Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <98363f27-e7a4-7351-fad7-361f7e465b7e@suse.cz>
Date:   Fri, 8 Jul 2022 09:16:12 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH 1/2] clk: pistachio: Fix initconst confusion
Content-Language: en-US
To:     Stephen Boyd <sboyd@kernel.org>, mturquette@baylibre.com
Cc:     mliska@suse.cz, linux-kernel@vger.kernel.org,
        Andi Kleen <ak@linux.intel.com>, linux-clk@vger.kernel.org
References: <20220623083217.26433-1-jslaby@suse.cz>
 <20220624004225.0DE4AC3411D@smtp.kernel.org>
 <0edab0e2-5355-a3da-445d-b6f45e3082ed@suse.cz>
 <20220629082104.E25D2C34114@smtp.kernel.org>
From:   Jiri Slaby <jslaby@suse.cz>
In-Reply-To: <20220629082104.E25D2C34114@smtp.kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

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.

> ----8<---
> 
> diff --git a/drivers/clk/pistachio/clk.h b/drivers/clk/pistachio/clk.h
> index f9c31e3a0e47..8be02ac2d909 100644
> --- a/drivers/clk/pistachio/clk.h
> +++ b/drivers/clk/pistachio/clk.h
> @@ -31,10 +31,10 @@ struct pistachio_mux {
>   	unsigned int shift;
>   	unsigned int num_parents;
>   	const char *name;
> -	const char **parents;
> +	const char * const *parents;
>   };
>   
> -#define PNAME(x) static const char *x[] __initconst
> +#define PNAME(x) static const char * const x[] __initconst
>   
>   #define MUX(_id, _name, _pnames, _reg, _shift)			\
>   	{							\


-- 
js
suse labs