r3913 - trunk/kernel/source/linux-2.6/debian/patches-debian
Sven Luther
luther at costa.debian.org
Tue Aug 16 09:49:16 UTC 2005
Author: luther
Date: 2005-08-16 09:49:15 +0000 (Tue, 16 Aug 2005)
New Revision: 3913
Added:
trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-serial-of.patch
Log:
Added a clean version of the powerpc OF patch, not yet applied though.
Added: trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-serial-of.patch
===================================================================
--- trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-serial-of.patch 2005-08-16 09:47:11 UTC (rev 3912)
+++ trunk/kernel/source/linux-2.6/debian/patches-debian/powerpc-serial-of.patch 2005-08-16 09:49:15 UTC (rev 3913)
@@ -0,0 +1,442 @@
+# Description: Adds a new OF-based serial driver instead of the bit-banging # one.
+# Patch author: David Woodhouse <dwmw2 at infradead.org>
+# Upstream status: Well, this should replace the hacky workaround
+# introduced in the powerpc-serial patch. not yet enabled though as i am
+# unsure how this will work on PReP hardware.
+
+--- linux-2.6.12/drivers/serial/Makefile~ 2005-08-11 13:51:50.000000000 +0100
++++ linux-2.6.12/drivers/serial/Makefile 2005-08-15 21:08:49.000000000 +0100
+@@ -22,6 +22,7 @@ obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250
+ obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
+ obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
+ obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
++obj-$(CONFIG_SERIAL_8250_OF) += 8250_of.o
+ obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
+ obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
+ obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
+--- linux-2.6.12/drivers/serial/8250_of.c~ 2005-08-15 21:14:27.000000000 +0100
++++ linux-2.6.12/drivers/serial/8250_of.c 2005-08-15 21:20:59.000000000 +0100
+@@ -0,0 +1,199 @@
++#include <linux/kernel.h>
++#include <linux/serial.h>
++#include <linux/serial_8250.h>
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/pci.h>
++#include <asm/serial.h>
++#include <asm/prom.h>
++
++#if 0
++#define DBG(fmt...) printk(KERN_DEBUG fmt)
++#else
++#define DBG(fmt) do { } while (0)
++#endif
++
++/*
++ * This function can be used by platforms to "find" legacy serial ports.
++ * It works for "serial" nodes under an "isa" node, and will try to
++ * respect the "ibm,aix-loc" property if any. It works with up to 8
++ * ports.
++ */
++
++#define MAX_LEGACY_SERIAL_PORTS 8
++static int ports_probed = 0;
++
++static struct plat_serial8250_port serial_ports[MAX_LEGACY_SERIAL_PORTS+1];
++static unsigned int old_serial_count;
++
++void __init generic_find_legacy_serial_ports(u64 *physport,
++ unsigned int *default_speed)
++{
++ struct device_node *np;
++ u32 *sizeprop;
++
++ struct isa_reg_property {
++ u32 space;
++ u32 address;
++ u32 size;
++ };
++
++ DBG(" -> generic_find_legacy_serial_port()\n");
++ ports_probed = 1;
++
++ *physport = 0;
++ if (default_speed)
++ *default_speed = 0;
++
++ np = of_find_node_by_path("/");
++ if (!np)
++ return;
++
++ /* First fill our array */
++ for (np = NULL; (np = of_find_node_by_type(np, "serial"));) {
++ struct device_node *isa, *pci;
++ struct isa_reg_property *reg;
++ unsigned long phys_size, addr_size;
++ u64 io_base;
++ u32 *rangesp;
++ u32 *interrupts, *clk, *spd;
++ char *typep;
++ int index, rlen, rentsize;
++
++ /* Ok, first check if it's under an "isa" parent */
++ isa = of_get_parent(np);
++ if (!isa || strcmp(isa->name, "isa")) {
++ DBG("%s: no isa parent found\n", np->full_name);
++ continue;
++ }
++
++ /* Now look for an "ibm,aix-loc" property that gives us ordering
++ * if any...
++ */
++ typep = (char *)get_property(np, "ibm,aix-loc", NULL);
++
++ /* Get the ISA port number */
++ reg = (struct isa_reg_property *)get_property(np, "reg", NULL);
++ if (reg == NULL)
++ goto next_port;
++ /* We assume the interrupt number isn't translated ... */
++ interrupts = (u32 *)get_property(np, "interrupts", NULL);
++ /* get clock freq. if present */
++ clk = (u32 *)get_property(np, "clock-frequency", NULL);
++ /* get default speed if present */
++ spd = (u32 *)get_property(np, "current-speed", NULL);
++ /* Default to locate at end of array */
++ index = old_serial_count; /* end of the array by default */
++
++ /* If we have a location index, then use it */
++ if (typep && *typep == 'S') {
++ index = simple_strtol(typep+1, NULL, 0) - 1;
++ /* if index is out of range, use end of array instead */
++ if (index >= MAX_LEGACY_SERIAL_PORTS)
++ index = old_serial_count;
++ /* if our index is still out of range, that mean that
++ * array is full, we could scan for a free slot but that
++ * make little sense to bother, just skip the port
++ */
++ if (index >= MAX_LEGACY_SERIAL_PORTS)
++ goto next_port;
++ if (index >= old_serial_count)
++ old_serial_count = index + 1;
++ /* Check if there is a port who already claimed our slot */
++ if (serial_ports[index].iobase != 0) {
++ /* if we still have some room, move it, else override */
++ if (old_serial_count < MAX_LEGACY_SERIAL_PORTS) {
++ DBG("Moved legacy port %d -> %d\n", index,
++ old_serial_count);
++ serial_ports[old_serial_count++] =
++ serial_ports[index];
++ } else {
++ DBG("Replacing legacy port %d\n", index);
++ }
++ }
++ }
++ if (index >= MAX_LEGACY_SERIAL_PORTS)
++ goto next_port;
++ if (index >= old_serial_count)
++ old_serial_count = index + 1;
++
++ /* Now fill the entry */
++ memset(&serial_ports[index], 0, sizeof(struct plat_serial8250_port));
++ serial_ports[index].uartclk = (clk && *clk) ? *clk : BASE_BAUD * 16;
++ serial_ports[index].iobase = reg->address;
++ serial_ports[index].irq = interrupts ? interrupts[0] : 0;
++ serial_ports[index].flags = ASYNC_BOOT_AUTOCONF;
++
++ DBG("Added legacy port, index: %d, port: %x, irq: %d, clk: %d\n",
++ index,
++ serial_ports[index].iobase,
++ serial_ports[index].irq,
++ serial_ports[index].uartclk);
++
++ /* Get phys address of IO reg for port 1 */
++ if (index != 0)
++ goto next_port;
++
++ pci = of_get_parent(isa);
++ if (!pci) {
++ DBG("%s: no pci parent found\n", np->full_name);
++ goto next_port;
++ }
++
++ rangesp = (u32 *)get_property(pci, "ranges", &rlen);
++ if (rangesp == NULL) {
++ of_node_put(pci);
++ goto next_port;
++ }
++ rlen /= 4;
++
++ /* we need the #size-cells of the PCI bridge node itself */
++ phys_size = 1;
++ sizeprop = (u32 *)get_property(pci, "#size-cells", NULL);
++ if (sizeprop != NULL)
++ phys_size = *sizeprop;
++ /* we need the parent #addr-cells */
++ addr_size = prom_n_addr_cells(pci);
++ rentsize = 3 + addr_size + phys_size;
++ io_base = 0;
++ for (;rlen >= rentsize; rlen -= rentsize,rangesp += rentsize) {
++ if (((rangesp[0] >> 24) & 0x3) != 1)
++ continue; /* not IO space */
++ io_base = rangesp[3];
++ if (addr_size == 2)
++ io_base = (io_base << 32) | rangesp[4];
++ }
++ if (io_base != 0) {
++ *physport = io_base + reg->address;
++ if (default_speed && spd)
++ *default_speed = *spd;
++ }
++ of_node_put(pci);
++ next_port:
++ of_node_put(isa);
++ }
++
++ DBG(" <- generic_find_legacy_serial_port()\n");
++}
++
++static struct platform_device serial_device = {
++ .name = "serial8250",
++ .id = 0,
++ .dev = {
++ .platform_data = serial_ports,
++ },
++};
++
++static int __init serial_dev_init(void)
++{
++ u64 phys;
++ unsigned int spd;
++
++ if (!ports_probed)
++ generic_find_legacy_serial_ports(&phys, &spd);
++ return platform_device_register(&serial_device);
++}
++arch_initcall(serial_dev_init);
++
++
+--- linux-2.6.12/drivers/serial/Kconfig~ 2005-08-11 13:51:50.000000000 +0100
++++ linux-2.6.12/drivers/serial/Kconfig 2005-08-15 21:13:41.000000000 +0100
+@@ -77,6 +77,11 @@ config SERIAL_8250_CS
+
+ If unsure, say N.
+
++config SERIAL_8250_OF
++ bool
++ default y
++ depends on PPC_OF && SERIAL_8250 != n
++
+ config SERIAL_8250_ACPI
+ bool "8250/16550 device discovery via ACPI namespace"
+ default y if IA64
+--- linux-2.6.12/arch/ppc64/kernel/setup.c~ 2005-08-11 13:52:04.000000000 +0100
++++ linux-2.6.12/arch/ppc64/kernel/setup.c 2005-08-15 20:27:25.000000000 +0100
+@@ -1147,186 +1147,6 @@ void __init setup_default_decr(void)
+ lpaca->next_jiffy_update_tb = get_tb() + tb_ticks_per_jiffy;
+ }
+
+-#ifndef CONFIG_PPC_ISERIES
+-/*
+- * This function can be used by platforms to "find" legacy serial ports.
+- * It works for "serial" nodes under an "isa" node, and will try to
+- * respect the "ibm,aix-loc" property if any. It works with up to 8
+- * ports.
+- */
+-
+-#define MAX_LEGACY_SERIAL_PORTS 8
+-static struct plat_serial8250_port serial_ports[MAX_LEGACY_SERIAL_PORTS+1];
+-static unsigned int old_serial_count;
+-
+-void __init generic_find_legacy_serial_ports(u64 *physport,
+- unsigned int *default_speed)
+-{
+- struct device_node *np;
+- u32 *sizeprop;
+-
+- struct isa_reg_property {
+- u32 space;
+- u32 address;
+- u32 size;
+- };
+- struct pci_reg_property {
+- struct pci_address addr;
+- u32 size_hi;
+- u32 size_lo;
+- };
+-
+- DBG(" -> generic_find_legacy_serial_port()\n");
+-
+- *physport = 0;
+- if (default_speed)
+- *default_speed = 0;
+-
+- np = of_find_node_by_path("/");
+- if (!np)
+- return;
+-
+- /* First fill our array */
+- for (np = NULL; (np = of_find_node_by_type(np, "serial"));) {
+- struct device_node *isa, *pci;
+- struct isa_reg_property *reg;
+- unsigned long phys_size, addr_size, io_base;
+- u32 *rangesp;
+- u32 *interrupts, *clk, *spd;
+- char *typep;
+- int index, rlen, rentsize;
+-
+- /* Ok, first check if it's under an "isa" parent */
+- isa = of_get_parent(np);
+- if (!isa || strcmp(isa->name, "isa")) {
+- DBG("%s: no isa parent found\n", np->full_name);
+- continue;
+- }
+-
+- /* Now look for an "ibm,aix-loc" property that gives us ordering
+- * if any...
+- */
+- typep = (char *)get_property(np, "ibm,aix-loc", NULL);
+-
+- /* Get the ISA port number */
+- reg = (struct isa_reg_property *)get_property(np, "reg", NULL);
+- if (reg == NULL)
+- goto next_port;
+- /* We assume the interrupt number isn't translated ... */
+- interrupts = (u32 *)get_property(np, "interrupts", NULL);
+- /* get clock freq. if present */
+- clk = (u32 *)get_property(np, "clock-frequency", NULL);
+- /* get default speed if present */
+- spd = (u32 *)get_property(np, "current-speed", NULL);
+- /* Default to locate at end of array */
+- index = old_serial_count; /* end of the array by default */
+-
+- /* If we have a location index, then use it */
+- if (typep && *typep == 'S') {
+- index = simple_strtol(typep+1, NULL, 0) - 1;
+- /* if index is out of range, use end of array instead */
+- if (index >= MAX_LEGACY_SERIAL_PORTS)
+- index = old_serial_count;
+- /* if our index is still out of range, that mean that
+- * array is full, we could scan for a free slot but that
+- * make little sense to bother, just skip the port
+- */
+- if (index >= MAX_LEGACY_SERIAL_PORTS)
+- goto next_port;
+- if (index >= old_serial_count)
+- old_serial_count = index + 1;
+- /* Check if there is a port who already claimed our slot */
+- if (serial_ports[index].iobase != 0) {
+- /* if we still have some room, move it, else override */
+- if (old_serial_count < MAX_LEGACY_SERIAL_PORTS) {
+- DBG("Moved legacy port %d -> %d\n", index,
+- old_serial_count);
+- serial_ports[old_serial_count++] =
+- serial_ports[index];
+- } else {
+- DBG("Replacing legacy port %d\n", index);
+- }
+- }
+- }
+- if (index >= MAX_LEGACY_SERIAL_PORTS)
+- goto next_port;
+- if (index >= old_serial_count)
+- old_serial_count = index + 1;
+-
+- /* Now fill the entry */
+- memset(&serial_ports[index], 0, sizeof(struct plat_serial8250_port));
+- serial_ports[index].uartclk = clk ? *clk : BASE_BAUD * 16;
+- serial_ports[index].iobase = reg->address;
+- serial_ports[index].irq = interrupts ? interrupts[0] : 0;
+- serial_ports[index].flags = ASYNC_BOOT_AUTOCONF;
+-
+- DBG("Added legacy port, index: %d, port: %x, irq: %d, clk: %d\n",
+- index,
+- serial_ports[index].iobase,
+- serial_ports[index].irq,
+- serial_ports[index].uartclk);
+-
+- /* Get phys address of IO reg for port 1 */
+- if (index != 0)
+- goto next_port;
+-
+- pci = of_get_parent(isa);
+- if (!pci) {
+- DBG("%s: no pci parent found\n", np->full_name);
+- goto next_port;
+- }
+-
+- rangesp = (u32 *)get_property(pci, "ranges", &rlen);
+- if (rangesp == NULL) {
+- of_node_put(pci);
+- goto next_port;
+- }
+- rlen /= 4;
+-
+- /* we need the #size-cells of the PCI bridge node itself */
+- phys_size = 1;
+- sizeprop = (u32 *)get_property(pci, "#size-cells", NULL);
+- if (sizeprop != NULL)
+- phys_size = *sizeprop;
+- /* we need the parent #addr-cells */
+- addr_size = prom_n_addr_cells(pci);
+- rentsize = 3 + addr_size + phys_size;
+- io_base = 0;
+- for (;rlen >= rentsize; rlen -= rentsize,rangesp += rentsize) {
+- if (((rangesp[0] >> 24) & 0x3) != 1)
+- continue; /* not IO space */
+- io_base = rangesp[3];
+- if (addr_size == 2)
+- io_base = (io_base << 32) | rangesp[4];
+- }
+- if (io_base != 0) {
+- *physport = io_base + reg->address;
+- if (default_speed && spd)
+- *default_speed = *spd;
+- }
+- of_node_put(pci);
+- next_port:
+- of_node_put(isa);
+- }
+-
+- DBG(" <- generic_find_legacy_serial_port()\n");
+-}
+-
+-static struct platform_device serial_device = {
+- .name = "serial8250",
+- .id = 0,
+- .dev = {
+- .platform_data = serial_ports,
+- },
+-};
+-
+-static int __init serial_dev_init(void)
+-{
+- return platform_device_register(&serial_device);
+-}
+-arch_initcall(serial_dev_init);
+-
+-#endif /* CONFIG_PPC_ISERIES */
+
+ int check_legacy_ioport(unsigned long base_port)
+ {
+--- linux-2.6.12/include/asm-ppc/pc_serial.h~ 2005-08-15 21:19:32.000000000 +0100
++++ linux-2.6.12/include/asm-ppc/pc_serial.h 2005-08-15 21:20:24.000000000 +0100
+@@ -26,18 +26,3 @@
+ #define RS_TABLE_SIZE 4
+ #endif
+
+-/* Standard COM flags (except for COM4, because of the 8514 problem) */
+-#ifdef CONFIG_SERIAL_DETECT_IRQ
+-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
+-#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
+-#else
+-#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+-#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
+-#endif
+-
+-#define SERIAL_PORT_DFNS \
+- /* UART CLK PORT IRQ FLAGS */ \
+- { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
+- { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
+- { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
+- { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
More information about the Kernel-svn-changes
mailing list