Commit 52e0ad26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next 

Pull sparc updates from David Miller:

 - Rework the sparc32 page tables so that READ_ONCE(*pmd), as done by
   generic code, operates on a word sized element. From Will Deacon.

 - Some scnprintf() conversions, from Chen Zhou.

 - A pin_user_pages() conversion from John Hubbard.

 - Several 32-bit ptrace register handling fixes and such from Al Viro.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
  fix a braino in "sparc32: fix register window handling in genregs32_[gs]et()"
  sparc32: mm: Only call ctor()/dtor() functions for first and last user
  sparc32: mm: Disable SPLIT_PTLOCK_CPUS
  sparc32: mm: Don't try to free page-table pages if ctor() fails
  sparc32: register memory occupied by kernel as memblock.memory
  sparc: remove unused header file nfs_fs.h
  sparc32: fix register window handling in genregs32_[gs]et()
  sparc64: fix misuses of access_process_vm() in genregs32_[sg]et()
  oradax: convert get_user_pages() --> pin_user_pages()
  sparc: use scnprintf() in show_pciobppath_attr() in vio.c
  sparc: use scnprintf() in show_pciobppath_attr() in pci.c
  tty: vcc: Fix error return code in vcc_probe()
  sparc32: mm: Reduce allocation size for PMD and PTE tables
  sparc32: mm: Change pgtable_t type to pte_t * instead of struct page *
  sparc32: mm: Restructure sparc32 MMU page-table layout
  sparc32: mm: Fix argument checking in __srmmu_get_nocache()
  sparc64: Replace zero-length array with flexible-array
  sparc: mm: return true,false in kern_addr_valid()
parents cf0c97f1 4f8ad738

arch/sparc/include/asm/page_32.h

+6 −6
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ extern struct sparc_phys_banks sp_banks[SPARC_PHYS_BANKS+1]; 
 */

typedef struct { unsigned long pte; } pte_t;

typedef struct { unsigned long iopte; } iopte_t;

typedef struct { unsigned long pmdv[16]; } pmd_t;

typedef struct { unsigned long pmd; } pmd_t;

typedef struct { unsigned long pgd; } pgd_t;

typedef struct { unsigned long ctxd; } ctxd_t;

typedef struct { unsigned long pgprot; } pgprot_t;
@@ -62,7 +62,7 @@ typedef struct { unsigned long iopgprot; } iopgprot_t; 


#define pte_val(x)	((x).pte)

#define iopte_val(x)	((x).iopte)

#define pmd_val(x)      ((x).pmdv[0])

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

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

#define ctxd_val(x)	((x).ctxd)

#define pgprot_val(x)	((x).pgprot)
@@ -82,7 +82,7 @@ typedef struct { unsigned long iopgprot; } iopgprot_t; 
 */

typedef unsigned long pte_t;

typedef unsigned long iopte_t;

typedef struct { unsigned long pmdv[16]; } pmd_t;

typedef unsigned long pmd_t;

typedef unsigned long pgd_t;

typedef unsigned long ctxd_t;

typedef unsigned long pgprot_t;
@@ -90,14 +90,14 @@ typedef unsigned long iopgprot_t; 


#define pte_val(x)	(x)

#define iopte_val(x)	(x)

#define pmd_val(x)      ((x).pmdv[0])

#define pmd_val(x)      (x)

#define pgd_val(x)	(x)

#define ctxd_val(x)	(x)

#define pgprot_val(x)	(x)

#define iopgprot_val(x)	(x)



#define __pte(x)	(x)

#define __pmd(x)	((pmd_t) { { (x) }, })

#define __pmd(x)	(x)

#define __iopte(x)	(x)

#define __pgd(x)	(x)

#define __ctxd(x)	(x)
@@ -106,7 +106,7 @@ typedef unsigned long iopgprot_t; 


#endif



typedef struct page *pgtable_t;

typedef pte_t *pgtable_t;



#define TASK_UNMAPPED_BASE	0x50000000

arch/sparc/include/asm/pgalloc_32.h

+6 −5
Original line number Diff line number Diff line
@@ -50,23 +50,24 @@ static inline void free_pmd_fast(pmd_t * pmd) 
#define pmd_free(mm, pmd)		free_pmd_fast(pmd)

#define __pmd_free_tlb(tlb, pmd, addr)	pmd_free((tlb)->mm, pmd)



