Received-SPF: pass (google.com: domain of linux-kernel+bounces-122385-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Guanbing Huang <albanhuang@outlook.com>
To: gregkh@linuxfoundation.org,
	andriy.shevchenko@intel.com
Cc: jirislaby@kernel.org,
	linux-kernel@vger.kernel.org,
	linux-serial@vger.kernel.org,
	lvjianmin@loongson.cn,
	albanhuang@tencent.com,
	tombinfan@tencent.com
Subject: [PATCH v3] serial: 8250_pnp: Support configurable reg shift property
Date: Thu, 28 Mar 2024 11:45:29 +0800
Message-ID:
 <SG2PR06MB4953D0E0A40FDAC34FF130C8C93B2@SG2PR06MB4953.apcprd06.prod.outlook.com>
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: SG2PR06MB4953:EE_|KL1PR06MB7009:EE_
X-MS-Office365-Filtering-Correlation-Id: 8c6d801f-a003-4a63-ff86-08dc4ed987f9
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	WeouQVmtPdHCmR8Mhlx5g4MItMiTHXnrYr9/Zpt/NTrjsXmUZX/0UM3SzrO8pU2miguvA1SUJya71bBp35GDcN6tY5cRCmYRs0EKGFFT0kqw9BwIo7Vrvv0zrg+9LUsOWPZaM6Mh/JenR1zr3v3PqMuCDy3Jvnu6xWai4i3NnzPIYUiKd0QLRcA5oBdS/K/t95Gw2m/8CuwF6h7M2BL0DnUDUxcRAUjBLSp/+PdbRTM550AhQrLIxijQN9DQ4Rl2xsRF8YHN1ULSmOFN/QfXuX67zJ7rPu9QkMhi/2h/LR3skjbldk40KuvOYfpqs5XlPVApWyul+Mu+bGNqA7BAxmloPvGq6qSI8t+UjAr/I9j6U3JFiVg+jEjg4x7YGIU21oogTnCruNH7emf5uFWqpvLXdtnKUFiuBvx7OHDDgf1qDvGXjv0rgs1IRBMKjb9zGo+e9M9RtmdOfNSN9s4FqoUEZeTA4l04Oo7qpa4Pkfl9zxbbgT9YxHr7Xn7l0+BIKfJP0DUV7HxEiOLGveo5uy4yBIKz65SCzlGl6M/MxwU0AvTMwAlvpn1+cPxHUIuf
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?vvYEn/AcuDmPwma7A1qQbkLcCm0xcH/Qgol9x5ffyf2sUnjoCcyt0HfCT37j?=
 =?us-ascii?Q?KRYEna6ImgqrHrJ+HScaJdne6MvhRtyHzXyKFWcIKO76W2nzDsYvdSqulZGN?=
 =?us-ascii?Q?t8eTx2Z+n+YF8tMXL2GsryTL+Knr4Qy5eeRRqAoOMcbRI3OQo9jylfZFnWfi?=
 =?us-ascii?Q?mLEyPb4tee01zaimobobmjtMh2iAj1SD3cJKpkpBNhjzuZhhjojys43f8S/H?=
 =?us-ascii?Q?y/dAqvzp3zETp6DQdoqVOThLHcXO+A4cEldWjQ8XBoAfiiZ0Kz/FBihAoojQ?=
 =?us-ascii?Q?g+7R98eNgtsiKFYRtGd7zxFxDkDF37c77UHeryvuDVnYPm1xZKwHF2PqDdFf?=
 =?us-ascii?Q?b2jVKKkQLdPJEBjT2Ygwl9DpSkul8jsjgEARxulWD8dLdWeBeMX4HgQpBQD+?=
 =?us-ascii?Q?333KwHkKpLPeZ04/0KkhFqawRREX8dk9Fo6XbEOH7W5l15vWn+RXuFHyzaO8?=
 =?us-ascii?Q?lyMZRFXRLFeeRyq90p1Az3LglmECQPi7XekImQZSF5Uz0WIA80Q+FmmmuhaA?=
 =?us-ascii?Q?gKG2S0WV+MJi3VShEYFiJqECF/GrClFT/CgORm1NVyTGOe8NpRIlF73lDdQA?=
 =?us-ascii?Q?LdiNPl15c2XdUG9RJ4VBgX7HF4JLm5sO9sppQtr0QNWT4Z0fB01wxnvkswej?=
 =?us-ascii?Q?A4hk6r6WsnieVcJOn59h2DI+qLyU6hQIXuytV5UNqWGCVQvVGGa0k2C+4oW2?=
 =?us-ascii?Q?SQHwYRNQwBN2uqC6OFD30SbGaJmFFon/T+p3ZBwBmKQ+uz0U9wjI+bioxM9k?=
 =?us-ascii?Q?MASuo4HgS40LpC7wPjWz0ExyzGN8f+FF8oRc4XNh6rWqn5ZBJPOnMd5yhSiA?=
 =?us-ascii?Q?zllidveB8hGtWiBWHAKXi9MAKcCDuxg9drggr7Mn8I/8dHq9xeW8aSvgphhw?=
 =?us-ascii?Q?dGwvVgw+pEBOiOqbtfe7oxyhmscZOL7KxvDvpusjU5HFZAEwA1sWDrgCQeSi?=
 =?us-ascii?Q?yBpkwkvhqIYUt36jTTRTQj755sPn65So5YtCE2/BF7SEK0HhHnUAtj+faTTe?=
 =?us-ascii?Q?rlRR8OrjavDRL67rkcbiwIeYBJawNEqaKXsLOcGG6aLfS4um5lfw0reyPJhE?=
 =?us-ascii?Q?ELv1MnWYOl3mR+l5qR/KS6E+ZeSoG7p+YrwYMwOIh59Bwoy3w+PCXUycz32X?=
 =?us-ascii?Q?bYo48Vj8PzU+ETpF8XoL6tAumq+gOHwg+BJlde6R2XY/lzuawhr4srS8LH+n?=
 =?us-ascii?Q?Vj7FhDIhkkAXUaLTM9soZrsaGSPW3FYDHyLnjosfIkNcCK1bFU5v3W1OZY8?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8c6d801f-a003-4a63-ff86-08dc4ed987f9
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB4953.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2024 03:45:37.7765
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB7009

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>
Reviewed-by: Bing Fan <tombinfan@tencent.com>
Tested-by: Linheng Du <dylanlhdu@tencent.com>
---
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 | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
index 1974bbadc975..aafddede783a 100644
--- a/drivers/tty/serial/8250/8250_pnp.c
+++ b/drivers/tty/serial/8250/8250_pnp.c
@@ -443,25 +443,22 @@ 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;
 	} else if (pnp_port_valid(dev, 0)) {
 		uart.port.iobase = pnp_port_start(dev, 0);
-		uart.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.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;
+
+	ret = uart_read_port_properties(&uart.port);
+	if (ret < 0)
+		return ret;
 
 	if (flags & CIR_PORT) {
 		uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;
@@ -469,11 +466,11 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 	}
 
 	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, irq %u, type %u\n",
+		 uart.port.iobase, (unsigned long long)uart.port.mapbase,
+		 uart.port.irq, uart.port.iotype);
 
 	line = serial8250_register_8250_port(&uart);
 	if (line < 0 || (flags & CIR_PORT))
-- 
2.17.1