Patchwork sparc32: remove unused file: include/asm/pgtsun4.h

login
register
mail settings
Submitter Sam Ravnborg
Date Dec. 30, 2011, 12:35 p.m.
Message ID <20111230123521.GA4478@merkur.ravnborg.org>
Download mbox | patch
Permalink /patch/133640/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sam Ravnborg - Dec. 30, 2011, 12:35 p.m.
From d1b5b3bdc351b423e2e9ca24ded8cbabf61e4474 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 30 Dec 2011 13:32:16 +0100
Subject: [PATCH] sparc32: remove unused file: include/asm/pgtsun4.h

sun4 is no longer supported and this file is unused.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
 arch/sparc/include/asm/pgtsun4.h |  171 --------------------------------------
 1 files changed, 0 insertions(+), 171 deletions(-)
 delete mode 100644 arch/sparc/include/asm/pgtsun4.h
Julian Calaby - Dec. 30, 2011, 12:44 p.m.
Sam,

I understand if this isn't used at all, but this seems to be Sun4C
stuff, so why isn't it used - are these defines defined elsewhere?
(I'd look myself, but I'm not at home)

Thanks,

Julian Calaby

On Fri, Dec 30, 2011 at 23:35, Sam Ravnborg <sam@ravnborg.org> wrote:
> From d1b5b3bdc351b423e2e9ca24ded8cbabf61e4474 Mon Sep 17 00:00:00 2001
> From: Sam Ravnborg <sam@ravnborg.org>
> Date: Fri, 30 Dec 2011 13:32:16 +0100
> Subject: [PATCH] sparc32: remove unused file: include/asm/pgtsun4.h
>
> sun4 is no longer supported and this file is unused.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> ---
>  arch/sparc/include/asm/pgtsun4.h |  171 --------------------------------------
>  1 files changed, 0 insertions(+), 171 deletions(-)
>  delete mode 100644 arch/sparc/include/asm/pgtsun4.h
Sam Ravnborg - Dec. 30, 2011, 2:10 p.m.
On Fri, Dec 30, 2011 at 11:44:28PM +1100, Julian Calaby wrote:
> Sam,
> 
> I understand if this isn't used at all, but this seems to be Sun4C
> stuff, so why isn't it used - are these defines defined elsewhere?

The SUN4C stuff is defined in arch/sparc/include/asm/pgtsun4c.h

	Sam
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sam Ravnborg - Dec. 30, 2011, 2:16 p.m.
On Fri, Dec 30, 2011 at 03:10:33PM +0100, Sam Ravnborg wrote:
> On Fri, Dec 30, 2011 at 11:44:28PM +1100, Julian Calaby wrote:
> > Sam,
> > 
> > I understand if this isn't used at all, but this seems to be Sun4C
> > stuff, so why isn't it used - are these defines defined elsewhere?
> 
> The SUN4C stuff is defined in arch/sparc/include/asm/pgtsun4c.h

The diff between pgtsun.h and pgtsun4c.h is very small.
The relevant part of the diff is below:

@@ -9,10 +10,10 @@
 #include <asm/contregs.h>

 /* PMD_SHIFT determines the size of the area a second-level page table can map */
-#define SUN4C_PMD_SHIFT       22
+#define SUN4C_PMD_SHIFT       23

 /* PGDIR_SHIFT determines what a third-level page table entry can map */
-#define SUN4C_PGDIR_SHIFT       22
+#define SUN4C_PGDIR_SHIFT       23
 #define SUN4C_PGDIR_SIZE        (1UL << SUN4C_PGDIR_SHIFT)
 #define SUN4C_PGDIR_MASK        (~(SUN4C_PGDIR_SIZE-1))
 #define SUN4C_PGDIR_ALIGN(addr) (((addr)+SUN4C_PGDIR_SIZE-1)&SUN4C_PGDIR_MASK)
@@ -23,9 +24,9 @@
 #define SUN4C_REAL_PGDIR_MASK        (~(SUN4C_REAL_PGDIR_SIZE-1))
 #define SUN4C_REAL_PGDIR_ALIGN(addr) (((addr)+SUN4C_REAL_PGDIR_SIZE-1)&SUN4C_REAL_PGDIR_MASK)

-/* 16 bit PFN on sun4c */
-#define SUN4C_PFN_MASK 0xffff
-
+/* 19 bit PFN on sun4 */
+#define SUN4C_PFN_MASK 0x7ffff
+
 /* Don't increase these unless the structures in sun4c.c are fixed */
 #define SUN4C_MAX_SEGMAPS 256
 #define SUN4C_MAX_CONTEXTS 16


I stripped aways the parts which was in comments and white-space only.

	Sam
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Dec. 30, 2011, 6:29 p.m.
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 30 Dec 2011 13:35:21 +0100

>>From d1b5b3bdc351b423e2e9ca24ded8cbabf61e4474 Mon Sep 17 00:00:00 2001
> From: Sam Ravnborg <sam@ravnborg.org>
> Date: Fri, 30 Dec 2011 13:32:16 +0100
> Subject: [PATCH] sparc32: remove unused file: include/asm/pgtsun4.h
> 
> sun4 is no longer supported and this file is unused.
> 
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julian Calaby - Dec. 30, 2011, 10:47 p.m.
Hi Sam,

On Sat, Dec 31, 2011 at 01:16, Sam Ravnborg <sam@ravnborg.org> wrote:
> On Fri, Dec 30, 2011 at 03:10:33PM +0100, Sam Ravnborg wrote:
>> On Fri, Dec 30, 2011 at 11:44:28PM +1100, Julian Calaby wrote:
>> > Sam,
>> >
>> > I understand if this isn't used at all, but this seems to be Sun4C
>> > stuff, so why isn't it used - are these defines defined elsewhere?
>>
>> The SUN4C stuff is defined in arch/sparc/include/asm/pgtsun4c.h
>
> The diff between pgtsun.h and pgtsun4c.h is very small.
> The relevant part of the diff is below:
>
> @@ -9,10 +10,10 @@
>  #include <asm/contregs.h>
>
>  /* PMD_SHIFT determines the size of the area a second-level page table can map */
> -#define SUN4C_PMD_SHIFT       22
> +#define SUN4C_PMD_SHIFT       23
>
>  /* PGDIR_SHIFT determines what a third-level page table entry can map */
> -#define SUN4C_PGDIR_SHIFT       22
> +#define SUN4C_PGDIR_SHIFT       23
>  #define SUN4C_PGDIR_SIZE        (1UL << SUN4C_PGDIR_SHIFT)
>  #define SUN4C_PGDIR_MASK        (~(SUN4C_PGDIR_SIZE-1))
>  #define SUN4C_PGDIR_ALIGN(addr) (((addr)+SUN4C_PGDIR_SIZE-1)&SUN4C_PGDIR_MASK)
> @@ -23,9 +24,9 @@
>  #define SUN4C_REAL_PGDIR_MASK        (~(SUN4C_REAL_PGDIR_SIZE-1))
>  #define SUN4C_REAL_PGDIR_ALIGN(addr) (((addr)+SUN4C_REAL_PGDIR_SIZE-1)&SUN4C_REAL_PGDIR_MASK)
>
> -/* 16 bit PFN on sun4c */
> -#define SUN4C_PFN_MASK 0xffff
> -
> +/* 19 bit PFN on sun4 */
> +#define SUN4C_PFN_MASK 0x7ffff
> +
>  /* Don't increase these unless the structures in sun4c.c are fixed */
>  #define SUN4C_MAX_SEGMAPS 256
>  #define SUN4C_MAX_CONTEXTS 16
>
>
> I stripped aways the parts which was in comments and white-space only.

Ok, that makes sense then.

Thanks!

Patch

