Hello Richard Spiegel, Martin Roth, Furquan Shaikh,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/32657
to review the following change.
Change subject: soc/amd/stoneyridge: Move IOMMU support to common ......................................................................
soc/amd/stoneyridge: Move IOMMU support to common
Change-Id: Icb02180645c9e7e6dc973438c777228b031b3f54 Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com --- A src/soc/amd/common/block/iommu/Kconfig A src/soc/amd/common/block/iommu/Makefile.inc R src/soc/amd/common/block/iommu/iommu.c M src/soc/amd/stoneyridge/Kconfig M src/soc/amd/stoneyridge/Makefile.inc 5 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/32657/1
diff --git a/src/soc/amd/common/block/iommu/Kconfig b/src/soc/amd/common/block/iommu/Kconfig new file mode 100644 index 0000000..4580400 --- /dev/null +++ b/src/soc/amd/common/block/iommu/Kconfig @@ -0,0 +1,5 @@ +config SOC_AMD_COMMON_BLOCK_IOMMU + bool + default n + help + Select this option to use AMD common IOMMU support. diff --git a/src/soc/amd/common/block/iommu/Makefile.inc b/src/soc/amd/common/block/iommu/Makefile.inc new file mode 100644 index 0000000..d08dbfc --- /dev/null +++ b/src/soc/amd/common/block/iommu/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_IOMMU) += iommu.c diff --git a/src/soc/amd/stoneyridge/iommu.c b/src/soc/amd/common/block/iommu/iommu.c similarity index 100% rename from src/soc/amd/stoneyridge/iommu.c rename to src/soc/amd/common/block/iommu/iommu.c diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index ed9aaf0..cbb8ba0 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -46,6 +46,7 @@ select SOC_AMD_PI select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK + select SOC_AMD_COMMON_BLOCK_IOMMU select SOC_AMD_COMMON_BLOCK_ACPIMMIO select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS select SOC_AMD_COMMON_BLOCK_ACPI diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index 7c4e875..57c886d 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -99,7 +99,6 @@ ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c ramstage-y += gpio.c -ramstage-y += iommu.c ramstage-y += monotonic_timer.c ramstage-y += southbridge.c ramstage-y += sb_util.c
Hello Richard Spiegel, build bot (Jenkins), Patrick Georgi, Martin Roth, Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32657
to look at the new patch set (#2).
Change subject: soc/amd/stoneyridge: Move IOMMU support to common ......................................................................
soc/amd/stoneyridge: Move IOMMU support to common
BUG=b:131682806
Change-Id: Icb02180645c9e7e6dc973438c777228b031b3f54 Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com --- A src/soc/amd/common/block/iommu/Kconfig A src/soc/amd/common/block/iommu/Makefile.inc R src/soc/amd/common/block/iommu/iommu.c M src/soc/amd/stoneyridge/Kconfig M src/soc/amd/stoneyridge/Makefile.inc 5 files changed, 7 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/32657/2
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32657 )
Change subject: soc/amd/stoneyridge: Move IOMMU support to common ......................................................................
Patch Set 2: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32657 )
Change subject: soc/amd/stoneyridge: Move IOMMU support to common ......................................................................
Patch Set 4:
(3 comments)
https://review.coreboot.org/#/c/32657/4/src/soc/amd/common/block/iommu/iommu... File src/soc/amd/common/block/iommu/iommu.c:
https://review.coreboot.org/#/c/32657/4/src/soc/amd/common/block/iommu/iommu... PS4, Line 46: 0 DEVICE_NOOP?
https://review.coreboot.org/#/c/32657/4/src/soc/amd/common/block/iommu/iommu... PS4, Line 47: 0 DEVICE_NOOP?
https://review.coreboot.org/#/c/32657/4/src/soc/amd/common/block/iommu/iommu... PS4, Line 54: PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU This will have to be transformed into a list of pci device_ids.
Hello Richard Spiegel, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32657
to look at the new patch set (#5).
Change subject: soc/amd/stoneyridge: Move IOMMU support to common ......................................................................
soc/amd/stoneyridge: Move IOMMU support to common
BUG=b:131682806
Change-Id: Icb02180645c9e7e6dc973438c777228b031b3f54 Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com --- A src/soc/amd/common/block/iommu/Kconfig A src/soc/amd/common/block/iommu/Makefile.inc R src/soc/amd/common/block/iommu/iommu.c M src/soc/amd/stoneyridge/Kconfig M src/soc/amd/stoneyridge/Makefile.inc 5 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/32657/5
Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32657 )
Change subject: soc/amd/stoneyridge: Move IOMMU support to common ......................................................................
Patch Set 5:
(3 comments)
https://review.coreboot.org/#/c/32657/4/src/soc/amd/common/block/iommu/iommu... File src/soc/amd/common/block/iommu/iommu.c:
https://review.coreboot.org/#/c/32657/4/src/soc/amd/common/block/iommu/iommu... PS4, Line 46: 0
DEVICE_NOOP?
IIRC we were removing unimplemented ones instead.
https://review.coreboot.org/#/c/32657/4/src/soc/amd/common/block/iommu/iommu... PS4, Line 47: 0
DEVICE_NOOP?
same
https://review.coreboot.org/#/c/32657/4/src/soc/amd/common/block/iommu/iommu... PS4, Line 54: PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU
This will have to be transformed into a list of pci device_ids.
Done
Richard Spiegel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32657 )
Change subject: soc/amd/stoneyridge: Move IOMMU support to common ......................................................................
Patch Set 6: Code-Review+2
Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32657 )
Change subject: soc/amd/stoneyridge: Move IOMMU support to common ......................................................................
soc/amd/stoneyridge: Move IOMMU support to common
BUG=b:131682806
Change-Id: Icb02180645c9e7e6dc973438c777228b031b3f54 Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32657 Reviewed-by: Richard Spiegel richard.spiegel@silverbackltd.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- A src/soc/amd/common/block/iommu/Kconfig A src/soc/amd/common/block/iommu/Makefile.inc R src/soc/amd/common/block/iommu/iommu.c M src/soc/amd/stoneyridge/Kconfig M src/soc/amd/stoneyridge/Makefile.inc 5 files changed, 14 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Richard Spiegel: Looks good to me, approved
diff --git a/src/soc/amd/common/block/iommu/Kconfig b/src/soc/amd/common/block/iommu/Kconfig new file mode 100644 index 0000000..4580400 --- /dev/null +++ b/src/soc/amd/common/block/iommu/Kconfig @@ -0,0 +1,5 @@ +config SOC_AMD_COMMON_BLOCK_IOMMU + bool + default n + help + Select this option to use AMD common IOMMU support. diff --git a/src/soc/amd/common/block/iommu/Makefile.inc b/src/soc/amd/common/block/iommu/Makefile.inc new file mode 100644 index 0000000..d08dbfc --- /dev/null +++ b/src/soc/amd/common/block/iommu/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_IOMMU) += iommu.c diff --git a/src/soc/amd/stoneyridge/iommu.c b/src/soc/amd/common/block/iommu/iommu.c similarity index 89% rename from src/soc/amd/stoneyridge/iommu.c rename to src/soc/amd/common/block/iommu/iommu.c index e33402a..1c982ca 100644 --- a/src/soc/amd/stoneyridge/iommu.c +++ b/src/soc/amd/common/block/iommu/iommu.c @@ -43,13 +43,17 @@ .read_resources = iommu_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, - .init = 0, - .scan_bus = 0, .ops_pci = &lops_pci, };
+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, + 0 +}; + static const struct pci_driver iommu_driver __pci_driver = { .ops = &iommu_ops, .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU, + .devices = pci_device_ids, }; diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index d386012..5bad309 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -46,6 +46,7 @@ select SOC_AMD_PI select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK + select SOC_AMD_COMMON_BLOCK_IOMMU select SOC_AMD_COMMON_BLOCK_ACPIMMIO select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS select SOC_AMD_COMMON_BLOCK_ACPI diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index 7c4e875..57c886d 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -99,7 +99,6 @@ ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c ramstage-y += gpio.c -ramstage-y += iommu.c ramstage-y += monotonic_timer.c ramstage-y += southbridge.c ramstage-y += sb_util.c
-
Furquan Shaikh (Code Review) -
Marshall Dawson (Code Review)
-
Martin Roth (Code Review)
-
Richard Spiegel (Code Review)