From patchwork Wed Jul 19 05:12:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 122396 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2209253vqt; Tue, 18 Jul 2023 22:25:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlGx8YkRBpgzSGQSO1vAUvKNrQD84KmH45iCR1p7yB9ywX2xDQFVZzWhQVBLlu1KJTTOMe2P X-Received: by 2002:a05:6a20:244e:b0:137:2f8f:68af with SMTP id t14-20020a056a20244e00b001372f8f68afmr1182057pzc.34.1689744312884; Tue, 18 Jul 2023 22:25:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689744312; cv=none; d=google.com; s=arc-20160816; b=MlZrGRrxT4rmJvQ1zadgxgt6/5FSfn4PJ7KxhgnsIqwLRR8x7NlTCD6ps/cvRj16qp YaAsH4rT0PPT7WDuCZESm+mk4YjuAlkm/FOzmRcjWra0G4IFUVopZQTmbQe8B6vGAmOC GSjdhXjCK/sIfkaSMmfmah6EMy/Mu3u2OBMfn4eSo7Hnogp7c8O0iIGEaV01hQqoIXpb r96KH353OpUYo3VMgmskSYGmOSLcQJNIrxVHBAYZ/1h5wl/1OpZucfDP9RFfDFWv690P gwhSSTkkhvuHU+AYERWLt6riLGyCknQChqzkQdSSC6nn54dqtrpJn7CMbpCTR5kDFK9n AMVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=CpTknSuqLaa9O55Wdgb6VApHEJ6ZLO6uwJ+326pe6ac=; fh=4/QVXuYbDz5eDJk1WOri1GE1zBIPkwazzm/ZNdiW5zo=; b=Wjpvm5TNV9k7Z1QqNfMq10ihlypsfPKK/M06x+3G0p6AslEd6+h1LUm1ElyzaRhtyN duLBZ2YGx+xqd2ijYlwGhRa0VSKm4IecUMvUY2SMwIKyFTHR2hyFVruJWZxvUhFQCg3R 9GQYnClbAu5VVw1/P89EBBWVHt2LzC7XdEJ/MnPqTxhcB0Dpzs3Sf5sBDYjzFrhp0Y77 KB5MnsVEgabkwKqnxo3by+uNJWiihe012w8oxHMdoup/mDjuqHZmnmwI8JqPjiMtLH2B hY7VZYzQwaYCXeS/XKsKByjoPN8YKk3Op/WJuKM9LFOkaH8CnfnxY588WJJ0Rdawza5L i+tg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ct9-20020a056a000f8900b0066879af7571si2774008pfb.130.2023.07.18.22.25.00; Tue, 18 Jul 2023 22:25:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229649AbjGSFMs (ORCPT + 99 others); Wed, 19 Jul 2023 01:12:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjGSFMn (ORCPT ); Wed, 19 Jul 2023 01:12:43 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2C8DA1BF5; Tue, 18 Jul 2023 22:12:42 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 2346880AA; Wed, 19 Jul 2023 05:12:38 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby , Andy Shevchenko Cc: Andy Shevchenko , Dhruva Gole , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , John Ogness , Johan Hovold , Sebastian Andrzej Siewior , Vignesh Raghavendra , linux-omap@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] serial: core: Fix serial core port id to not use port->line Date: Wed, 19 Jul 2023 08:12:33 +0300 Message-ID: <20230719051235.46396-1-tony@atomide.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771825332899824769 X-GMAIL-MSGID: 1771825332899824769 The serial core port id should be serial core controller specific port instance, which is not always the port->line index. For example, 8250 driver maps a number of legacy ports, and when a hardware specific device driver takes over, we typically have one driver instance for each port. Let's instead add port->port_id to keep track serial ports mapped to each serial core controller instance. Currently this is only a cosmetic issue for the serial core port device names. The issue can be noticed looking at /sys/bus/serial-base/devices for example though. Let's fix the issue to avoid port addressing issues later on. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Signed-off-by: Tony Lindgren Reviewed-by: Andy Shevchenko --- drivers/tty/serial/8250/8250_core.c | 2 ++ drivers/tty/serial/serial_base_bus.c | 2 +- include/linux/serial_core.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -497,6 +497,7 @@ static struct uart_8250_port *serial8250_setup_port(int index) up = &serial8250_ports[index]; up->port.line = index; + up->port.port_id = index; serial8250_init_port(up); if (!base_ops) @@ -1040,6 +1041,7 @@ int serial8250_register_8250_port(const struct uart_8250_port *up) uart_remove_one_port(&serial8250_reg, &uart->port); uart->port.ctrl_id = up->port.ctrl_id; + uart->port.port_id = up->port.port_id; uart->port.iobase = up->port.iobase; uart->port.membase = up->port.membase; uart->port.irq = up->port.irq; diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c --- a/drivers/tty/serial/serial_base_bus.c +++ b/drivers/tty/serial/serial_base_bus.c @@ -136,7 +136,7 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port, err = serial_base_device_init(port, &port_dev->dev, &ctrl_dev->dev, &serial_port_type, serial_base_port_release, - port->line); + port->port_id); if (err) goto err_put_device; diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -460,6 +460,7 @@ struct uart_port { int (*iso7816_config)(struct uart_port *, struct serial_iso7816 *iso7816); int ctrl_id; /* optional serial core controller id */ + int port_id; /* optional serial core port id */ unsigned int irq; /* irq number */ unsigned long irqflags; /* irq flags */ unsigned int uartclk; /* base uart clock */