clk: don't use __initconst for non-const arrays
Subsystems (6)
PATCH 1/1 clk: don't use __initconst for non-const arrays
The statement
static const char *name[];
defines a modifiable array of pointers to constant chars. That is
*name[0] = 'f';
is forbidden, but
name[0] = "f";
is not. So marking an array that is defined as above with __initconst is wrong. Either an additional const must be added such that the whole definition reads:
static const char *const name[] __initconst;
or where this is not possible __initdata must be used.
--- drivers/clk/hisilicon/clk-hix5hd2.c | 6 ++-- drivers/clk/mxs/clk-imx23.c | 12 ++++---- drivers/clk/mxs/clk-imx28.c | 18 ++++++------ drivers/clk/rockchip/clk.h | 2 +- drivers/clk/samsung/clk-s5pv210.c | 56 ++++++++++++++++++------------------- drivers/clk/ti/composite.c | 2 +- 6 files changed, 48 insertions(+), 48 deletions(-)
drivers/clk/hisilicon/clk-hix5hd2.c +3 -3
@@ -44,15 +44,15 @@ static struct hisi_fixed_rate_clock hix5hd2_fixed_rate_clks[] __initdata = { { HIX5HD2_FIXED_83M, "83m", NULL, CLK_IS_ROOT, 83333333, }, }; -static const char *sfc_mux_p[]__initconst = { +static const char *sfc_mux_p[]__initdata = {"24m" ,"150m" ,"200m" ,"100m" ,"75m" , };static u32 sfc_mux_table[] = {0 ,4 ,5 ,6 ,7 }; -static const char *sdio1_mux_p[]__initconst = { +static const char *sdio1_mux_p[]__initdata = {"75m" ,"100m" ,"50m" ,"15m" , };static u32 sdio1_mux_table[] = {0 ,1 ,2 ,3 }; -static const char *fephy_mux_p[]__initconst = {"25m" ,"125m" }; +static const char *fephy_mux_p[]__initdata = {"25m" ,"125m" };static u32 fephy_mux_table[] = {0 ,1 };
drivers/clk/mxs/clk-imx23.c +6 -6
@@ -77,12 +77,12 @@ static void __init clk_misc_init(void)writel_relaxed (30 <<BP_FRAC_IOFRAC ,FRAC +SET ); } -static const char *sel_pll[]__initconst = {"pll" ,"ref_xtal" , }; -static const char *sel_cpu[]__initconst = {"ref_cpu" ,"ref_xtal" , }; -static const char *sel_pix[]__initconst = {"ref_pix" ,"ref_xtal" , }; -static const char *sel_io[]__initconst = {"ref_io" ,"ref_xtal" , }; -static const char *cpu_sels[]__initconst = {"cpu_pll" ,"cpu_xtal" , }; -static const char *emi_sels[]__initconst = {"emi_pll" ,"emi_xtal" , }; +static const char *sel_pll[]__initdata = {"pll" ,"ref_xtal" , }; +static const char *sel_cpu[]__initdata = {"ref_cpu" ,"ref_xtal" , }; +static const char *sel_pix[]__initdata = {"ref_pix" ,"ref_xtal" , }; +static const char *sel_io[]__initdata = {"ref_io" ,"ref_xtal" , }; +static const char *cpu_sels[]__initdata = {"cpu_pll" ,"cpu_xtal" , }; +static const char *emi_sels[]__initdata = {"emi_pll" ,"emi_xtal" , };enum imx23_clk { ref_xtal, pll, ref_cpu, ref_emi, ref_pix, ref_io, saif_sel,
drivers/clk/mxs/clk-imx28.c +9 -9
@@ -125,15 +125,15 @@ static void __init clk_misc_init(void)writel_relaxed (val,FRAC0 ); } -static const char *sel_cpu[]__initconst = {"ref_cpu" ,"ref_xtal" , }; -static const char *sel_io0[]__initconst = {"ref_io0" ,"ref_xtal" , }; -static const char *sel_io1[]__initconst = {"ref_io1" ,"ref_xtal" , }; -static const char *sel_pix[]__initconst = {"ref_pix" ,"ref_xtal" , }; -static const char *sel_gpmi[]__initconst = {"ref_gpmi" ,"ref_xtal" , }; -static const char *sel_pll0[]__initconst = {"pll0" ,"ref_xtal" , }; -static const char *cpu_sels[]__initconst = {"cpu_pll" ,"cpu_xtal" , }; -static const char *emi_sels[]__initconst = {"emi_pll" ,"emi_xtal" , }; -static const char *ptp_sels[]__initconst = {"ref_xtal" ,"pll0" , }; +static const char *sel_cpu[]__initdata = {"ref_cpu" ,"ref_xtal" , }; +static const char *sel_io0[]__initdata = {"ref_io0" ,"ref_xtal" , }; +static const char *sel_io1[]__initdata = {"ref_io1" ,"ref_xtal" , }; +static const char *sel_pix[]__initdata = {"ref_pix" ,"ref_xtal" , }; +static const char *sel_gpmi[]__initdata = {"ref_gpmi" ,"ref_xtal" , }; +static const char *sel_pll0[]__initdata = {"pll0" ,"ref_xtal" , }; +static const char *cpu_sels[]__initdata = {"cpu_pll" ,"cpu_xtal" , }; +static const char *emi_sels[]__initdata = {"emi_pll" ,"emi_xtal" , }; +static const char *ptp_sels[]__initdata = {"ref_xtal" ,"pll0" , };enum imx28_clk { ref_xtal, pll0, pll1, pll2, ref_cpu, ref_emi, ref_io0, ref_io1,
drivers/clk/rockchip/clk.h +1 -1
@@ -120,7 +120,7 @@ struct clk *rockchip_clk_register_pll(enum rockchip_pll_type pll_type,struct rockchip_pll_rate_table *rate_table, spinlock_t *lock); -#define PNAME (x) static const char *x[] __initconst +#define PNAME (x) static const char *x[] __initdataenum rockchip_clk_branch_type { branch_composite,
drivers/clk/samsung/clk-s5pv210.c +28 -28
191 lines not on this page · raw message
drivers/clk/ti/composite.c +1 -1
@@ -67,7 +67,7 @@ struct component_clk {struct list_head link; }; -static const char *__initconst component_clk_types[] = { +static const char *const component_clk_types[]__initconst = {"gate" ,"divider" ,"mux" };
Signature · 1 line
2.1.0
PATCH 1/1 clk: don't use __initconst for non-const arrays
[adding Sylwester and removing my samsung.com e-mail which is no longer valid]
Quoted 20 lines · Uwe Kleine-K?nig
The statement
static const char *name[];defines a modifiable array of pointers to constant chars. That is
*name[0] = 'f';is forbidden, but
name[0] = "f";is not. So marking an array that is defined as above with
__initconstis wrong. Either an additional const must be added such that the whole definition reads:static const char *const name[] __initconst;or where this is not possible
__initdatamust be used.
Quoted 7 lines
Signed-off-by Uwe Kleine-K?nig <[email protected]>--- drivers/clk/hisilicon/clk-hix5hd2.c | 6 ++-- drivers/clk/mxs/clk-imx23.c | 12 ++++---- drivers/clk/mxs/clk-imx28.c | 18 ++++++------ drivers/clk/rockchip/clk.h | 2 +- drivers/clk/samsung/clk-s5pv210.c | 56 ++++++++++++++++++-------------------
For drivers/clk/samsung/*
Best regards,
Tomasz
PATCH 1/1 clk: don't use __initconst for non-const arrays
In reply to Uwe Kleine-KönigHello,
drivers/clk/samsung/clk-s5pv210.c static inline void s5pv210_clk_sleep_init(void) { } · line 175
Quoted 6 lines · Uwe Kleine-K?nig
/* Mux parent lists. */
drivers/clk/samsung/clk-s5pv210.c +1
-1-static const char *fin_pll_p[]__initconst = { +static const char *fin_pll_p[]__initdata = {"xxti" ,"xusbxti" };
As discussed with Tomasz on irc: The sad thing here is that for this array only 8 bytes are freed when .init.rodata is thrown away (that is two pointers). The actual data---5 + 8 bytes + maybe aligning---isn't freed though.
We wondered if there is a nice and easy way to throw away the characters, too.
The only way I currently see is:
const char xxti[] __initconst = "xxti";
...
static const char *fin_pll_p[] __initdata = {
xxti,
...
};but this definitively doesn't qualify as "nice and easy". Is there an alternative?
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/1 clk: don't use __initconst for non-const arrays
Quoted 27 lines · Uwe Kleine-K?nig
Hello,
drivers/clk/samsung/clk-s5pv210.c static inline void s5pv210_clk_sleep_init(void) { } · line 175
Quoted 6 lines · Uwe Kleine-K?nig
/* Mux parent lists. */
drivers/clk/samsung/clk-s5pv210.c +1
-1-static const char *fin_pll_p[]__initconst = { +static const char *fin_pll_p[]__initdata = {"xxti" ,"xusbxti" };As discussed with Tomasz on irc: The sad thing here is that for this array only 8 bytes are freed when .init.rodata is thrown away (that is two pointers). The actual data---5 + 8 bytes + maybe aligning---isn't freed though.
We wondered if there is a nice and easy way to throw away the characters, too.
The only way I currently see is:
const char xxti[] __initconst = "xxti"; ... static const char *fin_pll_p[] __initdata = { xxti, ... };
Quoted 3 lines
but this definitively doesn't qualify as "nice and easy". Is there an alternative?
What about doing
static const char fin_pll_p[][8] __initconst = {
"xxti",
"xusbxti"
};PATCH 1/1 clk: don't use __initconst for non-const arrays
Hello Ard,
Quoted 33 lines · Ard Biesheuvel
Quoted 27 lines · Uwe Kleine-K?nig
Hello,
drivers/clk/samsung/clk-s5pv210.c static inline void s5pv210_clk_sleep_init(void) { } · line 175
Quoted 6 lines · Uwe Kleine-K?nig
/* Mux parent lists. */
drivers/clk/samsung/clk-s5pv210.c +1
-1-static const char *fin_pll_p[]__initconst = { +static const char *fin_pll_p[]__initdata = {"xxti" ,"xusbxti" };As discussed with Tomasz on irc: The sad thing here is that for this array only 8 bytes are freed when .init.rodata is thrown away (that is two pointers). The actual data---5 + 8 bytes + maybe aligning---isn't freed though.
We wondered if there is a nice and easy way to throw away the characters, too.
The only way I currently see is:
const char xxti[] __initconst = "xxti"; ... static const char *fin_pll_p[] __initdata = { xxti, ... };Quoted 3 lines
but this definitively doesn't qualify as "nice and easy". Is there an alternative?
Quoted 6 lines
What about doing
static const char fin_pll_p[][8] __initconst = { "xxti", "xusbxti" };
This results in the strings being moved to .init.rodata and so they are discarded. But it also results in:
drivers/clk/samsung/clk-s5pv210.c:412:2: warning: initialization from incompatible pointer type [enabled by default] MUX_F(FIN_PLL, "fin_pll", fin_pll_p, OM_STAT, 0, 1, ^ drivers/clk/samsung/clk-s5pv210.c:412:2: warning: (near initialization for 'early_mux_clks[0].parent_names') [enabled by default]
That's because early_mux_clks[0].parent_names is of type const char ** while fin_pll_p as suggested doesn't provide an array of pointers to the start of the contained strings.
I don't see a way to fix that unless we fix the maximal clock name length globally and so waste much memory.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |