From a2ea50d9e8bf0fc11496d2c8086b6ee5bd7105b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Thu, 15 May 2025 15:54:19 +0200 Subject: [PATCH 1/4] Revert "soc/intel/mtl: move IOE P2SB BAR below 4G" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 79fb20e3c0ee3604ced70e40c347c3056f98a5de. Upstream-Status: Inappropriate (revert of downstream commit) Change-Id: I1795dd345925010df11eed38b9da077235d9cff0 Signed-off-by: Michał Kopeć --- src/soc/intel/meteorlake/Kconfig | 2 +- src/soc/intel/meteorlake/include/soc/iomap.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index 63426efc7c1..543373d7667 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -256,7 +256,7 @@ config PCR_BASE_ADDRESS config IOE_PCR_BASE_ADDRESS hex - default 0x60000000 + default 0x3fff0000000 help This option allows you to select MMIO Base Address of IOE sideband bus. diff --git a/src/soc/intel/meteorlake/include/soc/iomap.h b/src/soc/intel/meteorlake/include/soc/iomap.h index 03ef56d3d81..742af482e37 100644 --- a/src/soc/intel/meteorlake/include/soc/iomap.h +++ b/src/soc/intel/meteorlake/include/soc/iomap.h @@ -66,10 +66,9 @@ #define IOE_P2SB_BAR IOE_PCR_ABOVE_4G_BASE_ADDR #define IOE_P2SB_SIZE (256 * MiB) -/* IOE_P2SB_BAR + 0xaa0000, but iasl refuses to perform arithmetics */ -#define IOM_BASE_ADDR 0x60aa0000 +#define IOM_BASE_ADDR 0x3fff0aa0000 #define IOM_BASE_SIZE 0x1600 -#define IOM_BASE_ADDR_MAX 0x60aa15ff +#define IOM_BASE_ADDR_MAX 0x3fff0aa15ff /* * I/O port address space From b722d6a26985e51cc650175a0ee866ab9a52dc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Thu, 15 May 2025 15:54:26 +0200 Subject: [PATCH 2/4] Revert "soc/intel/cmn/blk/i2c: ensure resources are allocated <4G" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 64fa3c2408defef13e506f40dcaf6385ddd18ac7. Upstream-Status: Inappropriate (revert of downstream commit) Change-Id: I650f1d95f9a06f8f262af91bac159e16656a2d8e Signed-off-by: Michał Kopeć --- src/soc/intel/common/block/i2c/i2c.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index 4d7ff7c74ff..3c2f211d282 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -134,19 +134,6 @@ uintptr_t dw_i2c_base_address(unsigned int bus) return (uintptr_t)ALIGN_DOWN(pci_read_config32(dev, PCI_BASE_ADDRESS_0), 16); } -static void dw_i2c_read_resources(struct device *dev) -{ - /* Read standard PCI resources. */ - pci_dev_read_resources(dev); - - if (ENV_X86_32) { - /* Put resource below 4G to ensure coreboot can access it */ - struct resource *res = find_resource(dev, PCI_BASE_ADDRESS_0); - res->limit = 0xffffffff; - res->flags &= ~IORESOURCE_ABOVE_4G; - } -} - /* * This function ensures that the device is actually out of reset and * its ready for initialization sequence. @@ -174,7 +161,7 @@ static void dw_i2c_device_init(struct device *dev) } struct device_operations i2c_dev_ops = { - .read_resources = dw_i2c_read_resources, + .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, .scan_bus = scan_static_bus, From cd96032317e75dd4ec7de6d5938fbc89daf593fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Thu, 15 May 2025 15:54:29 +0200 Subject: [PATCH 3/4] Revert "soc/intel/cmn/blk/graphics: ensure framebuffer is allocated <4G" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 692b50110c5ed241f9d380b76ce62c697fcb5156. Upstream-Status: Inappropriate (revert of downstream commit) Change-Id: I7f019845e40f7a59a37b558a9e92f7726ee95184 Signed-off-by: Michał Kopeć --- src/soc/intel/common/block/graphics/graphics.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c index ab2f13863ed..fe06eef2a13 100644 --- a/src/soc/intel/common/block/graphics/graphics.c +++ b/src/soc/intel/common/block/graphics/graphics.c @@ -288,13 +288,6 @@ static void graphics_dev_read_resources(struct device *dev) pci_dev_set_resources(dev); res_bar0->flags |= IORESOURCE_FIXED; } - - if (ENV_X86_32) { - /* Place framebuffer below 4G to ensure coreboot can access it */ - struct resource *res_bar2 = find_resource(dev, PCI_BASE_ADDRESS_2); - res_bar2->limit = 0xffffffff; - res_bar2->flags &= ~IORESOURCE_ABOVE_4G; - } } static void graphics_join_mbus(void) From ac95ddf8b0be3472ab66fc59d4fef1357ea62b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kope=C4=87?= Date: Thu, 15 May 2025 15:54:39 +0200 Subject: [PATCH 4/4] Revert "soc/intel/cmn/blk/cse/cse.c: ensure resources are allocated <4G" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7a9385fe92df0352ee0a286bf822c4ff27bc1e8a. Upstream-Status: Inappropriate (revert of downstream commit) Change-Id: I4cc1de75a59c4316cdf9679777bcaf196d47a1c0 Signed-off-by: Michał Kopeć --- src/soc/intel/common/block/cse/cse.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 42c4ed6af2d..f2786fc4b8e 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -1601,24 +1601,9 @@ static void cse_final(struct device *dev) cse_final_end_of_firmware(); } -#if ENV_RAMSTAGE -static void heci_read_resources(struct device *dev) -{ - /* Read standard PCI resources. */ - pci_dev_read_resources(dev); - - if (ENV_X86_32) { - /* Put resource below 4G to ensure coreboot can access it */ - struct resource *res = find_resource(dev, PCI_BASE_ADDRESS_0); - res->limit = 0xffffffff; - res->flags &= ~IORESOURCE_ABOVE_4G; - } -} -#endif - struct device_operations cse_ops = { .set_resources = pci_dev_set_resources, - .read_resources = heci_read_resources, + .read_resources = pci_dev_read_resources, .enable_resources = pci_dev_enable_resources, .init = pci_dev_init, .ops_pci = &pci_dev_ops_pci,