Author: jim
Date: 2005-12-02 00:43:06 -0700 (Fri, 02 Dec 2005)
New Revision: 1289
Modified:
trunk/
trunk/linux/linux-2.6.14.3-mips_fix-1.patch
Log:
[EMAIL PROTECTED]: jim | 2005-12-01 23:42:48 -0800
Updated mips_fix patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1567
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1569
Modified: trunk/linux/linux-2.6.14.3-mips_fix-1.patch
===================================================================
--- trunk/linux/linux-2.6.14.3-mips_fix-1.patch 2005-12-01 23:55:44 UTC (rev
1288)
+++ trunk/linux/linux-2.6.14.3-mips_fix-1.patch 2005-12-02 07:43:06 UTC (rev
1289)
@@ -4,10 +4,20 @@
Origin: Linux-MIPS, Gentoo, and Debian
Upstream Status: N/A
Description: Various Fixes for MIPS architectures
-
-diff -Naur linux-mips-2.6.14.orig/arch/mips/lib/iomap.c
linux-mips-2.6.14/arch/mips/lib/iomap.c
---- linux-mips-2.6.14.orig/arch/mips/lib/iomap.c 1969-12-31
16:00:00.000000000 -0800
-+++ linux-mips-2.6.14/arch/mips/lib/iomap.c 2005-11-17 14:58:18.000000000
-0800
+
+diff -Naur linux-2.6.14.2.orig/arch/mips/lib/Makefile
linux-2.6.14.2/arch/mips/lib/Makefile
+--- linux-2.6.14.2.orig/arch/mips/lib/Makefile 2005-11-29 22:54:59.000000000
+0000
++++ linux-2.6.14.2/arch/mips/lib/Makefile 2005-12-02 07:38:12.000000000
+0000
+@@ -5,4 +5,6 @@
+ lib-y += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
+ strnlen_user.o uncached.o
+
++obj-y += iomap.o
++
+ EXTRA_AFLAGS := $(CFLAGS)
+diff -Naur linux-2.6.14.2.orig/arch/mips/lib/iomap.c
linux-2.6.14.2/arch/mips/lib/iomap.c
+--- linux-2.6.14.2.orig/arch/mips/lib/iomap.c 1970-01-01 00:00:00.000000000
+0000
++++ linux-2.6.14.2/arch/mips/lib/iomap.c 2005-12-02 07:38:12.000000000
+0000
@@ -0,0 +1,78 @@
+/*
+ * iomap.c, Memory Mapped I/O routines for MIPS architecture.
@@ -87,19 +97,9 @@
+}
+EXPORT_SYMBOL(pci_iomap);
+EXPORT_SYMBOL(pci_iounmap);
-diff -Naur linux-mips-2.6.14.orig/arch/mips/lib/Makefile
linux-mips-2.6.14/arch/mips/lib/Makefile
---- linux-mips-2.6.14.orig/arch/mips/lib/Makefile 2005-11-17
11:42:23.000000000 -0800
-+++ linux-mips-2.6.14/arch/mips/lib/Makefile 2005-11-17 14:58:18.000000000
-0800
-@@ -5,4 +5,6 @@
- lib-y += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \
- strnlen_user.o uncached.o
-
-+obj-y += iomap.o
-+
- EXTRA_AFLAGS := $(CFLAGS)
-diff -Naur linux-mips-2.6.14.orig/drivers/net/tulip/21142.c
linux-mips-2.6.14/drivers/net/tulip/21142.c
---- linux-mips-2.6.14.orig/drivers/net/tulip/21142.c 2005-11-17
11:43:12.000000000 -0800
-+++ linux-mips-2.6.14/drivers/net/tulip/21142.c 2005-11-17
21:52:47.000000000 -0800
+diff -Naur linux-2.6.14.2.orig/drivers/net/tulip/21142.c
linux-2.6.14.2/drivers/net/tulip/21142.c
+--- linux-2.6.14.2.orig/drivers/net/tulip/21142.c 2005-11-11
05:33:12.000000000 +0000
++++ linux-2.6.14.2/drivers/net/tulip/21142.c 2005-12-02 07:38:12.000000000
+0000
@@ -172,7 +172,7 @@
int i;
for (i = 0; i < tp->mtable->leafcount; i++)
@@ -109,9 +109,9 @@
tp->cur_index = i;
tulip_select_media(dev, startup);
setup_done = 1;
-diff -Naur linux-mips-2.6.14.orig/drivers/net/tulip/media.c
linux-mips-2.6.14/drivers/net/tulip/media.c
---- linux-mips-2.6.14.orig/drivers/net/tulip/media.c 2005-11-17
11:43:13.000000000 -0800
-+++ linux-mips-2.6.14/drivers/net/tulip/media.c 2005-11-17
21:52:47.000000000 -0800
+diff -Naur linux-2.6.14.2.orig/drivers/net/tulip/media.c
linux-2.6.14.2/drivers/net/tulip/media.c
+--- linux-2.6.14.2.orig/drivers/net/tulip/media.c 2005-11-11
05:33:12.000000000 +0000
++++ linux-2.6.14.2/drivers/net/tulip/media.c 2005-12-02 07:38:12.000000000
+0000
@@ -44,8 +44,10 @@
/* MII transceiver control section.
@@ -183,9 +183,26 @@
tmp_info = get_u16(&misc_info[1]);
if (tmp_info)
tp->advertising[phy_num] = tmp_info | 1;
-diff -Naur linux-mips-2.6.14.orig/drivers/net/tulip/tulip_core.c
linux-mips-2.6.14/drivers/net/tulip/tulip_core.c
---- linux-mips-2.6.14.orig/drivers/net/tulip/tulip_core.c 2005-11-17
11:43:13.000000000 -0800
-+++ linux-mips-2.6.14/drivers/net/tulip/tulip_core.c 2005-11-17
21:52:47.000000000 -0800
+diff -Naur linux-2.6.14.2.orig/drivers/net/tulip/tulip.h
linux-2.6.14.2/drivers/net/tulip/tulip.h
+--- linux-2.6.14.2.orig/drivers/net/tulip/tulip.h 2005-11-11
05:33:12.000000000 +0000
++++ linux-2.6.14.2/drivers/net/tulip/tulip.h 2005-12-02 07:38:13.000000000
+0000
+@@ -474,8 +474,11 @@
+ udelay(10);
+
+ if (!i)
+- printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed\n",
+- pci_name(tp->pdev));
++ printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed"
++ " (CSR5 0x%x CSR6 0x%x)\n",
++ pci_name(tp->pdev),
++ ioread32(ioaddr + CSR5),
++ ioread32(ioaddr + CSR6));
+ }
+ }
+
+diff -Naur linux-2.6.14.2.orig/drivers/net/tulip/tulip_core.c
linux-2.6.14.2/drivers/net/tulip/tulip_core.c
+--- linux-2.6.14.2.orig/drivers/net/tulip/tulip_core.c 2005-11-29
22:55:01.000000000 +0000
++++ linux-2.6.14.2/drivers/net/tulip/tulip_core.c 2005-12-02
07:38:13.000000000 +0000
@@ -22,7 +22,7 @@
#else
#define DRV_VERSION "1.1.13"
@@ -204,26 +221,9 @@
HAS_MII | HAS_MEDIA_TABLE | ALWAYS_CHECK_MII | HAS_ACPI | HAS_NWAY
| HAS_INTR_MITIGATION | HAS_PCI_MWI, t21142_timer },
-diff -Naur linux-mips-2.6.14.orig/drivers/net/tulip/tulip.h
linux-mips-2.6.14/drivers/net/tulip/tulip.h
---- linux-mips-2.6.14.orig/drivers/net/tulip/tulip.h 2005-11-17
11:43:13.000000000 -0800
-+++ linux-mips-2.6.14/drivers/net/tulip/tulip.h 2005-11-17
21:52:47.000000000 -0800
-@@ -474,8 +474,11 @@
- udelay(10);
-
- if (!i)
-- printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed\n",
-- pci_name(tp->pdev));
-+ printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed"
-+ " (CSR5 0x%x CSR6 0x%x)\n",
-+ pci_name(tp->pdev),
-+ ioread32(ioaddr + CSR5),
-+ ioread32(ioaddr + CSR6));
- }
- }
-
-diff -Naur linux-mips-2.6.14.orig/include/asm-mips/addrspace.h
linux-mips-2.6.14/include/asm-mips/addrspace.h
---- linux-mips-2.6.14.orig/include/asm-mips/addrspace.h 2005-11-17
11:44:26.000000000 -0800
-+++ linux-mips-2.6.14/include/asm-mips/addrspace.h 2005-11-17
14:58:18.000000000 -0800
+diff -Naur linux-2.6.14.2.orig/include/asm-mips/addrspace.h
linux-2.6.14.2/include/asm-mips/addrspace.h
+--- linux-2.6.14.2.orig/include/asm-mips/addrspace.h 2005-11-29
22:55:02.000000000 +0000
++++ linux-2.6.14.2/include/asm-mips/addrspace.h 2005-12-02
07:38:13.000000000 +0000
@@ -124,7 +124,7 @@
#define PHYS_TO_XKSEG_CACHED(p)
PHYS_TO_XKPHYS(K_CALG_COH_SHAREABLE,(p))
#define XKPHYS_TO_PHYS(p) ((p) & TO_PHYS_MASK)
@@ -233,9 +233,37 @@
#if defined (CONFIG_CPU_R4300)
\
|| defined (CONFIG_CPU_R4X00) \
-diff -Naur linux-mips-2.6.14.orig/include/asm-mips/cobalt/ide.h
linux-mips-2.6.14/include/asm-mips/cobalt/ide.h
---- linux-mips-2.6.14.orig/include/asm-mips/cobalt/ide.h 1969-12-31
16:00:00.000000000 -0800
-+++ linux-mips-2.6.14/include/asm-mips/cobalt/ide.h 2005-11-17
14:58:19.000000000 -0800
+diff -Naur linux-2.6.14.2.orig/include/asm-mips/cobalt/cpu-feature-overrides.h
linux-2.6.14.2/include/asm-mips/cobalt/cpu-feature-overrides.h
+--- linux-2.6.14.2.orig/include/asm-mips/cobalt/cpu-feature-overrides.h
1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.14.2/include/asm-mips/cobalt/cpu-feature-overrides.h
2005-12-02 07:38:13.000000000 +0000
+@@ -0,0 +1,24 @@
++/*
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2003, 2004 Chris Dearman
++ * Copyright (C) 2005 Ralf Baechle ([EMAIL PROTECTED])
++ */
++#ifndef __ASM_COBALT_MIPS_CPU_FEATURE_OVERRIDES_H
++#define __ASM_COBALT_MIPS_CPU_FEATURE_OVERRIDES_H
++
++#include <linux/config.h>
++
++/*
++ * CPU feature overrides for Cobalt Servers
++ */
++
++#ifdef CONFIG_64BIT
++#define cpu_has_llsc 0
++#else
++#define cpu_has_llsc 1
++#endif
++
++#endif /* __ASM_COBALT_MIPS_CPU_FEATURE_OVERRIDES_H */
+diff -Naur linux-2.6.14.2.orig/include/asm-mips/cobalt/ide.h
linux-2.6.14.2/include/asm-mips/cobalt/ide.h
+--- linux-2.6.14.2.orig/include/asm-mips/cobalt/ide.h 1970-01-01
00:00:00.000000000 +0000
++++ linux-2.6.14.2/include/asm-mips/cobalt/ide.h 2005-12-02
07:38:13.000000000 +0000
@@ -0,0 +1,83 @@
+
+/*
@@ -320,10 +348,10 @@
+
+#define __ide_mm_outsw writesw
+#define __ide_mm_outsl writesl
-diff -Naur linux-mips-2.6.14.orig/include/asm-mips/io.h
linux-mips-2.6.14/include/asm-mips/io.h
---- linux-mips-2.6.14.orig/include/asm-mips/io.h 2005-11-17
11:44:27.000000000 -0800
-+++ linux-mips-2.6.14/include/asm-mips/io.h 2005-11-17 14:58:19.000000000
-0800
-@@ -535,6 +535,62 @@
+diff -Naur linux-2.6.14.2.orig/include/asm-mips/io.h
linux-2.6.14.2/include/asm-mips/io.h
+--- linux-2.6.14.2.orig/include/asm-mips/io.h 2005-11-29 22:55:02.000000000
+0000
++++ linux-2.6.14.2/include/asm-mips/io.h 2005-12-02 07:38:32.000000000
+0000
+@@ -535,6 +535,34 @@
}
/*
@@ -355,63 +383,6 @@
+extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
+
+/*
-+ * Memory Mapped I/O
-+ */
-+#define ioread8(addr) readb(addr)
-+#define ioread16(addr) readw(addr)
-+#define ioread32(addr) readl(addr)
-+
-+#define iowrite8(b,addr) writeb(b,addr)
-+#define iowrite16(w,addr) writew(w,addr)
-+#define iowrite32(l,addr) writel(l,addr)
-+
-+#define ioread8_rep(a,b,c) readsb(a,b,c)
-+#define ioread16_rep(a,b,c) readsw(a,b,c)
-+#define ioread32_rep(a,b,c) readsl(a,b,c)
-+
-+#define iowrite8_rep(a,b,c) writesb(a,b,c)
-+#define iowrite16_rep(a,b,c) writesw(a,b,c)
-+#define iowrite32_rep(a,b,c) writesl(a,b,c)
-+
-+/* Create a virtual mapping cookie for an IO port range */
-+extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
-+extern void ioport_unmap(void __iomem *);
-+
-+/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
-+struct pci_dev;
-+extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long
max);
-+extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
-+
-+/*
* ISA space is 'always mapped' on currently supported MIPS systems, no need
* to explicitly ioremap() it. The fact that the ISA IO space is mapped
* to PAGE_OFFSET is pure coincidence - it does not mean ISA values
-
-diff -Naur linux-2.6.14.orig/include/asm-mips/cobalt/cpu-feature-overrides.h
linux-2.6.14/include/asm-mips/cobalt/cpu-feature-overrides.h
---- linux-2.6.14.orig/include/asm-mips/cobalt/cpu-feature-overrides.h
1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.14/include/asm-mips/cobalt/cpu-feature-overrides.h
2005-11-29 23:02:33.000000000 +0000
-@@ -0,0 +1,24 @@
-+/*
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License. See the file "COPYING" in the main directory of this archive
-+ * for more details.
-+ *
-+ * Copyright (C) 2003, 2004 Chris Dearman
-+ * Copyright (C) 2005 Ralf Baechle ([EMAIL PROTECTED])
-+ */
-+#ifndef __ASM_COBALT_MIPS_CPU_FEATURE_OVERRIDES_H
-+#define __ASM_COBALT_MIPS_CPU_FEATURE_OVERRIDES_H
-+
-+#include <linux/config.h>
-+
-+/*
-+ * CPU feature overrides for Cobalt Servers
-+ */
-+
-+#ifdef CONFIG_64BIT
-+#define cpu_has_llsc 0
-+#else
-+#define cpu_has_llsc 1
-+#endif
-+
-+#endif /* __ASM_COBALT_MIPS_CPU_FEATURE_OVERRIDES_H */
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
