sparc: remove CONFIG_SUN4

While doing some easy cleanups on the sparc code I noticed that the
CONFIG_SUN4 code seems to be worse than the rest - there were some
"I don't know how it should work, but the current code definitely cannot
work." places.

And while I have seen people running Linux on machines like a
SPARCstation 5 a few years ago I don't recall having seen sun4
machines, even less ones running Linux.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 47 insertions, 210 deletions

diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
index 109c8b22cb38..ea88955d97ff 100644
--- a/arch/sparc/mm/Makefile
+++ b/arch/sparc/mm/Makefile
@@ -3,13 +3,8 @@
 
 EXTRA_AFLAGS := -ansi
 
-obj-y    := fault.o init.o loadmmu.o generic.o extable.o btfixup.o
-
-ifeq ($(CONFIG_SUN4),y)
-obj-y    += nosrmmu.o
-else
-obj-y    += srmmu.o iommu.o io-unit.o hypersparc.o viking.o tsunami.o swift.o
-endif
+obj-y   := fault.o init.o loadmmu.o generic.o extable.o btfixup.o \
+            srmmu.o iommu.o io-unit.o hypersparc.o viking.o tsunami.o swift.o
 
 ifdef CONFIG_HIGHMEM
 obj-y   += highmem.o
diff --git a/arch/sparc/mm/btfixup.c b/arch/sparc/mm/btfixup.c
index a312d127d47a..5175ac2f4820 100644
--- a/arch/sparc/mm/btfixup.c
+++ b/arch/sparc/mm/btfixup.c
@@ -20,11 +20,7 @@
 
 extern char *srmmu_name;
 static char version[] __initdata = "Boot time fixup v1.6. 4/Mar/98 Jakub Jelinek (jj@ultra.linux.cz). Patching kernel for ";
-#ifdef CONFIG_SUN4
-static char str_sun4c[] __initdata = "sun4\n";
-#else
 static char str_sun4c[] __initdata = "sun4c\n";
-#endif
 static char str_srmmu[] __initdata = "srmmu[%s]/";
 static char str_iommu[] __initdata = "iommu\n";
 static char str_iounit[] __initdata = "io-unit\n";
