aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2006-10-27 12:32:10 +0000
committerImre Kaloz <kaloz@openwrt.org>2006-10-27 12:32:10 +0000
commit3dace10f8be1d44b8890c5ae4dec99f8897552d6 (patch)
tree8921e1edcc1b14d1af83d488bd2de9b160f8b441 /target/linux/generic-2.6/patches
parentf8aa6c7c8f3af42341da4747e227e2dbdb1bf6f8 (diff)
downloadupstream-3dace10f8be1d44b8890c5ae4dec99f8897552d6.tar.gz
upstream-3dace10f8be1d44b8890c5ae4dec99f8897552d6.tar.bz2
upstream-3dace10f8be1d44b8890c5ae4dec99f8897552d6.zip
add redboot parsing and rtl8169 fixes, enable r8169 and add the free ixp4xx ethernet driver - the later still needs fixes and testing for the gateway 7001
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5311 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches')
-rw-r--r--target/linux/generic-2.6/patches/050-mtdpart_redboot_byteswap_partition_truncate.patch61
-rw-r--r--target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch35
2 files changed, 96 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches/050-mtdpart_redboot_byteswap_partition_truncate.patch b/target/linux/generic-2.6/patches/050-mtdpart_redboot_byteswap_partition_truncate.patch
new file mode 100644
index 0000000000..3aa60e0d9b
--- /dev/null
+++ b/target/linux/generic-2.6/patches/050-mtdpart_redboot_byteswap_partition_truncate.patch
@@ -0,0 +1,61 @@
+--- linux-2.6.18/drivers/mtd/redboot.c.orig 2006-10-23 11:41:56.000000000 -0400
++++ linux-2.6.18/drivers/mtd/redboot.c 2006-10-23 11:42:09.000000000 -0400
+@@ -92,22 +92,47 @@
+ * swab32(erasesize) then we know we are looking at
+ * a byte swapped FIS directory - swap all the entries!
+ * (NOTE: this is 'size' not 'data_length'; size is
+- * the full size of the entry.)
++ * the full size of the entry.)
++ *
++ * Handle cases where the FIS directory is less than
++ * a full erase block (like combine FIS directory
++ * and RedBoot config).
++ *
++ * IMHO the best solution would be to compute the
++ * flash address of the RedBoot FIS directory and
++ * compare that with the entry in the FIS directory
++ * entry swabbed. However, I haven't yet figured out
++ * how to compute that.
+ */
+- if (swab32(buf[i].size) == master->erasesize) {
++
++ unsigned long erasesize_mask = master->erasesize -1;
++ unsigned long eraseaddr_mask = 0xFFFFFFFF ^ erasesize_mask;
++
++ if (((swab32(buf[i].size)+erasesize_mask)
++ & eraseaddr_mask) == master->erasesize) {
+ int j;
+- for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) {
++
++ /* N.B. The full table being processed so adjust size now */
++ numslots = swab32(buf[i].size) / sizeof (struct fis_image_desc);
++ for (j = 0; j < numslots; ++j) {
+ /* The unsigned long fields were written with the
+ * wrong byte sex, name and pad have no byte sex.
+- */
+- swab32s(&buf[j].flash_base);
+- swab32s(&buf[j].mem_base);
+- swab32s(&buf[j].size);
+- swab32s(&buf[j].entry_point);
+- swab32s(&buf[j].data_length);
+- swab32s(&buf[j].desc_cksum);
+- swab32s(&buf[j].file_cksum);
++ *
++ * Only process non-deleted entries. Don't exit early.
++ */
++ if (buf[j].name[0] != 0xff) {
++ swab32s(&buf[j].flash_base);
++ swab32s(&buf[j].mem_base);
++ swab32s(&buf[j].size);
++ swab32s(&buf[j].entry_point);
++ swab32s(&buf[j].data_length);
++ swab32s(&buf[j].desc_cksum);
++ swab32s(&buf[j].file_cksum);
++ }
+ }
++ } else {
++ /* Update numslots based on actual FIS directory size */
++ numslots = buf[i].size / sizeof (struct fis_image_desc);
+ }
+ break;
+ }
diff --git a/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch
new file mode 100644
index 0000000000..5d48342e63
--- /dev/null
+++ b/target/linux/generic-2.6/patches/208-rtl8110sb_fix.patch
@@ -0,0 +1,35 @@
+diff -Nur linux-2.6.17/drivers/net/r8169.c linux-2.6.17-owrt/drivers/net/r8169.c
+--- linux-2.6.17/drivers/net/r8169.c 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.17-owrt/drivers/net/r8169.c 2006-10-27 13:18:46.000000000 +0200
+@@ -483,7 +483,7 @@
+ #endif
+
+ static const u16 rtl8169_intr_mask =
+- SYSErr | LinkChg | RxOverflow | RxFIFOOver | TxErr | TxOK | RxErr | RxOK;
++ LinkChg | RxOverflow | RxFIFOOver | TxErr | TxOK | RxErr | RxOK;
+ static const u16 rtl8169_napi_event =
+ RxOK | RxOverflow | RxFIFOOver | TxOK | TxErr;
+ static const unsigned int rtl8169_rx_config =
+@@ -1832,8 +1832,8 @@
+ */
+ RTL_W16(IntrMitigate, 0x0000);
+
+- RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr & DMA_32BIT_MASK));
+ RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr >> 32));
++ RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr & DMA_32BIT_MASK));
+ RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr & DMA_32BIT_MASK));
+ RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr >> 32));
+ RTL_W8(Cfg9346, Cfg9346_Lock);
+@@ -2535,10 +2535,12 @@
+ if (!(status & rtl8169_intr_mask))
+ break;
+
++#if 0
+ if (unlikely(status & SYSErr)) {
+ rtl8169_pcierr_interrupt(dev);
+ break;
+ }
++#endif
+
+ if (status & LinkChg)
+ rtl8169_check_link_status(dev, tp, ioaddr);