2021-07-14 22:25:54

by Marcin Wojtas

[permalink] [raw]
Subject: [PATCH 0/2] ACPI: Update DBG2 Serial Port Subtypes list

Hi,

This short patchset adds support for the new 16550-compatible
serial port subtype in the spcr.c driver, using the definition from
updated ACPICA header.

I'm looking forward to the comments or remarks.

Best regards,
Marcin

Marcin Wojtas (2):
ACPICA: Add new DBG2 Serial Port Subtypes
ACPI: SPCR: Add support for the new 16550-compatible Serial Port
Subtype

include/acpi/actbl1.h | 15 ++++++++++++++-
drivers/acpi/spcr.c | 1 +
2 files changed, 15 insertions(+), 1 deletion(-)

--
2.29.0


2021-07-14 22:27:03

by Marcin Wojtas

[permalink] [raw]
Subject: [PATCH 2/2] ACPI: SPCR: Add support for the new 16550-compatible Serial Port Subtype

The Microsoft Debug Port Table 2 (DBG2) specification revision
May 31, 2017 added definition of the 16550-compatible Serial Port
Subtype with parameters defined in Generic Address Structure (GAS) [1]

Add its support in the SPCR table parsing routine.

[1] https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi-debug-port-table

Signed-off-by: Marcin Wojtas <[email protected]>
---
drivers/acpi/spcr.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
index 88460bacd5ae..25c2d0be953e 100644
--- a/drivers/acpi/spcr.c
+++ b/drivers/acpi/spcr.c
@@ -136,6 +136,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)
break;
case ACPI_DBG2_16550_COMPATIBLE:
case ACPI_DBG2_16550_SUBSET:
+ case ACPI_DBG2_16550_WITH_GAS:
uart = "uart";
break;
default:
--
2.29.0

2021-07-14 23:35:18

by Marcin Wojtas

[permalink] [raw]
Subject: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes

ACPICA commit d95c7d206b5836c7770e8e9cd613859887fded8f

The Microsoft Debug Port Table 2 (DBG2) specification revision
September 21, 2020 comprises additional Serial Port Subtypes [1].
Reflect that in the actbl1.h header file.

[1] https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi-debug-port-table

