diff mbox

[v4] mmc: dw_mmc: fix potential system abort

Message ID 1506415566-115405-1-git-send-email-shawn.lin@rock-chips.com (mailing list archive)
State New, archived
Headers show

Commit Message

Shawn Lin Sept. 26, 2017, 8:46 a.m. UTC
dw_mmc allows the variant drivers to register the interrupt
as a shared irq, which means dw_mmc should guarantee to properly
handle the irq at any time, even if the irq isn't belong to itself.
So there is a timing gap that the dw_mmc is being removed but the
shared irq comes concurrently. The clock/reset controller/power
domain for accessing the controller had been off before the irq
comes in, so that the irq handler, dw_mci_interrupt, would still
try to read the MINTSTS to see if the irq belongs to this controller.
However, at least for rockchip platforms, it doesn't allow to access
the controller w/o clock and power domain be in the active state.

To quick reproduce that, we could enable CONFIG_DEBUG_SHIRQ.
the irq tear down routine would still access the irq handler registed
as a shard irq. Per the comment within the function of __free_irq, it
says "It's a shared IRQ -- the driver ought to be prepared for an IRQ
event to happen even now it's being freed". So whenever we fail to probe
the driver or unbind the driver, the system abort.

Synopsys Designware Multimedia Card Interface Driver
dwmmc_rockchip fe320000.dwmmc: IDMAC supports 32-bit address mode.
dwmmc_rockchip fe320000.dwmmc: Using internal DMA controller.
dwmmc_rockchip fe320000.dwmmc: Version ID is 270a
CPU: 0 PID: 1 Comm: swapper/0 Not tainted
4.13.0-rc3-next-20170807-00004-g93d3644-dirty #5
Hardware name: Firefly-RK3399 Board (DT)
Call trace:
[<ffff20000808b5a0>] dump_backtrace+0x0/0x300
[<ffff20000808ba1c>] show_stack+0x14/0x20
[<ffff200008dc480c>] dump_stack+0xa4/0xc8
[<ffff200008b9691c>] dw_mci_interrupt+0x3c/0x6a8
[<ffff200008157450>] __free_irq+0x308/0x410
[<ffff20000815760c>] free_irq+0x54/0xb0
[<ffff20000815d630>] devm_irq_release+0x30/0x40
[<ffff2000087f0174>] release_nodes+0x1e4/0x390
[<ffff2000087f04c0>] devres_release_all+0x50/0x78
[<ffff2000087e9bc0>] driver_probe_device+0x128/0x3b8
[<ffff2000087e9f34>] __driver_attach+0xe4/0xe8
[<ffff2000087e7048>] bus_for_each_dev+0xe0/0x138
[<ffff2000087e93b8>] driver_attach+0x30/0x40
[<ffff2000087e8c00>] bus_add_driver+0x1d0/0x328
[<ffff2000087ead0c>] driver_register+0xb4/0x198
[<ffff2000087ec98c>] __platform_driver_register+0x7c/0x88
[<ffff2000095bc564>] dw_mci_rockchip_pltfm_driver_init+0x18/0x20
[<ffff200008083a8c>] do_one_initcall+0x14c/0x1b8
[<ffff200009560ff8>] kernel_init_freeable+0x238/0x2d8
[<ffff200008dde500>] kernel_init+0x10/0x110
[<ffff2000080836c0>] ret_from_fork+0x10/0x50
Synchronous External Abort: synchronous external abort (0x96000010) at
0xffff20000aaa4040
Internal error: : 96000010 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted
task: ffff80006ba28080 task.stack: ffff80006ba24000
PC is at dw_mci_interrupt+0x4c/0x6a8
LR is at dw_mci_interrupt+0x44/0x6a8
pc : [<ffff200008b9692c>] lr : [<ffff200008b96924>] pstate: 600001c5

In order to fix this more visible, we introduce new bool variable
'driver_removed' to bail out early from the irq handler if the driver
had been removed.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>

---

Changes in v4:
- remove the driver core change from v3 and add new flag to solve this
issue instead of adding devm_add_action_or_reset.

 drivers/mmc/host/dw_mmc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Jaehoon Chung Sept. 26, 2017, 11:11 a.m. UTC | #1
Hi Shawn,