@@ -86,7 +82,7 @@ void __init btfixup(void)
         if (!visited) {
                 visited++;
                 printk(version);
-                if (ARCH_SUN4C_SUN4)
+                if (ARCH_SUN4C)
                         printk(str_sun4c);
                 else {
                         printk(str_srmmu, srmmu_name);
diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c
index 3604c2e86709..a507e1174662 100644
--- a/arch/sparc/mm/fault.c
+++ b/arch/sparc/mm/fault.c
@@ -191,7 +191,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
          * only copy the information from the master page table,
          * nothing more.
          */
-        if (!ARCH_SUN4C_SUN4 && address >= TASK_SIZE)
+        if (!ARCH_SUN4C && address >= TASK_SIZE)
                 goto vmalloc_fault;
 
         info.si_code = SEGV_MAPERR;
diff --git a/arch/sparc/mm/nosrmmu.c b/arch/sparc/mm/nosrmmu.c
deleted file mode 100644
index 4f061bb6ce78..000000000000
--- a/arch/sparc/mm/nosrmmu.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * nosrmmu.c: This file is a bunch of dummies for sun4 compiles, 
- *         so that it does not need srmmu and avoid ifdefs.
- *
- * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
- */
-
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <asm/mbus.h>
-
-static char shouldnothappen[] __initdata = "SUN4 kernel can only run on SUN4\n";
-
-enum mbus_module srmmu_modtype;
-void *srmmu_nocache_pool;
-
-int vac_cache_size = 0;
-
-static void __init should_not_happen(void)
-{
-        prom_printf(shouldnothappen);
-        prom_halt();
-}
-
-void __init srmmu_frob_mem_map(unsigned long start_mem)
-{
-        should_not_happen();
-}
-
-unsigned long __init srmmu_paging_init(unsigned long start_mem, unsigned long end_mem)
-{
-        should_not_happen();
-        return 0;
-}
-
-void __init ld_mmu_srmmu(void)
-{
-        should_not_happen();
-}
-
-void srmmu_mapioaddr(unsigned long physaddr, unsigned long virt_addr, int bus_type, int rdonly)
-{
-}
-
-void srmmu_unmapioaddr(unsigned long virt_addr)
-{
-}
-
-__u32 iounit_map_dma_init(struct sbus_bus *sbus, int size)
-{
-        return 0;
-}
-
-__u32 iounit_map_dma_page(__u32 vaddr, void *addr, struct sbus_bus *sbus)
-{
-        return 0;
-}
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index f289e7ce902e..95070a1e1b7b 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -31,7 +31,6 @@
 #include <asm/oplib.h>
 #include <asm/openprom.h>
 #include <asm/mmu_context.h>
-#include <asm/sun4paddr.h>
 #include <asm/highmem.h>
 #include <asm/btfixup.h>
 #include <asm/cacheflush.h>
@@ -52,15 +51,11 @@ extern int num_segmaps, num_contexts;
 
 extern unsigned long page_kernel;
 
-#ifdef CONFIG_SUN4
-#define SUN4C_VAC_SIZE sun4c_vacinfo.num_bytes
-#else
 /* That's it, we prom_halt() on sun4c if the cache size is something other than 65536.
  * So let's save some cycles and just use that everywhere except for that bootup
  * sanity check.
  */
 #define SUN4C_VAC_SIZE 65536
-#endif
 
 #define SUN4C_KERNEL_BUCKETS 32
 
@@ -285,75 +280,32 @@ void __init sun4c_probe_vac(void)
 {
         sun4c_disable_vac();
 
-        if (ARCH_SUN4) {
-                switch (idprom->id_machtype) {
-
-                case (SM_SUN4|SM_4_110):
-                        sun4c_vacinfo.type = VAC_NONE;
-                        sun4c_vacinfo.num_bytes = 0;
-                        sun4c_vacinfo.linesize = 0;
-                        sun4c_vacinfo.do_hwflushes = 0;
-                        prom_printf("No VAC. Get some bucks and buy a real computer.");
-                        prom_halt();
-                        break;
-
-                case (SM_SUN4|SM_4_260):
-                        sun4c_vacinfo.type = VAC_WRITE_BACK;
-                        sun4c_vacinfo.num_bytes = 128 * 1024;
-                        sun4c_vacinfo.linesize = 16;
-                        sun4c_vacinfo.do_hwflushes = 0;
-                        break;
-
-                case (SM_SUN4|SM_4_330):
-                        sun4c_vacinfo.type = VAC_WRITE_THROUGH;
-                        sun4c_vacinfo.num_bytes = 128 * 1024;
-                        sun4c_vacinfo.linesize = 16;
-                        sun4c_vacinfo.do_hwflushes = 0;
-                        break;
-
-                case (SM_SUN4|SM_4_470):
-                        sun4c_vacinfo.type = VAC_WRITE_BACK;
-                        sun4c_vacinfo.num_bytes = 128 * 1024;
-                        sun4c_vacinfo.linesize = 32;
-                        sun4c_vacinfo.do_hwflushes = 0;
-                        break;
-
-                default:
-                        prom_printf("Cannot initialize VAC - weird sun4 model idprom->id_machtype = %d", idprom->id_machtype);
-                        prom_halt();
-                };
+        if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS1)) ||
+            (idprom->id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {
+                /* PROM on SS1 lacks this info, to be super safe we
+                 * hard code it here since this arch is cast in stone.
+                 */
+                sun4c_vacinfo.num_bytes = 65536;
+                sun4c_vacinfo.linesize = 16;
         } else {
-                sun4c_vacinfo.type = VAC_WRITE_THROUGH;
+                sun4c_vacinfo.num_bytes =
+                 prom_getintdefault(prom_root_node, "vac-size", 65536);
+                sun4c_vacinfo.linesize =
+                 prom_getintdefault(prom_root_node, "vac-linesize", 16);
+        }
+        sun4c_vacinfo.do_hwflushes =
+         prom_getintdefault(prom_root_node, "vac-hwflush", 0);
 
-                if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS1)) ||
-                    (idprom->id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {
-                        /* PROM on SS1 lacks this info, to be super safe we
-                         * hard code it here since this arch is cast in stone.
-                         */
-                        sun4c_vacinfo.num_bytes = 65536;
-                        sun4c_vacinfo.linesize = 16;
-                } else {
-                        sun4c_vacinfo.num_bytes =
-                         prom_getintdefault(prom_root_node, "vac-size", 65536);
-                        sun4c_vacinfo.linesize =
-                         prom_getintdefault(prom_root_node, "vac-linesize", 16);
-                }
+        if (sun4c_vacinfo.do_hwflushes == 0)
                 sun4c_vacinfo.do_hwflushes =
-                 prom_getintdefault(prom_root_node, "vac-hwflush", 0);
-
-                if (sun4c_vacinfo.do_hwflushes == 0)
-                        sun4c_vacinfo.do_hwflushes =
-                         prom_getintdefault(prom_root_node, "vac_hwflush", 0);
+                 prom_getintdefault(prom_root_node, "vac_hwflush", 0);
 
-                if (sun4c_vacinfo.num_bytes != 65536) {
-                        prom_printf("WEIRD Sun4C VAC cache size, "
-                                    "tell sparclinux@vger.kernel.org");
-                        prom_halt();
-                }
+        if (sun4c_vacinfo.num_bytes != 65536) {
+                prom_printf("WEIRD Sun4C VAC cache size, "
+                            "tell sparclinux@vger.kernel.org");
+                prom_halt();
         }
 
-        sun4c_vacinfo.num_lines =
-                (sun4c_vacinfo.num_bytes / sun4c_vacinfo.linesize);
         switch (sun4c_vacinfo.linesize) {
         case 16:
                 sun4c_vacinfo.log2lsize = 4;
@@ -447,49 +399,18 @@ static void __init patch_kernel_fault_handler(void)
 
 static void __init sun4c_probe_mmu(void)
 {
-        if (ARCH_SUN4) {
-                switch (idprom->id_machtype) {
-                case (SM_SUN4|SM_4_110):
-                        prom_printf("No support for 4100 yet\n");
-                        prom_halt();
-                        num_segmaps = 256;
-                        num_contexts = 8;
-                        break;
-
-                case (SM_SUN4|SM_4_260):
-                        /* should be 512 segmaps. when it get fixed */
-                        num_segmaps = 256;
-                        num_contexts = 16;
-                        break;
-
-                case (SM_SUN4|SM_4_330):
-                        num_segmaps = 256;
-                        num_contexts = 16;
-                        break;
-
-                case (SM_SUN4|SM_4_470):
-                        /* should be 1024 segmaps. when it get fixed */
-                        num_segmaps = 256;
-                        num_contexts = 64;
-                        break;
-                default:
-                        prom_printf("Invalid SUN4 model\n");
-                        prom_halt();
-                };
+        if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS1)) ||
+            (idprom->id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {
+                /* Hardcode these just to be safe, PROM on SS1 does
+                * not have this info available in the root node.
+                */
+                num_segmaps = 128;
+                num_contexts = 8;
         } else {
-                if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS1)) ||
-                    (idprom->id_machtype == (SM_SUN4C | SM_4C_SS1PLUS))) {
-                        /* Hardcode these just to be safe, PROM on SS1 does
-                        * not have this info available in the root node.
-                        */
-                        num_segmaps = 128;
-                        num_contexts = 8;
-                } else {
-                        num_segmaps =
-                            prom_getintdefault(prom_root_node, "mmu-npmg", 128);
-                        num_contexts =
-                            prom_getintdefault(prom_root_node, "mmu-nctx", 0x8);
-                }
+                num_segmaps =
+                    prom_getintdefault(prom_root_node, "mmu-npmg", 128);
+                num_contexts =
+                    prom_getintdefault(prom_root_node, "mmu-nctx", 0x8);
         }
         patch_kernel_fault_handler();
 }
