| Message ID | 20221026194209.3758834-1-briannorris@chromium.org |
|---|---|
| Headers | show |
| Series | mmc: sdhci controllers: Fix SDHCI_RESET_ALL for CQHCI | expand |
On 10/26/22 12:42, Brian Norris wrote: > Several SDHCI drivers need to deactivate command queueing in their reset > hook (see sdhci_cqhci_reset() / sdhci-pci-core.c, for example), and > several more are coming. > > Those reset implementations have some small subtleties (e.g., ordering > of initialization of SDHCI vs. CQHCI might leave us resetting with a > NULL ->cqe_private), and are often identical across different host > drivers. > > We also don't want to force a dependency between SDHCI and CQHCI, or > vice versa; non-SDHCI drivers use CQHCI, and SDHCI drivers might support > command queueing through some other means. > > So, implement a small helper, to avoid repeating the same mistakes in > different drivers. Simply stick it in a header, because it's so small it > doesn't deserve its own module right now, and inlining to each driver is > pretty reasonable. > > This is marked for -stable, as it is an important prerequisite patch for > several SDHCI controller bugfixes that follow. > > Cc: <stable@vger.kernel.org> > Signed-off-by: Brian Norris <briannorris@chromium.org> > Acked-by: Adrian Hunter <adrian.hunter@intel.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On Wed, 26 Oct 2022 at 21:42, Brian Norris <briannorris@chromium.org> wrote: > > This is a series of identical fixes for several SDHCI host > drivers. Patch #2 (for sdhci-of-arasan; plus its dependency in patch #1) > is the only one I've tested, and I wrote it due to a bug described > there. > > I then noticed that several other drivers do the same thing, and that > commit df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for > Intel GLK-based controllers") points out the likely-repeated bug. So the > fix is now factored into a separate sdhci_and_cqhci_reset() helper, > and it's likely that most/all drivers that support a combo SDHCI/CQHCI > controller will want to use it. > > Thus, I include additional patches (compile-tested only) that apply this > helper/fix to the other drivers which call cqhci_init() but not > cqhci_deactivate(). They contain appropriate disclaimers and the > relevant parties are CC'd. I would suggest only merging them if you get > some kind of ACK from people familiar with the relevant hardware. > > Notably, I do *not* patch drivers/mmc/host/mtk-sd.c although it uses > CQHCI, because it doesn't seem to be an SDHCI-based controller, and so > even if it has a similar bug, it's not clear to me how to patch it. > > - Brian > > Changes in v4: > - Improve for-stable cherry-picking notes > - Add Adrian's Ack > - Also fix sdhci_am654_ops, sdhci_j721e_8bit_ops > > Changes in v3: > - Refactor to a "SDHCI and CQHCI" helper -- sdhci_and_cqhci_reset() > > Changes in v2: > - Rely on cqhci_deactivate() to safely handle (ignore) > not-yet-initialized CQE support > > Brian Norris (7): > mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI > mmc: sdhci-of-arasan: Fix SDHCI_RESET_ALL for CQHCI > mmc: sdhci-brcmstb: Fix SDHCI_RESET_ALL for CQHCI > mms: sdhci-esdhc-imx: Fix SDHCI_RESET_ALL for CQHCI > mmc: sdhci-tegra: Fix SDHCI_RESET_ALL for CQHCI > mmc: sdhci_am654: Fix SDHCI_RESET_ALL for CQHCI > mmc: sdhci-*: Convert drivers to new sdhci_and_cqhci_reset() > > drivers/mmc/host/sdhci-brcmstb.c | 3 ++- > drivers/mmc/host/sdhci-cqhci.h | 24 ++++++++++++++++++++++++ > drivers/mmc/host/sdhci-esdhc-imx.c | 3 ++- > drivers/mmc/host/sdhci-msm.c | 10 ++-------- > drivers/mmc/host/sdhci-of-arasan.c | 3 ++- > drivers/mmc/host/sdhci-pci-core.c | 11 ++--------- > drivers/mmc/host/sdhci-pci-gli.c | 11 ++--------- > drivers/mmc/host/sdhci-tegra.c | 3 ++- > drivers/mmc/host/sdhci_am654.c | 7 ++++--- > 9 files changed, 42 insertions(+), 33 deletions(-) > create mode 100644 drivers/mmc/host/sdhci-cqhci.h > Patch1 -> patch6, applied for fixes and by adding stable tags. Patch7 applied for next. Thanks and kind regards Uffe
This is a series of identical fixes for several SDHCI host drivers. Patch #2 (for sdhci-of-arasan; plus its dependency in patch #1) is the only one I've tested, and I wrote it due to a bug described there. I then noticed that several other drivers do the same thing, and that commit df57d73276b8 ("mmc: sdhci-pci: Fix SDHCI_RESET_ALL for CQHCI for Intel GLK-based controllers") points out the likely-repeated bug. So the fix is now factored into a separate sdhci_and_cqhci_reset() helper, and it's likely that most/all drivers that support a combo SDHCI/CQHCI controller will want to use it. Thus, I include additional patches (compile-tested only) that apply this helper/fix to the other drivers which call cqhci_init() but not cqhci_deactivate(). They contain appropriate disclaimers and the relevant parties are CC'd. I would suggest only merging them if you get some kind of ACK from people familiar with the relevant hardware. Notably, I do *not* patch drivers/mmc/host/mtk-sd.c although it uses CQHCI, because it doesn't seem to be an SDHCI-based controller, and so even if it has a similar bug, it's not clear to me how to patch it. - Brian Changes in v4: - Improve for-stable cherry-picking notes - Add Adrian's Ack - Also fix sdhci_am654_ops, sdhci_j721e_8bit_ops Changes in v3: - Refactor to a "SDHCI and CQHCI" helper -- sdhci_and_cqhci_reset() Changes in v2: - Rely on cqhci_deactivate() to safely handle (ignore) not-yet-initialized CQE support Brian Norris (7): mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI mmc: sdhci-of-arasan: Fix SDHCI_RESET_ALL for CQHCI mmc: sdhci-brcmstb: Fix SDHCI_RESET_ALL for CQHCI mms: sdhci-esdhc-imx: Fix SDHCI_RESET_ALL for CQHCI mmc: sdhci-tegra: Fix SDHCI_RESET_ALL for CQHCI mmc: sdhci_am654: Fix SDHCI_RESET_ALL for CQHCI mmc: sdhci-*: Convert drivers to new sdhci_and_cqhci_reset() drivers/mmc/host/sdhci-brcmstb.c | 3 ++- drivers/mmc/host/sdhci-cqhci.h | 24 ++++++++++++++++++++++++ drivers/mmc/host/sdhci-esdhc-imx.c | 3 ++- drivers/mmc/host/sdhci-msm.c | 10 ++-------- drivers/mmc/host/sdhci-of-arasan.c | 3 ++- drivers/mmc/host/sdhci-pci-core.c | 11 ++--------- drivers/mmc/host/sdhci-pci-gli.c | 11 ++--------- drivers/mmc/host/sdhci-tegra.c | 3 ++- drivers/mmc/host/sdhci_am654.c | 7 ++++--- 9 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 drivers/mmc/host/sdhci-cqhci.h