Changeset 23911


Ignore:
Timestamp:
2010-11-07T14:44:48+01:00 (7 years ago)
Author:
hauke
Message:

brcm47xx: Fix boot problem with wgt634u.

Readd the workarround from the old version again which was removed in r22296 and refresh the patches.

This should close #7874

Thank you Russell Senior for testing.

Location:
trunk/target/linux/brcm47xx
Files:
3 added
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-2.6.34/999-wl_exports.patch

    r22296 r23911  
    88+char nvram_buf[NVRAM_SPACE]; 
    99+EXPORT_SYMBOL(nvram_buf); 
     10 static int cfe_env; 
     11 extern char *cfe_env_get(char *nv_buf, const char *name); 
    1012  
    11  /* Probe for NVRAM header */ 
    12  static void __init early_nvram_init(void) 
    1313--- a/arch/mips/mm/cache.c 
    1414+++ b/arch/mips/mm/cache.c 
  • trunk/target/linux/brcm47xx/patches-2.6.35/015-MIPS-BCM47xx-nvram_getenv-fix-return-value.patch

    r22663 r23911  
    1616--- a/arch/mips/bcm47xx/nvram.c 
    1717+++ b/arch/mips/bcm47xx/nvram.c 
    18 @@ -69,7 +69,7 @@ int nvram_getenv(char *name, char *val,  
     18@@ -69,7 +69,7 @@ int nvram_getenv(char *name, char *val, 
    1919        char *var, *value, *end, *eq; 
    2020  
     
    2525        if (!nvram_buf[0]) 
    2626                early_nvram_init(); 
    27 @@ -89,6 +89,6 @@ int nvram_getenv(char *name, char *val,  
     27@@ -89,6 +89,6 @@ int nvram_getenv(char *name, char *val, 
    2828                        return 0; 
    2929                } 
  • trunk/target/linux/brcm47xx/patches-2.6.35/211-b44_timeout_spam.patch

    r22296 r23911  
    11--- a/drivers/net/b44.c 
    22+++ b/drivers/net/b44.c 
    3 @@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp,  
     3@@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp, 
    44                udelay(10); 
    55        } 
  • trunk/target/linux/brcm47xx/patches-2.6.35/310-no_highpage.patch

    r21707 r23911  
    99  
    1010 extern void build_clear_page(void); 
    11 @@ -78,13 +79,16 @@ static inline void clear_user_page(void  
     11@@ -78,13 +79,16 @@ static inline void clear_user_page(void 
    1212                flush_data_cache_page((unsigned long)addr); 
    1313 } 
  • trunk/target/linux/brcm47xx/patches-2.6.35/400-arch-bcm47xx.patch

    r22425 r23911  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val,  
    4         return -1; 
     3@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, 
     4        return NVRAM_ERR_ENVNOTFOUND; 
    55 } 
    66 EXPORT_SYMBOL(nvram_getenv); 
  • trunk/target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch

    r22425 r23911  
    99 #include <net/checksum.h> 
    1010 #include <net/ip.h> 
    11 @@ -494,8 +495,9 @@ static void _tw32_flush(struct tg3 *tp,  
     11@@ -494,8 +495,9 @@ static void _tw32_flush(struct tg3 *tp, 
    1212 static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val) 
    1313 { 
     
    6262        u32 frame_val; 
    6363        unsigned int loops; 
    64 @@ -872,7 +879,7 @@ static int tg3_writephy(struct tg3 *tp,  
     64@@ -872,7 +879,7 @@ static int tg3_writephy(struct tg3 *tp, 
    6565                udelay(80); 
    6666        } 
     
    7171        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & 
    7272                      MI_COM_REG_ADDR_MASK); 
    73 @@ -905,6 +912,11 @@ static int tg3_writephy(struct tg3 *tp,  
     73@@ -905,6 +912,11 @@ static int tg3_writephy(struct tg3 *tp, 
    7474        return ret; 
    7575 } 
     
    148148  
    149149        if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { 
    150 @@ -7179,9 +7217,12 @@ static int tg3_halt_cpu(struct tg3 *tp,  
     150@@ -7179,9 +7217,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
    151151                return -ENODEV; 
    152152        } 
     
    176176  
    177177        /* Firmware blob starts with version numbers, followed by 
    178 @@ -7302,6 +7348,11 @@ static int tg3_load_tso_firmware(struct  
     178@@ -7302,6 +7348,11 @@ static int tg3_load_tso_firmware(struct 
    179179        unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; 
    180180        int err, i; 
     
    243243             (EEPROM_ADDR_FSM_RESET | 
    244244              (EEPROM_DEFAULT_CLOCK_PERIOD << 
    245 @@ -11855,6 +11922,9 @@ static int tg3_nvram_write_block(struct  
     245@@ -11855,6 +11922,9 @@ static int tg3_nvram_write_block(struct 
    246246 { 
    247247        int ret; 
  • trunk/target/linux/brcm47xx/patches-2.6.35/940-bcm47xx-yenta.patch

    r22296 r23911  
    2929                   "ISA IRQ mask 0x%04x, PCI irq %d\n", 
    3030                   socket->socket.irq_mask, socket->cb_irq); 
    31 @@ -1259,6 +1266,15 @@ static int __devinit yenta_probe(struct  
     31@@ -1259,6 +1266,15 @@ static int __devinit yenta_probe(struct 
    3232        dev_printk(KERN_INFO, &dev->dev, 
    3333                   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); 
  • trunk/target/linux/brcm47xx/patches-2.6.35/999-wl_exports.patch

    r22296 r23911  
    88+char nvram_buf[NVRAM_SPACE]; 
    99+EXPORT_SYMBOL(nvram_buf); 
     10 static int cfe_env; 
     11 extern char *cfe_env_get(char *nv_buf, const char *name); 
    1012  
    11  /* Probe for NVRAM header */ 
    12  static void __init early_nvram_init(void) 
    1313--- a/arch/mips/mm/cache.c 
    1414+++ b/arch/mips/mm/cache.c 
  • trunk/target/linux/brcm47xx/patches-2.6.36/016-MIPS-BCM47xx-Remove-CFE-console.patch

    r23278 r23911  
    1717--- a/arch/mips/Kconfig 
    1818+++ b/arch/mips/Kconfig 
    19 @@ -76,7 +76,6 @@ config BCM47XX 
     19@@ -77,7 +77,6 @@ config BCM47XX 
    2020        select SSB_B43_PCI_BRIDGE if PCI 
    2121        select SSB_PCICORE_HOSTMODE if PCI 
  • trunk/target/linux/brcm47xx/patches-2.6.36/211-b44_timeout_spam.patch

    r22296 r23911  
    11--- a/drivers/net/b44.c 
    22+++ b/drivers/net/b44.c 
    3 @@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp,  
     3@@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp, 
    44                udelay(10); 
    55        } 
  • trunk/target/linux/brcm47xx/patches-2.6.36/310-no_highpage.patch

    r21707 r23911  
    99  
    1010 extern void build_clear_page(void); 
    11 @@ -78,13 +79,16 @@ static inline void clear_user_page(void  
     11@@ -78,13 +79,16 @@ static inline void clear_user_page(void 
    1212                flush_data_cache_page((unsigned long)addr); 
    1313 } 
  • trunk/target/linux/brcm47xx/patches-2.6.36/400-arch-bcm47xx.patch

    r23278 r23911  
    11--- a/arch/mips/bcm47xx/nvram.c 
    22+++ b/arch/mips/bcm47xx/nvram.c 
    3 @@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val,  
     3@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, 
    44        return NVRAM_ERR_ENVNOTFOUND; 
    55 } 
  • trunk/target/linux/brcm47xx/patches-2.6.36/700-ssb-gigabit-ethernet-driver.patch

    r23278 r23911  
    99 #include <net/checksum.h> 
    1010 #include <net/ip.h> 
    11 @@ -494,8 +495,9 @@ static void _tw32_flush(struct tg3 *tp,  
     11@@ -494,8 +495,9 @@ static void _tw32_flush(struct tg3 *tp, 
    1212 static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val) 
    1313 { 
     
    6262        u32 frame_val; 
    6363        unsigned int loops; 
    64 @@ -889,7 +896,7 @@ static int tg3_writephy(struct tg3 *tp,  
     64@@ -889,7 +896,7 @@ static int tg3_writephy(struct tg3 *tp, 
    6565                udelay(80); 
    6666        } 
     
    7171        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & 
    7272                      MI_COM_REG_ADDR_MASK); 
    73 @@ -922,6 +929,11 @@ static int tg3_writephy(struct tg3 *tp,  
     73@@ -922,6 +929,11 @@ static int tg3_writephy(struct tg3 *tp, 
    7474        return ret; 
    7575 } 
     
    148148  
    149149        if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { 
    150 @@ -7202,9 +7240,12 @@ static int tg3_halt_cpu(struct tg3 *tp,  
     150@@ -7202,9 +7240,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
    151151                return -ENODEV; 
    152152        } 
     
    176176  
    177177        /* Firmware blob starts with version numbers, followed by 
    178 @@ -7325,6 +7371,11 @@ static int tg3_load_tso_firmware(struct  
     178@@ -7325,6 +7371,11 @@ static int tg3_load_tso_firmware(struct 
    179179        unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; 
    180180        int err, i; 
     
    200200                /* All of this garbage is because when using non-tagged 
    201201                 * IRQ status the mailbox/status_block protocol the chip 
    202 @@ -10131,6 +10187,11 @@ static int tg3_test_nvram(struct tg3 *tp 
     202@@ -10133,6 +10189,11 @@ static int tg3_test_nvram(struct tg3 *tp 
    203203        if (tp->tg3_flags3 & TG3_FLG3_NO_NVRAM) 
    204204                return 0; 
     
    212212                return -EIO; 
    213213  
    214 @@ -10951,7 +11012,7 @@ static int tg3_ioctl(struct net_device * 
     214@@ -10953,7 +11014,7 @@ static int tg3_ioctl(struct net_device * 
    215215                        return -EAGAIN; 
    216216  
     
    221221  
    222222                data->val_out = mii_regval; 
    223 @@ -10967,7 +11028,7 @@ static int tg3_ioctl(struct net_device * 
     223@@ -10969,7 +11030,7 @@ static int tg3_ioctl(struct net_device * 
    224224                        return -EAGAIN; 
    225225  
     
    230230  
    231231                return err; 
    232 @@ -11612,6 +11673,12 @@ static void __devinit tg3_get_5717_nvram 
     232@@ -11614,6 +11675,12 @@ static void __devinit tg3_get_5717_nvram 
    233233 /* Chips other than 5700/5701 use the NVRAM for fetching info. */ 
    234234 static void __devinit tg3_nvram_init(struct tg3 *tp) 
     
    243243             (EEPROM_ADDR_FSM_RESET | 
    244244              (EEPROM_DEFAULT_CLOCK_PERIOD << 
    245 @@ -11875,6 +11942,9 @@ static int tg3_nvram_write_block(struct  
     245@@ -11877,6 +11944,9 @@ static int tg3_nvram_write_block(struct 
    246246 { 
    247247        int ret; 
     
    253253                tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & 
    254254                       ~GRC_LCLCTRL_GPIO_OUTPUT1); 
    255 @@ -13267,6 +13337,11 @@ static int __devinit tg3_get_invariants( 
     255@@ -13269,6 +13339,11 @@ static int __devinit tg3_get_invariants( 
    256256              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701))) 
    257257                tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG; 
     
    265265         * In particular, the TG3_FLG2_IS_NIC flag must be 
    266266         * determined before calling tg3_set_power_state() so that 
    267 @@ -13665,6 +13740,10 @@ static int __devinit tg3_get_device_addr 
     267@@ -13667,6 +13742,10 @@ static int __devinit tg3_get_device_addr 
    268268        } 
    269269  
     
    276276                if (!tg3_get_default_macaddr_sparc(tp)) 
    277277                        return 0; 
    278 @@ -14181,6 +14260,7 @@ static char * __devinit tg3_phy_string(s 
     278@@ -14183,6 +14262,7 @@ static char * __devinit tg3_phy_string(s 
    279279        case TG3_PHY_ID_BCM5704:        return "5704"; 
    280280        case TG3_PHY_ID_BCM5705:        return "5705"; 
     
    284284        case TG3_PHY_ID_BCM5714:        return "5714"; 
    285285        case TG3_PHY_ID_BCM5780:        return "5780"; 
    286 @@ -14392,6 +14472,13 @@ static int __devinit tg3_init_one(struct 
     286@@ -14394,6 +14474,13 @@ static int __devinit tg3_init_one(struct 
    287287                tp->msg_enable = tg3_debug; 
    288288        else 
  • trunk/target/linux/brcm47xx/patches-2.6.36/940-bcm47xx-yenta.patch

    r23278 r23911  
    2929                   "ISA IRQ mask 0x%04x, PCI irq %d\n", 
    3030                   socket->socket.irq_mask, socket->cb_irq); 
    31 @@ -1258,6 +1265,15 @@ static int __devinit yenta_probe(struct  
     31@@ -1258,6 +1265,15 @@ static int __devinit yenta_probe(struct 
    3232        dev_printk(KERN_INFO, &dev->dev, 
    3333                   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); 
  • trunk/target/linux/brcm47xx/patches-2.6.36/999-wl_exports.patch

    r22296 r23911  
    88+char nvram_buf[NVRAM_SPACE]; 
    99+EXPORT_SYMBOL(nvram_buf); 
     10 static int cfe_env; 
     11 extern char *cfe_env_get(char *nv_buf, const char *name); 
    1012  
    11  /* Probe for NVRAM header */ 
    12  static void __init early_nvram_init(void) 
    1313--- a/arch/mips/mm/cache.c 
    1414+++ b/arch/mips/mm/cache.c 
Note: See TracChangeset for help on using the changeset viewer.