@@ -501,18 +422,14 @@ void __init sun4c_probe_memerr_reg(void)
         int node;
         struct linux_prom_registers regs[1];
 
-        if (ARCH_SUN4) {
-                sun4c_memerr_reg = ioremap(sun4_memreg_physaddr, PAGE_SIZE);
-        } else {
-                node = prom_getchild(prom_root_node);
-                node = prom_searchsiblings(prom_root_node, "memory-error");
-                if (!node)
-                        return;
-                if (prom_getproperty(node, "reg", (char *)regs, sizeof(regs)) <= 0)
-                        return;
-                /* hmm I think regs[0].which_io is zero here anyways */
-                sun4c_memerr_reg = ioremap(regs[0].phys_addr, regs[0].reg_size);
-        }
+        node = prom_getchild(prom_root_node);
+        node = prom_searchsiblings(prom_root_node, "memory-error");
+        if (!node)
+                return;
+        if (prom_getproperty(node, "reg", (char *)regs, sizeof(regs)) <= 0)
+                return;
+        /* hmm I think regs[0].which_io is zero here anyways */
+        sun4c_memerr_reg = ioremap(regs[0].phys_addr, regs[0].reg_size);
 }
 
 static inline void sun4c_init_ss2_cache_bug(void)
@@ -521,7 +438,6 @@ static inline void sun4c_init_ss2_cache_bug(void)
 
         if ((idprom->id_machtype == (SM_SUN4C | SM_4C_SS2)) ||
             (idprom->id_machtype == (SM_SUN4C | SM_4C_IPX)) ||
-            (idprom->id_machtype == (SM_SUN4 | SM_4_330)) ||
             (idprom->id_machtype == (SM_SUN4C | SM_4C_ELC))) {
                 /* Whee.. */
                 printk("SS2 cache bug detected, uncaching trap table page\n");
@@ -617,11 +533,7 @@ static inline void sun4c_init_map_kernelprom(unsigned long kernel_end)
 {
         unsigned long vaddr;
         unsigned char pseg, ctx;
-#ifdef CONFIG_SUN4
-        /* sun4/110 and 260 have no kadb. */
-        if ((idprom->id_machtype != (SM_SUN4 | SM_4_260)) && 
-            (idprom->id_machtype != (SM_SUN4 | SM_4_110))) {
-#endif
+
         for (vaddr = KADB_DEBUGGER_BEGVM;
              vaddr < LINUX_OPPROM_ENDVM;
              vaddr += SUN4C_REAL_PGDIR_SIZE) {
@@ -633,9 +545,7 @@ static inline void sun4c_init_map_kernelprom(unsigned long kernel_end)
                         fix_permissions(vaddr, _SUN4C_PAGE_PRIV, 0);
                 }
         }
-#ifdef CONFIG_SUN4
-        }
-#endif
+
         for (vaddr = KERNBASE; vaddr < kernel_end; vaddr += SUN4C_REAL_PGDIR_SIZE) {
                 pseg = sun4c_get_segmap(vaddr);
                 mmu_entry_pool[pseg].locked = 1;
@@ -1041,14 +951,10 @@ static struct thread_info *sun4c_alloc_thread_info(void)
          * so we must flush the cache to guarantee consistency.
          */
         sun4c_flush_page(pages);
-#ifndef CONFIG_SUN4     
         sun4c_flush_page(pages + PAGE_SIZE);
-#endif
 
         sun4c_put_pte(addr, BUCKET_PTE(pages));
-#ifndef CONFIG_SUN4     
         sun4c_put_pte(addr + PAGE_SIZE, BUCKET_PTE(pages + PAGE_SIZE));
-#endif
 
 #ifdef CONFIG_DEBUG_STACK_USAGE
         memset((void *)addr, 0, PAGE_SIZE << THREAD_INFO_ORDER);
@@ -1065,13 +971,11 @@ static void sun4c_free_thread_info(struct thread_info *ti)
 
         /* We are deleting a mapping, so the flush here is mandatory. */
         sun4c_flush_page(tiaddr);
-#ifndef CONFIG_SUN4     
         sun4c_flush_page(tiaddr + PAGE_SIZE);
-#endif
+
         sun4c_put_pte(tiaddr, 0);
-#ifndef CONFIG_SUN4     
         sun4c_put_pte(tiaddr + PAGE_SIZE, 0);
-#endif
+
         sun4c_bucket[entry] = BUCKET_EMPTY;
         if (entry < sun4c_lowbucket_avail)
                 sun4c_lowbucket_avail = entry;