Changeset 12415

Timestamp:

06/30/09 17:02:18 (5 months ago)

Author:

BrainSlayer

Message:

latest adm5120 update incl. remap patch

Files:

• src/linux/adm5120/linux-2.6.23/.config (modified) (2 diffs)
• src/linux/adm5120/linux-2.6.23/.config_full (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/.config_np28g (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/arch/mips/Makefile (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/arch/mips/adm5120/boards/compex.c (modified) (6 diffs)
• src/linux/adm5120/linux-2.6.23/arch/mips/adm5120/proc_gpio.c (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/arch/mips/kernel/module.c (modified) (10 diffs)
• src/linux/adm5120/linux-2.6.23/arch/mips/kernel/scall32-o32.S (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/arch/mips/kernel/vmlinux.lds.S (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/arch/mips/mm/c-r4k.c (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/crypto/api.c (modified) (2 diffs)
• src/linux/adm5120/linux-2.6.23/drivers/net/adm5120sw.c (modified) (5 diffs)
• src/linux/adm5120/linux-2.6.23/include/asm-mips/module.h (modified) (2 diffs)
• src/linux/adm5120/linux-2.6.23/include/asm-mips/string.h (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/kernel/module.c (modified) (1 diff)
• src/linux/adm5120/linux-2.6.23/mm/page_alloc.c (modified) (2 diffs)

src/linux/adm5120/linux-2.6.23/.config

@@ -2 +2 @@
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.24.111
-Mon Apr  6 11:23:59
+Tue Jun 30 13:35:08
-#
-CONFIG_MIPS=y
@@ -686 +686 @@
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
-
+
-# CONFIG_ARCNET is not set
-# CONFIG_PHYLIB is not set

src/linux/adm5120/linux-2.6.23/.config_full

@@ -685 +685 @@
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
-
+
-# CONFIG_ARCNET is not set
-# CONFIG_PHYLIB is not set

src/linux/adm5120/linux-2.6.23/.config_np28g

@@ -685 +685 @@
-# CONFIG_IMQ_BEHAVIOR_BB is not set
-CONFIG_IMQ_NUM_DEVS=2
-
+
-# CONFIG_ARCNET is not set
-# CONFIG_PHYLIB is not set

src/linux/adm5120/linux-2.6.23/arch/mips/Makefile

@@ -84 +84 @@
-cflags-y                        += -msoft-float
-LDFLAGS_vmlinux                 += -G 0 -static -n -nostdlib
-
+no-
-
-cflags-y += -ffreestanding

src/linux/adm5120/linux-2.6.23/arch/mips/adm5120/boards/compex.c

@@ -81 +81 @@
-
-unsigned char wp54_vlans[6] __initdata = {
-00, 0x00, 0x0
+44, 0x48, 0x5
-};
-
@@ -171 +171 @@
-        .board_setup    = wp54_setup,
-        .board_reset    = wp54_reset,
-2
+5
-        .eth_vlans      = wp54_vlans,
-        .num_devices    = ARRAY_SIZE(wp54_devices),
@@ -182 +182 @@
-        .board_setup    = wp54_setup,
-        .board_reset    = wp54_reset,
-2
+5
-        .eth_vlans      = wp54_vlans,
-        .num_devices    = ARRAY_SIZE(wp54_devices),
@@ -193 +193 @@
-        .board_setup    = wp54_wrt_setup,
-        .board_reset    = wp54_reset,
-2
+5
-        .eth_vlans      = wp54_vlans,
-        .num_devices    = ARRAY_SIZE(wp54_devices),
@@ -204 +204 @@
-        .board_setup    = wp54_setup,
-        .board_reset    = wp54_reset,
-2
+5
-        .eth_vlans      = wp54_vlans,
-        .num_devices    = ARRAY_SIZE(wp54_devices),
@@ -215 +215 @@
-        .board_setup    = wp54_setup,
-        .board_reset    = wp54_reset,
-2
-
-
-
-
-
-
+5
+
+
+
+
+
+

src/linux/adm5120/linux-2.6.23/arch/mips/adm5120/proc_gpio.c

@@ -154 +154 @@
-    int gpiocount;
-
-8
+22
-
-    /* create directory gpio */

src/linux/adm5120/linux-2.6.23/arch/mips/kernel/module.c

@@ -30 +30 @@
-#include <linux/module.h>
-#include <linux/spinlock.h>
+#include <linux/mm.h>
-#include <asm/pgtable.h>        /* MODULE_START */
-
@@ -43 +44 @@
-static DEFINE_SPINLOCK(dbe_lock);
-
+static void *alloc_phys(unsigned long size)
+{
+        unsigned order;
+        struct page *page;
+        struct page *p;
+
+        size = PAGE_ALIGN(size);
+        order = get_order(size);
+
+        page = alloc_pages(
+                GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN | __GFP_THISNODE,
+                order);
+        if (!page)
+                return 0;
+
+        split_page(page, order);
+
+        for (p = page + (size >> PAGE_SHIFT); p < page + (1 << order); ++p)
+                __free_page(p);
+
+        return page_address(page);
+}
+
+static void free_phys(void *ptr, unsigned long size)
+{
+        struct page *page;
+        struct page *end;
+
+        page = virt_to_page(ptr);
+        end = page + (PAGE_ALIGN(size) >> PAGE_SHIFT);
+
+        for (; page < end; ++page)
+                __free_pages(page, 0);
+}
+
-void *module_alloc(unsigned long size)
-{
@@ -58 +94 @@
-        return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
-#else
+        unsigned addr;
+        void *ptr;
+
+        size = PAGE_ALIGN(size);
-        if (size == 0)
-                return NULL;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
+}
+
+static inline int is_phys(void *ptr)
+{
+        unsigned addr = (unsigned) ptr;
+        return addr && (addr < VMALLOC_START || addr > VMALLOC_END);
-}
-
@@ -67 +134 @@
-void module_free(struct module *mod, void *module_region)
-{
+        if (is_phys(module_region)) {
+                if (mod->module_init == module_region)
+                        free_phys(module_region, mod->init_size);
+                else if (mod->module_core == module_region)
+                        free_phys(module_region, mod->core_size);
+                else
+                    BUG();
+                return;
+        }
+
-        vfree(module_region);
-        /* FIXME: If module_region == mod->init_region, trim exception
@@ -78 +155 @@
-}
-
+/* Get the potential trampolines size required of the init and
+   non-init sections */
+static unsigned get_plt_size(const Elf32_Ehdr *hdr,
+                             const Elf32_Shdr *sechdrs,
+                             const char *secstrings,
+                             unsigned symindex,
+                             int is_init)
+{
+        unsigned long ret = 0;
+        unsigned i, j;
+        Elf_Sym *syms;
+
+        /* Everything marked ALLOC (this includes the exported symbols) */
+        for (i = 1; i < hdr->e_shnum; ++i) {
+                unsigned int info = sechdrs[i].sh_info;
+
+                if (sechdrs[i].sh_type != SHT_REL
+                    && sechdrs[i].sh_type != SHT_RELA)
+                        continue;
+
+                /* Not a valid relocation section? */
+                if (info >= hdr->e_shnum)
+                        continue;
+
+                /* Don't bother with non-allocated sections */
+                if (!(sechdrs[info].sh_flags & SHF_ALLOC))
+                        continue;
+
+                /* If it's called *.init*, and we're not init, we're
+                   not interested */
+                if ((strstr(secstrings + sechdrs[i].sh_name, ".init") != 0)
+                    != is_init)
+                        continue;
+
+                syms = (Elf_Sym *) sechdrs[symindex].sh_addr;
+                if (sechdrs[i].sh_type == SHT_REL) {
+                        Elf_Mips_Rel *rel = (void *) sechdrs[i].sh_addr;
+                        unsigned size = sechdrs[i].sh_size / sizeof(*rel);
+
+                        for (j = 0; j < size; ++j) {
+                                Elf_Sym *sym;
+
+                                if (ELF_MIPS_R_TYPE(rel[j]) != R_MIPS_26)
+                                        continue;
+                                sym = syms + ELF_MIPS_R_SYM(rel[j]);
+                                if (!is_init && sym->st_shndx != SHN_UNDEF)
+                                        continue;
+
+                                ret += sizeof(unsigned[4]);
+                        }
+                } else {
+                        Elf_Mips_Rela *rela = (void *) sechdrs[i].sh_addr;
+                        unsigned size = sechdrs[i].sh_size / sizeof(*rela);
+
+                        for (j = 0; j < size; ++j) {
+                                Elf_Sym *sym;
+
+                                if (ELF_MIPS_R_TYPE(rela[j]) != R_MIPS_26)
+                                        continue;
+                                sym = syms + ELF_MIPS_R_SYM(rela[j]);
+                                if (!is_init && sym->st_shndx != SHN_UNDEF)
+                                        continue;
+
+                                ret += sizeof(unsigned[4]);
+                        }
+                }
+
+        }
+
+        return ret;
+}
+
+int module_relayout(Elf32_Ehdr *hdr,
+                    Elf32_Shdr *sechdrs,
+                    char *secstrings,
+                    unsigned symindex,
+                    struct module *me)
+{
+        unsigned core_plt_size = get_plt_size(
+            hdr, sechdrs, secstrings, symindex, 0);
+        unsigned init_plt_size = get_plt_size(
+            hdr, sechdrs, secstrings, symindex, 1);
+
+        if (core_plt_size > 0)
+                me->core_size = PAGE_ALIGN(me->core_size);
+        me->arch.core_plt_offset = me->core_size;
+        me->core_size = me->core_size + core_plt_size;
+
+        me->arch.init_plt_offset = me->init_size;
+        me->init_size = me->init_size + init_plt_size;
+
+        return 0;
+}
+
-static int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v)
-{
@@ -94 +265 @@
-        *location = v;
-
+        return 0;
+}
+
+static Elf_Addr add_plt_entry_to(unsigned *plt_offset,
+                                 void *start, unsigned size, Elf_Addr v)
+{
+        unsigned *tramp = start + *plt_offset;
+        if (*plt_offset == size) return 0;
+
+        *plt_offset += sizeof(unsigned[4]);
+
+        /* adjust carry for addiu */
+        if (v & 0x00008000) 
+                v += 0x10000;
+        
+        tramp[0] = 0x3c190000 | (v >> 16);      /* lui t9, hi16 */
+        tramp[1] = 0x27390000 | (v & 0xffff);   /* addiu t9, t9, lo16 */
+        tramp[2] = 0x03200008;                  /* jr t9 */
+        tramp[3] = 0x00000000;                  /* nop */
+        
+        return (Elf_Addr) tramp;
+}
+
+static Elf_Addr add_plt_entry(struct module *me, void *location, Elf_Addr v)
+{
+        if (location >= me->module_core
+            && location < me->module_core + me->core_size) {
+                return add_plt_entry_to(&me->arch.core_plt_offset,
+                                        me->module_core, me->core_size, v);
+        } else if (location > me->module_init
+                   && location < me->module_init + me->init_size) {
+                return add_plt_entry_to(&me->arch.init_plt_offset,
+                                        me->module_init, me->init_size, v);
+        } else {
+                printk(KERN_ERR "module %s: "
+                       "relocation to unknown segment %u\n",
+                       me->name, v);
+        }
-        return 0;
-}
@@ -105 +314 @@
-
-        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+                v = add_plt_entry(me, location,
+                                  v + ((*location & 0x03ffffff) << 2));
+                if (v == 0) {
-                printk(KERN_ERR
-                       "module %s: relocation overflow\n",
@@ -110 +322 @@
-                return -ENOEXEC;
-        }
+                *location = (*location & ~0x03ffffff) |
+                            ((v >> 2) & 0x03ffffff);
+                return 0;
+        }
-
-        *location = (*location & ~0x03ffffff) |
@@ -125 +341 @@
-
-        if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) {
+                v = add_plt_entry(me, location, v);
+                if (v == 0) {
-                printk(KERN_ERR
-                       "module %s: relocation overflow\n",
-                       me->name);
-                return -ENOEXEC;
+        }
-        }
-
@@ -400 +619 @@
-                spin_unlock_irq(&dbe_lock);
-        }
+
+        if (me->arch.core_plt_offset < me->core_size
+            && PAGE_ALIGN(me->arch.core_plt_offset) == me->arch.core_plt_offset
+            && is_phys(me->module_core)) {
+                free_phys(me->module_core + me->arch.core_plt_offset,
+                          me->core_size - me->arch.core_plt_offset);
+                me->core_size = me->arch.core_plt_offset;
+        }
-        return 0;
-}

src/linux/adm5120/linux-2.6.23/arch/mips/kernel/scall32-o32.S

@@ -647 +647 @@
-        sys     sys_ppoll               5
-        sys     sys_unshare             1
-4
+6
-        sys     sys_sync_file_range     7       /* 4305 */
-        sys     sys_tee                 4

src/linux/adm5120/linux-2.6.23/arch/mips/kernel/vmlinux.lds.S

@@ -135 +135 @@
-    *(.bss)
-    *(COMMON)
-
+
+
-  __bss_stop = .;
-

src/linux/adm5120/linux-2.6.23/arch/mips/mm/c-r4k.c

@@ -914 +914 @@
-                c->dcache.waybit = __ffs(dcache_size/c->dcache.ways);
-
+#ifdef CONFIG_CPU_HAS_PREFETCH
-                c->options |= MIPS_CPU_PREFETCH;
+#endif
-                break;
-        }

src/linux/adm5120/linux-2.6.23/crypto/api.c

@@ -394 +394 @@
-        return ERR_PTR(err);
-}
-_GPL
+
- 
-/*
@@ -422 +422 @@
-}
-
-_GPL
+
-
-int crypto_alg_available(const char *name, u32 flags)

src/linux/adm5120/linux-2.6.23/drivers/net/adm5120sw.c

@@ -798 +798 @@
-static inline void adm5120_if_napi_disable(struct net_device *dev) {}
-#endif /* CONFIG_ADM5120_SWITCH_NAPI */
+static void adm5120_if_set_multicast_list(struct net_device *dev);
-
-/* ------------------------------------------------------------------------ */
+#define SW_DIS_SA_LEARN_MASK                                    0x0000003F
-
-static int adm5120_if_open(struct net_device *dev)
@@ -820 +822 @@
-                sw_int_unmask(SWITCH_INTS_USED);
-
+
-        /* enable (additional) port */
-        t = sw_read_reg(SWITCH_REG_PORT_CONF0);
@@ -828 +831 @@
-        sw_write_reg(SWITCH_REG_PORT_CONF0, t);
-
+
+//wp54g patch
+        sw_write_reg(SWITCH_REG_PORT_CONF1, sw_read_reg(SWITCH_REG_PORT_CONF1) | SW_DIS_SA_LEARN_MASK);
+        adm5120_if_set_multicast_list(dev);
+        adm5120_write_mac(dev);
+/*
+//important: promisc mode
+#define SW_DIS_UN_SHIFT                                                 9
+#define SW_DIS_UN_MASK                                                  (0x3F << SW_DIS_UN_SHIFT)
+#define SW_DIS_MC_SHIFT                                                 16
+#define SW_DIS_MC_MASK                                                  (0x3F << SW_DIS_MC_SHIFT)
+#define SW_DIS_BC_SHIFT                                                 24
+#define SW_DIS_BC_MASK                                                  (0x3F << SW_DIS_BC_SHIFT)
+
+        if (dev->flags & IFF_PROMISC) {
+                printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n",
+                        dev->name);
+                sw_write_reg(SWITCH_REG_CPUP_CONF, sw_read_reg(SWITCH_REG_CPUP_CONF) & ~(SW_DIS_BC_MASK | SW_DIS_MC_MASK | SW_DIS_UN_MASK));
+        } else if (dev->mc_count || (dev->flags & IFF_ALLMULTI)) {
+                sw_write_reg(SWITCH_REG_CPUP_CONF, sw_read_reg(SWITCH_REG_CPUP_CONF) & ~(SW_DIS_BC_MASK | SW_DIS_MC_MASK | SW_DIS_UN_MASK));
+        } else {
+                sw_write_reg(SWITCH_REG_CPUP_CONF, (sw_read_reg(SWITCH_REG_CPUP_CONF) & ~(SW_DIS_BC_MASK | SW_DIS_UN_MASK)) | SW_DIS_MC_MASK);
+        }
+
+        // Sets the switch bridge mode
+        sw_write_reg(SWITCH_REG_CPUP_CONF, sw_read_reg(SWITCH_REG_CPUP_CONF) | CPUP_CONF_BTM);
+*/
-        netif_start_queue(dev);
-
@@ -1075 +1105 @@
-
-        adm5120_nrdevs = adm5120_eth_num_ports;
- 0x9
- 0x9
- 0x9
- 0x9
- 0x9
+(LED_MODE_LINK_ACT << LED0_MODE_SHIFT) | (LED_MODE_SPEED << LED1_MODE_SHIFT) | (LED_MODE_LINK << LED2_MODE_SHIFT)
+(LED_MODE_LINK_ACT << LED0_MODE_SHIFT) | (LED_MODE_SPEED << LED1_MODE_SHIFT) | (LED_MODE_LINK << LED2_MODE_SHIFT)
+(LED_MODE_LINK_ACT << LED0_MODE_SHIFT) | (LED_MODE_SPEED << LED1_MODE_SHIFT) | (LED_MODE_LINK << LED2_MODE_SHIFT)
+(LED_MODE_LINK_ACT << LED0_MODE_SHIFT) | (LED_MODE_SPEED << LED1_MODE_SHIFT) | (LED_MODE_LINK << LED2_MODE_SHIFT)
+(LED_MODE_LINK_ACT << LED0_MODE_SHIFT) | (LED_MODE_SPEED << LED1_MODE_SHIFT) | (LED_MODE_LINK << LED2_MODE_SHIFT)
-
-        t = CPUP_CONF_DCPUP | CPUP_CONF_CRCP |
@@ -1085 +1115 @@
-                SWITCH_PORTS_NOCPU << CPUP_CONF_DMCP_SHIFT ;
-        sw_write_reg(SWITCH_REG_CPUP_CONF, t);
+
+
+
-
-        t = (SWITCH_PORTS_NOCPU << PORT_CONF0_EMCP_SHIFT) |

src/linux/adm5120/linux-2.6.23/include/asm-mips/module.h

@@ -10 +10 @@
-        const struct exception_table_entry *dbe_start;
-        const struct exception_table_entry *dbe_end;
+
+        unsigned int core_plt_offset;
+        unsigned int init_plt_offset;
-};
-
@@ -66 +69 @@
-/* Given an address, look for it in the exception tables. */
-const struct exception_table_entry*search_module_dbetables(unsigned long addr);
+int module_relayout(Elf32_Ehdr *hdr, Elf32_Shdr *sechdrs,
+                    char *secstrings, unsigned symindex, struct module *me);
-#else
-/* Given an address, look for it in the exception tables. */

src/linux/adm5120/linux-2.6.23/include/asm-mips/string.h

@@ -109 +109 @@
-        ".set\tnoreorder\n\t"
-        ".set\tnoat\n"
-
-
+
+
+
-        "lbu\t$1,(%1)\n\t"
-        "subu\t%2,1\n\t"

src/linux/adm5120/linux-2.6.23/kernel/module.c

@@ -1738 +1738 @@
-        layout_sections(mod, hdr, sechdrs, secstrings);
-
+#ifdef __mips
+        module_relayout(hdr, sechdrs, secstrings, symindex, mod);
+#endif
+
-        /* Do the allocs. */
-        ptr = module_alloc(mod->core_size);

src/linux/adm5120/linux-2.6.23/mm/page_alloc.c

@@ -1265 +1265 @@
-
-        /*
+         * Code in arch/mips/kernel/module.c wants physically
+         * contiguous memory only if there is plenty of free of them.
+         */
+        if ((gfp_mask & (__GFP_THISNODE | __GFP_NORETRY | __GFP_NOWARN))
+            == (__GFP_THISNODE | __GFP_NORETRY | __GFP_NOWARN))
+                goto nopage;
+
+        /*
-         * GFP_THISNODE (meaning __GFP_THISNODE, __GFP_NORETRY and
-         * __GFP_NOWARN set) should not cause reclaim since the subsystem
@@ -1277 +1285 @@
-        for (z = zonelist->zones; *z; z++)
-                wakeup_kswapd(*z, order);
+
+        if (gfp_mask & 0x80000000)
+            goto nopage;
-
-        /*