mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
![Greg Kroah-Hartman](/assets/img/avatar_default.png)
This includes following Thunderbolt/USB4 changes for v5.12 merge window: * Start lane initialization after sleep for Thunderbolt 3 compatible devices * Add support for de-authorizing PCIe tunnels (software based connection manager only) * Add support for new ACPI 6.4 USB4 _OSC * Allow disabling XDomain protocol * Add support for new SL5 security level * Clean up kernel-docs to pass W=1 builds * A couple of cleanups and minor fixes All these have been in linux-next without reported issues. -----BEGIN PGP SIGNATURE----- iQJUBAABCgA+FiEEVTdhRGBbNzLrSUBaAP2fSd+ZWKAFAmAib9IgHG1pa2Eud2Vz dGVyYmVyZ0BsaW51eC5pbnRlbC5jb20ACgkQAP2fSd+ZWKAykw/+JfXClHYVlqRh IH7kFkD4nA7g7359PpmSLxRBzvkivz7w66BqNtp6GhIF1oGRtDJ5t5ufgwdYX3Ld tqH2Glhw9gV5EmeqDzq3TbLzAU+zm9a5bVE3vwQbxpgPGtDigKpDjqUobGFooDaB F8EX3H3rwI3i+1/S1vBAZbuJqND0cuDM2yQNYJ//Dch2wnZ/Vy6darzY+GpJYSWi ZlzWsvhfbo1V3n1PphzRkvzcMbVcJriVfwJihtY1h3H6RnnD4pqQJ7e1ec+4Pgdv fql3lJg0M02rzTSYLyLwuMOojZA+gPqLWb3Fj5pkfjcKoneq1BNTsl4xRzDpqwP3 /DeOPE+TO6SAsAkRksyH5W9nvaYGmLy0r9JREkkzdhH41RML4ueEjstaJyfWn1N+ bX2Ba+5A9pIWKYbwfbNTZPyHk9r94IdDDXzjXFLSeOTcCwMf97XX4sgrbPHedxh6 VAjIrYxuSCTRRN1G6xtPI9aer5wh7e01W71WK3SJhvpqs092E0m0p4gN/nm6yW1Z SSJg36uqp0egjU/NxsyNvB1ePQFiUkO7WIow9pVBU+US7vSuW9IXbC59lAx0XUE5 tonIF7zAiz1hLp6DZRYfTX7R9xbyshep0uhESceCcIsF5winsgUXL76QEMN0fEjf wmUG/HWrOd2O/IH8704rfnu7ajxATGM= =pzr4 -----END PGP SIGNATURE----- Merge tag 'thunderbolt-for-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next Mika writes: thunderbolt: Changes for v5.12 merge window This includes following Thunderbolt/USB4 changes for v5.12 merge window: * Start lane initialization after sleep for Thunderbolt 3 compatible devices * Add support for de-authorizing PCIe tunnels (software based connection manager only) * Add support for new ACPI 6.4 USB4 _OSC * Allow disabling XDomain protocol * Add support for new SL5 security level * Clean up kernel-docs to pass W=1 builds * A couple of cleanups and minor fixes All these have been in linux-next without reported issues. * tag 'thunderbolt-for-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: (27 commits) thunderbolt: Add support for native USB4 _OSC ACPI: Add support for native USB4 control _OSC ACPI: Execute platform _OSC also with query bit clear thunderbolt: Allow disabling XDomain protocol thunderbolt: Add support for PCIe tunneling disabled (SL5) thunderbolt: dma_test: Drop unnecessary include thunderbolt: Add clarifying comments about USB4 terms router and adapter thunderbolt: switch: Fix kernel-doc descriptions of non-static functions thunderbolt: nhi: Fix kernel-doc descriptions of non-static functions thunderbolt: path: Fix kernel-doc descriptions of non-static functions thunderbolt: eeprom: Fix kernel-doc descriptions of non-static functions thunderbolt: ctl: Fix kernel-doc descriptions of non-static functions thunderbolt: switch: Fix function name in the header thunderbolt: tunnel: Fix misspelling of 'receive_path' thunderbolt: icm: Fix a couple of formatting issues thunderbolt: switch: Demote a bunch of non-conformant kernel-doc headers thunderbolt: tb: Kernel-doc function headers should document their parameters thunderbolt: nhi: Demote some non-conformant kernel-doc headers thunderbolt: xdomain: Fix 'tb_unregister_service_driver()'s 'drv' param thunderbolt: eeprom: Demote non-conformant kernel-doc headers to standard comment blocks ...
182 lines
4.7 KiB
C
182 lines
4.7 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* ACPI support
|
|
*
|
|
* Copyright (C) 2020, Intel Corporation
|
|
* Author: Mika Westerberg <mika.westerberg@linux.intel.com>
|
|
*/
|
|
|
|
#include <linux/acpi.h>
|
|
|
|
#include "tb.h"
|
|
|
|
static acpi_status tb_acpi_add_link(acpi_handle handle, u32 level, void *data,
|
|
void **return_value)
|
|
{
|
|
struct fwnode_reference_args args;
|
|
struct fwnode_handle *fwnode;
|
|
struct tb_nhi *nhi = data;
|
|
struct acpi_device *adev;
|
|
struct pci_dev *pdev;
|
|
struct device *dev;
|
|
int ret;
|
|
|
|
if (acpi_bus_get_device(handle, &adev))
|
|
return AE_OK;
|
|
|
|
fwnode = acpi_fwnode_handle(adev);
|
|
ret = fwnode_property_get_reference_args(fwnode, "usb4-host-interface",
|
|
NULL, 0, 0, &args);
|
|
if (ret)
|
|
return AE_OK;
|
|
|
|
/* It needs to reference this NHI */
|
|
if (nhi->pdev->dev.fwnode != args.fwnode)
|
|
goto out_put;
|
|
|
|
/*
|
|
* Try to find physical device walking upwards to the hierarcy.
|
|
* We need to do this because the xHCI driver might not yet be
|
|
* bound so the USB3 SuperSpeed ports are not yet created.
|
|
*/
|
|
dev = acpi_get_first_physical_node(adev);
|
|
while (!dev) {
|
|
adev = adev->parent;
|
|
if (!adev)
|
|
break;
|
|
dev = acpi_get_first_physical_node(adev);
|
|
}
|
|
|
|
if (!dev)
|
|
goto out_put;
|
|
|
|
/*
|
|
* Check that the device is PCIe. This is because USB3
|
|
* SuperSpeed ports have this property and they are not power
|
|
* managed with the xHCI and the SuperSpeed hub so we create the
|
|
* link from xHCI instead.
|
|
*/
|
|
while (dev && !dev_is_pci(dev))
|
|
dev = dev->parent;
|
|
|
|
if (!dev)
|
|
goto out_put;
|
|
|
|
/*
|
|
* Check that this actually matches the type of device we
|
|
* expect. It should either be xHCI or PCIe root/downstream
|
|
* port.
|
|
*/
|
|
pdev = to_pci_dev(dev);
|
|
if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI ||
|
|
(pci_is_pcie(pdev) &&
|
|
(pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT ||
|
|
pci_pcie_type(pdev) == PCI_EXP_TYPE_DOWNSTREAM))) {
|
|
const struct device_link *link;
|
|
|
|
link = device_link_add(&pdev->dev, &nhi->pdev->dev,
|
|
DL_FLAG_AUTOREMOVE_SUPPLIER |
|
|
DL_FLAG_PM_RUNTIME);
|
|
if (link) {
|
|
dev_dbg(&nhi->pdev->dev, "created link from %s\n",
|
|
dev_name(&pdev->dev));
|
|
} else {
|
|
dev_warn(&nhi->pdev->dev, "device link creation from %s failed\n",
|
|
dev_name(&pdev->dev));
|
|
}
|
|
}
|
|
|
|
out_put:
|
|
fwnode_handle_put(args.fwnode);
|
|
return AE_OK;
|
|
}
|
|
|
|
/**
|
|
* tb_acpi_add_links() - Add device links based on ACPI description
|
|
* @nhi: Pointer to NHI
|
|
*
|
|
* Goes over ACPI namespace finding tunneled ports that reference to
|
|
* @nhi ACPI node. For each reference a device link is added. The link
|
|
* is automatically removed by the driver core.
|
|
*/
|
|
void tb_acpi_add_links(struct tb_nhi *nhi)
|
|
{
|
|
acpi_status status;
|
|
|
|
if (!has_acpi_companion(&nhi->pdev->dev))
|
|
return;
|
|
|
|
/*
|
|
* Find all devices that have usb4-host-controller interface
|
|
* property that references to this NHI.
|
|
*/
|
|
status = acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, 32,
|
|
tb_acpi_add_link, NULL, nhi, NULL);
|
|
if (ACPI_FAILURE(status))
|
|
dev_warn(&nhi->pdev->dev, "failed to enumerate tunneled ports\n");
|
|
}
|
|
|
|
/**
|
|
* tb_acpi_is_native() - Did the platform grant native TBT/USB4 control
|
|
*
|
|
* Returns %true if the platform granted OS native control over
|
|
* TBT/USB4. In this case software based connection manager can be used,
|
|
* otherwise there is firmware based connection manager running.
|
|
*/
|
|
bool tb_acpi_is_native(void)
|
|
{
|
|
return osc_sb_native_usb4_support_confirmed &&
|
|
osc_sb_native_usb4_control;
|
|
}
|
|
|
|
/**
|
|
* tb_acpi_may_tunnel_usb3() - Is USB3 tunneling allowed by the platform
|
|
*
|
|
* When software based connection manager is used, this function
|
|
* returns %true if platform allows native USB3 tunneling.
|
|
*/
|
|
bool tb_acpi_may_tunnel_usb3(void)
|
|
{
|
|
if (tb_acpi_is_native())
|
|
return osc_sb_native_usb4_control & OSC_USB_USB3_TUNNELING;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* tb_acpi_may_tunnel_dp() - Is DisplayPort tunneling allowed by the platform
|
|
*
|
|
* When software based connection manager is used, this function
|
|
* returns %true if platform allows native DP tunneling.
|
|
*/
|
|
bool tb_acpi_may_tunnel_dp(void)
|
|
{
|
|
if (tb_acpi_is_native())
|
|
return osc_sb_native_usb4_control & OSC_USB_DP_TUNNELING;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* tb_acpi_may_tunnel_pcie() - Is PCIe tunneling allowed by the platform
|
|
*
|
|
* When software based connection manager is used, this function
|
|
* returns %true if platform allows native PCIe tunneling.
|
|
*/
|
|
bool tb_acpi_may_tunnel_pcie(void)
|
|
{
|
|
if (tb_acpi_is_native())
|
|
return osc_sb_native_usb4_control & OSC_USB_PCIE_TUNNELING;
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* tb_acpi_is_xdomain_allowed() - Are XDomain connections allowed
|
|
*
|
|
* When software based connection manager is used, this function
|
|
* returns %true if platform allows XDomain connections.
|
|
*/
|
|
bool tb_acpi_is_xdomain_allowed(void)
|
|
{
|
|
if (tb_acpi_is_native())
|
|
return osc_sb_native_usb4_control & OSC_USB_XDOMAIN;
|
|
return true;
|
|
}
|