[PATCH v2 0/6] ARM: dts: Use correct CD properties for SDIO and eMMC in Snow and Peach

[PATCH v2 0/6] ARM: dts: Use correct CD properties for SDIO and eMMC in Snow and Peach

[Javier Martinez Canillas]

Hello,

The Exynos Chromebooks DTS don't use the correct card detection properties
since these were carried from the vendor tree that had a reason to do so.

There are two things that I noticed:

1) The Marvell WiFi SDIO is marked as broken-cd instead of non-removable:

This causes the device to be removed when the system enters into a suspend
state which leads to the following warning when the system is resumed:

[  181.944636] mmc2: error -2 during resume (card was removed?)

The rationale for using broken-cd is explained in downstream commit [0] and
was that using the non-removable property caused issues with the mwifiex
driver since the reset logic called the mmc_{remove,add}_host() functions.

But the reset logic in the mwifiex mainline driver has changed and this is
no longer the case so it's safe to use the non-removable property AFAICT.

2) The eMMC node has both broken-cd and non-removable but the MMC DT binding
doc (Documentation/devicetree/bindings/mmc/mmc.txt) mentions that only one
of these card detection properties should be used.

So this series change both the SDIO WiFi and eMMC device nodes in the Snow,
Peach Pi and Peach Pit boards DTS to use the non-removable property.

To test, I've cherry picked commit [1] from the vendor tree that adds a
debugfs entry to force a card reset and after the reset, the WiFi card still
works correctly:

$ echo 1 > /sys/kernel/debug/mwifiex/mlan0/reset

And also tested that both eMMC and WiFi are working correctly after a S2R.

The test were made on an Exynos5800 Peach Pi but I don't have access to a
Snow anymore so testing patch 3/6 and 6/6 on that board will be appreciated.

v1 of the series was [2] and this version fixes issues pointed out by Tomeu.

Changes since v1:
 - Replace broken-cd for non-removable in the correct mmc node for Snow.
 - Correct the card detetion properties for eMMC in Snow, Pit and Pi.
 - Also remove the card-detect-delay property when using non-removable.

[0]: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ad348e1e2381
[1]: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/5995363523de
[2]: https://lkml.org/lkml/2015/10/15/294

Best regards,
Javier


Javier Martinez Canillas (6):
  ARM: dts: Mark SDIO as non-removable in exynos5800-peach-pi
  ARM: dts: Mark SDIO as non-removable in exynos5420-peach-pit
  ARM: dts: Mark SDIO as non-removable in exynos5250-snow-common
  ARM: dts: Remove broken-cd from eMMC node in exynos5800-peach-pi
  ARM: dts: Remove broken-cd from eMMC node in exynos5420-peach-pi
  ARM: dts: Mark eMMC as non-removable in exynos5250-snow-common

 arch/arm/boot/dts/exynos5250-snow-common.dtsi | 6 ++----
 arch/arm/boot/dts/exynos5420-peach-pit.dts    | 5 +----
 arch/arm/boot/dts/exynos5800-peach-pi.dts     | 5 +----
 3 files changed, 4 insertions(+), 12 deletions(-)

-- 
2.4.3

[PATCH v2 1/6] ARM: dts: Mark SDIO as non-removable in exynos5800-peach-pi

[Javier Martinez Canillas]

The Exynos5800 Peach Pi Chromebook has a Marvell WiFi SDIO chip which
can't neither be removed nor be detected. But the node isn't marked
as non-removable and instead has the broken-cd DT property.

This causes the device to be removed when the system enters into a
suspend state and the following warnings is shown after a resume:

[  181.944636] mmc2: error -2 during resume (card was removed?)

Also remove the card-detect-delay property that is not needed with
non-removable.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

