[PATCH v5 1/3] PNP: Add dev_is_pnp() macro

[PATCH v5 1/3] PNP: Add dev_is_pnp() macro

[Guanbing Huang]

From: Guanbing Huang <albanhuang@tencent.com>

Add dev_is_pnp() macro to determine whether the device is a PNP device.

Signed-off-by: Guanbing Huang <albanhuang@tencent.com>
Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Bing Fan <tombinfan@tencent.com>
Tested-by: Linheng Du <dylanlhdu@tencent.com>
---
v4 -> v5: change "pnp" in the commit message to uppercase

 include/linux/pnp.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index ddbe7c3ca4ce..792921c06594 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -502,6 +502,8 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { }
 
 #endif /* CONFIG_PNP */
 
+#define dev_is_pnp(d) ((d)->bus == &pnp_bus_type)
+
 /**
  * module_pnp_driver() - Helper macro for registering a PnP driver
  * @__pnp_driver: pnp_driver struct
-- 
2.17.1

[PATCH v5 2/3] serial: port: Add support of PNP IRQ to __uart_read_properties()

[Guanbing Huang]

From: Guanbing Huang <albanhuang@tencent.com>

The function __uart_read_properties doesn't cover PNP devices, so add IRQ
processing for PNP devices in the branch.

Signed-off-by: Guanbing Huang <albanhuang@tencent.com>
Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Bing Fan <tombinfan@tencent.com>
Tested-by: Linheng Du <dylanlhdu@tencent.com>
---
v4 -> v5: change "pnp" and "irq" in the commit message to uppercase, modify the subject
          to start with "serial: port:", modify the location of the header file pnp.h 

 drivers/tty/serial/serial_port.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/serial_port.c b/drivers/tty/serial/serial_port.c
index 22b9eeb23e68..8504bae1d2c9 100644
--- a/drivers/tty/serial/serial_port.c
+++ b/drivers/tty/serial/serial_port.c
@@ -11,6 +11,7 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/pnp.h>
 #include <linux/property.h>
 #include <linux/serial_core.h>
 #include <linux/spinlock.h>
@@ -221,7 +222,11 @@ static int __uart_read_properties(struct uart_port *port, bool use_defaults)
 
 	if (dev_is_platform(dev))
 		ret = platform_get_irq(to_platform_device(dev), 0);
-	else
+	else if (dev_is_pnp(dev)) {
+		ret = pnp_irq(to_pnp_dev(dev), 0);
+		if (ret < 0)
+			ret = -ENXIO;
+	} else
 		ret = fwnode_irq_get(dev_fwnode(dev), 0);
 	if (ret == -EPROBE_DEFER)
 		return ret;
-- 
2.17.1

[PATCH v5 3/3] serial: 8250_pnp: Support configurable reg shift property

[Guanbing Huang]

From: Guanbing Huang <albanhuang@tencent.com>

The 16550a serial port based on the ACPI table requires obtaining the
reg-shift attribute. In the ACPI scenario, If the reg-shift property
is not configured like in DTS, the 16550a serial driver cannot read or
write controller registers properly during initialization.

Signed-off-by: Guanbing Huang <albanhuang@tencent.com>
Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Reviewed-by: Bing Fan <tombinfan@tencent.com>
Tested-by: Linheng Du <dylanlhdu@tencent.com>
---
v4 -> v5: modify to obtain the value of mapsize through the pnp_mem_len function,
          add annotations for the iotype variable, delete excess uart.port.flags operation
v3 -> v4: dependent on two pre patches: "pnp: Add dev_is_pnp() macro" and
          "serial: 8250_port: Add support of pnp irq to  __uart_read_properties()",
          the iotype is reserved, the mapsize is initialized, fix the UPF_SHARE_IRQ
	  flag, check for IRQ being absent
v2 -> v3: switch to use uart_read_port_properties(), change "Signed-off-by" to "Reviewed-by" and "Tested-by"
v1 -> v2: change the names after "Signed off by" to the real names

 drivers/tty/serial/8250/8250_pnp.c | 40 +++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index 1974bbadc975..8f72a7de1d1d 100644
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
@@ -435,6 +435,7 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 {
 	struct uart_8250_port uart, *port;
 	int ret, line, flags = dev_id->driver_data;
+	unsigned char iotype;
 
 	if (flags & UNKNOWN_DEV) {
 		ret = serial_pnp_guess_board(dev);
@@ -443,37 +444,46 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 	}
 
 	memset(&uart, 0, sizeof(uart));
-	if (pnp_irq_valid(dev, 0))
-		uart.port.irq = pnp_irq(dev, 0);
 	if ((flags & CIR_PORT) && pnp_port_valid(dev, 2)) {
 		uart.port.iobase = pnp_port_start(dev, 2);
-		uart.port.iotype = UPIO_PORT;
+		iotype = UPIO_PORT;
 	} else if (pnp_port_valid(dev, 0)) {
 		uart.port.iobase = pnp_port_start(dev, 0);
-		uart.port.iotype = UPIO_PORT;
+		iotype = UPIO_PORT;
 	} else if (pnp_mem_valid(dev, 0)) {
 		uart.port.mapbase = pnp_mem_start(dev, 0);
-		uart.port.iotype = UPIO_MEM;
+		uart.port.mapsize = pnp_mem_len(dev, 0);
+		iotype = UPIO_MEM;
 		uart.port.flags = UPF_IOREMAP;
 	} else
 		return -ENODEV;
 
-	dev_dbg(&dev->dev,
-		 "Setup PNP port: port %#lx, mem %#llx, irq %u, type %u\n",
-		 uart.port.iobase, (unsigned long long)uart.port.mapbase,
-		 uart.port.irq, uart.port.iotype);
+	uart.port.uartclk = 1843200;
+	uart.port.dev = &dev->dev;
+	uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
+
+	ret = uart_read_port_properties(&uart.port);
+	/* no interrupt -> fall back to polling */
+	if (ret == -ENXIO)
+		ret = 0;
+	if (ret)
+		return ret;
+
+	/*
+	 * The previous call may not set iotype correctly when reg-io-width
+	 * property is absent and it doesn't support IO port resource.
+	 */
+	uart.port.iotype = iotype;
 
 	if (flags & CIR_PORT) {
 		uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;
 		uart.port.type = PORT_8250_CIR;
 	}
 
