minios: Disable the mfn_is_ram() check, it doesn't work correctly on all systems

This patch disables the mfn_is_ram check in mini-os. The current check
is insufficient and fails on some systems with larger than 4gb memory.

Signed-off-by: Matthew Fioravante <matthew.fioravante@jhuapl.edu>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyons.org>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Matthew Fioravante committed 2012-10-08 14:36:30 +01:00
1 parent 7ab9bbf9f8
commit b8902baf80
3 files changed
-30

No files matched your search

-13
View File
@@ -35,7 +35,6 @@ static void *__do_ioremap(unsigned long phys_addr, unsigned long size,
unsigned long va;
unsigned long mfns, mfn;
unsigned long num_pages, offset;
int i;
/* allow non page aligned addresses but for mapping we need to align them */
offset = (phys_addr & ~PAGE_MASK);
@@ -43,21 +42,9 @@ static void *__do_ioremap(unsigned long phys_addr, unsigned long size,
phys_addr &= PAGE_MASK;
mfns = mfn = phys_addr >> PAGE_SHIFT;
/* sanity checks on list of MFNs */
for ( i = 0; i < num_pages; i++, mfn++ )
{
if ( mfn_is_ram(mfn) )
{
printk("ioremap: mfn 0x%ulx is RAM\n", mfn);
goto mfn_invalid;
}
}
va = (unsigned long)map_frames_ex(&mfns, num_pages, 0, 1, 1,
DOMID_IO, NULL, prot);
return (void *)(va + offset);
mfn_invalid:
return NULL;
}
void *ioremap(unsigned long phys_addr, unsigned long size)
-16
View File
@@ -844,18 +844,6 @@ unsigned long alloc_contig_pages(int order, unsigned int addr_bits)
return in_va;
}
/*
* Check if a given MFN refers to real memory
*/
static long system_ram_end_mfn;
int mfn_is_ram(unsigned long mfn)
{
/* very crude check if a given MFN is memory or not. Probably should
* make this a little more sophisticated ;) */
return (mfn <= system_ram_end_mfn) ? 1 : 0;
}
/*
* Clear some of the bootstrap memory
*/
@@ -951,10 +939,6 @@ void arch_init_mm(unsigned long* start_pfn_p, unsigned long* max_pfn_p)
clear_bootstrap();
set_readonly(&_text, &_erodata);
/* get the number of physical pages the system has. Used to check for
* system memory. */
system_ram_end_mfn = HYPERVISOR_memory_op(XENMEM_maximum_ram_page, NULL);
*start_pfn_p = start_pfn;
*max_pfn_p = max_pfn;
}
-1
View File
@@ -229,6 +229,5 @@ static __inline__ paddr_t machine_to_phys(maddr_t machine)
#define do_map_zero(start, n) do_map_frames(start, &mfn_zero, n, 0, 0, DOMID_SELF, NULL, L1_PROT_RO)
pgentry_t *need_pgt(unsigned long addr);
int mfn_is_ram(unsigned long mfn);
#endif /* _ARCH_MM_H_ */
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.