* [RFC PATCH 01/21] mmc: sdhci-pltfm: consolidate parsing path
@ 2016-01-27 5:04 Shawn Lin
0 siblings, 0 replies; 2+ messages in thread
From: Shawn Lin @ 2016-01-27 5:04 UTC (permalink / raw)
To: Ulf Hansson
Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-mmc,
linux-kernel, Shawn Lin
This patch wrapper mmc_of_parse into sdhci_get_of_property,
and change the return value for variant drivers to check it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/host/sdhci-pltfm.c | 23 +++++++++++++++++++----
drivers/mmc/host/sdhci-pltfm.h | 2 +-
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 072bb27..8b0fa73 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -66,12 +66,19 @@ static bool sdhci_of_wp_inverted(struct device_node *np)
#endif /* CONFIG_PPC */
}
-void sdhci_get_of_property(struct platform_device *pdev)
+int sdhci_get_of_property(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
u32 bus_width;
+ int ret;
+
+ ret = mmc_of_parse(host->mmc);
+ if (ret) {
+ dev_err(&pdev->dev, "mmc_of_parse failed!\n");
+ return ret;
+ }
if (of_get_property(np, "sdhci,auto-cmd12", NULL))
host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
@@ -107,9 +114,11 @@ void sdhci_get_of_property(struct platform_device *pdev)
if (of_property_read_bool(np, "wakeup-source") ||
of_property_read_bool(np, "enable-sdio-wakeup")) /* legacy */
host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
+
+ return 0;
}
#else
-void sdhci_get_of_property(struct platform_device *pdev) {}
+int sdhci_get_of_property(struct platform_device *pdev) {}
#endif /* CONFIG_OF */
EXPORT_SYMBOL_GPL(sdhci_get_of_property);
@@ -207,12 +216,18 @@ int sdhci_pltfm_register(struct platform_device *pdev,
if (IS_ERR(host))
return PTR_ERR(host);
- sdhci_get_of_property(pdev);
+ ret = sdhci_get_of_property(pdev);
+ if (ret)
+ goto err_register;
ret = sdhci_add_host(host);
if (ret)
- sdhci_pltfm_free(pdev);
+ goto err_register;
+
+ return 0;
+err_register:
+ sdhci_pltfm_free(pdev);
return ret;
}
EXPORT_SYMBOL_GPL(sdhci_pltfm_register);
diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
index 04bc248..2da8065 100644
--- a/drivers/mmc/host/sdhci-pltfm.h
+++ b/drivers/mmc/host/sdhci-pltfm.h
@@ -91,7 +91,7 @@ static inline void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg)
}
#endif /* CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER */
-extern void sdhci_get_of_property(struct platform_device *pdev);
+extern int sdhci_get_of_property(struct platform_device *pdev);
extern struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
const struct sdhci_pltfm_data *pdata,
--
2.3.7
^ permalink raw reply [flat|nested] 2+ messages in thread* [RFC PATCH 0/21] Totally remove SDHCI_QUIRK_BROKEN_CARD_DETECTION quirk
@ 2016-01-27 5:05 Shawn Lin
2016-01-27 5:06 ` [RFC PATCH 01/21] mmc: sdhci-pltfm: consolidate parsing path Shawn Lin
0 siblings, 1 reply; 2+ messages in thread
From: Shawn Lin @ 2016-01-27 5:05 UTC (permalink / raw)
To: Ulf Hansson
Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-mmc,
linux-kernel, Shawn Lin
Ulf wants to make sdhci into a library, but it's a huge task
since any improvemts may touch too much platforms. But at least
we should make some effort to push things torwards to this target.
This patchset remove SDHCI_QUIRK_BROKEN_CARD_DETECTION from sdhci
to gradually reduce quirk of sdhci.
Firstly, SDHCI_QUIRK_BROKEN_CARD_DETECTION aims at claiming the slot is
a "broken-cd" one, but "broken-cd" is not a quirk from my view.
In addition, mmc core stack had already obtain "broken-cd" from dts via
mmc_of_parse and pass MMC_CAP_NEEDS_POLL to mmc->caps. So we can reuse it
instead of SDHCI_QUIRK_BROKEN_CARD_DETECTION.
However, before doing the cleanup work, I find that geting _of_ property
for sdhci* is not so pretty good and consistent. Some variant drives use
mmc_of_parse, while another ones use sdhci_get_of_property. I also find some
variant drivers combine these two paths. So in order to make my "broken-cd"
cleanup running, I decide to add mmc_of_parse into sdhci_get_of_property and
replace mmc_of_parse with sdhci_get_of_property for all variant drivers if
needed.
Unfortunately, I don't have all these platforms touched to test my patchset.
I might make some mistakes for these changes, so any comments are welcomed.
Shawn Lin (21):
mmc: sdhci-pltfm: consolidate parsing path
mmc: sdhci-iproc: consolidate parsing path
mmc: sdhci-msm: consolidate parsing path
mmc: sdhci-of-arasan: consolidate parsing path
mmc: sdhci-of-at91: consolidate parsing path
mmc: sdhci-of-esdhc: consolidate parsing path
mmc: sdhci-pxav3: consolidate parsing path
mmc: sdhci-sirf: check sdhci_get_of_property return value
mmc: sdhci_f_sdh30: check sdhci_get_of_property return value
mmc: sdhci: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-acpi: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-bcm-kona: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-bcm2835: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-esdhc-imx: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-msm: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-of-esdhc: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-pci-core: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-pltfm: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-pxav2: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-s3c: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci.h: remove SDHCI_QUIRK_BROKEN_CARD_DETECTION
drivers/mmc/host/sdhci-acpi.c | 3 +--
drivers/mmc/host/sdhci-bcm-kona.c | 3 ---
drivers/mmc/host/sdhci-bcm2835.c | 5 +++--
drivers/mmc/host/sdhci-esdhc-imx.c | 9 +++++----
drivers/mmc/host/sdhci-iproc.c | 5 +++--
drivers/mmc/host/sdhci-msm.c | 6 ++----
drivers/mmc/host/sdhci-of-arasan.c | 11 ++++-------
drivers/mmc/host/sdhci-of-at91.c | 4 +---
drivers/mmc/host/sdhci-of-esdhc.c | 25 ++++++++++++-------------
drivers/mmc/host/sdhci-pci-core.c | 5 ++++-
drivers/mmc/host/sdhci-pltfm.c | 26 +++++++++++++++++++-------
drivers/mmc/host/sdhci-pltfm.h | 2 +-
drivers/mmc/host/sdhci-pxav2.c | 1 -
drivers/mmc/host/sdhci-pxav3.c | 4 +---
drivers/mmc/host/sdhci-s3c.c | 2 +-
drivers/mmc/host/sdhci-sirf.c | 4 +++-
drivers/mmc/host/sdhci.c | 14 +++++---------
drivers/mmc/host/sdhci.h | 30 ++++++++++++++----------------
drivers/mmc/host/sdhci_f_sdh30.c | 5 ++++-
19 files changed, 83 insertions(+), 81 deletions(-)
--
2.3.7
^ permalink raw reply [flat|nested] 2+ messages in thread
* [RFC PATCH 01/21] mmc: sdhci-pltfm: consolidate parsing path
2016-01-27 5:05 [RFC PATCH 0/21] Totally remove SDHCI_QUIRK_BROKEN_CARD_DETECTION quirk Shawn Lin
@ 2016-01-27 5:06 ` Shawn Lin
0 siblings, 0 replies; 2+ messages in thread
From: Shawn Lin @ 2016-01-27 5:06 UTC (permalink / raw)
To: Ulf Hansson
Cc: bcm-kernel-feedback-list, linux-rpi-kernel, linux-mmc,
linux-kernel, Shawn Lin
This patch wrapper mmc_of_parse into sdhci_get_of_property,
and change the return value for variant drivers to check it.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/mmc/host/sdhci-pltfm.c | 23 +++++++++++++++++++----
drivers/mmc/host/sdhci-pltfm.h | 2 +-
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 072bb27..8b0fa73 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -66,12 +66,19 @@ static bool sdhci_of_wp_inverted(struct device_node *np)
#endif /* CONFIG_PPC */
}
-void sdhci_get_of_property(struct platform_device *pdev)
+int sdhci_get_of_property(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
u32 bus_width;
+ int ret;
+
+ ret = mmc_of_parse(host->mmc);
+ if (ret) {
+ dev_err(&pdev->dev, "mmc_of_parse failed!\n");
+ return ret;
+ }
if (of_get_property(np, "sdhci,auto-cmd12", NULL))
host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
@@ -107,9 +114,11 @@ void sdhci_get_of_property(struct platform_device *pdev)
if (of_property_read_bool(np, "wakeup-source") ||
of_property_read_bool(np, "enable-sdio-wakeup")) /* legacy */
host->mmc->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
+
+ return 0;
}
#else
-void sdhci_get_of_property(struct platform_device *pdev) {}
+int sdhci_get_of_property(struct platform_device *pdev) {}
#endif /* CONFIG_OF */
EXPORT_SYMBOL_GPL(sdhci_get_of_property);
@@ -207,12 +216,18 @@ int sdhci_pltfm_register(struct platform_device *pdev,
if (IS_ERR(host))
return PTR_ERR(host);
- sdhci_get_of_property(pdev);
+ ret = sdhci_get_of_property(pdev);
+ if (ret)
+ goto err_register;
ret = sdhci_add_host(host);
if (ret)
- sdhci_pltfm_free(pdev);
+ goto err_register;
+
+ return 0;
+err_register:
+ sdhci_pltfm_free(pdev);
return ret;
}
EXPORT_SYMBOL_GPL(sdhci_pltfm_register);
diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h
index 04bc248..2da8065 100644
--- a/drivers/mmc/host/sdhci-pltfm.h
+++ b/drivers/mmc/host/sdhci-pltfm.h
@@ -91,7 +91,7 @@ static inline void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg)
}
#endif /* CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER */
-extern void sdhci_get_of_property(struct platform_device *pdev);
+extern int sdhci_get_of_property(struct platform_device *pdev);
extern struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
const struct sdhci_pltfm_data *pdata,
--
2.3.7
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-27 5:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-27 5:04 [RFC PATCH 01/21] mmc: sdhci-pltfm: consolidate parsing path Shawn Lin
2016-01-27 5:05 [RFC PATCH 0/21] Totally remove SDHCI_QUIRK_BROKEN_CARD_DETECTION quirk Shawn Lin
2016-01-27 5:06 ` [RFC PATCH 01/21] mmc: sdhci-pltfm: consolidate parsing path Shawn Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®