Changes since v1:
- Remove card-detect-delay property as well.

 arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 49a4f43e5ac2..ca3a467a585d 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -672,10 +672,9 @@
 &mmc_1 {
 	status = "okay";
 	num-slots = <1>;
-	broken-cd;
+	non-removable;
 	cap-sdio-irq;
 	keep-power-in-suspend;
-	card-detect-delay = <200>;
 	clock-frequency = <400000000>;
 	samsung,dw-mshc-ciu-div = <1>;
 	samsung,dw-mshc-sdr-timing = <0 1>;
-- 
2.4.3

[PATCH v2 1/6] ARM: dts: Mark SDIO as non-removable in exynos5800-peach-pi

[Krzysztof Kozlowski]

On 16.10.2015 01:51, Javier Martinez Canillas wrote:
> The Exynos5800 Peach Pi Chromebook has a Marvell WiFi SDIO chip which
> can't neither be removed nor be detected. But the node isn't marked
> as non-removable and instead has the broken-cd DT property.
> 
> This causes the device to be removed when the system enters into a
> suspend state and the following warnings is shown after a resume:
> 
> [  181.944636] mmc2: error -2 during resume (card was removed?)
> 
> Also remove the card-detect-delay property that is not needed with
> non-removable.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> 
> Changes since v1:
> - Remove card-detect-delay property as well.
> 
>  arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

That sounds reasonable:

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

[PATCH v2 2/6] ARM: dts: Mark SDIO as non-removable in exynos5420-peach-pit

[Javier Martinez Canillas]

The Exynos5420 Peach Pit Chromebook has a Marvell WiFi SDIO chip which
can't neither be removed nor be detected. But the node isn't marked
as non-removable and instead has the broken-cd DT property.

This causes the device to be removed when the system enters into a
suspend state and the following warnings is shown after a resume:

[  181.944636] mmc2: error -2 during resume (card was removed?)

Also remove the card-detect-delay property that is not needed with
non-removable.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

Changes since v1:
- Remove card-detect-delay property as well.

 arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 72ba6f032ed7..02e99dbafcfb 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -709,10 +709,9 @@
 &mmc_1 {
 	status = "okay";
 	num-slots = <1>;
-	broken-cd;
+	non-removable;
 	cap-sdio-irq;
 	keep-power-in-suspend;
-	card-detect-delay = <200>;
 	clock-frequency = <400000000>;
 	samsung,dw-mshc-ciu-div = <1>;
 	samsung,dw-mshc-sdr-timing = <0 1>;
-- 
2.4.3

[PATCH v2 2/6] ARM: dts: Mark SDIO as non-removable in exynos5420-peach-pit

[Krzysztof Kozlowski]

On 16.10.2015 01:51, Javier Martinez Canillas wrote:
> The Exynos5420 Peach Pit Chromebook has a Marvell WiFi SDIO chip which
> can't neither be removed nor be detected. But the node isn't marked
> as non-removable and instead has the broken-cd DT property.
> 
> This causes the device to be removed when the system enters into a
> suspend state and the following warnings is shown after a resume:
> 
> [  181.944636] mmc2: error -2 during resume (card was removed?)
> 
> Also remove the card-detect-delay property that is not needed with
> non-removable.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> 
> Changes since v1:
> - Remove card-detect-delay property as well.
> 
>  arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

[RFT PATCH v2 3/6] ARM: dts: Mark SDIO as non-removable in exynos5250-snow-common

[Javier Martinez Canillas]

The Exynos5250 Snow Chromebooks have a Marvell WiFi SDIO chip which
can't neither be removed nor be detected. But the node isn't marked
as non-removable and instead has the broken-cd DT property.

This causes the device to be removed when the system enters into a
suspend state and the following warnings is shown after a resume:

[  181.944636] mmc2: error -2 during resume (card was removed?)

Also remove the card-detect-delay property that is not needed with
non-removable.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

Changes since v1:
- Remove card-detect-delay property as well.
- Use the correct mmc node. Suggested by Tomeu.

 arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 0a7f408824d8..1822c502a25a 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -552,10 +552,9 @@
 &mmc_3 {
 	status = "okay";
 	num-slots = <1>;
-	broken-cd;
+	non-removable;
 	cap-sdio-irq;
 	keep-power-in-suspend;
-	card-detect-delay = <200>;
 	samsung,dw-mshc-ciu-div = <3>;
 	samsung,dw-mshc-sdr-timing = <2 3>;
 	samsung,dw-mshc-ddr-timing = <1 2>;
-- 
2.4.3

[RFT PATCH v2 3/6] ARM: dts: Mark SDIO as non-removable in exynos5250-snow-common

[Tomeu Vizoso]

On 15 October 2015 at 18:51, Javier Martinez Canillas
<javier@osg.samsung.com> wrote:
> The Exynos5250 Snow Chromebooks have a Marvell WiFi SDIO chip which
> can't neither be removed nor be detected. But the node isn't marked
> as non-removable and instead has the broken-cd DT property.
>
> This causes the device to be removed when the system enters into a
> suspend state and the following warnings is shown after a resume:
>
> [  181.944636] mmc2: error -2 during resume (card was removed?)
>
> Also remove the card-detect-delay property that is not needed with
> non-removable.
>
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Tested-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>

Thanks,

Tomeu


>
> Changes since v1:
> - Remove card-detect-delay property as well.
> - Use the correct mmc node. Suggested by Tomeu.
>
>  arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
> index 0a7f408824d8..1822c502a25a 100644
> --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
> +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
> @@ -552,10 +552,9 @@
>  &mmc_3 {
>         status = "okay";
>         num-slots = <1>;
> -       broken-cd;
> +       non-removable;
>         cap-sdio-irq;
>         keep-power-in-suspend;
> -       card-detect-delay = <200>;
>         samsung,dw-mshc-ciu-div = <3>;
>         samsung,dw-mshc-sdr-timing = <2 3>;
>         samsung,dw-mshc-ddr-timing = <1 2>;
> --
> 2.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

[RFT PATCH v2 3/6] ARM: dts: Mark SDIO as non-removable in exynos5250-snow-common

[Krzysztof Kozlowski]

On 16.10.2015 01:51, Javier Martinez Canillas wrote:
> The Exynos5250 Snow Chromebooks have a Marvell WiFi SDIO chip which
> can't neither be removed nor be detected. But the node isn't marked
> as non-removable and instead has the broken-cd DT property.
> 
> This causes the device to be removed when the system enters into a
> suspend state and the following warnings is shown after a resume:
> 
> [  181.944636] mmc2: error -2 during resume (card was removed?)
> 
> Also remove the card-detect-delay property that is not needed with
> non-removable.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> 
> Changes since v1:
> - Remove card-detect-delay property as well.
> - Use the correct mmc node. Suggested by Tomeu.
> 
>  arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

[PATCH v2 4/6] ARM: dts: Remove broken-cd from eMMC node in exynos5800-peach-pi

[Javier Martinez Canillas]

The eMMC is non-removable so is marked with the non-removable DT
property to avoid having to redetect it after a suspend/resume.

But it also has the broken-cd property which is wrong since only
one of the DT properties for card detection should be used.

Also remove the card-detect-delay property that is not needed with
non-removable.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

Changes since v1:
- None, new patch.

 arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index ca3a467a585d..7b018e451880 100644
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -652,12 +652,10 @@
 &mmc_0 {
 	status = "okay";
 	num-slots = <1>;
-	broken-cd;
 	mmc-hs200-1_8v;
 	mmc-hs400-1_8v;
 	cap-mmc-highspeed;
 	non-removable;
-	card-detect-delay = <200>;
 	clock-frequency = <800000000>;
 	samsung,dw-mshc-ciu-div = <3>;
 	samsung,dw-mshc-sdr-timing = <0 4>;
-- 
2.4.3

[PATCH v2 4/6] ARM: dts: Remove broken-cd from eMMC node in exynos5800-peach-pi

[Krzysztof Kozlowski]

On 16.10.2015 01:51, Javier Martinez Canillas wrote:
> The eMMC is non-removable so is marked with the non-removable DT
> property to avoid having to redetect it after a suspend/resume.
> 
> But it also has the broken-cd property which is wrong since only
> one of the DT properties for card detection should be used.
> 
> Also remove the card-detect-delay property that is not needed with
> non-removable.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> 
> Changes since v1:
> - None, new patch.
> 
>  arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 --
>  1 file changed, 2 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

[PATCH v2 5/6] ARM: dts: Remove broken-cd from eMMC node in exynos5420-peach-pi

[Javier Martinez Canillas]

The eMMC is non-removable so is marked with the non-removable DT
property to avoid having to redetect it after a suspend/resume.

But it also has the broken-cd property which is wrong since only
one of the DT properties for card detection should be used.

Also remove the card-detect-delay property that is not needed with
non-removable.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

Changes since v1:
- None, new patch.

 arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index 02e99dbafcfb..35cfb07dc4bb 100644
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -690,11 +690,9 @@
 &mmc_0 {
 	status = "okay";
 	num-slots = <1>;
-	broken-cd;
 	mmc-hs200-1_8v;
 	cap-mmc-highspeed;
 	non-removable;
-	card-detect-delay = <200>;
 	clock-frequency = <400000000>;
 	samsung,dw-mshc-ciu-div = <3>;
 	samsung,dw-mshc-sdr-timing = <0 4>;
-- 
2.4.3

[PATCH v2 5/6] ARM: dts: Remove broken-cd from eMMC node in exynos5420-peach-pi

[Krzysztof Kozlowski]

On 16.10.2015 01:51, Javier Martinez Canillas wrote:
> The eMMC is non-removable so is marked with the non-removable DT
> property to avoid having to redetect it after a suspend/resume.
> 
> But it also has the broken-cd property which is wrong since only
> one of the DT properties for card detection should be used.
> 
> Also remove the card-detect-delay property that is not needed with
> non-removable.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> 
> Changes since v1:
> - None, new patch.
> 
>  arch/arm/boot/dts/exynos5420-peach-pit.dts | 2 --
>  1 file changed, 2 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

[RFT PATCH v2 6/6] ARM: dts: Mark eMMC as non-removable in exynos5250-snow-common

[Javier Martinez Canillas]

The eMMC is non-removable so mark it using the non-removable DT
property to avoid having to redetect it after a suspend/resume.

Also remove the card-detect-delay property that is not needed with
non-removable.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

Changes since v1:
- None, new patch.

 arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 1822c502a25a..5cb33ba5e296 100644
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -520,8 +520,7 @@
 &mmc_0 {
 	status = "okay";
 	num-slots = <1>;
-	broken-cd;
-	card-detect-delay = <200>;
+	non-removable;
 	samsung,dw-mshc-ciu-div = <3>;
 	samsung,dw-mshc-sdr-timing = <2 3>;
 	samsung,dw-mshc-ddr-timing = <1 2>;
-- 
2.4.3

[RFT PATCH v2 6/6] ARM: dts: Mark eMMC as non-removable in exynos5250-snow-common

[Tomeu Vizoso]

On 15 October 2015 at 18:51, Javier Martinez Canillas
<javier@osg.samsung.com> wrote:
> The eMMC is non-removable so mark it using the non-removable DT
> property to avoid having to redetect it after a suspend/resume.
>
> Also remove the card-detect-delay property that is not needed with
> non-removable.
>
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Tested-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>

Thanks,

Tomeu

> ---
>
> Changes since v1:
> - None, new patch.
>
>  arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
> index 1822c502a25a..5cb33ba5e296 100644
> --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
> +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
> @@ -520,8 +520,7 @@
>  &mmc_0 {
>         status = "okay";
>         num-slots = <1>;
> -       broken-cd;
> -       card-detect-delay = <200>;
> +       non-removable;
>         samsung,dw-mshc-ciu-div = <3>;
>         samsung,dw-mshc-sdr-timing = <2 3>;
>         samsung,dw-mshc-ddr-timing = <1 2>;
> --
> 2.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

[RFT PATCH v2 6/6] ARM: dts: Mark eMMC as non-removable in exynos5250-snow-common

[Krzysztof Kozlowski]

On 16.10.2015 01:51, Javier Martinez Canillas wrote:
> The eMMC is non-removable so mark it using the non-removable DT
> property to avoid having to redetect it after a suspend/resume.
> 
> Also remove the card-detect-delay property that is not needed with
> non-removable.
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 
> ---
> 
> Changes since v1:
> - None, new patch.
> 
>  arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 

Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

Best regards,
Krzysztof

[PATCH v2 0/6] ARM: dts: Use correct CD properties for SDIO and eMMC in Snow and Peach

[Alim Akhtar]

Hi Javier,

On 10/15/2015 10:21 PM, Javier Martinez Canillas wrote:
> Hello,
>
> The Exynos Chromebooks DTS don't use the correct card detection properties
> since these were carried from the vendor tree that had a reason to do so.
>
> There are two things that I noticed:
>
> 1) The Marvell WiFi SDIO is marked as broken-cd instead of non-removable:
>
> This causes the device to be removed when the system enters into a suspend
> state which leads to the following warning when the system is resumed:
>
> [  181.944636] mmc2: error -2 during resume (card was removed?)
>
> The rationale for using broken-cd is explained in downstream commit [0] and
> was that using the non-removable property caused issues with the mwifiex
> driver since the reset logic called the mmc_{remove,add}_host() functions.
>
> But the reset logic in the mwifiex mainline driver has changed and this is
> no longer the case so it's safe to use the non-removable property AFAICT.
>
Good to know it is fixed now. This is fixed in firmware or in the driver?

> 2) The eMMC node has both broken-cd and non-removable but the MMC DT binding
> doc (Documentation/devicetree/bindings/mmc/mmc.txt) mentions that only one
> of these card detection properties should be used.
>
This change looks ok, will take a closer look once I am back to my work 
station.

> So this series change both the SDIO WiFi and eMMC device nodes in the Snow,
> Peach Pi and Peach Pit boards DTS to use the non-removable property.
>
> To test, I've cherry picked commit [1] from the vendor tree that adds a
> debugfs entry to force a card reset and after the reset, the WiFi card still
> works correctly:
>
> $ echo 1 > /sys/kernel/debug/mwifiex/mlan0/reset
>
> And also tested that both eMMC and WiFi are working correctly after a S2R.
>
> The test were made on an Exynos5800 Peach Pi but I don't have access to a
> Snow anymore so testing patch 3/6 and 6/6 on that board will be appreciated.
>
> v1 of the series was [2] and this version fixes issues pointed out by Tomeu.
>
> Changes since v1:
>   - Replace broken-cd for non-removable in the correct mmc node for Snow.
>   - Correct the card detetion properties for eMMC in Snow, Pit and Pi.
>   - Also remove the card-detect-delay property when using non-removable.
>
> [0]: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ad348e1e2381
> [1]: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/5995363523de
> [2]: https://lkml.org/lkml/2015/10/15/294
>
> Best regards,
> Javier
>
>
> Javier Martinez Canillas (6):
>    ARM: dts: Mark SDIO as non-removable in exynos5800-peach-pi
>    ARM: dts: Mark SDIO as non-removable in exynos5420-peach-pit
>    ARM: dts: Mark SDIO as non-removable in exynos5250-snow-common
>    ARM: dts: Remove broken-cd from eMMC node in exynos5800-peach-pi
>    ARM: dts: Remove broken-cd from eMMC node in exynos5420-peach-pi
>    ARM: dts: Mark eMMC as non-removable in exynos5250-snow-common
>
>   arch/arm/boot/dts/exynos5250-snow-common.dtsi | 6 ++----
>   arch/arm/boot/dts/exynos5420-peach-pit.dts    | 5 +----
>   arch/arm/boot/dts/exynos5800-peach-pi.dts     | 5 +----
>   3 files changed, 4 insertions(+), 12 deletions(-)
>

[PATCH v2 0/6] ARM: dts: Use correct CD properties for SDIO and eMMC in Snow and Peach

[Javier Martinez Canillas]

Hello Alim,

On 10/16/2015 01:37 PM, Alim Akhtar wrote:
> Hi Javier,
> 
> On 10/15/2015 10:21 PM, Javier Martinez Canillas wrote:
>> Hello,
>>
>> The Exynos Chromebooks DTS don't use the correct card detection properties
>> since these were carried from the vendor tree that had a reason to do so.
>>
>> There are two things that I noticed:
>>
>> 1) The Marvell WiFi SDIO is marked as broken-cd instead of non-removable:
>>
>> This causes the device to be removed when the system enters into a suspend
>> state which leads to the following warning when the system is resumed:
>>
>> [  181.944636] mmc2: error -2 during resume (card was removed?)
>>
>> The rationale for using broken-cd is explained in downstream commit [0] and
>> was that using the non-removable property caused issues with the mwifiex
>> driver since the reset logic called the mmc_{remove,add}_host() functions.
>>
>> But the reset logic in the mwifiex mainline driver has changed and this is
>> no longer the case so it's safe to use the non-removable property AFAICT.
>>
> Good to know it is fixed now. This is fixed in firmware or in the driver?
>

The fix is only in the driver. In fact, I'm using the same firmware from
the ChromeOS rootfs for both the v3.8 vendor tree and mainline.

So IIUC, the problem with the vendor tree was that the mwifiex SDIO driver
mwifiex_sdio_reset_work() function did a card reset by calling the functions
mmc_remove_host() and then mmc_add_host().

But this didn't play nice with MMC_CAP_NONREMOVABLE since mmc_rescan() just
returns if the flag is set so the card wouldn't be tried to be detected again.

After commit ("b4336a282db8 mwifiex: sdio: reset adapter using mmc_hw_reset"),
the card is reset by doing a power cycle so that's why "non-removable" can be
used now instead of "broken-cd".

>> 2) The eMMC node has both broken-cd and non-removable but the MMC DT binding
>> doc (Documentation/devicetree/bindings/mmc/mmc.txt) mentions that only one
>> of these card detection properties should be used.
>>
> This change looks ok, will take a closer look once I am back to my work station.
>

Thanks a lot for taking a look.

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

[PATCH v2 0/6] ARM: dts: Use correct CD properties for SDIO and eMMC in Snow and Peach

[Kukjin Kim]

On 10/16/15 22:48, Javier Martinez Canillas wrote:
> Hello Alim,
> 
> On 10/16/2015 01:37 PM, Alim Akhtar wrote:
>> Hi Javier,
>>
>> On 10/15/2015 10:21 PM, Javier Martinez Canillas wrote:
>>> Hello,
>>>
>>> The Exynos Chromebooks DTS don't use the correct card detection properties
>>> since these were carried from the vendor tree that had a reason to do so.
>>>
>>> There are two things that I noticed:
>>>
>>> 1) The Marvell WiFi SDIO is marked as broken-cd instead of non-removable:
>>>
>>> This causes the device to be removed when the system enters into a suspend
>>> state which leads to the following warning when the system is resumed:
>>>
>>> [  181.944636] mmc2: error -2 during resume (card was removed?)
>>>
>>> The rationale for using broken-cd is explained in downstream commit [0] and
>>> was that using the non-removable property caused issues with the mwifiex
>>> driver since the reset logic called the mmc_{remove,add}_host() functions.
>>>
>>> But the reset logic in the mwifiex mainline driver has changed and this is
>>> no longer the case so it's safe to use the non-removable property AFAICT.
>>>
>> Good to know it is fixed now. This is fixed in firmware or in the driver?
>>
> 
> The fix is only in the driver. In fact, I'm using the same firmware from
> the ChromeOS rootfs for both the v3.8 vendor tree and mainline.
> 
> So IIUC, the problem with the vendor tree was that the mwifiex SDIO driver
> mwifiex_sdio_reset_work() function did a card reset by calling the functions
> mmc_remove_host() and then mmc_add_host().
> 
> But this didn't play nice with MMC_CAP_NONREMOVABLE since mmc_rescan() just
> returns if the flag is set so the card wouldn't be tried to be detected again.
> 
> After commit ("b4336a282db8 mwifiex: sdio: reset adapter using mmc_hw_reset"),
> the card is reset by doing a power cycle so that's why "non-removable" can be
> used now instead of "broken-cd".
> 
>>> 2) The eMMC node has both broken-cd and non-removable but the MMC DT binding
>>> doc (Documentation/devicetree/bindings/mmc/mmc.txt) mentions that only one
>>> of these card detection properties should be used.
>>>
>> This change looks ok, will take a closer look once I am back to my work station.
>>
Actually, looks good to me +1.
Let me take this series once get the feedback from Alim.

Thanks,
Kukjin

[PATCH v2 0/6] ARM: dts: Use correct CD properties for SDIO and eMMC in Snow and Peach

[Alim Akhtar]

Hi Javier,

On 10/15/2015 10:21 PM, Javier Martinez Canillas wrote:
> Hello,
>
> The Exynos Chromebooks DTS don't use the correct card detection properties
> since these were carried from the vendor tree that had a reason to do so.
>
> There are two things that I noticed:
>
> 1) The Marvell WiFi SDIO is marked as broken-cd instead of non-removable:
>
> This causes the device to be removed when the system enters into a suspend
> state which leads to the following warning when the system is resumed:
>
> [  181.944636] mmc2: error -2 during resume (card was removed?)
>
> The rationale for using broken-cd is explained in downstream commit [0] and
> was that using the non-removable property caused issues with the mwifiex
> driver since the reset logic called the mmc_{remove,add}_host() functions.
>
> But the reset logic in the mwifiex mainline driver has changed and this is
> no longer the case so it's safe to use the non-removable property AFAICT.
>
> 2) The eMMC node has both broken-cd and non-removable but the MMC DT binding
> doc (Documentation/devicetree/bindings/mmc/mmc.txt) mentions that only one
> of these card detection properties should be used.
>
> So this series change both the SDIO WiFi and eMMC device nodes in the Snow,
> Peach Pi and Peach Pit boards DTS to use the non-removable property.
>
> To test, I've cherry picked commit [1] from the vendor tree that adds a
> debugfs entry to force a card reset and after the reset, the WiFi card still
> works correctly:
>
> $ echo 1 > /sys/kernel/debug/mwifiex/mlan0/reset
>
> And also tested that both eMMC and WiFi are working correctly after a S2R.
>
> The test were made on an Exynos5800 Peach Pi but I don't have access to a
> Snow anymore so testing patch 3/6 and 6/6 on that board will be appreciated.
>
> v1 of the series was [2] and this version fixes issues pointed out by Tomeu.
>
> Changes since v1:
>   - Replace broken-cd for non-removable in the correct mmc node for Snow.
>   - Correct the card detetion properties for eMMC in Snow, Pit and Pi.
>   - Also remove the card-detect-delay property when using non-removable.
>
> [0]: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ad348e1e2381
> [1]: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/5995363523de
> [2]: https://lkml.org/lkml/2015/10/15/294
>
> Best regards,
> Javier
>
>
> Javier Martinez Canillas (6):
>    ARM: dts: Mark SDIO as non-removable in exynos5800-peach-pi
>    ARM: dts: Mark SDIO as non-removable in exynos5420-peach-pit
>    ARM: dts: Mark SDIO as non-removable in exynos5250-snow-common
>    ARM: dts: Remove broken-cd from eMMC node in exynos5800-peach-pi
>    ARM: dts: Remove broken-cd from eMMC node in exynos5420-peach-pi
>    ARM: dts: Mark eMMC as non-removable in exynos5250-snow-common
>
This series looks good to me, so feel free to add
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
and for patch 4 and 5: Tested-by: Alim Akhtar <alim.akhtar@samsung.com>
Thanks.

