From patchwork Tue Jul 25 05:42:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 125332 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2255954vqg; Mon, 24 Jul 2023 22:49:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlGgO7RCOrxecceOSlaGkWXaImSlTFbPAG71TQ1ryRttEL/inshYW7hkb9iO250+HB/P5559 X-Received: by 2002:a17:906:3292:b0:994:4e9c:30c6 with SMTP id 18-20020a170906329200b009944e9c30c6mr10064905ejw.57.1690264139900; Mon, 24 Jul 2023 22:48:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690264139; cv=none; d=google.com; s=arc-20160816; b=OJBdJ3Kd85Iz7lmsfEJRNq9X7hBxDaiRFy5T1/L6+nzYQkFASmZP6f+XbVyX8lTn/f /5SpR+aJYHluiuqAW0Irn0kQuyTiBRCcvwb/x2zPh9+k6s8/nUJw3h/a3xodYX3g0MjX 9zPonsxbzyGzyVcgeinSKmcHaYdsmH4iwlF4qPZ1CTGjCzOeO1ABmFRv73M87CkPRJiZ Z+KjoEn1BoSWDghXR49hCcvnfxSXbjSppw+PdHltfgfTtey9MH88eSfg1hGDLP4otpQM pDShxDpp+j5KCZjSPBmyecV1HEXxYE1I/W+b+p51imNay00lc/vPVBCmVWFna5Bdh/hq iUyw== 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=SianzBZBNbsMFjX+N/mx0RXemP7xXLz1cxvt9Byz+iU=; fh=wxWR7S7XHVlqVIuoke4G1/IBIqVMAhyap/qryV8BrCQ=; b=Ss6zlMHBEhpXZoSD5al8Ip8NNDD+WGcFtooxnzh04M3fjG7w97HjsnJD8QkRB6DXBo 9lzqCq/Wa94JjF0U0HYTXLsjKXt97Wbf/6LdSnD8nwrXKzSIMROfrU5xJLfyf3Zm5UWY JLSz3syjg4cxjXlghuJT7am9R2ZbT3otLM+EvzEFUVS/pw6MAZoqcBzvmykXaValIYEP F9qHVjADVSD/QuXxi+z4IkapyDpsibgzFHSvfGfK/Udd1Bu02HrbHYdaTOY+BXmk4ZtD P4R4h368SISQdj4Njlsr+BephHeJzzP87XXfdUsPOXLYBAm0BuLvrA8CdneDQdF7/6p6 LCTw== 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 s25-20020a170906061900b00991c8af7ba5si7833123ejb.473.2023.07.24.22.48.35; Mon, 24 Jul 2023 22:48:59 -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 S231575AbjGYFnV (ORCPT + 99 others); Tue, 25 Jul 2023 01:43:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231670AbjGYFmx (ORCPT ); Tue, 25 Jul 2023 01:42:53 -0400 Received: from muru.com (muru.com [72.249.23.125]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8DF301FC1; Mon, 24 Jul 2023 22:42:45 -0700 (PDT) Received: from hillo.muru.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 841038176; Tue, 25 Jul 2023 05:42:42 +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 3/3] serial: core: Fix serial core controller port name to show controller id Date: Tue, 25 Jul 2023 08:42:12 +0300 Message-ID: <20230725054216.45696-4-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: 1772370411042258798 X-GMAIL-MSGID: 1772370411042258798 We are missing the serial core controller id for the serial core port name. Let's fix the issue for sane sysfs output, and to avoid issues addressing serial ports later on. And as we're now showing the controller id, the "ctrl" and "port" prefix for the DEVNAME become useless, we can just drop them. Let's standardize on DEVNAME:0 for controller name, where 0 is the controller id. And DEVNAME:0.0 for port name, where 0.0 are the controller id and port id. This makes the sysfs output nicer, on qemu for example: $ ls /sys/bus/serial-base/devices 00:04:0 serial8250:0 serial8250:0.2 00:04:0.0 serial8250:0.1 serial8250:0.3 Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") Reported-by: Andy Shevchenko Reviewed-by: Andy Shevchenko Signed-off-by: Tony Lindgren Acked-by: Andy Shevchenko --- Andy, I kept your Reviewed-by although I updated the device naming and description, does the patch still look OK to you? --- drivers/tty/serial/serial_base_bus.c | 32 +++++++++++++++++----------- 1 file changed, 20 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,16 @@ 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:%d", dev_name(port->dev), ctrl_id); + + if (type == &serial_port_type) + return dev_set_name(dev, "%s:%d.%d", dev_name(port->dev), + ctrl_id, port_id); + + 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 +108,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 +124,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 +144,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;