Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40672 )
Change subject: soc/amd: Update macro name for IOMMU on AMD Family 17h ......................................................................
soc/amd: Update macro name for IOMMU on AMD Family 17h
IOMMU for AMD Family 17h Model 10-20h uses the same PCI device ID 0x15D1. This change updates the name to indicate that the PCI device ID is supported for FP5(Model 18h) and FT5(Model 20h).
BUG=b:153858769 BRANCH=None TEST=Trembyle and dalboz still build.
Signed-off-by: Furquan Shaikh furquan@google.com Change-Id: I17c782000ed525075a3e438ed820a22d9af61a26 --- M src/include/device/pci_ids.h M src/soc/amd/common/block/iommu/iommu.c 2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/40672/1
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 3de67ca..d0cf21f 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -305,7 +305,7 @@ #define PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU 0x1423 #define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU 0x1577 #define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_IOMMU 0x1567 -#define PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB_IOMMU 0x15d1 +#define PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU 0x15D1
#define PCI_DEVICE_ID_ATI_SB600_LPC 0x438D #define PCI_DEVICE_ID_ATI_SB600_SATA 0x4380 diff --git a/src/soc/amd/common/block/iommu/iommu.c b/src/soc/amd/common/block/iommu/iommu.c index effdd7c..d9517c8 100644 --- a/src/soc/amd/common/block/iommu/iommu.c +++ b/src/soc/amd/common/block/iommu/iommu.c @@ -36,7 +36,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU, PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU, - PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB_IOMMU, + PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU, 0 };
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40672 )
Change subject: soc/amd: Update macro name for IOMMU on AMD Family 17h ......................................................................
Patch Set 3: Code-Review+2
Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40672 )
Change subject: soc/amd: Update macro name for IOMMU on AMD Family 17h ......................................................................
Patch Set 3: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40672 )
Change subject: soc/amd: Update macro name for IOMMU on AMD Family 17h ......................................................................
Patch Set 5: Code-Review+2
I'd complain about the change in casing of the hex numbers but it is already inconsistent anyway
Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40672 )
Change subject: soc/amd: Update macro name for IOMMU on AMD Family 17h ......................................................................
soc/amd: Update macro name for IOMMU on AMD Family 17h
IOMMU for AMD Family 17h Model 10-20h uses the same PCI device ID 0x15D1. This change updates the name to indicate that the PCI device ID is supported for FP5(Model 18h) and FT5(Model 20h).
BUG=b:153858769 BRANCH=None TEST=Trembyle and dalboz still build.
Signed-off-by: Furquan Shaikh furquan@google.com Change-Id: I17c782000ed525075a3e438ed820a22d9af61a26 Reviewed-on: https://review.coreboot.org/c/coreboot/+/40672 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Raul Rangel rrangel@chromium.org --- M src/include/device/pci_ids.h M src/soc/amd/common/block/iommu/iommu.c 2 files changed, 2 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved Raul Rangel: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h index 2ef3aa3..76b214a 100644 --- a/src/include/device/pci_ids.h +++ b/src/include/device/pci_ids.h @@ -305,7 +305,7 @@ #define PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU 0x1423 #define PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU 0x1577 #define PCI_DEVICE_ID_AMD_16H_MODEL_303F_NB_IOMMU 0x1567 -#define PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB_IOMMU 0x15d1 +#define PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU 0x15D1
#define PCI_DEVICE_ID_ATI_SB600_LPC 0x438D #define PCI_DEVICE_ID_ATI_SB600_SATA 0x4380 diff --git a/src/soc/amd/common/block/iommu/iommu.c b/src/soc/amd/common/block/iommu/iommu.c index effdd7c..d9517c8 100644 --- a/src/soc/amd/common/block/iommu/iommu.c +++ b/src/soc/amd/common/block/iommu/iommu.c @@ -36,7 +36,7 @@ static const unsigned short pci_device_ids[] = { PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU, PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU, - PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB_IOMMU, + PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU, 0 };
-
Aaron Durbin (Code Review) -
Angel Pons (Code Review)
-
Furquan Shaikh (Code Review)
-
Raul Rangel (Code Review)