diff for duplicates of <20230803071034.25571-1-tony@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 85557d5..e09d322 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,55 +1,19 @@ -While fixing DEVNAME to be more usable, I broke serial_base_match() as the -ctrl and port prefix for device names seemed unnecessary. +Hi, -The prefixes are still needed by serial_base_match() to probe the serial -base controller port, and serial tx is now broken. +> While fixing DEVNAME to be more usable, I broke serial_base_match() as the +> ctrl and port prefix for device names seemed unnecessary. -Let's fix the issue by checking against dev->type and drv->name instead -of the prefixes that are no longer in the DEVNAME. +> The prefixes are still needed by serial_base_match() to probe the serial +> base controller port, and serial tx is now broken. -Fixes: 1ef2c2df1199 ("serial: core: Fix serial core controller port name to show controller id") -Reported-by: kernel test robot <oliver.sang@intel.com> -Closes: https://lore.kernel.org/oe-lkp/202308021529.35b3ad6c-oliver.sang@intel.com -Signed-off-by: Tony Lindgren <tony@atomide.com> ---- +> Let's fix the issue by checking against dev->type and drv->name instead +> of the prefixes that are no longer in the DEVNAME. -Changes since v1: -- Leave out magic numbers and use str_has_prefix() as suggested by Andy - and Greg +> Fixes: 1ef2c2df1199 ("serial: core: Fix serial core controller port name to show controller id") +> Reported-by: kernel test robot <oliver.sang@intel.com> +> Closes: https://lore.kernel.org/oe-lkp/202308021529.35b3ad6c-oliver.sang@intel.com +> Signed-off-by: Tony Lindgren <tony@atomide.com> -- Improve patch description and add a link for Closes tag as suggested - by Jiri +This patch fixes the boot issue on RZ/G2L SMARC EVK since yesterday. -- Check the name against device_type name since we have it and leave - out the changes to try to define names in the header because of the - issues noted by Jiri - -- Leave out Tested-by from Mark and Anders as the patch changed - ---- - drivers/tty/serial/serial_base_bus.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 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 -@@ -29,9 +29,15 @@ static const struct device_type serial_port_type = { - - static int serial_base_match(struct device *dev, struct device_driver *drv) - { -- int len = strlen(drv->name); -+ if (dev->type == &serial_ctrl_type && -+ str_has_prefix(drv->name, serial_ctrl_type.name)) -+ return 1; - -- return !strncmp(dev_name(dev), drv->name, len); -+ if (dev->type == &serial_port_type && -+ str_has_prefix(drv->name, serial_port_type.name)) -+ return 1; -+ -+ return 0; - } - - static struct bus_type serial_base_bus_type = { --- -2.41.0 +Tested-by: Biju Das <biju.das.jz@bp.renesas.com> diff --git a/a/content_digest b/N1/content_digest index d12054a..d3c2a55 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,75 +1,42 @@ - "From\0Tony Lindgren <tony@atomide.com>\0" + "From\0Biju Das <biju.das.jz@bp.renesas.com>\0" "Subject\0[PATCH v2 1/1] serial: core: Fix serial_base_match() after fixing controller port name\0" - "Date\0Thu, 3 Aug 2023 10:10:32 +0300\0" - "To\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>" - Jiri Slaby <jirislaby@kernel.org> - " Andy Shevchenko <andriy.shevchenko@linux.intel.com>\0" - "Cc\0Andy Shevchenko <andriy.shevchenko@intel.com>" - Dhruva Gole <d-gole@ti.com> - " Ilpo J\303\244rvinen <ilpo.jarvinen@linux.intel.com>" - John Ogness <john.ogness@linutronix.de> - Johan Hovold <johan@kernel.org> - Sebastian Andrzej Siewior <bigeasy@linutronix.de> - Vignesh Raghavendra <vigneshr@ti.com> + "Date\0Thu, 3 Aug 2023 16:34:17 +0100\0" + "To\0tony@atomide.com\0" + "Cc\0andriy.shevchenko@intel.com" + andriy.shevchenko@linux.intel.com + bigeasy@linutronix.de + d-gole@ti.com + gregkh@linuxfoundation.org + ilpo.jarvinen@linux.intel.com + jirislaby@kernel.org + johan@kernel.org + john.ogness@linutronix.de linux-kernel@vger.kernel.org linux-serial@vger.kernel.org - " kernel test robot <oliver.sang@intel.com>\0" + oliver.sang@intel.com + vigneshr@ti.com + linux-renesas-soc@vger.kernel.org + " Biju Das <biju.das.jz@bp.renesas.com>\0" "\00:1\0" "b\0" - "While fixing DEVNAME to be more usable, I broke serial_base_match() as the\n" - "ctrl and port prefix for device names seemed unnecessary.\n" + "Hi,\n" "\n" - "The prefixes are still needed by serial_base_match() to probe the serial\n" - "base controller port, and serial tx is now broken.\n" + "> While fixing DEVNAME to be more usable, I broke serial_base_match() as the\n" + "> ctrl and port prefix for device names seemed unnecessary.\n" "\n" - "Let's fix the issue by checking against dev->type and drv->name instead\n" - "of the prefixes that are no longer in the DEVNAME.\n" + "> The prefixes are still needed by serial_base_match() to probe the serial\n" + "> base controller port, and serial tx is now broken.\n" "\n" - "Fixes: 1ef2c2df1199 (\"serial: core: Fix serial core controller port name to show controller id\")\n" - "Reported-by: kernel test robot <oliver.sang@intel.com>\n" - "Closes: https://lore.kernel.org/oe-lkp/202308021529.35b3ad6c-oliver.sang@intel.com\n" - "Signed-off-by: Tony Lindgren <tony@atomide.com>\n" - "---\n" + "> Let's fix the issue by checking against dev->type and drv->name instead\n" + "> of the prefixes that are no longer in the DEVNAME.\n" "\n" - "Changes since v1:\n" - "- Leave out magic numbers and use str_has_prefix() as suggested by Andy\n" - " and Greg\n" + "> Fixes: 1ef2c2df1199 (\"serial: core: Fix serial core controller port name to show controller id\")\n" + "> Reported-by: kernel test robot <oliver.sang@intel.com>\n" + "> Closes: https://lore.kernel.org/oe-lkp/202308021529.35b3ad6c-oliver.sang@intel.com\n" + "> Signed-off-by: Tony Lindgren <tony@atomide.com>\n" "\n" - "- Improve patch description and add a link for Closes tag as suggested\n" - " by Jiri\n" + "This patch fixes the boot issue on RZ/G2L SMARC EVK since yesterday.\n" "\n" - "- Check the name against device_type name since we have it and leave\n" - " out the changes to try to define names in the header because of the\n" - " issues noted by Jiri\n" - "\n" - "- Leave out Tested-by from Mark and Anders as the patch changed\n" - "\n" - "---\n" - " drivers/tty/serial/serial_base_bus.c | 10 ++++++++--\n" - " 1 file changed, 8 insertions(+), 2 deletions(-)\n" - "\n" - "diff --git a/drivers/tty/serial/serial_base_bus.c b/drivers/tty/serial/serial_base_bus.c\n" - "--- a/drivers/tty/serial/serial_base_bus.c\n" - "+++ b/drivers/tty/serial/serial_base_bus.c\n" - "@@ -29,9 +29,15 @@ static const struct device_type serial_port_type = {\n" - " \n" - " static int serial_base_match(struct device *dev, struct device_driver *drv)\n" - " {\n" - "-\tint len = strlen(drv->name);\n" - "+\tif (dev->type == &serial_ctrl_type &&\n" - "+\t str_has_prefix(drv->name, serial_ctrl_type.name))\n" - "+\t\treturn 1;\n" - " \n" - "-\treturn !strncmp(dev_name(dev), drv->name, len);\n" - "+\tif (dev->type == &serial_port_type &&\n" - "+\t str_has_prefix(drv->name, serial_port_type.name))\n" - "+\t\treturn 1;\n" - "+\n" - "+\treturn 0;\n" - " }\n" - " \n" - " static struct bus_type serial_base_bus_type = {\n" - "-- \n" - 2.41.0 + Tested-by: Biju Das <biju.das.jz@bp.renesas.com> -4e593cb236994cbb58373447d00cf9f4acf16e0aacca400c56804eb116438dff +6dfac3d79dd0769652f71fe5fb34b020b6fe8f28c76fe32f661d0f2baaef8c7d
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox