Skip to contentSkip to conversation

Add q 12MHz internal clock rate to calculate

PATCH Superseded Yu Tu 4 participants 13 messages Apr 18, 2022 – Apr 21, 2022

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Yu Tu

author
#0 lore raw

v2 cover Add q 12MHz internal clock rate to calculate

1.Added 12Mhz as the clock source for calculating baud rate.

2.Added S4 SOC compatibility.

Yu Tu (2):
tty: serial: meson: Add a 12MHz internal clock rate to calculate baud
rate in order to meet the baud rate requirements of special BT modules
tty: serial: meson: Added S4 SOC compatibility

V1 -> V2: Change format as discussed in the email.

 drivers/tty/serial/meson_uart.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

base-commit: f398e0aa325c61fa20903833a5b534ecb8e6e418

Signature · 1 line
2.33.1
author
#1 lore raw

PATCH v2 1/2 tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

A /2 divider over XTAL was introduced since G12A, and is preferred to be used over the still present /3 divider since it provides much closer frequencies vs the request baudrate.Especially the BT module uses 3Mhz baud rate. 8Mhz calculations can lead to baud rate bias, causing some problems.

---
 drivers/tty/serial/meson_uart.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/tty/serial/meson_uart.c +15 -2
index 8e59624935af..58bd2723c004 100644
@@ -68,6 +68,7 @@
 #define AML_UART_BAUD_MASK		0x7fffff
 #define AML_UART_BAUD_USE		BIT(23)
 #define AML_UART_BAUD_XTAL		BIT(24)
+#define AML_UART_BAUD_XTAL_DIV2		BIT(27)
 
 #define AML_UART_PORT_NUM		12
 #define AML_UART_PORT_OFFSET		6
@@ -80,6 +81,10 @@ static struct uart_driver meson_uart_driver;
 
 static struct uart_port *meson_ports[AML_UART_PORT_NUM];
 
+struct meson_uart_data {
+	bool has_xtal_div2;
+};
+
 static void meson_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
 }