On 09/26/2017 05:46 PM, Shawn Lin wrote:
> dw_mmc allows the variant drivers to register the interrupt
> as a shared irq, which means dw_mmc should guarantee to properly
> handle the irq at any time, even if the irq isn't belong to itself.
> So there is a timing gap that the dw_mmc is being removed but the
> shared irq comes concurrently. The clock/reset controller/power
> domain for accessing the controller had been off before the irq
> comes in, so that the irq handler, dw_mci_interrupt, would still
> try to read the MINTSTS to see if the irq belongs to this controller.
> However, at least for rockchip platforms, it doesn't allow to access
> the controller w/o clock and power domain be in the active state.
> 
> To quick reproduce that, we could enable CONFIG_DEBUG_SHIRQ.
> the irq tear down routine would still access the irq handler registed
> as a shard irq. Per the comment within the function of __free_irq, it
> says "It's a shared IRQ -- the driver ought to be prepared for an IRQ
> event to happen even now it's being freed". So whenever we fail to probe
> the driver or unbind the driver, the system abort.

I will check this patch..thanks!

> 
> Synopsys Designware Multimedia Card Interface Driver
> dwmmc_rockchip fe320000.dwmmc: IDMAC supports 32-bit address mode.
> dwmmc_rockchip fe320000.dwmmc: Using internal DMA controller.
> dwmmc_rockchip fe320000.dwmmc: Version ID is 270a
> CPU: 0 PID: 1 Comm: swapper/0 Not tainted
> 4.13.0-rc3-next-20170807-00004-g93d3644-dirty #5
> Hardware name: Firefly-RK3399 Board (DT)
> Call trace:
> [<ffff20000808b5a0>] dump_backtrace+0x0/0x300
> [<ffff20000808ba1c>] show_stack+0x14/0x20
> [<ffff200008dc480c>] dump_stack+0xa4/0xc8
> [<ffff200008b9691c>] dw_mci_interrupt+0x3c/0x6a8
> [<ffff200008157450>] __free_irq+0x308/0x410
> [<ffff20000815760c>] free_irq+0x54/0xb0
> [<ffff20000815d630>] devm_irq_release+0x30/0x40
> [<ffff2000087f0174>] release_nodes+0x1e4/0x390
> [<ffff2000087f04c0>] devres_release_all+0x50/0x78
> [<ffff2000087e9bc0>] driver_probe_device+0x128/0x3b8
> [<ffff2000087e9f34>] __driver_attach+0xe4/0xe8
> [<ffff2000087e7048>] bus_for_each_dev+0xe0/0x138
> [<ffff2000087e93b8>] driver_attach+0x30/0x40
> [<ffff2000087e8c00>] bus_add_driver+0x1d0/0x328
> [<ffff2000087ead0c>] driver_register+0xb4/0x198
> [<ffff2000087ec98c>] __platform_driver_register+0x7c/0x88
> [<ffff2000095bc564>] dw_mci_rockchip_pltfm_driver_init+0x18/0x20
> [<ffff200008083a8c>] do_one_initcall+0x14c/0x1b8
> [<ffff200009560ff8>] kernel_init_freeable+0x238/0x2d8
> [<ffff200008dde500>] kernel_init+0x10/0x110
> [<ffff2000080836c0>] ret_from_fork+0x10/0x50
> Synchronous External Abort: synchronous external abort (0x96000010) at
> 0xffff20000aaa4040
> Internal error: : 96000010 [#1] PREEMPT SMP
> Modules linked in:
> CPU: 0 PID: 1 Comm: swapper/0 Not tainted
> task: ffff80006ba28080 task.stack: ffff80006ba24000
> PC is at dw_mci_interrupt+0x4c/0x6a8
> LR is at dw_mci_interrupt+0x44/0x6a8
> pc : [<ffff200008b9692c>] lr : [<ffff200008b96924>] pstate: 600001c5
> 
> In order to fix this more visible, we introduce new bool variable
> 'driver_removed' to bail out early from the irq handler if the driver
> had been removed.
> 
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
> 
> ---
> 
> Changes in v4:
> - remove the driver core change from v3 and add new flag to solve this
> issue instead of adding devm_add_action_or_reset.
> 
>  drivers/mmc/host/dw_mmc.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 860313b..bb4c608 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -2595,6 +2595,9 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
>  	u32 pending;
>  	struct dw_mci_slot *slot = host->slot;
>  
> +	if (host->driver_removed)
> +		return IRQ_NONE;
> +
>  	pending = mci_readl(host, MINTSTS); /* read-only mask reg */
>  
>  	if (pending) {
> @@ -3221,6 +3224,8 @@ int dw_mci_probe(struct dw_mci *host)
>  	else
>  		host->fifo_reg = host->regs + DATA_240A_OFFSET;
>  
> +	host->driver_removed = false;
> +
>  	tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host);
>  	ret = devm_request_irq(host->dev, host->irq, dw_mci_interrupt,
>  			       host->irq_flags, "dw-mci", host);
> @@ -3266,6 +3271,7 @@ int dw_mci_probe(struct dw_mci *host)
>  err_clk_biu:
>  	clk_disable_unprepare(host->biu_clk);
>  
> +	host->driver_removed = true;
>  	return ret;
>  }
>  EXPORT_SYMBOL(dw_mci_probe);
> @@ -3291,6 +3297,8 @@ void dw_mci_remove(struct dw_mci *host)
>  
>  	clk_disable_unprepare(host->ciu_clk);
>  	clk_disable_unprepare(host->biu_clk);
> +
> +	host->driver_removed = true;
>  }
>  EXPORT_SYMBOL(dw_mci_remove);
>  
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Shawn Lin Nov. 1, 2017, 1:42 a.m. UTC | #2
Hi Jaehoon, Ulf