>   arch/arm/boot/dts/exynos5250-snow-common.dtsi | 6 ++----
>   arch/arm/boot/dts/exynos5420-peach-pit.dts    | 5 +----
>   arch/arm/boot/dts/exynos5800-peach-pi.dts     | 5 +----
>   3 files changed, 4 insertions(+), 12 deletions(-)
>

[PATCH v2 0/6] ARM: dts: Use correct CD properties for SDIO and eMMC in Snow and Peach

[Javier Martinez Canillas]

Hello Kukjin,

On 10/19/2015 12:04 AM, Alim Akhtar wrote:
> Hi Javier,
> 
> On 10/15/2015 10:21 PM, Javier Martinez Canillas wrote:
>> Hello,
>>
>> The Exynos Chromebooks DTS don't use the correct card detection properties
>> since these were carried from the vendor tree that had a reason to do so.
>>
>> There are two things that I noticed:
>>
>> 1) The Marvell WiFi SDIO is marked as broken-cd instead of non-removable:
>>
>> This causes the device to be removed when the system enters into a suspend
>> state which leads to the following warning when the system is resumed:
>>
>> [  181.944636] mmc2: error -2 during resume (card was removed?)
>>
>> The rationale for using broken-cd is explained in downstream commit [0] and
>> was that using the non-removable property caused issues with the mwifiex
>> driver since the reset logic called the mmc_{remove,add}_host() functions.
>>
>> But the reset logic in the mwifiex mainline driver has changed and this is
>> no longer the case so it's safe to use the non-removable property AFAICT.
>>
>> 2) The eMMC node has both broken-cd and non-removable but the MMC DT binding
>> doc (Documentation/devicetree/bindings/mmc/mmc.txt) mentions that only one
>> of these card detection properties should be used.
>>
>> So this series change both the SDIO WiFi and eMMC device nodes in the Snow,
>> Peach Pi and Peach Pit boards DTS to use the non-removable property.
>>
>> To test, I've cherry picked commit [1] from the vendor tree that adds a
>> debugfs entry to force a card reset and after the reset, the WiFi card still
>> works correctly:
>>
>> $ echo 1 > /sys/kernel/debug/mwifiex/mlan0/reset
>>
>> And also tested that both eMMC and WiFi are working correctly after a S2R.
>>
>> The test were made on an Exynos5800 Peach Pi but I don't have access to a
>> Snow anymore so testing patch 3/6 and 6/6 on that board will be appreciated.
>>
>> v1 of the series was [2] and this version fixes issues pointed out by Tomeu.
>>
>> Changes since v1:
>>   - Replace broken-cd for non-removable in the correct mmc node for Snow.
>>   - Correct the card detetion properties for eMMC in Snow, Pit and Pi.
>>   - Also remove the card-detect-delay property when using non-removable.
>>
>> [0]: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/ad348e1e2381
>> [1]: https://chromium.googlesource.com/chromiumos/third_party/kernel/+/5995363523de
>> [2]: https://lkml.org/lkml/2015/10/15/294
>>
>> Best regards,
>> Javier
>>
>>
>> Javier Martinez Canillas (6):
>>    ARM: dts: Mark SDIO as non-removable in exynos5800-peach-pi
>>    ARM: dts: Mark SDIO as non-removable in exynos5420-peach-pit
>>    ARM: dts: Mark SDIO as non-removable in exynos5250-snow-common
>>    ARM: dts: Remove broken-cd from eMMC node in exynos5800-peach-pi
>>    ARM: dts: Remove broken-cd from eMMC node in exynos5420-peach-pi
>>    ARM: dts: Mark eMMC as non-removable in exynos5250-snow-common
>>
> This series looks good to me, so feel free to add
> Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> and for patch 4 and 5: Tested-by: Alim Akhtar <alim.akhtar@samsung.com>
> Thanks.
>

You said that you are going to take this series once Alim tested / gave
his feedback but that happened weeks ago and I still don't see these in
your tree.

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America