* [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function
@ 2015-05-20 8:42 Masahiro Yamada
2015-05-20 8:42 ` [RESEND PATCH 1/2] pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro Masahiro Yamada
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Masahiro Yamada @ 2015-05-20 8:42 UTC (permalink / raw)
To: linux-arm-kernel
I sent the previous one to linux-serial by mistake.
I am resending to linux-gpio, dropping linux-serial.
Sorry for noise.
Masahiro Yamada (2):
pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro
pinctrl: zynq: fix offset address for {SD0,SD1}_WP_CD_SEL
drivers/pinctrl/pinctrl-zynq.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [RESEND PATCH 1/2] pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro 2015-05-20 8:42 [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Masahiro Yamada @ 2015-05-20 8:42 ` Masahiro Yamada 2015-06-01 12:44 ` Linus Walleij 2015-05-20 8:42 ` [RESEND PATCH 2/2] pinctrl: zynq: fix offset address for {SD0, SD1}_WP_CD_SEL Masahiro Yamada 2015-05-20 14:23 ` [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Sören Brinkmann 2 siblings, 1 reply; 8+ messages in thread From: Masahiro Yamada @ 2015-05-20 8:42 UTC (permalink / raw) To: linux-arm-kernel The offset to the mux register is missing. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/pinctrl/pinctrl-zynq.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-zynq.c b/drivers/pinctrl/pinctrl-zynq.c index 3d5453a..77c5a98 100644 --- a/drivers/pinctrl/pinctrl-zynq.c +++ b/drivers/pinctrl/pinctrl-zynq.c @@ -714,12 +714,13 @@ static const char * const gpio0_groups[] = {"gpio0_0_grp", .mux_val = mval, \ } -#define DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(fname, mval, mux, mask, shift) \ +#define DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(fname, mval, offset, mask, shift)\ [ZYNQ_PMUX_##fname] = { \ .name = #fname, \ .groups = fname##_groups, \ .ngroups = ARRAY_SIZE(fname##_groups), \ .mux_val = mval, \ + .mux = offset, \ .mux_mask = mask, \ .mux_shift = shift, \ } -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [RESEND PATCH 1/2] pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro 2015-05-20 8:42 ` [RESEND PATCH 1/2] pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro Masahiro Yamada @ 2015-06-01 12:44 ` Linus Walleij 0 siblings, 0 replies; 8+ messages in thread From: Linus Walleij @ 2015-06-01 12:44 UTC (permalink / raw) To: linux-arm-kernel On Wed, May 20, 2015 at 10:42 AM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > The offset to the mux register is missing. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> No reply from S?ren, but applying anyway since it seems to make sense. Only for -next though. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH 2/2] pinctrl: zynq: fix offset address for {SD0, SD1}_WP_CD_SEL 2015-05-20 8:42 [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Masahiro Yamada 2015-05-20 8:42 ` [RESEND PATCH 1/2] pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro Masahiro Yamada @ 2015-05-20 8:42 ` Masahiro Yamada 2015-06-01 12:44 ` Linus Walleij 2015-05-20 14:23 ` [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Sören Brinkmann 2 siblings, 1 reply; 8+ messages in thread From: Masahiro Yamada @ 2015-05-20 8:42 UTC (permalink / raw) To: linux-arm-kernel The address for SD0_WP_CD_SEL, SD1_WP_CD_SEL is 0xf8000830, 0xf8000834, respectively. Each offset address must be prefixed with 0x. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/pinctrl/pinctrl-zynq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/pinctrl-zynq.c b/drivers/pinctrl/pinctrl-zynq.c index 77c5a98..04748a4 100644 --- a/drivers/pinctrl/pinctrl-zynq.c +++ b/drivers/pinctrl/pinctrl-zynq.c @@ -745,15 +745,15 @@ static const struct zynq_pinmux_function zynq_pmux_functions[] = { DEFINE_ZYNQ_PINMUX_FUNCTION(spi1, 0x50), DEFINE_ZYNQ_PINMUX_FUNCTION(sdio0, 0x40), DEFINE_ZYNQ_PINMUX_FUNCTION(sdio0_pc, 0xc), - DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(sdio0_wp, 0, 130, ZYNQ_SDIO_WP_MASK, + DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(sdio0_wp, 0, 0x130, ZYNQ_SDIO_WP_MASK, ZYNQ_SDIO_WP_SHIFT), - DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(sdio0_cd, 0, 130, ZYNQ_SDIO_CD_MASK, + DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(sdio0_cd, 0, 0x130, ZYNQ_SDIO_CD_MASK, ZYNQ_SDIO_CD_SHIFT), DEFINE_ZYNQ_PINMUX_FUNCTION(sdio1, 0x40), DEFINE_ZYNQ_PINMUX_FUNCTION(sdio1_pc, 0xc), - DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(sdio1_wp, 0, 134, ZYNQ_SDIO_WP_MASK, + DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(sdio1_wp, 0, 0x134, ZYNQ_SDIO_WP_MASK, ZYNQ_SDIO_WP_SHIFT), - DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(sdio1_cd, 0, 134, ZYNQ_SDIO_CD_MASK, + DEFINE_ZYNQ_PINMUX_FUNCTION_MUX(sdio1_cd, 0, 0x134, ZYNQ_SDIO_CD_MASK, ZYNQ_SDIO_CD_SHIFT), DEFINE_ZYNQ_PINMUX_FUNCTION(smc0_nor, 4), DEFINE_ZYNQ_PINMUX_FUNCTION(smc0_nor_cs1, 8), -- 1.9.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [RESEND PATCH 2/2] pinctrl: zynq: fix offset address for {SD0, SD1}_WP_CD_SEL 2015-05-20 8:42 ` [RESEND PATCH 2/2] pinctrl: zynq: fix offset address for {SD0, SD1}_WP_CD_SEL Masahiro Yamada @ 2015-06-01 12:44 ` Linus Walleij 0 siblings, 0 replies; 8+ messages in thread From: Linus Walleij @ 2015-06-01 12:44 UTC (permalink / raw) To: linux-arm-kernel On Wed, May 20, 2015 at 10:42 AM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > The address for SD0_WP_CD_SEL, SD1_WP_CD_SEL is 0xf8000830, > 0xf8000834, respectively. > > Each offset address must be prefixed with 0x. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> No reply from S?ren, but applying anyway since it seems to make sense. Only for -next though. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function 2015-05-20 8:42 [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Masahiro Yamada 2015-05-20 8:42 ` [RESEND PATCH 1/2] pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro Masahiro Yamada 2015-05-20 8:42 ` [RESEND PATCH 2/2] pinctrl: zynq: fix offset address for {SD0, SD1}_WP_CD_SEL Masahiro Yamada @ 2015-05-20 14:23 ` Sören Brinkmann 2015-05-21 14:31 ` Masahiro Yamada 2015-06-01 13:01 ` Linus Walleij 2 siblings, 2 replies; 8+ messages in thread From: Sören Brinkmann @ 2015-05-20 14:23 UTC (permalink / raw) To: linux-arm-kernel Hi Masahiro, On Wed, 2015-05-20 at 05:42PM +0900, Masahiro Yamada wrote: > > I sent the previous one to linux-serial by mistake. > I am resending to linux-gpio, dropping linux-serial. > Sorry for noise. > > > > Masahiro Yamada (2): > pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro > pinctrl: zynq: fix offset address for {SD0,SD1}_WP_CD_SEL For the series: Reviewed-by: S?ren Brinkmann <soren.brinkmann@xilinx.com> I'm not sure how severe the impact of these bugs is. It looks like the the current driver could corrupt the register for MIO pin0, am I right? It may be a good ides to add Fixes: add958cee967 "pinctrl: Add driver for Zynq" (I suspect that bug is there from the beginning) and ask Linus to consider this for stable. Thanks, S?ren ^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function 2015-05-20 14:23 ` [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Sören Brinkmann @ 2015-05-21 14:31 ` Masahiro Yamada 2015-06-01 13:01 ` Linus Walleij 1 sibling, 0 replies; 8+ messages in thread From: Masahiro Yamada @ 2015-05-21 14:31 UTC (permalink / raw) To: linux-arm-kernel Hi S?ren, 2015-05-20 23:23 GMT+09:00 S?ren Brinkmann <soren.brinkmann@xilinx.com>: > Hi Masahiro, > > On Wed, 2015-05-20 at 05:42PM +0900, Masahiro Yamada wrote: >> >> I sent the previous one to linux-serial by mistake. >> I am resending to linux-gpio, dropping linux-serial. >> Sorry for noise. >> >> >> >> Masahiro Yamada (2): >> pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro >> pinctrl: zynq: fix offset address for {SD0,SD1}_WP_CD_SEL > > For the series: > Reviewed-by: S?ren Brinkmann <soren.brinkmann@xilinx.com> > > I'm not sure how severe the impact of these bugs is. It looks like the > the current driver could corrupt the register for MIO pin0, am I right? Right. DEFINE_ZYNQ_PINMUX_FUNCTION_MUX() is missing the .mux so it is always set to zero, i.e. MIO pin0 register is corrupted. > It may be a good ides to add > Fixes: add958cee967 "pinctrl: Add driver for Zynq" > (I suspect that bug is there from the beginning) and ask Linus to > consider this for stable. Yes, looks like these two bugs have been there since the introduction of this driver. For the series, Fixes: add958cee967 (pinctrl: Add driver for Zynq) Linus, Could you consider this series for stable and linux-4.1, please? -- Best Regards Masahiro Yamada ^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function 2015-05-20 14:23 ` [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Sören Brinkmann 2015-05-21 14:31 ` Masahiro Yamada @ 2015-06-01 13:01 ` Linus Walleij 1 sibling, 0 replies; 8+ messages in thread From: Linus Walleij @ 2015-06-01 13:01 UTC (permalink / raw) To: linux-arm-kernel On Wed, May 20, 2015 at 4:23 PM, S?ren Brinkmann <soren.brinkmann@xilinx.com> wrote: > For the series: > Reviewed-by: S?ren Brinkmann <soren.brinkmann@xilinx.com> Ah that is S?ren's Review tag. > It may be a good ides to add > Fixes: add958cee967 "pinctrl: Add driver for Zynq" > (I suspect that bug is there from the beginning) and ask Linus to > consider this for stable. I added it but still merging for -next at this point. No need to rush this fix since it's been around so long. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-06-01 13:01 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-20 8:42 [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Masahiro Yamada
2015-05-20 8:42 ` [RESEND PATCH 1/2] pinctrl: zynq: fix DEFINE_ZYNQ_PINMUX_FUNCTION_MUX macro Masahiro Yamada
2015-06-01 12:44 ` Linus Walleij
2015-05-20 8:42 ` [RESEND PATCH 2/2] pinctrl: zynq: fix offset address for {SD0, SD1}_WP_CD_SEL Masahiro Yamada
2015-06-01 12:44 ` Linus Walleij
2015-05-20 14:23 ` [RESEND PATCH 0/2] pinctrl: zynq: fix two bugs of zynq pinmux function Sören Brinkmann
2015-05-21 14:31 ` Masahiro Yamada
2015-06-01 13:01 ` Linus Walleij
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).