diff options
| -rw-r--r-- | src/soc/intel/apollolake/acpi/xhci.asl | 24 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/chip.c | 36 | ||||
| -rw-r--r-- | src/soc/intel/common/block/include/intelblocks/acpi.h | 3 | ||||
| -rw-r--r-- | src/soc/intel/common/block/xhci/xhci.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi.c | 35 |
5 files changed, 100 insertions, 1 deletions
diff --git a/src/soc/intel/apollolake/acpi/xhci.asl b/src/soc/intel/apollolake/acpi/xhci.asl index c07c7079ad..8222cb5ec4 100644 --- a/src/soc/intel/apollolake/acpi/xhci.asl +++ b/src/soc/intel/apollolake/acpi/xhci.asl @@ -28,4 +28,28 @@ Device (XHC1) { { Return (0xF) } + + Device (RHUB) + { + /* Root Hub */ + Name (_ADR, Zero) + + /* USB2 */ + Device (HS01) { Name (_ADR, 1) } + Device (HS02) { Name (_ADR, 2) } + Device (HS03) { Name (_ADR, 3) } + Device (HS04) { Name (_ADR, 4) } + Device (HS05) { Name (_ADR, 5) } + Device (HS06) { Name (_ADR, 6) } + Device (HS07) { Name (_ADR, 7) } + Device (HS08) { Name (_ADR, 8) } + + /* USB3 */ + Device (SS01) { Name (_ADR, 9) } + Device (SS02) { Name (_ADR, 10) } + Device (SS03) { Name (_ADR, 11) } + Device (SS04) { Name (_ADR, 12) } + Device (SS05) { Name (_ADR, 13) } + Device (SS06) { Name (_ADR, 14) } + } } diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index f782cc3238..4c8abda7f3 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -34,6 +34,7 @@ #include <intelblocks/xdci.h> #include <fsp/api.h> #include <fsp/util.h> +#include <intelblocks/acpi.h> #include <intelblocks/cpulib.h> #include <intelblocks/itss.h> #include <intelblocks/pmclib.h> @@ -50,11 +51,44 @@ #include "chip.h" -static const char *soc_acpi_name(const struct device *dev) +const char *soc_acpi_name(const struct device *dev) { if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; + if (dev->path.type == DEVICE_PATH_USB) { + switch (dev->path.usb.port_type) { + case 0: + /* Root Hub */ + return "RHUB"; + case 2: + /* USB2 ports */ + switch (dev->path.usb.port_id) { + case 0: return "HS01"; + case 1: return "HS02"; + case 2: return "HS03"; + case 3: return "HS04"; + case 4: return "HS05"; + case 5: return "HS06"; + case 6: return "HS07"; + case 7: return "HS08"; + } + break; + case 3: + /* USB3 ports */ + switch (dev->path.usb.port_id) { + case 0: return "SS01"; + case 1: return "SS02"; + case 2: return "SS03"; + case 3: return "SS04"; + case 4: return "SS05"; + case 5: return "SS06"; + } + break; + } + return NULL; + } + if (dev->path.type != DEVICE_PATH_PCI) return NULL; diff --git a/src/soc/intel/common/block/include/intelblocks/acpi.h b/src/soc/intel/common/block/include/intelblocks/acpi.h index 927da3c214..f58f914757 100644 --- a/src/soc/intel/common/block/include/intelblocks/acpi.h +++ b/src/soc/intel/common/block/include/intelblocks/acpi.h @@ -29,6 +29,9 @@ struct chipset_power_state; /* Forward declare the global nvs structure here */ struct global_nvs_t; +/* Return ACPI name for this device */ +const char *soc_acpi_name(const struct device *dev); + /* Read the scis from soc specific register. Returns int scis value */ uint32_t soc_read_sci_irq_select(void); diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c index 737c8cfe7e..d76426211c 100644 --- a/src/soc/intel/common/block/xhci/xhci.c +++ b/src/soc/intel/common/block/xhci/xhci.c @@ -19,6 +19,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <arch/io.h> +#include <intelblocks/acpi.h> #include <intelblocks/xhci.h> __weak void soc_xhci_init(struct device *dev) { /* no-op */ } @@ -29,6 +30,8 @@ static struct device_operations usb_xhci_ops = { .enable_resources = &pci_dev_enable_resources, .init = soc_xhci_init, .ops_pci = &pci_dev_ops_pci, + .scan_bus = &scan_usb_bus, + .acpi_name = &soc_acpi_name, }; static const unsigned short pci_device_ids[] = { diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 914b9d51a3..43487c477e 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -717,6 +717,41 @@ const char *soc_acpi_name(const struct device *dev) if (dev->path.type == DEVICE_PATH_DOMAIN) return "PCI0"; + if (dev->path.type == DEVICE_PATH_USB) { + switch (dev->path.usb.port_type) { + case 0: + /* Root Hub */ + return "RHUB"; + case 2: + /* USB2 ports */ + switch (dev->path.usb.port_id) { + case 0: return "HS01"; + case 1: return "HS02"; + case 2: return "HS03"; + case 3: return "HS04"; + case 4: return "HS05"; + case 5: return "HS06"; + case 6: return "HS07"; + case 7: return "HS08"; + case 8: return "HS09"; + case 9: return "HS10"; + } + break; + case 3: + /* USB3 ports */ + switch (dev->path.usb.port_id) { + case 0: return "SS01"; + case 1: return "SS02"; + case 2: return "SS03"; + case 3: return "SS04"; + case 4: return "SS05"; + case 5: return "SS06"; + } + break; + } + return NULL; + } + if (dev->path.type != DEVICE_PATH_PCI) return NULL; |