Commit 7c42d6f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:

 - Provide helper for resetting both SDHCI and CQHCI

 - Fix reset for CQHCI (am654, brcmstb, esdhc-imx, of-arasan, tegra)

 - Fixup support for MMC_CAP_8_BIT_DATA (esdhc-imx)

* tag 'mmc-v6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-esdhc-imx: use the correct host caps for MMC_CAP_8_BIT_DATA
  mmc: sdhci_am654: Fix SDHCI_RESET_ALL for CQHCI
  mmc: sdhci-tegra: Fix SDHCI_RESET_ALL for CQHCI
  mms: sdhci-esdhc-imx: Fix SDHCI_RESET_ALL for CQHCI
  mmc: sdhci-brcmstb: Fix SDHCI_RESET_ALL for CQHCI
  mmc: sdhci-of-arasan: Fix SDHCI_RESET_ALL for CQHCI
  mmc: cqhci: Provide helper for resetting both SDHCI and CQHCI
parents 9c730fe1 f002f45a

drivers/mmc/host/sdhci-brcmstb.c

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/bitops.h>

#include <linux/delay.h>



#include "sdhci-cqhci.h"

#include "sdhci-pltfm.h"

#include "cqhci.h"
@@ -55,7 +56,7 @@ static void brcmstb_reset(struct sdhci_host *host, u8 mask) 
	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);



	sdhci_reset(host, mask);

	sdhci_and_cqhci_reset(host, mask);



	/* Reset will clear this, so re-enable it */

	if (priv->flags & BRCMSTB_PRIV_FLAGS_GATE_CLOCK)

drivers/mmc/host/sdhci-cqhci.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright 2022 The Chromium OS Authors

 *

 * Support that applies to the combination of SDHCI and CQHCI, while not

 * expressing a dependency between the two modules.

 */



#ifndef __MMC_HOST_SDHCI_CQHCI_H__

#define __MMC_HOST_SDHCI_CQHCI_H__



#include "cqhci.h"

#include "sdhci.h"



static inline void sdhci_and_cqhci_reset(struct sdhci_host *host, u8 mask)

{

	if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL) &&

	    host->mmc->cqe_private)

		cqhci_deactivate(host->mmc);



	sdhci_reset(host, mask);

}



#endif /* __MMC_HOST_SDHCI_CQHCI_H__ */

drivers/mmc/host/sdhci-esdhc-imx.c

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/of_device.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pm_runtime.h>

#include "sdhci-cqhci.h"

#include "sdhci-pltfm.h"

#include "sdhci-esdhc.h"

#include "cqhci.h"
@@ -1288,7 +1289,7 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned timing) 


static void esdhc_reset(struct sdhci_host *host, u8 mask)

{

	sdhci_reset(host, mask);

	sdhci_and_cqhci_reset(host, mask);



	sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);

	sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
@@ -1671,14 +1672,14 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) 
	if (imx_data->socdata->flags & ESDHC_FLAG_ERR004536)

		host->quirks |= SDHCI_QUIRK_BROKEN_ADMA;



	if (host->caps & MMC_CAP_8_BIT_DATA &&

	if (host->mmc->caps & MMC_CAP_8_BIT_DATA &&

	    imx_data->socdata->flags & ESDHC_FLAG_HS400)

		host->mmc->caps2 |= MMC_CAP2_HS400;



	if (imx_data->socdata->flags & ESDHC_FLAG_BROKEN_AUTO_CMD23)

		host->quirks2 |= SDHCI_QUIRK2_ACMD23_BROKEN;



	if (host->caps & MMC_CAP_8_BIT_DATA &&

	if (host->mmc->caps & MMC_CAP_8_BIT_DATA &&

	    imx_data->socdata->flags & ESDHC_FLAG_HS400_ES) {

		host->mmc->caps2 |= MMC_CAP2_HS400_ES;

		host->mmc_host_ops.hs400_enhanced_strobe =

drivers/mmc/host/sdhci-of-arasan.c

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/firmware/xlnx-zynqmp.h>



#include "cqhci.h"

#include "sdhci-cqhci.h"

#include "sdhci-pltfm.h"



#define SDHCI_ARASAN_VENDOR_REGISTER	0x78
@@ -366,7 +367,7 @@ static void sdhci_arasan_reset(struct sdhci_host *host, u8 mask) 
	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);

	struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host);



	sdhci_reset(host, mask);

	sdhci_and_cqhci_reset(host, mask);



	if (sdhci_arasan->quirks & SDHCI_ARASAN_QUIRK_FORCE_CDTEST) {

		ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);

drivers/mmc/host/sdhci-tegra.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include <soc/tegra/common.h>



#include "sdhci-cqhci.h"

#include "sdhci-pltfm.h"

#include "cqhci.h"
@@ -367,7 +368,7 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask) 
	const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;

	u32 misc_ctrl, clk_ctrl, pad_ctrl;



	sdhci_reset(host, mask);

	sdhci_and_cqhci_reset(host, mask);



	if (!(mask & SDHCI_RESET_ALL))

		return;