Message ID | 20220330185454.10887-1-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive) |
---|---|
Headers | show |
Series | Add SD/eMMC support for Renesas RZ/G2L SoC | expand |
Hi! > This patch series adds support for SD/eMMC on Renesas RZ/G2L SoC and > enables this interfaces on Renesas RZ/G2L SMARC EVK. > > All the patches have been cherry picked from v5.17 release. Thanks for the series. Review did not find anything that would prevent merge, so I'll proceed with testing. If it tests okay and there are no other comments, I'll likely apply the patches. Best regards, Pavel
Hi! > This patch series adds support for SD/eMMC on Renesas RZ/G2L SoC and > enables this interfaces on Renesas RZ/G2L SMARC EVK. > > All the patches have been cherry picked from v5.17 release. I tried to apply the patches on top of 5.10.106-cip4, and could not. Can you double check series applies properly? 8bb6e30b765989a3c0924158316d689e16317cd1 CIP: Bump version suffix to -cip4 after merge from stable commit 66f600a7a5460b6acab5272ac9f54f842927a50d Merge tag 'v5.10.106' into linux-5.10.y-cip Best regards, Pavel
Hi! > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > commit 183edc060e6969a3afe83f663b534f6324fb7e3a upstream. > > We want to clear TAPEN in a software reset, too, to have a completely > known state. Especially when we doing the initial reset during boot to > clear previous firmware states. > > +++ b/drivers/mmc/host/renesas_sdhi_core.c > @@ -558,7 +558,7 @@ static void renesas_sdhi_reset(struct tmio_mmc_host *host) > struct renesas_sdhi *priv = host_to_priv(host); > > if (priv->scc_ctl) { > - renesas_sdhi_reset_scc(host, priv); > + renesas_sdhi_disable_scc(host->mmc); > renesas_sdhi_reset_hs400_mode(host, priv); > priv->needs_adjust_hs400 = false; Having half of functions receive host, priv pointers and the other half receiving host->mmc pointer is not very nice. Is there some logic behind that / is it possible to somehow fix? Best regards, Pavel
Hi! > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > commit ab07a1356043f07142ba351253904ef8c42ecd4f upstream. > > Better prevent double includes. > +++ b/drivers/mmc/host/renesas_sdhi_core.c > @@ -18,22 +18,22 @@ > * > */ > > -#include <linux/kernel.h> > #include <linux/clk.h> > -#include <linux/slab.h> > -#include <linux/module.h> > -#include <linux/of_device.h> > -#include <linux/platform_device.h> > -#include <linux/pm_domain.h> > +#include <linux/delay.h> > +#include <linux/kernel.h> > +#include <linux/mfd/tmio.h> > #include <linux/mmc/host.h> > #include <linux/mmc/mmc.h> > #include <linux/mmc/slot-gpio.h> > -#include <linux/mfd/tmio.h> > -#include <linux/sh_dma.h> > -#include <linux/delay.h> > +#include <linux/module.h> > +#include <linux/of_device.h> > #include <linux/pinctrl/consumer.h> > #include <linux/pinctrl/pinctrl-state.h> > +#include <linux/platform_device.h> > +#include <linux/pm_domain.h> > #include <linux/regulator/consumer.h> > +#include <linux/sh_dma.h> > +#include <linux/slab.h> > #include <linux/sys_soc.h> > > #include "renesas_sdhi.h" In these cases we usually sort be include length, first ("reverse xmass tree"). Best regards, Pavel
Hi! > This condition is partially checked with the meta-schema already, but > only if both 'minItems' and 'maxItems' are equal to the 'items' length. > An improved meta-schema is pending. Do we have the improved meta-scheme in 5.10.X? Are we actually running the dts schema checks? I guess it is not a big deal either way. Best regards, Pavel > +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > @@ -74,7 +74,6 @@ properties: > > clock-names: > minItems: 1 > - maxItems: 2 > items: > - const: core > - const: cd > @@ -106,7 +105,6 @@ properties: > > pinctrl-names: > minItems: 1 > - maxItems: 2 > items: > - const: default > - const: state_uhs
Hi Pavel, > -----Original Message----- > From: Pavel Machek <pavel@denx.de> > Sent: 31 March 2022 10:28 > To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> > Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu > <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>; Biju Das > <biju.das.jz@bp.renesas.com> > Subject: Re: [PATCH 5.10.y-cip 00/39] Add SD/eMMC support for Renesas > RZ/G2L SoC > > Hi! > > > This patch series adds support for SD/eMMC on Renesas RZ/G2L SoC and > > enables this interfaces on Renesas RZ/G2L SMARC EVK. > > > > All the patches have been cherry picked from v5.17 release. > > I tried to apply the patches on top of 5.10.106-cip4, and could not. Can > you double check series applies properly? > I did cross check my base branch and it is 5.10.106-cip4. For some weird reason patches 01 to 09 are missing in patchwork. (I can see the patches are in my inbox though and pretty sure you too have it as have received feedback on patch 04 and 09). Do you want me to resend the series hoping patches appear on patchwork? Cheers, Prabhakar > 8bb6e30b765989a3c0924158316d689e16317cd1 > CIP: Bump version suffix to -cip4 after merge from stable commit > 66f600a7a5460b6acab5272ac9f54f842927a50d > Merge tag 'v5.10.106' into linux-5.10.y-cip > > Best regards, > Pavel > > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Hi! > > > This patch series adds support for SD/eMMC on Renesas RZ/G2L SoC and > > > enables this interfaces on Renesas RZ/G2L SMARC EVK. > > > > > > All the patches have been cherry picked from v5.17 release. > > > > I tried to apply the patches on top of 5.10.106-cip4, and could not. Can > > you double check series applies properly? > > > I did cross check my base branch and it is 5.10.106-cip4. For some weird reason patches 01 to 09 are missing in patchwork. (I can see the patches are in my inbox though and pretty sure you too have it as have received feedback on patch 04 and 09). > > Do you want me to resend the series hoping patches appear on > patchwork? I took patches from emails list, not from patchwork, so that should not be it. Let me try again: git log commit 8bb6e30b765989a3c0924158316d689e16317cd1 (HEAD -> linux-5.10.y-cip, tag: v5.10.106-cip4, origin/l\ inux-5.10.y-cip) Author: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Date: Tue Mar 29 08:32:48 2022 +0900 CIP: Bump version suffix to -cip4 after merge from stable pavel@duo:~/cip/10$ ./git-am /tmp/delme.zz pavel@duo:~/cip/10$ ./git-am /tmp/delme.zt Applying: mmc: renesas_sdhi: probe into TMIO after SCC parameters have been setup Applying: mmc: renesas_sdhi: populate SCC pointer at the proper place Applying: mmc: renesas_sdhi: simplify reset routine a little error: patch failed: drivers/mmc/host/renesas_sdhi_core.c:569 error: drivers/mmc/host/renesas_sdhi_core.c: patch does not apply Patch failed at 0003 mmc: renesas_sdhi: simplify reset routine a little hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". pavel@duo:~/cip/10$ git am --skip Applying: mmc: renesas_sdhi: clear TAPEN when resetting, too error: patch failed: drivers/mmc/host/renesas_sdhi_core.c:558 error: drivers/mmc/host/renesas_sdhi_core.c: patch does not apply Patch failed at 0004 mmc: renesas_sdhi: clear TAPEN when resetting, too hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". pavel@duo:~/cip/10$ pavel@duo:~/cip/10$ git am --skip Applying: mmc: renesas_sdhi: merge the SCC reset functions Applying: mmc: renesas_sdhi: remove superfluous SCLKEN error: patch failed: drivers/mmc/host/renesas_sdhi_core.c:556 error: drivers/mmc/host/renesas_sdhi_core.c: patch does not apply Patch failed at 0006 mmc: renesas_sdhi: remove superfluous SCLKEN hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". pavel@duo:~/cip/10$ Best regards, Pavel
Hi all, > -----Original Message----- > From: Pavel Machek <pavel@denx.de> > Sent: Thursday, March 31, 2022 9:49 PM > To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> > Cc: Pavel Machek <pavel@denx.de>; cip-dev@lists.cip-project.org; iwamatsu > nobuhiro(岩松 信洋 □SWC◯ACT) > <nobuhiro1.iwamatsu@toshiba.co.jp>; Biju Das > <biju.das.jz@bp.renesas.com> > Subject: Re: [PATCH 5.10.y-cip 00/39] Add SD/eMMC support for Renesas > RZ/G2L SoC > > Hi! > > > > > This patch series adds support for SD/eMMC on Renesas RZ/G2L SoC > > > > and enables this interfaces on Renesas RZ/G2L SMARC EVK. > > > > > > > > All the patches have been cherry picked from v5.17 release. > > > > > > I tried to apply the patches on top of 5.10.106-cip4, and could not. > > > Can you double check series applies properly? > > > > > I did cross check my base branch and it is 5.10.106-cip4. For some weird > reason patches 01 to 09 are missing in patchwork. (I can see the patches are in > my inbox though and pretty sure you too have it as have received feedback on > patch 04 and 09). > > > > Do you want me to resend the series hoping patches appear on > > patchwork? > > I took patches from emails list, not from patchwork, so that should not be it. > > Let me try again: > > git log > commit 8bb6e30b765989a3c0924158316d689e16317cd1 (HEAD -> > linux-5.10.y-cip, tag: v5.10.106-cip4, origin/l\ > inux-5.10.y-cip) > Author: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> > Date: Tue Mar 29 08:32:48 2022 +0900 > > CIP: Bump version suffix to -cip4 after merge from stable > pavel@duo:~/cip/10$ ./git-am /tmp/delme.zz > > pavel@duo:~/cip/10$ ./git-am /tmp/delme.zt > Applying: mmc: renesas_sdhi: probe into TMIO after SCC parameters have > been setup > Applying: mmc: renesas_sdhi: populate SCC pointer at the proper place > Applying: mmc: renesas_sdhi: simplify reset routine a little > error: patch failed: drivers/mmc/host/renesas_sdhi_core.c:569 > error: drivers/mmc/host/renesas_sdhi_core.c: patch does not apply Patch > failed at 0003 mmc: renesas_sdhi: simplify reset routine a little > hint: Use 'git am --show-current-patch' to see the failed patch When you have > resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > pavel@duo:~/cip/10$ git am --skip > Applying: mmc: renesas_sdhi: clear TAPEN when resetting, too > error: patch failed: drivers/mmc/host/renesas_sdhi_core.c:558 > error: drivers/mmc/host/renesas_sdhi_core.c: patch does not apply Patch > failed at 0004 mmc: renesas_sdhi: clear TAPEN when resetting, too > hint: Use 'git am --show-current-patch' to see the failed patch When you have > resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > pavel@duo:~/cip/10$ > pavel@duo:~/cip/10$ git am --skip > Applying: mmc: renesas_sdhi: merge the SCC reset functions > Applying: mmc: renesas_sdhi: remove superfluous SCLKEN > error: patch failed: drivers/mmc/host/renesas_sdhi_core.c:556 > error: drivers/mmc/host/renesas_sdhi_core.c: patch does not apply Patch > failed at 0006 mmc: renesas_sdhi: remove superfluous SCLKEN > hint: Use 'git am --show-current-patch' to see the failed patch When you have > resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > pavel@duo:~/cip/10$ I have the same issue. It seems that patchwork has not been able to catch all the patches. https://patchwork.kernel.org/project/cip-dev/list/?series=627598 And CIP-dev ML is in the same situation. https://lore.kernel.org/cip-dev/20220331124910.GA16062@duo.ucw.cz/T/#m5be9be981a6acb372766fc280b7fb27eb5a27527 1 to 10, 18, 23, 26, 27, 32 do not exist. Best regards, Nobuhiro
Hi Pavel, Thank you for the review. > -----Original Message----- > From: Pavel Machek <pavel@denx.de> > Sent: 31 March 2022 11:14 > To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> > Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu > <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>; Biju Das > <biju.das.jz@bp.renesas.com> > Subject: Re: [PATCH 5.10.y-cip 04/39] mmc: renesas_sdhi: clear TAPEN when > resetting, too > > Hi! > > > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > > > commit 183edc060e6969a3afe83f663b534f6324fb7e3a upstream. > > > > We want to clear TAPEN in a software reset, too, to have a completely > > known state. Especially when we doing the initial reset during boot to > > clear previous firmware states. > > > > > +++ b/drivers/mmc/host/renesas_sdhi_core.c > > @@ -558,7 +558,7 @@ static void renesas_sdhi_reset(struct tmio_mmc_host > *host) > > struct renesas_sdhi *priv = host_to_priv(host); > > > > if (priv->scc_ctl) { > > - renesas_sdhi_reset_scc(host, priv); > > + renesas_sdhi_disable_scc(host->mmc); > > renesas_sdhi_reset_hs400_mode(host, priv); > > priv->needs_adjust_hs400 = false; > > Having half of functions receive host, priv pointers and the other half > receiving host->mmc pointer is not very nice. Is there some logic behind > that / is it possible to somehow fix? > That's because renesas_sdhi_disable_scc() needed only host->mmc pointer. Cheers, Prabhakar > Best regards, > Pavel > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Hi Pavel, Thank you for the review. > -----Original Message----- > From: Pavel Machek <pavel@denx.de> > Sent: 31 March 2022 11:15 > To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> > Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu > <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>; Biju Das > <biju.das.jz@bp.renesas.com> > Subject: Re: [PATCH 5.10.y-cip 09/39] mmc: renesas_sdhi: sort includes > > Hi! > > > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > > > commit ab07a1356043f07142ba351253904ef8c42ecd4f upstream. > > > > Better prevent double includes. > > > +++ b/drivers/mmc/host/renesas_sdhi_core.c > > @@ -18,22 +18,22 @@ > > * > > */ > > > > -#include <linux/kernel.h> > > #include <linux/clk.h> > > -#include <linux/slab.h> > > -#include <linux/module.h> > > -#include <linux/of_device.h> > > -#include <linux/platform_device.h> > > -#include <linux/pm_domain.h> > > +#include <linux/delay.h> > > +#include <linux/kernel.h> > > +#include <linux/mfd/tmio.h> > > #include <linux/mmc/host.h> > > #include <linux/mmc/mmc.h> > > #include <linux/mmc/slot-gpio.h> > > -#include <linux/mfd/tmio.h> > > -#include <linux/sh_dma.h> > > -#include <linux/delay.h> > > +#include <linux/module.h> > > +#include <linux/of_device.h> > > #include <linux/pinctrl/consumer.h> > > #include <linux/pinctrl/pinctrl-state.h> > > +#include <linux/platform_device.h> > > +#include <linux/pm_domain.h> > > #include <linux/regulator/consumer.h> > > +#include <linux/sh_dma.h> > > +#include <linux/slab.h> > > #include <linux/sys_soc.h> > > > > #include "renesas_sdhi.h" > > In these cases we usually sort be include length, first ("reverse xmass > tree"). > My understating was most subsystems prefer alphabetical. Cheers, Prabhakar > Best regards, > Pavel > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Hi Pavel, Thank you for the review. > -----Original Message----- > From: Pavel Machek <pavel@denx.de> > Sent: 31 March 2022 11:22 > To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> > Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu > <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>; Biju Das > <biju.das.jz@bp.renesas.com> > Subject: Re: [PATCH 5.10.y-cip 32/39] dt-bindings: Drop redundant > minItems/maxItems > > Hi! > > > This condition is partially checked with the meta-schema already, but > > only if both 'minItems' and 'maxItems' are equal to the 'items' length. > > An improved meta-schema is pending. > > Do we have the improved meta-scheme in 5.10.X? Are we actually running the > dts schema checks? > Right 5.10.x will use older schemas. Let me know your thoughts If you want me to drop this patch. > I guess it is not a big deal either way. > Im hoping you are ok with this change. Cheers, Prabhakar > Best regards, > Pavel > > > +++ b/Documentation/devicetree/bindings/mmc/renesas,sdhi.yaml > > @@ -74,7 +74,6 @@ properties: > > > > clock-names: > > minItems: 1 > > - maxItems: 2 > > items: > > - const: core > > - const: cd > > @@ -106,7 +105,6 @@ properties: > > > > pinctrl-names: > > minItems: 1 > > - maxItems: 2 > > items: > > - const: default > > - const: state_uhs > > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Hi Pavel, Nobuhiro, > -----Original Message----- > From: Pavel Machek <pavel@denx.de> > Sent: 31 March 2022 10:28 > To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> > Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu > <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>; Biju Das > <biju.das.jz@bp.renesas.com> > Subject: Re: [PATCH 5.10.y-cip 00/39] Add SD/eMMC support for Renesas > RZ/G2L SoC > > Hi! > > > This patch series adds support for SD/eMMC on Renesas RZ/G2L SoC and > > enables this interfaces on Renesas RZ/G2L SMARC EVK. > > > > All the patches have been cherry picked from v5.17 release. > > I tried to apply the patches on top of 5.10.106-cip4, and could not. Can > you double check series applies properly? > Sorry about that, I realized now I had missed a patch! Will resend the series (with 40 patches). Cheers, Prabhakar > 8bb6e30b765989a3c0924158316d689e16317cd1 > CIP: Bump version suffix to -cip4 after merge from stable commit > 66f600a7a5460b6acab5272ac9f54f842927a50d > Merge tag 'v5.10.106' into linux-5.10.y-cip > > Best regards, > Pavel > > -- > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany