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

Commit 4ec5387c authored by Juan Quintela's avatar Juan Quintela Committed by Stefano Stabellini
Browse files

xen: add the direct mapping area for ISA bus access 



add the direct mapping area for ISA bus access when running as initial
domain

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent b37a56d6

arch/x86/xen/enlighten.c

+1 −0
Original line number Diff line number Diff line
@@ -1186,6 +1186,7 @@ asmlinkage void __init xen_start_kernel(void) 


	xen_raw_console_write("mapping kernel into physical memory\n");

	pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);

	xen_ident_map_ISA();



	init_mm.pgd = pgd;

arch/x86/xen/mmu.c

+24 −0
Original line number Diff line number Diff line
@@ -1682,6 +1682,7 @@ static void *m2v(phys_addr_t maddr) 
	return __ka(m2p(maddr));

}



/* Set the page permissions on an identity-mapped pages */

static void set_page_prot(void *addr, pgprot_t prot)

{

	unsigned long pfn = __pa(addr) >> PAGE_SHIFT;
@@ -1929,6 +1930,29 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot) 
#endif

}



__init void xen_ident_map_ISA(void)

{

	unsigned long pa;



	/*

	 * If we're dom0, then linear map the ISA machine addresses into

	 * the kernel's address space.

	 */

	if (!xen_initial_domain())

		return;



	xen_raw_printk("Xen: setup ISA identity maps\n");



	for (pa = ISA_START_ADDRESS; pa < ISA_END_ADDRESS; pa += PAGE_SIZE) {

		pte_t pte = mfn_pte(PFN_DOWN(pa), PAGE_KERNEL_IO);



		if (HYPERVISOR_update_va_mapping(PAGE_OFFSET + pa, pte, 0))

			BUG();

	}



	xen_flush_tlb();

}



static __init void xen_post_allocator_init(void)

{

	pv_mmu_ops.set_pte = xen_set_pte;

arch/x86/xen/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ char * __init xen_memory_setup(void) 
	 * Even though this is normal, usable memory under Xen, reserve

	 * ISA memory anyway because too many things think they can poke

	 * about in there.

	 *

	 * In a dom0 kernel, this region is identity mapped with the

	 * hardware ISA area, so it really is out of bounds.

	 */

	e820_add_region(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS,

			E820_RESERVED);