-	uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
-	if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE)
-		uart.port.flags |= UPF_SHARE_IRQ;
-	uart.port.uartclk = 1843200;
-	device_property_read_u32(&dev->dev, "clock-frequency", &uart.port.uartclk);
-	uart.port.dev = &dev->dev;
+	dev_dbg(&dev->dev,
+		 "Setup PNP port: port %#lx, mem %#llx, size %#llx, irq %u, type %u\n",
+		 uart.port.iobase, (unsigned long long)uart.port.mapbase,
+		 (unsigned long long)uart.port.mapsize, uart.port.irq, uart.port.iotype);
 
 	line = serial8250_register_8250_port(&uart);
 	if (line < 0 || (flags & CIR_PORT))
-- 
2.17.1

Kernel 6.10-rc1 b,Build error with [PATCH v5 2/3] serial: port: Add support of PNP IRQ

[Woody Suwalski]

Guanbing Huang wrote:
> From: Guanbing Huang <albanhuang@tencent.com>
>
> The function __uart_read_properties doesn't cover PNP devices, so add IRQ
> processing for PNP devices in the branch.
>
> Signed-off-by: Guanbing Huang <albanhuang@tencent.com>
> Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
> Reviewed-by: Bing Fan <tombinfan@tencent.com>
> Tested-by: Linheng Du <dylanlhdu@tencent.com>
> ---
> v4 -> v5: change "pnp" and "irq" in the commit message to uppercase, modify the subject
>            to start with "serial: port:", modify the location of the header file pnp.h
>
>   drivers/tty/serial/serial_port.c | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/serial_port.c b/drivers/tty/serial/serial_port.c
> index 22b9eeb23e68..8504bae1d2c9 100644
> --- a/drivers/tty/serial/serial_port.c
> +++ b/drivers/tty/serial/serial_port.c
> @@ -11,6 +11,7 @@
>   #include <linux/of.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm_runtime.h>
> +#include <linux/pnp.h>
>   #include <linux/property.h>
>   #include <linux/serial_core.h>
>   #include <linux/spinlock.h>
> @@ -221,7 +222,11 @@ static int __uart_read_properties(struct uart_port *port, bool use_defaults)
>   
>   	if (dev_is_platform(dev))
>   		ret = platform_get_irq(to_platform_device(dev), 0);
> -	else
> +	else if (dev_is_pnp(dev)) {
> +		ret = pnp_irq(to_pnp_dev(dev), 0);
> +		if (ret < 0)
> +			ret = -ENXIO;
> +	} else
>   		ret = fwnode_irq_get(dev_fwnode(dev), 0);
>   	if (ret == -EPROBE_DEFER)
>   		return ret;

