[PATCH] ia64: ioremap: check EFI for valid memory attributes
Check the EFI memory map so we can use the correct memory attributes for ioremap(). Previously, we always used uncacheable access, which blows up on some machines for regular system memory. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Matt Domsch <Matt_Domsch@dell.com> Cc: "Tolentino, Matthew E" <matthew.e.tolentino@intel.com> Cc: "Brown, Len" <len.brown@intel.com> Cc: Andi Kleen <ak@muc.de> Acked-by: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
136939a2b5
commit
e9b0a07121
@@ -416,25 +416,14 @@ __writeq (unsigned long val, volatile void __iomem *addr)
|
||||
# define outl_p outl
|
||||
#endif
|
||||
|
||||
/*
|
||||
* An "address" in IO memory space is not clearly either an integer or a pointer. We will
|
||||
* accept both, thus the casts.
|
||||
*
|
||||
* On ia-64, we access the physical I/O memory space through the uncached kernel region.
|
||||
*/
|
||||
static inline void __iomem *
|
||||
ioremap (unsigned long offset, unsigned long size)
|
||||
{
|
||||
return (void __iomem *) (__IA64_UNCACHED_OFFSET | (offset));
|
||||
}
|
||||
extern void __iomem * ioremap(unsigned long offset, unsigned long size);
|
||||
extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
|
||||
|
||||
static inline void
|
||||
iounmap (volatile void __iomem *addr)
|
||||
{
|
||||
}
|
||||
|
||||
#define ioremap_nocache(o,s) ioremap(o,s)
|
||||
|
||||
/* Use normal IO mappings for DMI */
|
||||
#define dmi_ioremap ioremap
|
||||
#define dmi_iounmap(x,l) iounmap(x)
|
||||
|
Reference in New Issue
Block a user