[PATCH] r8169: use the broken_parity_status field in pci_dev

[PATCH] r8169: use the broken_parity_status field in pci_dev

[Francois Romieu]

The former option is removed and platform code can now specify the
expected behavior.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---
 drivers/net/r8169.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index f83b41d..1489100 100644
--- a/drivers/net/r8169.c
+++ b/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;
-- 
1.4.2.3

Re: [PATCH] r8169: use the broken_parity_status field in pci_dev

[Lennert Buytenhek]

On Mon, Dec 18, 2006 at 12:04:19AM +0100, Francois Romieu wrote:

> The former option is removed and platform code can now specify the
> expected behavior.

Thanks a lot.

FYI, I submitted this patch for the n2100 side:


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,26 @@ static struct hw_pci n2100_pci __initdat
 
 static int __init n2100_pci_init(void)
 {
-	if (machine_is_n2100())
+	if (machine_is_n2100()) {
+		int i;
+
 		pci_common_init(&n2100_pci);
 
+		/*
+		 * Both r8169 chips on the n2100 exhibit PCI parity
+		 * problems.  Set the ->broken_parity_status flag for
+		 * both ports so that the r8169 driver knows it should
+		 * ignore error interrupts.
+		 */
+		for (i = 1; i <= 2; i++) {
+			struct pci_dev *dev;
+
+			dev = pci_get_bus_and_slot(0, PCI_DEVFN(i, 0));
+			if (dev != NULL)
+				dev->broken_parity_status = 1;
+		}
+	}
+
 	return 0;
 }

Re: [PATCH] r8169: use the broken_parity_status field in pci_dev

[Jeff Garzik]

Francois Romieu wrote:
> The former option is removed and platform code can now specify the
> expected behavior.
> 
> Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

applied