void pmd_populate(struct mm_struct *mm, pmd_t *pmdp, struct page *ptep);

#define pmd_pgtable(pmd) pmd_page(pmd)

#define pmd_populate(mm, pmd, pte)	pmd_set(pmd, pte)

#define pmd_pgtable(pmd)		(pgtable_t)__pmd_page(pmd)



void pmd_set(pmd_t *pmdp, pte_t *ptep);

#define pmd_populate_kernel(MM, PMD, PTE) pmd_set(PMD, PTE)

#define pmd_populate_kernel		pmd_populate



pgtable_t pte_alloc_one(struct mm_struct *mm);



static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm)

{

	return srmmu_get_nocache(PTE_SIZE, PTE_SIZE);

	return srmmu_get_nocache(SRMMU_PTE_TABLE_SIZE,

				 SRMMU_PTE_TABLE_SIZE);

}





static inline void free_pte_fast(pte_t *pte)

{

	srmmu_free_nocache(pte, PTE_SIZE);

	srmmu_free_nocache(pte, SRMMU_PTE_TABLE_SIZE);

}



#define pte_free_kernel(mm, pte)	free_pte_fast(pte)

arch/sparc/include/asm/pgtable_32.h

+26 −14
Original line number Diff line number Diff line
@@ -11,6 +11,16 @@ 


#include <linux/const.h>



#define PMD_SHIFT		18

#define PMD_SIZE        	(1UL << PMD_SHIFT)

#define PMD_MASK        	(~(PMD_SIZE-1))

#define PMD_ALIGN(__addr) 	(((__addr) + ~PMD_MASK) & PMD_MASK)



#define PGDIR_SHIFT     	24

#define PGDIR_SIZE      	(1UL << PGDIR_SHIFT)

#define PGDIR_MASK      	(~(PGDIR_SIZE-1))

#define PGDIR_ALIGN(__addr) 	(((__addr) + ~PGDIR_MASK) & PGDIR_MASK)



#ifndef __ASSEMBLY__

#include <asm-generic/pgtable-nopud.h>
@@ -34,17 +44,10 @@ unsigned long __init bootmem_init(unsigned long *pages_avail); 
#define pmd_ERROR(e)   __builtin_trap()

#define pgd_ERROR(e)   __builtin_trap()



#define PMD_SHIFT		22

#define PMD_SIZE        	(1UL << PMD_SHIFT)

#define PMD_MASK        	(~(PMD_SIZE-1))

#define PMD_ALIGN(__addr) 	(((__addr) + ~PMD_MASK) & PMD_MASK)

#define PGDIR_SHIFT     	SRMMU_PGDIR_SHIFT

#define PGDIR_SIZE      	SRMMU_PGDIR_SIZE

#define PGDIR_MASK      	SRMMU_PGDIR_MASK

#define PTRS_PER_PTE    	1024

#define PTRS_PER_PMD    	SRMMU_PTRS_PER_PMD

#define PTRS_PER_PGD    	SRMMU_PTRS_PER_PGD

#define USER_PTRS_PER_PGD	PAGE_OFFSET / SRMMU_PGDIR_SIZE

#define PTRS_PER_PTE    	64

#define PTRS_PER_PMD    	64

#define PTRS_PER_PGD    	256

#define USER_PTRS_PER_PGD	PAGE_OFFSET / PGDIR_SIZE

#define FIRST_USER_ADDRESS	0UL

#define PTE_SIZE		(PTRS_PER_PTE*4)
@@ -132,6 +135,17 @@ static inline struct page *pmd_page(pmd_t pmd) 
	return pfn_to_page((pmd_val(pmd) & SRMMU_PTD_PMASK) >> (PAGE_SHIFT-4));

}



static inline unsigned long __pmd_page(pmd_t pmd)

{

	unsigned long v;



	if (srmmu_device_memory(pmd_val(pmd)))

		BUG();



	v = pmd_val(pmd) & SRMMU_PTD_PMASK;

	return (unsigned long)__nocache_va(v << 4);

}



static inline unsigned long pud_page_vaddr(pud_t pud)

