Hi Adrian, > -----Original Message----- > From: linux-mmc-owner@xxxxxxxxxxxxxxx > [mailto:linux-mmc-owner@xxxxxxxxxxxxxxx] On Behalf Of Adrian Hunter > Sent: Friday, December 09, 2011 3:37 PM > To: Chris Ball > Cc: linux-mmc@xxxxxxxxxxxxxxx; Hunter, Adrian > Subject: [PATCH] mmc: sdhci-pci: remove SDHCI_QUIRK2_OWN_CARD_DETECTION > > Even if a driver provides separate card detection, > an interrupt is still needed to abort mmc requests > that are in progress. SDHCI_QUIRK2_OWN_CARD_DETECTION > prevents that, so remove it. I think this should be considered by the new registered irq handler but not directly removing this quirk. If removing it directly, inserting/removing a card will cause driver to get two interrupts and that makes people confusing why there are two interrupts actually. So, shall we change the mfd_sd_cd function like below? static irqreturn_t mfd_sd_cd(int irq, void *dev_id) { struct sdhci_pci_slot *slot = dev_id; struct sdhci_host *host = slot->host; if (host->card_tasklet.func == NULL) return IRQ_NONE; tasklet_schedule(&host->card_tasklet); return IRQ_HANDLED; } With this, driver can also abort the mmc requests that are in progress. Thanks Chuanxiao > > Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> > --- > drivers/mmc/host/sdhci-pci.c | 1 - > drivers/mmc/host/sdhci.c | 3 --- > include/linux/mmc/sdhci.h | 2 -- > 3 files changed, 0 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c > index d2e77fb..abced67 100644 > --- a/drivers/mmc/host/sdhci-pci.c > +++ b/drivers/mmc/host/sdhci-pci.c > @@ -233,7 +233,6 @@ static int mfd_sd_probe_slot(struct sdhci_pci_slot *slot) > > slot->cd_gpio = gpio; > slot->cd_irq = irq; > - slot->host->quirks2 |= SDHCI_QUIRK2_OWN_CARD_DETECTION; > > return 0; > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index ab6018f..ec10288 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -149,9 +149,6 @@ static void sdhci_set_card_detection(struct sdhci_host > *host, bool enable) > if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) > return; > > - if (host->quirks2 & SDHCI_QUIRK2_OWN_CARD_DETECTION) > - return; > - > present = sdhci_readl(host, SDHCI_PRESENT_STATE) & > SDHCI_CARD_PRESENT; > irqs = present ? SDHCI_INT_CARD_REMOVE : SDHCI_INT_CARD_INSERT; > diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h > index e4b6935..dad7a46 100644 > --- a/include/linux/mmc/sdhci.h > +++ b/include/linux/mmc/sdhci.h > @@ -90,8 +90,6 @@ struct sdhci_host { > > unsigned int quirks2; /* More deviations from spec. */ > > -#define SDHCI_QUIRK2_OWN_CARD_DETECTION (1<<0) > - > int irq; /* Device IRQ */ > void __iomem *ioaddr; /* Mapped address */ > > -- > 1.7.6.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-mmc" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > 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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
