From fcbf18c5df6013c31e99662887be5c4e8bb2cf24 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Sun, 18 Oct 2020 15:03:21 -0700 Subject: soc/intel/common: Fix ACPI device name for USB4 DMA device The USB4 host interface (DMA) devices need to use SA_DEVFN_* instead of SA_DEV_* when determining the ACPI name. The matching names are removed from the SOC-level ACPI name handler since they are provided by this driver now. TEST=boot on volteer and ensure TDM0 device is in the SSDT. Signed-off-by: Duncan Laurie Change-Id: If778bda82b80593452a590962dbffef6eff6484a Reviewed-on: https://review.coreboot.org/c/coreboot/+/46543 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/soc/intel/common/block/usb4/usb4.c | 4 ++-- src/soc/intel/tigerlake/chip.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/common/block/usb4/usb4.c b/src/soc/intel/common/block/usb4/usb4.c index 7c545f6043..df2dfdde37 100644 --- a/src/soc/intel/common/block/usb4/usb4.c +++ b/src/soc/intel/common/block/usb4/usb4.c @@ -15,9 +15,9 @@ static const char *tbt_dma_acpi_name(const struct device *dev) { switch (dev->path.pci.devfn) { - case SA_DEV_TCSS_DMA0: + case SA_DEVFN_TCSS_DMA0: return "TDM0"; - case SA_DEV_TCSS_DMA1: + case SA_DEVFN_TCSS_DMA1: return "TDM1"; default: return NULL; diff --git a/src/soc/intel/tigerlake/chip.c b/src/soc/intel/tigerlake/chip.c index 98ed55ca58..46c043fce9 100644 --- a/src/soc/intel/tigerlake/chip.c +++ b/src/soc/intel/tigerlake/chip.c @@ -68,8 +68,6 @@ const char *soc_acpi_name(const struct device *dev) case SA_DEVFN_ROOT: return "MCHC"; case SA_DEVFN_TCSS_XHCI: return "TXHC"; case SA_DEVFN_TCSS_XDCI: return "TXDC"; - case SA_DEVFN_TCSS_DMA0: return "TDM0"; - case SA_DEVFN_TCSS_DMA1: return "TDM1"; case SA_DEVFN_TBT0: return "TRP0"; case SA_DEVFN_TBT1: return "TRP1"; case SA_DEVFN_TBT2: return "TRP2"; -- cgit v1.2.3