thunderbolt: Clear hops before overwriting
Andreas Noever
maintainerPATCH 1/1 thunderbolt: Clear hops before overwriting
Zero hops in tb_path_activate before writing a new path.
This fixes the following scenario:
- Boot with a coldplugged device
- Unplug device
- Plug device back in
- PCI hotplug fails
The hotplug operation fails because our new path matches the (now defunct) path which was setup by the firmware for the coldplugged device. By writing zeros before writing our path configuration we can force thunderbolt to retrain the path.
--- drivers/thunderbolt/path.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
drivers/thunderbolt/path.c +20 -1
@@ -150,7 +150,26 @@ int tb_path_activate(struct tb_path *path)/* Activate hops. */ for (i = path->path_length -1 ; i >=0 ; i--) { -struct tb_regs_hop hop; +struct tb_regs_hop hop = {0 }; + +/* +* We do (currently) not tear down paths setup by the firmeware. +* If a firmware device is unplugged and plugged in again then +* it can happen that we reuse some of the hops from the (now +* defunct) firmeware path. This causes the hotplug operation to +* fail (the pci device does not show up). Clearing the hop +* before overwriting it fixes the problem. +* +* Should be removed once we discover and tear down firmeware +* paths. +*/ + res =tb_port_write (path->hops[i].in_port, &hop,TB_CFG_HOPS , +2 * path->hops[i].in_hop_index,2 ); +if (res) { +__tb_path_deactivate_hops (path, i); +__tb_path_deallocate_nfc (path,0 ); + goto err; + }/* dword 0 */ hop.next_hop = path->hops[i].next_hop_index;
Signature · 1 line
2.1.0
Quoted 13 lines · Andreas Noever
Zero hops in
tb_path_activatebefore writing a new path.This fixes the following scenario:
- Boot with a coldplugged device
- Unplug device
- Plug device back in
- PCI hotplug failsThe hotplug operation fails because our new path matches the (now defunct) path which was setup by the firmware for the coldplugged device. By writing zeros before writing our path configuration we can force thunderbolt to retrain the path.
Quoted 4 lines
Signed-off-by Andreas Noever <[email protected]>--- drivers/thunderbolt/path.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)
Should this get in for 3.17-final or can it wait for 3.18? I'm thinking 3.17, but want to make sure.
thanks,
greg k-h
Andreas Noever
maintainerQuoted 14 lines · Greg KH
Quoted 13 lines · Andreas Noever
Zero hops in
tb_path_activatebefore writing a new path.This fixes the following scenario:
- Boot with a coldplugged device
- Unplug device
- Plug device back in
- PCI hotplug failsThe hotplug operation fails because our new path matches the (now defunct) path which was setup by the firmware for the coldplugged device. By writing zeros before writing our path configuration we can force thunderbolt to retrain the path.
Quoted 7 lines
Quoted 4 lines
Signed-off-by Andreas Noever <[email protected]>--- drivers/thunderbolt/path.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)Should this get in for 3.17-final or can it wait for 3.18? I'm thinking 3.17, but want to make sure.
I would prefer 3.17.
Quoted 3 lines
thanks,
greg k-h