Commit c1c57d76 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Tony Luck

[IA64] ioremap() should prefer WB over UC

efi_memmap_init() collects full granules of WB memory, without
regard for whether they also support UC.  So in order for ioremap()
to work for main memory, it must prefer WB mappings when possible.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 3283a67d
...@@ -21,12 +21,12 @@ __ioremap (unsigned long offset, unsigned long size) ...@@ -21,12 +21,12 @@ __ioremap (unsigned long offset, unsigned long size)
void __iomem * void __iomem *
ioremap (unsigned long offset, unsigned long size) ioremap (unsigned long offset, unsigned long size)
{ {
if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC))
return __ioremap(offset, size);
if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB)) if (efi_mem_attribute_range(offset, size, EFI_MEMORY_WB))
return phys_to_virt(offset); return phys_to_virt(offset);
if (efi_mem_attribute_range(offset, size, EFI_MEMORY_UC))
return __ioremap(offset, size);
/* /*
* Someday this should check ACPI resources so we * Someday this should check ACPI resources so we
* can do the right thing for hot-plugged regions. * can do the right thing for hot-plugged regions.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment