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

Commit d6a9996e authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm: vmalloc abstraction in preparation for radix 



The vmalloc range differs between hash and radix config. Hence make
VMALLOC_START and related constants a variable which will be runtime
initialized depending on whether hash or radix mode is active.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[mpe: Fix missing init of ioremap_bot in pgtable_64.c for ppc64e]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 4dfb88ca

arch/powerpc/include/asm/book3s/64/hash.h

+7 −7
Original line number Diff line number Diff line
@@ -45,17 +45,17 @@ 
/*

 * Define the address range of the kernel non-linear virtual area

 */

#define KERN_VIRT_START ASM_CONST(0xD000000000000000)

#define KERN_VIRT_SIZE	ASM_CONST(0x0000100000000000)

#define H_KERN_VIRT_START ASM_CONST(0xD000000000000000)

#define H_KERN_VIRT_SIZE	ASM_CONST(0x0000100000000000)



/*

 * The vmalloc space starts at the beginning of that region, and

 * occupies half of it on hash CPUs and a quarter of it on Book3E

 * (we keep a quarter for the virtual memmap)

 */

#define VMALLOC_START	KERN_VIRT_START

#define VMALLOC_SIZE	(KERN_VIRT_SIZE >> 1)

#define VMALLOC_END	(VMALLOC_START + VMALLOC_SIZE)

#define H_VMALLOC_START	H_KERN_VIRT_START

#define H_VMALLOC_SIZE	(H_KERN_VIRT_SIZE >> 1)

#define H_VMALLOC_END	(H_VMALLOC_START + H_VMALLOC_SIZE)



/*

 * Region IDs
@@ -64,7 +64,7 @@ 
#define REGION_MASK		(0xfUL << REGION_SHIFT)

#define REGION_ID(ea)		(((unsigned long)(ea)) >> REGION_SHIFT)



#define VMALLOC_REGION_ID	(REGION_ID(VMALLOC_START))

#define VMALLOC_REGION_ID	(REGION_ID(H_VMALLOC_START))

#define KERNEL_REGION_ID	(REGION_ID(PAGE_OFFSET))

#define VMEMMAP_REGION_ID	(0xfUL)	/* Server only */

#define USER_REGION_ID		(0UL)
@@ -73,7 +73,7 @@ 
 * Defines the address of the vmemap area, in its own region on

 * hash table CPUs.

 */

#define VMEMMAP_BASE		(VMEMMAP_REGION_ID << REGION_SHIFT)

#define H_VMEMMAP_BASE		(VMEMMAP_REGION_ID << REGION_SHIFT)



#ifdef CONFIG_PPC_MM_SLICES

#define HAVE_ARCH_UNMAPPED_AREA

arch/powerpc/include/asm/book3s/64/pgtable.h

+12 −3
Original line number Diff line number Diff line
@@ -208,6 +208,18 @@ extern unsigned long __pgd_val_bits; 
#define PUD_MASKED_BITS		0xc0000000000000ffUL

/* Bits to mask out from a PGD to get to the PUD page */

#define PGD_MASKED_BITS		0xc0000000000000ffUL



extern unsigned long __vmalloc_start;

extern unsigned long __vmalloc_end;

#define VMALLOC_START	__vmalloc_start

#define VMALLOC_END	__vmalloc_end



extern unsigned long __kernel_virt_start;

extern unsigned long __kernel_virt_size;

#define KERN_VIRT_START __kernel_virt_start

#define KERN_VIRT_SIZE  __kernel_virt_size

extern struct page *vmemmap;

extern unsigned long ioremap_bot;

#endif /* __ASSEMBLY__ */



#include <asm/book3s/64/hash.h>
@@ -220,7 +232,6 @@ extern unsigned long __pgd_val_bits; 
#endif



#include <asm/barrier.h>



/*

 * The second half of the kernel virtual space is used for IO mappings,

 * it's itself carved into the PIO region (ISA and PHB IO space) and
@@ -239,8 +250,6 @@ extern unsigned long __pgd_val_bits; 
#define IOREMAP_BASE	(PHB_IO_END)

#define IOREMAP_END	(KERN_VIRT_START + KERN_VIRT_SIZE)



#define vmemmap			((struct page *)VMEMMAP_BASE)



/* Advertise special mapping type for AGP */

#define HAVE_PAGE_AGP

arch/powerpc/include/asm/book3s/64/radix.h

