Skip to content

Commit b8a13d3

Browse files
committed
intel_workaround: Fix warning on 32bit
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
1 parent c65161f commit b8a13d3

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/intel_workarounds.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static int pit_8254cge_workaround(void)
5757
{
5858
uint8_t reg8;
5959
uint32_t reg;
60-
uint64_t base;
60+
unsigned long base;
6161
bool p2sb_hide = false;
6262

6363
reg = pciConfigReadDWord(0, PCI_DEVICE_NUMBER_PCH_P2SB,
@@ -93,7 +93,14 @@ static int pit_8254cge_workaround(void)
9393
reg = pciConfigReadDWord(0, PCI_DEVICE_NUMBER_PCH_P2SB,
9494
PCI_FUNCTION_NUMBER_PCH_P2SB,
9595
SBREG_BARH);
96+
#ifdef __LP64__
9697
base |= ((uint64_t)reg & 0xFFFFFFFF) << 32;
98+
#else
99+
if (reg) {
100+
printf("Invalid P2SB BARH\n");
101+
goto test_pit;
102+
}
103+
#endif
97104

98105
/* FIXME: Validate base */
99106
reg = readl(PCH_PCR_ADDRESS(base, PID_ITSS, R_PCH_PCR_ITSS_ITSSPRC));

0 commit comments

Comments
 (0)