[PATCH] ACPI: SPCR: Support Precise Baud Rate filed

cp0613@linux.alibaba.com posted 1 patch 2 weeks, 6 days ago
There is a newer version of this series
drivers/acpi/spcr.c | 56 ++++++++++++++++++++++++++-------------------
1 file changed, 33 insertions(+), 23 deletions(-)
[PATCH] ACPI: SPCR: Support Precise Baud Rate filed
Posted by cp0613@linux.alibaba.com 2 weeks, 6 days ago
From: Chen Pei <cp0613@linux.alibaba.com>

The Microsoft Serial Port Console Redirection (SPCR) specification
revision 1.09 comprises additional field: Precise Baud Rate [1].

It is used to describe non-traditional baud rates (such as those
used by high-speed UARTs).

It contains a specific non-zero baud rate which overrides the value
of the Configured Baud Rate field. If this field is zero or not
present, Configured Baud Rate is used.

Link: https://learn.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table # 1

Signed-off-by: Chen Pei <cp0613@linux.alibaba.com>
---
 drivers/acpi/spcr.c | 56 ++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
index cd36a97b0ea2..69142c2ac4b3 100644
--- a/drivers/acpi/spcr.c
+++ b/drivers/acpi/spcr.c
@@ -146,29 +146,39 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)
 		goto done;
 	}
 
-	switch (table->baud_rate) {
-	case 0:
-		/*
-		 * SPCR 1.04 defines 0 as a preconfigured state of UART.
-		 * Assume firmware or bootloader configures console correctly.
-		 */
-		baud_rate = 0;
-		break;
-	case 3:
-		baud_rate = 9600;
-		break;
-	case 4:
-		baud_rate = 19200;
-		break;
-	case 6:
-		baud_rate = 57600;
-		break;
-	case 7:
-		baud_rate = 115200;
-		break;
-	default:
-		err = -ENOENT;
-		goto done;
+	/*
+	 * SPCR 1.09 defines Precise Baud Rate Filed contains a specific
+	 * non-zero baud rate which overrides the value of the Configured
+	 * Baud Rate field. If this field is zero or not present, Configured
+	 * Baud Rate is used.
+	 */
+	if (table->precise_baudrate)
+		baud_rate = table->precise_baudrate;
+	else {
+		switch (table->baud_rate) {
+		case 0:
+			/*
+			 * SPCR 1.04 defines 0 as a preconfigured state of UART.
+			 * Assume firmware or bootloader configures console correctly.
+			 */
+			baud_rate = 0;
+			break;
+		case 3:
+			baud_rate = 9600;
+			break;
+		case 4:
+			baud_rate = 19200;
+			break;
+		case 6:
+			baud_rate = 57600;
+			break;
+		case 7:
+			baud_rate = 115200;
+			break;
+		default:
+			err = -ENOENT;
+			goto done;
+		}
 	}
 
 	/*
-- 
2.49.0
Re: [PATCH] ACPI: SPCR: Support Precise Baud Rate filed
Posted by Rafael J. Wysocki 2 weeks, 6 days ago
On Fri, Sep 12, 2025 at 10:58 AM <cp0613@linux.alibaba.com> wrote:
>
> From: Chen Pei <cp0613@linux.alibaba.com>
>
> The Microsoft Serial Port Console Redirection (SPCR) specification
> revision 1.09 comprises additional field: Precise Baud Rate [1].
>
> It is used to describe non-traditional baud rates (such as those
> used by high-speed UARTs).
>
> It contains a specific non-zero baud rate which overrides the value
> of the Configured Baud Rate field. If this field is zero or not
> present, Configured Baud Rate is used.
>
> Link: https://learn.microsoft.com/en-us/windows-hardware/drivers/serports/serial-port-console-redirection-table # 1
>
> Signed-off-by: Chen Pei <cp0613@linux.alibaba.com>
> ---
>  drivers/acpi/spcr.c | 56 ++++++++++++++++++++++++++-------------------
>  1 file changed, 33 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
> index cd36a97b0ea2..69142c2ac4b3 100644
> --- a/drivers/acpi/spcr.c
> +++ b/drivers/acpi/spcr.c
> @@ -146,29 +146,39 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)
>                 goto done;
>         }
>
> -       switch (table->baud_rate) {
> -       case 0:
> -               /*
> -                * SPCR 1.04 defines 0 as a preconfigured state of UART.
> -                * Assume firmware or bootloader configures console correctly.
> -                */
> -               baud_rate = 0;
> -               break;
> -       case 3:
> -               baud_rate = 9600;
> -               break;
> -       case 4:
> -               baud_rate = 19200;
> -               break;
> -       case 6:
> -               baud_rate = 57600;
> -               break;
> -       case 7:
> -               baud_rate = 115200;
> -               break;
> -       default:
> -               err = -ENOENT;
> -               goto done;
> +       /*
> +        * SPCR 1.09 defines Precise Baud Rate Filed contains a specific
> +        * non-zero baud rate which overrides the value of the Configured
> +        * Baud Rate field. If this field is zero or not present, Configured
> +        * Baud Rate is used.
> +        */
> +       if (table->precise_baudrate)
> +               baud_rate = table->precise_baudrate;
> +       else {

The outer braces here are redundant and if you combined the "else"
above with the "switch ()" statement below in one line, the patch
would be smaller.

> +               switch (table->baud_rate) {
> +               case 0:
> +                       /*
> +                        * SPCR 1.04 defines 0 as a preconfigured state of UART.
> +                        * Assume firmware or bootloader configures console correctly.
> +                        */
> +                       baud_rate = 0;
> +                       break;
> +               case 3:
> +                       baud_rate = 9600;
> +                       break;
> +               case 4:
> +                       baud_rate = 19200;
> +                       break;
> +               case 6:
> +                       baud_rate = 57600;
> +                       break;
> +               case 7:
> +                       baud_rate = 115200;
> +                       break;
> +               default:
> +                       err = -ENOENT;
> +                       goto done;
> +               }
>         }
>
>         /*
> --
Re: [PATCH] ACPI: SPCR: Support Precise Baud Rate filed
Posted by cp0613@linux.alibaba.com 2 weeks, 6 days ago
On Fri, 12 Sep 2025 11:29:44 +0200, rafael@kernel.org wrote:

> > +       if (table->precise_baudrate)
> > +               baud_rate =3D table->precise_baudrate;
> > +       else {> 

> The outer braces here are redundant and if you combined the "else"
> above with the "switch ()" statement below in one line, the patch
> would be smaller.> 

> > +               switch (table->baud_rate) {
> > +               case 0:

Thanks for your suggestion. I will modify it.