+68 −0
Original line number Diff line number Diff line
@@ -31,6 +31,74 @@ 
			      RADIX_PUD_INDEX_SIZE + RADIX_PGD_INDEX_SIZE + PAGE_SHIFT)

#define RADIX_PGTABLE_RANGE (ASM_CONST(1) << RADIX_PGTABLE_EADDR_SIZE)



/*

 * We support 52 bit address space, Use top bit for kernel

 * virtual mapping. Also make sure kernel fit in the top

 * quadrant.

 *

 *           +------------------+

 *           +------------------+  Kernel virtual map (0xc008000000000000)

 *           |                  |

 *           |                  |

 *           |                  |

 * 0b11......+------------------+  Kernel linear map (0xc....)

 *           |                  |

 *           |     2 quadrant   |

 *           |                  |

 * 0b10......+------------------+

 *           |                  |

 *           |    1 quadrant    |

 *           |                  |

 * 0b01......+------------------+

 *           |                  |

 *           |    0 quadrant    |

 *           |                  |

 * 0b00......+------------------+

 *

 *

 * 3rd quadrant expanded:

 * +------------------------------+

 * |                              |

 * |                              |

 * |                              |

 * +------------------------------+  Kernel IO map end (0xc010000000000000)

 * |                              |

 * |                              |

 * |      1/2 of virtual map      |

 * |                              |

 * |                              |

 * +------------------------------+  Kernel IO map start

 * |                              |

 * |      1/4 of virtual map      |

 * |                              |

 * +------------------------------+  Kernel vmemap start

 * |                              |

 * |     1/4 of virtual map       |

 * |                              |

 * +------------------------------+  Kernel virt start (0xc008000000000000)

 * |                              |

 * |                              |

 * |                              |

 * +------------------------------+  Kernel linear (0xc.....)

 */



#define RADIX_KERN_VIRT_START ASM_CONST(0xc008000000000000)

#define RADIX_KERN_VIRT_SIZE  ASM_CONST(0x0008000000000000)



/*

 * The vmalloc space starts at the beginning of that region, and

 * occupies a quarter of it on radix config.

 * (we keep a quarter for the virtual memmap)

 */

#define RADIX_VMALLOC_START	RADIX_KERN_VIRT_START

#define RADIX_VMALLOC_SIZE	(RADIX_KERN_VIRT_SIZE >> 2)

#define RADIX_VMALLOC_END	(RADIX_VMALLOC_START + RADIX_VMALLOC_SIZE)

/*

 * Defines the address of the vmemap area, in its own region on

 * hash table CPUs.

 */

#define RADIX_VMEMMAP_BASE		(RADIX_VMALLOC_END)



#ifndef __ASSEMBLY__

#define RADIX_PTE_TABLE_SIZE	(sizeof(pte_t) << RADIX_PTE_INDEX_SIZE)

#define RADIX_PMD_TABLE_SIZE	(sizeof(pmd_t) << RADIX_PMD_INDEX_SIZE)

arch/powerpc/kernel/pci_64.c

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
 * ISA drivers use hard coded offsets.  If no ISA bus exists nothing

 * is mapped on the first 64K of IO space

 */

unsigned long pci_io_base = ISA_IO_BASE;

unsigned long pci_io_base;

EXPORT_SYMBOL(pci_io_base);



static int __init pcibios_init(void)
@@ -47,6 +47,7 @@ static int __init pcibios_init(void) 


	printk(KERN_INFO "PCI: Probing PCI hardware\n");



	pci_io_base = ISA_IO_BASE;

	/* For now, override phys_mem_access_prot. If we need it,g

	 * later, we may move that initialization to each ppc_md

	 */

arch/powerpc/mm/hash_utils_64.c

+8 −0
Original line number Diff line number Diff line
@@ -889,6 +889,14 @@ void __init hash__early_init_mmu(void) 
	__pmd_val_bits = 0;

	__pud_val_bits = 0;

	__pgd_val_bits = 0;



	__kernel_virt_start = H_KERN_VIRT_START;

	__kernel_virt_size = H_KERN_VIRT_SIZE;

	__vmalloc_start = H_VMALLOC_START;

	__vmalloc_end = H_VMALLOC_END;

	vmemmap = (struct page *)H_VMEMMAP_BASE;

	ioremap_bot = IOREMAP_BASE;



	/* Initialize the MMU Hash table and create the linear mapping

	 * of memory. Has to be done before SLB initialization as this is

	 * currently where the page size encoding is obtained.