Hello all, trying to build 6.10-rc1 fails for me in serial_base.o:
   CALL    scripts/checksyscalls.sh
   DESCEND objtool
   INSTALL libsubcmd_headers
   CC [M]  drivers/tty/serial/serial_port.o
   LD [M]  drivers/tty/serial/serial_base.o
   MODPOST Module.symvers
ERROR: modpost: "pnp_bus_type" [drivers/tty/serial/serial_base.ko] 
undefined!
make[2]: *** [scripts/Makefile.modpost:145: Module.symvers] Error 1
make[1]: *** 
[/woody/src/kernels/linux-6.10-pingu/work/linux-6.10/Makefile:1892: 
modpost] Error 2
make: *** [Makefile:246: __sub-make] Error 2

Reversing the patch "fixes" the problem :-(
I am building on a Debian bookworm system, gcc 12.2

Any suggestions  how to make it work?

Thanks, Woody

Re: Kernel 6.10-rc1 b,Build error with [PATCH v5 2/3] serial: port: Add support of PNP IRQ

[Andy Shevchenko]

On Mon, May 27, 2024 at 03:44:42PM -0400, Woody Suwalski wrote:
> Guanbing Huang wrote:
> > From: Guanbing Huang <albanhuang@tencent.com>
> > 
> > The function __uart_read_properties doesn't cover PNP devices, so add IRQ
> > processing for PNP devices in the branch.

...

> >   #include <linux/property.h>
> >   #include <linux/serial_core.h>
> >   #include <linux/spinlock.h>
> > @@ -221,7 +222,11 @@ static int __uart_read_properties(struct uart_port *port, bool use_defaults)
> >   	if (dev_is_platform(dev))
> >   		ret = platform_get_irq(to_platform_device(dev), 0);
> > -	else
> > +	else if (dev_is_pnp(dev)) {
> > +		ret = pnp_irq(to_pnp_dev(dev), 0);
> > +		if (ret < 0)
> > +			ret = -ENXIO;
> > +	} else
> >   		ret = fwnode_irq_get(dev_fwnode(dev), 0);
> >   	if (ret == -EPROBE_DEFER)
> >   		return ret;
> 
> Hello all, trying to build 6.10-rc1 fails for me in serial_base.o:
>   CALL    scripts/checksyscalls.sh
>   DESCEND objtool
>   INSTALL libsubcmd_headers
>   CC [M]  drivers/tty/serial/serial_port.o
>   LD [M]  drivers/tty/serial/serial_base.o
>   MODPOST Module.symvers
> ERROR: modpost: "pnp_bus_type" [drivers/tty/serial/serial_base.ko]
> undefined!
> make[2]: *** [scripts/Makefile.modpost:145: Module.symvers] Error 1
> make[1]: ***
> [/woody/src/kernels/linux-6.10-pingu/work/linux-6.10/Makefile:1892: modpost]
> Error 2
> make: *** [Makefile:246: __sub-make] Error 2
> 
> Reversing the patch "fixes" the problem :-(
> I am building on a Debian bookworm system, gcc 12.2
> 
> Any suggestions  how to make it work?

Yes, I will send a patch soon. Thanks for the report!

-- 
With Best Regards,
Andy Shevchenko