On 2017/9/26 16:46, Shawn Lin wrote:
> dw_mmc allows the variant drivers to register the interrupt

Any chance to pick up this for 4.15?

> Synopsys Designware Multimedia Card Interface Driver
> dwmmc_rockchip fe320000.dwmmc: IDMAC supports 32-bit address mode.
> dwmmc_rockchip fe320000.dwmmc: Using internal DMA controller.
> dwmmc_rockchip fe320000.dwmmc: Version ID is 270a
> CPU: 0 PID: 1 Comm: swapper/0 Not tainted
> 4.13.0-rc3-next-20170807-00004-g93d3644-dirty #5
> Hardware name: Firefly-RK3399 Board (DT)
> Call trace:

>   
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ulf Hansson Nov. 1, 2017, 1:51 p.m. UTC | #3
On 26 September 2017 at 10:46, Shawn Lin <shawn.lin@rock-chips.com> wrote:
> dw_mmc allows the variant drivers to register the interrupt
> as a shared irq, which means dw_mmc should guarantee to properly
> handle the irq at any time, even if the irq isn't belong to itself.
> So there is a timing gap that the dw_mmc is being removed but the
> shared irq comes concurrently. The clock/reset controller/power
> domain for accessing the controller had been off before the irq
> comes in, so that the irq handler, dw_mci_interrupt, would still
> try to read the MINTSTS to see if the irq belongs to this controller.
> However, at least for rockchip platforms, it doesn't allow to access
> the controller w/o clock and power domain be in the active state.
>
> To quick reproduce that, we could enable CONFIG_DEBUG_SHIRQ.
> the irq tear down routine would still access the irq handler registed
> as a shard irq. Per the comment within the function of __free_irq, it
> says "It's a shared IRQ -- the driver ought to be prepared for an IRQ
> event to happen even now it's being freed". So whenever we fail to probe
> the driver or unbind the driver, the system abort.
>
> Synopsys Designware Multimedia Card Interface Driver
> dwmmc_rockchip fe320000.dwmmc: IDMAC supports 32-bit address mode.
> dwmmc_rockchip fe320000.dwmmc: Using internal DMA controller.
> dwmmc_rockchip fe320000.dwmmc: Version ID is 270a
> CPU: 0 PID: 1 Comm: swapper/0 Not tainted
> 4.13.0-rc3-next-20170807-00004-g93d3644-dirty #5
> Hardware name: Firefly-RK3399 Board (DT)
> Call trace:
> [<ffff20000808b5a0>] dump_backtrace+0x0/0x300
> [<ffff20000808ba1c>] show_stack+0x14/0x20
> [<ffff200008dc480c>] dump_stack+0xa4/0xc8
> [<ffff200008b9691c>] dw_mci_interrupt+0x3c/0x6a8
> [<ffff200008157450>] __free_irq+0x308/0x410
> [<ffff20000815760c>] free_irq+0x54/0xb0
> [<ffff20000815d630>] devm_irq_release+0x30/0x40
> [<ffff2000087f0174>] release_nodes+0x1e4/0x390
> [<ffff2000087f04c0>] devres_release_all+0x50/0x78
> [<ffff2000087e9bc0>] driver_probe_device+0x128/0x3b8
> [<ffff2000087e9f34>] __driver_attach+0xe4/0xe8
> [<ffff2000087e7048>] bus_for_each_dev+0xe0/0x138
> [<ffff2000087e93b8>] driver_attach+0x30/0x40
> [<ffff2000087e8c00>] bus_add_driver+0x1d0/0x328
> [<ffff2000087ead0c>] driver_register+0xb4/0x198
> [<ffff2000087ec98c>] __platform_driver_register+0x7c/0x88
> [<ffff2000095bc564>] dw_mci_rockchip_pltfm_driver_init+0x18/0x20
> [<ffff200008083a8c>] do_one_initcall+0x14c/0x1b8
> [<ffff200009560ff8>] kernel_init_freeable+0x238/0x2d8
> [<ffff200008dde500>] kernel_init+0x10/0x110
> [<ffff2000080836c0>] ret_from_fork+0x10/0x50
> Synchronous External Abort: synchronous external abort (0x96000010) at
> 0xffff20000aaa4040
> Internal error: : 96000010 [#1] PREEMPT SMP
> Modules linked in:
> CPU: 0 PID: 1 Comm: swapper/0 Not tainted
> task: ffff80006ba28080 task.stack: ffff80006ba24000
> PC is at dw_mci_interrupt+0x4c/0x6a8
> LR is at dw_mci_interrupt+0x44/0x6a8
> pc : [<ffff200008b9692c>] lr : [<ffff200008b96924>] pstate: 600001c5
>
> In order to fix this more visible, we introduce new bool variable
> 'driver_removed' to bail out early from the irq handler if the driver
> had been removed.

Shawn, apologize for the earlier lack of response.

As you also stated earlier, to me, this a generic problem, not even
specific to the ->remove() case.

In principle, as soon as the device enters a suspend state (at remove,
probe failure, runtime_suspend, system-wide suspend), we need a way to
either bail out early in the irq handler or actually preventing it
from being called.

However, even if this is a generic problem, I agree/suggest that we
should take care of this locally in dw_mmc for now. In a second step,
we should explore a more generic solution, by perhaps adding some
genirq API, mainly to avoid lots of boiler plate code to each an every
driver.

So my overall comments is, can you please take care of the other cases
(runtime suspend, system-wide suspend) as well? Perhaps in separate
patches on top!?

More comments below..

>
> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
>
> ---
>
> Changes in v4:
> - remove the driver core change from v3 and add new flag to solve this
> issue instead of adding devm_add_action_or_reset.
>
>  drivers/mmc/host/dw_mmc.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 860313b..bb4c608 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -2595,6 +2595,9 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
>         u32 pending;
>         struct dw_mci_slot *slot = host->slot;
>
> +       if (host->driver_removed)

I would rather rename this flag to host->suspended, to better reflect
its purpose.

> +               return IRQ_NONE;
> +
>         pending = mci_readl(host, MINTSTS); /* read-only mask reg */
>
>         if (pending) {
> @@ -3221,6 +3224,8 @@ int dw_mci_probe(struct dw_mci *host)
>         else
>                 host->fifo_reg = host->regs + DATA_240A_OFFSET;
>
> +       host->driver_removed = false;
> +
>         tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host);
>         ret = devm_request_irq(host->dev, host->irq, dw_mci_interrupt,
>                                host->irq_flags, "dw-mci", host);
> @@ -3266,6 +3271,7 @@ int dw_mci_probe(struct dw_mci *host)
>  err_clk_biu:
>         clk_disable_unprepare(host->biu_clk);
>
> +       host->driver_removed = true;
>         return ret;
>  }
>  EXPORT_SYMBOL(dw_mci_probe);
> @@ -3291,6 +3297,8 @@ void dw_mci_remove(struct dw_mci *host)
>
>         clk_disable_unprepare(host->ciu_clk);
>         clk_disable_unprepare(host->biu_clk);
> +
> +       host->driver_removed = true;

