From patchwork Thu Jul 20 05:10:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 122978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2895966vqt; Wed, 19 Jul 2023 22:23:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlFjul+Z/OFk81J1uL2my6FrJaq8LWQ/c8f2KHw4PznbEk30zzC79p4O6wWZScw7yIt83KYQ X-Received: by 2002:a05:6a21:339b:b0:133:215e:746d with SMTP id yy27-20020a056a21339b00b00133215e746dmr6374555pzb.41.1689830587627; Wed, 19 Jul 2023 22:23:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689830587; cv=none; d=google.com; s=arc-20160816; b=w8FU3b6kEVi/7V8IohyLMdskTDMpIAwW85hPyjHDux8MN/aT6LsQbEp13gSij4D7kJ cRwdFw1o9NIHU+pC1LeFvOQQN9vr6Vuz+/onq5IMSatA2DCLYf7/9Y65hFUFaBMJDaoO UF30oO7KsPLxTAnzwOyW1Otm6O9SoPE5fTEqbCg/ZdMeThH+XOa4EBD2n6H+r7Lco9Vn xEn7gX0L1IJqTIFzJCP1Pre8Gu7LlbKX0WxFEZuhGUP+mgzegP9ONYzOVZ69IfWRn6Dp HfzE27PhD+TU4VaioSFcryvtXhfCwtEMprhPq/xfMhezBD232GSNUeKzlCMK44IQ//ib MZcw== 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=m1bcS5djnwE+EPU1AXVyo8gr1XZfusFQaFJvk+KUSCY=; fh=4/QVXuYbDz5eDJk1WOri1GE1zBIPkwazzm/ZNdiW5zo=; b=OOHxuWm+nGYhYcuRa5/y0xeyCZnyHSKn5RxB6qeFnuevZjNh5VDHQZBk004NAW9m1q IOsUNDK3RYj+XF80kBArGzzOfiQDJ5n/3S5FspcFngKV29uNkLINUQpENTrgUQdQigyQ 4GapDWAILIjjPDLlXlnfk88PtCtozbx5IrQrFK/KCooipSgP+HqosWvUesX66BFGD23V Xk+QQMaZ4SdafNI5u1//qOqgxbvXxpYlNspt4bMMRL0ti/zM7oCV999emqCtJCdshAba UwXmMqJz2e0hMOF3vuPYGBe6/Z6GOV3/ZRIpf2DlQ2kX2IUHVtfUkE+rYUC3yCskl95/ GO6A== 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 m17-20020a056a00081100b0068255c2b8a8si226911pfk.151.2023.07.19.22.22.54; Wed, 19 Jul 2023 22:23:07 -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 S229828AbjGTFLA (ORCPT + 99 others); Thu, 20 Jul 2023 01:11:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbjGTFK4 (ORCPT ); Thu, 20 Jul 2023 01:10:56 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 83EFB269E; Wed, 19 Jul 2023 22:10:50 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 3CF7D80F7; Thu, 20 Jul 2023 05:10:47 +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 3/3] serial: core: Fix serial core controller port name to show controller id Date: Thu, 20 Jul 2023 08:10:16 +0300 Message-ID: <20230720051021.14961-4-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: 1771915798465900827 X-GMAIL-MSGID: 1771915798465900827 We are missing the serial core controller id for the serial core port name. Let's fix the issue for sane /sys/bus/serial-core/devices, and to avoid issues addressing serial ports later on. Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reported-by: Andy Shevchenko Closes: https://lore.kernel.org/linux-serial/20230719051613.46569-1-tony@atomide.com/T/#m0f358e91262f7f56198ba9d0a7100809e9e35cc5 Signed-off-by: Tony Lindgren --- drivers/tty/serial/serial_base_bus.c | 33 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) 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 @@ -19,6 +19,14 @@ static bool serial_base_initialized; +static const struct device_type serial_ctrl_type = { + .name = "ctrl", +}; + +static const struct device_type serial_port_type = { + .name = "port", +}; + static int serial_base_match(struct device *dev, struct device_driver *drv) { int len = strlen(drv->name); @@ -48,7 +56,8 @@ static int serial_base_device_init(struct uart_port *port, struct device *parent_dev, const struct device_type *type, void (*release)(struct device *dev), - int id) + unsigned int ctrl_id, + unsigned int port_id) { device_initialize(dev); dev->type = type; @@ -61,13 +70,17 @@ static int serial_base_device_init(struct uart_port *port, return -EPROBE_DEFER; } - return dev_set_name(dev, "%s.%s.%d", type->name, dev_name(port->dev), id); + if (type == &serial_ctrl_type) + return dev_set_name(dev, "%s.%s.%d", type->name, + dev_name(port->dev), ctrl_id); + else if (type == &serial_port_type) + return dev_set_name(dev, "%s.%s.%d.%d", type->name, + dev_name(port->dev), ctrl_id, + port_id); + else + return -EINVAL; } -static const struct device_type serial_ctrl_type = { - .name = "ctrl", -}; - static void serial_base_ctrl_release(struct device *dev) { struct serial_ctrl_device *ctrl_dev = to_serial_base_ctrl_device(dev); @@ -96,7 +109,7 @@ struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port, err = serial_base_device_init(port, &ctrl_dev->dev, parent, &serial_ctrl_type, serial_base_ctrl_release, - port->ctrl_id); + port->ctrl_id, 0); if (err) goto err_put_device; @@ -112,10 +125,6 @@ struct serial_ctrl_device *serial_base_ctrl_add(struct uart_port *port, return ERR_PTR(err); } -static const struct device_type serial_port_type = { - .name = "port", -}; - static void serial_base_port_release(struct device *dev) { struct serial_port_device *port_dev = to_serial_base_port_device(dev); @@ -136,7 +145,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->port_id); + port->ctrl_id, port->port_id); if (err) goto err_put_device;