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

Commit 683d2fa6 authored by David S. Miller's avatar David S. Miller Committed by Linus Torvalds
Browse files

sparc64: add support for _PAGE_SPECIAL 



Luckily there are still a few software PTE bits remaining and they even
match up in both the sun4u and sun4v pte layouts.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4a0100f7

arch/sparc/include/asm/pgtable_64.h

+11 −4
Original line number Original line Diff line number Diff line
@@ -95,6 +95,10 @@ 
/* PTE bits which are the same in SUN4U and SUN4V format.  */

/* PTE bits which are the same in SUN4U and SUN4V format.  */

#define _PAGE_VALID	  _AC(0x8000000000000000,UL) /* Valid TTE            */

#define _PAGE_VALID	  _AC(0x8000000000000000,UL) /* Valid TTE            */

#define _PAGE_R	  	  _AC(0x8000000000000000,UL) /* Keep ref bit uptodate*/

#define _PAGE_R	  	  _AC(0x8000000000000000,UL) /* Keep ref bit uptodate*/

#define _PAGE_SPECIAL     _AC(0x0200000000000000,UL) /* Special page         */



/* Advertise support for _PAGE_SPECIAL */

#define __HAVE_ARCH_PTE_SPECIAL





/* SUN4U pte bits... */

/* SUN4U pte bits... */

#define _PAGE_SZ4MB_4U	  _AC(0x6000000000000000,UL) /* 4MB Page             */

#define _PAGE_SZ4MB_4U	  _AC(0x6000000000000000,UL) /* 4MB Page             */
@@ -104,6 +108,7 @@ 
#define _PAGE_NFO_4U	  _AC(0x1000000000000000,UL) /* No Fault Only        */

#define _PAGE_NFO_4U	  _AC(0x1000000000000000,UL) /* No Fault Only        */

#define _PAGE_IE_4U	  _AC(0x0800000000000000,UL) /* Invert Endianness    */

#define _PAGE_IE_4U	  _AC(0x0800000000000000,UL) /* Invert Endianness    */

#define _PAGE_SOFT2_4U	  _AC(0x07FC000000000000,UL) /* Software bits, set 2 */

#define _PAGE_SOFT2_4U	  _AC(0x07FC000000000000,UL) /* Software bits, set 2 */

#define _PAGE_SPECIAL_4U  _AC(0x0200000000000000,UL) /* Special page         */

#define _PAGE_RES1_4U	  _AC(0x0002000000000000,UL) /* Reserved             */

#define _PAGE_RES1_4U	  _AC(0x0002000000000000,UL) /* Reserved             */

#define _PAGE_SZ32MB_4U	  _AC(0x0001000000000000,UL) /* (Panther) 32MB page  */

#define _PAGE_SZ32MB_4U	  _AC(0x0001000000000000,UL) /* (Panther) 32MB page  */

#define _PAGE_SZ256MB_4U  _AC(0x2001000000000000,UL) /* (Panther) 256MB page */

#define _PAGE_SZ256MB_4U  _AC(0x2001000000000000,UL) /* (Panther) 256MB page */
@@ -133,6 +138,7 @@ 
#define _PAGE_ACCESSED_4V _AC(0x1000000000000000,UL) /* Accessed (ref'd)     */

#define _PAGE_ACCESSED_4V _AC(0x1000000000000000,UL) /* Accessed (ref'd)     */

#define _PAGE_READ_4V	  _AC(0x0800000000000000,UL) /* Readable SW Bit      */

#define _PAGE_READ_4V	  _AC(0x0800000000000000,UL) /* Readable SW Bit      */

#define _PAGE_WRITE_4V	  _AC(0x0400000000000000,UL) /* Writable SW Bit      */

#define _PAGE_WRITE_4V	  _AC(0x0400000000000000,UL) /* Writable SW Bit      */

#define _PAGE_SPECIAL_4V  _AC(0x0200000000000000,UL) /* Special page         */

#define _PAGE_PADDR_4V	  _AC(0x00FFFFFFFFFFE000,UL) /* paddr[55:13]         */

#define _PAGE_PADDR_4V	  _AC(0x00FFFFFFFFFFE000,UL) /* paddr[55:13]         */

#define _PAGE_IE_4V	  _AC(0x0000000000001000,UL) /* Invert Endianness    */

#define _PAGE_IE_4V	  _AC(0x0000000000001000,UL) /* Invert Endianness    */

#define _PAGE_E_4V	  _AC(0x0000000000000800,UL) /* side-Effect          */

#define _PAGE_E_4V	  _AC(0x0000000000000800,UL) /* side-Effect          */
@@ -302,10 +308,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t prot) 
	: "=r" (mask), "=r" (tmp)

	: "=r" (mask), "=r" (tmp)

	: "i" (_PAGE_PADDR_4U | _PAGE_MODIFIED_4U | _PAGE_ACCESSED_4U |

	: "i" (_PAGE_PADDR_4U | _PAGE_MODIFIED_4U | _PAGE_ACCESSED_4U |

	       _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U | _PAGE_PRESENT_4U |

	       _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_E_4U | _PAGE_PRESENT_4U |

	       _PAGE_SZBITS_4U),

	       _PAGE_SZBITS_4U | _PAGE_SPECIAL),

	  "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V |

	  "i" (_PAGE_PADDR_4V | _PAGE_MODIFIED_4V | _PAGE_ACCESSED_4V |

	       _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V | _PAGE_PRESENT_4V |

	       _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_E_4V | _PAGE_PRESENT_4V |

	       _PAGE_SZBITS_4V));

	       _PAGE_SZBITS_4V | _PAGE_SPECIAL));





	return __pte((pte_val(pte) & mask) | (pgprot_val(prot) & ~mask));

	return __pte((pte_val(pte) & mask) | (pgprot_val(prot) & ~mask));

}

}
@@ -502,6 +508,7 @@ static inline pte_t pte_mkyoung(pte_t pte) 




static inline pte_t pte_mkspecial(pte_t pte)

static inline pte_t pte_mkspecial(pte_t pte)

{

{

	pte_val(pte) |= _PAGE_SPECIAL;

	return pte;

	return pte;

}

}
@@ -607,9 +614,9 @@ static inline unsigned long pte_present(pte_t pte) 
	return val;

	return val;

}

}





static inline int pte_special(pte_t pte)

static inline unsigned long pte_special(pte_t pte)

{

{

	return 0;

	return pte_val(pte) & _PAGE_SPECIAL;

}

}





#define pmd_set(pmdp, ptep)	\

#define pmd_set(pmdp, ptep)	\