From patchwork Thu Aug 10 06:57:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 133723 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp241265vqi; Thu, 10 Aug 2023 00:20:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVUMrS9tqfM6R53jjlgnNU7Erh2Y7DphA+81hvrNAaoMKTdeSr3bmgCo7LT09EniqGdR9t X-Received: by 2002:a54:4492:0:b0:3a3:6f20:39b4 with SMTP id v18-20020a544492000000b003a36f2039b4mr1708148oiv.29.1691652053206; Thu, 10 Aug 2023 00:20:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691652053; cv=none; d=google.com; s=arc-20160816; b=kTheu6r/MTnfcrIDALDBSRbBpnrSw45cPi7KyvU/4z9QK8C5fJtdYNbXaHZatBRDFg 260cJlwWBPlDxJSHxTqPpRbd8YEArcn7bIffg7pZTqvX7xAiZrun9+sfzc0q0Kv4ej84 xE7y69DS8/5Uwk/U1v2uq2DLNJOxXaZtvHssx1twnGfF/XI56YAsRXV1YhqJ6saDF6iS uNurSW1lkTqWt+UIfEOm3yfTwBWfyknqQrZeTq89AnPliS9lma9KU32bVZ67ys88ywmC +rBzHXym8kUGQm5AC0gD0qoEkR0/iCUzXHHedKtJ7Lyt1vuWgoJsAy5Fe3ObHdfS7wLj W+GQ== 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=6C7zBxH370Ej8Gf7/tltDfeuKsWgh6WFI56laOMUgrM=; fh=m/k2RZybUoLEVX0Ev44OqlFoslBjKRRAtUW0pTDUGI8=; b=SfbnZ7NvBaOXJVxQHcKrQY45EBwWrr2K/hBisNTkxhQZ2sKCh08K73U/bvDd1pGCEM LpgyhJ05ohe5E6nlKw1Uy2TDSHv3XRB3orOo9LhN3y9CRomGF0ba2m3yct8hZWYVo9lh Fs57v25dzZ2o1LQ7PEgM5c633On5mTEyZT1S1AgWzXBBcmTRLaiRvGENe/IK0zbGt0s4 szpH0hsKEhGtQv4rGjP/cYGPey5R72S7NugJDGPjL2eYUul32SiFrXzlOkeMR6HOdzAc TSg1YwN32HLW94z3TK5y2LcRDa4z2j6kOUV5sDDfJhwPcUoqDM6qqILDdQLHWoytAvgZ AaOA== 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 hs14-20020a17090b200e00b0025979e8c246si1024206pjb.70.2023.08.10.00.20.39; Thu, 10 Aug 2023 00:20:53 -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 S231991AbjHJG5v (ORCPT + 99 others); Thu, 10 Aug 2023 02:57:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230212AbjHJG5t (ORCPT ); Thu, 10 Aug 2023 02:57:49 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7EB1810C0; Wed, 9 Aug 2023 23:57:49 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 39DB180A9; Thu, 10 Aug 2023 06:57:47 +0000 (UTC) From: Tony Lindgren To: Greg Kroah-Hartman , Jiri Slaby 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, Guenter Roeck Subject: [PATCH] serial: core: Fix serial core port id, including multiport devices Date: Thu, 10 Aug 2023 09:57:34 +0300 Message-ID: <20230810065737.47294-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 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: 1773825743580287601 X-GMAIL-MSGID: 1773825743580287601 We want to fix the serial core port DEVNAME to use a port id of the hardware specific controller port instance instead of the port->line. For example, the 8250 driver sets up a number of serial8250 ports initially that can be inherited by the hardware specific driver. At that the port->line no longer decribes the port's relation to the serial core controller instance. Let's fix the issue by assigning port->port_id for each serial core controller port instance. Fixes: 7d695d83767c ("serial: core: Fix serial_base_match() after fixing controller port name") Tested-by: Guenter Roeck Signed-off-by: Tony Lindgren Reviewed-by: Dhruva Gole --- drivers/tty/serial/serial_base.h | 1 + drivers/tty/serial/serial_base_bus.c | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/serial_base.h b/drivers/tty/serial/serial_base.h --- a/drivers/tty/serial/serial_base.h +++ b/drivers/tty/serial/serial_base.h @@ -16,6 +16,7 @@ struct device; struct serial_ctrl_device { struct device dev; + struct ida port_ida; }; struct serial_port_device { 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 @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -112,6 +113,8 @@ struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port, if (!ctrl_dev) return ERR_PTR(-ENOMEM); + ida_init(&ctrl_dev->port_ida); + err = serial_base_device_init(port, &ctrl_dev->dev, parent, &serial_ctrl_type, serial_base_ctrl_release, @@ -142,16 +145,31 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port, struct serial_ctrl_device *ctrl_dev) { struct serial_port_device *port_dev; + unsigned int min = 0, max = ~0U; int err; port_dev = kzalloc(sizeof(*port_dev), GFP_KERNEL); if (!port_dev) return ERR_PTR(-ENOMEM); + /* Device driver specified port_id vs automatic assignment? */ + if (port->port_id) { + min = port->port_id; + max = port->port_id; + } + + err = ida_alloc_range(&ctrl_dev->port_ida, min, max, GFP_KERNEL); + if (err < 0) { + kfree(port_dev); + return ERR_PTR(err); + } + + port->port_id = err; + err = serial_base_device_init(port, &port_dev->dev, &ctrl_dev->dev, &serial_port_type, serial_base_port_release, - port->ctrl_id, port->line); + port->ctrl_id, port->port_id); if (err) goto err_put_device; @@ -165,16 +183,24 @@ struct serial_port_device *serial_base_port_add(struct uart_port *port, err_put_device: put_device(&port_dev->dev); + ida_free(&ctrl_dev->port_ida, port->port_id); return ERR_PTR(err); } void serial_base_port_device_remove(struct serial_port_device *port_dev) { + struct serial_ctrl_device *ctrl_dev; + struct device *parent; + if (!port_dev) return; + parent = port_dev->dev.parent; + ctrl_dev = to_serial_base_ctrl_device(parent); + device_del(&port_dev->dev); + ida_free(&ctrl_dev->port_ida, port_dev->port->port_id); put_device(&port_dev->dev); }