mmc: dw_mmc: Only inject fault before done/error
Subsystems (2)
PATCH 1/1 mmc: dw_mmc: Only inject fault before done/error
The fault injection function can set EVENT_DATA_ERROR but skip the setting of ->data_status to an error status if it hits just after a data over interrupt. This confuses the tasklet which can later end up triggering the WARN_ON(host->cmd || ..) in dw_mci_request_end() since dw_mci_data_complete() would return success.
Prevent the fault injection function from doing this since this is not a real case, and ensure that the fault injection doesn't race with a real error either.
--- drivers/mmc/host/dw_mmc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/mmc/host/dw_mmc.c +12 -3
@@ -1802,10 +1802,15 @@ static enum hrtimer_restart dw_mci_fault_timer(struct hrtimer *t)spin_lock_irqsave (&host->irq_lock, flags); -if (!host->data_status) +/* +* Only inject an error if we haven't already got an error or data over +* interrupt. +*/ +if (!host->data_status) { host->data_status =SDMMC_INT_DCRC ; -set_bit (EVENT_DATA_ERROR , &host->pending_events); -tasklet_schedule (&host->tasklet); +set_bit (EVENT_DATA_ERROR , &host->pending_events); +tasklet_schedule (&host->tasklet); + }spin_unlock_irqrestore (&host->irq_lock, flags);
@@ -2721,12 +2726,16 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) }if (pending &DW_MCI_DATA_ERROR_FLAGS ) { +spin_lock (&host->irq_lock); +/* if there is an error report DATA_ERROR */ mci_writel (host,RINTSTS ,DW_MCI_DATA_ERROR_FLAGS ); host->data_status = pending;smp_wmb ();/* drain writebuffer */ set_bit (EVENT_DATA_ERROR , &host->pending_events);tasklet_schedule (&host->tasklet); + +spin_unlock (&host->irq_lock); }if (pending &SDMMC_INT_DATA_OVER ) {
Signature · 1 line
2.28.0
Quoted 11 lines · Vincent Whitchurch
The fault injection function can set
EVENT_DATA_ERRORbut skip the setting of ->data_status to an error status if it hits just after a data over interrupt. This confuses the tasklet which can later end up triggering theWARN_ON(host->cmd || ..)indw_mci_request_end()sincedw_mci_data_complete()would return success.Prevent the fault injection function from doing this since this is not a real case, and ensure that the fault injection doesn't race with a real error either.
Signed-off-by Vincent Whitchurch <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 45 lines
--- drivers/mmc/host/dw_mmc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)drivers/mmc/host/dw_mmc.c +12
-3@@ -1802,10 +1802,15 @@ static enum hrtimer_restart dw_mci_fault_timer(struct hrtimer *t)spin_lock_irqsave (&host->irq_lock, flags); -if (!host->data_status) +/* +* Only inject an error if we haven't already got an error or data over +* interrupt. +*/ +if (!host->data_status) { host->data_status =SDMMC_INT_DCRC ; -set_bit (EVENT_DATA_ERROR , &host->pending_events); -tasklet_schedule (&host->tasklet); +set_bit (EVENT_DATA_ERROR , &host->pending_events); +tasklet_schedule (&host->tasklet); + }spin_unlock_irqrestore (&host->irq_lock, flags);@@ -2721,12 +2726,16 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) }if (pending &DW_MCI_DATA_ERROR_FLAGS ) { +spin_lock (&host->irq_lock); +/* if there is an error report DATA_ERROR */ mci_writel (host,RINTSTS ,DW_MCI_DATA_ERROR_FLAGS ); host->data_status = pending;smp_wmb ();/* drain writebuffer */ set_bit (EVENT_DATA_ERROR , &host->pending_events);tasklet_schedule (&host->tasklet); + +spin_unlock (&host->irq_lock); }if (pending &SDMMC_INT_DATA_OVER ) {
Quoted 7 lines · Vincent Whitchurch
The fault injection function can set
EVENT_DATA_ERRORbut skip the setting of ->data_status to an error status if it hits just after a data over interrupt. This confuses the tasklet which can later end up triggering theWARN_ON(host->cmd || ..)indw_mci_request_end()sincedw_mci_data_complete()would return success.
Quoted 5 lines
Prevent the fault injection function from doing this since this is not a real case, and ensure that the fault injection doesn't race with a real error either.
Signed-off-by Vincent Whitchurch <[email protected]>
Applied for fixes and by adding a fixes tag, thanks!
Kind regards
Uffe
Quoted 47 lines
--- drivers/mmc/host/dw_mmc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)drivers/mmc/host/dw_mmc.c +12
-4@@ -1802,10 +1802,15 @@ static enum hrtimer_restart dw_mci_fault_timer(struct hrtimer *t)spin_lock_irqsave (&host->irq_lock, flags); -if (!host->data_status) +/* +* Only inject an error if we haven't already got an error or data over +* interrupt. +*/ +if (!host->data_status) { host->data_status =SDMMC_INT_DCRC ; -set_bit (EVENT_DATA_ERROR , &host->pending_events); -tasklet_schedule (&host->tasklet); +set_bit (EVENT_DATA_ERROR , &host->pending_events); +tasklet_schedule (&host->tasklet); + }spin_unlock_irqrestore (&host->irq_lock, flags);@@ -2721,12 +2726,16 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id) }if (pending &DW_MCI_DATA_ERROR_FLAGS ) { +spin_lock (&host->irq_lock); +/* if there is an error report DATA_ERROR */ mci_writel (host,RINTSTS ,DW_MCI_DATA_ERROR_FLAGS ); host->data_status = pending;smp_wmb ();/* drain writebuffer */ set_bit (EVENT_DATA_ERROR , &host->pending_events);tasklet_schedule (&host->tasklet); + +spin_unlock (&host->irq_lock); }if (pending &SDMMC_INT_DATA_OVER ) { --2.28.0