Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7eb5189 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: truncate ISA addresses to unsigned int 



Impact: Cleanup; fix inappropriate macro use

ISA addresses on x86 are mapped 1:1 with the physical address space.
Since the ISA address space is only 24 bits (32 for VLB or LPC) it
will always fit in an unsigned int, and at least in the aha1542 driver
using a wider type would cause an undesirable promotion.  Hence
explicitly cast the ISA bus addresses to unsigned int.

Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
Cc: James Bottomley <James.Bottomley@hansenpartnership.com>
parent ee8b53c1

arch/x86/include/asm/io.h

+8 −3
Original line number Diff line number Diff line
@@ -124,9 +124,14 @@ static inline void *phys_to_virt(phys_addr_t address) 


/*

 * ISA I/O bus memory addresses are 1:1 with the physical address.

 * However, we truncate the address to unsigned int to avoid undesirable

 * promitions in legacy drivers.

 */

#define isa_virt_to_bus (unsigned long)virt_to_phys

#define isa_page_to_bus page_to_phys

static inline unsigned int isa_virt_to_bus(volatile void *address)

{

	return (unsigned int)virt_to_phys(address);

}

#define isa_page_to_bus(page)	((unsigned int)page_to_phys(page))

#define isa_bus_to_virt		phys_to_virt



/*