* [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED
@ 2015-06-16 15:56 Boris Brezillon
2015-06-17 11:57 ` Gregory CLEMENT
0 siblings, 1 reply; 6+ messages in thread
From: Boris Brezillon @ 2015-06-16 15:56 UTC (permalink / raw)
To: linux-arm-kernel
The crypto SRAM, used by the armada 370 cpuidle code to workaround a bug
in the BootROM code, requires the crypto clk to be up and running.
Flag the crypto clk as IGNORE_UNUSED until we add the proper
infrastructure to define the crypto SRAM in the DT and reference the crypto
clk in this SRAM node.
Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: Kevin Hilman <khilman@linaro.org>
Fixes: 29e623475c50267ee3aaa49ebb6cbe107bce8d2a ("clk: mvebu: add
missing CESA gate clk").
Cc: <stable@vger.kernel.org> #4.1
---
Changes since v1:
- add the Reported-by tag
- add the missing trailing ','
drivers/clk/mvebu/armada-370.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c
index c19fd77..2c7c108 100644
--- a/drivers/clk/mvebu/armada-370.c
+++ b/drivers/clk/mvebu/armada-370.c
@@ -163,7 +163,7 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = {
{ "pex1", "pex1_en", 9, 0 },
{ "sata0", NULL, 15, 0 },
{ "sdio", NULL, 17, 0 },
- { "crypto", NULL, 23, 0 },
+ { "crypto", NULL, 23, CLK_IGNORE_UNUSED },
{ "tdm", NULL, 25, 0 },
{ "ddr", NULL, 28, CLK_IGNORE_UNUSED },
{ "sata1", NULL, 30, 0 },
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED 2015-06-16 15:56 [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED Boris Brezillon @ 2015-06-17 11:57 ` Gregory CLEMENT 2015-06-18 18:36 ` Michael Turquette 0 siblings, 1 reply; 6+ messages in thread From: Gregory CLEMENT @ 2015-06-17 11:57 UTC (permalink / raw) To: linux-arm-kernel Hi Mike, Stephen, On 16/06/2015 17:56, Boris Brezillon wrote: > The crypto SRAM, used by the armada 370 cpuidle code to workaround a bug > in the BootROM code, requires the crypto clk to be up and running. > Flag the crypto clk as IGNORE_UNUSED until we add the proper > infrastructure to define the crypto SRAM in the DT and reference the crypto > clk in this SRAM node. > > Reported-by: Kevin Hilman <khilman@linaro.org> > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > Tested-by: Kevin Hilman <khilman@linaro.org> > Fixes: 29e623475c50267ee3aaa49ebb6cbe107bce8d2a ("clk: mvebu: add > missing CESA gate clk"). > Cc: <stable@vger.kernel.org> #4.1 Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Would it possible to apply this fix on 4.1-rc8 ? Thanks, Gregory > --- > Changes since v1: > - add the Reported-by tag > - add the missing trailing ',' > > drivers/clk/mvebu/armada-370.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c > index c19fd77..2c7c108 100644 > --- a/drivers/clk/mvebu/armada-370.c > +++ b/drivers/clk/mvebu/armada-370.c > @@ -163,7 +163,7 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = { > { "pex1", "pex1_en", 9, 0 }, > { "sata0", NULL, 15, 0 }, > { "sdio", NULL, 17, 0 }, > - { "crypto", NULL, 23, 0 }, > + { "crypto", NULL, 23, CLK_IGNORE_UNUSED }, > { "tdm", NULL, 25, 0 }, > { "ddr", NULL, 28, CLK_IGNORE_UNUSED }, > { "sata1", NULL, 30, 0 }, > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED 2015-06-17 11:57 ` Gregory CLEMENT @ 2015-06-18 18:36 ` Michael Turquette 2015-06-18 18:49 ` Gregory CLEMENT 2015-06-18 19:47 ` Boris Brezillon 0 siblings, 2 replies; 6+ messages in thread From: Michael Turquette @ 2015-06-18 18:36 UTC (permalink / raw) To: linux-arm-kernel Quoting Gregory CLEMENT (2015-06-17 04:57:08) > Hi Mike, Stephen, > > On 16/06/2015 17:56, Boris Brezillon wrote: > > The crypto SRAM, used by the armada 370 cpuidle code to workaround a bug > > in the BootROM code, requires the crypto clk to be up and running. > > Flag the crypto clk as IGNORE_UNUSED until we add the proper > > infrastructure to define the crypto SRAM in the DT and reference the crypto > > clk in this SRAM node. > > > > Reported-by: Kevin Hilman <khilman@linaro.org> > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > Tested-by: Kevin Hilman <khilman@linaro.org> > > Fixes: 29e623475c50267ee3aaa49ebb6cbe107bce8d2a ("clk: mvebu: add > > missing CESA gate clk"). > > Cc: <stable@vger.kernel.org> #4.1 > > Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > > Would it possible to apply this fix on 4.1-rc8 ? Hi Gregory, I'm a bit confused by this. This patch fixes "clk: mvebu: add missing CESA gate clk", right? That patch lives in clk-next. It was not pushed to Linus' tree yet via a -fixes branch. Thus I can just apply this patch to clk-next and the problem should be resolved in clk-next, no? Furthermore, I do not have 29e623475c50267ee3aaa49ebb6cbe107bce8d2a anywhere in my tree. I'm not sure where this sha1 hash came from. Regards, Mike > > Thanks, > > Gregory > > > --- > > Changes since v1: > > - add the Reported-by tag > > - add the missing trailing ',' > > > > drivers/clk/mvebu/armada-370.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c > > index c19fd77..2c7c108 100644 > > --- a/drivers/clk/mvebu/armada-370.c > > +++ b/drivers/clk/mvebu/armada-370.c > > @@ -163,7 +163,7 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = { > > { "pex1", "pex1_en", 9, 0 }, > > { "sata0", NULL, 15, 0 }, > > { "sdio", NULL, 17, 0 }, > > - { "crypto", NULL, 23, 0 }, > > + { "crypto", NULL, 23, CLK_IGNORE_UNUSED }, > > { "tdm", NULL, 25, 0 }, > > { "ddr", NULL, 28, CLK_IGNORE_UNUSED }, > > { "sata1", NULL, 30, 0 }, > > > > > -- > Gregory Clement, Free Electrons > Kernel, drivers, real-time and embedded Linux > development, consulting, training and support. > http://free-electrons.com > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED 2015-06-18 18:36 ` Michael Turquette @ 2015-06-18 18:49 ` Gregory CLEMENT 2015-06-18 19:47 ` Boris Brezillon 1 sibling, 0 replies; 6+ messages in thread From: Gregory CLEMENT @ 2015-06-18 18:49 UTC (permalink / raw) To: linux-arm-kernel Hi Mike, On 18/06/2015 20:36, Michael Turquette wrote: > Quoting Gregory CLEMENT (2015-06-17 04:57:08) >> Hi Mike, Stephen, >> >> On 16/06/2015 17:56, Boris Brezillon wrote: >>> The crypto SRAM, used by the armada 370 cpuidle code to workaround a bug >>> in the BootROM code, requires the crypto clk to be up and running. >>> Flag the crypto clk as IGNORE_UNUSED until we add the proper >>> infrastructure to define the crypto SRAM in the DT and reference the crypto >>> clk in this SRAM node. >>> >>> Reported-by: Kevin Hilman <khilman@linaro.org> >>> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> >>> Tested-by: Kevin Hilman <khilman@linaro.org> >>> Fixes: 29e623475c50267ee3aaa49ebb6cbe107bce8d2a ("clk: mvebu: add >>> missing CESA gate clk"). >>> Cc: <stable@vger.kernel.org> #4.1 >> >> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> >> >> Would it possible to apply this fix on 4.1-rc8 ? > > Hi Gregory, > > I'm a bit confused by this. This patch fixes "clk: mvebu: add missing > CESA gate clk", right? That patch lives in clk-next. It was not pushed > to Linus' tree yet via a -fixes branch. > > Thus I can just apply this patch to clk-next and the problem should be > resolved in clk-next, no? You're right I was confused by the "<stable@vger.kernel.org> #4.1" tag, and I thought it was already part of 4.1. So indeed you just have to apply it in clk-next. You can remove the Fixes: and CC: line. And even better you can squashed it into 4d52b2acefdf "clk: mvebu: add missing CESA gate clk", if your clk-next branch is not immutable. > > Furthermore, I do not have 29e623475c50267ee3aaa49ebb6cbe107bce8d2a > anywhere in my tree. I'm not sure where this sha1 hash came from. Me neither :) Thanks, Gregory >> >>> --- >>> Changes since v1: >>> - add the Reported-by tag >>> - add the missing trailing ',' >>> >>> drivers/clk/mvebu/armada-370.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/clk/mvebu/armada-370.c b/drivers/clk/mvebu/armada-370.c >>> index c19fd77..2c7c108 100644 >>> --- a/drivers/clk/mvebu/armada-370.c >>> +++ b/drivers/clk/mvebu/armada-370.c >>> @@ -163,7 +163,7 @@ static const struct clk_gating_soc_desc a370_gating_desc[] __initconst = { >>> { "pex1", "pex1_en", 9, 0 }, >>> { "sata0", NULL, 15, 0 }, >>> { "sdio", NULL, 17, 0 }, >>> - { "crypto", NULL, 23, 0 }, >>> + { "crypto", NULL, 23, CLK_IGNORE_UNUSED }, >>> { "tdm", NULL, 25, 0 }, >>> { "ddr", NULL, 28, CLK_IGNORE_UNUSED }, >>> { "sata1", NULL, 30, 0 }, >>> >> >> >> -- >> Gregory Clement, Free Electrons >> Kernel, drivers, real-time and embedded Linux >> development, consulting, training and support. >> http://free-electrons.com >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel at lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED 2015-06-18 18:36 ` Michael Turquette 2015-06-18 18:49 ` Gregory CLEMENT @ 2015-06-18 19:47 ` Boris Brezillon 2015-06-18 20:52 ` Michael Turquette 1 sibling, 1 reply; 6+ messages in thread From: Boris Brezillon @ 2015-06-18 19:47 UTC (permalink / raw) To: linux-arm-kernel Hi Mike, On Thu, 18 Jun 2015 11:36:54 -0700 Michael Turquette <mturquette@linaro.org> wrote: > Quoting Gregory CLEMENT (2015-06-17 04:57:08) > > Hi Mike, Stephen, > > > > On 16/06/2015 17:56, Boris Brezillon wrote: > > > The crypto SRAM, used by the armada 370 cpuidle code to workaround a bug > > > in the BootROM code, requires the crypto clk to be up and running. > > > Flag the crypto clk as IGNORE_UNUSED until we add the proper > > > infrastructure to define the crypto SRAM in the DT and reference the crypto > > > clk in this SRAM node. > > > > > > Reported-by: Kevin Hilman <khilman@linaro.org> > > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > > Tested-by: Kevin Hilman <khilman@linaro.org> > > > Fixes: 29e623475c50267ee3aaa49ebb6cbe107bce8d2a ("clk: mvebu: add > > > missing CESA gate clk"). > > > Cc: <stable@vger.kernel.org> #4.1 > > > > Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > > > > Would it possible to apply this fix on 4.1-rc8 ? > > Hi Gregory, > > I'm a bit confused by this. This patch fixes "clk: mvebu: add missing > CESA gate clk", right? That patch lives in clk-next. It was not pushed > to Linus' tree yet via a -fixes branch. > > Thus I can just apply this patch to clk-next and the problem should be > resolved in clk-next, no? Yes. I've tagged this patch as applicable on stable 4.1 in case it didn't make it in the next -rc (which should be the last one before 4.1 is released). I don't know if it's a good practice, but I've had several fixes which missed the targeted release in the past, and tagging them as stable helps in getting the patches applied afterwards. > > Furthermore, I do not have 29e623475c50267ee3aaa49ebb6cbe107bce8d2a > anywhere in my tree. I'm not sure where this sha1 hash came from. Oops, I mixed the commit hash in my local branch and the one in clk-next (4d52b2acefdfceae0e47ed08324a96f511dc80b1). Best Regards, Boris -- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED 2015-06-18 19:47 ` Boris Brezillon @ 2015-06-18 20:52 ` Michael Turquette 0 siblings, 0 replies; 6+ messages in thread From: Michael Turquette @ 2015-06-18 20:52 UTC (permalink / raw) To: linux-arm-kernel Quoting Boris Brezillon (2015-06-18 12:47:29) > Hi Mike, > > On Thu, 18 Jun 2015 11:36:54 -0700 > Michael Turquette <mturquette@linaro.org> wrote: > > > Quoting Gregory CLEMENT (2015-06-17 04:57:08) > > > Hi Mike, Stephen, > > > > > > On 16/06/2015 17:56, Boris Brezillon wrote: > > > > The crypto SRAM, used by the armada 370 cpuidle code to workaround a bug > > > > in the BootROM code, requires the crypto clk to be up and running. > > > > Flag the crypto clk as IGNORE_UNUSED until we add the proper > > > > infrastructure to define the crypto SRAM in the DT and reference the crypto > > > > clk in this SRAM node. > > > > > > > > Reported-by: Kevin Hilman <khilman@linaro.org> > > > > Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> > > > > Tested-by: Kevin Hilman <khilman@linaro.org> > > > > Fixes: 29e623475c50267ee3aaa49ebb6cbe107bce8d2a ("clk: mvebu: add > > > > missing CESA gate clk"). > > > > Cc: <stable@vger.kernel.org> #4.1 > > > > > > Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > > > > > > Would it possible to apply this fix on 4.1-rc8 ? > > > > Hi Gregory, > > > > I'm a bit confused by this. This patch fixes "clk: mvebu: add missing > > CESA gate clk", right? That patch lives in clk-next. It was not pushed > > to Linus' tree yet via a -fixes branch. > > > > Thus I can just apply this patch to clk-next and the problem should be > > resolved in clk-next, no? > > Yes. I've tagged this patch as applicable on stable 4.1 in case it > didn't make it in the next -rc (which should be the last one before > 4.1 is released). Applied to clk-next. Regards, Mike > I don't know if it's a good practice, but I've had several fixes which > missed the targeted release in the past, and tagging them as stable > helps in getting the patches applied afterwards. > > > > > Furthermore, I do not have 29e623475c50267ee3aaa49ebb6cbe107bce8d2a > > anywhere in my tree. I'm not sure where this sha1 hash came from. > > Oops, I mixed the commit hash in my local branch and the one in clk-next > (4d52b2acefdfceae0e47ed08324a96f511dc80b1). > > Best Regards, > > Boris > > -- > Boris Brezillon, Free Electrons > Embedded Linux and Kernel engineering > http://free-electrons.com ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-06-18 20:52 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-06-16 15:56 [PATCH v2] clk: mvebu: flag the crypto clk as CLK_IGNORE_UNUSED Boris Brezillon 2015-06-17 11:57 ` Gregory CLEMENT 2015-06-18 18:36 ` Michael Turquette 2015-06-18 18:49 ` Gregory CLEMENT 2015-06-18 19:47 ` Boris Brezillon 2015-06-18 20:52 ` Michael Turquette
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).