renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 10:13:57 +08:00
Code

MMC host:

Browse Source 
- meson-gx: Fix error handling in ->probe()
  - mtk-sd: Fix a command problem when using cqe off/disable
  - pxamci: Fix error handling in ->probe()
  - sdhci-of-dwcmshc: Fix broken support for the BlueField-3 variant
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAmL/oAsXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjClZUA/+LcIA3KQPboS5dhSLoh/xqk3r
 NToGetW8Fb9Y21FRL4Q/xs5cp2TSOioWj9V3qnc6ir7uYH3YrVTSZCH8USVnkzQ7
 MRyrpf/Fvlb12Tenqu/IkWRrJHRXaSHF6jPXhjvN7S+cpcRX+DoUo2LJh0bx9BI4
 bi9jeA4Y/h0Kt5BmG5OQ5EMlozDvzvmDcBjYlcW2+L9Oxer9VJ3hXDPpeahuw0NQ
 mZaFGGtmFVTImyPwU1yGfiKJ/2nzJBccsb252OqYXaF44gDduEt422MUhjZvP57n
 pdU3BPKvZ6A3kJy6kAgptjGRN8nNnxLnMLoKN1LdvmQcwzT7ZAe0y5kQESK6UZQa
 rSPenDupIFQUC8y62eqkfHZOAFeixRs/lL4lOpEyiUBtFhlOVUC8sKkLrRzXneqW
 taYRw5lLxb55NcHIT2mxFRqn18PXZg3skt2gUg2/oLlzrJ/O9hIWZ9crNinqZj0v
 69aqBlRC1MJNw56KuI+4JSWVG9ira4fHjkMH2M3IQ8Plg1AX18Pd3IHOBMIaSWLd
 hKYPfq/aiaxTZDEKTDmWUQLtRifVwCj6HePCKcee0sxBGttNNtlYoHehWqbYxU+U
 0AsNViwU8BbVV6TDLKUcNLO2RgIPz+jQYTDNMT95A9U0/TJTF0Vpdorgb9Dj9LXG
 rE/46eulsDxpjtWiQ9s=
 =vAkO
 -----END PGP SIGNATURE-----

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

Pull MMC host fixes from Ulf Hansson:

 - meson-gx: Fix error handling in ->probe()

 - mtk-sd: Fix a command problem when using cqe off/disable

 - pxamci: Fix error handling in ->probe()

 - sdhci-of-dwcmshc: Fix broken support for the BlueField-3 variant

* tag 'mmc-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-of-dwcmshc: Re-enable support for the BlueField-3 SoC
  mmc: meson-gx: Fix an error handling path in meson_mmc_probe()
  mmc: mtk-sd: Clear interrupts when cqe off/disable
  mmc: pxamci: Fix another error handling path in pxamci_probe()
  mmc: pxamci: Fix an error handling path in pxamci_probe()
This commit is contained in:
Linus Torvalds 2022-08-20 09:39:00 -07:00
commit 4d099c3329
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mmc/host/meson-gx-mmc.c
View File

@ -1172,8 +1172,10 @@ static int meson_mmc_probe(struct platform_device *pdev)
}
ret = device_reset_optional(&pdev->dev);
if (ret)
return dev_err_probe(&pdev->dev, ret, "device reset failed\n");
if (ret) {
dev_err_probe(&pdev->dev, ret, "device reset failed\n");
goto free_host;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
host->regs = devm_ioremap_resource(&pdev->dev, res);

6
drivers/mmc/host/mtk-sd.c
View File

@ -2446,6 +2446,9 @@ static void msdc_cqe_disable(struct mmc_host *mmc, bool recovery)
/* disable busy check */
sdr_clr_bits(host->base + MSDC_PATCH_BIT1, MSDC_PB1_BUSY_CHECK_SEL);
val = readl(host->base + MSDC_INT);
writel(val, host->base + MSDC_INT);
if (recovery) {
sdr_set_field(host->base + MSDC_DMA_CTRL,
MSDC_DMA_CTRL_STOP, 1);
@ -2932,11 +2935,14 @@ static int __maybe_unused msdc_suspend(struct device *dev)
struct mmc_host *mmc = dev_get_drvdata(dev);
struct msdc_host *host = mmc_priv(mmc);
int ret;
u32 val;
if (mmc->caps2 & MMC_CAP2_CQE) {
ret = cqhci_suspend(mmc);
if (ret)
return ret;
val = readl(host->base + MSDC_INT);
writel(val, host->base + MSDC_INT);
}
/*

4
drivers/mmc/host/pxamci.c
View File

@ -648,7 +648,7 @@ static int pxamci_probe(struct platform_device *pdev)
ret = pxamci_of_init(pdev, mmc);
if (ret)
return ret;
goto out;
host = mmc_priv(mmc);
host->mmc = mmc;
@ -672,7 +672,7 @@ static int pxamci_probe(struct platform_device *pdev)
ret = pxamci_init_ocr(host);
if (ret < 0)
return ret;
goto out;
mmc->caps = 0;
host->cmdat = 0;

16
drivers/mmc/host/sdhci-of-dwcmshc.c
View File

@ -349,6 +349,15 @@ static const struct sdhci_pltfm_data sdhci_dwcmshc_pdata = {
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
};
#ifdef CONFIG_ACPI
static const struct sdhci_pltfm_data sdhci_dwcmshc_bf3_pdata = {
.ops = &sdhci_dwcmshc_ops,
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN |
SDHCI_QUIRK2_ACMD23_BROKEN,
};
#endif
static const struct sdhci_pltfm_data sdhci_dwcmshc_rk35xx_pdata = {
.ops = &sdhci_dwcmshc_rk35xx_ops,
.quirks = SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN |
@ -431,7 +440,10 @@ MODULE_DEVICE_TABLE(of, sdhci_dwcmshc_dt_ids);
#ifdef CONFIG_ACPI
static const struct acpi_device_id sdhci_dwcmshc_acpi_ids[] = {
{ .id = "MLNXBF30" },
{
.id = "MLNXBF30",
.driver_data = (kernel_ulong_t)&sdhci_dwcmshc_bf3_pdata,
},
{}
};
#endif
@ -447,7 +459,7 @@ static int dwcmshc_probe(struct platform_device *pdev)
int err;
u32 extra;
pltfm_data = of_device_get_match_data(&pdev->dev);
pltfm_data = device_get_match_data(&pdev->dev);
if (!pltfm_data) {
dev_err(&pdev->dev, "Error: No device match data found\n");
return -ENODEV;