{

	if (srmmu_device_memory(pud_val(pud))) {
@@ -179,9 +193,7 @@ static inline int pmd_none(pmd_t pmd) 


static inline void pmd_clear(pmd_t *pmdp)

{

	int i;

	for (i = 0; i < PTRS_PER_PTE/SRMMU_REAL_PTRS_PER_PTE; i++)

		set_pte((pte_t *)&pmdp->pmdv[i], __pte(0));

	set_pte((pte_t *)&pmd_val(*pmdp), __pte(0));

}



static inline int pud_none(pud_t pud)

arch/sparc/include/asm/pgtsrmmu.h

+3 −33
Original line number Diff line number Diff line
@@ -17,39 +17,9 @@ 
/* Number of contexts is implementation-dependent; 64k is the most we support */

#define SRMMU_MAX_CONTEXTS	65536



/* PMD_SHIFT determines the size of the area a second-level page table entry can map */

#define SRMMU_REAL_PMD_SHIFT		18

#define SRMMU_REAL_PMD_SIZE		(1UL << SRMMU_REAL_PMD_SHIFT)

#define SRMMU_REAL_PMD_MASK		(~(SRMMU_REAL_PMD_SIZE-1))

#define SRMMU_REAL_PMD_ALIGN(__addr)	(((__addr)+SRMMU_REAL_PMD_SIZE-1)&SRMMU_REAL_PMD_MASK)



/* PGDIR_SHIFT determines what a third-level page table entry can map */

#define SRMMU_PGDIR_SHIFT       24

#define SRMMU_PGDIR_SIZE        (1UL << SRMMU_PGDIR_SHIFT)

#define SRMMU_PGDIR_MASK        (~(SRMMU_PGDIR_SIZE-1))

#define SRMMU_PGDIR_ALIGN(addr) (((addr)+SRMMU_PGDIR_SIZE-1)&SRMMU_PGDIR_MASK)



#define SRMMU_REAL_PTRS_PER_PTE	64

#define SRMMU_REAL_PTRS_PER_PMD	64

#define SRMMU_PTRS_PER_PGD	256



#define SRMMU_REAL_PTE_TABLE_SIZE	(SRMMU_REAL_PTRS_PER_PTE*4)

#define SRMMU_PMD_TABLE_SIZE		(SRMMU_REAL_PTRS_PER_PMD*4)

#define SRMMU_PGD_TABLE_SIZE		(SRMMU_PTRS_PER_PGD*4)



/*

 * To support pagetables in highmem, Linux introduces APIs which

 * return struct page* and generally manipulate page tables when

 * they are not mapped into kernel space. Our hardware page tables

 * are smaller than pages. We lump hardware tabes into big, page sized

 * software tables.

 *

 * PMD_SHIFT determines the size of the area a second-level page table entry

 * can map, and our pmd_t is 16 times larger than normal.  The values which

 * were once defined here are now generic for 4c and srmmu, so they're

 * found in pgtable.h.

 */

#define SRMMU_PTRS_PER_PMD	4

#define SRMMU_PTE_TABLE_SIZE		(PTRS_PER_PTE*4)

#define SRMMU_PMD_TABLE_SIZE		(PTRS_PER_PMD*4)

#define SRMMU_PGD_TABLE_SIZE		(PTRS_PER_PGD*4)



/* Definition of the values in the ET field of PTD's and PTE's */

#define SRMMU_ET_MASK         0x3

arch/sparc/include/asm/viking.h

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <asm/asi.h>

#include <asm/mxcc.h>

#include <asm/pgtable.h>

#include <asm/pgtsrmmu.h>



/* Bits in the SRMMU control register for GNU/Viking modules.
@@ -227,7 +228,7 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr) 
			     : "=r" (val)

			     : "r" (vaddr | 0x200), "i" (ASI_M_FLUSH_PROBE));

	if ((val & SRMMU_ET_MASK) == SRMMU_ET_PTE) {

		vaddr &= ~SRMMU_PGDIR_MASK;

		vaddr &= ~PGDIR_MASK;

		vaddr >>= PAGE_SHIFT;

		return val | (vaddr << 8);

	}
@@ -237,7 +238,7 @@ static inline unsigned long viking_hwprobe(unsigned long vaddr) 
			     : "=r" (val)

			     : "r" (vaddr | 0x100), "i" (ASI_M_FLUSH_PROBE));

	if ((val & SRMMU_ET_MASK) == SRMMU_ET_PTE) {

		vaddr &= ~SRMMU_REAL_PMD_MASK;

		vaddr &= ~PMD_MASK;

		vaddr >>= PAGE_SHIFT;

		return val | (vaddr << 8);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE