diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 12:57:04 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 12:57:04 +0000 |
commit | 478b3b32f429be04c317e7aa1eb44241dd3429e1 (patch) | |
tree | e74befb0c374b234d84de0bc1cc10296d19133f1 /target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch | |
parent | 14b8ea6a1a5d851cf316c38d0594f33a4263e142 (diff) | |
download | upstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.tar.gz upstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.tar.bz2 upstream-478b3b32f429be04c317e7aa1eb44241dd3429e1.zip |
[kernel] upgrade to 2.6.25.7, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11523 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch | 154 |
1 files changed, 64 insertions, 90 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch index 0291096fc4..ae97cf6cd5 100644 --- a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/drivers/ssb/Kconfig -=================================================================== ---- linux-2.6.25.4.orig/drivers/ssb/Kconfig -+++ linux-2.6.25.4/drivers/ssb/Kconfig -@@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF +--- a/drivers/ssb/Kconfig ++++ b/drivers/ssb/Kconfig +@@ -125,4 +125,13 @@ If unsure, say N @@ -16,11 +14,9 @@ Index: linux-2.6.25.4/drivers/ssb/Kconfig + If unsure, say N + endmenu -Index: linux-2.6.25.4/drivers/ssb/Makefile -=================================================================== ---- linux-2.6.25.4.orig/drivers/ssb/Makefile -+++ linux-2.6.25.4/drivers/ssb/Makefile -@@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o +--- a/drivers/ssb/Makefile ++++ b/drivers/ssb/Makefile +@@ -11,6 +11,7 @@ ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o ssb-$(CONFIG_SSB_DRIVER_PCICORE) += driver_pcicore.o @@ -28,10 +24,8 @@ Index: linux-2.6.25.4/drivers/ssb/Makefile # b43 pci-ssb-bridge driver # Not strictly a part of SSB, but kept here for convenience -Index: linux-2.6.25.4/drivers/ssb/driver_gige.c -=================================================================== --- /dev/null -+++ linux-2.6.25.4/drivers/ssb/driver_gige.c ++++ b/drivers/ssb/driver_gige.c @@ -0,0 +1,294 @@ +/* + * Sonics Silicon Backplane @@ -327,10 +321,8 @@ Index: linux-2.6.25.4/drivers/ssb/driver_gige.c +{ + return ssb_driver_register(&ssb_gige_driver); +} -Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h -=================================================================== --- /dev/null -+++ linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h ++++ b/include/linux/ssb/ssb_driver_gige.h @@ -0,0 +1,174 @@ +#ifndef LINUX_SSB_DRIVER_GIGE_H_ +#define LINUX_SSB_DRIVER_GIGE_H_ @@ -506,11 +498,9 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h + +#endif /* CONFIG_SSB_DRIVER_GIGE */ +#endif /* LINUX_SSB_DRIVER_GIGE_H_ */ -Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/ssb/driver_pcicore.c -+++ linux-2.6.25.4/drivers/ssb/driver_pcicore.c -@@ -60,78 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock); +--- a/drivers/ssb/driver_pcicore.c ++++ b/drivers/ssb/driver_pcicore.c +@@ -60,78 +60,6 @@ /* Core to access the external PCI config space. Can only have one. */ static struct ssb_pcicore *extpci_core; @@ -589,7 +579,7 @@ Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c static u32 get_cfgspace_addr(struct ssb_pcicore *pc, unsigned int bus, unsigned int dev, unsigned int func, unsigned int off) -@@ -320,6 +248,95 @@ static struct pci_controller ssb_pcicore +@@ -320,6 +248,95 @@ .mem_offset = 0x24000000, }; @@ -685,10 +675,8 @@ Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc) { u32 val; -Index: linux-2.6.25.4/drivers/ssb/embedded.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/ssb/embedded.c -+++ linux-2.6.25.4/drivers/ssb/embedded.c +--- a/drivers/ssb/embedded.c ++++ b/drivers/ssb/embedded.c @@ -10,6 +10,9 @@ #include <linux/ssb/ssb.h> @@ -699,7 +687,7 @@ Index: linux-2.6.25.4/drivers/ssb/embedded.c #include "ssb_private.h" -@@ -130,3 +133,90 @@ u32 ssb_gpio_polarity(struct ssb_bus *bu +@@ -130,3 +133,90 @@ return res; } EXPORT_SYMBOL(ssb_gpio_polarity); @@ -790,11 +778,9 @@ Index: linux-2.6.25.4/drivers/ssb/embedded.c + + return -ENODEV; +} -Index: linux-2.6.25.4/include/linux/ssb/ssb.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/ssb/ssb.h -+++ linux-2.6.25.4/include/linux/ssb/ssb.h -@@ -426,5 +426,12 @@ extern int ssb_bus_powerup(struct ssb_bu +--- a/include/linux/ssb/ssb.h ++++ b/include/linux/ssb/ssb.h +@@ -426,5 +426,12 @@ extern u32 ssb_admatch_base(u32 adm); extern u32 ssb_admatch_size(u32 adm); @@ -807,10 +793,8 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb.h +#endif /* CONFIG_SSB_EMBEDDED */ #endif /* LINUX_SSB_H_ */ -Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h -=================================================================== ---- linux-2.6.25.4.orig/include/linux/ssb/ssb_driver_pci.h -+++ linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h +--- a/include/linux/ssb/ssb_driver_pci.h ++++ b/include/linux/ssb/ssb_driver_pci.h @@ -1,6 +1,11 @@ #ifndef LINUX_SSB_PCICORE_H_ #define LINUX_SSB_PCICORE_H_ @@ -823,7 +807,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h #ifdef CONFIG_SSB_DRIVER_PCICORE /* PCI core registers. */ -@@ -88,6 +93,9 @@ extern void ssb_pcicore_init(struct ssb_ +@@ -88,6 +93,9 @@ extern int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc, struct ssb_device *dev); @@ -833,7 +817,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h #else /* CONFIG_SSB_DRIVER_PCICORE */ -@@ -107,5 +115,16 @@ int ssb_pcicore_dev_irqvecs_enable(struc +@@ -107,5 +115,16 @@ return 0; } @@ -850,10 +834,8 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h + #endif /* CONFIG_SSB_DRIVER_PCICORE */ #endif /* LINUX_SSB_PCICORE_H_ */ -Index: linux-2.6.25.4/drivers/ssb/main.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/ssb/main.c -+++ linux-2.6.25.4/drivers/ssb/main.c +--- a/drivers/ssb/main.c ++++ b/drivers/ssb/main.c @@ -14,6 +14,7 @@ #include <linux/io.h> #include <linux/ssb/ssb.h> @@ -862,7 +844,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c #include <linux/dma-mapping.h> #include <linux/pci.h> -@@ -68,6 +69,25 @@ found: +@@ -68,6 +69,25 @@ } #endif /* CONFIG_SSB_PCIHOST */ @@ -888,7 +870,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c static struct ssb_device *ssb_device_get(struct ssb_device *dev) { if (dev) -@@ -1181,7 +1201,14 @@ static int __init ssb_modinit(void) +@@ -1181,7 +1201,14 @@ err = b43_pci_ssb_bridge_init(); if (err) { ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge " @@ -904,7 +886,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c /* don't fail SSB init because of this */ err = 0; } -@@ -1195,6 +1222,7 @@ fs_initcall(ssb_modinit); +@@ -1195,6 +1222,7 @@ static void __exit ssb_modexit(void) { @@ -912,11 +894,9 @@ Index: linux-2.6.25.4/drivers/ssb/main.c b43_pci_ssb_bridge_exit(); bus_unregister(&ssb_bustype); } -Index: linux-2.6.25.4/drivers/ssb/ssb_private.h -=================================================================== ---- linux-2.6.25.4.orig/drivers/ssb/ssb_private.h -+++ linux-2.6.25.4/drivers/ssb/ssb_private.h -@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty +--- a/drivers/ssb/ssb_private.h ++++ b/drivers/ssb/ssb_private.h +@@ -118,6 +118,8 @@ extern int ssb_devices_freeze(struct ssb_bus *bus); extern int ssb_devices_thaw(struct ssb_bus *bus); extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev); @@ -925,10 +905,8 @@ Index: linux-2.6.25.4/drivers/ssb/ssb_private.h /* b43_pci_bridge.c */ #ifdef CONFIG_SSB_B43_PCI_BRIDGE -Index: linux-2.6.25.4/drivers/net/tg3.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/net/tg3.c -+++ linux-2.6.25.4/drivers/net/tg3.c +--- a/drivers/net/tg3.c ++++ b/drivers/net/tg3.c @@ -38,6 +38,7 @@ #include <linux/workqueue.h> #include <linux/prefetch.h> @@ -937,7 +915,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c #include <net/checksum.h> #include <net/ip.h> -@@ -425,8 +426,9 @@ static void _tw32_flush(struct tg3 *tp, +@@ -425,8 +426,9 @@ static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val) { tp->write32_mbox(tp, off, val); @@ -949,7 +927,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c tp->read32_mbox(tp, off); } -@@ -706,7 +708,7 @@ static void tg3_switch_clocks(struct tg3 +@@ -706,7 +708,7 @@ #define PHY_BUSY_LOOPS 5000 @@ -958,7 +936,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c { u32 frame_val; unsigned int loops; -@@ -720,7 +722,7 @@ static int tg3_readphy(struct tg3 *tp, i +@@ -720,7 +722,7 @@ *val = 0x0; @@ -967,7 +945,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c MI_COM_PHY_ADDR_MASK); frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & MI_COM_REG_ADDR_MASK); -@@ -755,7 +757,12 @@ static int tg3_readphy(struct tg3 *tp, i +@@ -755,7 +757,12 @@ return ret; } @@ -981,7 +959,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c { u32 frame_val; unsigned int loops; -@@ -771,7 +778,7 @@ static int tg3_writephy(struct tg3 *tp, +@@ -771,7 +778,7 @@ udelay(80); } @@ -990,7 +968,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c MI_COM_PHY_ADDR_MASK); frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & MI_COM_REG_ADDR_MASK); -@@ -804,6 +811,11 @@ static int tg3_writephy(struct tg3 *tp, +@@ -804,6 +811,11 @@ return ret; } @@ -1002,7 +980,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val) { tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg); -@@ -2250,6 +2262,14 @@ static int tg3_setup_copper_phy(struct t +@@ -2250,6 +2262,14 @@ } } @@ -1017,7 +995,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c if (current_link_up == 1 && tp->link_config.active_duplex == DUPLEX_FULL) tg3_setup_flow_control(tp, lcl_adv, rmt_adv); -@@ -5197,6 +5217,11 @@ static int tg3_poll_fw(struct tg3 *tp) +@@ -5197,6 +5217,11 @@ int i; u32 val; @@ -1029,7 +1007,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) { /* Wait up to 20ms for init done. */ for (i = 0; i < 200; i++) { -@@ -5435,6 +5460,14 @@ static int tg3_chip_reset(struct tg3 *tp +@@ -5435,6 +5460,14 @@ tw32(0x5000, 0x400); } @@ -1044,7 +1022,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c tw32(GRC_MODE, tp->grc_mode); if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { -@@ -5704,9 +5737,12 @@ static int tg3_halt_cpu(struct tg3 *tp, +@@ -5704,9 +5737,12 @@ return -ENODEV; } @@ -1060,7 +1038,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c return 0; } -@@ -5787,6 +5823,11 @@ static int tg3_load_5701_a0_firmware_fix +@@ -5787,6 +5823,11 @@ struct fw_info info; int err, i; @@ -1072,7 +1050,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c info.text_base = TG3_FW_TEXT_ADDR; info.text_len = TG3_FW_TEXT_LEN; info.text_data = &tg3FwText[0]; -@@ -6345,6 +6386,11 @@ static int tg3_load_tso_firmware(struct +@@ -6345,6 +6386,11 @@ unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; int err, i; @@ -1084,7 +1062,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) return 0; -@@ -7306,6 +7352,11 @@ static void tg3_timer(unsigned long __op +@@ -7306,6 +7352,11 @@ spin_lock(&tp->lock); @@ -1096,7 +1074,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) { /* All of this garbage is because when using non-tagged * IRQ status the mailbox/status_block protocol the chip -@@ -8906,6 +8957,11 @@ static int tg3_test_nvram(struct tg3 *tp +@@ -8906,6 +8957,11 @@ __le32 *buf; int i, j, k, err = 0, size; @@ -1108,7 +1086,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c if (tg3_nvram_read_swab(tp, 0, &magic) != 0) return -EIO; -@@ -9689,7 +9745,7 @@ static int tg3_ioctl(struct net_device * +@@ -9689,7 +9745,7 @@ return -EAGAIN; spin_lock_bh(&tp->lock); @@ -1117,7 +1095,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c spin_unlock_bh(&tp->lock); data->val_out = mii_regval; -@@ -9708,7 +9764,7 @@ static int tg3_ioctl(struct net_device * +@@ -9708,7 +9764,7 @@ return -EAGAIN; spin_lock_bh(&tp->lock); @@ -1126,7 +1104,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c spin_unlock_bh(&tp->lock); return err; -@@ -10177,6 +10233,12 @@ static void __devinit tg3_get_5906_nvram +@@ -10177,6 +10233,12 @@ /* Chips other than 5700/5701 use the NVRAM for fetching info. */ static void __devinit tg3_nvram_init(struct tg3 *tp) { @@ -1139,7 +1117,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c tw32_f(GRC_EEPROM_ADDR, (EEPROM_ADDR_FSM_RESET | (EEPROM_DEFAULT_CLOCK_PERIOD << -@@ -10317,6 +10379,9 @@ static int tg3_nvram_read(struct tg3 *tp +@@ -10317,6 +10379,9 @@ { int ret; @@ -1149,7 +1127,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c if (!(tp->tg3_flags & TG3_FLAG_NVRAM)) return tg3_nvram_read_using_eeprom(tp, offset, val); -@@ -10563,6 +10628,9 @@ static int tg3_nvram_write_block(struct +@@ -10563,6 +10628,9 @@ { int ret; @@ -1159,7 +1137,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) { tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & ~GRC_LCLCTRL_GPIO_OUTPUT1); -@@ -11610,7 +11678,6 @@ static int __devinit tg3_get_invariants( +@@ -11610,7 +11678,6 @@ tp->write32 = tg3_write_flush_reg32; } @@ -1167,7 +1145,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) || (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) { tp->write32_tx_mbox = tg3_write32_tx_mbox; -@@ -11646,6 +11713,11 @@ static int __devinit tg3_get_invariants( +@@ -11646,6 +11713,11 @@ GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701))) tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG; @@ -1179,7 +1157,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c /* Get eeprom hw config before calling tg3_set_power_state(). * In particular, the TG3_FLG2_IS_NIC flag must be * determined before calling tg3_set_power_state() so that -@@ -12017,6 +12089,10 @@ static int __devinit tg3_get_device_addr +@@ -12017,6 +12089,10 @@ } if (!is_valid_ether_addr(&dev->dev_addr[0])) { @@ -1190,7 +1168,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c #ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; -@@ -12508,6 +12584,7 @@ static char * __devinit tg3_phy_string(s +@@ -12508,6 +12584,7 @@ case PHY_ID_BCM5704: return "5704"; case PHY_ID_BCM5705: return "5705"; case PHY_ID_BCM5750: return "5750"; @@ -1198,7 +1176,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c case PHY_ID_BCM5752: return "5752"; case PHY_ID_BCM5714: return "5714"; case PHY_ID_BCM5780: return "5780"; -@@ -12695,6 +12772,13 @@ static int __devinit tg3_init_one(struct +@@ -12695,6 +12772,13 @@ tp->msg_enable = tg3_debug; else tp->msg_enable = TG3_DEF_MSG_ENABLE; @@ -1212,11 +1190,9 @@ Index: linux-2.6.25.4/drivers/net/tg3.c /* The word/byte swap controls here control register access byte * swapping. DMA data byte swapping is controlled in the GRC_MODE -Index: linux-2.6.25.4/drivers/net/tg3.h -=================================================================== ---- linux-2.6.25.4.orig/drivers/net/tg3.h -+++ linux-2.6.25.4/drivers/net/tg3.h -@@ -2477,6 +2477,9 @@ struct tg3 { +--- a/drivers/net/tg3.h ++++ b/drivers/net/tg3.h +@@ -2477,6 +2477,9 @@ #define TG3_FLG3_ENABLE_APE 0x00000002 #define TG3_FLG3_5761_5784_AX_FIXES 0x00000004 #define TG3_FLG3_5701_DMA_BUG 0x00000008 @@ -1226,7 +1202,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.h struct timer_list timer; u16 timer_counter; -@@ -2532,6 +2535,7 @@ struct tg3 { +@@ -2532,6 +2535,7 @@ #define PHY_ID_BCM5714 0x60008340 #define PHY_ID_BCM5780 0x60008350 #define PHY_ID_BCM5755 0xbc050cc0 @@ -1234,7 +1210,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.h #define PHY_ID_BCM5787 0xbc050ce0 #define PHY_ID_BCM5756 0xbc050ed0 #define PHY_ID_BCM5784 0xbc050fa0 -@@ -2568,7 +2572,7 @@ struct tg3 { +@@ -2568,7 +2572,7 @@ (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \ (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \ (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \ @@ -1243,11 +1219,9 @@ Index: linux-2.6.25.4/drivers/net/tg3.h struct tg3_hw_stats *hw_stats; dma_addr_t stats_mapping; -Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c -+++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c -@@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco +--- a/drivers/ssb/driver_mipscore.c ++++ b/drivers/ssb/driver_mipscore.c +@@ -212,6 +212,7 @@ /* fallthrough */ case SSB_DEV_PCI: case SSB_DEV_ETHERNET: |