diff --git a/arch/sparc/include/asm/pgtsun4.h b/arch/sparc/include/asm/pgtsun4.h
deleted file mode 100644
index 5a0d661..0000000
--- a/arch/sparc/include/asm/pgtsun4.h
+++ /dev/null
@@ -1,171 +0,0 @@ 
-/*
- * pgtsun4.h:  Sun4 specific pgtable.h defines and code.
- *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
- */
-#ifndef _SPARC_PGTSUN4C_H
-#define _SPARC_PGTSUN4C_H
-
-#include <asm/contregs.h>
-
-/* PMD_SHIFT determines the size of the area a second-level page table can map */
-#define SUN4C_PMD_SHIFT       23
-
-/* PGDIR_SHIFT determines what a third-level page table entry can map */
-#define SUN4C_PGDIR_SHIFT       23
-#define SUN4C_PGDIR_SIZE        (1UL << SUN4C_PGDIR_SHIFT)
-#define SUN4C_PGDIR_MASK        (~(SUN4C_PGDIR_SIZE-1))
-#define SUN4C_PGDIR_ALIGN(addr) (((addr)+SUN4C_PGDIR_SIZE-1)&SUN4C_PGDIR_MASK)
-
-/* To represent how the sun4c mmu really lays things out. */
-#define SUN4C_REAL_PGDIR_SHIFT       18
-#define SUN4C_REAL_PGDIR_SIZE        (1UL << SUN4C_REAL_PGDIR_SHIFT)
-#define SUN4C_REAL_PGDIR_MASK        (~(SUN4C_REAL_PGDIR_SIZE-1))
-#define SUN4C_REAL_PGDIR_ALIGN(addr) (((addr)+SUN4C_REAL_PGDIR_SIZE-1)&SUN4C_REAL_PGDIR_MASK)
-
-/* 19 bit PFN on sun4 */
-#define SUN4C_PFN_MASK 0x7ffff
- 
-/* Don't increase these unless the structures in sun4c.c are fixed */
-#define SUN4C_MAX_SEGMAPS 256
-#define SUN4C_MAX_CONTEXTS 16
-
-/*
- * To be efficient, and not have to worry about allocating such
- * a huge pgd, we make the kernel sun4c tables each hold 1024
- * entries and the pgd similarly just like the i386 tables.
- */
-#define SUN4C_PTRS_PER_PTE    1024
-#define SUN4C_PTRS_PER_PMD    1
-#define SUN4C_PTRS_PER_PGD    1024
-
-/*
- * Sparc SUN4C pte fields.
- */
-#define _SUN4C_PAGE_VALID        0x80000000
-#define _SUN4C_PAGE_SILENT_READ  0x80000000   /* synonym */
-#define _SUN4C_PAGE_DIRTY        0x40000000
-#define _SUN4C_PAGE_SILENT_WRITE 0x40000000   /* synonym */
-#define _SUN4C_PAGE_PRIV         0x20000000   /* privileged page */
-#define _SUN4C_PAGE_NOCACHE      0x10000000   /* non-cacheable page */
-#define _SUN4C_PAGE_PRESENT      0x08000000   /* implemented in software */
-#define _SUN4C_PAGE_IO           0x04000000   /* I/O page */
-#define _SUN4C_PAGE_FILE         0x02000000   /* implemented in software */
-#define _SUN4C_PAGE_READ         0x00800000   /* implemented in software */
-#define _SUN4C_PAGE_WRITE        0x00400000   /* implemented in software */
-#define _SUN4C_PAGE_ACCESSED     0x00200000   /* implemented in software */
-#define _SUN4C_PAGE_MODIFIED     0x00100000   /* implemented in software */
-
-#define _SUN4C_READABLE		(_SUN4C_PAGE_READ|_SUN4C_PAGE_SILENT_READ|\
-				 _SUN4C_PAGE_ACCESSED)
-#define _SUN4C_WRITEABLE	(_SUN4C_PAGE_WRITE|_SUN4C_PAGE_SILENT_WRITE|\
-				 _SUN4C_PAGE_MODIFIED)
-
-#define _SUN4C_PAGE_CHG_MASK	(0xffff|_SUN4C_PAGE_ACCESSED|_SUN4C_PAGE_MODIFIED)
-
-#define SUN4C_PAGE_NONE		__pgprot(_SUN4C_PAGE_PRESENT)
-#define SUN4C_PAGE_SHARED	__pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE|\
-					 _SUN4C_PAGE_WRITE)
-#define SUN4C_PAGE_COPY		__pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE)
-#define SUN4C_PAGE_READONLY	__pgprot(_SUN4C_PAGE_PRESENT|_SUN4C_READABLE)
-#define SUN4C_PAGE_KERNEL	__pgprot(_SUN4C_READABLE|_SUN4C_WRITEABLE|\
-					 _SUN4C_PAGE_DIRTY|_SUN4C_PAGE_PRIV)
-
-/* SUN4C swap entry encoding
- *
- * We use 5 bits for the type and 19 for the offset.  This gives us
- * 32 swapfiles of 4GB each.  Encoding looks like:
- *
- * RRRRRRRRooooooooooooooooooottttt
- * fedcba9876543210fedcba9876543210
- *
- * The top 8 bits are reserved for protection and status bits, especially
- * FILE and PRESENT.
- */
-#define SUN4C_SWP_TYPE_MASK	0x1f
-#define SUN4C_SWP_OFF_MASK	0x7ffff
-#define SUN4C_SWP_OFF_SHIFT	5
-
-#ifndef __ASSEMBLY__
-
-static inline unsigned long sun4c_get_synchronous_error(void)
-{
-	unsigned long sync_err;
-
-	__asm__ __volatile__("lda [%1] %2, %0\n\t" :
-			     "=r" (sync_err) :
-			     "r" (AC_SYNC_ERR), "i" (ASI_CONTROL));
-	return sync_err;
-}
-
-static inline unsigned long sun4c_get_synchronous_address(void)
-{
-	unsigned long sync_addr;
-
-	__asm__ __volatile__("lda [%1] %2, %0\n\t" :
-			     "=r" (sync_addr) :
-			     "r" (AC_SYNC_VA), "i" (ASI_CONTROL));
-	return sync_addr;
-}
-
-/* SUN4 pte, segmap, and context manipulation */
-static inline unsigned long sun4c_get_segmap(unsigned long addr)
-{
-  register unsigned long entry;
-
-  __asm__ __volatile__("\n\tlduha [%1] %2, %0\n\t" : 
-		       "=r" (entry) :
-		       "r" (addr), "i" (ASI_SEGMAP));
-  return entry;
-}
-
-static inline void sun4c_put_segmap(unsigned long addr, unsigned long entry)
-{
-  __asm__ __volatile__("\n\tstha %1, [%0] %2; nop; nop; nop;\n\t" : :
-		       "r" (addr), "r" (entry),
-		       "i" (ASI_SEGMAP)
-		       : "memory");
-}
-
-static inline unsigned long sun4c_get_pte(unsigned long addr)
-{
-  register unsigned long entry;
-
-  __asm__ __volatile__("\n\tlda [%1] %2, %0\n\t" : 
-		       "=r" (entry) :
-		       "r" (addr), "i" (ASI_PTE));
-  return entry;
-}
-
-static inline void sun4c_put_pte(unsigned long addr, unsigned long entry)
-{
-  __asm__ __volatile__("\n\tsta %1, [%0] %2; nop; nop; nop;\n\t" : :
-		       "r" (addr), 
-		       "r" ((entry & ~(_SUN4C_PAGE_PRESENT))), "i" (ASI_PTE)
-		       : "memory");
-}
-
-static inline int sun4c_get_context(void)
-{
-  register int ctx;
-
-  __asm__ __volatile__("\n\tlduba [%1] %2, %0\n\t" :
-		       "=r" (ctx) :
-		       "r" (AC_CONTEXT), "i" (ASI_CONTROL));
-
-  return ctx;
-}
-
-static inline int sun4c_set_context(int ctx)
-{
-  __asm__ __volatile__("\n\tstba %0, [%1] %2; nop; nop; nop;\n\t" : :
-		       "r" (ctx), "r" (AC_CONTEXT), "i" (ASI_CONTROL)
-		       : "memory");
-
-  return ctx;
-}
-
-#endif /* !(__ASSEMBLY__) */
-
-#endif /* !(_SPARC_PGTSUN4_H) */