From nobody Fri Sep 19 00:37:40 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC030C43217 for ; Thu, 1 Dec 2022 04:51:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbiLAEvT (ORCPT ); Wed, 30 Nov 2022 23:51:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229702AbiLAEvP (ORCPT ); Wed, 30 Nov 2022 23:51:15 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23C7099F6B; Wed, 30 Nov 2022 20:51:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1669870274; x=1701406274; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lfpVGRH8pltqZXjI3RqjNSR9YB5pgEh4vVlSlb798AM=; b=1iWqUzk9Kv6+6ABeG3GRtngghbpXvYPybiv7qslLbG1L0towejSdS3tv d8ZkrxD2xkenw1kWWuh4hpXvODv6GPX46zmc1qIZS4ItWMiIfAohIfUR+ P2hfcufI/QaZrtxbb9ajgR6WVWJxTp0sk9bpCwhVD5Jqid8Nu3/pu9LAB LEHqUb89NIB6/66qXl0Y1joaH8GOdoaAWH3ZwwhQTS/TNdwNOPx2BVQ6V 1lvDLC/OpYXvwTSLHidyC77l3nTAIhOzkJg9c4oE8uyetapdfPNOXh8ju 71NUKrDYODee3nWBRloW+3KrZ4oZ+cixkUz4v5oS+AM4BL7tWGqjiC7zb Q==; X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="125921825" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 30 Nov 2022 21:51:13 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Wed, 30 Nov 2022 21:51:12 -0700 Received: from CHE-LT-UNGSOFTWARE.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Wed, 30 Nov 2022 21:51:06 -0700 From: Kumaravel Thiagarajan To: , CC: , , , , , , , , , , , , , , , , , Tharun Kumar P Subject: [PATCH v6 tty-next 1/4] serial: 8250_pci: Add serial8250_pci_setup_port definition in 8250_pcilib.c Date: Thu, 1 Dec 2022 10:21:43 +0530 Message-ID: <20221201045146.1055913-2-kumaravel.thiagarajan@microchip.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221201045146.1055913-1-kumaravel.thiagarajan@microchip.com> References: <20221201045146.1055913-1-kumaravel.thiagarajan@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move implementation of setup_port API to serial8250_pci_setup_port Co-developed-by: Tharun Kumar P Signed-off-by: Tharun Kumar P Signed-off-by: Kumaravel Thiagarajan Reviewed-by: Ilpo J=C3=A4rvinen --- Changes in v6: - Made this patch first patch of the patch series Changes in v5: - This is the new patch added in v5 version of this patchset - Moved implementation of setup_port from 8250_pci.c to 8250_pcilib.c --- drivers/tty/serial/8250/8250_pci.c | 24 ++--------------- drivers/tty/serial/8250/8250_pcilib.c | 38 +++++++++++++++++++++++++++ drivers/tty/serial/8250/8250_pcilib.h | 9 +++++++ drivers/tty/serial/8250/Kconfig | 4 +++ drivers/tty/serial/8250/Makefile | 1 + 5 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 drivers/tty/serial/8250/8250_pcilib.c create mode 100644 drivers/tty/serial/8250/8250_pcilib.h diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8= 250_pci.c index 6f66dc2ebacc..69ff367b08de 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -24,6 +24,7 @@ #include =20 #include "8250.h" +#include "8250_pcilib.h" =20 /* * init function returns: @@ -89,28 +90,7 @@ static int setup_port(struct serial_private *priv, struct uart_8250_port *port, u8 bar, unsigned int offset, int regshift) { - struct pci_dev *dev =3D priv->dev; - - if (bar >=3D PCI_STD_NUM_BARS) - return -EINVAL; - - if (pci_resource_flags(dev, bar) & IORESOURCE_MEM) { - if (!pcim_iomap(dev, bar, 0) && !pcim_iomap_table(dev)) - return -ENOMEM; - - port->port.iotype =3D UPIO_MEM; - port->port.iobase =3D 0; - port->port.mapbase =3D pci_resource_start(dev, bar) + offset; - port->port.membase =3D pcim_iomap_table(dev)[bar] + offset; - port->port.regshift =3D regshift; - } else { - port->port.iotype =3D UPIO_PORT; - port->port.iobase =3D pci_resource_start(dev, bar) + offset; - port->port.mapbase =3D 0; - port->port.membase =3D NULL; - port->port.regshift =3D 0; - } - return 0; + return serial8250_pci_setup_port(priv->dev, port, bar, offset, regshift); } =20 /* diff --git a/drivers/tty/serial/8250/8250_pcilib.c b/drivers/tty/serial/825= 0/8250_pcilib.c new file mode 100644 index 000000000000..e5a4a9b22c81 --- /dev/null +++ b/drivers/tty/serial/8250/8250_pcilib.c @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * 8250 PCI library. + * + * Copyright (C) 2001 Russell King, All Rights Reserved. + */ +#include +#include +#include +#include + +#include "8250.h" + +int serial8250_pci_setup_port(struct pci_dev *dev, struct uart_8250_port *= port, + u8 bar, unsigned int offset, int regshift) +{ + if (bar >=3D PCI_STD_NUM_BARS) + return -EINVAL; + + if (pci_resource_flags(dev, bar) & IORESOURCE_MEM) { + if (!pcim_iomap(dev, bar, 0) && !pcim_iomap_table(dev)) + return -ENOMEM; + + port->port.iotype =3D UPIO_MEM; + port->port.iobase =3D 0; + port->port.mapbase =3D pci_resource_start(dev, bar) + offset; + port->port.membase =3D pcim_iomap_table(dev)[bar] + offset; + port->port.regshift =3D regshift; + } else { + port->port.iotype =3D UPIO_PORT; + port->port.iobase =3D pci_resource_start(dev, bar) + offset; + port->port.mapbase =3D 0; + port->port.membase =3D NULL; + port->port.regshift =3D 0; + } + return 0; +} +EXPORT_SYMBOL_GPL(serial8250_pci_setup_port); diff --git a/drivers/tty/serial/8250/8250_pcilib.h b/drivers/tty/serial/825= 0/8250_pcilib.h new file mode 100644 index 000000000000..41ef01d5c3c5 --- /dev/null +++ b/drivers/tty/serial/8250/8250_pcilib.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * 8250 PCI library header file. + * + * Copyright (C) 2001 Russell King, All Rights Reserved. + */ + +int serial8250_pci_setup_port(struct pci_dev *dev, struct uart_8250_port *= port, u8 bar, + unsigned int offset, int regshift); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kcon= fig index d0b49e15fbf5..3088eaff3ad0 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -132,6 +132,7 @@ config SERIAL_8250_DMA config SERIAL_8250_PCI tristate "8250/16550 PCI device support" depends on SERIAL_8250 && PCI + select SERIAL_8250_PCILIB default SERIAL_8250 help This builds standard PCI serial support. You may be able to @@ -500,6 +501,9 @@ config SERIAL_8250_MID Intel Medfield SOC and various other Intel platforms that is not covered by the more generic SERIAL_8250_PCI option. =20 +config SERIAL_8250_PCILIB + bool + config SERIAL_8250_PERICOM tristate "Support for Pericom and Acces I/O serial ports" default SERIAL_8250 diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Mak= efile index bee908f99ea0..b9179d1f104b 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_SERIAL_8250) +=3D 8250.o 8250_base.o 8250_base-$(CONFIG_SERIAL_8250_DMA) +=3D 8250_dma.o 8250_base-$(CONFIG_SERIAL_8250_DWLIB) +=3D 8250_dwlib.o 8250_base-$(CONFIG_SERIAL_8250_FINTEK) +=3D 8250_fintek.o +8250_base-$(CONFIG_SERIAL_8250_PCILIB) +=3D 8250_pcilib.o obj-$(CONFIG_SERIAL_8250_GSC) +=3D 8250_gsc.o obj-$(CONFIG_SERIAL_8250_PCI) +=3D 8250_pci.o obj-$(CONFIG_SERIAL_8250_EXAR) +=3D 8250_exar.o --=20 2.25.1