|
@@ -333,11 +333,20 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
|
|
|
req_type & _PAGE_CACHE_MASK);
|
|
|
}
|
|
|
|
|
|
- is_range_ram = pagerange_is_ram(start, end);
|
|
|
- if (is_range_ram == 1)
|
|
|
- return reserve_ram_pages_type(start, end, req_type, new_type);
|
|
|
- else if (is_range_ram < 0)
|
|
|
- return -EINVAL;
|
|
|
+ /*
|
|
|
+ * For legacy reasons, some parts of the physical address range in the
|
|
|
+ * legacy 1MB region is treated as non-RAM (even when listed as RAM in
|
|
|
+ * the e820 tables). So we will track the memory attributes of this
|
|
|
+ * legacy 1MB region using the linear memtype_list always.
|
|
|
+ */
|
|
|
+ if (end >= ISA_END_ADDRESS) {
|
|
|
+ is_range_ram = pagerange_is_ram(start, end);
|
|
|
+ if (is_range_ram == 1)
|
|
|
+ return reserve_ram_pages_type(start, end, req_type,
|
|
|
+ new_type);
|
|
|
+ else if (is_range_ram < 0)
|
|
|
+ return -EINVAL;
|
|
|
+ }
|
|
|
|
|
|
new = kmalloc(sizeof(struct memtype), GFP_KERNEL);
|
|
|
if (!new)
|
|
@@ -437,11 +446,19 @@ int free_memtype(u64 start, u64 end)
|
|
|
if (is_ISA_range(start, end - 1))
|
|
|
return 0;
|
|
|
|
|
|
- is_range_ram = pagerange_is_ram(start, end);
|
|
|
- if (is_range_ram == 1)
|
|
|
- return free_ram_pages_type(start, end);
|
|
|
- else if (is_range_ram < 0)
|
|
|
- return -EINVAL;
|
|
|
+ /*
|
|
|
+ * For legacy reasons, some parts of the physical address range in the
|
|
|
+ * legacy 1MB region is treated as non-RAM (even when listed as RAM in
|
|
|
+ * the e820 tables). So we will track the memory attributes of this
|
|
|
+ * legacy 1MB region using the linear memtype_list always.
|
|
|
+ */
|
|
|
+ if (end >= ISA_END_ADDRESS) {
|
|
|
+ is_range_ram = pagerange_is_ram(start, end);
|
|
|
+ if (is_range_ram == 1)
|
|
|
+ return free_ram_pages_type(start, end);
|
|
|
+ else if (is_range_ram < 0)
|
|
|
+ return -EINVAL;
|
|
|
+ }
|
|
|
|
|
|
spin_lock(&memtype_lock);
|
|
|
list_for_each_entry(entry, &memtype_list, nd) {
|