Update patches for 2.6.17.
svn path=/dists/trunk/linux-2.6/; revision=6680
This commit is contained in:
parent
56f885702f
commit
8b338f0018
|
@ -1,7 +1,11 @@
|
|||
linux-2.6 (2.6.16+2.6.17-rc4-0experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
[ Frederik Schüler ]
|
||||
* New upstream release candidate.
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
* [mips] Update patches for 2.6.17.
|
||||
|
||||
-- Frederik Schüler <fs@debian.org> Fri, 12 May 2006 13:02:25 +0200
|
||||
|
||||
linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low
|
||||
|
|
|
@ -1,45 +1,22 @@
|
|||
## DP: Fix Makefile for compiles with modern toolchains.
|
||||
## DP: Add -mfix7000 to CONFIG_SGI_IP22
|
||||
## DP: Patch author: Thiemo Seufer <ths@networkno.de>
|
||||
## DP: Upstream status: Thiemo will go through the Makefile and completely
|
||||
## redo it. Until this happens, this patch is needed for Debian.
|
||||
## DP: Upstream status: unclear
|
||||
|
||||
From: Thiemo Seufer <ths@networkno.de>
|
||||
|
||||
Fix Makefile for compiles with modern toolchains.
|
||||
Add -mfix7000 to CONFIG_SGI_IP22
|
||||
|
||||
Signed-off-by: Thiemo Seufer <ths@networkno.de>
|
||||
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
|
||||
|
||||
--
|
||||
|
||||
diff -u -p -r1.186 Makefile
|
||||
--- a/arch/mips/Makefile 18 Dec 2004 01:15:52 -0000 1.186
|
||||
+++ b/arch/mips/Makefile 10 Jan 2005 22:10:32 -0000
|
||||
@@ -118,7 +118,7 @@ if $(CC) $$gcc_abi -S -o /dev/null -xc /
|
||||
else \
|
||||
gcc_abi=; gcc_isa=-$(5); \
|
||||
fi; \
|
||||
-gas_abi=-Wa,-$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
|
||||
+gas_abi=-Wa,-mabi=$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
|
||||
while :; do \
|
||||
for gas_opt in -Wa,-march= -Wa,-mcpu=; do \
|
||||
$(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \
|
||||
@@ -129,7 +129,7 @@ while :; do \
|
||||
break; \
|
||||
done; \
|
||||
if test "$(gcc-abi)" != "$(gas-abi)"; then \
|
||||
- gas_abi="-Wa,-$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
|
||||
+ gas_abi="-Wa,-mabi=$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
|
||||
fi; \
|
||||
if test "$$gcc_opt" = -march= && test -n "$$gcc_abi"; then \
|
||||
$(CC) $$gcc_abi $$gcc_opt$$gcc_cpu -S -o /dev/null \
|
||||
@@ -581,7 +597,7 @@ endif
|
||||
# will break.
|
||||
--- a/arch/mips/Makefile
|
||||
+++ b/arch/mips/Makefile
|
||||
@@ -478,7 +478,7 @@ load-$(CONFIG_PNX8550_JBS) += 0xffffffff
|
||||
# address by 8kb.
|
||||
#
|
||||
core-$(CONFIG_SGI_IP32) += arch/mips/sgi-ip32/
|
||||
-cflags-$(CONFIG_SGI_IP32) += -Iinclude/asm-mips/mach-ip32
|
||||
+cflags-$(CONFIG_SGI_IP32) += -Iinclude/asm-mips/mach-ip32 -Wa,-mfix7000
|
||||
load-$(CONFIG_SGI_IP32) += 0xffffffff80004000
|
||||
|
||||
#
|
||||
|
||||
core-$(CONFIG_SGI_IP22) += arch/mips/sgi-ip22/
|
||||
-cflags-$(CONFIG_SGI_IP22) += -Iinclude/asm-mips/mach-ip22
|
||||
+cflags-$(CONFIG_SGI_IP22) += -Iinclude/asm-mips/mach-ip22 -Wa,-mfix7000
|
||||
ifdef CONFIG_32BIT
|
||||
load-$(CONFIG_SGI_IP22) += 0xffffffff88002000
|
||||
endif
|
||||
|
|
|
@ -1,246 +0,0 @@
|
|||
SB1 1480 support for the sb1 network drivr.
|
||||
Status: in linux-mips git; still needs to be synced into mainline
|
||||
|
||||
--- linux-2.6/drivers/net/sb1250-mac.c 2006-03-05 19:35:04.000000000 +0000
|
||||
+++ mips.git/drivers/net/sb1250-mac.c 2006-03-05 18:51:16.000000000 +0000
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (C) 2001,2002,2003 Broadcom Corporation
|
||||
+ * Copyright (C) 2001,2002,2003,2004 Broadcom Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
@@ -43,6 +43,7 @@
|
||||
#define SBMAC_ETH0_HWADDR "40:00:00:00:01:00"
|
||||
#define SBMAC_ETH1_HWADDR "40:00:00:00:01:01"
|
||||
#define SBMAC_ETH2_HWADDR "40:00:00:00:01:02"
|
||||
+#define SBMAC_ETH3_HWADDR "40:00:00:00:01:03"
|
||||
#endif
|
||||
|
||||
|
||||
@@ -57,7 +58,7 @@
|
||||
|
||||
#define CONFIG_SBMAC_COALESCE
|
||||
|
||||
-#define MAX_UNITS 3 /* More are supported, limit only on options */
|
||||
+#define MAX_UNITS 4 /* More are supported, limit only on options */
|
||||
|
||||
/* Time in jiffies before concluding the transmitter is hung. */
|
||||
#define TX_TIMEOUT (2*HZ)
|
||||
@@ -85,11 +86,11 @@
|
||||
The media type is usually passed in 'options[]'.
|
||||
*/
|
||||
#ifdef MODULE
|
||||
-static int options[MAX_UNITS] = {-1, -1, -1};
|
||||
+static int options[MAX_UNITS] = {-1, -1, -1, -1};
|
||||
module_param_array(options, int, NULL, S_IRUGO);
|
||||
MODULE_PARM_DESC(options, "1-" __MODULE_STRING(MAX_UNITS));
|
||||
|
||||
-static int full_duplex[MAX_UNITS] = {-1, -1, -1};
|
||||
+static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1};
|
||||
module_param_array(full_duplex, int, NULL, S_IRUGO);
|
||||
MODULE_PARM_DESC(full_duplex, "1-" __MODULE_STRING(MAX_UNITS));
|
||||
#endif
|
||||
@@ -105,13 +106,26 @@
|
||||
#endif
|
||||
|
||||
#include <asm/sibyte/sb1250.h>
|
||||
-#include <asm/sibyte/sb1250_defs.h>
|
||||
+#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
|
||||
+#include <asm/sibyte/bcm1480_regs.h>
|
||||
+#include <asm/sibyte/bcm1480_int.h>
|
||||
+#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
|
||||
#include <asm/sibyte/sb1250_regs.h>
|
||||
-#include <asm/sibyte/sb1250_mac.h>
|
||||
-#include <asm/sibyte/sb1250_dma.h>
|
||||
#include <asm/sibyte/sb1250_int.h>
|
||||
+#else
|
||||
+#error invalid SiByte MAC configuation
|
||||
+#endif
|
||||
#include <asm/sibyte/sb1250_scd.h>
|
||||
+#include <asm/sibyte/sb1250_mac.h>
|
||||
+#include <asm/sibyte/sb1250_dma.h>
|
||||
|
||||
+#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
|
||||
+#define UNIT_INT(n) (K_BCM1480_INT_MAC_0 + ((n) * 2))
|
||||
+#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
|
||||
+#define UNIT_INT(n) (K_INT_MAC_0 + (n))
|
||||
+#else
|
||||
+#error invalid SiByte MAC configuation
|
||||
+#endif
|
||||
|
||||
/**********************************************************************
|
||||
* Simple types
|
||||
@@ -142,6 +156,10 @@
|
||||
|
||||
#define NUMCACHEBLKS(x) (((x)+SMP_CACHE_BYTES-1)/SMP_CACHE_BYTES)
|
||||
|
||||
+#define SBMAC_READCSR(t) __raw_readq((unsigned long)t)
|
||||
+#define SBMAC_WRITECSR(t,v) __raw_writeq(v, (unsigned long)t)
|
||||
+
|
||||
+
|
||||
#define SBMAC_MAX_TXDESCR 32
|
||||
#define SBMAC_MAX_RXDESCR 32
|
||||
|
||||
@@ -1476,10 +1494,10 @@
|
||||
* and make sure that RD_THRSH + WR_THRSH <=128 for pass2 and above
|
||||
* Use a larger RD_THRSH for gigabit
|
||||
*/
|
||||
- if (periph_rev >= 2)
|
||||
- th_value = 64;
|
||||
- else
|
||||
+ if (soc_type == K_SYS_SOC_TYPE_BCM1250 && periph_rev < 2)
|
||||
th_value = 28;
|
||||
+ else
|
||||
+ th_value = 64;
|
||||
|
||||
fifo = V_MAC_TX_WR_THRSH(4) | /* Must be '4' or '8' */
|
||||
((s->sbm_speed == sbmac_speed_1000)
|
||||
@@ -1589,13 +1607,17 @@
|
||||
* Turn on the rest of the bits in the enable register
|
||||
*/
|
||||
|
||||
+#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
|
||||
+ __raw_writeq(M_MAC_RXDMA_EN0 |
|
||||
+ M_MAC_TXDMA_EN0, s->sbm_macenable);
|
||||
+#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
|
||||
__raw_writeq(M_MAC_RXDMA_EN0 |
|
||||
M_MAC_TXDMA_EN0 |
|
||||
M_MAC_RX_ENABLE |
|
||||
M_MAC_TX_ENABLE, s->sbm_macenable);
|
||||
-
|
||||
-
|
||||
-
|
||||
+#else
|
||||
+#error invalid SiByte MAC configuation
|
||||
+#endif
|
||||
|
||||
#ifdef CONFIG_SBMAC_COALESCE
|
||||
/*
|
||||
@@ -1786,11 +1808,12 @@
|
||||
reg &= ~M_MAC_IPHDR_OFFSET | V_MAC_IPHDR_OFFSET(15);
|
||||
__raw_writeq(reg, sc->sbm_rxfilter);
|
||||
|
||||
- /* read system identification to determine revision */
|
||||
- if (periph_rev >= 2) {
|
||||
- sc->rx_hw_checksum = ENABLE;
|
||||
- } else {
|
||||
+ /* BCM1250 pass1 didn't have hardware checksum. Everything
|
||||
+ later does. */
|
||||
+ if (soc_type == K_SYS_SOC_TYPE_BCM1250 && periph_rev < 2) {
|
||||
sc->rx_hw_checksum = DISABLE;
|
||||
+ } else {
|
||||
+ sc->rx_hw_checksum = ENABLE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2220,7 +2243,7 @@
|
||||
|
||||
|
||||
|
||||
-#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR)
|
||||
+#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR) || defined(SBMAC_ETH3_HWADDR)
|
||||
/**********************************************************************
|
||||
* SBMAC_PARSE_XDIGIT(str)
|
||||
*
|
||||
@@ -2397,6 +2420,11 @@
|
||||
sc->sbm_dev->name);
|
||||
}
|
||||
|
||||
+ if (periph_rev >= 2) {
|
||||
+ printk(KERN_INFO "%s: enabling TCP rcv checksum\n",
|
||||
+ sc->sbm_dev->name);
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* Display Ethernet address (this is called during the config
|
||||
* process so we need to finish off the config message that
|
||||
@@ -2792,7 +2820,7 @@
|
||||
|
||||
|
||||
|
||||
-#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR)
|
||||
+#if defined(SBMAC_ETH0_HWADDR) || defined(SBMAC_ETH1_HWADDR) || defined(SBMAC_ETH2_HWADDR) || defined(SBMAC_ETH3_HWADDR)
|
||||
static void
|
||||
sbmac_setup_hwaddr(int chan,char *addr)
|
||||
{
|
||||
@@ -2818,25 +2846,7 @@
|
||||
unsigned long port;
|
||||
int chip_max_units;
|
||||
|
||||
- /*
|
||||
- * For bringup when not using the firmware, we can pre-fill
|
||||
- * the MAC addresses using the environment variables
|
||||
- * specified in this file (or maybe from the config file?)
|
||||
- */
|
||||
-#ifdef SBMAC_ETH0_HWADDR
|
||||
- sbmac_setup_hwaddr(0,SBMAC_ETH0_HWADDR);
|
||||
-#endif
|
||||
-#ifdef SBMAC_ETH1_HWADDR
|
||||
- sbmac_setup_hwaddr(1,SBMAC_ETH1_HWADDR);
|
||||
-#endif
|
||||
-#ifdef SBMAC_ETH2_HWADDR
|
||||
- sbmac_setup_hwaddr(2,SBMAC_ETH2_HWADDR);
|
||||
-#endif
|
||||
-
|
||||
- /*
|
||||
- * Walk through the Ethernet controllers and find
|
||||
- * those who have their MAC addresses set.
|
||||
- */
|
||||
+ /* Set the number of available units based on the SOC type. */
|
||||
switch (soc_type) {
|
||||
case K_SYS_SOC_TYPE_BCM1250:
|
||||
case K_SYS_SOC_TYPE_BCM1250_ALT:
|
||||
@@ -2848,6 +2858,10 @@
|
||||
case K_SYS_SOC_TYPE_BCM1250_ALT2: /* Hybrid */
|
||||
chip_max_units = 2;
|
||||
break;
|
||||
+ case K_SYS_SOC_TYPE_BCM1x55:
|
||||
+ case K_SYS_SOC_TYPE_BCM1x80:
|
||||
+ chip_max_units = 4;
|
||||
+ break;
|
||||
default:
|
||||
chip_max_units = 0;
|
||||
break;
|
||||
@@ -2855,6 +2869,32 @@
|
||||
if (chip_max_units > MAX_UNITS)
|
||||
chip_max_units = MAX_UNITS;
|
||||
|
||||
+ /*
|
||||
+ * For bringup when not using the firmware, we can pre-fill
|
||||
+ * the MAC addresses using the environment variables
|
||||
+ * specified in this file (or maybe from the config file?)
|
||||
+ */
|
||||
+#ifdef SBMAC_ETH0_HWADDR
|
||||
+ if (chip_max_units > 0)
|
||||
+ sbmac_setup_hwaddr(0,SBMAC_ETH0_HWADDR);
|
||||
+#endif
|
||||
+#ifdef SBMAC_ETH1_HWADDR
|
||||
+ if (chip_max_units > 1)
|
||||
+ sbmac_setup_hwaddr(1,SBMAC_ETH1_HWADDR);
|
||||
+#endif
|
||||
+#ifdef SBMAC_ETH2_HWADDR
|
||||
+ if (chip_max_units > 2)
|
||||
+ sbmac_setup_hwaddr(2,SBMAC_ETH2_HWADDR);
|
||||
+#endif
|
||||
+#ifdef SBMAC_ETH3_HWADDR
|
||||
+ if (chip_max_units > 3)
|
||||
+ sbmac_setup_hwaddr(3,SBMAC_ETH3_HWADDR);
|
||||
+#endif
|
||||
+
|
||||
+ /*
|
||||
+ * Walk through the Ethernet controllers and find
|
||||
+ * those who have their MAC addresses set.
|
||||
+ */
|
||||
for (idx = 0; idx < chip_max_units; idx++) {
|
||||
|
||||
/*
|
||||
@@ -2886,7 +2926,7 @@
|
||||
|
||||
printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port);
|
||||
|
||||
- dev->irq = K_INT_MAC_0 + idx;
|
||||
+ dev->irq = UNIT_INT(idx);
|
||||
dev->base_addr = port;
|
||||
dev->mem_end = 0;
|
||||
if (sbmac_init(dev, idx)) {
|
|
@ -11,12 +11,10 @@
|
|||
+ powerpc-mv643xx-hotplug-support.patch
|
||||
+ sparc64-hme-lockup.patch
|
||||
+ sparc64-atyfb-xl-gr.patch
|
||||
#FIXME + mips-makefile.patch
|
||||
#FIXME + mips-arch-makefile.patch
|
||||
+ mips-arch-makefile.patch
|
||||
+ mips-gettimeofday.patch
|
||||
+ mips-ide-scan.patch
|
||||
#FIXME + mips-sb1-probe-ide.patch
|
||||
#FIXME + mips-sb1-eth-1480.patch
|
||||
+ mips-sb1-probe-ide.patch
|
||||
+ mips-sb1-eth-napi.patch
|
||||
+ mips-sb1-duart.patch
|
||||
+ video-vino-64-bit-fix-kernel.diff
|
||||
|
|
Loading…
Reference in New Issue