Link: https://github.com/acpica/acpica/commit/d95c7d20
Signed-off-by: Marcin Wojtas <[email protected]>
---
include/acpi/actbl1.h | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index ef2872dea01c..7bbb3e2bd33f 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -482,7 +482,7 @@ struct acpi_csrt_descriptor {
* DBG2 - Debug Port Table 2
* Version 0 (Both main table and subtables)
*
- * Conforms to "Microsoft Debug Port Table 2 (DBG2)", December 10, 2015
+ * Conforms to "Microsoft Debug Port Table 2 (DBG2)", September 21, 2020
*
******************************************************************************/

@@ -532,11 +532,24 @@ struct acpi_dbg2_device {

#define ACPI_DBG2_16550_COMPATIBLE 0x0000
#define ACPI_DBG2_16550_SUBSET 0x0001
+#define ACPI_DBG2_MAX311XE_SPI 0x0002
#define ACPI_DBG2_ARM_PL011 0x0003
+#define ACPI_DBG2_MSM8X60 0x0004
+#define ACPI_DBG2_16550_NVIDIA 0x0005
+#define ACPI_DBG2_TI_OMAP 0x0006
+#define ACPI_DBG2_APM88XXXX 0x0008
+#define ACPI_DBG2_MSM8974 0x0009
+#define ACPI_DBG2_SAM5250 0x000A
+#define ACPI_DBG2_INTEL_USIF 0x000B
+#define ACPI_DBG2_IMX6 0x000C
#define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
#define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
#define ACPI_DBG2_ARM_DCC 0x000F
#define ACPI_DBG2_BCM2835 0x0010
+#define ACPI_DBG2_SDM845_1_8432MHZ 0x0011
+#define ACPI_DBG2_16550_WITH_GAS 0x0012
+#define ACPI_DBG2_SDM845_7_372MHZ 0x0013
+#define ACPI_DBG2_INTEL_LPSS 0x0014

#define ACPI_DBG2_1394_STANDARD 0x0000

--
2.29.0

2021-07-15 14:20:04

by Moore, Robert

[permalink] [raw]
Subject: RE: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes

This was already reported (with a patch that we've already merged) by semihalf-wojtas-marcin

-----Original Message-----
From: Marcin Wojtas <[email protected]>
Sent: Wednesday, July 14, 2021 2:44 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Moore, Robert <[email protected]>; Marcin Wojtas <[email protected]>
Subject: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes

ACPICA commit d95c7d206b5836c7770e8e9cd613859887fded8f

The Microsoft Debug Port Table 2 (DBG2) specification revision September 21, 2020 comprises additional Serial Port Subtypes [1].
Reflect that in the actbl1.h header file.

[1] https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi-debug-port-table

Link: https://github.com/acpica/acpica/commit/d95c7d20
Signed-off-by: Marcin Wojtas <[email protected]>
---
include/acpi/actbl1.h | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index ef2872dea01c..7bbb3e2bd33f 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -482,7 +482,7 @@ struct acpi_csrt_descriptor {
* DBG2 - Debug Port Table 2
* Version 0 (Both main table and subtables)
*
- * Conforms to "Microsoft Debug Port Table 2 (DBG2)", December 10, 2015
+ * Conforms to "Microsoft Debug Port Table 2 (DBG2)", September 21,
+ 2020
*
******************************************************************************/

@@ -532,11 +532,24 @@ struct acpi_dbg2_device {

#define ACPI_DBG2_16550_COMPATIBLE 0x0000
#define ACPI_DBG2_16550_SUBSET 0x0001
+#define ACPI_DBG2_MAX311XE_SPI 0x0002
#define ACPI_DBG2_ARM_PL011 0x0003
+#define ACPI_DBG2_MSM8X60 0x0004
+#define ACPI_DBG2_16550_NVIDIA 0x0005
+#define ACPI_DBG2_TI_OMAP 0x0006
+#define ACPI_DBG2_APM88XXXX 0x0008
+#define ACPI_DBG2_MSM8974 0x0009
+#define ACPI_DBG2_SAM5250 0x000A
+#define ACPI_DBG2_INTEL_USIF 0x000B
+#define ACPI_DBG2_IMX6 0x000C
#define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
#define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
#define ACPI_DBG2_ARM_DCC 0x000F
#define ACPI_DBG2_BCM2835 0x0010
+#define ACPI_DBG2_SDM845_1_8432MHZ 0x0011
+#define ACPI_DBG2_16550_WITH_GAS 0x0012
+#define ACPI_DBG2_SDM845_7_372MHZ 0x0013
+#define ACPI_DBG2_INTEL_LPSS 0x0014

#define ACPI_DBG2_1394_STANDARD 0x0000

--
2.29.0

2021-07-15 16:47:21

by Marcin Wojtas

[permalink] [raw]
Subject: Re: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes

Hi,


czw., 15 lip 2021 o 16:07 Moore, Robert <[email protected]> napisał(a):
>
> This was already reported (with a patch that we've already merged) by semihalf-wojtas-marcin
>

I'm not sure to be aware of the process. Reported where?
Are you planning to import the upstream patch on your own and I should
rebase the SPCR driver change on top once it lands?

Best regards,
Marcin

> -----Original Message-----
> From: Marcin Wojtas <[email protected]>
> Sent: Wednesday, July 14, 2021 2:44 PM
> To: [email protected]; [email protected]; [email protected]
> Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Moore, Robert <[email protected]>; Marcin Wojtas <[email protected]>
> Subject: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes
>
> ACPICA commit d95c7d206b5836c7770e8e9cd613859887fded8f
>
> The Microsoft Debug Port Table 2 (DBG2) specification revision September 21, 2020 comprises additional Serial Port Subtypes [1].
> Reflect that in the actbl1.h header file.
>
> [1] https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi-debug-port-table
>
> Link: https://github.com/acpica/acpica/commit/d95c7d20
> Signed-off-by: Marcin Wojtas <[email protected]>
> ---
> include/acpi/actbl1.h | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index ef2872dea01c..7bbb3e2bd33f 100644
> --- a/include/acpi/actbl1.h
> +++ b/include/acpi/actbl1.h
> @@ -482,7 +482,7 @@ struct acpi_csrt_descriptor {
> * DBG2 - Debug Port Table 2
> * Version 0 (Both main table and subtables)
> *
> - * Conforms to "Microsoft Debug Port Table 2 (DBG2)", December 10, 2015
> + * Conforms to "Microsoft Debug Port Table 2 (DBG2)", September 21,
> + 2020
> *
> ******************************************************************************/
>
> @@ -532,11 +532,24 @@ struct acpi_dbg2_device {
>
> #define ACPI_DBG2_16550_COMPATIBLE 0x0000
> #define ACPI_DBG2_16550_SUBSET 0x0001
> +#define ACPI_DBG2_MAX311XE_SPI 0x0002
> #define ACPI_DBG2_ARM_PL011 0x0003
> +#define ACPI_DBG2_MSM8X60 0x0004
> +#define ACPI_DBG2_16550_NVIDIA 0x0005
> +#define ACPI_DBG2_TI_OMAP 0x0006
> +#define ACPI_DBG2_APM88XXXX 0x0008
> +#define ACPI_DBG2_MSM8974 0x0009
> +#define ACPI_DBG2_SAM5250 0x000A
> +#define ACPI_DBG2_INTEL_USIF 0x000B
> +#define ACPI_DBG2_IMX6 0x000C
> #define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
> #define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
> #define ACPI_DBG2_ARM_DCC 0x000F
> #define ACPI_DBG2_BCM2835 0x0010
> +#define ACPI_DBG2_SDM845_1_8432MHZ 0x0011
> +#define ACPI_DBG2_16550_WITH_GAS 0x0012
> +#define ACPI_DBG2_SDM845_7_372MHZ 0x0013
> +#define ACPI_DBG2_INTEL_LPSS 0x0014
>
> #define ACPI_DBG2_1394_STANDARD 0x0000
>
> --
> 2.29.0
>

2021-07-15 16:51:34

by Moore, Robert

[permalink] [raw]
Subject: RE: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes

The patch was posted as a pull request on our github site.

The merged patch will be released as part of the normal ACPICA release process, which will then make it into Linux. You should then rebase.
Bob


-----Original Message-----
From: Marcin Wojtas <[email protected]>
Sent: Thursday, July 15, 2021 7:17 AM
To: Moore, Robert <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes

Hi,


czw., 15 lip 2021 o 16:07 Moore, Robert <[email protected]> napisał(a):
>
> This was already reported (with a patch that we've already merged) by
> semihalf-wojtas-marcin
>

I'm not sure to be aware of the process. Reported where?
Are you planning to import the upstream patch on your own and I should rebase the SPCR driver change on top once it lands?

Best regards,
Marcin

> -----Original Message-----
> From: Marcin Wojtas <[email protected]>
> Sent: Wednesday, July 14, 2021 2:44 PM
> To: [email protected]; [email protected];
> [email protected]
> Cc: [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; Moore, Robert
> <[email protected]>; Marcin Wojtas <[email protected]>
> Subject: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes
>
> ACPICA commit d95c7d206b5836c7770e8e9cd613859887fded8f
>
> The Microsoft Debug Port Table 2 (DBG2) specification revision September 21, 2020 comprises additional Serial Port Subtypes [1].
> Reflect that in the actbl1.h header file.
>
> [1]
> https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi
> -debug-port-table
>
> Link: https://github.com/acpica/acpica/commit/d95c7d20
> Signed-off-by: Marcin Wojtas <[email protected]>
> ---
> include/acpi/actbl1.h | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index
> ef2872dea01c..7bbb3e2bd33f 100644
> --- a/include/acpi/actbl1.h
> +++ b/include/acpi/actbl1.h
> @@ -482,7 +482,7 @@ struct acpi_csrt_descriptor {
> * DBG2 - Debug Port Table 2
> * Version 0 (Both main table and subtables)
> *
> - * Conforms to "Microsoft Debug Port Table 2 (DBG2)", December 10,
> 2015
> + * Conforms to "Microsoft Debug Port Table 2 (DBG2)", September 21,
> + 2020
> *
>
> **********************************************************************
> ********/
>
> @@ -532,11 +532,24 @@ struct acpi_dbg2_device {
>
> #define ACPI_DBG2_16550_COMPATIBLE 0x0000
> #define ACPI_DBG2_16550_SUBSET 0x0001
> +#define ACPI_DBG2_MAX311XE_SPI 0x0002
> #define ACPI_DBG2_ARM_PL011 0x0003
> +#define ACPI_DBG2_MSM8X60 0x0004
> +#define ACPI_DBG2_16550_NVIDIA 0x0005
> +#define ACPI_DBG2_TI_OMAP 0x0006
> +#define ACPI_DBG2_APM88XXXX 0x0008
> +#define ACPI_DBG2_MSM8974 0x0009
> +#define ACPI_DBG2_SAM5250 0x000A
> +#define ACPI_DBG2_INTEL_USIF 0x000B
> +#define ACPI_DBG2_IMX6 0x000C
> #define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
> #define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
> #define ACPI_DBG2_ARM_DCC 0x000F
> #define ACPI_DBG2_BCM2835 0x0010
> +#define ACPI_DBG2_SDM845_1_8432MHZ 0x0011
> +#define ACPI_DBG2_16550_WITH_GAS 0x0012
> +#define ACPI_DBG2_SDM845_7_372MHZ 0x0013
> +#define ACPI_DBG2_INTEL_LPSS 0x0014
>
> #define ACPI_DBG2_1394_STANDARD 0x0000
>
> --
> 2.29.0
>

2021-07-15 16:52:33

by Marcin Wojtas

[permalink] [raw]
Subject: Re: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes

czw., 15 lip 2021 o 17:44 Moore, Robert <[email protected]> napisał(a):
>
> The patch was posted as a pull request on our github site.
>

I'm aware of that, semihalf-wojtas-marcin is me :)

> The merged patch will be released as part of the normal ACPICA release process, which will then make it into Linux. You should then rebase.

Ok, thanks for explanation. When approximately can this happen?

Best regards,
Marcin

> Bob
>
>
> -----Original Message-----
> From: Marcin Wojtas <[email protected]>
> Sent: Thursday, July 15, 2021 7:17 AM
> To: Moore, Robert <[email protected]>
> Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
> Subject: Re: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes
>
> Hi,
>
>
> czw., 15 lip 2021 o 16:07 Moore, Robert <[email protected]> napisał(a):
> >
> > This was already reported (with a patch that we've already merged) by
> > semihalf-wojtas-marcin
> >
>
> I'm not sure to be aware of the process. Reported where?
> Are you planning to import the upstream patch on your own and I should rebase the SPCR driver change on top once it lands?
>
> Best regards,
> Marcin
>
> > -----Original Message-----
> > From: Marcin Wojtas <[email protected]>
> > Sent: Wednesday, July 14, 2021 2:44 PM
> > To: [email protected]; [email protected];
> > [email protected]
> > Cc: [email protected]; [email protected]; [email protected];
> > [email protected]; [email protected]; [email protected];
> > [email protected]; [email protected]; Moore, Robert
> > <[email protected]>; Marcin Wojtas <[email protected]>
> > Subject: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes
> >
> > ACPICA commit d95c7d206b5836c7770e8e9cd613859887fded8f
> >
> > The Microsoft Debug Port Table 2 (DBG2) specification revision September 21, 2020 comprises additional Serial Port Subtypes [1].
> > Reflect that in the actbl1.h header file.
> >
> > [1]
> > https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi
> > -debug-port-table
> >
> > Link: https://github.com/acpica/acpica/commit/d95c7d20
> > Signed-off-by: Marcin Wojtas <[email protected]>
> > ---
> > include/acpi/actbl1.h | 15 ++++++++++++++-
> > 1 file changed, 14 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index
> > ef2872dea01c..7bbb3e2bd33f 100644
> > --- a/include/acpi/actbl1.h
> > +++ b/include/acpi/actbl1.h
> > @@ -482,7 +482,7 @@ struct acpi_csrt_descriptor {
> > * DBG2 - Debug Port Table 2
> > * Version 0 (Both main table and subtables)
> > *
> > - * Conforms to "Microsoft Debug Port Table 2 (DBG2)", December 10,
> > 2015
> > + * Conforms to "Microsoft Debug Port Table 2 (DBG2)", September 21,
> > + 2020
> > *
> >
> > **********************************************************************
> > ********/
> >
> > @@ -532,11 +532,24 @@ struct acpi_dbg2_device {
> >
> > #define ACPI_DBG2_16550_COMPATIBLE 0x0000
> > #define ACPI_DBG2_16550_SUBSET 0x0001
> > +#define ACPI_DBG2_MAX311XE_SPI 0x0002
> > #define ACPI_DBG2_ARM_PL011 0x0003
> > +#define ACPI_DBG2_MSM8X60 0x0004
> > +#define ACPI_DBG2_16550_NVIDIA 0x0005
> > +#define ACPI_DBG2_TI_OMAP 0x0006
> > +#define ACPI_DBG2_APM88XXXX 0x0008
> > +#define ACPI_DBG2_MSM8974 0x0009
> > +#define ACPI_DBG2_SAM5250 0x000A
> > +#define ACPI_DBG2_INTEL_USIF 0x000B
> > +#define ACPI_DBG2_IMX6 0x000C
> > #define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
> > #define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
> > #define ACPI_DBG2_ARM_DCC 0x000F
> > #define ACPI_DBG2_BCM2835 0x0010
> > +#define ACPI_DBG2_SDM845_1_8432MHZ 0x0011
> > +#define ACPI_DBG2_16550_WITH_GAS 0x0012
> > +#define ACPI_DBG2_SDM845_7_372MHZ 0x0013
> > +#define ACPI_DBG2_INTEL_LPSS 0x0014
> >
> > #define ACPI_DBG2_1394_STANDARD 0x0000
> >
> > --
> > 2.29.0
> >

2021-07-16 14:13:25

by Moore, Robert

[permalink] [raw]
Subject: RE: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes



-----Original Message-----
From: Marcin Wojtas <[email protected]>
Sent: Thursday, July 15, 2021 8:47 AM
To: Moore, Robert <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes

czw., 15 lip 2021 o 17:44 Moore, Robert <[email protected]> napisał(a):
>
> The patch was posted as a pull request on our github site.
>

I'm aware of that, semihalf-wojtas-marcin is me :)

> The merged patch will be released as part of the normal ACPICA release process, which will then make it into Linux. You should then rebase.

Ok, thanks for explanation. When approximately can this happen?

About the end of the month
Bob

Best regards,
Marcin

> Bob
>
>
> -----Original Message-----
> From: Marcin Wojtas <[email protected]>
> Sent: Thursday, July 15, 2021 7:17 AM
> To: Moore, Robert <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected]; [email protected]
> Subject: Re: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes
>
> Hi,
>
>
> czw., 15 lip 2021 o 16:07 Moore, Robert <[email protected]> napisał(a):
> >
> > This was already reported (with a patch that we've already merged)
> > by semihalf-wojtas-marcin
> >
>
> I'm not sure to be aware of the process. Reported where?
> Are you planning to import the upstream patch on your own and I should rebase the SPCR driver change on top once it lands?
>
> Best regards,
> Marcin
>
> > -----Original Message-----
> > From: Marcin Wojtas <[email protected]>
> > Sent: Wednesday, July 14, 2021 2:44 PM
> > To: [email protected]; [email protected];
> > [email protected]
> > Cc: [email protected]; [email protected]; [email protected];
> > [email protected]; [email protected]; [email protected];
> > [email protected]; [email protected]; Moore, Robert
> > <[email protected]>; Marcin Wojtas <[email protected]>
> > Subject: [PATCH 1/2] ACPICA: Add new DBG2 Serial Port Subtypes
> >
> > ACPICA commit d95c7d206b5836c7770e8e9cd613859887fded8f
> >
> > The Microsoft Debug Port Table 2 (DBG2) specification revision September 21, 2020 comprises additional Serial Port Subtypes [1].
> > Reflect that in the actbl1.h header file.
> >
> > [1]
> > https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/ac
> > pi
> > -debug-port-table
> >
> > Link: https://github.com/acpica/acpica/commit/d95c7d20
> > Signed-off-by: Marcin Wojtas <[email protected]>
> > ---
> > include/acpi/actbl1.h | 15 ++++++++++++++-
> > 1 file changed, 14 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h index
> > ef2872dea01c..7bbb3e2bd33f 100644
> > --- a/include/acpi/actbl1.h
> > +++ b/include/acpi/actbl1.h
> > @@ -482,7 +482,7 @@ struct acpi_csrt_descriptor {
> > * DBG2 - Debug Port Table 2
> > * Version 0 (Both main table and subtables)
> > *
> > - * Conforms to "Microsoft Debug Port Table 2 (DBG2)", December 10,
> > 2015
> > + * Conforms to "Microsoft Debug Port Table 2 (DBG2)", September 21,
> > + 2020
> > *
> >
> > ********************************************************************
> > **
> > ********/
> >
> > @@ -532,11 +532,24 @@ struct acpi_dbg2_device {
> >
> > #define ACPI_DBG2_16550_COMPATIBLE 0x0000
> > #define ACPI_DBG2_16550_SUBSET 0x0001
> > +#define ACPI_DBG2_MAX311XE_SPI 0x0002
> > #define ACPI_DBG2_ARM_PL011 0x0003
> > +#define ACPI_DBG2_MSM8X60 0x0004
> > +#define ACPI_DBG2_16550_NVIDIA 0x0005
> > +#define ACPI_DBG2_TI_OMAP 0x0006
> > +#define ACPI_DBG2_APM88XXXX 0x0008
> > +#define ACPI_DBG2_MSM8974 0x0009
> > +#define ACPI_DBG2_SAM5250 0x000A
> > +#define ACPI_DBG2_INTEL_USIF 0x000B
> > +#define ACPI_DBG2_IMX6 0x000C
> > #define ACPI_DBG2_ARM_SBSA_32BIT 0x000D
> > #define ACPI_DBG2_ARM_SBSA_GENERIC 0x000E
> > #define ACPI_DBG2_ARM_DCC 0x000F
> > #define ACPI_DBG2_BCM2835 0x0010
> > +#define ACPI_DBG2_SDM845_1_8432MHZ 0x0011
> > +#define ACPI_DBG2_16550_WITH_GAS 0x0012
> > +#define ACPI_DBG2_SDM845_7_372MHZ 0x0013
> > +#define ACPI_DBG2_INTEL_LPSS 0x0014
> >
> > #define ACPI_DBG2_1394_STANDARD 0x0000
> >
> > --
> > 2.29.0
> >

2021-08-16 16:40:39

by Rafael J. Wysocki

[permalink] [raw]
Subject: Re: [PATCH 2/2] ACPI: SPCR: Add support for the new 16550-compatible Serial Port Subtype

On Wed, Jul 14, 2021 at 11:46 PM Marcin Wojtas <[email protected]> wrote:
>
> The Microsoft Debug Port Table 2 (DBG2) specification revision
> May 31, 2017 added definition of the 16550-compatible Serial Port
> Subtype with parameters defined in Generic Address Structure (GAS) [1]
>
> Add its support in the SPCR table parsing routine.
>
> [1] https://docs.microsoft.com/en-us/windows-hardware/drivers/bringup/acpi-debug-port-table
>
> Signed-off-by: Marcin Wojtas <[email protected]>
> ---
> drivers/acpi/spcr.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
> index 88460bacd5ae..25c2d0be953e 100644
> --- a/drivers/acpi/spcr.c
> +++ b/drivers/acpi/spcr.c
> @@ -136,6 +136,7 @@ int __init acpi_parse_spcr(bool enable_earlycon, bool enable_console)
> break;
> case ACPI_DBG2_16550_COMPATIBLE:
> case ACPI_DBG2_16550_SUBSET:
> + case ACPI_DBG2_16550_WITH_GAS:
> uart = "uart";
> break;
> default:
> --

Applied as 5.15 material, thanks!