summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/common/block/usb4/chip.h54
-rw-r--r--src/soc/intel/common/block/usb4/pcie.c34
2 files changed, 67 insertions, 21 deletions
diff --git a/src/soc/intel/common/block/usb4/chip.h b/src/soc/intel/common/block/usb4/chip.h
index f2eee4d34c..41f4ed6cab 100644
--- a/src/soc/intel/common/block/usb4/chip.h
+++ b/src/soc/intel/common/block/usb4/chip.h
@@ -3,10 +3,62 @@
#ifndef __DRIVERS_INTEL_USB4_PCIE_H__
#define __DRIVERS_INTEL_USB4_PCIE_H__
+/*
+ * This virtual generic driver provides the ACPI properties for an
+ * Intel USB4/TBT PCIe Root Port which is already declared in the DSDT,
+ *
+ * The associated USB4 port number is obtained from the generic ID and
+ * the related host interface (DMA) device is provided by the devicetree.
+ *
+ * The "ExternalFacingPort", and "HotPlugSupportInD3" properties are defined at
+ * https://docs.microsoft.com/en-us/windows-hardware/drivers/pci/dsd-for-pcie-root-ports
+ *
+ * Example: PCIe Root Port 2 via USB4 host interface 1 port 0:
+ *
+ * device pci 0d.3 alias tbt_dma1 on end # \_SB.PCI0.TDM1
+ * device pci 07.2 alias tbt_pcie_rp2 on # \_SB.PCI0.TRP2
+ * chip soc/intel/common/block/usb4
+ * use tbt_dma1 as usb4_port # USB4 host interface for this root port
+ * device generic 0 on end # USB4 port number on this host interface
+ * end
+ * end
+ *
+ * The host interface and PCIe Root Port are declared in the DSDT:
+ *
+ * Scope (\_SB.PCI0) {
+ * Device (TDM1) {
+ * Name (_ADR, 0x000d0003)
+ * }
+ * Device (TRP2) {
+ * Name (_ADR, 0x00070002)
+ * }
+ * }
+ *
+ * This driver will provide the following properties in the SSDT:
+ *
+ * Scope (\_SB.PCI0.TRP2) {
+ * Name (_DSD, Package () {
+ * ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+ * Package () {
+ * Package () { "usb4-host-interface", \_SB.PCI0.TDM1 },
+ * Package () { "usb4-port-number", 0 },
+ * },
+ * ToUUID ("6211e2c0-58a3-4af3-90e1-927a4e0c55a4"),
+ * Package () {
+ * Package () { "HotPlugSupportInD3", 1 },
+ * },
+ * ToUUID ("efcc06cc-73ac-4bc3-bff0-76143807c389"),
+ * Package () {
+ * Package () { "ExternalFacingPort", 1 },
+ * },
+ * }
+ * }
+ */
+
struct soc_intel_common_block_usb4_config {
const char *desc;
- /* Pointer to USB4 device that this PCIe root port is routed to. */
+ /* USB4 host interface (DMA device) that this PCIe root port is routed to. */
DEVTREE_CONST struct device *usb4_port;
};
diff --git a/src/soc/intel/common/block/usb4/pcie.c b/src/soc/intel/common/block/usb4/pcie.c
index e37d5f4125..eae9027511 100644
--- a/src/soc/intel/common/block/usb4/pcie.c
+++ b/src/soc/intel/common/block/usb4/pcie.c
@@ -4,19 +4,14 @@
#include <console/console.h>
#include <device/device.h>
#include <device/path.h>
-#include <device/pci.h>
-#include <device/pci_def.h>
-#include <device/pci_ids.h>
-#include <stdlib.h>
#include <string.h>
-#include <types.h>
#include "chip.h"
#define PCI_HOTPLUG_IN_D3_UUID "6211E2C0-58A3-4AF3-90E1-927A4E0C55A4"
#define PCI_EXTERNAL_PORT_UUID "EFCC06CC-73AC-4BC3-BFF0-76143807C389"
#if CONFIG(HAVE_ACPI_TABLES)
-static void usb4_pcie_fill_ssdt(const struct device *dev)
+static void usb4_pcie_acpi_fill_ssdt(const struct device *dev)
{
const struct soc_intel_common_block_usb4_config *config;
const struct device *parent;
@@ -43,14 +38,15 @@ static void usb4_pcie_fill_ssdt(const struct device *dev)
/* Get ACPI path to USB4 device. */
usb4_path = acpi_device_path(config->usb4_port);
if (!usb4_path) {
- printk(BIOS_ERR, "%s: Unable to find ACPI path for usb4_port\n", __func__);
+ printk(BIOS_ERR, "%s: Unable to find ACPI path for usb4_port %s\n",
+ __func__, dev_path(config->usb4_port));
return;
}
usb4_path = strdup(usb4_path);
port_id = dev->path.generic.id;
- acpigen_write_scope(acpi_device_path(dev));
+ acpigen_write_scope(acpi_device_path(parent));
/* Add pointer to USB4 port controller. */
dsd = acpi_dp_new_table("_DSD");
@@ -65,33 +61,31 @@ static void usb4_pcie_fill_ssdt(const struct device *dev)
/* Indicate that port is external. */
pkg = acpi_dp_new_table(PCI_EXTERNAL_PORT_UUID);
acpi_dp_add_integer(pkg, "ExternalFacingPort", 1);
- acpi_dp_add_integer(pkg, "UID", port_id);
acpi_dp_add_package(dsd, pkg);
acpi_dp_write(dsd);
acpigen_pop_len(); /* Scope */
- printk(BIOS_INFO, "%s: %s at %s\n", acpi_device_path(dev), config->desc, dev_path(dev));
+ printk(BIOS_INFO, "%s: %s at %s\n", acpi_device_path(parent),
+ config->desc ? : dev->chip_ops->name, dev_path(parent));
}
#endif
-static struct device_operations usb4_dev_ops = {
- .read_resources = pci_dev_read_resources,
- .set_resources = pci_dev_set_resources,
- .enable_resources = pci_dev_enable_resources,
- .scan_bus = scan_static_bus,
+static struct device_operations usb4_pcie_acpi_dev_ops = {
+ .read_resources = noop_read_resources,
+ .set_resources = noop_set_resources,
#if CONFIG(HAVE_ACPI_TABLES)
- .acpi_fill_ssdt = usb4_pcie_fill_ssdt,
+ .acpi_fill_ssdt = usb4_pcie_acpi_fill_ssdt,
#endif
};
-static void pcie_enable(struct device *dev)
+static void usb4_pcie_acpi_enable(struct device *dev)
{
- dev->ops = &usb4_dev_ops;
+ dev->ops = &usb4_pcie_acpi_dev_ops;
}
struct chip_operations soc_intel_common_block_usb4_ops = {
- CHIP_NAME("Intel USB4 Root Port")
- .enable_dev = pcie_enable
+ CHIP_NAME("Intel USB4 PCIe Root Port")
+ .enable_dev = usb4_pcie_acpi_enable
};