[PATCH 0/4] clk drivers: Terminate clk_div_table with sentinel element

[PATCH 0/4] clk drivers: Terminate clk_div_table with sentinel element

[Jonathan Neuschäfer]

I noticed that some of the clk_div_tables in different drivers are not
terminated with a sentinel element. This may cause the code in
clk-divider.c to read garbage that happens to be beyond the end.

This patchset fixed all instances of this bug that I could find, except
for a case in drivers/phy/ti/phy-j721e-wiz.c that is already fixed in
linux-next:
  https://lore.kernel.org/lkml/20220117110108.4117-1-kishon@ti.com/

Jonathan Neuschäfer (4):
  clk: actions: Terminate clk_div_table with sentinel element
  clk: loongson1: Terminate clk_div_table with sentinel element
  clk: hisilicon: Terminate clk_div_table with sentinel element
  clk: clps711x: Terminate clk_div_table with sentinel element

 drivers/clk/actions/owl-s700.c         | 1 +
 drivers/clk/actions/owl-s900.c         | 4 ++--
 drivers/clk/clk-clps711x.c             | 2 ++
 drivers/clk/hisilicon/clk-hi3559a.c    | 4 ++--
 drivers/clk/loongson1/clk-loongson1c.c | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

--
2.34.1

[PATCH 1/4] clk: actions: Terminate clk_div_table with sentinel element

[Jonathan Neuschäfer]

In order that the end of a clk_div_table can be detected, it must be
terminated with a sentinel element (.div = 0).

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---

I'm not so sure about usb3_mac_div_table. Maybe the { 0, 8 } element was
meant to be { 0, 0 }?
---
 drivers/clk/actions/owl-s700.c | 1 +
 drivers/clk/actions/owl-s900.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/actions/owl-s700.c b/drivers/clk/actions/owl-s700.c