@@ -293,13 +298,20 @@ static int meson_uart_startup(struct uart_port *port)
 
 static void meson_uart_change_speed(struct uart_port *port, unsigned long baud)
 {
-	u32 val;
+	const struct meson_uart_data *private_data = port->private_data;
+	u32 val = 0;
 
 	while (!meson_uart_tx_empty(port))
 		cpu_relax();
 
 	if (port->uartclk == 24000000) {
-		val = DIV_ROUND_CLOSEST(port->uartclk / 3, baud) - 1;
+		unsigned int xtal_div = 3;
+
+		if (private_data && private_data->has_xtal_div2) {
+			xtal_div = 2;
+			val |= AML_UART_BAUD_XTAL_DIV2;
+		}
+		val |= DIV_ROUND_CLOSEST(port->uartclk / xtal_div, baud) - 1;
 		val |= AML_UART_BAUD_XTAL;
 	} else {
 		val =  DIV_ROUND_CLOSEST(port->uartclk / 4, baud) - 1;
@@ -749,6 +761,7 @@ static int meson_uart_probe(struct platform_device *pdev)
 	port->x_char = 0;
 	port->ops = &meson_uart_ops;
 	port->fifosize = fifosize;
+	port->private_data = (void *)device_get_match_data(&pdev->dev);
 
 	meson_ports[pdev->id] = port;
 	platform_set_drvdata(pdev, port);
Signature · 1 line
2.33.1
#2 lore raw

Re: [PATCH V2 1/2] tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

Quoted 4 lines · Yu Tu

A /2 divider over XTAL was introduced since G12A, and is preferred to be used over the still present /3 divider since it provides much closer frequencies vs the request baudrate.Especially the BT module

'e. E' (mind the space)

Quoted 2 lines

uses 3Mhz baud rate. 8Mhz calculations can lead to baud rate bias, causing some problems.

...

drivers/tty/serial/meson_uart.c static struct uart_driver meson_uart_driver; · line 85

Quoted 2 lines
drivers/tty/serial/meson_uart.c +2 -0
+struct meson_uart_data {
+       bool has_xtal_div2;

I would prefer to see this as an unsigned int and with a less particular name, e.g. xtal_div would suffice.

Quoted 1 line

+};

...

drivers/tty/serial/meson_uart.c static int meson_uart_startup(struct uart_port *port) · line 311

Quoted 4 lines
drivers/tty/serial/meson_uart.c +3 -0
+               unsigned int xtal_div = 3;
 
+               if (private_data && private_data->has_xtal_div2) {
+                       xtal_div = 2;

Better to define privata data always

Quoted 3 lines
drivers/tty/serial/meson_uart.c +3 -0
+                       val |= AML_UART_BAUD_XTAL_DIV2;
+               }
+               val |= DIV_ROUND_CLOSEST(port->uartclk / xtal_div, baud) - 1;
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author
#3 lore raw

Re: [PATCH V2 1/2] tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

Hi Andy,
Thank you for your advice.

Quoted 9 lines · Andy Shevchenko

[ EXTERNAL EMAIL ]

Quoted 4 lines · Yu Tu

A /2 divider over XTAL was introduced since G12A, and is preferred to be used over the still present /3 divider since it provides much closer frequencies vs the request baudrate.Especially the BT module

'e. E' (mind the space)

My statement is a whole. There should be no spaces.

Quoted 11 lines
Quoted 3 lines

uses 3Mhz baud rate. 8Mhz calculations can lead to baud rate bias, causing some problems.

...

drivers/tty/serial/meson_uart.c static struct uart_driver meson_uart_driver; · line 85

Quoted 2 lines
drivers/tty/serial/meson_uart.c +2 -0
+struct meson_uart_data {
+       bool has_xtal_div2;

I would prefer to see this as an unsigned int and with a less particular name, e.g. xtal_div would suffice.

I don't have a problem with your suggestion.Let's see What Neil has to say.

Quoted 18 lines
Quoted 2 lines

+};

...

drivers/tty/serial/meson_uart.c static int meson_uart_startup(struct uart_port *port) · line 311

Quoted 4 lines
drivers/tty/serial/meson_uart.c +3 -0
+               unsigned int xtal_div = 3;
 
+               if (private_data && private_data->has_xtal_div2) {
+                       xtal_div = 2;

Better to define privata data always

Quoted 3 lines
drivers/tty/serial/meson_uart.c +3 -0
+                       val |= AML_UART_BAUD_XTAL_DIV2;
+               }
+               val |= DIV_ROUND_CLOSEST(port->uartclk / xtal_div, baud) - 1;
maintainer
#4 lore raw

Re: [PATCH V2 1/2] tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

Hi,

Quoted 6 lines · Yu Tu

Hi Andy,
    Thank you for your advice.

Quoted 2 lines · Andy Shevchenko

[ EXTERNAL EMAIL ]

Quoted 8 lines
Quoted 7 lines · Yu Tu
Quoted 4 lines

A /2 divider over XTAL was introduced since G12A, and is preferred to be used over the still present /3 divider since it provides much closer frequencies vs the request baudrate.Especially the BT module

'e. E' (mind the space)

My statement is a whole. There should be no spaces.

Period should be followed by a space, of course.

Quoted 11 lines
Quoted 10 lines
Quoted 2 lines

uses 3Mhz baud rate. 8Mhz calculations can lead to baud rate bias, causing some problems.

...

Quoted 2 lines

+struct meson_uart_data {
+       bool has_xtal_div2;

I would prefer to see this as an unsigned int and with a less particular name, e.g. xtal_div would suffice.

I don't have a problem with your suggestion.Let's see What Neil has to say.

Actually why uint provided it's a boolean value? Or do you mean to store the divisor directly in this member, Andy?

thanks,

Signature · 2 lines
js
suse labs
#5 lore raw

Re: [PATCH V2 1/2] tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

Quoted 3 lines · Jiri Slaby
Quoted 2 lines · Yu Tu
Quoted 1 line · Andy Shevchenko

On Mon, Apr 18, 2022 at 8:50 AM Yu Tu <[email protected]> wrote:

...

Quoted 9 lines
Quoted 6 lines
Quoted 5 lines

drivers/tty/serial/meson_uart.c static struct uart_driver meson_uart_driver; · line 85

Quoted 2 lines
drivers/tty/serial/meson_uart.c +2 -0
+struct meson_uart_data {
+       bool has_xtal_div2;

I would prefer to see this as an unsigned int and with a less particular name, e.g. xtal_div would suffice.

I don't have a problem with your suggestion.Let's see What Neil has to say.

Actually why uint provided it's a boolean value? Or do you mean to store the divisor directly in this member, Andy?

Yes I was thinking to provide the value and then always provide the private data. In such cases we don't need an additional condition.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw

Re: [PATCH V2 1/2] tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

Hi Andy,

Quoted 12 lines · Andy Shevchenko
Quoted 3 lines · Jiri Slaby
Quoted 2 lines · Yu Tu
Quoted 1 line · Andy Shevchenko

On Mon, Apr 18, 2022 at 8:50 AM Yu Tu <[email protected]> wrote:

...

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

drivers/tty/serial/meson_uart.c static struct uart_driver meson_uart_driver; · line 85

Quoted 2 lines
drivers/tty/serial/meson_uart.c +2 -0
+struct meson_uart_data {
+       bool has_xtal_div2;

I would prefer to see this as an unsigned int and with a less particular name, e.g. xtal_div would suffice.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

I don't have a problem with your suggestion.Let's see What Neil has to say.

Actually why uint provided it's a boolean value? Or do you mean to store the divisor directly in this member, Andy?

Yes I was thinking to provide the value and then always provide the private data. In such cases we don't need an additional condition.

Actually, the original boolean "has_xtal_div2" is right because it encodes if the HW has an internal /2 divider for the XTAL clock input path.

The HW historically has a /3 divider on the same path, and new HW now has both.

So the boolean indicates if the /2 divider is present so it can be used.

So I'm in favour of keeping the boolean type.
For the naming, it seems appropriate for me.

Neil

author
#7 lore raw

Re: [PATCH V2 1/2] tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

In reply to Jiri Slaby

Hi Jiri,
Thanks for the tip.

Quoted 13 lines · Jiri Slaby

[ EXTERNAL EMAIL ]

Hi,

Quoted 8 lines · Yu Tu

Hi Andy,
     Thank you for your advice.

Quoted 4 lines · Andy Shevchenko

[ EXTERNAL EMAIL ]

Quoted 1 line · Yu Tu
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines

A /2 divider over XTAL was introduced since G12A, and is preferred to be used over the still present /3 divider since it provides much closer frequencies vs the request baudrate.Especially the BT module

'e. E' (mind the space)

My statement is a whole. There should be no spaces.

Period should be followed by a space, of course.

I got it .This will be corrected in the next version.

Quoted 16 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines

uses 3Mhz baud rate. 8Mhz calculations can lead to baud rate bias, causing some problems.

Quoted 8 lines
Quoted 7 lines

...

Quoted 2 lines

+struct meson_uart_data {
+       bool has_xtal_div2;

I would prefer to see this as an unsigned int and with a less particular name, e.g. xtal_div would suffice.

I don't have a problem with your suggestion.Let's see What Neil has to say.

Actually why uint provided it's a boolean value? Or do you mean to store the divisor directly in this member, Andy?

thanks,

#8 lore raw

Re: [PATCH V2 1/2] tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

In reply to Andy Shevchenko

Hi Andy,

Quoted 21 lines · Andy Shevchenko
Quoted 4 lines · Yu Tu

A /2 divider over XTAL was introduced since G12A, and is preferred to be used over the still present /3 divider since it provides much closer frequencies vs the request baudrate.Especially the BT module

'e. E' (mind the space)

Quoted 2 lines

uses 3Mhz baud rate. 8Mhz calculations can lead to baud rate bias, causing some problems.

...

drivers/tty/serial/meson_uart.c static struct uart_driver meson_uart_driver; · line 85

Quoted 2 lines
drivers/tty/serial/meson_uart.c +2 -0
+struct meson_uart_data {
+       bool has_xtal_div2;

I would prefer to see this as an unsigned int and with a less particular name, e.g. xtal_div would suffice.

Quoted 1 line

+};

Quoted 8 lines

...

drivers/tty/serial/meson_uart.c static int meson_uart_startup(struct uart_port *port) · line 311

Quoted 4 lines
drivers/tty/serial/meson_uart.c +3 -0
+               unsigned int xtal_div = 3;
 
+               if (private_data && private_data->has_xtal_div2) {
+                       xtal_div = 2;

Better to define privata data always

While I'm in favor of defining private data, here 3 and 2 are actually the values 2 and 3 used to divide.

The code is easy to read and we quickly understand this value is the clock divider.

Quoted 7 lines
Quoted 5 lines
drivers/tty/serial/meson_uart.c +3 -0
+                       val |= AML_UART_BAUD_XTAL_DIV2;
+               }
+               val |= DIV_ROUND_CLOSEST(port->uartclk / xtal_div, baud) - 1;
author
#9 lore raw

Re: [PATCH V2 1/2] tty: serial: meson: Add a 12MHz internal clock rate to calculate baud rate in order to meet the baud rate requirements of special BT modules

Hi Neil,

Quoted 33 lines · Neil Armstrong

[ EXTERNAL EMAIL ]

Hi Andy,

Quoted 28 lines · Andy Shevchenko
Quoted 4 lines · Yu Tu

A /2 divider over XTAL was introduced since G12A, and is preferred to be used over the still present /3 divider since it provides much closer frequencies vs the request baudrate.Especially the BT module

'e. E' (mind the space)

Quoted 2 lines

uses 3Mhz baud rate. 8Mhz calculations can lead to baud rate bias, causing some problems.

...

Quoted 2 lines

+struct meson_uart_data {
+       bool has_xtal_div2;

I would prefer to see this as an unsigned int and with a less particular name, e.g. xtal_div would suffice.

Quoted 1 line

+};

...

Quoted 4 lines

+               unsigned int xtal_div = 3;

+               if (private_data && private_data->has_xtal_div2) { +                       xtal_div = 2;

Quoted 7 lines
Quoted 1 line

Better to define privata data always

While I'm in favor of defining private data, here 3 and 2 are actually the values 2 and 3 used to divide.

The code is easy to read and we quickly understand this value is the clock divider.

Therefore, this place should be modified according to your previous suggestion.I will prepare the next version.

Quoted 10 lines
Quoted 8 lines
Quoted 6 lines

+                       val |= AML_UART_BAUD_XTAL_DIV2; +               }
+               val |= DIV_ROUND_CLOSEST(port->uartclk / xtal_div, baud) - 1;

.

author
#10 lore raw

PATCH v2 2/2 tty: serial: meson: Added S4 SOC compatibility

In reply to Yu Tu

Make UART driver compatible with S4 SOC UART. Meanwhile, the S4 SOC UART uses 12MHz as the clock source for baud rate calculations.

---
 drivers/tty/serial/meson_uart.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/tty/serial/meson_uart.c +8 -0
index 58bd2723c004..43941f21735f 100644
@@ -790,11 +790,19 @@ static int meson_uart_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static struct meson_uart_data s4_uart_date = {
+	.has_xtal_div2 = true,
+};
+
 static const struct of_device_id meson_uart_dt_match[] = {
 	{ .compatible = "amlogic,meson6-uart" },
 	{ .compatible = "amlogic,meson8-uart" },
 	{ .compatible = "amlogic,meson8b-uart" },
 	{ .compatible = "amlogic,meson-gx-uart" },
+	{
+		.compatible = "amlogic,meson-s4-uart",
+		.data = (void *)&s4_uart_date,
+	},
 	{ /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, meson_uart_dt_match);
Signature · 1 line
2.33.1
#11 lore raw

Re: [PATCH V2 2/2] tty: serial: meson: Added S4 SOC compatibility

Quoted 13 lines · Yu Tu

Make UART driver compatible with S4 SOC UART. Meanwhile, the S4 SOC UART uses 12MHz as the clock source for baud rate calculations.

---
  drivers/tty/serial/meson_uart.c | 8 ++++++++
  1 file changed, 8 insertions(+)
drivers/tty/serial/meson_uart.c +0 -0
index 58bd2723c004..43941f21735f 100644

drivers/tty/serial/meson_uart.c static int meson_uart_remove(struct platform_device *pdev) · line 793

Quoted 4 lines
drivers/tty/serial/meson_uart.c +1 -0
@@ -790,11 +790,19 @@ static int meson_uart_remove(struct platform_device *pdev)
  	return 0;
  }
 
+static struct meson_uart_data s4_uart_date = {

Should be s4_uart_data instead of s4_uart_date

drivers/tty/serial/meson_uart.c static int meson_uart_remove(struct platform_device *pdev) · line 804

Quoted 11 lines
drivers/tty/serial/meson_uart.c +6 -0
+	.has_xtal_div2 = true,
+};
+
  static const struct of_device_id meson_uart_dt_match[] = {
  	{ .compatible = "amlogic,meson6-uart" },
  	{ .compatible = "amlogic,meson8-uart" },
  	{ .compatible = "amlogic,meson8b-uart" },
  	{ .compatible = "amlogic,meson-gx-uart" },
+	{
+		.compatible = "amlogic,meson-s4-uart",
+		.data = (void *)&s4_uart_date,

Here same

drivers/tty/serial/meson_uart.c static int meson_uart_remove(struct platform_device *pdev) · line 808

Quoted 4 lines
drivers/tty/serial/meson_uart.c +1 -0
+	},
  	{ /* sentinel */ },
  };
  MODULE_DEVICE_TABLE(of, meson_uart_dt_match);

With this change, it's fine for me.

Neil

author
#12 lore raw

Re: [PATCH V2 2/2] tty: serial: meson: Added S4 SOC compatibility

Quoted 11 lines · Neil Armstrong

[ EXTERNAL EMAIL ]

Quoted 8 lines · Yu Tu

Make UART driver compatible with S4 SOC UART. Meanwhile, the S4 SOC UART uses 12MHz as the clock source for baud rate calculations.

---
  drivers/tty/serial/meson_uart.c | 8 ++++++++

  1 file changed, 8 insertions(+)
Quoted 12 lines

drivers/tty/serial/meson_uart.c static int meson_uart_remove(struct · line 793

Quoted 9 lines
drivers/tty/serial/meson_uart.c +1 -0
index 58bd2723c004..43941f21735f 100644
@@ -790,11 +790,19 @@ static int meson_uart_remove(struct 
 platform_device *pdev)
       return 0;
   }
+static struct meson_uart_data s4_uart_date = {

Should be s4_uart_data instead of s4_uart_date

I will prepare the next version and correct it.

Quoted 23 lines

drivers/tty/serial/meson_uart.c static int meson_uart_remove(struct platform_device *pdev) · line 804

Quoted 11 lines
drivers/tty/serial/meson_uart.c +6 -0
+    .has_xtal_div2 = true,
+};
+
   static const struct of_device_id meson_uart_dt_match[] = {
       { .compatible = "amlogic,meson6-uart" },
       { .compatible = "amlogic,meson8-uart" },
       { .compatible = "amlogic,meson8b-uart" },
       { .compatible = "amlogic,meson-gx-uart" },
+    {
+        .compatible = "amlogic,meson-s4-uart",
+        .data = (void *)&s4_uart_date,

Here same

drivers/tty/serial/meson_uart.c static int meson_uart_remove(struct platform_device *pdev) · line 808

Quoted 4 lines
drivers/tty/serial/meson_uart.c +1 -0
+    },
       { /* sentinel */ },
   };
   MODULE_DEVICE_TABLE(of, meson_uart_dt_match);

With this change, it's fine for me.

Neil

.