Changeset 47930


Ignore:
Timestamp:
2015-12-18T08:25:13+01:00 (2 years ago)
Author:
rmilecki
Message:

brcm47xx: add kernel 4.4 support

Signed-off-by: Rafał Miłecki <zajec5@…>

Location:
trunk/target/linux/brcm47xx
Files:
2 added
20 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm47xx/patches-4.4/159-cpu_fixes.patch

    r47929 r47930  
    318318                protected_writeback_dcache_line(addr & ~(dc_lsize - 1)); 
    319319        if (!cpu_icache_snoops_remote_store && scache_size) 
    320 @@ -1599,6 +1613,17 @@ static void coherency_setup(void) 
     320@@ -1602,6 +1616,17 @@ static void coherency_setup(void) 
    321321         * silly idea of putting something else there ... 
    322322         */ 
     
    336336        case CPU_R4000SC: 
    337337        case CPU_R4000MC: 
    338 @@ -1645,6 +1670,15 @@ void r4k_cache_init(void) 
     338@@ -1648,6 +1673,15 @@ void r4k_cache_init(void) 
    339339        extern void build_copy_page(void); 
    340340        struct cpuinfo_mips *c = &current_cpu_data; 
     
    352352        setup_scache(); 
    353353  
    354 @@ -1714,7 +1748,15 @@ void r4k_cache_init(void) 
     354@@ -1717,7 +1751,15 @@ void r4k_cache_init(void) 
    355355         */ 
    356356        local_r4k___flush_cache_all(NULL); 
     
    370370--- a/arch/mips/mm/tlbex.c 
    371371+++ b/arch/mips/mm/tlbex.c 
    372 @@ -1296,6 +1296,9 @@ static void build_r4000_tlb_refill_handl 
     372@@ -1281,6 +1281,9 @@ static void build_r4000_tlb_refill_handl 
    373373                        /* No need for uasm_i_nop */ 
    374374                } 
  • trunk/target/linux/brcm47xx/patches-4.4/160-kmap_coherent.patch

    r47929 r47930  
    99--- a/arch/mips/include/asm/cpu-features.h 
    1010+++ b/arch/mips/include/asm/cpu-features.h 
    11 @@ -158,6 +158,9 @@ 
     11@@ -160,6 +160,9 @@ 
    1212 #ifndef cpu_has_local_ebase 
    1313 #define cpu_has_local_ebase    1 
     
    5050--- a/arch/mips/mm/init.c 
    5151+++ b/arch/mips/mm/init.c 
    52 @@ -160,7 +160,7 @@ void copy_user_highpage(struct page *to, 
     52@@ -164,7 +164,7 @@ void copy_user_highpage(struct page *to, 
    5353        void *vfrom, *vto; 
    5454  
     
    5959                vfrom = kmap_coherent(from, vaddr); 
    6060                copy_page(vto, vfrom); 
    61 @@ -182,7 +182,7 @@ void copy_to_user_page(struct vm_area_st 
     61@@ -186,7 +186,7 @@ void copy_to_user_page(struct vm_area_st 
    6262        struct page *page, unsigned long vaddr, void *dst, const void *src, 
    6363        unsigned long len) 
     
    6868                void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); 
    6969                memcpy(vto, src, len); 
    70 @@ -200,7 +200,7 @@ void copy_from_user_page(struct vm_area_ 
     70@@ -204,7 +204,7 @@ void copy_from_user_page(struct vm_area_ 
    7171        struct page *page, unsigned long vaddr, void *dst, const void *src, 
    7272        unsigned long len) 
  • trunk/target/linux/brcm47xx/patches-4.4/209-b44-register-adm-switch.patch

    r47929 r47930  
    111111--- a/drivers/net/ethernet/broadcom/b44.h 
    112112+++ b/drivers/net/ethernet/broadcom/b44.h 
    113 @@ -404,6 +404,9 @@ struct b44 { 
     113@@ -408,6 +408,9 @@ struct b44 { 
    114114        struct mii_bus          *mii_bus; 
    115115        int                     old_link; 
  • trunk/target/linux/brcm47xx/patches-4.4/310-no_highpage.patch

    r47929 r47930  
    4242--- a/arch/mips/mm/init.c 
    4343+++ b/arch/mips/mm/init.c 
    44 @@ -154,30 +154,6 @@ void kunmap_coherent(void) 
    45         pagefault_enable(); 
     44@@ -158,30 +158,6 @@ void kunmap_coherent(void) 
     45        preempt_enable(); 
    4646 } 
    4747  
  • trunk/target/linux/brcm47xx/patches-4.4/610-pci_ide_fix.patch

    r47929 r47930  
    2828--- a/include/linux/ide.h 
    2929+++ b/include/linux/ide.h 
    30 @@ -191,7 +191,11 @@ static inline void ide_std_init_ports(st 
     30@@ -204,7 +204,11 @@ static inline void ide_std_init_ports(st 
    3131        hw->io_ports.ctl_addr = ctl_addr; 
    3232 } 
  • trunk/target/linux/brcm47xx/patches-4.4/820-wgt634u-nvram-fix.patch

    r47929 r47930  
    44out the configuration than the in kernel cfe config reader. 
    55 
    6 --- a/arch/mips/bcm47xx/Makefile 
    7 +++ b/arch/mips/bcm47xx/Makefile 
    8 @@ -5,3 +5,4 @@ 
    9   
    10  obj-y                          += irq.o nvram.o prom.o serial.o setup.o time.o sprom.o 
    11  obj-y                          += board.o buttons.o leds.o workarounds.o 
    12 +obj-y                          += cfe_env.o 
     6--- a/drivers/firmware/broadcom/Makefile 
     7+++ b/drivers/firmware/broadcom/Makefile 
     8@@ -1 +1 @@ 
     9-obj-$(CONFIG_BCM47XX_NVRAM)            += bcm47xx_nvram.o 
     10+obj-$(CONFIG_BCM47XX_NVRAM)            += bcm47xx_nvram.o cfe_env.o 
    1311--- /dev/null 
    14 +++ b/arch/mips/bcm47xx/cfe_env.c 
     12+++ b/drivers/firmware/broadcom/cfe_env.c 
    1513@@ -0,0 +1,228 @@ 
    1614+/* 
     
    242240+} 
    243241+ 
    244 --- a/arch/mips/bcm47xx/nvram.c 
    245 +++ b/arch/mips/bcm47xx/nvram.c 
     242--- a/drivers/firmware/broadcom/bcm47xx_nvram.c 
     243+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c 
    246244@@ -37,6 +37,8 @@ struct nvram_header { 
    247245 static char nvram_buf[NVRAM_SPACE]; 
  • trunk/target/linux/brcm47xx/patches-4.4/830-huawei_e970_support.patch

    r47929 r47930  
    4646        bcm47xx_workarounds(); 
    4747  
    48         fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status); 
     48        fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status, -1); 
    4949+       bcm47xx_register_gpio_watchdog(); 
    5050        return 0; 
  • trunk/target/linux/brcm47xx/patches-4.4/920-cache-wround.patch

    r47929 r47930  
    3535--- a/arch/mips/mm/tlbex.c 
    3636+++ b/arch/mips/mm/tlbex.c 
    37 @@ -936,6 +936,9 @@ build_get_pgde32(u32 **p, unsigned int t 
     37@@ -943,6 +943,9 @@ build_get_pgde32(u32 **p, unsigned int t 
    3838                uasm_i_srl(p, ptr, ptr, SMP_CPUID_PTRSHIFT); 
    3939                uasm_i_addu(p, ptr, tmp, ptr); 
     
    4545 #endif 
    4646                uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */ 
    47 @@ -1296,12 +1299,12 @@ static void build_r4000_tlb_refill_handl 
     47@@ -1281,12 +1284,12 @@ static void build_r4000_tlb_refill_handl 
    4848                        /* No need for uasm_i_nop */ 
    4949                } 
     
    6161 #endif 
    6262  
    63 @@ -1313,6 +1316,9 @@ static void build_r4000_tlb_refill_handl 
     63@@ -1298,6 +1301,9 @@ static void build_r4000_tlb_refill_handl 
    6464                build_update_entries(&p, K0, K1); 
    6565                build_tlb_write_entry(&p, &l, &r, tlb_random); 
  • trunk/target/linux/brcm47xx/patches-4.4/940-bcm47xx-yenta.patch

    r47929 r47930  
    11--- a/drivers/pcmcia/yenta_socket.c 
    22+++ b/drivers/pcmcia/yenta_socket.c 
    3 @@ -920,6 +920,8 @@ static unsigned int yenta_probe_irq(stru 
     3@@ -919,6 +919,8 @@ static unsigned int yenta_probe_irq(stru 
    44         * Probe for usable interrupts using the force 
    55         * register to generate bogus card status events. 
     
    1010        cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK); 
    1111        reg = exca_readb(socket, I365_CSCINT); 
    12 @@ -935,6 +937,7 @@ static unsigned int yenta_probe_irq(stru 
     12@@ -934,6 +936,7 @@ static unsigned int yenta_probe_irq(stru 
    1313        } 
    1414        cb_writel(socket, CB_SOCKET_MASK, 0); 
     
    1818        mask = probe_irq_mask(val) & 0xffff; 
    1919  
    20 @@ -1019,6 +1022,10 @@ static void yenta_get_socket_capabilitie 
     20@@ -1018,6 +1021,10 @@ static void yenta_get_socket_capabilitie 
    2121        else 
    2222                socket->socket.irq_mask = 0; 
     
    2626+               socket->socket.irq_mask = 0x6f8; 
    2727+ 
    28         dev_printk(KERN_INFO, &socket->dev->dev, 
    29                    "ISA IRQ mask 0x%04x, PCI irq %d\n", 
    30                    socket->socket.irq_mask, socket->cb_irq); 
    31 @@ -1255,6 +1262,15 @@ static int yenta_probe(struct pci_dev *d 
    32         dev_printk(KERN_INFO, &dev->dev, 
    33                    "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE)); 
     28        dev_info(&socket->dev->dev, "ISA IRQ mask 0x%04x, PCI irq %d\n", 
     29                 socket->socket.irq_mask, socket->cb_irq); 
     30 } 
     31@@ -1250,6 +1257,15 @@ static int yenta_probe(struct pci_dev *d 
     32        dev_info(&dev->dev, "Socket status: %08x\n", 
     33                 cb_readl(socket, CB_SOCKET_STATE)); 
    3434  
    3535+       /* Generate an interrupt on card insert/remove */ 
  • trunk/target/linux/brcm47xx/patches-4.4/999-wl_exports.patch

    r47929 r47930  
    1 --- a/arch/mips/bcm47xx/nvram.c 
    2 +++ b/arch/mips/bcm47xx/nvram.c 
     1--- a/drivers/firmware/broadcom/bcm47xx_nvram.c 
     2+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c 
    33@@ -34,7 +34,8 @@ struct nvram_header { 
    44        u32 config_ncdl;        /* ncdl values for memc */ 
Note: See TracChangeset for help on using the changeset viewer.