Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 128793 Details for
Bug 189470
[2.6.22 regression] serial ports are switched (16550A, A8V Deluxe)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix_serial_ports_order.patch
fix_serial_ports_order.patch (text/plain), 7.17 KB, created by
Carlos Silva (RETIRED)
on 2007-08-21 16:51:59 UTC
(
hide
)
Description:
fix_serial_ports_order.patch
Filename:
MIME Type:
Creator:
Carlos Silva (RETIRED)
Created:
2007-08-21 16:51:59 UTC
Size:
7.17 KB
patch
obsolete
>diff -Naur a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt >--- a/Documentation/kernel-parameters.txt 2007-08-21 17:43:09.000000000 +0100 >+++ b/Documentation/kernel-parameters.txt 2007-08-21 17:44:09.000000000 +0100 >@@ -850,11 +850,6 @@ > lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip > Format: addr:<io>,irq:<irq> > >- legacy_serial.force [HW,IA-32,X86-64] >- Probe for COM ports at legacy addresses even >- if PNPBIOS or ACPI should describe them. This >- is for working around firmware defects. >- > llsc*= [IA64] See function print_params() in > arch/ia64/sn/kernel/llsc4.c. > >diff -Naur a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile >--- a/arch/i386/kernel/Makefile 2007-08-21 17:42:51.000000000 +0100 >+++ b/arch/i386/kernel/Makefile 2007-08-21 17:41:54.000000000 +0100 >@@ -35,7 +35,6 @@ > obj-$(CONFIG_ACPI_SRAT) += srat.o > obj-$(CONFIG_EFI) += efi.o efi_stub.o > obj-$(CONFIG_DOUBLEFAULT) += doublefault.o >-obj-$(CONFIG_SERIAL_8250) += legacy_serial.o > obj-$(CONFIG_VM86) += vm86.o > obj-$(CONFIG_EARLY_PRINTK) += early_printk.o > obj-$(CONFIG_HPET_TIMER) += hpet.o >diff -Naur a/arch/i386/kernel/legacy_serial.c b/arch/i386/kernel/legacy_serial.c >--- a/arch/i386/kernel/legacy_serial.c 2007-08-21 17:42:51.000000000 +0100 >+++ b/arch/i386/kernel/legacy_serial.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,67 +0,0 @@ >-/* >- * Legacy COM port devices for x86 platforms without PNPBIOS or ACPI. >- * Data taken from include/asm-i386/serial.h. >- * >- * (c) Copyright 2007 Hewlett-Packard Development Company, L.P. >- * Bjorn Helgaas <bjorn.helgaas@hp.com> >- * >- * This program is free software; you can redistribute it and/or modify >- * it under the terms of the GNU General Public License version 2 as >- * published by the Free Software Foundation. >- */ >-#include <linux/module.h> >-#include <linux/init.h> >-#include <linux/pnp.h> >-#include <linux/serial_8250.h> >- >-/* Standard COM flags (except for COM4, because of the 8514 problem) */ >-#ifdef CONFIG_SERIAL_DETECT_IRQ >-#define COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ) >-#define COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ) >-#else >-#define COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) >-#define COM4_FLAGS UPF_BOOT_AUTOCONF >-#endif >- >-#define PORT(_base,_irq,_flags) \ >- { \ >- .iobase = _base, \ >- .irq = _irq, \ >- .uartclk = 1843200, \ >- .iotype = UPIO_PORT, \ >- .flags = _flags, \ >- } >- >-static struct plat_serial8250_port x86_com_data[] = { >- PORT(0x3F8, 4, COM_FLAGS), >- PORT(0x2F8, 3, COM_FLAGS), >- PORT(0x3E8, 4, COM_FLAGS), >- PORT(0x2E8, 3, COM4_FLAGS), >- { }, >-}; >- >-static struct platform_device x86_com_device = { >- .name = "serial8250", >- .id = PLAT8250_DEV_PLATFORM, >- .dev = { >- .platform_data = x86_com_data, >- }, >-}; >- >-static int force_legacy_probe; >-module_param_named(force, force_legacy_probe, bool, 0); >-MODULE_PARM_DESC(force, "Force legacy serial port probe"); >- >-static int __init serial8250_x86_com_init(void) >-{ >- if (pnp_platform_devices && !force_legacy_probe) >- return -ENODEV; >- >- return platform_device_register(&x86_com_device); >-} >- >-module_init(serial8250_x86_com_init); >- >-MODULE_AUTHOR("Bjorn Helgaas"); >-MODULE_LICENSE("GPL"); >-MODULE_DESCRIPTION("Generic 8250/16x50 legacy probe module"); >diff -Naur a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile >--- a/arch/x86_64/kernel/Makefile 2007-08-21 17:42:52.000000000 +0100 >+++ b/arch/x86_64/kernel/Makefile 2007-08-21 17:41:54.000000000 +0100 >@@ -32,7 +32,6 @@ > obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o > obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary.o tce.o > obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o >-obj-$(CONFIG_SERIAL_8250) += legacy_serial.o > obj-$(CONFIG_KPROBES) += kprobes.o > obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o > obj-$(CONFIG_X86_VSMP) += vsmp.o >@@ -50,7 +49,6 @@ > > therm_throt-y += ../../i386/kernel/cpu/mcheck/therm_throt.o > bootflag-y += ../../i386/kernel/bootflag.o >-legacy_serial-y += ../../i386/kernel/legacy_serial.o > cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o > topology-y += ../../i386/kernel/topology.o > microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o >diff -Naur a/drivers/serial/Kconfig b/drivers/serial/Kconfig >--- a/drivers/serial/Kconfig 2007-08-21 17:43:07.000000000 +0100 >+++ b/drivers/serial/Kconfig 2007-08-21 17:41:54.000000000 +0100 >@@ -74,21 +74,17 @@ > depends on SERIAL_8250 && PCI > default SERIAL_8250 > help >- Say Y here if you have PCI serial ports. >- >- To compile this driver as a module, choose M here: the module >- will be called 8250_pci. >+ This builds standard PCI serial support. You may be able to >+ disable this feature if you only need legacy serial support. >+ Saves about 9K. > > config SERIAL_8250_PNP > tristate "8250/16550 PNP device support" if EMBEDDED > depends on SERIAL_8250 && PNP > default SERIAL_8250 > help >- Say Y here if you have serial ports described by PNPBIOS or ACPI. >- These are typically ports built into the system board. >- >- To compile this driver as a module, choose M here: the module >- will be called 8250_pnp. >+ This builds standard PNP serial support. You may be able to >+ disable this feature if you only need legacy serial support. > > config SERIAL_8250_HP300 > tristate >diff -Naur a/include/asm-i386/serial.h b/include/asm-i386/serial.h >--- a/include/asm-i386/serial.h 2007-08-21 17:43:17.000000000 +0100 >+++ b/include/asm-i386/serial.h 2007-08-21 17:41:54.000000000 +0100 >@@ -11,3 +11,19 @@ > * megabits/second; but this requires the faster clock. > */ > #define BASE_BAUD ( 1843200 / 16 ) >+ >+/* 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 */ >diff -Naur a/include/asm-x86_64/serial.h b/include/asm-x86_64/serial.h >--- a/include/asm-x86_64/serial.h 2007-08-21 17:43:13.000000000 +0100 >+++ b/include/asm-x86_64/serial.h 2007-08-21 17:41:54.000000000 +0100 >@@ -11,3 +11,19 @@ > * megabits/second; but this requires the faster clock. > */ > #define BASE_BAUD ( 1843200 / 16 ) >+ >+/* 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 */
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 189470
:
128591
|
128592
|
128593
|
128594
| 128793