Messages in this thread Patch in this message | | | Date | Sun, 17 Dec 2006 00:52:45 +0100 | From | Lennert Buytenhek <> | Subject | Re: r8169 on n2100 (was Re: r8169 mac address change (was Re: [0/3] 2.6.19-rc2: known regressions)) |
| |
On Sun, Dec 17, 2006 at 12:31:34AM +0100, Francois Romieu wrote:
> > Sounds good. How about something like the patch below plus the > > corresponding r8169 diff? > > Go wild.
Martin/Riku, I'm pretty busy with other stuff at the moment, can you give this (on top of 2.6.20-rc1) a spin?
Index: linux-2.6.19/arch/arm/mach-iop32x/n2100.c =================================================================== --- linux-2.6.19.orig/arch/arm/mach-iop32x/n2100.c +++ linux-2.6.19/arch/arm/mach-iop32x/n2100.c @@ -123,9 +123,13 @@ static struct hw_pci n2100_pci __initdat static int __init n2100_pci_init(void) { - if (machine_is_n2100()) + if (machine_is_n2100()) { pci_common_init(&n2100_pci); + pci_get_bus_and_slot(0, 0x08)->broken_parity_status = 1; + pci_get_bus_and_slot(0, 0x10)->broken_parity_status = 1; + } + return 0; } Index: linux-2.6.19/drivers/net/r8169.c =================================================================== --- linux-2.6.19.orig/drivers/net/r8169.c +++ linux-2.6.19/drivers/net/r8169.c @@ -225,7 +225,6 @@ MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl static int rx_copybreak = 200; static int use_dac; -static int ignore_parity_err; static struct { u32 msg_enable; } debug = { -1 }; @@ -471,8 +470,6 @@ module_param(use_dac, int, 0); MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot."); module_param_named(debug, debug.msg_enable, int, 0); MODULE_PARM_DESC(debug, "Debug verbosity level (0=none, ..., 16=all)"); -module_param_named(ignore_parity_err, ignore_parity_err, bool, 0); -MODULE_PARM_DESC(ignore_parity_err, "Ignore PCI parity error as target. Default: false"); MODULE_LICENSE("GPL"); MODULE_VERSION(RTL8169_VERSION); @@ -2388,7 +2385,7 @@ static void rtl8169_pcierr_interrupt(str * * Feel free to adjust to your needs. */ - if (ignore_parity_err) + if (pdev->broken_parity_status) pci_cmd &= ~PCI_COMMAND_PARITY; else pci_cmd |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |