GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/xeon_sp/nb_acpi.c: Use read{16,32,64}p() 

Change-Id: I89bfbab7850dd9bd29ca2097ee2efce058720ca7
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70583
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Elyes Haouas 2022-12-11 10:38:35 +01:00 committed by Felix Held
parent 878a99f554
commit 167b7fcdd9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,13 +258,13 @@ static unsigned long acpi_create_drhd(unsigned long current, int socket,
// Add HPET // Add HPET
if (socket == 0 && stack == CSTACK) { if (socket == 0 && stack == CSTACK) {
uint16_t hpet_capid = read16((void *)HPET_BASE_ADDRESS); uint16_t hpet_capid = read16p(HPET_BASE_ADDRESS);
uint16_t num_hpets = (hpet_capid >> 0x08) & 0x1F; // Bits [8:12] has hpet count uint16_t num_hpets = (hpet_capid >> 0x08) & 0x1F; // Bits [8:12] has hpet count
printk(BIOS_SPEW, "%s hpet_capid: 0x%x, num_hpets: 0x%x\n", printk(BIOS_SPEW, "%s hpet_capid: 0x%x, num_hpets: 0x%x\n",
__func__, hpet_capid, num_hpets); __func__, hpet_capid, num_hpets);
//BIT 15 //BIT 15
if (num_hpets && (num_hpets != 0x1f) && if (num_hpets && (num_hpets != 0x1f) &&
(read32((void *)(HPET_BASE_ADDRESS + 0x100)) & (0x00008000))) { (read32p(HPET_BASE_ADDRESS + 0x100) & (0x00008000))) {
union p2sb_bdf hpet_bdf = p2sb_get_hpet_bdf(); union p2sb_bdf hpet_bdf = p2sb_get_hpet_bdf();
printk(BIOS_DEBUG, " [Message-capable HPET Device] Enumeration ID: 0x%x, " printk(BIOS_DEBUG, " [Message-capable HPET Device] Enumeration ID: 0x%x, "
"PCI Bus Number: 0x%x, PCI Path: 0x%x, 0x%x\n", "PCI Bus Number: 0x%x, PCI Path: 0x%x, 0x%x\n",
@ -293,7 +293,7 @@ static unsigned long acpi_create_atsr(unsigned long current, const IIO_UDS *hob)
uint32_t vtd_base = iio_resource.StackRes[stack].VtdBarAddress; uint32_t vtd_base = iio_resource.StackRes[stack].VtdBarAddress;
if (!vtd_base) if (!vtd_base)
continue; continue;
uint64_t vtd_mmio_cap = read64((void *)(vtd_base + VTD_EXT_CAP_LOW)); uint64_t vtd_mmio_cap = read64p(vtd_base + VTD_EXT_CAP_LOW);
printk(BIOS_SPEW, "%s socket: %d, stack: %d, bus: 0x%x, vtd_base: 0x%x, " printk(BIOS_SPEW, "%s socket: %d, stack: %d, bus: 0x%x, vtd_base: 0x%x, "
"vtd_mmio_cap: 0x%llx\n", "vtd_mmio_cap: 0x%llx\n",
__func__, socket, stack, bus, vtd_base, vtd_mmio_cap); __func__, socket, stack, bus, vtd_base, vtd_mmio_cap);