Author: jim
Date: 2005-12-01 16:55:44 -0700 (Thu, 01 Dec 2005)
New Revision: 1288
Added:
trunk/linux/linux-2.6.14.3-cobalt_x86-1.patch
trunk/linux/linux-2.6.14.3-mips-1.patch
trunk/linux/linux-2.6.14.3-mips_fix-1.patch
trunk/linux/linux-2.6.14.3-tulip-1.patch
Modified:
trunk/
Log:
[EMAIL PROTECTED]: jim | 2005-12-01 15:50:28 -0800
Added linux-2.6.14.3 patches
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1549
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1567
Added: trunk/linux/linux-2.6.14.3-cobalt_x86-1.patch
===================================================================
--- trunk/linux/linux-2.6.14.3-cobalt_x86-1.patch 2005-11-30 10:31:45 UTC
(rev 1287)
+++ trunk/linux/linux-2.6.14.3-cobalt_x86-1.patch 2005-12-01 23:55:44 UTC
(rev 1288)
@@ -0,0 +1 @@
+link linux-2.6.14-cobalt_x86-1.patch
\ No newline at end of file
Property changes on: trunk/linux/linux-2.6.14.3-cobalt_x86-1.patch
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/linux/linux-2.6.14.3-mips-1.patch
===================================================================
--- trunk/linux/linux-2.6.14.3-mips-1.patch 2005-11-30 10:31:45 UTC (rev
1287)
+++ trunk/linux/linux-2.6.14.3-mips-1.patch 2005-12-01 23:55:44 UTC (rev
1288)
@@ -0,0 +1 @@
+link linux-2.6.14-mips-1.patch
\ No newline at end of file
Property changes on: trunk/linux/linux-2.6.14.3-mips-1.patch
___________________________________________________________________
Name: svn:special
+ *
Added: trunk/linux/linux-2.6.14.3-mips_fix-1.patch
===================================================================
--- trunk/linux/linux-2.6.14.3-mips_fix-1.patch 2005-11-30 10:31:45 UTC (rev
1287)
+++ trunk/linux/linux-2.6.14.3-mips_fix-1.patch 2005-12-01 23:55:44 UTC (rev
1288)
@@ -0,0 +1,417 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-11-29
+Initial Package Version: 2.6.14
+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
+@@ -0,0 +1,78 @@
++/*
++ * iomap.c, Memory Mapped I/O routines for MIPS architecture.
++ *
++ * This code is based on lib/iomap.c, by Linus Torvalds.
++ *
++ * Copyright (C) 2004-2005 Yoichi Yuasa <[EMAIL PROTECTED]>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++#include <linux/ioport.h>
++#include <linux/module.h>
++#include <linux/pci.h>
++
++#include <asm/io.h>
++
++void __iomem *ioport_map(unsigned long port, unsigned int nr)
++{
++ unsigned long end;
++
++ end = port + nr - 1UL;
++ if (ioport_resource.start > port ||
++ ioport_resource.end < end || port > end)
++ return NULL;
++
++ return (void __iomem *)(mips_io_port_base + port);
++}
++
++void ioport_unmap(void __iomem *addr)
++{
++}
++EXPORT_SYMBOL(ioport_map);
++EXPORT_SYMBOL(ioport_unmap);
++
++void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
++{
++ unsigned long start, len, flags;
++
++ if (dev == NULL)
++ return NULL;
++
++ start = pci_resource_start(dev, bar);
++ len = pci_resource_len(dev, bar);
++ if (!start || !len)
++ return NULL;
++
++ if (maxlen != 0 && len > maxlen)
++ len = maxlen;
++
++ flags = pci_resource_flags(dev, bar);
++ if (flags & IORESOURCE_IO)
++ return ioport_map(start, len);
++ if (flags & IORESOURCE_MEM) {
++ if (flags & IORESOURCE_CACHEABLE)
++ return ioremap_cacheable_cow(start, len);
++ return ioremap_nocache(start, len);
++ }
++
++ return NULL;
++}
++
++void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
++{
++ iounmap(addr);
++}
++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
+@@ -172,7 +172,7 @@
+ int i;
+ for (i = 0; i < tp->mtable->leafcount; i++)
+ if (tp->mtable->mleaf[i].media == dev->if_port)
{
+- int startup = ! ((tp->chip_id ==
DC21143 && (tp->revision == 48 || tp->revision == 65)));
++ int startup = ! ((tp->chip_id ==
DC21143 && tp->revision == 65));
+ 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
+@@ -44,8 +44,10 @@
+
+ /* MII transceiver control section.
+ Read and write the MII registers using software-generated serial
+- MDIO protocol. See the MII specifications or DP83840A data sheet
+- for details. */
++ MDIO protocol.
++ See IEEE 802.3-2002.pdf (Section 2, Chapter "22.2.4 Management functions")
++ or DP83840A data sheet for more details.
++ */
+
+ int tulip_mdio_read(struct net_device *dev, int phy_id, int location)
+ {
+@@ -261,24 +263,56 @@
+ u16 *reset_sequence =
&((u16*)(p+3))[init_length];
+ int reset_length = p[2 + init_length*2];
+ misc_info = reset_sequence + reset_length;
+- if (startup)
++ if (startup) {
++ int timeout = 10; /* max 1 ms */
+ for (i = 0; i < reset_length; i++)
+
iowrite32(get_u16(&reset_sequence[i]) << 16, ioaddr + CSR15);
++
++ /* flush posted writes */
++ ioread32(ioaddr + CSR15);
++
++ /* Sect 3.10.3 in DP83840A.pdf (p39) */
++ udelay(500);
++
++ /* Section 4.2 in DP83840A.pdf (p43) */
++ /* and IEEE 802.3 "22.2.4.1.1 Reset" */
++ while (timeout-- &&
++ (tulip_mdio_read (dev, phy_num,
MII_BMCR) & BMCR_RESET))
++ udelay(100);
++ }
+ for (i = 0; i < init_length; i++)
+ iowrite32(get_u16(&init_sequence[i]) <<
16, ioaddr + CSR15);
++
++ ioread32(ioaddr + CSR15); /* flush posted
writes */
+ } else {
+ u8 *init_sequence = p + 2;
+ u8 *reset_sequence = p + 3 + init_length;
+ int reset_length = p[2 + init_length];
+ misc_info = (u16*)(reset_sequence +
reset_length);
+ if (startup) {
++ int timeout = 10; /* max 1 ms */
+ iowrite32(mtable->csr12dir | 0x100,
ioaddr + CSR12);
+ for (i = 0; i < reset_length; i++)
+ iowrite32(reset_sequence[i],
ioaddr + CSR12);
++
++ /* flush posted writes */
++ ioread32(ioaddr + CSR12);
++
++ /* Sect 3.10.3 in DP83840A.pdf (p39) */
++ udelay(500);
++
++ /* Section 4.2 in DP83840A.pdf (p43) */
++ /* and IEEE 802.3 "22.2.4.1.1 Reset" */
++ while (timeout-- &&
++ (tulip_mdio_read (dev, phy_num,
MII_BMCR) & BMCR_RESET))
++ udelay(100);
+ }
+ for (i = 0; i < init_length; i++)
+ iowrite32(init_sequence[i], ioaddr +
CSR12);
++
++ ioread32(ioaddr + CSR12); /* flush posted
writes */
+ }
++
+ 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
+@@ -22,7 +22,7 @@
+ #else
+ #define DRV_VERSION "1.1.13"
+ #endif
+-#define DRV_RELDATE "May 11, 2002"
++#define DRV_RELDATE "December 15, 2004"
+
+
+ #include <linux/module.h>
+@@ -148,7 +148,7 @@
+ HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_PCI_MWI, tulip_timer },
+
+ /* DC21142, DC21143 */
+- { "Digital DS21143 Tulip", 128, 0x0801fbff,
++ { "Digital DS21142/DS21143 Tulip", 128, 0x0801fbff,
+ 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
+@@ -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)
+ #define PHYS_TO_XKPHYS(cm,a) (_LLCONST_(0x8000000000000000) | \
+- ((cm)<<59) | (a))
++ ((unsigned long)(cm)<<59) | (a))
+
+ #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
+@@ -0,0 +1,83 @@
++
++/*
++ * PIO "in" transfers can cause D-cache lines to be allocated
++ * to the data being read. If the target is the page cache then
++ * the kernel can create a user space mapping of the same page
++ * without flushing it from the D-cache. This has large potential
++ * to create cache aliases. The Cobalts seem to trigger this
++ * problem easily.
++ *
++ * MIPs doesn't have a flush_dcache_range() so we roll
++ * our own.
++ *
++ * -- pdh
++ */
++
++#define MAX_HWIFS 2
++
++#include <asm/r4kcache.h>
++
++static inline void __flush_dcache(void)
++{
++ unsigned long dc_size, dc_line, addr, end;
++
++ dc_size = current_cpu_data.dcache.ways <<
current_cpu_data.dcache.waybit;
++ dc_line = current_cpu_data.dcache.linesz;
++
++ addr = CKSEG0;
++ end = addr + dc_size;
++
++ for (; addr < end; addr += dc_line)
++ flush_dcache_line_indexed(addr);
++}
++
++static inline void __flush_dcache_range(unsigned long start, unsigned long
end)
++{
++ unsigned long dc_size, dc_line, addr;
++
++ dc_size = current_cpu_data.dcache.ways <<
current_cpu_data.dcache.waybit;
++ dc_line = current_cpu_data.dcache.linesz;
++
++ addr = start & ~(dc_line - 1);
++ end += dc_line - 1;
++
++ if (end - addr < dc_size)
++ for (; addr < end; addr += dc_line)
++ flush_dcache_line(addr);
++ else
++ __flush_dcache();
++}
++
++static inline void __ide_insw(unsigned long port, void *addr, unsigned int
count)
++{
++ insw(port, addr, count);
++
++ __flush_dcache_range((unsigned long) addr, (unsigned long) addr + count
* 2);
++}
++
++static inline void __ide_insl(unsigned long port, void *addr, unsigned int
count)
++{
++ insl(port, addr, count);
++
++ __flush_dcache_range((unsigned long) addr, (unsigned long) addr + count
* 4);
++}
++
++static inline void __ide_mm_insw(volatile void __iomem *port, void *addr,
unsigned int count)
++{
++ readsw(port, addr, count);
++
++ __flush_dcache_range((unsigned long) addr, (unsigned long) addr + count
* 2);
++}
++
++static inline void __ide_mm_insl(volatile void __iomem *port, void *addr,
unsigned int count)
++{
++ readsl(port, addr, count);
++
++ __flush_dcache_range((unsigned long) addr, (unsigned long) addr + count
* 4);
++}
++
++#define insw __ide_insw
++#define insl __ide_insl
++
++#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 @@
+ }
+
+ /*
++ * 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 *);
++
++/*
++ * 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 */
Added: trunk/linux/linux-2.6.14.3-tulip-1.patch
===================================================================
--- trunk/linux/linux-2.6.14.3-tulip-1.patch 2005-11-30 10:31:45 UTC (rev
1287)
+++ trunk/linux/linux-2.6.14.3-tulip-1.patch 2005-12-01 23:55:44 UTC (rev
1288)
@@ -0,0 +1 @@
+link linux-2.6.14-tulip-1.patch
\ No newline at end of file
Property changes on: trunk/linux/linux-2.6.14.3-tulip-1.patch
___________________________________________________________________
Name: svn:special
+ *
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
