projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[brcm47xx] refresh kernel patches
[openwrt.git]
/
target
/
linux
/
brcm47xx
/
patches-2.6.23
/
700-ssb-gigabit-ethernet-driver.patch
diff --git
a/target/linux/brcm47xx/patches-2.6.23/700-ssb-gigabit-ethernet-driver.patch
b/target/linux/brcm47xx/patches-2.6.23/700-ssb-gigabit-ethernet-driver.patch
index
90346e2
..
c396395
100644
(file)
--- a/
target/linux/brcm47xx/patches-2.6.23/700-ssb-gigabit-ethernet-driver.patch
+++ b/
target/linux/brcm47xx/patches-2.6.23/700-ssb-gigabit-ethernet-driver.patch
@@
-1,25
+1,25
@@
-Index: linux-2.6.23.1
6
/drivers/ssb/Kconfig
+Index: linux-2.6.23.1
7
/drivers/ssb/Kconfig
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/ssb/Kconfig 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/ssb/Kconfig 2008-02-22 19:42:52.000000000 +0100
+--- linux-2.6.23.1
7.orig/drivers/ssb/Kconfig
++++ linux-2.6.23.1
7/drivers/ssb/Kconfig
@@ -120,4 +120,13 @@ config SSB_DRIVER_EXTIF
If unsure, say N
+config SSB_DRIVER_GIGE
@@ -120,4 +120,13 @@ config SSB_DRIVER_EXTIF
If unsure, say N
+config SSB_DRIVER_GIGE
-+ bool "SSB Broadcom Gigabit Ethernet driver
(EXPERIMENTAL)
"
-+ depends on SSB_PCIHOST_POSSIBLE && SSB_EMBEDDED && MIPS
&& EXPERIMENTAL
++ bool "SSB Broadcom Gigabit Ethernet driver"
++ depends on SSB_PCIHOST_POSSIBLE && SSB_EMBEDDED && MIPS
+ help
+ help
-+ Driver
the
the Sonics Silicon Backplane attached
++ Driver
for
the Sonics Silicon Backplane attached
+ Broadcom Gigabit Ethernet.
+
+ If unsure, say N
+
endmenu
+ Broadcom Gigabit Ethernet.
+
+ If unsure, say N
+
endmenu
-Index: linux-2.6.23.1
6
/drivers/ssb/Makefile
+Index: linux-2.6.23.1
7
/drivers/ssb/Makefile
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/ssb/Makefile 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/ssb/Makefile 2008-02-22 19:42:52.000000000 +0100
+--- linux-2.6.23.1
7.orig/drivers/ssb/Makefile
++++ linux-2.6.23.1
7/drivers/ssb/Makefile
@@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o
ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o
@@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o
ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o
@@
-28,11
+28,11
@@
Index: linux-2.6.23.16/drivers/ssb/Makefile
# b43 pci-ssb-bridge driver
# Not strictly a part of SSB, but kept here for convenience
# b43 pci-ssb-bridge driver
# Not strictly a part of SSB, but kept here for convenience
-Index: linux-2.6.23.1
6
/drivers/ssb/driver_gige.c
+Index: linux-2.6.23.1
7
/drivers/ssb/driver_gige.c
===================================================================
===================================================================
---- /dev/null
1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23.1
6/drivers/ssb/driver_gige.c 2008-02-28 12:26:18.000000000 +0100
-@@ -0,0 +1,2
86
@@
+--- /dev/null
++++ linux-2.6.23.1
7/drivers/ssb/driver_gige.c
+@@ -0,0 +1,2
94
@@
+/*
+ * Sonics Silicon Backplane
+ * Broadcom Gigabit Ethernet core driver
+/*
+ * Sonics Silicon Backplane
+ * Broadcom Gigabit Ethernet core driver
@@
-44,9
+44,9
@@
Index: linux-2.6.23.16/drivers/ssb/driver_gige.c
+ */
+
+#include <linux/ssb/ssb.h>
+ */
+
+#include <linux/ssb/ssb.h>
++#include <linux/ssb/ssb_driver_gige.h>
+#include <linux/pci.h>
+#include <linux/pci_regs.h>
+#include <linux/pci.h>
+#include <linux/pci_regs.h>
-+#include <linux/ssb/ssb_driver_gige.h>
+
+
+/*
+
+
+/*
@@
-271,6
+271,14
@@
Index: linux-2.6.23.16/drivers/ssb/driver_gige.c
+ return 0;
+}
+
+ return 0;
+}
+
++bool pdev_is_ssb_gige_core(struct pci_dev *pdev)
++{
++ if (!pdev->resource[0].name)
++ return 0;
++ return (strcmp(pdev->resource[0].name, SSB_GIGE_MEM_RES_NAME) == 0);
++}
++EXPORT_SYMBOL(pdev_is_ssb_gige_core);
++
+int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
+ struct pci_dev *pdev)
+{
+int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
+ struct pci_dev *pdev)
+{
@@
-319,11
+327,11
@@
Index: linux-2.6.23.16/drivers/ssb/driver_gige.c
+{
+ return ssb_driver_register(&ssb_gige_driver);
+}
+{
+ return ssb_driver_register(&ssb_gige_driver);
+}
-Index: linux-2.6.23.1
6
/include/linux/ssb/ssb_driver_gige.h
+Index: linux-2.6.23.1
7
/include/linux/ssb/ssb_driver_gige.h
===================================================================
===================================================================
---- /dev/null
1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23.1
6/include/linux/ssb/ssb_driver_gige.h 2008-02-22 20:47:58.000000000 +0100
-@@ -0,0 +1,17
8
@@
+--- /dev/null
++++ linux-2.6.23.1
7/include/linux/ssb/ssb_driver_gige.h
+@@ -0,0 +1,17
4
@@
+#ifndef LINUX_SSB_DRIVER_GIGE_H_
+#define LINUX_SSB_DRIVER_GIGE_H_
+
+#ifndef LINUX_SSB_DRIVER_GIGE_H_
+#define LINUX_SSB_DRIVER_GIGE_H_
+
@@
-376,11
+384,7
@@
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h
+};
+
+/* Check whether a PCI device is a SSB Gigabit Ethernet core. */
+};
+
+/* Check whether a PCI device is a SSB Gigabit Ethernet core. */
-+static inline bool pdev_is_ssb_gige_core(struct pci_dev *pdev)
-+{
-+ return (pdev->resource[0].name &&
-+ strcmp(pdev->resource[0].name, SSB_GIGE_MEM_RES_NAME) == 0);
-+}
++extern bool pdev_is_ssb_gige_core(struct pci_dev *pdev);
+
+/* Convert a pci_dev pointer to a ssb_gige pointer. */
+static inline struct ssb_gige * pdev_to_ssb_gige(struct pci_dev *pdev)
+
+/* Convert a pci_dev pointer to a ssb_gige pointer. */
+static inline struct ssb_gige * pdev_to_ssb_gige(struct pci_dev *pdev)
@@
-426,12
+430,12
@@
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h
+ return 0;
+}
+
+ return 0;
+}
+
-+extern char * nvram_get(const char *name);
//FIXME
++extern char * nvram_get(const char *name);
+/* Get the device MAC address */
+static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
+{
+#ifdef CONFIG_BCM947XX
+/* Get the device MAC address */
+static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
+{
+#ifdef CONFIG_BCM947XX
-+ char *res = nvram_get("et0macaddr");
//FIXME
++ char *res = nvram_get("et0macaddr");
+ if (res)
+ memcpy(macaddr, res, 6);
+#endif
+ if (res)
+ memcpy(macaddr, res, 6);
+#endif
@@
-502,10
+506,10
@@
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h
+
+#endif /* CONFIG_SSB_DRIVER_GIGE */
+#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
+
+#endif /* CONFIG_SSB_DRIVER_GIGE */
+#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
-Index: linux-2.6.23.1
6
/drivers/ssb/driver_pcicore.c
+Index: linux-2.6.23.1
7
/drivers/ssb/driver_pcicore.c
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/ssb/driver_pcicore.c 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/ssb/driver_pcicore.c 2008-02-22 19:42:52.000000000 +0100
+--- linux-2.6.23.1
7.orig/drivers/ssb/driver_pcicore.c
++++ linux-2.6.23.1
7/drivers/ssb/driver_pcicore.c
@@ -60,74 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
/* Core to access the external PCI config space. Can only have one. */
static struct ssb_pcicore *extpci_core;
@@ -60,74 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
/* Core to access the external PCI config space. Can only have one. */
static struct ssb_pcicore *extpci_core;
@@
-674,10
+678,10
@@
Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c
static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
{
u32 val;
static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
{
u32 val;
-Index: linux-2.6.23.1
6
/drivers/ssb/embedded.c
+Index: linux-2.6.23.1
7
/drivers/ssb/embedded.c
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/ssb/embedded.c 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/ssb/embedded.c 2008-02-22 19:42:52.000000000 +0100
+--- linux-2.6.23.1
7.orig/drivers/ssb/embedded.c
++++ linux-2.6.23.1
7/drivers/ssb/embedded.c
@@ -10,6 +10,9 @@
#include <linux/ssb/ssb.h>
@@ -10,6 +10,9 @@
#include <linux/ssb/ssb.h>
@@
-779,10
+783,10
@@
Index: linux-2.6.23.16/drivers/ssb/embedded.c
+
+ return -ENODEV;
+}
+
+ return -ENODEV;
+}
-Index: linux-2.6.23.1
6
/include/linux/ssb/ssb.h
+Index: linux-2.6.23.1
7
/include/linux/ssb/ssb.h
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/include/linux/ssb/ssb.h 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/include/linux/ssb/ssb.h 2008-02-22 19:42:52.000000000 +0100
+--- linux-2.6.23.1
7.orig/include/linux/ssb/ssb.h
++++ linux-2.6.23.1
7/include/linux/ssb/ssb.h
@@ -422,5 +422,12 @@ extern int ssb_bus_powerup(struct ssb_bu
extern u32 ssb_admatch_base(u32 adm);
extern u32 ssb_admatch_size(u32 adm);
@@ -422,5 +422,12 @@ extern int ssb_bus_powerup(struct ssb_bu
extern u32 ssb_admatch_base(u32 adm);
extern u32 ssb_admatch_size(u32 adm);
@@
-796,10
+800,10
@@
Index: linux-2.6.23.16/include/linux/ssb/ssb.h
+#endif /* CONFIG_SSB_EMBEDDED */
#endif /* LINUX_SSB_H_ */
+#endif /* CONFIG_SSB_EMBEDDED */
#endif /* LINUX_SSB_H_ */
-Index: linux-2.6.23.1
6
/include/linux/ssb/ssb_driver_pci.h
+Index: linux-2.6.23.1
7
/include/linux/ssb/ssb_driver_pci.h
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/include/linux/ssb/ssb_driver_pci.h 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/include/linux/ssb/ssb_driver_pci.h 2008-02-22 19:42:52.000000000 +0100
+--- linux-2.6.23.1
7.orig/include/linux/ssb/ssb_driver_pci.h
++++ linux-2.6.23.1
7/include/linux/ssb/ssb_driver_pci.h
@@ -1,6 +1,11 @@
#ifndef LINUX_SSB_PCICORE_H_
#define LINUX_SSB_PCICORE_H_
@@ -1,6 +1,11 @@
#ifndef LINUX_SSB_PCICORE_H_
#define LINUX_SSB_PCICORE_H_
@@
-839,10
+843,10
@@
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h
+
#endif /* CONFIG_SSB_DRIVER_PCICORE */
#endif /* LINUX_SSB_PCICORE_H_ */
+
#endif /* CONFIG_SSB_DRIVER_PCICORE */
#endif /* LINUX_SSB_PCICORE_H_ */
-Index: linux-2.6.23.1
6
/drivers/ssb/main.c
+Index: linux-2.6.23.1
7
/drivers/ssb/main.c
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/ssb/main.c 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/ssb/main.c 2008-02-22 19:42:52.000000000 +0100
+--- linux-2.6.23.1
7.orig/drivers/ssb/main.c
++++ linux-2.6.23.1
7/drivers/ssb/main.c
@@ -14,6 +14,7 @@
#include <linux/io.h>
#include <linux/ssb/ssb.h>
@@ -14,6 +14,7 @@
#include <linux/io.h>
#include <linux/ssb/ssb.h>
@@
-901,10
+905,10
@@
Index: linux-2.6.23.16/drivers/ssb/main.c
b43_pci_ssb_bridge_exit();
bus_unregister(&ssb_bustype);
}
b43_pci_ssb_bridge_exit();
bus_unregister(&ssb_bustype);
}
-Index: linux-2.6.23.1
6
/drivers/ssb/ssb_private.h
+Index: linux-2.6.23.1
7
/drivers/ssb/ssb_private.h
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/ssb/ssb_private.h 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/ssb/ssb_private.h 2008-02-22 19:42:52.000000000 +0100
+--- linux-2.6.23.1
7.orig/drivers/ssb/ssb_private.h
++++ linux-2.6.23.1
7/drivers/ssb/ssb_private.h
@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty
extern int ssb_devices_freeze(struct ssb_bus *bus);
extern int ssb_devices_thaw(struct ssb_bus *bus);
@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty
extern int ssb_devices_freeze(struct ssb_bus *bus);
extern int ssb_devices_thaw(struct ssb_bus *bus);
@@
-914,10
+918,10
@@
Index: linux-2.6.23.16/drivers/ssb/ssb_private.h
/* b43_pci_bridge.c */
#ifdef CONFIG_SSB_PCIHOST
/* b43_pci_bridge.c */
#ifdef CONFIG_SSB_PCIHOST
-Index: linux-2.6.23.1
6
/drivers/net/tg3.c
+Index: linux-2.6.23.1
7
/drivers/net/tg3.c
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/net/tg3.c 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/net/tg3.c 2008-02-28 12:28:17.000000000 +0100
+--- linux-2.6.23.1
7.orig/drivers/net/tg3.c
++++ linux-2.6.23.1
7/drivers/net/tg3.c
@@ -38,6 +38,7 @@
#include <linux/workqueue.h>
#include <linux/prefetch.h>
@@ -38,6 +38,7 @@
#include <linux/workqueue.h>
#include <linux/prefetch.h>
@@
-1201,10
+1205,10
@@
Index: linux-2.6.23.16/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
/* 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.23.1
6
/drivers/net/tg3.h
+Index: linux-2.6.23.1
7
/drivers/net/tg3.h
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/net/tg3.h 2008-02-22 19:40:57.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/net/tg3.h 2008-02-23 20:56:08.000000000 +0100
+--- linux-2.6.23.1
7.orig/drivers/net/tg3.h
++++ linux-2.6.23.1
7/drivers/net/tg3.h
@@ -2279,6 +2279,10 @@ struct tg3 {
#define TG3_FLG2_PHY_JITTER_BUG 0x20000000
#define TG3_FLG2_NO_FWARE_REPORTED 0x40000000
@@ -2279,6 +2279,10 @@ struct tg3 {
#define TG3_FLG2_PHY_JITTER_BUG 0x20000000
#define TG3_FLG2_NO_FWARE_REPORTED 0x40000000
@@
-1234,11
+1238,11
@@
Index: linux-2.6.23.16/drivers/net/tg3.h
struct tg3_hw_stats *hw_stats;
dma_addr_t stats_mapping;
struct tg3_hw_stats *hw_stats;
dma_addr_t stats_mapping;
-Index: linux-2.6.23.1
6
/drivers/ssb/driver_mipscore.c
+Index: linux-2.6.23.1
7
/drivers/ssb/driver_mipscore.c
===================================================================
===================================================================
---- linux-2.6.23.1
6.orig/drivers/ssb/driver_mipscore.c 2008-02-20 20:02:43.000000000 +0100
-+++ linux-2.6.23.1
6/drivers/ssb/driver_mipscore.c 2008-02-28 12:16:12.000000000 +0100
-@@ -21
1,6 +211
,7 @@ void ssb_mipscore_init(struct ssb_mipsco
+--- linux-2.6.23.1
7.orig/drivers/ssb/driver_mipscore.c
++++ linux-2.6.23.1
7/drivers/ssb/driver_mipscore.c
+@@ -21
2,6 +212
,7 @@ void ssb_mipscore_init(struct ssb_mipsco
/* fallthrough */
case SSB_DEV_PCI:
case SSB_DEV_ETHERNET:
/* fallthrough */
case SSB_DEV_PCI:
case SSB_DEV_ETHERNET:
This page took
0.033491 seconds
and
4
git commands to generate.