sparc,sparc64: unify kernel/

o Move all files from sparc64/kernel/ to sparc/kernel
  - rename as appropriate
o Update sparc/Makefile to the changes
o Update sparc/kernel/Makefile to include the sparc64 files

NOTE: This commit changes link order on sparc64!

Link order had to change for either of sparc32 and sparc64.
And assuming sparc64 see more testing than sparc32 change link
order on sparc64 where issues will be caught faster.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 213 insertions, 0 deletions

diff --git a/arch/sparc/kernel/module_64.c b/arch/sparc/kernel/module_64.c
new file mode 100644
index 000000000000..158484bf5999
--- /dev/null
+++ b/arch/sparc/kernel/module_64.c
@@ -0,0 +1,213 @@
+/* Kernel module help for sparc64.
+ *
+ * Copyright (C) 2001 Rusty Russell.
+ * Copyright (C) 2002 David S. Miller.
+ */
+
+#include <linux/moduleloader.h>
+#include <linux/kernel.h>
+#include <linux/elf.h>
+#include <linux/vmalloc.h>
+#include <linux/fs.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/mm.h>
+
+#include <asm/processor.h>
+#include <asm/spitfire.h>
+
+static void *module_map(unsigned long size)
+{
+        struct vm_struct *area;
+
+        size = PAGE_ALIGN(size);
+        if (!size || size > MODULES_LEN)
+                return NULL;
+
+        area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);
+        if (!area)
+                return NULL;
+
+        return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
+}
+
+void *module_alloc(unsigned long size)
+{
+        void *ret;
+
+        /* We handle the zero case fine, unlike vmalloc */
+        if (size == 0)
+                return NULL;
+
+        ret = module_map(size);
+        if (!ret)
+                ret = ERR_PTR(-ENOMEM);
+        else
+                memset(ret, 0, size);
+
+        return ret;
+}
+
+/* Free memory returned from module_core_alloc/module_init_alloc */
+void module_free(struct module *mod, void *module_region)
+{
+        vfree(module_region);
+        /* FIXME: If module_region == mod->init_region, trim exception
+           table entries. */
+}
+
+/* Make generic code ignore STT_REGISTER dummy undefined symbols.  */
+int module_frob_arch_sections(Elf_Ehdr *hdr,
+                              Elf_Shdr *sechdrs,
+                              char *secstrings,
+                              struct module *mod)
+{
+        unsigned int symidx;
+        Elf64_Sym *sym;
+        const char *strtab;
+        int i;
+
+        for (symidx = 0; sechdrs[symidx].sh_type != SHT_SYMTAB; symidx++) {
+                if (symidx == hdr->e_shnum-1) {
+                        printk("%s: no symtab found.\n", mod->name);
+                        return -ENOEXEC;
+                }
+        }
+        sym = (Elf64_Sym *)sechdrs[symidx].sh_addr;
+        strtab = (char *)sechdrs[sechdrs[symidx].sh_link].sh_addr;
+
+        for (i = 1; i < sechdrs[symidx].sh_size / sizeof(Elf_Sym); i++) {
+                if (sym[i].st_shndx == SHN_UNDEF &&
+                    ELF64_ST_TYPE(sym[i].st_info) == STT_REGISTER)
+                        sym[i].st_shndx = SHN_ABS;
+        }
+        return 0;
+}
+
+int apply_relocate(Elf64_Shdr *sechdrs,
+                   const char *strtab,
+                   unsigned int symindex,
+                   unsigned int relsec,
+                   struct module *me)
+{
+        printk(KERN_ERR "module %s: non-ADD RELOCATION unsupported\n",
+               me->name);
+        return -ENOEXEC;
+}
+
+int apply_relocate_add(Elf64_Shdr *sechdrs,
+                       const char *strtab,
+                       unsigned int symindex,
+                       unsigned int relsec,
+                       struct module *me)
+{
+        unsigned int i;
+        Elf64_Rela *rel = (void *)sechdrs[relsec].sh_addr;
+        Elf64_Sym *sym;
+        u8 *location;
+        u32 *loc32;
+
+        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
+                Elf64_Addr v;
+
+                /* This is where to make the change */
+                location = (u8 *)sechdrs[sechdrs[relsec].sh_info].sh_addr
+                        + rel[i].r_offset;
+                loc32 = (u32 *) location;
+
+                BUG_ON(((u64)location >> (u64)32) != (u64)0);
+
+                /* This is the symbol it is referring to.  Note that all
+                   undefined symbols have been resolved.  */
+                sym = (Elf64_Sym *)sechdrs[symindex].sh_addr
+                        + ELF64_R_SYM(rel[i].r_info);
+                v = sym->st_value + rel[i].r_addend;
+
+                switch (ELF64_R_TYPE(rel[i].r_info) & 0xff) {
+                case R_SPARC_64:
+                        location[0] = v >> 56;
+                        location[1] = v >> 48;
+                        location[2] = v >> 40;
+                        location[3] = v >> 32;
+                        location[4] = v >> 24;
+                        location[5] = v >> 16;
+                        location[6] = v >>  8;
+                        location[7] = v >>  0;
+                        break;
+
+                case R_SPARC_32:
+                        location[0] = v >> 24;
+                        location[1] = v >> 16;
+                        location[2] = v >>  8;
+                        location[3] = v >>  0;
+                        break;
+
+                case R_SPARC_DISP32:
+                        v -= (Elf64_Addr) location;
+                        *loc32 = v;
+                        break;
+
+                case R_SPARC_WDISP30:
+                        v -= (Elf64_Addr) location;
+                        *loc32 = (*loc32 & ~0x3fffffff) |
+                                ((v >> 2) & 0x3fffffff);
+                        break;
+
+                case R_SPARC_WDISP22:
+                        v -= (Elf64_Addr) location;
+                        *loc32 = (*loc32 & ~0x3fffff) |
+                                ((v >> 2) & 0x3fffff);
+                        break;
+
+                case R_SPARC_WDISP19:
+                        v -= (Elf64_Addr) location;
+                        *loc32 = (*loc32 & ~0x7ffff) |
+                                ((v >> 2) & 0x7ffff);
+                        break;
+
+                case R_SPARC_LO10:
+                        *loc32 = (*loc32 & ~0x3ff) | (v & 0x3ff);
+                        break;
+
+                case R_SPARC_HI22:
+                        *loc32 = (*loc32 & ~0x3fffff) |
+                                ((v >> 10) & 0x3fffff);
+                        break;
+
+                case R_SPARC_OLO10:
+                        *loc32 = (*loc32 & ~0x1fff) |
+                                (((v & 0x3ff) +
+                                  (ELF64_R_TYPE(rel[i].r_info) >> 8))
+                                 & 0x1fff);
+                        break;
+
+                default:
+                        printk(KERN_ERR "module %s: Unknown relocation: %x\n",
+                               me->name,
+                               (int) (ELF64_R_TYPE(rel[i].r_info) & 0xff));
+                        return -ENOEXEC;
+                };
+        }
+        return 0;
+}
+
+int module_finalize(const Elf_Ehdr *hdr,
+                    const Elf_Shdr *sechdrs,
+                    struct module *me)
+{
+        /* Cheetah's I-cache is fully coherent.  */
+        if (tlb_type == spitfire) {
+                unsigned long va;
+
+                flushw_all();
+                for (va =  0; va < (PAGE_SIZE << 1); va += 32)
+                        spitfire_put_icache_tag(va, 0x0);
+                __asm__ __volatile__("flush %g6");
+        }
+
+        return 0;
+}
+
+void module_arch_cleanup(struct module *mod)
+{
+}