sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/xeon_sp: Use a common function to get the IIO HOB

Browse Source 
TESTED ocp/deltalake still boots.

Change-Id: I69f336c1ff348b8e820340b84494929f2c58ce72
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47296
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans
2020-11-06 11:50:55 +01:00
parent 04ebdd9710
commit 83b262275c
4 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/soc/intel/xeon_sp/cpx/soc_util.c
View File

@@ -29,13 +29,7 @@ const struct SystemMemoryMapHob *get_system_memory_map(void)
uint8_t get_iiostack_info(struct iiostack_resource *info) uint8_t get_iiostack_info(struct iiostack_resource *info)
{ {
size_t hob_size; const IIO_UDS *hob = get_iio_uds();
const uint8_t fsp_hob_iio_universal_data_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
const IIO_UDS *hob;
hob = fsp_find_extension_hob_by_guid(
fsp_hob_iio_universal_data_guid, &hob_size);
assert(hob != NULL && hob_size != 0);
// copy IIO Stack info from FSP HOB // copy IIO Stack info from FSP HOB
info->no_of_stacks = 0; info->no_of_stacks = 0;

10
src/soc/intel/xeon_sp/nb_acpi.c
View File

@@ -362,10 +362,7 @@ static unsigned long acpi_create_rmrr(unsigned long current)
static unsigned long acpi_create_rhsa(unsigned long current) static unsigned long acpi_create_rhsa(unsigned long current)
{ {
size_t hob_size; const IIO_UDS *hob = get_iio_uds();
const uint8_t uds_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
const IIO_UDS *hob = fsp_find_extension_hob_by_guid(uds_guid, &hob_size);
assert(hob != NULL && hob_size != 0);
for (int socket = 0; socket < hob->PlatformData.numofIIO; ++socket) { for (int socket = 0; socket < hob->PlatformData.numofIIO; ++socket) {
IIO_RESOURCE_INSTANCE iio_resource = IIO_RESOURCE_INSTANCE iio_resource =
@@ -386,10 +383,7 @@ static unsigned long acpi_create_rhsa(unsigned long current)
static unsigned long acpi_fill_dmar(unsigned long current) static unsigned long acpi_fill_dmar(unsigned long current)
{ {
size_t hob_size; const IIO_UDS *hob = get_iio_uds();
const uint8_t uds_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
const IIO_UDS *hob = fsp_find_extension_hob_by_guid(uds_guid, &hob_size);
assert(hob != NULL && hob_size != 0);
// DRHD // DRHD
for (int iio = 1; iio <= hob->PlatformData.numofIIO; ++iio) { for (int iio = 1; iio <= hob->PlatformData.numofIIO; ++iio) {

6
src/soc/intel/xeon_sp/skx/soc_acpi.c
View File

@@ -17,6 +17,7 @@
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pm.h> #include <soc/pm.h>
#include <soc/soc_util.h> #include <soc/soc_util.h>
#include <soc/util.h>
/* TODO: Check if the common/acpi weak function can be used */ /* TODO: Check if the common/acpi weak function can be used */
unsigned long acpi_fill_mcfg(unsigned long current) unsigned long acpi_fill_mcfg(unsigned long current)
@@ -99,10 +100,7 @@ void soc_fill_fadt(acpi_fadt_t *fadt)
void uncore_inject_dsdt(const struct device *device) void uncore_inject_dsdt(const struct device *device)
{ {
size_t hob_size; const IIO_UDS *hob = get_iio_uds();
const uint8_t uds_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
const IIO_UDS *hob = fsp_find_extension_hob_by_guid(uds_guid, &hob_size);
assert(hob != NULL && hob_size != 0);
/* Only add RTxx entries once. */ /* Only add RTxx entries once. */
if (device->bus->secondary != 0) if (device->bus->secondary != 0)

15
src/soc/intel/xeon_sp/skx/soc_util.c
View File

@@ -57,13 +57,7 @@ const struct SystemMemoryMapHob *get_system_memory_map(void)
uint8_t get_iiostack_info(struct iiostack_resource *info) uint8_t get_iiostack_info(struct iiostack_resource *info)
{ {
size_t hob_size; const IIO_UDS *hob = get_iio_uds();
const uint8_t fsp_hob_iio_universal_data_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
const IIO_UDS *hob;
hob = fsp_find_extension_hob_by_guid(
fsp_hob_iio_universal_data_guid, &hob_size);
assert(hob != NULL && hob_size != 0);
// copy IIO Stack info from FSP HOB // copy IIO Stack info from FSP HOB
info->no_of_stacks = 0; info->no_of_stacks = 0;
@@ -83,15 +77,10 @@ uint8_t get_iiostack_info(struct iiostack_resource *info)
uint32_t get_socket_stack_busno(uint32_t socket, uint32_t stack) uint32_t get_socket_stack_busno(uint32_t socket, uint32_t stack)
{ {
size_t hob_size; const IIO_UDS *hob = get_iio_uds();
const IIO_UDS *hob;
const uint8_t fsp_hob_iio_universal_data_guid[16] = FSP_HOB_IIO_UNIVERSAL_DATA_GUID;
assert(socket < MAX_SOCKET && stack < MAX_IIO_STACK); assert(socket < MAX_SOCKET && stack < MAX_IIO_STACK);
hob = fsp_find_extension_hob_by_guid(fsp_hob_iio_universal_data_guid, &hob_size);
assert(hob != NULL && hob_size != 0);
return hob->PlatformData.CpuQpiInfo[socket].StackBus[stack]; return hob->PlatformData.CpuQpiInfo[socket].StackBus[stack];
} }