aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2023-06-15 09:59:58 +0200
committerFelix Held <felix-coreboot@felixheld.de>2023-06-19 12:42:44 +0000
commit61daf9b7386162ea23cae4fe63584796b882e7bd (patch)
treeedd01edc2fd8e6cf777feebb5453f22c18133e45 /src
parente633d37000c7dca9c02a15c5516aba618bcdd7f5 (diff)
soc/amd/*: Use proper resource function to declare GNB IOAPICs
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Change-Id: I296697d579b9ad8e35b22ada939a74a5ef6d6f61 Reviewed-on: https://review.coreboot.org/c/coreboot/+/75828 Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/soc/amd/cezanne/root_complex.c6
-rw-r--r--src/soc/amd/glinda/root_complex.c6
-rw-r--r--src/soc/amd/mendocino/root_complex.c6
-rw-r--r--src/soc/amd/phoenix/root_complex.c6
-rw-r--r--src/soc/amd/picasso/root_complex.c6
5 files changed, 5 insertions, 25 deletions
diff --git a/src/soc/amd/cezanne/root_complex.c b/src/soc/amd/cezanne/root_complex.c
index b5bf62c061..848392213b 100644
--- a/src/soc/amd/cezanne/root_complex.c
+++ b/src/soc/amd/cezanne/root_complex.c
@@ -107,7 +107,6 @@ static void read_resources(struct device *dev)
unsigned int idx = 0;
const struct hob_header *hob_iterator;
const struct hob_resource *res;
- struct resource *gnb_apic;
uintptr_t early_reserved_dram_start, early_reserved_dram_end;
const struct memmap_early_dram *e = memmap_get_early_dram_usage();
@@ -147,10 +146,7 @@ static void read_resources(struct device *dev)
mmconf_resource(dev, idx++);
/* GNB IOAPIC resource */
- gnb_apic = new_resource(dev, IOMMU_IOAPIC_IDX);
- gnb_apic->base = GNB_IO_APIC_ADDR;
- gnb_apic->size = 0x00001000;
- gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+ mmio_range(dev, IOMMU_IOAPIC_IDX, GNB_IO_APIC_ADDR, 0x1000);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, idx++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);
diff --git a/src/soc/amd/glinda/root_complex.c b/src/soc/amd/glinda/root_complex.c
index 1794d08983..470dd49406 100644
--- a/src/soc/amd/glinda/root_complex.c
+++ b/src/soc/amd/glinda/root_complex.c
@@ -122,7 +122,6 @@ static void read_resources(struct device *dev)
unsigned int idx = 0;
const struct hob_header *hob_iterator;
const struct hob_resource *res;
- struct resource *gnb_apic;
uintptr_t early_reserved_dram_start, early_reserved_dram_end;
const struct memmap_early_dram *e = memmap_get_early_dram_usage();
@@ -162,10 +161,7 @@ static void read_resources(struct device *dev)
mmconf_resource(dev, idx++);
/* GNB IOAPIC resource */
- gnb_apic = new_resource(dev, IOMMU_IOAPIC_IDX);
- gnb_apic->base = GNB_IO_APIC_ADDR;
- gnb_apic->size = 0x00001000;
- gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+ mmio_range(dev, IOMMU_IOAPIC_IDX, GNB_IO_APIC_ADDR, 0x1000);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, idx++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);
diff --git a/src/soc/amd/mendocino/root_complex.c b/src/soc/amd/mendocino/root_complex.c
index 0dcf2b8a02..5e1e11a431 100644
--- a/src/soc/amd/mendocino/root_complex.c
+++ b/src/soc/amd/mendocino/root_complex.c
@@ -150,7 +150,6 @@ static void read_resources(struct device *dev)
unsigned int idx = 0;
const struct hob_header *hob_iterator;
const struct hob_resource *res;
- struct resource *gnb_apic;
uintptr_t early_reserved_dram_start, early_reserved_dram_end;
const struct memmap_early_dram *e = memmap_get_early_dram_usage();
@@ -190,10 +189,7 @@ static void read_resources(struct device *dev)
mmconf_resource(dev, idx++);
/* GNB IOAPIC resource */
- gnb_apic = new_resource(dev, IOMMU_IOAPIC_IDX);
- gnb_apic->base = GNB_IO_APIC_ADDR;
- gnb_apic->size = 0x00001000;
- gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+ mmio_range(dev, IOMMU_IOAPIC_IDX, GNB_IO_APIC_ADDR, 0x1000);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, idx++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);
diff --git a/src/soc/amd/phoenix/root_complex.c b/src/soc/amd/phoenix/root_complex.c
index a75de50618..999df58dcd 100644
--- a/src/soc/amd/phoenix/root_complex.c
+++ b/src/soc/amd/phoenix/root_complex.c
@@ -122,7 +122,6 @@ static void read_resources(struct device *dev)
unsigned int idx = 0;
const struct hob_header *hob_iterator;
const struct hob_resource *res;
- struct resource *gnb_apic;
uintptr_t early_reserved_dram_start, early_reserved_dram_end;
const struct memmap_early_dram *e = memmap_get_early_dram_usage();
@@ -162,10 +161,7 @@ static void read_resources(struct device *dev)
mmconf_resource(dev, idx++);
/* GNB IOAPIC resource */
- gnb_apic = new_resource(dev, IOMMU_IOAPIC_IDX);
- gnb_apic->base = GNB_IO_APIC_ADDR;
- gnb_apic->size = 0x00001000;
- gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+ mmio_range(dev, IOMMU_IOAPIC_IDX, GNB_IO_APIC_ADDR, 0x1000);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, idx++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);
diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c
index bf36f6dd50..27f2fcf927 100644
--- a/src/soc/amd/picasso/root_complex.c
+++ b/src/soc/amd/picasso/root_complex.c
@@ -107,7 +107,6 @@ static void read_resources(struct device *dev)
unsigned int idx = 0;
const struct hob_header *hob_iterator;
const struct hob_resource *res;
- struct resource *gnb_apic;
uintptr_t early_reserved_dram_start, early_reserved_dram_end;
const struct memmap_early_dram *e = memmap_get_early_dram_usage();
@@ -145,10 +144,7 @@ static void read_resources(struct device *dev)
mmconf_resource(dev, idx++);
/* GNB IOAPIC resource */
- gnb_apic = new_resource(dev, IOMMU_IOAPIC_IDX);
- gnb_apic->base = GNB_IO_APIC_ADDR;
- gnb_apic->size = 0x00001000;
- gnb_apic->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
+ mmio_range(dev, IOMMU_IOAPIC_IDX, GNB_IO_APIC_ADDR, 0x1000);
/* Reserve fixed IOMMU MMIO region */
mmio_range(dev, idx++, IOMMU_RESERVED_MMIO_BASE, IOMMU_RESERVED_MMIO_SIZE);