[coreboot-gerrit] Change in coreboot[master]: soc/intel/xeon_sp/skx: use mem32 address space for PCIe mem64 assignment

[Jonathan Zhang (Code Review)]

Jonathan Zhang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40577 )

Change subject: soc/intel/xeon_sp/skx: use mem32 address space for PCIe mem64 assignment
......................................................................

soc/intel/xeon_sp/skx: use mem32 address space for PCIe mem64 assignment

FSP HOB indicates whether mem32 address space is used for PCIe mem64
allocation or not. If that is the case, split PCIe mem32 address space
to support both mem32 assignment and mem64 assignment.

TESTED=booted TiogaPass with different PCIe configurations; Verified
PCIe devices work in target OS, and resource assignments are correct.

Change-Id: Ic7064526bdcba770ff377960045a8aea59e9c0bb
---
M src/soc/intel/xeon_sp/skx/chip.c
M src/soc/intel/xeon_sp/skx/include/soc/soc_util.h
M src/soc/intel/xeon_sp/skx/soc_util.c
3 files changed, 21 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/40577/1

diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index 938edf1..c097457 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -444,7 +444,23 @@
    	xeonsp_pci_dev_iterator(link, xeonsp_reset_pci_op, NULL, NULL);

struct iiostack_resource stack_info = {0};
-	get_iiostack_info(&stack_info);
+	uint8_t pci64bit_alloc_flag = get_iiostack_info(&stack_info);
+
+	/*
+	 * pci64bit_alloc_flag is obtained from FSP HOB. It indicates whether
+	 * 32bit address space needs to be split between mem32 and
+	 * mem64 windows.
+	 */
+	if (!pci64bit_alloc_flag) {
+		for (int s = 0; s < stack_info.no_of_stacks; ++s) {
+			STACK_RES *res = &stack_info.res[s];
+			uint64_t length = (res->PciResourceMem32Limit -
+				res->PciResourceMem32Base + 1) / 2;
+			res->PciResourceMem64Limit = res->PciResourceMem32Limit;
+			res->PciResourceMem32Limit = (res->PciResourceMem32Base + length - 1);
+			res->PciResourceMem64Base = res->PciResourceMem32Limit + 1;
+		}
+	}

/* assign resources */
    assign_stack_resources(&stack_info, dev, NULL);
diff --git a/src/soc/intel/xeon_sp/skx/include/soc/soc_util.h b/src/soc/intel/xeon_sp/skx/include/soc/soc_util.h
index 8ba4b29..002fb2b 100644
--- a/src/soc/intel/xeon_sp/skx/include/soc/soc_util.h
+++ b/src/soc/intel/xeon_sp/skx/include/soc/soc_util.h
@@ -22,7 +22,7 @@
 uint32_t pci_read_mmio_reg(int bus, uint32_t dev, uint32_t func, int offset);

uint32_t get_socket_stack_busno(uint32_t socket, uint32_t stack);
-void get_iiostack_info(struct iiostack_resource *info);
+uint8_t get_iiostack_info(struct iiostack_resource *info);

int get_threads_per_package(void);
 int get_platform_thread_count(void);
diff --git a/src/soc/intel/xeon_sp/skx/soc_util.c b/src/soc/intel/xeon_sp/skx/soc_util.c
index edacafd..94f2a38 100644
--- a/src/soc/intel/xeon_sp/skx/soc_util.c
+++ b/src/soc/intel/xeon_sp/skx/soc_util.c
@@ -364,7 +364,7 @@
    return get_cpu_count() * get_threads_per_package();
 }

-void get_iiostack_info(struct iiostack_resource *info)
+uint8_t get_iiostack_info(struct iiostack_resource *info)
 {
    size_t hob_size;
    const uint8_t fsp_hob_iio_universal_data_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
@@ -386,6 +386,8 @@
    		memcpy(&info->res[info->no_of_stacks++], ri, sizeof(STACK_RES));
    	}
    }
+
+	return hob->PlatformData.Pci64BitResourceAllocation;
 }

#if ENV_RAMSTAGE