Skip to content

Commit

Permalink
Revert "thunderbolt: Hide authorized attribute if router does not sup…
Browse files Browse the repository at this point in the history
…port PCIe tunnels"

commit 8e33412 upstream.

This reverts commit 6f3bade.

It turns out bolt depends on having authorized attribute visible under
each device. Hiding it makes bolt crash as several people have reported
on various bug trackers. For this reason revert the commit.

Link: https://gitlab.freedesktop.org/bolt/bolt/-/issues/174
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1979765
Link: https://bugs.archlinux.org/task/71569
Cc: stable@vger.kernel.org
Cc: Christian Kellner <ckellner@redhat.com>
Fixes: 6f3bade ("thunderbolt: Hide authorized attribute if router does not support PCIe tunnels")
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20210727142501.27476-1-mika.westerberg@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
westeri authored and gregkh committed Aug 12, 2021
1 parent bc3c6b5 commit ddbd617
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions drivers/thunderbolt/switch.c
Expand Up @@ -1740,18 +1740,6 @@ static struct attribute *switch_attrs[] = {
NULL,
};

static bool has_port(const struct tb_switch *sw, enum tb_port_type type)
{
const struct tb_port *port;

tb_switch_for_each_port(sw, port) {
if (!port->disabled && port->config.type == type)
return true;
}

return false;
}

static umode_t switch_attr_is_visible(struct kobject *kobj,
struct attribute *attr, int n)
{
Expand All @@ -1760,8 +1748,7 @@ static umode_t switch_attr_is_visible(struct kobject *kobj,

if (attr == &dev_attr_authorized.attr) {
if (sw->tb->security_level == TB_SECURITY_NOPCIE ||
sw->tb->security_level == TB_SECURITY_DPONLY ||
!has_port(sw, TB_TYPE_PCIE_UP))
sw->tb->security_level == TB_SECURITY_DPONLY)
return 0;
} else if (attr == &dev_attr_device.attr) {
if (!sw->device)
Expand Down

0 comments on commit ddbd617

Please sign in to comment.