index a2f34d13fb543..617174644f728 100644
--- a/drivers/clk/actions/owl-s700.c
+++ b/drivers/clk/actions/owl-s700.c
@@ -162,6 +162,7 @@ static struct clk_div_table hdmia_div_table[] = {

 static struct clk_div_table rmii_div_table[] = {
 	{0, 4},   {1, 10},
+	{0, 0},
 };

 /* divider clocks */
diff --git a/drivers/clk/actions/owl-s900.c b/drivers/clk/actions/owl-s900.c
index 790890978424a..f6f49100a865b 100644
--- a/drivers/clk/actions/owl-s900.c
+++ b/drivers/clk/actions/owl-s900.c
@@ -139,8 +139,8 @@ static struct clk_div_table rmii_ref_div_table[] = {
 };

 static struct clk_div_table usb3_mac_div_table[] = {
-	{ 1, 2 }, { 2, 3 }, { 3, 4 },
-	{ 0, 8 },
+	{ 1, 2 }, { 2, 3 }, { 3, 4 }, { 0, 8 },
+	{ 0, 0 },
 };

 static struct clk_div_table i2s_div_table[] = {
--
2.34.1

[PATCH 1/4] clk: actions: Terminate clk_div_table with sentinel element

[Jonathan Neuschäfer]

In order that the end of a clk_div_table can be detected, it must be
terminated with a sentinel element (.div = 0).

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---

I'm not so sure about usb3_mac_div_table. Maybe the { 0, 8 } element was
meant to be { 0, 0 }?
---
 drivers/clk/actions/owl-s700.c | 1 +
 drivers/clk/actions/owl-s900.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/actions/owl-s700.c b/drivers/clk/actions/owl-s700.c
index a2f34d13fb543..617174644f728 100644
--- a/drivers/clk/actions/owl-s700.c
+++ b/drivers/clk/actions/owl-s700.c
@@ -162,6 +162,7 @@ static struct clk_div_table hdmia_div_table[] = {

 static struct clk_div_table rmii_div_table[] = {
 	{0, 4},   {1, 10},
+	{0, 0},
 };

 /* divider clocks */
diff --git a/drivers/clk/actions/owl-s900.c b/drivers/clk/actions/owl-s900.c
index 790890978424a..f6f49100a865b 100644
--- a/drivers/clk/actions/owl-s900.c
+++ b/drivers/clk/actions/owl-s900.c
@@ -139,8 +139,8 @@ static struct clk_div_table rmii_ref_div_table[] = {
 };

 static struct clk_div_table usb3_mac_div_table[] = {
-	{ 1, 2 }, { 2, 3 }, { 3, 4 },
-	{ 0, 8 },
+	{ 1, 2 }, { 2, 3 }, { 3, 4 }, { 0, 8 },
+	{ 0, 0 },
 };

 static struct clk_div_table i2s_div_table[] = {
--
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/4] clk: loongson1: Terminate clk_div_table with sentinel element

[Jonathan Neuschäfer]

In order that the end of a clk_div_table can be detected, it must be
terminated with a sentinel element (.div = 0).

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 drivers/clk/loongson1/clk-loongson1c.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/loongson1/clk-loongson1c.c b/drivers/clk/loongson1/clk-loongson1c.c
index 703f87622cf5f..6b29ae9ede3e5 100644
--- a/drivers/clk/loongson1/clk-loongson1c.c
+++ b/drivers/clk/loongson1/clk-loongson1c.c
@@ -37,6 +37,7 @@ static const struct clk_div_table ahb_div_table[] = {
 	[1] = { .val = 1, .div = 4 },
 	[2] = { .val = 2, .div = 3 },
 	[3] = { .val = 3, .div = 3 },
+	[4] = { .val = 0, .div = 0 },
 };

 void __init ls1x_clk_init(void)
--
2.34.1

[PATCH 3/4] clk: hisilicon: Terminate clk_div_table with sentinel element

[Jonathan Neuschäfer]

In order that the end of a clk_div_table can be detected, it must be
terminated with a sentinel element (.div = 0).

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 drivers/clk/hisilicon/clk-hi3559a.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/hisilicon/clk-hi3559a.c b/drivers/clk/hisilicon/clk-hi3559a.c
index 56012a3d02192..28c2a0630474d 100644
--- a/drivers/clk/hisilicon/clk-hi3559a.c
+++ b/drivers/clk/hisilicon/clk-hi3559a.c
@@ -611,8 +611,8 @@ static struct hisi_mux_clock hi3559av100_shub_mux_clks[] = {


 /* shub div clk */
-static struct clk_div_table shub_spi_clk_table[] = {{0, 8}, {1, 4}, {2, 2}};
-static struct clk_div_table shub_uart_div_clk_table[] = {{1, 8}, {2, 4}};
+static struct clk_div_table shub_spi_clk_table[] = {{0, 8}, {1, 4}, {2, 2}, {}};
+static struct clk_div_table shub_uart_div_clk_table[] = {{1, 8}, {2, 4}, {}};

 static struct hisi_divider_clock hi3559av100_shub_div_clks[] = {
 	{ HI3559AV100_SHUB_SPI_SOURCE_CLK, "clk_spi_clk", "shub_clk", 0, 0x20, 24, 2,
--
2.34.1

[PATCH 4/4] clk: clps711x: Terminate clk_div_table with sentinel element

[Jonathan Neuschäfer]

In order that the end of a clk_div_table can be detected, it must be
terminated with a sentinel element (.div = 0).

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 drivers/clk/clk-clps711x.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/clk/clk-clps711x.c b/drivers/clk/clk-clps711x.c
index a2c6486ef1708..d96d96c8752c7 100644
--- a/drivers/clk/clk-clps711x.c
+++ b/drivers/clk/clk-clps711x.c
@@ -28,11 +28,13 @@ static const struct clk_div_table spi_div_table[] = {
 	{ .val = 1, .div = 8, },
 	{ .val = 2, .div = 2, },
 	{ .val = 3, .div = 1, },
+	{}
 };

 static const struct clk_div_table timer_div_table[] = {
 	{ .val = 0, .div = 256, },
 	{ .val = 1, .div = 1, },
+	{}
 };

 struct clps711x_clk {
--
2.34.1

[PATCH 4/4] clk: clps711x: Terminate clk_div_table with sentinel element

[Jonathan Neuschäfer]

In order that the end of a clk_div_table can be detected, it must be
terminated with a sentinel element (.div = 0).

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 drivers/clk/clk-clps711x.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/clk/clk-clps711x.c b/drivers/clk/clk-clps711x.c
index a2c6486ef1708..d96d96c8752c7 100644
--- a/drivers/clk/clk-clps711x.c
+++ b/drivers/clk/clk-clps711x.c
@@ -28,11 +28,13 @@ static const struct clk_div_table spi_div_table[] = {
 	{ .val = 1, .div = 8, },
 	{ .val = 2, .div = 2, },
 	{ .val = 3, .div = 1, },
+	{}
 };

 static const struct clk_div_table timer_div_table[] = {
 	{ .val = 0, .div = 256, },
 	{ .val = 1, .div = 1, },
+	{}
 };

 struct clps711x_clk {
--
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/4] clk: loongson1: Terminate clk_div_table with sentinel element

[Philippe Mathieu-Daudé]

On Mon, Jan 31, 2022 at 12:48 PM Jonathan Neuschäfer
<j.neuschaefer@gmx.net> wrote:
>
> In order that the end of a clk_div_table can be detected, it must be
> terminated with a sentinel element (.div = 0).
>
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
> ---
>  drivers/clk/loongson1/clk-loongson1c.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clk/loongson1/clk-loongson1c.c b/drivers/clk/loongson1/clk-loongson1c.c
> index 703f87622cf5f..6b29ae9ede3e5 100644
> --- a/drivers/clk/loongson1/clk-loongson1c.c
> +++ b/drivers/clk/loongson1/clk-loongson1c.c
> @@ -37,6 +37,7 @@ static const struct clk_div_table ahb_div_table[] = {
>         [1] = { .val = 1, .div = 4 },
>         [2] = { .val = 2, .div = 3 },
>         [3] = { .val = 3, .div = 3 },
> +       [4] = { .val = 0, .div = 0 },

Easier to review when self-explicit:

        [4] = { /* sentinel */ }

Preferably updated:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

And eventually:
Fixes: b4626a7f4892 ("CLK: Add Loongson1C clock support")

>  };
>
>  void __init ls1x_clk_init(void)
> --
> 2.34.1
>

Re: [PATCH 2/4] clk: loongson1: Terminate clk_div_table with sentinel element

[Jonathan Neuschäfer]

[-- Attachment #1: Type: text/plain, Size: 1294 bytes --]

On Tue, Feb 01, 2022 at 02:57:03PM +0100, Philippe Mathieu-Daudé wrote:
> On Mon, Jan 31, 2022 at 12:48 PM Jonathan Neuschäfer
> <j.neuschaefer@gmx.net> wrote:
> >
> > In order that the end of a clk_div_table can be detected, it must be
> > terminated with a sentinel element (.div = 0).
> >
> > Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
> > ---
> >  drivers/clk/loongson1/clk-loongson1c.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/clk/loongson1/clk-loongson1c.c b/drivers/clk/loongson1/clk-loongson1c.c
> > index 703f87622cf5f..6b29ae9ede3e5 100644
> > --- a/drivers/clk/loongson1/clk-loongson1c.c
> > +++ b/drivers/clk/loongson1/clk-loongson1c.c
> > @@ -37,6 +37,7 @@ static const struct clk_div_table ahb_div_table[] = {
> >         [1] = { .val = 1, .div = 4 },
> >         [2] = { .val = 2, .div = 3 },
> >         [3] = { .val = 3, .div = 3 },
> > +       [4] = { .val = 0, .div = 0 },
> 
> Easier to review when self-explicit:
> 
>         [4] = { /* sentinel */ }
> 
> Preferably updated:
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> And eventually:
> Fixes: b4626a7f4892 ("CLK: Add Loongson1C clock support")

All good suggestions, I'll incorporate them into v2.


Thanks,
Jonathan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]