From nobody Wed Jan 7 03:33:04 2026 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 EE2F6E784A6 for ; Mon, 2 Oct 2023 01:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235176AbjJBB5x (ORCPT ); Sun, 1 Oct 2023 21:57:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235137AbjJBB5v (ORCPT ); Sun, 1 Oct 2023 21:57:51 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2040.outbound.protection.outlook.com [40.107.215.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8591FC6; Sun, 1 Oct 2023 18:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n9vLmohPW6g3wjZzZixGGs3y9YPnwN6BozSPPP+SfaxZLBQ11chrT8aQFYo7Nh/ALfZm8FxBcMYNKCq407Qs0Zo1qqhmrAxV+nxlv6Hla+Bz4oQe+50ebwJzzAsv/aOoKvpg/RmdPgBOnpT5+cuxIN5JHbON2X75hARPJdx6cSOwdU66pe1Tu9lZwcsgSZ0ipohLg2qzuA1Fp5PtLiUGVTkKYOP6SlCwMdQNHtfqGlq4nj7gz8WMDlSzJ/t0XcgB1hvNvolZ5HbhByjDDJthFfb3H5oWi6VLaybdQAJYOqCOzGvJ75lsp4EIgFu+q69r2PW74F4WZJz9dEOvUHfr+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2xZtzQXJdfV85aqK4Fe9r/c7fTggOyImm4SNI6LcIOA=; b=ctbTaUFTkqULzRomr6Y6voAxb7q5DxF3jGanpPw3qqtZcJ93eB4aLuhFRg8R0cX6qijcaJIu634Gv4ohM3fT7rJ6X1TkcRryEtHdauyBasIyOMlNitijOReALUhyvuhCW3PDpB4GSZ2XW+9q7BVBkn066mWVdpZBl1e9mpmkbSUizYw1bUfqgGf8L/5AskYk4MijrqutSLgfhW0DaYmC07/6wt7dbkwXaWD7T2CSpb+yqz/omrUTUH8UrpT1ALI++JTZWNTH/IEgypEwVCSSGAU3K5CLsBFOFJKtGviKb1kE02QJXXe5FHDaxEYGeLQcwjZdM4f2SG47+u4DdlJJHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=moxa.com; dmarc=pass action=none header.from=moxa.com; dkim=pass header.d=moxa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=moxa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2xZtzQXJdfV85aqK4Fe9r/c7fTggOyImm4SNI6LcIOA=; b=SfGKk5uCcsr3IFBuZT+E2zGgyyQvtlrg1u1OxaFU/id47rbnqJIyuE6b1JeESV0JXPrurnSnBptX8mqveQOGjs8Xfm1vBHD6DQPgS3/USMr7454dJLJD1t+UvbMrNblNhKAFNy06CzOKpL1msaeTiVWuO1oN/wWfCeSBcQIKC9s= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=moxa.com; Received: from PUZPR01MB5405.apcprd01.prod.exchangelabs.com (2603:1096:301:115::14) by TY0PR0101MB4788.apcprd01.prod.exchangelabs.com (2603:1096:400:279::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.29; Mon, 2 Oct 2023 01:57:44 +0000 Received: from PUZPR01MB5405.apcprd01.prod.exchangelabs.com ([fe80::3f1:6c0e:dec3:714b]) by PUZPR01MB5405.apcprd01.prod.exchangelabs.com ([fe80::3f1:6c0e:dec3:714b%5]) with mapi id 15.20.6838.024; Mon, 2 Oct 2023 01:57:44 +0000 From: Crescent CY Hsieh To: gregkh@linuxfoundation.org, jirislaby@kernel.org Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Crescent CY Hsieh Subject: [PATCH 1/4] tty: serial: 8250: Cleanup MOXA configurations in 8250_pci.c Date: Mon, 2 Oct 2023 09:56:59 +0800 Message-Id: <20231002015702.30509-2-crescentcy.hsieh@moxa.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231002015702.30509-1-crescentcy.hsieh@moxa.com> References: <20231002015702.30509-1-crescentcy.hsieh@moxa.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PS2PR02CA0078.apcprd02.prod.outlook.com (2603:1096:300:5c::18) To PUZPR01MB5405.apcprd01.prod.exchangelabs.com (2603:1096:301:115::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PUZPR01MB5405:EE_|TY0PR0101MB4788:EE_ X-MS-Office365-Filtering-Correlation-Id: f6761304-20b5-4775-e040-08dbc2eaec67 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sreUkBE9op9cbnbXccy92q0k0cWEjjVe3zKWroMRAfU8au+pqpypNEh1ge1pNpy/J6p8FWkPWo8gmJbBWih4eDJnSfq8+MR6Qsq3TfZHCErCeMTi1FfCY6mT3hlIGx1lLXTD9fKVJIw24t5HIry8dbiIdDUMcRhGcjOpq6IMLPXdsAutXP3DtjMeiLL71RjayrhMK/daclt7C9j9HkNBRDDLUinbawPKwkbV6TnA0lPy2/W6MdlSz2N7+mA52DKX8d0itl4xc6z203QB0Flp5vhV/PypkN0+v61GZstsWGuNaziz+VhHSY0zf1CB2lf5jOBECjjky8yV4xeu4gkL89ei+aYETdmi8a/hKV8IMMrOYhidbNXdUYumI3zLxLSEj/DIIGOh8FcqqEp9qmaANjTeFpVpxxnKREUeb/x+Yz8sKJoITBWJysWhvJ9buIT2OaiDuq4Y4Hzuo7Mhwm5F1fqeCEs98RRirUM2yujtu1ZVg8vGtWX2/o0tvg4881f6PHorIG8Ie2PfvqKZdQ2vnIYJbPhHebay9b5hvy5/xFQh4vO1slzxYdCeDjFAD1TSH1N+b4bGIaNsqypz67jXql1LvyUvMKnD2nyk8AHvLMyzjnlpFKNhzVD2CI0UAxdo X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PUZPR01MB5405.apcprd01.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(39850400004)(376002)(366004)(136003)(396003)(230922051799003)(64100799003)(1800799009)(451199024)(186009)(2616005)(107886003)(1076003)(26005)(38100700002)(86362001)(36756003)(38350700002)(83380400001)(316002)(4326008)(8676002)(5660300002)(41300700001)(8936002)(66476007)(66556008)(66946007)(2906002)(6506007)(6666004)(52116002)(6512007)(478600001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?N3V7kCVvsNtQuUqW/wdUzi3CGGbcjynVK0qAbmq6P+eygLwF+OZuAtKnMFCf?= =?us-ascii?Q?osxBjfr/Gvt5m5zu837KOUZYNsJfxRolUL7x/feIa7JQZlOqybFhR2XMUAcK?= =?us-ascii?Q?xhemULU8Bq6qlN+S0GoEvpBcXNFTx59Pvw8L/YGZCGnqY53BcWwrm2SAlrCJ?= =?us-ascii?Q?VV6xP6KoOxHLKKKJeYNfGnzpwwav5ytiuOxzXvaxsVh9VGYUQRrX/xHTUiE1?= =?us-ascii?Q?9wIraaKg/2SDKbe6N71ppdl7gvklk1e3mN65s1YAeM8303Nywg4ALDMEiBM8?= =?us-ascii?Q?5ow6QcoIS5TVcq89wpOiFOQSeI0NqK7JMcAlVEXjlaQI51PqW5i2HoGYC9yV?= =?us-ascii?Q?EpI2XOaVS59EOOrWnWLQgavqs3J1gsL7Lc5vX0utDJUkgKLIrcwocQ893jQX?= =?us-ascii?Q?O7TToBew6y1e48EyVHTLtujwC/kotuQZCUD2Q6MVB6CN6QYv5dlYWnpz6hXu?= =?us-ascii?Q?wUeTkT1AN9aNuWkimG3WM6s7prTvw5VwF+Q18olI0fr6HNpKHWUT7kzKYuky?= =?us-ascii?Q?TW+bGghkOgMm0KNvHcRuyjepudB9+7Z4Sew4vZheY9HDXeVod1oBNgV3lgqu?= =?us-ascii?Q?c0vY4xP2Wngxu0uQrJj7QsDLkPaVvdLiah+lBhVcK5BVw9sTAeolD/kj43Ug?= =?us-ascii?Q?6n95DH569/SnXqDFmqMj1HOamI0L9ChThCIp0CLmDU4kxnwvtXCJospp1X5i?= =?us-ascii?Q?S/Ii5lMXh5HoVqN9oEvCtgGFRnlkXHuY0/QnwRh2TxlmF19JkpT1ItxR/w0Z?= =?us-ascii?Q?G0cHX0NYBsfTWOVBSsTdQ7ohSYwsrPuSmy4n5tVbMnotUxJ55TSNvYoA2F1h?= =?us-ascii?Q?adyDf3M/zgt7+BRgdNFfQJS6fBZuWBzfbwg/ZYFS25hgNd9KajHLl0xRdb4j?= =?us-ascii?Q?IFS6cktx+4InveBudkzu8VzyEUXlLBANeeS015EZ5WmYHcACyI/e6QHbj1GS?= =?us-ascii?Q?7O/16/ONigqRjBGoGQdnYtA8jml7VpcB/RerFEJ2rHEs3CnZy/rqf1CEHKKQ?= =?us-ascii?Q?C86dayUWWCeoEbuM81M8eLEZVwMHPcJXfx0S6kVP5CxY3atFjHmJvFik3rEO?= =?us-ascii?Q?d4TwaSab4oyM4TepCwpckhMB6BrBtDvRGNQbQxXwwf24BbJpM9el/5WtcCHe?= =?us-ascii?Q?6gA6Xv8Aue5n4r6z1TiC9YayumlGtb4XNdEL8DcRu2Fc5HCgmhaDNmQpMvhu?= =?us-ascii?Q?Oqtn2Fq/vAXPy7bJHxMJvPNzrMz1Cym9eQq1So4BH4b07XV9eNSFyP5Q825t?= =?us-ascii?Q?hcQEhWYr9h8jqJwMm3xXVWCu3EbtA7L7mj0MlgPucZ2KmbFgoMGc3BPzHKPN?= =?us-ascii?Q?b4o5y/51ML4+n1Z0oRXNfulZhI+Me7Nn2RXi+H0NwIVtqI3xVt6XkET7VxyZ?= =?us-ascii?Q?Zp+RH0RlmSNPzhqQDjn9/lebXESyAlORGLRPmTTTDSPw2wh6Ds1blUj131YD?= =?us-ascii?Q?lccYF+ViwfMyhg4LkT0jUSYey2iAUBSQIlPqJ1G/TBV3DTtF9ET2KzIABl+b?= =?us-ascii?Q?YpAVMCHt51mI+5HA3i1lhMihkzSBj6akoOMm2CBKWPybRlAnMDVaSwOtaTnC?= =?us-ascii?Q?c69b4jyEIjN1grrEzZQOdEN7t/OlaUndbtScdVg/Nq1NFfcaSsRUGS1poNww?= =?us-ascii?Q?hg=3D=3D?= X-OriginatorOrg: moxa.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6761304-20b5-4775-e040-08dbc2eaec67 X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 01:57:24.9238 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: odWFe7d+C9+qobUOIV4bjxWqjxVGRfydeSNVZEBfY2n4JZ0ETZ45zn2VOWdYcdfFaOS6JwjUgiFCCYpR/GrS0gEx5KhYAAOXIzxwe5jkLqE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR0101MB4788 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To enhance the maintainability of MOXA configurations in 8250_pci.c, clean up the code to achieve simplicity, clarity and consistency. Signed-off-by: Crescent CY Hsieh --- drivers/tty/serial/8250/8250_pci.c | 73 +++++++++++------------------- 1 file changed, 26 insertions(+), 47 deletions(-) diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8= 250_pci.c index 62a9bd30b4db..a010790ccfcd 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -1887,10 +1887,10 @@ pci_sunix_setup(struct serial_private *priv, return setup_port(priv, port, bar, offset, 0); } =20 -static int -pci_moxa_setup(struct serial_private *priv, - const struct pciserial_board *board, - struct uart_8250_port *port, int idx) +static int pci_moxa_setup(struct serial_private *priv, + const struct pciserial_board *board, + struct uart_8250_port *port, + int idx) { unsigned int bar =3D FL_GET_BASE(board->flags); int offset; @@ -1958,6 +1958,9 @@ pci_moxa_setup(struct serial_private *priv, #define PCIE_DEVICE_ID_WCH_CH384_8S 0x3853 #define PCIE_DEVICE_ID_WCH_CH382_2S 0x3253 =20 +/* MOXA */ +#define PCI_VENDOR_ID_MOXA 0x1393 +/* MOXA PCIe */ #define PCI_DEVICE_ID_MOXA_CP102E 0x1024 #define PCI_DEVICE_ID_MOXA_CP102EL 0x1025 #define PCI_DEVICE_ID_MOXA_CP104EL_A 0x1045 @@ -2854,9 +2857,9 @@ enum pci_board_num_t { pbn_titan_2_4000000, pbn_titan_4_4000000, pbn_titan_8_4000000, - pbn_moxa8250_2p, - pbn_moxa8250_4p, - pbn_moxa8250_8p, + pbn_moxa_2, + pbn_moxa_4, + pbn_moxa_8, }; =20 /* @@ -3628,19 +3631,19 @@ static struct pciserial_board pci_boards[] =3D { .uart_offset =3D 0x200, .first_offset =3D 0x1000, }, - [pbn_moxa8250_2p] =3D { + [pbn_moxa_2] =3D { .flags =3D FL_BASE1, .num_ports =3D 2, .base_baud =3D 921600, .uart_offset =3D 0x200, }, - [pbn_moxa8250_4p] =3D { + [pbn_moxa_4] =3D { .flags =3D FL_BASE1, .num_ports =3D 4, .base_baud =3D 921600, .uart_offset =3D 0x200, }, - [pbn_moxa8250_8p] =3D { + [pbn_moxa_8] =3D { .flags =3D FL_BASE1, .num_ports =3D 8, .base_baud =3D 921600, @@ -5347,44 +5350,20 @@ static const struct pci_device_id serial_pci_tbl[] = =3D { pbn_ni8430_4 }, =20 /* - * MOXA + * MOXA PCIe */ - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102E, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_2p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102EL, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_2p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_4p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114EL, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_4p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_8p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_8p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_8p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_8p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132EL, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_2p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_4p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_8p }, - { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - pbn_moxa8250_8p }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102E), 0, 0, pbn_m= oxa_2 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102EL), 0, 0, pbn_= moxa_2 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104EL_A), 0, 0, pb= n_moxa_4 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114EL), 0, 0, pbn_= moxa_4 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_A), 0, 0, pb= n_moxa_8 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP116E_A_B), 0, 0, pb= n_moxa_8 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118EL_A), 0, 0, pb= n_moxa_8 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP118E_A_I), 0, 0, pb= n_moxa_8 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132EL), 0, 0, pbn_= moxa_2 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134EL_A), 0, 0, pb= n_moxa_4 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A), 0, 0, pbn= _moxa_8 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A), 0, 0, pb= n_moxa_8 }, =20 /* * ADDI-DATA GmbH communication cards --=20 2.34.1 From nobody Wed Jan 7 03:33:04 2026 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 5808FE784A6 for ; Mon, 2 Oct 2023 01:58:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235270AbjJBB6C (ORCPT ); Sun, 1 Oct 2023 21:58:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235137AbjJBB57 (ORCPT ); Sun, 1 Oct 2023 21:57:59 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2069.outbound.protection.outlook.com [40.107.215.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85990E9; Sun, 1 Oct 2023 18:57:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PemWceEkGUhWXCDAVzD6NkoFTLUJit7w7BDDtyTGh5ut45niM5n3ZVFB28GnzVW0ynrCYKayaA4znuyNSWj2akmmrOLfzaIsXhXTbHPOzMA2Cce+FvuHbwdEJ9iMk6ViRz5m75YZxqExiTWA5uoYbZ40gXr53CtH1eAgjlp5K9nAzYcd3O3kbxm9h1ZurVmFSK22dWFfoNSCZcNowcIH1K60UGaJPPDOzaiqzuYpsMjNxN858D+/yu1OXBFsZtESn3xXuPG+dCa3RNh6W9X8pZgsTTHIIP7hkQ/Hl7fSitE9OLAC9rUNRNgGwW+Av8sKiwKTlr5la9rc2ZieEjWduA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7UbQuFCrxI+p816yFNv1Cq6G0QP1ONUN9ALKl3qUy8s=; b=U9eLDkszAETX9Dsv9rpvUkGxIPHg7fGJyO3cNkj26n7plz1JLPbusopF4Stkl5GKrBZbMZqD/0tCsxYAa5zJ2eFY9dTYY905MVqJ0erg8SBjIsT/t4yzWtvTBTKa4nA/Af0QyNybF/sTaw+wNCOOY0jupuuD+kG9S7iHHIBj2hC9Rr57ObgHsOSVWhwhKWIcIwaeDpaBuckujTqKKLQVNg+NBOvTjkvvzm7tqlATO24/S8ffUS3I8XtRvBqiU5FwzSvfocOTnNfidcTHSttCYSuVi0a7hqwQu6hoZCpcpurzmE1vxJoiRUDWcKVonxR3HV1LK3KDC3X4W7PV1Z8soA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=moxa.com; dmarc=pass action=none header.from=moxa.com; dkim=pass header.d=moxa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=moxa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7UbQuFCrxI+p816yFNv1Cq6G0QP1ONUN9ALKl3qUy8s=; b=GPzneV64sIEgbELKGQ9Kn07+5srcYCrjs6U4dNDe3He07joXdQwNAP7mNwJstRitqrP5HpvS1n6oYungtasxJhjQ6hTXMdtYhwZdN89g0dCYYocRLnfO1dM6WZseSDW79HwcgA5u47R4C16uvdq1Q2FYrznP5FJaeiukYExkiIg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=moxa.com; Received: from PUZPR01MB5405.apcprd01.prod.exchangelabs.com (2603:1096:301:115::14) by TY0PR0101MB4788.apcprd01.prod.exchangelabs.com (2603:1096:400:279::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.29; Mon, 2 Oct 2023 01:57:53 +0000 Received: from PUZPR01MB5405.apcprd01.prod.exchangelabs.com ([fe80::3f1:6c0e:dec3:714b]) by PUZPR01MB5405.apcprd01.prod.exchangelabs.com ([fe80::3f1:6c0e:dec3:714b%5]) with mapi id 15.20.6838.024; Mon, 2 Oct 2023 01:57:53 +0000 From: Crescent CY Hsieh To: gregkh@linuxfoundation.org, jirislaby@kernel.org Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Crescent CY Hsieh Subject: [PATCH 2/4] tty: serial: 8250: Add support for MOXA Mini PCIe boards Date: Mon, 2 Oct 2023 09:57:00 +0800 Message-Id: <20231002015702.30509-3-crescentcy.hsieh@moxa.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231002015702.30509-1-crescentcy.hsieh@moxa.com> References: <20231002015702.30509-1-crescentcy.hsieh@moxa.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PS2PR02CA0078.apcprd02.prod.outlook.com (2603:1096:300:5c::18) To PUZPR01MB5405.apcprd01.prod.exchangelabs.com (2603:1096:301:115::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PUZPR01MB5405:EE_|TY0PR0101MB4788:EE_ X-MS-Office365-Filtering-Correlation-Id: 8454439b-5dcd-495c-5c5f-08dbc2eafd41 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n+AasV24/yFDdBbTlwizyA2FGqkLzKxOWIZ7E/vB+AHlMxrLMeSnZmOql296vuVi1bM9jFOF+exdQlnjw1KOZR5TE5YTHg58+qlWS0kAUfC/2LfzDSmZYXSf4F6Ciiqjo52LqPR/YRxgvf3BjU9q32ApE/0W5XvgvvPZzRZRepidAR5mRVvOjHhj47ut+DmYmMGfFbkfEJxjXH2JsU58qXWqec/hMkS9wlKteB3k4oroY6ZQROzXWLIO6jndopU+3nQ6Ml/x7TcG2I2dyvdLjIWuOP2QB/MPGTCRid6rmglEuiJ6TDWvOWErwdTUT2tTpMfyu8pFH3YSxL1H3Sb9lWAQ14GCt1CYG84DfhNRkDHV4og1YYNTgHYOpf4+zugJAr9dLZGpMzaFSsUmdNgM2v5FS9DfQM9G2j1jjsa4dpTmYzDMLOQC8DtI1pX9VamvcVnYBSzjFq3igV0vI/szMA+yQbCGPcViX44mv1pUKQIBU8NUnK0DIv07K10e5shWoObZXHgdpIJ0Oam+FrZ+VryjM6AWYHaLP7qPOfJ6NdHRF5sdPmUMs1qFoVQ1ryzqnhz6KoPI0as6NDLX3d7WxNrKlYmmOvvR+u4sulhmjs6CL7rlCurCMd5vXZmoeVqX X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PUZPR01MB5405.apcprd01.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(39850400004)(376002)(366004)(136003)(396003)(230922051799003)(64100799003)(1800799009)(451199024)(186009)(2616005)(107886003)(1076003)(26005)(38100700002)(86362001)(36756003)(38350700002)(316002)(4326008)(8676002)(5660300002)(41300700001)(8936002)(66476007)(66556008)(66946007)(2906002)(6506007)(6666004)(52116002)(6512007)(478600001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6kqjjBilwIZ66IJOv1sX6r+B/0wTsoU/PYVaBj7QmXoXPvL0DNi7n/rlXGad?= =?us-ascii?Q?YdWPpCFNQ+HwYK5lNCtNXueKH3FiaysMEfM40P5T+Q7RyHEKCi8qGomxkXjC?= =?us-ascii?Q?/v3jdQh6vbxUTTRcj8Sx9DFJ04vpJDGXhngYvpo2xG8YopvrY3RPS5Qg0NIu?= =?us-ascii?Q?9MZ4cflpo2mp4jo0XmCgVXNgWPcf5zKiz+ty0q2QMzg3K1Ic3p4FrRT49Pv5?= =?us-ascii?Q?B11/LCY8cTA/TnYPacr7gsnpHirrFAeyA09ZeU6CdoX9H82fBmjJV/3dHB9l?= =?us-ascii?Q?cMcdB2pqQ7geyJZtDBh2bt7n4S6h7fHaWBl2P5ydn+KSDYuXtKW6f9vUXXMk?= =?us-ascii?Q?Jn/pQypnV3gL91BWxeC4Jw5qzdC3qNF61ihCfqf29XnrYuPU0uDYbpSAFFvk?= =?us-ascii?Q?mReUQFgH9GI14/bA918ENU2asICrC2OFy4D+72EwXGFPx6gnqoXNkHEMAF/6?= =?us-ascii?Q?Rm+k6a8yvbloUY04VfJT2DlAA4p5A3Ka/Sh8Rl7rbRYYmn8pKE6xpQpruckw?= =?us-ascii?Q?3wslfdFaEKIUvOAH7Bn1OpAn7T7zI4uEk2gIDpykjyWWK7yLTVesnlvP9E3q?= =?us-ascii?Q?LsR/Qgy6ixX2idwsvQrFDnF0kJST9AizFh+Tpkjs4wM4iaTdIQr+L00LCFTe?= =?us-ascii?Q?85K8yQYok2cpVpXBcBjEYwsrlWGVASdimxENtqBprO8zTjoJjwBN8vZPmfuQ?= =?us-ascii?Q?JQ5aeWK6FVngRXA+BohQBbogXEMmcXz1KNiJdZ/rGrfWQk3hl3TF6kmAR+RF?= =?us-ascii?Q?orsaM3/IqKkQ+9bLS5fgRjqQ6fsbJIUxoRxx34w+0O6Y8ALh/gnyWCETgoNM?= =?us-ascii?Q?dLuc8+qzuG7/bK47rQSbTmDt8PmiXES64EyeC3UGylrUuIBYS6dM+ca3xhKU?= =?us-ascii?Q?h4yCDQVgBo1VE/fPaSWQ1XDbS2sWmwnm/nveGCM8pTANE0yXtZ8+pON19GIu?= =?us-ascii?Q?FVTp5iOyDhBK+6/7+6o5CnHWHyE6e4y6yHWYq+x70l5V7OQ6IOG176Y9q1NT?= =?us-ascii?Q?SerAzsgId9nC+cpjxMhWYz+vkz65clnRGcKG/7q7WuXD8UyU80WRM9kiWFxl?= =?us-ascii?Q?wmzJYQ9prC0cfY7LDwB/pJ7dy4MXbz5ukgf1pW4B8sMCvdX1ox2VeURH8RV5?= =?us-ascii?Q?/XnxNijA6rRAZvVTqQlvuDsPe3eQzEwLznmML0arRDmi9rNwfncmPMPOyF//?= =?us-ascii?Q?rvmBdajhUd39YK3q47utY0+ebDCUFN+uhKPEXBqiK4VWN8+1Kksh3v+N05NT?= =?us-ascii?Q?oLKtZA+DRlnlxav4qR2rFBxb6ELgERbQrchrQIPX3ReA3jkc+jtRiwCxFfDG?= =?us-ascii?Q?lBr/jWhmgYSPxWJxqeGlnr/oaKdxOJwkQWC4vP9p6xEpsOo1KTmHAnP9UcLe?= =?us-ascii?Q?LYDYsQwv9L8GtwhADFZbtiP/SI/rEdj4iCf/D31aaV/uQET4eDb0O4CEQwFk?= =?us-ascii?Q?Sj58c1ZYZUUl0Nz3JuTT8Bd11eER1r8Hs4+QXGLNB5FVBhoX6r0KigXVTSny?= =?us-ascii?Q?8GnMaWHJoszKGTeZp+Q4N111XrPTNdnU7oWZ0EV8Oi39CPr6qby5bPSGsC33?= =?us-ascii?Q?nX9NaaSQMC2k6DaQ9AL9ciL7KtZc4/U/Ag8Tz0+3RIgWp5Xzr0zMGlYOoVLm?= =?us-ascii?Q?jA=3D=3D?= X-OriginatorOrg: moxa.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8454439b-5dcd-495c-5c5f-08dbc2eafd41 X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 01:57:53.1671 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BIs7U4wqBzUnes1AnJQ9+6iY3eIhsWjrYPAq1O3DdK3Gka1voaBtd57rZbpUTbtxKDP2ABhw/abzSPxJNlE6HgqzoNnI/xh4PkZSevYqb7g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR0101MB4788 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add support for MOXA Mini PCIe serial boards: - CP102N: 2 ports | RS232 - CP104N: 4 ports | RS232 - CP112N: 2 ports | RS232/RS422/RS485 - CP114N: 4 ports | RS232/RS422/RS485 - CP132N: 2 ports | RS422/RS485 - CP134N: 4 ports | RS422/RS485 Signed-off-by: Crescent CY Hsieh --- drivers/tty/serial/8250/8250_pci.c | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8= 250_pci.c index a010790ccfcd..a70546ac361e 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -1887,6 +1887,42 @@ pci_sunix_setup(struct serial_private *priv, return setup_port(priv, port, bar, offset, 0); } =20 +#define MOXA_PUART_GPIO_EN 0x09 +#define MOXA_PUART_GPIO_OUT 0x0A + +#define MOXA_GPIO_SET_ALL_OUTPUT 0x0F + +static int pci_moxa_init(struct pci_dev *dev) +{ + unsigned short device =3D dev->device; + unsigned long iobar_addr =3D pci_resource_start(dev, 2); + int num_ports =3D (device & 0x00F0) >> 4; + unsigned char val; + + outb(MOXA_GPIO_SET_ALL_OUTPUT, iobar_addr + MOXA_PUART_GPIO_EN); + + /* + * Enable hardware buffer to prevent break signal output when system boot= up. + * This hardware buffer is only supported on Mini PCIe series. + */ + if (device =3D=3D 0x1027 || /* MOXA_CP102N */ + device =3D=3D 0x1046 || /* MOXA_CP104N */ + device =3D=3D 0x1121 || /* MOXA_CP112N */ + device =3D=3D 0x1145 || /* MOXA_CP114N */ + device =3D=3D 0x1323 || /* MOXA_CP132N */ + device =3D=3D 0x1343) { /* MOXA_CP134N */ + /* Set GPIO direction */ + val =3D inb(iobar_addr + MOXA_PUART_GPIO_EN); + val |=3D (1 << 2); + outb(val, iobar_addr + MOXA_PUART_GPIO_EN); + /* Enable low GPIO */ + val =3D inb(iobar_addr + MOXA_PUART_GPIO_OUT); + val &=3D ~(1 << 2); + outb(val, iobar_addr + MOXA_PUART_GPIO_OUT); + } + return num_ports; +} + static int pci_moxa_setup(struct serial_private *priv, const struct pciserial_board *board, struct uart_8250_port *port, @@ -1973,6 +2009,13 @@ static int pci_moxa_setup(struct serial_private *pri= v, #define PCI_DEVICE_ID_MOXA_CP134EL_A 0x1342 #define PCI_DEVICE_ID_MOXA_CP138E_A 0x1381 #define PCI_DEVICE_ID_MOXA_CP168EL_A 0x1683 +/* MOXA Mini PCIe */ +#define PCI_DEVICE_ID_MOXA_CP102N 0x1027 +#define PCI_DEVICE_ID_MOXA_CP104N 0x1046 +#define PCI_DEVICE_ID_MOXA_CP112N 0x1121 +#define PCI_DEVICE_ID_MOXA_CP114N 0x1145 +#define PCI_DEVICE_ID_MOXA_CP132N 0x1323 +#define PCI_DEVICE_ID_MOXA_CP134N 0x1343 =20 /* Unknown vendors/cards - this should not be in linux/pci_ids.h */ #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584 @@ -2638,6 +2681,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = =3D { .device =3D PCI_ANY_ID, .subvendor =3D PCI_ANY_ID, .subdevice =3D PCI_ANY_ID, + .init =3D pci_moxa_init, .setup =3D pci_moxa_setup, }, { @@ -5365,6 +5409,16 @@ static const struct pci_device_id serial_pci_tbl[] = =3D { { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP138E_A), 0, 0, pbn= _moxa_8 }, { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP168EL_A), 0, 0, pb= n_moxa_8 }, =20 + /* + * MOXA Mini PCIe + */ + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP102N), 0, 0, pbn_mo= xa_2 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP104N), 0, 0, pbn_mo= xa_4 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP112N), 0, 0, pbn_mo= xa_2 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP114N), 0, 0, pbn_mo= xa_4 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP132N), 0, 0, pbn_mo= xa_2 }, + { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP134N), 0, 0, pbn_mo= xa_4 }, + /* * ADDI-DATA GmbH communication cards */ --=20 2.34.1 From nobody Wed Jan 7 03:33:04 2026 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 09C13E784A6 for ; Mon, 2 Oct 2023 01:58:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235150AbjJBB6J (ORCPT ); Sun, 1 Oct 2023 21:58:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235137AbjJBB6F (ORCPT ); Sun, 1 Oct 2023 21:58:05 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2050.outbound.protection.outlook.com [40.107.215.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13A55F1; Sun, 1 Oct 2023 18:58:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fd/5bcBH9eshjzu9/TH0WpJwUW/NK5G6NMwKa9/nmqeXFpBqF3ZJ6dAy6x85QodR4djvNeu1Fh6kIc3xo6pUlG/+6igew9F70qrPSZtk/wJBo0bsFtk43BDikscKpi3+8mnc+zTkYeOV343rM56o5r3qrXSFaxXd3P4mlKtjWgmZHHahsd5upTCHobWLyKXAFFvcS7vQMlxviBelpRK04e8/iEiLSnVO+Ij8Uqb98h5QCvcJSPvIx6Elmr+SJgTjkvgBJok3g5HC21yCCFFcSr2dsdB7EucxLZldAq9ejl9pPduSvSfdeiTQExpuKQgsf/gbxRJSrPJorDCkeKCU+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1rN0xugcHEdl40amAZLxWgN66eO1OsQTzLQZPVJL8a0=; b=fXmPQS2jO7qDS9xFw3Qp0r2n8zcSlaamHZRB93sSJAA3olM41MxZmuCTkCLIhiKHKo95nsDFqQUPrtGVNraTU2iMpc801C3yRj5Z0YS3xtffO7Btn8ptJQYn5FLf+vwE+sl4Xskzin/Rgp1VQn+ckfgARtproJB96sBF9IowapXU907VXR892lm7hJ+gnXmEECDZmlbAMqPJzTpxTCTShuvweyyjZ5iktxWag3gtxoCY3SOrcDcfDL77mv+vIBsiSZ9Vobtj1JQibnEzGLdDo/eHUAE1Af32q5JoAStxKNvfxgtngUmbET9oNUDtCF12s76h7Z9Jj61srovusIo9Ow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=moxa.com; dmarc=pass action=none header.from=moxa.com; dkim=pass header.d=moxa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=moxa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1rN0xugcHEdl40amAZLxWgN66eO1OsQTzLQZPVJL8a0=; b=JFHbPiYKpTmxQFgMf7TzeCwZxG3LNNwLlhRn6djX+OJFCJClC0j0lPPBXzRLl9HDbMek2w5XFppXA3vd1xS5pKknvpX+CXuIIrQAxZDnLHJXGTAGKA/+Mi8HGaFGS2GEsPS9OlNWGqpJHFH7qCj3FU9JClPGoIVEQ9713qVhddM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=moxa.com; Received: from PUZPR01MB5405.apcprd01.prod.exchangelabs.com (2603:1096:301:115::14) by TY0PR0101MB4788.apcprd01.prod.exchangelabs.com (2603:1096:400:279::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.29; Mon, 2 Oct 2023 01:57:58 +0000 Received: from PUZPR01MB5405.apcprd01.prod.exchangelabs.com ([fe80::3f1:6c0e:dec3:714b]) by PUZPR01MB5405.apcprd01.prod.exchangelabs.com ([fe80::3f1:6c0e:dec3:714b%5]) with mapi id 15.20.6838.024; Mon, 2 Oct 2023 01:57:58 +0000 From: Crescent CY Hsieh To: gregkh@linuxfoundation.org, jirislaby@kernel.org Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Crescent CY Hsieh Subject: [PATCH 3/4] tty: serial: 8250: Fix MOXA RS422/RS485 PCIe boards not work by default Date: Mon, 2 Oct 2023 09:57:01 +0800 Message-Id: <20231002015702.30509-4-crescentcy.hsieh@moxa.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231002015702.30509-1-crescentcy.hsieh@moxa.com> References: <20231002015702.30509-1-crescentcy.hsieh@moxa.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PS2PR02CA0078.apcprd02.prod.outlook.com (2603:1096:300:5c::18) To PUZPR01MB5405.apcprd01.prod.exchangelabs.com (2603:1096:301:115::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PUZPR01MB5405:EE_|TY0PR0101MB4788:EE_ X-MS-Office365-Filtering-Correlation-Id: ba3d243f-afef-47ae-ec4e-08dbc2eb0064 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dTHf6wGg0U0CqPvFv23yr7pZg9aXybhuYpKf24nORGCMTz6N/44CyH92gfE8QQ3igvyVruTCXU3ywWiocqpBr+RuIaMGMSe8Ig902h4TANrGy0N8/w+q3GHmRho2/f5QYN86flWRnK5ksCZjMdpuvUhWkD2QknlN1FkQvb/LVnr8OgUdlH30gAjGT5KjHp8YYO57qcMnD18MFO7nOdbfRD+7UAWG4iO1UNeQ8HMwALfoaVcIatSs2X/JHdOqkKYyLPFhLd8loV71BFwXTEfA19gpDJ6m4DlMlJU5dAFBKVC77mjLoXUz3Uit1Iol0PGxzy1bMxB1ZLTe7LG+k13bhWYby3jnwVyntfF6TF2Wbv7op/U798VBCo86dNrJV68L9eSWSIT4kpsiI2hWwZfM0bRPROm6hb/1ZwJytLxqXl949IBnbOdTo/IGXSErNs6PlIW8nYmceH0LPiPpvfXccenwOOaAbEjie+fUVk1gkOagUILdymyL5SJO4HI1QheWrpS+fqy0vFeNjW2EJOq43hnX0tn74rg8T8lHFYdM0F2ipkGzrE3ZMSKFivilJ6XRZ82UT1OAKylbPzgjpfCEsMwE9Bo2lWuZ1tgZR9Kc80OfHIm6LvXGlFkZ7IGeJ2zi X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PUZPR01MB5405.apcprd01.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(39850400004)(376002)(366004)(136003)(396003)(230922051799003)(64100799003)(1800799009)(451199024)(186009)(2616005)(107886003)(1076003)(26005)(38100700002)(86362001)(36756003)(38350700002)(83380400001)(316002)(4326008)(8676002)(5660300002)(41300700001)(8936002)(66476007)(66556008)(66946007)(2906002)(6506007)(6666004)(52116002)(6512007)(478600001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CfAPex8DfKpWPOQV4TnkG34KtYxaW7r4b0IiMXZqDc0klRlB8oRzeOJQW8+2?= =?us-ascii?Q?eOXS/Exq1zUfW1JTONKdJpZ9GiSFUci2VHmtxj4ou8aEszAXLo3IOFXz6BIf?= =?us-ascii?Q?T1Hi+3HTmyqqApHZkvr+3yp9unUDHvCLmK+XjTwgK/qdW7Q3aHcIcO7bbf8B?= =?us-ascii?Q?p7Dnbm/YbDAFyWkXgIG3LhsnhOawzemGSyecu2k6yAuyJkE74mIwL9x1qEKF?= =?us-ascii?Q?mx4bNGwSTBqylWf4Mjr84grGwVa9p0q+QX5+d1J5Nk7z6NWiq9WpE18r5xcU?= =?us-ascii?Q?8NcxOofR/Huk+2pDwWafpONL/klGlmSWeQs3Upm1Vm+2zESJiOoVPXYWbKz1?= =?us-ascii?Q?S9TJIERJ7iplTx0K2E69yTf3Hjj7fAjmeCGzN105XU2n0qOSZTOiVUDH2KK7?= =?us-ascii?Q?7EGTLeLj05HQaWrQBg0t1d4gPquj7INws112MgERjvzXsLEQDbQZ+TS9UVEn?= =?us-ascii?Q?v/myOacdGsoNDeNIZdCp/qMBe/6mWvWPXa3Yiq0RSR1JhTfF2JpzGcMidYrh?= =?us-ascii?Q?xwZlsGtOYwSovLcsiiXdk38SYkzCjFYa044rpFWwFWmd8JLathuJz9/t5hp+?= =?us-ascii?Q?n9JCTkI9tC1je4xU8k3VdOk0r7KIUXD7Hkl/g/+hX2Q6dIkAgPm6pFof1CzO?= =?us-ascii?Q?7cPyT+LIGCOAvzMvarWb+S7c+D5u7Il8JZVVXpNN9G/s9/vFj+U5sLfNGKWf?= =?us-ascii?Q?+uEpCfHz3Or+/+Rb6MIOr2R4hDuq2tD2xC2GzlsPql+cm0slnDCU6+7Wm2oy?= =?us-ascii?Q?3TLVHQJgM7NynCnGevZaFGSVECsDkwNN6EXTmsihioCfHEG5UbgYxc+PPFX6?= =?us-ascii?Q?VkYuXk1v5KFZt3BUjk0RjAIKANxTnzkf3TTyYSTPF4g9+jIDtDcb8z1Wq1hr?= =?us-ascii?Q?E+8CfPF92vHPVO7IGE+c2TyUD3tL6fdYci5CtZPCYNRE61oV60BWvgX7+M69?= =?us-ascii?Q?yA/R6z0B81OWe2YlpIhVTskrhgV0oHfKUhBKeUUqJ1jVRkilgzkX3Y3kgZM7?= =?us-ascii?Q?bgqt3MckcV9dtr7BGRU6BMAGRruWWpwv7SDMhf9uwg9Zpb06z2k87ARrukwa?= =?us-ascii?Q?dt27dSMAUaUYTfnCIGeawwmJY5wgYW3d1udNYMELtW6+Cmw7eJc5kNTAOX3w?= =?us-ascii?Q?flWfEJJIvXdGB6120n8zunxH43s2kf0FWBaRnv9Hk/LadkZS/EXrndzVHOnz?= =?us-ascii?Q?WJ2hvSbV3XM2R7syKCKpFBwO2kFxSOFqZFX9OShGh+fZgXKgjQ+wEvF1Is9X?= =?us-ascii?Q?TC8Kb0/JmClKdEC6KZ5nSSGPhYsoIELWPfdUOQkCYcVCDsB93mc/XndOIvNY?= =?us-ascii?Q?pT04ICfo0NOB/f+lJT7sFtyLrsRwy6TMcSzdUFX+IAULNVvXwyZI9kjImslh?= =?us-ascii?Q?tIwMFwqUGyw5rjTMjNOPKj/9FsPcYZXMR8Bef+4Pxe8Oq2MPJmsQ1CgK5ESN?= =?us-ascii?Q?aATHsktA8OXfTjsDa0Q1auBajKLP62QF7l33kTI3PExHL1rGbR2oNWehEe7L?= =?us-ascii?Q?IoW+6PVUxdlzGKUQoWLc1qbLX/ukYC32KzttUPo4nb0iEt7S3+P6H1HcmhrV?= =?us-ascii?Q?zNe3OHFx5KlTFuSfSxQn/6DkcuXTYzH69tGroLUq1xpul0KWtGcQltZX/83y?= =?us-ascii?Q?ww=3D=3D?= X-OriginatorOrg: moxa.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba3d243f-afef-47ae-ec4e-08dbc2eb0064 X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 01:57:58.4000 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Bc6t4fZqM+cLsnvzg3OXEWUkbLXsZ7yOARJA7521pUC+7fqbC1Hr/9KGsexh57J3BzqyYjDELM87mHAtn7uKldmyLvR42L+G9OOz4v4MVhQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR0101MB4788 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" MOXA PCIe RS422/RS485 boards will not function by default because of the initial default serial interface of all MOXA PCIe boards is set to RS232. This patch fixes the problem above by setting the initial default serial interface to RS422 for those MOXA RS422/RS485 PCIe boards. Signed-off-by: Crescent CY Hsieh --- drivers/tty/serial/8250/8250_pci.c | 39 +++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8= 250_pci.c index a70546ac361e..31bfe5381000 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -1890,17 +1890,54 @@ pci_sunix_setup(struct serial_private *priv, #define MOXA_PUART_GPIO_EN 0x09 #define MOXA_PUART_GPIO_OUT 0x0A =20 +#define MOXA_RS232 0x00 +#define MOXA_RS422 0x01 +#define MOXA_RS485_4W 0x0B +#define MOXA_RS485_2W 0x0F +#define MOXA_UIR_OFFSET 0x04 + #define MOXA_GPIO_SET_ALL_OUTPUT 0x0F =20 +static int pci_moxa_set_interface(struct pci_dev *dev, + unsigned int port_idx, + unsigned char mode) +{ + unsigned long iobar_addr =3D pci_resource_start(dev, 2); + unsigned long UIR_addr =3D iobar_addr + MOXA_UIR_OFFSET + (port_idx / 2); + unsigned char val, intf; + + val =3D inb(UIR_addr); + + if (port_idx % 2) { + intf =3D mode << 4; + val &=3D 0x0F; + } else { + intf =3D mode; + val &=3D 0xF0; + } + val |=3D intf; + outb(val, UIR_addr); + + return 0; +} + static int pci_moxa_init(struct pci_dev *dev) { unsigned short device =3D dev->device; unsigned long iobar_addr =3D pci_resource_start(dev, 2); + int i; int num_ports =3D (device & 0x00F0) >> 4; unsigned char val; =20 outb(MOXA_GPIO_SET_ALL_OUTPUT, iobar_addr + MOXA_PUART_GPIO_EN); - + /* + * For the device IDs of MOXA PCIe boards match the pattern 0x*3**, + * the initial default serial interface mode should be set to RS422. + */ + if ((device & 0x0F00) =3D=3D 0x0300) { + for (i =3D 0; i < num_ports; ++i) + pci_moxa_set_interface(dev, i, MOXA_RS422); + } /* * Enable hardware buffer to prevent break signal output when system boot= up. * This hardware buffer is only supported on Mini PCIe series. --=20 2.34.1 From nobody Wed Jan 7 03:33:04 2026 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 9BC62E784A7 for ; Mon, 2 Oct 2023 01:58:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235261AbjJBB6U (ORCPT ); Sun, 1 Oct 2023 21:58:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235345AbjJBB6P (ORCPT ); Sun, 1 Oct 2023 21:58:15 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2081.outbound.protection.outlook.com [40.107.215.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6B4D127; Sun, 1 Oct 2023 18:58:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CG1kip8BnBY+X0MW5LfC07YglGncFvmCJOEiDgTKPBjjqdKWmR9dWPvD7pr1J3P4tdSDD4+IgCW3dLAI33jNQD9NMTCR0YjqeCGcvHgpBYGIAnVtHm4zD4iCnHeZ1OdvwLosypzJnBQM1KF9+3DgkJAsPjKBjK8IAStod7uuaAdDT6zjxCkjIAS3cLh+QSIEhHF76BGvPHyiFDoz7LZkEKZkISKdAVLzjeDEt3gLfaurxjU3ek2lz4cvFl/DTlxmcECGkgl+zyuOcsjmANKmkwsHpnploRMrmgrBq+Qh1uKddVY7MwUcO5o5V6x7nYXGZdAJnd5bTrfJFwxbkoZdAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0oMb2dQ2Is3Aebg2dtPqQvzzRFLfW3mFYfjHmKUOjzs=; b=avJgCIaVZMjHsyyV94NO9DqMU1Q0XiDAo07fJzxd1+ZAJJD9rIXG9ofFHY7KX0616Be8T4VC13YIIRzJXk7OcnL3swtBLTvDIgOSB75+vMT775p5AO1/AvLGqmSmROzpMTeogu5zoqOV/sr0q6v9EBSzdsH61RZ3Rjadk01OCvK4cX6Cjqk/k2Bf5sb4iS2zJzckTaKsBEmsBJjYRMmWr36drMuaDAgfYUKYfh8HsJTZaLrFc07jtkw4lzPFS5HV+ckDOQVzB5ZC0gglwlkhGtKYbKlL7JjnvzNU5gq2O0TMH88nXhP88AZHYc0UXhfTRgkyZWzVl664DTlVDk4lSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=moxa.com; dmarc=pass action=none header.from=moxa.com; dkim=pass header.d=moxa.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=moxa.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0oMb2dQ2Is3Aebg2dtPqQvzzRFLfW3mFYfjHmKUOjzs=; b=Rn+qEp5Jg720hkzTnn2dn5osxaNi5a4R3Miz4i6ltmJAJ6r8hPHx0JHWNU/ngnqCx1WN1j8oIqwXmHAP5LaTq1HIMstoHP2GxFQPbO9bLc/eh6wwJDUBZhtDiwgExc2/MFBdAzuUAR04zFInHLXsUYo21prNE32B13wCUTKFZz0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=moxa.com; Received: from PUZPR01MB5405.apcprd01.prod.exchangelabs.com (2603:1096:301:115::14) by SEZPR01MB4945.apcprd01.prod.exchangelabs.com (2603:1096:101:9c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.29; Mon, 2 Oct 2023 01:58:04 +0000 Received: from PUZPR01MB5405.apcprd01.prod.exchangelabs.com ([fe80::3f1:6c0e:dec3:714b]) by PUZPR01MB5405.apcprd01.prod.exchangelabs.com ([fe80::3f1:6c0e:dec3:714b%5]) with mapi id 15.20.6838.024; Mon, 2 Oct 2023 01:58:04 +0000 From: Crescent CY Hsieh To: gregkh@linuxfoundation.org, jirislaby@kernel.org Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Crescent CY Hsieh Subject: [PATCH 4/4] tty: serial: 8250: Add support for MOXA PCIe boards to switch interface between RS422/RS485 Date: Mon, 2 Oct 2023 09:57:02 +0800 Message-Id: <20231002015702.30509-5-crescentcy.hsieh@moxa.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231002015702.30509-1-crescentcy.hsieh@moxa.com> References: <20231002015702.30509-1-crescentcy.hsieh@moxa.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PS2PR02CA0078.apcprd02.prod.outlook.com (2603:1096:300:5c::18) To PUZPR01MB5405.apcprd01.prod.exchangelabs.com (2603:1096:301:115::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PUZPR01MB5405:EE_|SEZPR01MB4945:EE_ X-MS-Office365-Filtering-Correlation-Id: 715e4dc0-5e70-4272-17a6-08dbc2eb0402 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4DqFNb2w/5/OPwvD4blhuFpCvxnPgIEKK4Eaho8+5GHUjW1zBmSNZQ8+VKFQtkaieZ+PgVmg1RCo12xivTTDpWQUR7Hpj8vKSFYycokRt8bD2ubN7y1c1WlW5u+BhZVdUmlKyouRg2PdPiDlvryUvwVmSWnRwuzjekh/CLOTfI27Lk7AZ73ApopT9VDlac5etPbqKcZ9Ly+oU0B8zSPC6EzQhuoXxFAkPKlBx9gSCbXcJComVArMikGOCc1B8SjjQ9tLMDHFIZyafJpujUHf+cIuMaLZWemeNznNCJIbsKcXjjT9Tu/Ogi4dCFFjk1TFyHyD0dyxg88ZbDRnAEoS+s1lArio5IdDUFjPf7GtCFTenJRIyffFQsWhos2uCqPjqGzWlIA/oXBwe0oKpHoyoC5Gtsf4Wv82NrhxCRv0Zqd4AeH9ilFY2RSsq/XsdDP3c++k5AoVOoTfsWX88gbePU1w0WFZGLUdrXTKBqttKH5YVJ1MMI73/IuG7QSQaoRw0ZtMlDD6nlMdfGz17rvIc6yUI3T/9pZFZ5MG6CeZV+JfWj43bgjFsYSIrv/kAn93FII9OFywEUXiOsy7gzr7VsmBHQq6rOoicO10yDbAOivtyKOFSEpjktkCc2zTa6+J X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PUZPR01MB5405.apcprd01.prod.exchangelabs.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(346002)(396003)(136003)(39850400004)(376002)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(6512007)(1076003)(8676002)(8936002)(4326008)(86362001)(66476007)(107886003)(38100700002)(38350700002)(316002)(66556008)(66946007)(2616005)(41300700001)(83380400001)(52116002)(6506007)(5660300002)(26005)(478600001)(36756003)(6486002)(2906002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?130AwehEWQClGD3N+1jvaBWu+VEDZOaUIE7we1CD26raAXky9+whSkH5xrZz?= =?us-ascii?Q?5Di+bPCAFEJ1k+O80YeZmC5CEm7rFcAN7PCJL2UJLD4LzfvEpOYwzjNHmOyN?= =?us-ascii?Q?ppm65GR/N290z4tFlDJ3Pda2gTCu92Wmo1f2MZ3KK+QggcGd7oHFMkKvyL6w?= =?us-ascii?Q?0DoAALIhSK1qC7vVWUI7yi5jJ6QV8VwdBrevhLqPbrPGHfPFCSQtpvdbniaA?= =?us-ascii?Q?Kqx05rhwXxMUYI7sEPd8V0stoqNoFuJVYUZOhhbYb0IWUuksav77/KaRdyc/?= =?us-ascii?Q?xHbxdkSW1QgCOTxPUny7ewldazeHBFSZ/50CubcqcwQ4P4EohVp1MGFjpnte?= =?us-ascii?Q?UaG1AKKNwEXLw3zLfS4YYAN6rFvi83YUeS+QjlTr5iG9uE/vJxtV6gYDQ9ei?= =?us-ascii?Q?C9ay8l2RzHP9zvnn5QrGwy/8FeFiSAdi8v0dfh0Xkvrnfx//ZueREyLkoUMg?= =?us-ascii?Q?zxHXCxFz/6XplPi2zc682vyHwuy9zpr4qKgGAECwV8PKjXDGcjkgph47Wao3?= =?us-ascii?Q?dv0ogryS+GlI4aQZrUESLqJdtGkzwLcGCW4fHQUdj378EejVvuhUeEb2F23c?= =?us-ascii?Q?S2zOmBlw+2jpTHg0qGSxbAXfOXTrLFmLIJ3Obe0vnwnxjHqeWFP2NEGhyRIs?= =?us-ascii?Q?mWSpYT64xEobkQ/79Nb4zXx9pSjjNwHxvzCTn+n+xgFxqv9r10r4ENvrBm1h?= =?us-ascii?Q?KIayCxCCtntz+J+H9aQxRG5LJiszj4+/gENjCjLd60QgOlkkUKI4UJ1eXdyO?= =?us-ascii?Q?FrOU74AclJ/LAsHX/agtkudZfGs9MFpCuzq8FwEp9u17QvTZeEGIXkYCGyRn?= =?us-ascii?Q?cHoewH18LsVv5GT8I9Mp1DV6DXQ+nADgulThDzCQH4UckWvWdmp6HAYy4HwF?= =?us-ascii?Q?bSo4fPwS2VWoge5SWkybeLwQoobfwZnPgu2GvPLTLEIMFrkDaVHP3bkoChN4?= =?us-ascii?Q?bMHmKcNVx+LMLBd4XjmhM9dxwqIanpF5v3el7L0HdBNjlsZAyHvWFkuE3LjQ?= =?us-ascii?Q?cG/PFdnkrj2CzM5FP6ZAjRjFVmL9LG2l5e+gFNTCFDvOuzCK3LxR2RwnpdAa?= =?us-ascii?Q?mUp/33O2eFkvPW1HU/DsMUfk2lJmcb4Ssc+qax136/UyH4iyrEN5CdTfetic?= =?us-ascii?Q?ccmHtREzGaKq8yW7mEXYwdvV/d/5GSPPmPS4SwCxEkGhoinZKJnrPz1Am9EJ?= =?us-ascii?Q?yRtAGOQuBOI1a9BsyqQhCy/+cEnZnL46MGpjwXYt4IaqThAlVyN8dBRPMlTd?= =?us-ascii?Q?MYZSSPpXo14ZNuVnelfX5lDlBwC7iXKa0PWKSMrLer99lJ82Wpp6lkU72+N4?= =?us-ascii?Q?GA1AmgyZz0Yhh88WJMNUYJu5eAZjwAi8GZb0OG60Uk9c9i+6P+acmUEXaY7w?= =?us-ascii?Q?oKx3d9t5qhIwOPZ1Wd/LBlSlnsQX/PQAfVKbMjp8B5yBJ18W7OX2JMJKJUnW?= =?us-ascii?Q?lRNkd/r6pJSjL634LUooq1ZT9uLgiYNMU6cd1ucP21rlSb/2wjDcaCWnCsAD?= =?us-ascii?Q?ikDKPWSTZBP1kT4V/YkXIehLrysksRLwgMSPixz84lXPfpuEQZhctf34Dmqm?= =?us-ascii?Q?j/OljgZLEZf0O2sKtTG64ttvnOKfSX9dWgiD01KKgsHyf08GwviDCimRWduW?= =?us-ascii?Q?kQ=3D=3D?= X-OriginatorOrg: moxa.com X-MS-Exchange-CrossTenant-Network-Message-Id: 715e4dc0-5e70-4272-17a6-08dbc2eb0402 X-MS-Exchange-CrossTenant-AuthSource: PUZPR01MB5405.apcprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2023 01:58:04.5173 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5571c7d4-286b-47f6-9dd5-0aa688773c8e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ir6JK2jAbjye5zrJI8GGYcuLUJSVyEzqwEB6rq4kmUa/3C4iWGDMa8jtmH1Lw73hYleZ9Vvfm783Kb2o/oskKStymCUK0UhVj/Fmy6eojo0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR01MB4945 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" MOXA PCIe boards have 4 serial interfaces and don't require additional stuff to switch between interfaces: - RS232 - RS422 - RS485_2W (half-duplex) - RS485_4W (full-duplex) By using ioctl command "TIOCRS485", it can switch between default interface and RS485 if supported. That means, for RS422/RS485 board, it can switch between RS422 and RS485 by setting the flags within struct serial_rs485. However, for the RS232/RS422/RS485 board, it can only switch between RS232 and RS485, there's no flag for switching interface into RS422. This patch adds a flag call "SER_RS422_ENALBED" in serial.h and modifies serial_core.c to make it possible to switch interface between RS232, RS422 and RS485. Signed-off-by: Crescent CY Hsieh --- drivers/tty/serial/8250/8250_pci.c | 41 ++++++++++++++++++++++++++++++ drivers/tty/serial/serial_core.c | 20 ++++++++++++--- include/uapi/linux/serial.h | 4 +++ 3 files changed, 61 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8= 250_pci.c index 31bfe5381000..86dce37f08c0 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -1898,6 +1898,10 @@ pci_sunix_setup(struct serial_private *priv, =20 #define MOXA_GPIO_SET_ALL_OUTPUT 0x0F =20 +static const struct serial_rs485 pci_moxa_rs485_supported =3D { + .flags =3D SER_RS485_ENABLED | SER_RS485_RX_DURING_TX | SER_RS422_ENABLED, +}; + static int pci_moxa_set_interface(struct pci_dev *dev, unsigned int port_idx, unsigned char mode) @@ -1921,6 +1925,30 @@ static int pci_moxa_set_interface(struct pci_dev *de= v, return 0; } =20 +static int pci_moxa_rs485_config(struct uart_port *port, + struct ktermios *termios, + struct serial_rs485 *rs485) +{ + struct pci_dev *dev =3D to_pci_dev(port->dev); + unsigned short device =3D dev->device; + unsigned char mode =3D MOXA_RS232; + + if (rs485->flags & SER_RS485_ENABLED) { + if (rs485->flags & SER_RS485_RX_DURING_TX) + mode =3D MOXA_RS485_4W; + else + mode =3D MOXA_RS485_2W; + } else if (rs485->flags & SER_RS422_ENABLED) { + mode =3D MOXA_RS422; + } else { + if ((device & 0x0F00) =3D=3D 0x0300) { + pci_warn(dev, "RS232 interface is not supported."); + return -EINVAL; + } + } + return pci_moxa_set_interface(dev, port->line, mode); +} + static int pci_moxa_init(struct pci_dev *dev) { unsigned short device =3D dev->device; @@ -1965,9 +1993,22 @@ static int pci_moxa_setup(struct serial_private *pri= v, struct uart_8250_port *port, int idx) { + struct pci_dev *dev =3D priv->dev; + unsigned short device =3D dev->device; unsigned int bar =3D FL_GET_BASE(board->flags); int offset; =20 + /* + * For the device IDs of MOXA PCIe boards match the pattern 0x*3** and 0x= *1**, + * these boards support switching interface between RS422/RS485 using TIO= CSRS485. + */ + if ((device & 0x0F00) =3D=3D 0x0100 || (device & 0x0F00) =3D=3D 0x0300) { + port->port.rs485_config =3D pci_moxa_rs485_config; + port->port.rs485_supported =3D pci_moxa_rs485_supported; + + if ((device & 0x0F00) =3D=3D 0x0300) + port->port.rs485.flags =3D SER_RE422_ENABLED; + } if (board->num_ports =3D=3D 4 && idx =3D=3D 3) offset =3D 7 * board->uart_offset; else diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_c= ore.c index 7bdc21d5e13b..f316d9705809 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -1299,7 +1299,7 @@ static int uart_get_icount(struct tty_struct *tty, =20 #define SER_RS485_LEGACY_FLAGS (SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND = | \ SER_RS485_RTS_AFTER_SEND | SER_RS485_RX_DURING_TX | \ - SER_RS485_TERMINATE_BUS) + SER_RS485_TERMINATE_BUS | SER_RS422_ENALBED) =20 static int uart_check_rs485_flags(struct uart_port *port, struct serial_rs= 485 *rs485) { @@ -1365,11 +1365,23 @@ static void uart_sanitize_serial_rs485(struct uart_= port *port, struct serial_rs4 { u32 supported_flags =3D port->rs485_supported.flags; =20 - if (!(rs485->flags & SER_RS485_ENABLED)) { + if (!(rs485->flags & SER_RS485_ENABLED) && !(rs485->flags & SER_RS422_ENA= BLED)) { memset(rs485, 0, sizeof(*rs485)); return; } - + /* Pick sane setting if the user enables both interfaces */ + if (rs485->flags & SER_RS485_ENABLED && rs485->flags & SER_RS422_ENABLED)= { + dev_warn_ratelimited(port->dev, + "%s (%d): Invalid serial interface setting, using RS485 instead\n", + port->name, port->line); + rs485->flags &=3D ~(SER_RS422_ENABLED); + } + /* Clear other bits and return if enalbe RS422 */ + if (rs485->flags & SER_RS422_ENABLED) { + memset(rs485, 0, sizeof(*rs485)); + rs485->flags |=3D SER_RS422_ENABLED; + return; + } /* Pick sane settings if the user hasn't */ if ((supported_flags & (SER_RS485_RTS_ON_SEND|SER_RS485_RTS_AFTER_SEND)) = && !(rs485->flags & SER_RS485_RTS_ON_SEND) =3D=3D @@ -1394,7 +1406,7 @@ static void uart_sanitize_serial_rs485(struct uart_po= rt *port, struct serial_rs4 static void uart_set_rs485_termination(struct uart_port *port, const struct serial_rs485 *rs485) { - if (!(rs485->flags & SER_RS485_ENABLED)) + if (!(rs485->flags & SER_RS485_ENABLED) && !(rs485->flags & SER_RS422_ENA= BLED)) return; =20 gpiod_set_value_cansleep(port->rs485_term_gpio, diff --git a/include/uapi/linux/serial.h b/include/uapi/linux/serial.h index 53bc1af67a41..427609fd52cb 100644 --- a/include/uapi/linux/serial.h +++ b/include/uapi/linux/serial.h @@ -137,6 +137,8 @@ struct serial_icounter_struct { * * %SER_RS485_ADDRB - Enable RS485 addressing mode. * * %SER_RS485_ADDR_RECV - Receive address filter (enables @addr_recv). R= equires %SER_RS485_ADDRB. * * %SER_RS485_ADDR_DEST - Destination address (enables @addr_dest). Requ= ires %SER_RS485_ADDRB. + * + * * %SER_RS422_ENABLED - RS422 enabled. */ struct serial_rs485 { __u32 flags; @@ -149,6 +151,8 @@ struct serial_rs485 { #define SER_RS485_ADDR_RECV (1 << 7) #define SER_RS485_ADDR_DEST (1 << 8) =20 +#define SER_RS422_ENABLED (1 << 9) + __u32 delay_rts_before_send; __u32 delay_rts_after_send; =20 --=20 2.34.1