From c6f49ca48ad353d97c8557a91c86925fcfaef251 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 3 Dec 2020 11:03:30 -0700 Subject: [PATCH] Revert removal of MMCONFIG Change-Id: I22be03d5714b58bd19fdf0cd126487b1e72d7473 --- src/lib/memrange.c | 11 ----------- src/soc/intel/common/block/acpi/acpi/northbridge.asl | 4 ---- 2 files changed, 15 deletions(-) diff --git a/src/lib/memrange.c b/src/lib/memrange.c index 2f08082247..39f502caa6 100644 --- a/src/lib/memrange.c +++ b/src/lib/memrange.c @@ -252,17 +252,6 @@ static void collect_ranges(void *gp, struct device *dev, struct resource *res) if (res->size == 0) return; -#if CONFIG(SOC_INTEL_TIGERLAKE) - if ( - ctx->tag == 0x10002 && /* BM_MEM_RESERVED */ - res->base == CONFIG_MMCONF_BASE_ADDRESS && - res->size == CONFIG_SA_PCIEX_LENGTH - ) { - printk(BIOS_WARNING, "Skipping MMCONF region\n"); - return; - } -#endif - if (ctx->filter == NULL || ctx->filter(dev, res)) memranges_insert(ctx->ranges, res->base, res->size, ctx->tag); } diff --git a/src/soc/intel/common/block/acpi/acpi/northbridge.asl b/src/soc/intel/common/block/acpi/acpi/northbridge.asl index 21c8227dc7..b4b746542e 100644 --- a/src/soc/intel/common/block/acpi/acpi/northbridge.asl +++ b/src/soc/intel/common/block/acpi/acpi/northbridge.asl @@ -265,12 +265,10 @@ Device (PDRC) */ Memory32Fixed (ReadWrite, 0, EP_BASE_SIZE, EGPB) -#if !CONFIG(SOC_INTEL_TIGERLAKE) /* PCI Express BAR _BAS and _LEN will be updated in * _CRS below according to B0:D0:F0:Reg.60h */ Memory32Fixed (ReadWrite, 0, 0, PCIX) -#endif /* VTD engine memory range. */ Memory32Fixed (ReadOnly, VTD_BASE_ADDRESS, VTD_BASE_SIZE) @@ -294,13 +292,11 @@ Device (PDRC) CreateDwordField (BUF0, EGPB._BAS, EBR0) EBR0 = \_SB.PCI0.GEPB () -#if !CONFIG(SOC_INTEL_TIGERLAKE) CreateDwordField (BUF0, PCIX._BAS, XBR0) XBR0 = \_SB.PCI0.GPCB () CreateDwordField (BUF0, PCIX._LEN, XSZ0) XSZ0 = \_SB.PCI0.GPCL () -#endif CreateDwordField (BUF0, FIOH._BAS, FBR0) FBR0 = 0x100000000 - CONFIG_ROM_SIZE