First, it seems like you should move this a little further up, to the
point where you actually can't allow the irq handler to run. I assume
that is at least before the clk gating thingy.

Second, it seems like this flag also needs to be protected by a
spin_lock (host->irq_lock), unless I am missing something.

>  }
>  EXPORT_SYMBOL(dw_mci_remove);
>

I didn't find the "driver_removed" flag being added in the struct
dw_mci *host, I guess you missed to include that?

Kind regards
Uffe
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Shawn Lin Nov. 2, 2017, 7:38 a.m. UTC | #4
Hi Ulf,

On 2017/11/1 21:51, Ulf Hansson wrote:
> On 26 September 2017 at 10:46, Shawn Lin <shawn.lin@rock-chips.com> wrote:
>> dw_mmc allows the variant drivers to register the interrupt
>> as a shared irq, which means dw_mmc should guarantee to properly
>> handle the irq at any time, even if the irq isn't belong to itself.
>> So there is a timing gap that the dw_mmc is being removed but the
>> shared irq comes concurrently. The clock/reset controller/power
>> domain for accessing the controller had been off before the irq
>> comes in, so that the irq handler, dw_mci_interrupt, would still
>> try to read the MINTSTS to see if the irq belongs to this controller.
>> However, at least for rockchip platforms, it doesn't allow to access
>> the controller w/o clock and power domain be in the active state.
>>
>> To quick reproduce that, we could enable CONFIG_DEBUG_SHIRQ.
>> the irq tear down routine would still access the irq handler registed
>> as a shard irq. Per the comment within the function of __free_irq, it
>> says "It's a shared IRQ -- the driver ought to be prepared for an IRQ
>> event to happen even now it's being freed". So whenever we fail to probe
>> the driver or unbind the driver, the system abort.
>>
>> Synopsys Designware Multimedia Card Interface Driver
>> dwmmc_rockchip fe320000.dwmmc: IDMAC supports 32-bit address mode.
>> dwmmc_rockchip fe320000.dwmmc: Using internal DMA controller.
>> dwmmc_rockchip fe320000.dwmmc: Version ID is 270a
>> CPU: 0 PID: 1 Comm: swapper/0 Not tainted
>> 4.13.0-rc3-next-20170807-00004-g93d3644-dirty #5
>> Hardware name: Firefly-RK3399 Board (DT)
>> Call trace:
>> [<ffff20000808b5a0>] dump_backtrace+0x0/0x300
>> [<ffff20000808ba1c>] show_stack+0x14/0x20
>> [<ffff200008dc480c>] dump_stack+0xa4/0xc8
>> [<ffff200008b9691c>] dw_mci_interrupt+0x3c/0x6a8
>> [<ffff200008157450>] __free_irq+0x308/0x410
>> [<ffff20000815760c>] free_irq+0x54/0xb0
>> [<ffff20000815d630>] devm_irq_release+0x30/0x40
>> [<ffff2000087f0174>] release_nodes+0x1e4/0x390
>> [<ffff2000087f04c0>] devres_release_all+0x50/0x78
>> [<ffff2000087e9bc0>] driver_probe_device+0x128/0x3b8
>> [<ffff2000087e9f34>] __driver_attach+0xe4/0xe8
>> [<ffff2000087e7048>] bus_for_each_dev+0xe0/0x138
>> [<ffff2000087e93b8>] driver_attach+0x30/0x40
>> [<ffff2000087e8c00>] bus_add_driver+0x1d0/0x328
>> [<ffff2000087ead0c>] driver_register+0xb4/0x198
>> [<ffff2000087ec98c>] __platform_driver_register+0x7c/0x88
>> [<ffff2000095bc564>] dw_mci_rockchip_pltfm_driver_init+0x18/0x20
>> [<ffff200008083a8c>] do_one_initcall+0x14c/0x1b8
>> [<ffff200009560ff8>] kernel_init_freeable+0x238/0x2d8
>> [<ffff200008dde500>] kernel_init+0x10/0x110
>> [<ffff2000080836c0>] ret_from_fork+0x10/0x50
>> Synchronous External Abort: synchronous external abort (0x96000010) at
>> 0xffff20000aaa4040
>> Internal error: : 96000010 [#1] PREEMPT SMP
>> Modules linked in:
>> CPU: 0 PID: 1 Comm: swapper/0 Not tainted
>> task: ffff80006ba28080 task.stack: ffff80006ba24000
>> PC is at dw_mci_interrupt+0x4c/0x6a8
>> LR is at dw_mci_interrupt+0x44/0x6a8
>> pc : [<ffff200008b9692c>] lr : [<ffff200008b96924>] pstate: 600001c5
>>
>> In order to fix this more visible, we introduce new bool variable
>> 'driver_removed' to bail out early from the irq handler if the driver
>> had been removed.
> 
> Shawn, apologize for the earlier lack of response.
> 
> As you also stated earlier, to me, this a generic problem, not even
> specific to the ->remove() case.
> 
> In principle, as soon as the device enters a suspend state (at remove,
> probe failure, runtime_suspend, system-wide suspend), we need a way to
> either bail out early in the irq handler or actually preventing it
> from being called.
> 

Exactly. My very first try was to touch the device core to fix that.
But still more things should be considered pointed out by Rafael.

> However, even if this is a generic problem, I agree/suggest that we
> should take care of this locally in dw_mmc for now. In a second step,
> we should explore a more generic solution, by perhaps adding some
> genirq API, mainly to avoid lots of boiler plate code to each an every
> driver.
> 
> So my overall comments is, can you please take care of the other cases
> (runtime suspend, system-wide suspend) as well? Perhaps in separate
> patches on top!?

So, yes!

> 
> More comments below..
> 
>>
>> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
>>
>> ---
>>
>> Changes in v4:
>> - remove the driver core change from v3 and add new flag to solve this
>> issue instead of adding devm_add_action_or_reset.
>>
>>   drivers/mmc/host/dw_mmc.c | 8 ++++++++
>>   1 file changed, 8 insertions(+)
>>
>> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
>> index 860313b..bb4c608 100644
>> --- a/drivers/mmc/host/dw_mmc.c
>> +++ b/drivers/mmc/host/dw_mmc.c
>> @@ -2595,6 +2595,9 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
>>          u32 pending;
>>          struct dw_mci_slot *slot = host->slot;
>>
>> +       if (host->driver_removed)
> 
> I would rather rename this flag to host->suspended, to better reflect
> its purpose.

host->suspended doesn't look ideal to me either.

As you figure out that this flag should reflect the situation that
whether dw_mmc has been removed/runtime-suspended/system-wide-suspended.
That says the driver should be halted in all these three status.

So, how about renaming it to driver_halted?

> 
>> +               return IRQ_NONE;
>> +
>>          pending = mci_readl(host, MINTSTS); /* read-only mask reg */
>>
>>          if (pending) {
>> @@ -3221,6 +3224,8 @@ int dw_mci_probe(struct dw_mci *host)
>>          else
>>                  host->fifo_reg = host->regs + DATA_240A_OFFSET;
>>
>> +       host->driver_removed = false;
>> +
>>          tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host);
>>          ret = devm_request_irq(host->dev, host->irq, dw_mci_interrupt,
>>                                 host->irq_flags, "dw-mci", host);
>> @@ -3266,6 +3271,7 @@ int dw_mci_probe(struct dw_mci *host)
>>   err_clk_biu:
>>          clk_disable_unprepare(host->biu_clk);
>>
>> +       host->driver_removed = true;
>>          return ret;
>>   }
>>   EXPORT_SYMBOL(dw_mci_probe);
>> @@ -3291,6 +3297,8 @@ void dw_mci_remove(struct dw_mci *host)
>>
>>          clk_disable_unprepare(host->ciu_clk);
>>          clk_disable_unprepare(host->biu_clk);
>> +
>> +       host->driver_removed = true;
> 
> First, it seems like you should move this a little further up, to the
> point where you actually can't allow the irq handler to run. I assume
> that is at least before the clk gating thingy.
> 
> Second, it seems like this flag also needs to be protected by a
> spin_lock (host->irq_lock), unless I am missing something.
> 
>>   }
>>   EXPORT_SYMBOL(dw_mci_remove);
>>
> 
> I didn't find the "driver_removed" flag being added in the struct
> dw_mci *host, I guess you missed to include that?
> 
> Kind regards
> Uffe
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 860313b..bb4c608 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2595,6 +2595,9 @@  static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 	u32 pending;
 	struct dw_mci_slot *slot = host->slot;
 
+	if (host->driver_removed)
+		return IRQ_NONE;
+
 	pending = mci_readl(host, MINTSTS); /* read-only mask reg */
 
 	if (pending) {
@@ -3221,6 +3224,8 @@  int dw_mci_probe(struct dw_mci *host)
 	else
 		host->fifo_reg = host->regs + DATA_240A_OFFSET;
 
+	host->driver_removed = false;
+
 	tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host);
 	ret = devm_request_irq(host->dev, host->irq, dw_mci_interrupt,
 			       host->irq_flags, "dw-mci", host);
@@ -3266,6 +3271,7 @@  int dw_mci_probe(struct dw_mci *host)
 err_clk_biu:
 	clk_disable_unprepare(host->biu_clk);
 
+	host->driver_removed = true;
 	return ret;
 }
 EXPORT_SYMBOL(dw_mci_probe);
@@ -3291,6 +3297,8 @@  void dw_mci_remove(struct dw_mci *host)
 
 	clk_disable_unprepare(host->ciu_clk);
 	clk_disable_unprepare(host->biu_clk);
+
+	host->driver_removed = true;
 }
 EXPORT_SYMBOL(dw_mci_remove);