From patchwork Tue Jul 25 05:42:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 125342 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2268199vqg; Mon, 24 Jul 2023 23:18:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlFVptr1ZUbLsJFuLZS1mbf4NBh6l1jzkzP2OzSo4rlxZEmWO2LaAO1lgA+Rbvu8Gk/1gB0p X-Received: by 2002:a17:907:7750:b0:992:4250:5462 with SMTP id kx16-20020a170907775000b0099242505462mr11779257ejc.50.1690265923732; Mon, 24 Jul 2023 23:18:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690265923; cv=none; d=google.com; s=arc-20160816; b=hjD5Jw+UqTwCye5nHC7HPV9Ztm/GaI/jC01wWKR7Xt/PVCYIxeDwsr+ueigSl36BKO /4vyrzf8rcKvZdQ74fjloP/GRbgqqd7LLjeWf1tgN1Gu8ebIbXgM6fe00q517sx3O0At kclxnF5KMgWx5rAwiBDE1KQc3MFrP8CJnoMhn+8I1CTMS10VPumNhUTXQlfbjtDzMkWw NuZ9yfurLTS9wJrIhqV7Ztw8/+OWJDGpmXfLNGRhQaW//V9Q1jiWTsrfgLYzsuQN42wM u2S9BL1fQuGEKN1RzdNwYpTZkHvitr6I6/MhLBNxWRNNFBwx2u5fc0iGk+SQ1HDvZV3J R5yg== 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=7eutRLjZiASJgT9AMIabrw6rRnCqONPj76AlWZEdqOk=; fh=wxWR7S7XHVlqVIuoke4G1/IBIqVMAhyap/qryV8BrCQ=; b=LSL+gPyK/S2eGuL1rZ38RKTgcDgr2bU29sz+ZlAmWxJOBnLoccd6OmfGlGwSicGIVo mya0I54lEQ+qnPkE0JGHhO24LuV2R5VNQxIZm+SuU6cHaQaCoHF7PaHmC9/eQ3BhcrUm 6rZYJ2y1rFzFQj7w43tRRz3jXkVl+Evp3H7bWH/RJM3i45AMIkcxrl/3VUE8y9gMj4iq +YxmpeXEWYK1qC9CL+tJmzdKCFA3RNbLpLc9SiduAgNASXKJ1bix342kspOOvtF5eQCd fo0tmv/DX5Fq2G4+kdgM2bVx1f61CxHhkSO2XWy8T0JFwim/Msu+CMiSzrWyr3SgN4rQ mJJg== 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 xo17-20020a170907bb9100b00992aea2c6a6si6968535ejc.977.2023.07.24.23.18.19; Mon, 24 Jul 2023 23:18:43 -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 S230223AbjGYFmw (ORCPT + 99 others); Tue, 25 Jul 2023 01:42:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231378AbjGYFmm (ORCPT ); Tue, 25 Jul 2023 01:42:42 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AAB821BE7; Mon, 24 Jul 2023 22:42:39 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id CFB1281A1; Tue, 25 Jul 2023 05:42:36 +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 v5 2/3] serial: core: Fix serial core port id to not use port->line Date: Tue, 25 Jul 2023 08:42:11 +0300 Message-ID: <20230725054216.45696-3-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230725054216.45696-1-tony@atomide.com> References: <20230725054216.45696-1-tony@atomide.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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: 1772372281577610339 X-GMAIL-MSGID: 1772372281577610339 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") Reviewed-by: 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 */