From patchwork Thu Jul 20 05:10:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 122979 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2895971vqt; Wed, 19 Jul 2023 22:23:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlHPgRq8lhUWCszwyx/t2c8ct05GJaMIdpZhpCRvQVzviEzEmRuj2vsBfsBFygZNlO5oFYyb X-Received: by 2002:a05:6a21:3806:b0:123:2c2a:ee62 with SMTP id yi6-20020a056a21380600b001232c2aee62mr18088572pzb.14.1689830589001; Wed, 19 Jul 2023 22:23:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689830588; cv=none; d=google.com; s=arc-20160816; b=QPp3E/yVKsAKAsjb8vAfr1A41eEo9sTgxfFB2eE53uVw8IhyFDth/8Lbr5s0CY0Sle QTb6+2FiBBm8tBjXJRKZRviYtam4z+dl1/FUB2PVCms6asxDHjl0q0t6RtmnizLyzdLI tDGOkyDser0zNUVGSoKCxRmYzbXeff9d3oJp206uW7/orn94TPgEFWbMTxG7YJAZW5gq s6cNGSPjzOFbzu/WjeL/gygqyKbLwe3wSJqImyhFA1ju5UCC55eKPMlAABxYzj8qPf9h gymGS1Jja51uMzGqQc+X8x1WKt2PW1Ix6aWOG7zB5WDbN1lCVJ/5wst9nnyy59SGNLwi 3VKw== 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=hMBdZ2x06ff5cNWhIvW5d7okSD4QNjoqzFoC7cOYL1s=; fh=4/QVXuYbDz5eDJk1WOri1GE1zBIPkwazzm/ZNdiW5zo=; b=liRJzo9vXtBMctHZRmgUTB1eYorYz1Gb6x5RvVgzbDUEkBTnCF7hNdVMQP5ZfZGpHW mcVM8U73WzYWhW8LMlDfgS0xd68Wyik4DmLmdpAKyXitY3rLaO2wsMMx35OXquDCLxGs izposLwq40aF7zguhD+TtCpj4YujWswmDURejzbof+d9YMfdB1ezKr2XYIVVZqFBtQuy Ucw5J20QbNN4baU4aKrlNd7T8ylLOk2xdupqMMKWSPReEFkQ0m4ARri7jD2FH0AKZJ9p aRBD/PGw/YihMpY276rlc+LJ7qmZ62lXuEYouuaoCOc0b/h3aBjujzLbmBkNuiVcIXNC 7mCA== 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 by9-20020a056a00400900b00666892d1ec3si177338pfb.360.2023.07.19.22.22.56; Wed, 19 Jul 2023 22:23:08 -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 S229812AbjGTFKu (ORCPT + 99 others); Thu, 20 Jul 2023 01:10:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229779AbjGTFKo (ORCPT ); Thu, 20 Jul 2023 01:10:44 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B3137113; Wed, 19 Jul 2023 22:10:43 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 3D01780F7; Thu, 20 Jul 2023 05:10:41 +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 v2 2/3] serial: core: Fix serial core port id to not use port->line Date: Thu, 20 Jul 2023 08:10:15 +0300 Message-ID: <20230720051021.14961-3-tony@atomide.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230720051021.14961-1-tony@atomide.com> References: <20230720051021.14961-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: 1771915799811200635 X-GMAIL-MSGID: 1771915799811200635 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 --- 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 */