lkml.org 
[lkml]   [2022]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/2] clk: pistachio: Fix initconst confusion
From
Date
Quoting Jiri Slaby (2022-07-08 00:16:12)
> On 29. 06. 22, 10:21, Stephen Boyd wrote:
> > Quoting Jiri Slaby (2022-06-27 00:46:15)
> >> On 24. 06. 22, 2:42, Stephen Boyd wrote:
> >>> Quoting Jiri Slaby (2022-06-23 01:32:16)
> >>>> From: Andi Kleen <ak@linux.intel.com>
> >>>>
> >>>> A variable pointing to const isn't const itself. It'd have to contain
> >>>> "const" keyword after "*" too. Therefore, PNAME() cannot put the strings
> >>>> to "rodata". Hence use __initdata instead of __initconst to fix this.
> >>>>
> >>>> [js] more explanatory commit message.
> >>>>
> >>>> Cc: Michael Turquette <mturquette@baylibre.com>
> >>>> Cc: Stephen Boyd <sboyd@kernel.org>
> >>>> Cc: linux-clk@vger.kernel.org
> >>>> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> >>>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> >>>> ---
> >>>> drivers/clk/pistachio/clk.h | 2 +-
> >>>> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>>>
> >>>> diff --git a/drivers/clk/pistachio/clk.h b/drivers/clk/pistachio/clk.h
> >>>> index f9c31e3a0e47..742e5fab00c0 100644
> >>>> --- a/drivers/clk/pistachio/clk.h
> >>>> +++ b/drivers/clk/pistachio/clk.h
> >>>> @@ -34,7 +34,7 @@ struct pistachio_mux {
> >>>> const char **parents;
> >>>> };
> >>>>
> >>>> -#define PNAME(x) static const char *x[] __initconst
> >>>> +#define PNAME(x) static const char *x[] __initdata
> >>>
> >>> Can it be const char * const and left as __initconst?
> >>
> >> Let me check, IIRC the struct where this is assigned would need to be
> >> updated too.
> >>
> >> I will get into it only some time next week.
> >>
> >
> > Ok, sounds good. This seems to at least compile locally.
>
> Yeah, that works. I've sent a v2.
>
> BTW is the code intended to put the actual strings to .init.rodata? As
> that was never the case. Only those PNAME defined arrays (pointers to
> strings) end up in .init.rodata now and the strings are in .rodata.

I think both the strings and the array should be in .init.rodata. The
clk framework deep copies data like parent names.

\
 
 \ /
  Last update: 2022-07-11 22:54    [W:0.040 / U:0.860 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site