PCI: Disable parity checking if broken_parity is set
Subsystems (6)
Heiner Kallweit
maintainerv2 cover PCI: Disable parity checking if broken_parity is set
If we know that a device has broken parity checking, then disable it. This avoids quirks like in r8169 where on the first parity error interrupt parity checking will be disabled if broken_parity_status is set. Make pci_quirk_broken_parity() public so that it can be used by platform code, e.g. for Thecus N2100.
v2:
- reduce scope of N2100 change to using the new PCI core quirk
Heiner Kallweit (3):
PCI: Disable parity checking if broken_parity_status is set
ARM: iop32x: improve N2100 PCI broken parity quirk
r8169: simplify broken parity handling now that PCI core takes care
arch/arm/mach-iop32x/n2100.c | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 14 -------------- drivers/pci/quirks.c | 17 +++++++++++------ include/linux/pci.h | 2 ++ 4 files changed, 14 insertions(+), 21 deletions(-)
Signature · 1 line
2.30.0
Heiner Kallweit
maintainerPATCH v2 1/3 PCI: Disable parity checking if broken_parity is set
If we know that a device has broken parity checking, then disable it. This avoids quirks like in r8169 where on the first parity error interrupt parity checking will be disabled if broken_parity_status is set. Make pci_quirk_broken_parity() public so that it can be used by platform code, e.g. for Thecus N2100.
--- drivers/pci/quirks.c | 17 +++++++++++------ include/linux/pci.h | 2 ++ 2 files changed, 13 insertions(+), 6 deletions(-)
drivers/pci/quirks.c +11 -6
@@ -205,17 +205,22 @@ static void quirk_mmio_always_on(struct pci_dev *dev)DECLARE_PCI_FIXUP_CLASS_EARLY (PCI_ANY_ID ,PCI_ANY_ID ,PCI_CLASS_BRIDGE_HOST ,8 , quirk_mmio_always_on); +void pci_quirk_broken_parity (struct pci_dev *dev) +{ +u16 cmd; + + dev->broken_parity_status =1 ;/* This device gives false positives */ +pci_read_config_word (dev,PCI_COMMAND , &cmd); +pci_write_config_word (dev,PCI_COMMAND , cmd & ~PCI_COMMAND_PARITY ); +} +/* * The Mellanox Tavor device gives false positive parity errors. Mark this * device with a broken_parity_status to allow PCI scanning code to "skip" * this now blacklisted device. */ -static void quirk_mellanox_tavor (struct pci_dev *dev) -{ - dev->broken_parity_status =1 ;/* This device gives false positives */ -} -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_MELLANOX ,PCI_DEVICE_ID_MELLANOX_TAVOR , quirk_mellanox_tavor); -DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_MELLANOX ,PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE , quirk_mellanox_tavor); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_MELLANOX ,PCI_DEVICE_ID_MELLANOX_TAVOR , pci_quirk_broken_parity); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_MELLANOX ,PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE , pci_quirk_broken_parity);/* * Deal with broken BIOSes that neglect to enable passive release,
include/linux/pci.h +2 -0
@@ -1916,6 +1916,8 @@ enum pci_fixup_pass { pci_fixup_suspend_late, /* pci_device_suspend_late() */ }; +void pci_quirk_broken_parity (struct pci_dev *dev); +#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS #define __DECLARE_PCI_FIXUP_SECTION (sec, name, vendor, device, class, \ class_shift, hook) \
Signature · 1 line
2.30.0
Heiner Kallweit
maintainerPATCH v2 2/3 ARM: iop32x: improve N2100 PCI broken parity quirk
In reply to Heiner KallweitUse new PCI core function pci_quirk_broken_parity(), in addition to setting broken_parity_status is disables parity checking. This allows us to remove a quirk in r8169 driver.
---
v2:
- remove additional changes from this patch
--- arch/arm/mach-iop32x/n2100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-iop32x/n2100.c +1 -1
@@ -125,7 +125,7 @@ static void n2100_fixup_r8169(struct pci_dev *dev)if (dev->bus->number ==0 && (dev->devfn ==PCI_DEVFN (1 ,0 ) || dev->devfn ==PCI_DEVFN (2 ,0 ))) - dev->broken_parity_status =1 ; +pci_quirk_broken_parity (dev); }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_REALTEK ,PCI_ANY_ID , n2100_fixup_r8169);
Signature · 1 line
2.30.0
Re: [PATCH v2 2/3] ARM: iop32x: improve N2100 PCI broken parity quirk'
Quoted 2 lines · Heiner Kallweit
Use new PCI core function
pci_quirk_broken_parity(), in addition to settingbroken_parity_statusis disables parity checking.
That sentence has a typo or something so it doesn't read quite right. Maybe:
Use new PCI core function pci_quirk_broken_parity() to disable parity checking.
"broken_parity_status" is basically internal to the PCI core and doesn't really seem relevant here. The only uses are the sysfs store/show functions and edac.
Quoted 27 lines
This allows us to remove a quirk in r8169 driver.
Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- remove additional changes from this patch--- arch/arm/mach-iop32x/n2100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-iop32x/n2100.c +1
-1@@ -125,7 +125,7 @@ static void n2100_fixup_r8169(struct pci_dev *dev)if (dev->bus->number ==0 && (dev->devfn ==PCI_DEVFN (1 ,0 ) || dev->devfn ==PCI_DEVFN (2 ,0 ))) - dev->broken_parity_status =1 ; +pci_quirk_broken_parity (dev); }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_REALTEK ,PCI_ANY_ID , n2100_fixup_r8169);Signature · 1 line
2.30.0
Heiner Kallweit
maintainerRe: [PATCH v2 2/3] ARM: iop32x: improve N2100 PCI broken parity quirk'
Quoted 10 lines · Bjorn Helgaas
Quoted 2 lines · Heiner Kallweit
Use new PCI core function
pci_quirk_broken_parity(), in addition to settingbroken_parity_statusis disables parity checking.That sentence has a typo or something so it doesn't read quite right. Maybe:
Use new PCI core function
pci_quirk_broken_parity()to disable parity checking.
OK, let me adjust this in a v3.
Quoted 31 lines
"
broken_parity_status" is basically internal to the PCI core and doesn't really seem relevant here. The only uses are the sysfs store/show functions and edac.Quoted 27 lines
This allows us to remove a quirk in r8169 driver.
Signed-off-by Heiner Kallweit <[email protected]>---
v2:
- remove additional changes from this patch--- arch/arm/mach-iop32x/n2100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-iop32x/n2100.c +1
-1@@ -125,7 +125,7 @@ static void n2100_fixup_r8169(struct pci_dev *dev)if (dev->bus->number ==0 && (dev->devfn ==PCI_DEVFN (1 ,0 ) || dev->devfn ==PCI_DEVFN (2 ,0 ))) - dev->broken_parity_status =1 ; +pci_quirk_broken_parity (dev); }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_REALTEK ,PCI_ANY_ID , n2100_fixup_r8169);Signature · 1 line
2.30.0
Heiner Kallweit
maintainerPATCH v2 3/3 r8169: simplify broken parity handling now that PCI core takes care
In reply to Heiner KallweitMeanwhile the PCI core disables parity checking for a device that has broken_parity_status set. Therefore we don't need the quirk any longer to disable parity checking on the first parity error interrupt.
--- drivers/net/ethernet/realtek/r8169_main.c | 14 -------------- 1 file changed, 14 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +0 -14
@@ -4329,20 +4329,6 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)if (net_ratelimit ())netdev_err (dev,"PCI error (cmd = 0x%04x, status_errs = 0x%04x)\n" , pci_cmd, pci_status_errs); -/* -* The recovery sequence below admits a very elaborated explanation: -* - it seems to work; -* - I did not see what else could be done; -* - it makes iop3xx happy. -* -* Feel free to adjust to your needs. -*/ -if (pdev->broken_parity_status) - pci_cmd &= ~PCI_COMMAND_PARITY ; -else - pci_cmd |=PCI_COMMAND_SERR |PCI_COMMAND_PARITY ; - -pci_write_config_word (pdev,PCI_COMMAND , pci_cmd);rtl_schedule_task (tp,RTL_FLAG_TASK_RESET_PENDING ); }
Signature · 1 line
2.30.0