| Message ID | 20220926143351.11483-1-mario.limonciello@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5d2569cb4a65c373896ec0217febdf88739ed295 |
| Headers | show |
| Series | [v4] thunderbolt: Explicitly enable lane adapter hotplug events at startup | expand |
Hi Mario, On Mon, Sep 26, 2022 at 09:33:50AM -0500, Mario Limonciello wrote: > Software that has run before the USB4 CM in Linux runs may have disabled > hotplug events for a given lane adapter. > > Other CMs such as that one distributed with Windows 11 will enable hotplug > events. Do the same thing in the Linux CM which fixes hotplug events on > "AMD Pink Sardine". > > Cc: stable@vger.kernel.org > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Looks good to me now. Since we are pretty late in the rc and this is not trivial fix anymore, would it be OK for you if I apply this to my next branch with stable tag? Then it gets slightly more exposure before it ends up in any of the stable trees.
[Public] > -----Original Message----- > From: Mika Westerberg <mika.westerberg@linux.intel.com> > Sent: Monday, September 26, 2022 09:53 > To: Limonciello, Mario <Mario.Limonciello@amd.com> > Cc: Andreas Noever <andreas.noever@gmail.com>; Michael Jamet > <michael.jamet@intel.com>; Yehezkel Bernat <YehezkelShB@gmail.com>; > Mehta, Sanju <Sanju.Mehta@amd.com>; stable@vger.kernel.org; linux- > usb@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v4] thunderbolt: Explicitly enable lane adapter hotplug > events at startup > > Hi Mario, > > On Mon, Sep 26, 2022 at 09:33:50AM -0500, Mario Limonciello wrote: > > Software that has run before the USB4 CM in Linux runs may have disabled > > hotplug events for a given lane adapter. > > > > Other CMs such as that one distributed with Windows 11 will enable > hotplug > > events. Do the same thing in the Linux CM which fixes hotplug events on > > "AMD Pink Sardine". > > > > Cc: stable@vger.kernel.org > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > > Looks good to me now. Since we are pretty late in the rc and this is not > trivial fix anymore, would it be OK for you if I apply this to my next > branch with stable tag? Then it gets slightly more exposure before it > ends up in any of the stable trees. Yeah that's fine by me, thanks!
On Mon, Sep 26, 2022 at 02:54:22PM +0000, Limonciello, Mario wrote: > [Public] > > > > > -----Original Message----- > > From: Mika Westerberg <mika.westerberg@linux.intel.com> > > Sent: Monday, September 26, 2022 09:53 > > To: Limonciello, Mario <Mario.Limonciello@amd.com> > > Cc: Andreas Noever <andreas.noever@gmail.com>; Michael Jamet > > <michael.jamet@intel.com>; Yehezkel Bernat <YehezkelShB@gmail.com>; > > Mehta, Sanju <Sanju.Mehta@amd.com>; stable@vger.kernel.org; linux- > > usb@vger.kernel.org; linux-kernel@vger.kernel.org > > Subject: Re: [PATCH v4] thunderbolt: Explicitly enable lane adapter hotplug > > events at startup > > > > Hi Mario, > > > > On Mon, Sep 26, 2022 at 09:33:50AM -0500, Mario Limonciello wrote: > > > Software that has run before the USB4 CM in Linux runs may have disabled > > > hotplug events for a given lane adapter. > > > > > > Other CMs such as that one distributed with Windows 11 will enable > > hotplug > > > events. Do the same thing in the Linux CM which fixes hotplug events on > > > "AMD Pink Sardine". > > > > > > Cc: stable@vger.kernel.org > > > Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> > > > > Looks good to me now. Since we are pretty late in the rc and this is not > > trivial fix anymore, would it be OK for you if I apply this to my next > > branch with stable tag? Then it gets slightly more exposure before it > > ends up in any of the stable trees. > > Yeah that's fine by me, thanks! Applied to thunderbolt.git/next, thanks!
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 77d7f07ca075..e7851c926538 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -2822,6 +2822,26 @@ static void tb_switch_credits_init(struct tb_switch *sw) tb_sw_info(sw, "failed to determine preferred buffer allocation, using defaults\n"); } +static int tb_switch_port_hotplug_enable(struct tb_switch *sw) +{ + struct tb_port *port; + + if (tb_switch_is_icm(sw)) + return 0; + + tb_switch_for_each_port(sw, port) { + int res; + + if (!port->cap_usb4) + continue; + + res = usb4_port_hotplug_enable(port); + if (res) + return res; + } + return 0; +} + /** * tb_switch_add() - Add a switch to the domain * @sw: Switch to add @@ -2891,6 +2911,10 @@ int tb_switch_add(struct tb_switch *sw) return ret; } + ret = tb_switch_port_hotplug_enable(sw); + if (ret) + return ret; + ret = device_add(&sw->dev); if (ret) { dev_err(&sw->dev, "failed to add device: %d\n", ret); diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h index 5db76de40cc1..332159f984fc 100644 --- a/drivers/thunderbolt/tb.h +++ b/drivers/thunderbolt/tb.h @@ -1174,6 +1174,7 @@ int usb4_switch_add_ports(struct tb_switch *sw); void usb4_switch_remove_ports(struct tb_switch *sw); int usb4_port_unlock(struct tb_port *port); +int usb4_port_hotplug_enable(struct tb_port *port); int usb4_port_configure(struct tb_port *port); void usb4_port_unconfigure(struct tb_port *port); int usb4_port_configure_xdomain(struct tb_port *port); diff --git a/drivers/thunderbolt/tb_regs.h b/drivers/thunderbolt/tb_regs.h index 166054110388..bbe38b2d9057 100644 --- a/drivers/thunderbolt/tb_regs.h +++ b/drivers/thunderbolt/tb_regs.h @@ -308,6 +308,7 @@ struct tb_regs_port_header { #define ADP_CS_5 0x05 #define ADP_CS_5_LCA_MASK GENMASK(28, 22) #define ADP_CS_5_LCA_SHIFT 22 +#define ADP_CS_5_DHP BIT(31) /* TMU adapter registers */ #define TMU_ADP_CS_3 0x03 diff --git a/drivers/thunderbolt/usb4.c b/drivers/thunderbolt/usb4.c index 3a2e7126db9d..f0b5a8f1ed3a 100644 --- a/drivers/thunderbolt/usb4.c +++ b/drivers/thunderbolt/usb4.c @@ -1046,6 +1046,26 @@ int usb4_port_unlock(struct tb_port *port) return tb_port_write(port, &val, TB_CFG_PORT, ADP_CS_4, 1); } +/** + * usb4_port_hotplug_enable() - Enables hotplug for a port + * @port: USB4 port to operate on + * + * Enables hot plug events on a given port. This is only intended + * to be used on lane, DP-IN, and DP-OUT adapters. + */ +int usb4_port_hotplug_enable(struct tb_port *port) +{ + int ret; + u32 val; + + ret = tb_port_read(port, &val, TB_CFG_PORT, ADP_CS_5, 1); + if (ret) + return ret; + + val &= ~ADP_CS_5_DHP; + return tb_port_write(port, &val, TB_CFG_PORT, ADP_CS_5, 1); +} + static int usb4_port_set_configured(struct tb_port *port, bool configured) { int ret;
Software that has run before the USB4 CM in Linux runs may have disabled hotplug events for a given lane adapter. Other CMs such as that one distributed with Windows 11 will enable hotplug events. Do the same thing in the Linux CM which fixes hotplug events on "AMD Pink Sardine". Cc: stable@vger.kernel.org Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> --- v3->v4: * Adjust calling location from a new static function. v2->v3: * Guard with tb_switch_is_icm to avoid risk to Intel FW CM case v1->v2: * s/usb4_enable_hotplug/usb4_port_hotplug_enable/ * Clarify intended users in documentation comment * Only call for lane adapters * Add stable tag drivers/thunderbolt/switch.c | 24 ++++++++++++++++++++++++ drivers/thunderbolt/tb.h | 1 + drivers/thunderbolt/tb_regs.h | 1 + drivers/thunderbolt/usb4.c | 20 ++++++++++++++++++++ 4 files changed, 46 insertions(+)