Commit 190a1d72 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[S390] 4level-fixup cleanup 



Get independent from asm-generic/4level-fixup.h

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 3610cce8

arch/s390/lib/uaccess_pt.c

+6 −1
Original line number Diff line number Diff line
@@ -18,13 +18,18 @@ 
static inline pte_t *follow_table(struct mm_struct *mm, unsigned long addr)

{

	pgd_t *pgd;

	pud_t *pud;

	pmd_t *pmd;



	pgd = pgd_offset(mm, addr);

	if (pgd_none(*pgd) || unlikely(pgd_bad(*pgd)))

		return NULL;



	pmd = pmd_offset(pgd, addr);

	pud = pud_offset(pgd, addr);

	if (pud_none(*pud) || unlikely(pud_bad(*pud)))

		return NULL;



	pmd = pmd_offset(pud, addr);

	if (pmd_none(*pmd) || unlikely(pmd_bad(*pmd)))

		return NULL;

arch/s390/mm/init.c

+3 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ void show_mem(void) 
static void __init setup_ro_region(void)

{

	pgd_t *pgd;

	pud_t *pud;

	pmd_t *pmd;

	pte_t *pte;

	pte_t new_pte;
@@ -91,7 +92,8 @@ static void __init setup_ro_region(void) 


	for (; address < end; address += PAGE_SIZE) {

		pgd = pgd_offset_k(address);

		pmd = pmd_offset(pgd, address);

		pud = pud_offset(pgd, address);

		pmd = pmd_offset(pud, address);

		pte = pte_offset_kernel(pmd, address);

		new_pte = mk_pte_phys(address, __pgprot(_PAGE_RO));

		*pte = new_pte;

arch/s390/mm/vmem.c

+28 −6
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ static void __init_refok *vmem_alloc_pages(unsigned int order) 
	return alloc_bootmem_pages((1 << order) * PAGE_SIZE);

}



#define vmem_pud_alloc()	({ BUG(); ((pud_t *) NULL); })



static inline pmd_t *vmem_pmd_alloc(void)

{

	pmd_t *pmd = NULL;
@@ -103,6 +105,7 @@ static int vmem_add_range(unsigned long start, unsigned long size) 
{

	unsigned long address;

	pgd_t *pg_dir;

	pud_t *pu_dir;

	pmd_t *pm_dir;

	pte_t *pt_dir;

	pte_t  pte;
@@ -111,13 +114,21 @@ static int vmem_add_range(unsigned long start, unsigned long size) 
	for (address = start; address < start + size; address += PAGE_SIZE) {

		pg_dir = pgd_offset_k(address);

		if (pgd_none(*pg_dir)) {

			pu_dir = vmem_pud_alloc();

			if (!pu_dir)

				goto out;

			pgd_populate_kernel(&init_mm, pg_dir, pu_dir);

		}



		pu_dir = pud_offset(pg_dir, address);

		if (pud_none(*pu_dir)) {

			pm_dir = vmem_pmd_alloc();

			if (!pm_dir)

				goto out;

			pgd_populate_kernel(&init_mm, pg_dir, pm_dir);

			pud_populate_kernel(&init_mm, pu_dir, pm_dir);

		}



		pm_dir = pmd_offset(pg_dir, address);

		pm_dir = pmd_offset(pu_dir, address);

		if (pmd_none(*pm_dir)) {

			pt_dir = vmem_pte_alloc();

			if (!pt_dir)
@@ -143,6 +154,7 @@ static void vmem_remove_range(unsigned long start, unsigned long size) 
{

	unsigned long address;

	pgd_t *pg_dir;

	pud_t *pu_dir;

	pmd_t *pm_dir;

	pte_t *pt_dir;

	pte_t  pte;
@@ -150,9 +162,10 @@ static void vmem_remove_range(unsigned long start, unsigned long size) 
	pte_val(pte) = _PAGE_TYPE_EMPTY;

	for (address = start; address < start + size; address += PAGE_SIZE) {

		pg_dir = pgd_offset_k(address);

		if (pgd_none(*pg_dir))

		pu_dir = pud_offset(pg_dir, address);

		if (pud_none(*pu_dir))

			continue;

		pm_dir = pmd_offset(pg_dir, address);

		pm_dir = pmd_offset(pu_dir, address);

		if (pmd_none(*pm_dir))

			continue;

		pt_dir = pte_offset_kernel(pm_dir, address);
@@ -169,6 +182,7 @@ static int vmem_add_mem_map(unsigned long start, unsigned long size) 
	unsigned long address, start_addr, end_addr;

	struct page *map_start, *map_end;

	pgd_t *pg_dir;

	pud_t *pu_dir;

	pmd_t *pm_dir;

	pte_t *pt_dir;

	pte_t  pte;
@@ -183,13 +197,21 @@ static int vmem_add_mem_map(unsigned long start, unsigned long size) 
	for (address = start_addr; address < end_addr; address += PAGE_SIZE) {

		pg_dir = pgd_offset_k(address);

		if (pgd_none(*pg_dir)) {

			pu_dir = vmem_pud_alloc();

			if (!pu_dir)

				goto out;

			pgd_populate_kernel(&init_mm, pg_dir, pu_dir);

		}



		pu_dir = pud_offset(pg_dir, address);

		if (pud_none(*pu_dir)) {

			pm_dir = vmem_pmd_alloc();

			if (!pm_dir)

				goto out;

			pgd_populate_kernel(&init_mm, pg_dir, pm_dir);

			pud_populate_kernel(&init_mm, pu_dir, pm_dir);

		}



		pm_dir = pmd_offset(pg_dir, address);

		pm_dir = pmd_offset(pu_dir, address);

		if (pmd_none(*pm_dir)) {

			pt_dir = vmem_pte_alloc();

			if (!pt_dir)

include/asm-s390/page.h

+4 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ typedef struct { unsigned long pte; } pte_t; 
#ifndef __s390x__



typedef struct { unsigned long pmd; } pmd_t;

typedef struct { unsigned long pud; } pud_t;

typedef struct {

        unsigned long pgd0;

        unsigned long pgd1;
@@ -90,6 +91,7 @@ typedef struct { 
        } pgd_t;



#define pmd_val(x)      ((x).pmd)

#define pud_val(x)	((x).pud)

#define pgd_val(x)      ((x).pgd0)



#else /* __s390x__ */
@@ -98,10 +100,12 @@ typedef struct { 
        unsigned long pmd0;

        unsigned long pmd1; 

        } pmd_t;

typedef struct { unsigned long pud; } pud_t;

typedef struct { unsigned long pgd; } pgd_t;



#define pmd_val(x)      ((x).pmd0)

#define pmd_val1(x)     ((x).pmd1)

#define pud_val(x)	((x).pud)

#define pgd_val(x)      ((x).pgd)



#endif /* __s390x__ */

include/asm-s390/pgalloc.h

+22 −10
Original line number Diff line number Diff line
@@ -56,11 +56,17 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm) 
	return _SEGMENT_ENTRY_EMPTY;

}



#define pud_alloc_one(mm,address)		({ BUG(); ((pud_t *)2); })

#define pud_free(x)				do { } while (0)



#define pmd_alloc_one(mm,address)		({ BUG(); ((pmd_t *)2); })

#define pmd_free(x)				do { } while (0)



#define pgd_populate(mm, pmd, pte)		BUG()

#define pgd_populate_kernel(mm, pmd, pte)	BUG()

#define pgd_populate(mm, pgd, pud)		BUG()

#define pgd_populate_kernel(mm, pgd, pud)	BUG()



#define pud_populate(mm, pud, pmd)		BUG()

#define pud_populate_kernel(mm, pud, pmd)	BUG()



#else /* __s390x__ */
@@ -69,6 +75,9 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm) 
	return _REGION3_ENTRY_EMPTY;

}



#define pud_alloc_one(mm,address)		({ BUG(); ((pud_t *)2); })

#define pud_free(x)				do { } while (0)



static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)

{

	unsigned long *crst = crst_table_alloc(mm, s390_noexec);
@@ -78,20 +87,23 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr) 
}

#define pmd_free(pmd) crst_table_free((unsigned long *) pmd)



static inline void pgd_populate_kernel(struct mm_struct *mm,

				       pgd_t *pgd, pmd_t *pmd)

#define pgd_populate(mm, pgd, pud)		BUG()

#define pgd_populate_kernel(mm, pgd, pud)	BUG()



static inline void pud_populate_kernel(struct mm_struct *mm,

				       pud_t *pud, pmd_t *pmd)

{

	pgd_val(*pgd) = _REGION3_ENTRY | __pa(pmd);

	pud_val(*pud) = _REGION3_ENTRY | __pa(pmd);

}



static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)

static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)

{

	pgd_t *shadow_pgd = get_shadow_table(pgd);

	pud_t *shadow_pud = get_shadow_table(pud);

	pmd_t *shadow_pmd = get_shadow_table(pmd);



	if (shadow_pgd && shadow_pmd)

		pgd_populate_kernel(mm, shadow_pgd, shadow_pmd);

	pgd_populate_kernel(mm, pgd, pmd);

	if (shadow_pud && shadow_pmd)

		pud_populate_kernel(mm, shadow_pud, shadow_pmd);

	pud_populate_kernel(mm, pud, pmd);

}



#endif /* __s390x__ */