Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/EISA: Dereference memory directly instead of using readl()

Sparse expect an __iomem pointer, but after converting the EISA probe to
memremap() the pointer is a regular memory pointer. Access it directly
instead.

[ tglx: Converted it to fix the already applied version ]

Fixes: 80a4da05642c ("x86/EISA: Use memremap() to probe for the EISA BIOS signature")
Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/alpine.DEB.2.21.2408261015270.30766@angie.orcam.me.uk

authored by

Maciej W. Rozycki and committed by
Thomas Gleixner
a678164a cc5e03f3

+2 -2
+2 -2
arch/x86/kernel/eisa.c
··· 11 11 12 12 static __init int eisa_bus_probe(void) 13 13 { 14 - void *p; 14 + u32 *p; 15 15 16 16 if ((xen_pv_domain() && !xen_initial_domain()) || cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) 17 17 return 0; 18 18 19 19 p = memremap(0x0FFFD9, 4, MEMREMAP_WB); 20 - if (p && readl(p) == 'E' + ('I' << 8) + ('S' << 16) + ('A' << 24)) 20 + if (p && *p == 'E' + ('I' << 8) + ('S' << 16) + ('A' << 24)) 21 21 EISA_bus = 1; 22 22 memunmap(p); 23 23 return 0;