From patchwork Mon Jul 24 05:07:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 124614 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1584735vqg; Sun, 23 Jul 2023 22:31:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlFa9FxDkhBp2E4KYzTJw8RnhEXWF8J30yEbWiL1yzTcXOiypr3scvTq9StpsDdz3rQO2pRB X-Received: by 2002:a17:906:3109:b0:993:fb68:ed67 with SMTP id 9-20020a170906310900b00993fb68ed67mr8107250ejx.24.1690176663824; Sun, 23 Jul 2023 22:31:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690176663; cv=none; d=google.com; s=arc-20160816; b=HPOeKi7yL5/hpn0yTZGcLw9WmypbLAAFnb3450dVRSXWCy6OrPGrLQcqUMwIooPWQo cvHaAdEIeua7cre1QXvUMlluLaCqZ7uuN3Wd+tmFQmgbcJAH5GmvH8g5a8ljcq3zR9KG F/PTy2qLVnFs0dT1Qwgc53Y/3+j54OTGQvLbdX8GJ7+2zIU7uudHu9w66/iWyVfF0BC3 5It4lvoz890jNWCdo5PF2yb7jFO755Ceyzh+1axbXvHBT0FYNXl+osZ62TYvYYy/miSv FyrsD4vo8vL1skBijWrJTnQ9z8m91/BFvd7UnYyT+fuF9GqMtKCEVdruUoOjz76zBEqH Es6g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=xDgWAEdOI63fKAweHeRG72phX462EjcpEq6ueakbnag=; fh=wxWR7S7XHVlqVIuoke4G1/IBIqVMAhyap/qryV8BrCQ=; b=WQ6PS9V43pytyIWxm8jgL76V6G+HSoo/f4NqCc73TCs1M3KZXRpXc3n4HqHhqyLLdp cNJImpjIysuRrnrgeqev2s931i4yHx68eETY74+F1u6AYTpLOD41ZHMxOkhcUa9v2D14 kr5auFzSFthF/kR5yqPQZy4PNrqlXhdKPQrCmSbVV4OFuchmb6jAgRKreA3kryrNRjkY kn2JVOQSq4S585MkymzvPojG8OSQU+NGpQcmebMjFT0e6DrJ2j38o35dXb8WZGO7DYZ2 k4lHx4LAG7FiXuiJ4dBkDJVFrpQkQDGsxWRe1hoyr/ECeZLzVyBiAukl2jJZjTGpQh5x FOtA== 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 x10-20020a170906134a00b00988e89079fesi5850644ejb.167.2023.07.23.22.30.40; Sun, 23 Jul 2023 22:31:03 -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 S229832AbjGXFHk (ORCPT + 99 others); Mon, 24 Jul 2023 01:07:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229749AbjGXFHd (ORCPT ); Mon, 24 Jul 2023 01:07:33 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8FACDE5C; Sun, 23 Jul 2023 22:07:29 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 3E54A809F; Mon, 24 Jul 2023 05:07:27 +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-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH v4 2/3] serial: core: Fix serial core port id to not use port->line Date: Mon, 24 Jul 2023 08:07:04 +0300 Message-ID: <20230724050709.17544-3-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230724050709.17544-1-tony@atomide.com> References: <20230724050709.17544-1-tony@atomide.com> 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: 1772278685359648530 X-GMAIL-MSGID: 1772278685359648530 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") Andy Shevchenko Signed-off-by: Tony Lindgren --- 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); unsigned int ctrl_id; /* optional serial core controller id */ + unsigned int port_id; /* optional serial core port id */ unsigned int irq; /* irq number */ unsigned long irqflags; /* irq flags */ unsigned int uartclk; /* base uart clock */