Re: [PATCH 2/2] i2c: Clear client->irq in i2c_device_remove

From: Yauhen Kharuzhy
Date: Thu Jan 10 2019 - 15:35:42 EST


On Thu, Jan 10, 2019 at 01:32:36PM +0000, Charles Keepax wrote:
> On Thu, Jan 10, 2019 at 12:47:56AM +0300, Yauhen Kharuzhy wrote:
> > On Fri, Oct 19, 2018 at 09:59:58AM +0100, Charles Keepax wrote:
> > > The IRQ will be mapped in i2c_device_probe only if client->irq is zero and
> > > i2c_device_remove does not clear this. When rebinding an I2C device,
> > > whos IRQ provider has also been rebound this means that an IRQ mapping
> > > will never be created, causing the I2C device to fail to acquire its
> > > IRQ. Fix this issue by clearing client->irq in i2c_device_remove,
> > > forcing i2c_device_probe to lookup the mapping again.
> >
> > Hi.
> >
> > I found driver i2c/busses/i2c-cht-wc.c which instantiates I2C device
> > (battery charger) and passes IRQ to driver not using standard I2C IRQ mapping code.
> > So if we reprobe I2C device (by reloading I2C device driver module or by
> > manipulations with sysfs), we get invalid IRQ number for client:
> >
> > adap->client_irq = irq_create_mapping(adap->irq_domain, 0);
> > ...
> > irq_set_chip_data(adap->client_irq, adap);
> > irq_set_chip_and_handler(adap->client_irq, &adap->irqchip, handle_simple_irq);
> > ...
> > board_info.irq = adap->client_irq;
> > adap->client = i2c_new_device(&adap->adapter, &board_info);
> >
> >
> > adap->client->irq will be reset after device removing here.
> >
> >
> > Any advice to fix this? Maybe move initial i2c_client->irq value to new field
> > like client->init_irq and copy it to client->irq at probing, for example?
> >
>
> Could you be a little more specific here, are you saying if you
> reprobe the battery charger device or if you reprobe the I2C
> controller itself?

If I reprobe the battery charger.

>
> Apologies but I am having a little difficulty working out the
> path through which the IRQ is not reinitialised. As I would have
> through the battery chargers probe would have reset up the IRQ
> then the core would pick it up again from there.

No, this I2C bus driver(i2c-cht-wc) pass the IRQ to charger not throuth
ACPI of OF but by initializing of board_info.irq field, so I2C subsystem
cannot reinitialize irq automatically.

I am not sure if this is right path for IRQ initialization and maybe
should be changed for this driver.

>
> Thanks,
> Charles

--
Yauhen Kharuzhy