Re: RFC: PCI quirks update for 2.6.16
On Mon, 2006-12-11 at 00:47 +0100, Adrian Bunk wrote: > So we have the following situation: > - 2.6.16- 2.6.16.16 : problems for Chris > (and possibly many other people) > - 2.6.16.17 - 2.6.16.35 : problems for many other people > (I remember 4-5 bug reports in the kernel >Bugzilla alone) > > The fix in 2.6.19 was considered suboptimal, and Alan's patch for > fixing > this whole issue more properly is currently not even in your tree. Right, Those 4-5 bug reports should test Alan's patch. All the problem is detected the correct devices that should be quirked. In 2.6.16, all ( PCI_VENDOR_ID_VIA, PCI_ANY_ID), in 2.6.16.17 just some. Still questionable if this quirks is for on-board VIA when interrupts are in PIC mode, or for all interrupts modes (historically before the patch to be for IO-APIC and PIC mode, was just for PIC mode, but in that time IO-APIC wasn't common on PC) . So with Alan's patch the question is:if a device need to be quirked and don't. Those 4-5 reports will answer the question, they needs VIA quirks and we want know is the patch do the right job. My laptop that need the quirks and I can test it is not available right now and I am too busy to test on it, sorry. Thanks, -- Sérgio M.B. smime.p7s Description: S/MIME cryptographic signature
Re: RFC: PCI quirks update for 2.6.16
On Mon, 2006-12-11 at 00:47 +0100, Adrian Bunk wrote: So we have the following situation: - 2.6.16- 2.6.16.16 : problems for Chris (and possibly many other people) - 2.6.16.17 - 2.6.16.35 : problems for many other people (I remember 4-5 bug reports in the kernel Bugzilla alone) The fix in 2.6.19 was considered suboptimal, and Alan's patch for fixing this whole issue more properly is currently not even in your tree. Right, Those 4-5 bug reports should test Alan's patch. All the problem is detected the correct devices that should be quirked. In 2.6.16, all ( PCI_VENDOR_ID_VIA, PCI_ANY_ID), in 2.6.16.17 just some. Still questionable if this quirks is for on-board VIA when interrupts are in PIC mode, or for all interrupts modes (historically before the patch to be for IO-APIC and PIC mode, was just for PIC mode, but in that time IO-APIC wasn't common on PC) . So with Alan's patch the question is:if a device need to be quirked and don't. Those 4-5 reports will answer the question, they needs VIA quirks and we want know is the patch do the right job. My laptop that need the quirks and I can test it is not available right now and I am too busy to test on it, sorry. Thanks, -- Sérgio M.B. smime.p7s Description: S/MIME cryptographic signature
Re: RFC: PCI quirks update for 2.6.16
On Mon, Dec 11, 2006 at 12:48:10PM +, Sergio Monteiro Basto wrote: > On Mon, 2006-12-11 at 13:41 +0100, Adrian Bunk wrote: > > On Mon, Dec 11, 2006 at 01:42:48AM +, Sergio Monteiro Basto wrote: > > > On Sun, 2006-12-10 at 17:00 +0100, Adrian Bunk wrote: > > > > +DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, > > > > quirk_via_irq); > > > > > > This is back to state of kernel 2.6.16 final (without .x) > > > > > > In kernel 2.6.17 final we got > > > (http://lkml.org/lkml/2006/4/19/16) > > > commit 75cf7456dd87335f574dcd53c4ae616a2ad71a11 > > > Author: Chris Wedgwood <[EMAIL PROTECTED]> > > > Date: Tue Apr 18 23:57:09 2006 -0700 > > > Signed-off-by: Chris Wedgwood <[EMAIL PROTECTED]> > > > Acked-by: Jeff Garzik <[EMAIL PROTECTED]> > > > Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]> > > > and > > > commit a7b862f663d81858531dfccc0537bc9d8a2a4121 > > > Author: Chris Wedgwood <[EMAIL PROTECTED]> > > > Date: Mon May 15 09:43:55 2006 -0700 > > > [PATCH] VIA quirk fixup, additional PCI IDs > > > > > > BUT the latest stable and tested patch is the commit > > > 09d6029f43ebbe7307854abdae204c25d711ff94 > > > PCI: VIA IRQ quirk behaviour change, which in my opinion that should go > > > in. > > > > Commit 09d6029f43ebbe7307854abdae204c25d711ff94 is what Alan wasn't > > happy with, and -mm contains Alan's solution... > > No, Alan's solution was a post solution , which still on -mm, I think . Look at the patch in -mm, it contains essentially the next rewrite of this quirk... > Thanks, cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Sun, Dec 10, 2006 at 05:23:59PM -0800, Linus Torvalds wrote: > > > On Mon, 11 Dec 2006, Adrian Bunk wrote: > > > > If life was that easy... ;-) > > No. Life _is_ that easy. > > If the 2.6.16 stable tree took a patch that was questionable, and we don't > know what the right answer to it is from the _regular_ tree, than the > patch violated the stable tree rules in the first place and should just be > reverted. > > Once people know what the right answer is (and by "know", I mean: "not > guess") from the regular tree having been tested with it, and people > understanding the problem, then it can be re-instated. > > But if you're just guessing, and people don't _know_ the right answer, > then just revert the whole questionable area. The patch shouldn't have > been there in the first place. > > It really _is_ that simple. > > Either it's a stable tree or it isn't. The non-easy part is that the patch that turned out as being questionable was merged back in May, and that it actually fixed issues for some people... Unless you can lend me a time machine for telling Greg and Chris Wr. that they mustn't merge this patch for 2.6.16.17, there doesn't seem to be any regression free solution available at the moment. > Linus cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Mon, 2006-12-11 at 13:41 +0100, Adrian Bunk wrote: > On Mon, Dec 11, 2006 at 01:42:48AM +, Sergio Monteiro Basto wrote: > > On Sun, 2006-12-10 at 17:00 +0100, Adrian Bunk wrote: > > > +DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, > > > quirk_via_irq); > > > > This is back to state of kernel 2.6.16 final (without .x) > > > > In kernel 2.6.17 final we got > > (http://lkml.org/lkml/2006/4/19/16) > > commit 75cf7456dd87335f574dcd53c4ae616a2ad71a11 > > Author: Chris Wedgwood <[EMAIL PROTECTED]> > > Date: Tue Apr 18 23:57:09 2006 -0700 > > Signed-off-by: Chris Wedgwood <[EMAIL PROTECTED]> > > Acked-by: Jeff Garzik <[EMAIL PROTECTED]> > > Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]> > > and > > commit a7b862f663d81858531dfccc0537bc9d8a2a4121 > > Author: Chris Wedgwood <[EMAIL PROTECTED]> > > Date: Mon May 15 09:43:55 2006 -0700 > > [PATCH] VIA quirk fixup, additional PCI IDs > > > > BUT the latest stable and tested patch is the commit > > 09d6029f43ebbe7307854abdae204c25d711ff94 > > PCI: VIA IRQ quirk behaviour change, which in my opinion that should go in. > > Commit 09d6029f43ebbe7307854abdae204c25d711ff94 is what Alan wasn't > happy with, and -mm contains Alan's solution... No, Alan's solution was a post solution , which still on -mm, I think . Thanks, > > > Thanks, > > Sérgio M.B. > > cu > Adrian > - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Mon, Dec 11, 2006 at 01:42:48AM +, Sergio Monteiro Basto wrote: > On Sun, 2006-12-10 at 17:00 +0100, Adrian Bunk wrote: > > +DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, > > quirk_via_irq); > > This is back to state of kernel 2.6.16 final (without .x) > > In kernel 2.6.17 final we got > (http://lkml.org/lkml/2006/4/19/16) > commit 75cf7456dd87335f574dcd53c4ae616a2ad71a11 > Author: Chris Wedgwood <[EMAIL PROTECTED]> > Date: Tue Apr 18 23:57:09 2006 -0700 > Signed-off-by: Chris Wedgwood <[EMAIL PROTECTED]> > Acked-by: Jeff Garzik <[EMAIL PROTECTED]> > Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]> > and > commit a7b862f663d81858531dfccc0537bc9d8a2a4121 > Author: Chris Wedgwood <[EMAIL PROTECTED]> > Date: Mon May 15 09:43:55 2006 -0700 > [PATCH] VIA quirk fixup, additional PCI IDs > > BUT the latest stable and tested patch is the commit > 09d6029f43ebbe7307854abdae204c25d711ff94 > PCI: VIA IRQ quirk behaviour change, which in my opinion that should go in. Commit 09d6029f43ebbe7307854abdae204c25d711ff94 is what Alan wasn't happy with, and -mm contains Alan's solution... > Thanks, > Sérgio M.B. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Mon, Dec 11, 2006 at 01:42:48AM +, Sergio Monteiro Basto wrote: On Sun, 2006-12-10 at 17:00 +0100, Adrian Bunk wrote: +DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); This is back to state of kernel 2.6.16 final (without .x) In kernel 2.6.17 final we got (http://lkml.org/lkml/2006/4/19/16) commit 75cf7456dd87335f574dcd53c4ae616a2ad71a11 Author: Chris Wedgwood [EMAIL PROTECTED] Date: Tue Apr 18 23:57:09 2006 -0700 Signed-off-by: Chris Wedgwood [EMAIL PROTECTED] Acked-by: Jeff Garzik [EMAIL PROTECTED] Signed-off-by: Greg Kroah-Hartman [EMAIL PROTECTED] and commit a7b862f663d81858531dfccc0537bc9d8a2a4121 Author: Chris Wedgwood [EMAIL PROTECTED] Date: Mon May 15 09:43:55 2006 -0700 [PATCH] VIA quirk fixup, additional PCI IDs BUT the latest stable and tested patch is the commit 09d6029f43ebbe7307854abdae204c25d711ff94 PCI: VIA IRQ quirk behaviour change, which in my opinion that should go in. Commit 09d6029f43ebbe7307854abdae204c25d711ff94 is what Alan wasn't happy with, and -mm contains Alan's solution... Thanks, Sérgio M.B. cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Mon, 2006-12-11 at 13:41 +0100, Adrian Bunk wrote: On Mon, Dec 11, 2006 at 01:42:48AM +, Sergio Monteiro Basto wrote: On Sun, 2006-12-10 at 17:00 +0100, Adrian Bunk wrote: +DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); This is back to state of kernel 2.6.16 final (without .x) In kernel 2.6.17 final we got (http://lkml.org/lkml/2006/4/19/16) commit 75cf7456dd87335f574dcd53c4ae616a2ad71a11 Author: Chris Wedgwood [EMAIL PROTECTED] Date: Tue Apr 18 23:57:09 2006 -0700 Signed-off-by: Chris Wedgwood [EMAIL PROTECTED] Acked-by: Jeff Garzik [EMAIL PROTECTED] Signed-off-by: Greg Kroah-Hartman [EMAIL PROTECTED] and commit a7b862f663d81858531dfccc0537bc9d8a2a4121 Author: Chris Wedgwood [EMAIL PROTECTED] Date: Mon May 15 09:43:55 2006 -0700 [PATCH] VIA quirk fixup, additional PCI IDs BUT the latest stable and tested patch is the commit 09d6029f43ebbe7307854abdae204c25d711ff94 PCI: VIA IRQ quirk behaviour change, which in my opinion that should go in. Commit 09d6029f43ebbe7307854abdae204c25d711ff94 is what Alan wasn't happy with, and -mm contains Alan's solution... No, Alan's solution was a post solution , which still on -mm, I think . Thanks, Thanks, Sérgio M.B. cu Adrian - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Sun, Dec 10, 2006 at 05:23:59PM -0800, Linus Torvalds wrote: On Mon, 11 Dec 2006, Adrian Bunk wrote: If life was that easy... ;-) No. Life _is_ that easy. If the 2.6.16 stable tree took a patch that was questionable, and we don't know what the right answer to it is from the _regular_ tree, than the patch violated the stable tree rules in the first place and should just be reverted. Once people know what the right answer is (and by know, I mean: not guess) from the regular tree having been tested with it, and people understanding the problem, then it can be re-instated. But if you're just guessing, and people don't _know_ the right answer, then just revert the whole questionable area. The patch shouldn't have been there in the first place. It really _is_ that simple. Either it's a stable tree or it isn't. The non-easy part is that the patch that turned out as being questionable was merged back in May, and that it actually fixed issues for some people... Unless you can lend me a time machine for telling Greg and Chris Wr. that they mustn't merge this patch for 2.6.16.17, there doesn't seem to be any regression free solution available at the moment. Linus cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Mon, Dec 11, 2006 at 12:48:10PM +, Sergio Monteiro Basto wrote: On Mon, 2006-12-11 at 13:41 +0100, Adrian Bunk wrote: On Mon, Dec 11, 2006 at 01:42:48AM +, Sergio Monteiro Basto wrote: On Sun, 2006-12-10 at 17:00 +0100, Adrian Bunk wrote: +DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); This is back to state of kernel 2.6.16 final (without .x) In kernel 2.6.17 final we got (http://lkml.org/lkml/2006/4/19/16) commit 75cf7456dd87335f574dcd53c4ae616a2ad71a11 Author: Chris Wedgwood [EMAIL PROTECTED] Date: Tue Apr 18 23:57:09 2006 -0700 Signed-off-by: Chris Wedgwood [EMAIL PROTECTED] Acked-by: Jeff Garzik [EMAIL PROTECTED] Signed-off-by: Greg Kroah-Hartman [EMAIL PROTECTED] and commit a7b862f663d81858531dfccc0537bc9d8a2a4121 Author: Chris Wedgwood [EMAIL PROTECTED] Date: Mon May 15 09:43:55 2006 -0700 [PATCH] VIA quirk fixup, additional PCI IDs BUT the latest stable and tested patch is the commit 09d6029f43ebbe7307854abdae204c25d711ff94 PCI: VIA IRQ quirk behaviour change, which in my opinion that should go in. Commit 09d6029f43ebbe7307854abdae204c25d711ff94 is what Alan wasn't happy with, and -mm contains Alan's solution... No, Alan's solution was a post solution , which still on -mm, I think . Look at the patch in -mm, it contains essentially the next rewrite of this quirk... Thanks, cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, 2006-12-07 at 09:38 -0500, Daniel Drake wrote: > Adrian Bunk wrote: > > Daniel Drake (1): > > PCI: VIA IRQ quirk behaviour change > > Please drop this one, Alan isn't 100% on it and is working on getting a > better fix into mainline > > Daniel Sorry Daniel, I don't agree with you, this patch is a improvement of the original patch and in my opinion should go in. As Alan explain to us, is not the prefect one, but still be an improvement. Thanks, -- Sérgio M. B. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, 2006-12-07 at 09:38 -0500, Daniel Drake wrote: Adrian Bunk wrote: Daniel Drake (1): PCI: VIA IRQ quirk behaviour change Please drop this one, Alan isn't 100% on it and is working on getting a better fix into mainline Daniel Sorry Daniel, I don't agree with you, this patch is a improvement of the original patch and in my opinion should go in. As Alan explain to us, is not the prefect one, but still be an improvement. Thanks, -- Sérgio M. B. - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
Adrian Bunk wrote: > While checking how to fix the VIA quirk regressions for several users > introduced into -stable in 2.6.16.17, I started looking through all > drivers/pci/quirks.c updates up to both -stable and 2.6.19. > > Below is the selection the seemed good and safe. > > Any comments on whether it's really good or whether I should change > anything? > > > Brice Goglin (1): > PCI: nVidia quirk to make AER PCI-E extended capability visible > No problem with this one (but it won't be very useful since nobody used the PCIe AER cap before myri10ge in 2.6.18 IIRC). Thanks. Brice - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RFC: PCI quirks update for 2.6.16 (v2)
Thanks for all the comments I've gotten so far.
Below is my current stack of PCI quirks updates for 2.6.16.36.
Does all of this look OK?
TIA
Adrian
Adrian Bunk (1):
revert the quirk_via_irq changes
Bjorn Helgaas (1):
PCI: quirk to disable e100 interrupt if RESET failed to
Brice Goglin (1):
PCI: nVidia quirk to make AER PCI-E extended capability visible
Daniel Ritz (2):
PCI: fix ICH6 quirks
PCI: add ICH7/8 ACPI/GPIO io resource quirks
Jean Delvare (1):
PCI: Unhide the SMBus on Asus PU-DLS
John W. Linville (1):
pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge)
Linus Torvalds (1):
Add PIIX4 APCI quirk for the 440MX chipset too
drivers/pci/quirks.c| 101
include/linux/pci_ids.h |5 +
2 files changed, 97 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 381f36b..2a66e39 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -390,6 +390,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
piix4_io_quirk(dev, "PIIX4 devres J", 0x7c, 1 << 20);
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3,
quirk_piix4_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3,
quirk_piix4_acpi );
/*
* ICH4, ICH4-M, ICH5, ICH5-M ACPI: Three IO regions pointed to by longwords at
@@ -427,7 +428,14 @@ static void __devinit quirk_ich6_lpc_acpi(struct pci_dev
*dev)
pci_read_config_dword(dev, 0x48, );
quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, "ICH6 GPIO");
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,
quirk_ich6_lpc_acpi );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_0,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_2,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_3,
quirk_ich6_lpc_acpi );
/*
* VIA ACPI: One IO region pointed to by longword at
@@ -589,7 +597,7 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev
*dev)
pci_write_config_byte( dev, AMD8131_MISC, tmp);
}
}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,
quirk_amd_8131_ioapic );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE,
quirk_amd_8131_ioapic);
static void __init quirk_svw_msi(struct pci_dev *dev)
{
@@ -648,13 +656,7 @@ static void quirk_via_irq(struct pci_dev *dev)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
}
}
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5,
quirk_via_irq);
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
/*
* VIA VT82C598 has its device ID settable and many BIOSes
@@ -917,6 +919,11 @@ static void __init asus_hides_smbus_hostbridge(struct
pci_dev *dev)
case 0x8070: /* P4G8X Deluxe */
asus_hides_smbus = 1;
}
+ if (dev->device == PCI_DEVICE_ID_INTEL_E7501_MCH)
+ switch (dev->subsystem_device) {
+ case 0x80c9: /* PU-DLS */
+ asus_hides_smbus = 1;
+ }
if (dev->device == PCI_DEVICE_ID_INTEL_82855GM_HB)
switch (dev->subsystem_device) {
case 0x1751: /* M2N notebook */
@@ -978,6 +985,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_82845G_HB, asu
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82850_HB,
asus_hides_smbus_hostbridge );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82865_HB,
asus_hides_smbus_hostbridge );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_7205_0,
asus_hides_smbus_hostbridge );
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 09:45:56PM +0100, Tomek Koprowski wrote: > On Thursday 07 of December 2006 20:54, Jean Delvare wrote: > > > > Tomasz Koprowski (1): > > > PCI: SMBus unhide on HP Compaq nx6110 > > > > Bug #6944 might be related to this one, so I'd not include it in > > 2.6.16-stable. > > Actually, the #6944 requires more investigation. I've noticed the > kacpid going to 100% cpu without the unhide patch applied as well. It > happens sometimes after dehibernation, putting the laptop to sleep > and waking it up again resolves the issue. I can't figure out why. > > To be on the safe side I'd suggest dumping the patch, but I really > don't think it should fix anything. Thanks for this information, I've dropped it. And this problem really be debugged and fixed in Linus' tree... > Tomek cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 09:32:17PM +0300, Sergey Vlasov wrote: > On Thu, Dec 07, 2006 at 06:27:40PM +0100, Bauke Jan Douma wrote: >... > > I for one need this quirk to get both soundcards at all (which > > I need) -- no matter what indexing order. > > I don't question the need for this patch in mainline; however, it does > not seem to be suitable for -stable. >... Thanks to both of you. First of all, I agree that this is not 2.6.16 material. And looking at this issue at my A7V600-X, it's also a "feature" of this quirk that it enables the onboard audio even if you explicitely disabled it in the BIOS. I'm not sure about the correct solution in this case. cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 09:32:17PM +0300, Sergey Vlasov wrote: On Thu, Dec 07, 2006 at 06:27:40PM +0100, Bauke Jan Douma wrote: ... I for one need this quirk to get both soundcards at all (which I need) -- no matter what indexing order. I don't question the need for this patch in mainline; however, it does not seem to be suitable for -stable. ... Thanks to both of you. First of all, I agree that this is not 2.6.16 material. And looking at this issue at my A7V600-X, it's also a feature of this quirk that it enables the onboard audio even if you explicitely disabled it in the BIOS. I'm not sure about the correct solution in this case. cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RFC: PCI quirks update for 2.6.16 (v2)
Thanks for all the comments I've gotten so far.
Below is my current stack of PCI quirks updates for 2.6.16.36.
Does all of this look OK?
TIA
Adrian
Adrian Bunk (1):
revert the quirk_via_irq changes
Bjorn Helgaas (1):
PCI: quirk to disable e100 interrupt if RESET failed to
Brice Goglin (1):
PCI: nVidia quirk to make AER PCI-E extended capability visible
Daniel Ritz (2):
PCI: fix ICH6 quirks
PCI: add ICH7/8 ACPI/GPIO io resource quirks
Jean Delvare (1):
PCI: Unhide the SMBus on Asus PU-DLS
John W. Linville (1):
pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge)
Linus Torvalds (1):
Add PIIX4 APCI quirk for the 440MX chipset too
drivers/pci/quirks.c| 101
include/linux/pci_ids.h |5 +
2 files changed, 97 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 381f36b..2a66e39 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -390,6 +390,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
piix4_io_quirk(dev, PIIX4 devres J, 0x7c, 1 20);
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3,
quirk_piix4_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3,
quirk_piix4_acpi );
/*
* ICH4, ICH4-M, ICH5, ICH5-M ACPI: Three IO regions pointed to by longwords at
@@ -427,7 +428,14 @@ static void __devinit quirk_ich6_lpc_acpi(struct pci_dev
*dev)
pci_read_config_dword(dev, 0x48, region);
quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, ICH6 GPIO);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,
quirk_ich6_lpc_acpi );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_0,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_2,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_3,
quirk_ich6_lpc_acpi );
/*
* VIA ACPI: One IO region pointed to by longword at
@@ -589,7 +597,7 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev
*dev)
pci_write_config_byte( dev, AMD8131_MISC, tmp);
}
}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,
quirk_amd_8131_ioapic );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE,
quirk_amd_8131_ioapic);
static void __init quirk_svw_msi(struct pci_dev *dev)
{
@@ -648,13 +656,7 @@ static void quirk_via_irq(struct pci_dev *dev)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
}
}
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_2,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_3,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_4,
quirk_via_irq);
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5,
quirk_via_irq);
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
/*
* VIA VT82C598 has its device ID settable and many BIOSes
@@ -917,6 +919,11 @@ static void __init asus_hides_smbus_hostbridge(struct
pci_dev *dev)
case 0x8070: /* P4G8X Deluxe */
asus_hides_smbus = 1;
}
+ if (dev-device == PCI_DEVICE_ID_INTEL_E7501_MCH)
+ switch (dev-subsystem_device) {
+ case 0x80c9: /* PU-DLS */
+ asus_hides_smbus = 1;
+ }
if (dev-device == PCI_DEVICE_ID_INTEL_82855GM_HB)
switch (dev-subsystem_device) {
case 0x1751: /* M2N notebook */
@@ -978,6 +985,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_82845G_HB, asu
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82850_HB,
asus_hides_smbus_hostbridge );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82865_HB,
asus_hides_smbus_hostbridge );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_7205_0,
asus_hides_smbus_hostbridge );
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 09:45:56PM +0100, Tomek Koprowski wrote: On Thursday 07 of December 2006 20:54, Jean Delvare wrote: Tomasz Koprowski (1): PCI: SMBus unhide on HP Compaq nx6110 Bug #6944 might be related to this one, so I'd not include it in 2.6.16-stable. Actually, the #6944 requires more investigation. I've noticed the kacpid going to 100% cpu without the unhide patch applied as well. It happens sometimes after dehibernation, putting the laptop to sleep and waking it up again resolves the issue. I can't figure out why. To be on the safe side I'd suggest dumping the patch, but I really don't think it should fix anything. Thanks for this information, I've dropped it. And this problem really be debugged and fixed in Linus' tree... Tomek cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
Adrian Bunk wrote: While checking how to fix the VIA quirk regressions for several users introduced into -stable in 2.6.16.17, I started looking through all drivers/pci/quirks.c updates up to both -stable and 2.6.19. Below is the selection the seemed good and safe. Any comments on whether it's really good or whether I should change anything? Brice Goglin (1): PCI: nVidia quirk to make AER PCI-E extended capability visible No problem with this one (but it won't be very useful since nobody used the PCIe AER cap before myri10ge in 2.6.18 IIRC). Thanks. Brice - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thursday 07 of December 2006 20:54, Jean Delvare wrote: > > Tomasz Koprowski (1): > > PCI: SMBus unhide on HP Compaq nx6110 > > Bug #6944 might be related to this one, so I'd not include it in > 2.6.16-stable. Actually, the #6944 requires more investigation. I've noticed the kacpid going to 100% cpu without the unhide patch applied as well. It happens sometimes after dehibernation, putting the laptop to sleep and waking it up again resolves the issue. I can't figure out why. To be on the safe side I'd suggest dumping the patch, but I really don't think it should fix anything. Tomek -- [ [EMAIL PROTECTED] http://www.koprowski.org ] [ JabberID: [EMAIL PROTECTED] gg#: 2348134 ] [ Life is as bad as you make it be ] - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
Hi Adrian, On Thu, 7 Dec 2006 14:24:30 +0100, Adrian Bunk wrote: > While checking how to fix the VIA quirk regressions for several users > introduced into -stable in 2.6.16.17, I started looking through all > drivers/pci/quirks.c updates up to both -stable and 2.6.19. > > Below is the selection the seemed good and safe. > > Any comments on whether it's really good or whether I should change > anything? > (...) > Jean Delvare (1): > PCI: Unhide the SMBus on Asus PU-DLS Should be safe. > Tomasz Koprowski (1): > PCI: SMBus unhide on HP Compaq nx6110 Bug #6944 might be related to this one, so I'd not include it in 2.6.16-stable. -- Jean Delvare - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 06:27:40PM +0100, Bauke Jan Douma wrote: > Sergey Vlasov wrote on 07-12-06 14:53: > >On Thu, 7 Dec 2006 14:24:30 +0100 Adrian Bunk wrote: > > > >>While checking how to fix the VIA quirk regressions for several users > >>introduced into -stable in 2.6.16.17, I started looking through all > >>drivers/pci/quirks.c updates up to both -stable and 2.6.19. > >> > [snip] > >> > >>Bauke Jan Douma (1): > >> PCI: quirk for asus a8v and a8v delux motherboards > > > >This quirk will cause breakage for people who used an external PCI > >soundcard with these boards - the builtin sound chip which was > >invisible before may become the first audio device. > > I'm afraid I don't understand the problem described here, when > ALSA can assign any arbitrary index number of a user's choice > to cards that are detected. The problem is that -stable patches should not introduce regression. And if this patch would be included in the next -stable release, people who upgrade to this release may get unexpected changes of sound cards indexes. This may be OK for a new 2.6.x release, but not for a new 2.6.16.y. > Indeed, on my system (an A8V Deluxe motherboard, with this > quirk active), my first soundcard (given index=0) is an offboard > Creative SB Live, and the onboard card I have assigned index=1. Yes, now I have exactly the same setup. But before this patch I did not have any index=N assignments in my configuration; after the patch I needed to add them to get my system working as before. > I for one need this quirk to get both soundcards at all (which > I need) -- no matter what indexing order. I don't question the need for this patch in mainline; however, it does not seem to be suitable for -stable. > >It also enables the MC97 device, which does not really work (there is > >no MC97 codec attached to the controller at least on A8V Deluxe; I'm > >not sure if there is some other variant of this board which has MC97, > >but it seems unlikely). > > This one can be disabled separate of the AC97 -- let me get back > on that. I, for one (however much that is), don't need it either. Currently I get: VIA 82xx Modem: probe of :00:11.6 failed with error -13 on every boot (and snd_via82xx_modem module in memory). Not a grave bug, but not a good thing either (and another reason for not adding this patch to 2.6.16.y). signature.asc Description: Digital signature
Re: RFC: PCI quirks update for 2.6.16
Sergey Vlasov wrote on 07-12-06 14:53: On Thu, 7 Dec 2006 14:24:30 +0100 Adrian Bunk wrote: While checking how to fix the VIA quirk regressions for several users introduced into -stable in 2.6.16.17, I started looking through all drivers/pci/quirks.c updates up to both -stable and 2.6.19. [snip] Bauke Jan Douma (1): PCI: quirk for asus a8v and a8v delux motherboards This quirk will cause breakage for people who used an external PCI soundcard with these boards - the builtin sound chip which was invisible before may become the first audio device. I'm afraid I don't understand the problem described here, when ALSA can assign any arbitrary index number of a user's choice to cards that are detected. Indeed, on my system (an A8V Deluxe motherboard, with this quirk active), my first soundcard (given index=0) is an offboard Creative SB Live, and the onboard card I have assigned index=1. I for one need this quirk to get both soundcards at all (which I need) -- no matter what indexing order. It also enables the MC97 device, which does not really work (there is no MC97 codec attached to the controller at least on A8V Deluxe; I'm not sure if there is some other variant of this board which has MC97, but it seems unlikely). This one can be disabled separate of the AC97 -- let me get back on that. I, for one (however much that is), don't need it either. bjd - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 03:57:56PM +0100, Adrian Bunk wrote: > Looking at Alan's patch in -mm, it seems the best current solution for > 2.6.16 is to go back to the pre-2.6.16.17 > DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); > and revisit this after Alan's patch was released with 2.6.20? If you want 2.6.16.* not to risk any reversions of good behaviour then I'd agree I'm pretty sure the new code is right cool and wonderful *BUT* it may not be of course and it may also break broken bioses differently 8( - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 09:38:44AM -0500, Daniel Drake wrote: > Adrian Bunk wrote: > >Daniel Drake (1): > > PCI: VIA IRQ quirk behaviour change > > Please drop this one, Alan isn't 100% on it and is working on getting a > better fix into mainline Thanks for this information. That's the one that fixes the breakage introduced in 2.6.16.17... Looking at Alan's patch in -mm, it seems the best current solution for 2.6.16 is to go back to the pre-2.6.16.17 DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); and revisit this after Alan's patch was released with 2.6.20? > Daniel cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
Adrian Bunk wrote: Daniel Drake (1): PCI: VIA IRQ quirk behaviour change Please drop this one, Alan isn't 100% on it and is working on getting a better fix into mainline Daniel - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, 7 Dec 2006 14:24:30 +0100 Adrian Bunk wrote: > While checking how to fix the VIA quirk regressions for several users > introduced into -stable in 2.6.16.17, I started looking through all > drivers/pci/quirks.c updates up to both -stable and 2.6.19. > > Below is the selection the seemed good and safe. > > Any comments on whether it's really good or whether I should change > anything? > > TIA > Adrian > > > Bauke Jan Douma (1): > PCI: quirk for asus a8v and a8v delux motherboards This quirk will cause breakage for people who used an external PCI soundcard with these boards - the builtin sound chip which was invisible before may become the first audio device. It also enables the MC97 device, which does not really work (there is no MC97 codec attached to the controller at least on A8V Deluxe; I'm not sure if there is some other variant of this board which has MC97, but it seems unlikely). [...] pgpyaXzriv0an.pgp Description: PGP signature
RFC: PCI quirks update for 2.6.16
While checking how to fix the VIA quirk regressions for several users
introduced into -stable in 2.6.16.17, I started looking through all
drivers/pci/quirks.c updates up to both -stable and 2.6.19.
Below is the selection the seemed good and safe.
Any comments on whether it's really good or whether I should change
anything?
TIA
Adrian
Bauke Jan Douma (1):
PCI: quirk for asus a8v and a8v delux motherboards
Bjorn Helgaas (1):
PCI: quirk to disable e100 interrupt if RESET failed to
Brice Goglin (1):
PCI: nVidia quirk to make AER PCI-E extended capability visible
Daniel Drake (1):
PCI: VIA IRQ quirk behaviour change
Daniel Ritz (2):
PCI: fix ICH6 quirks
PCI: add ICH7/8 ACPI/GPIO io resource quirks
Jean Delvare (1):
PCI: Unhide the SMBus on Asus PU-DLS
John W. Linville (1):
pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge)
Linus Torvalds (1):
Add PIIX4 APCI quirk for the 440MX chipset too
Tomasz Koprowski (1):
PCI: SMBus unhide on HP Compaq nx6110
drivers/pci/quirks.c| 172 +---
include/linux/pci_ids.h |5 -
2 files changed, 167 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 381f36b..5640be5 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -390,6 +390,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
piix4_io_quirk(dev, "PIIX4 devres J", 0x7c, 1 << 20);
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3,
quirk_piix4_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3,
quirk_piix4_acpi );
/*
* ICH4, ICH4-M, ICH5, ICH5-M ACPI: Three IO regions pointed to by longwords at
@@ -427,7 +428,14 @@ static void __devinit quirk_ich6_lpc_acpi(struct pci_dev
*dev)
pci_read_config_dword(dev, 0x48, );
quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, "ICH6 GPIO");
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,
quirk_ich6_lpc_acpi );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_0,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_2,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_3,
quirk_ich6_lpc_acpi );
/*
* VIA ACPI: One IO region pointed to by longword at
@@ -589,7 +597,7 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev
*dev)
pci_write_config_byte( dev, AMD8131_MISC, tmp);
}
}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,
quirk_amd_8131_ioapic );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE,
quirk_amd_8131_ioapic);
static void __init quirk_svw_msi(struct pci_dev *dev)
{
@@ -635,11 +643,43 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_82C686_4, quirk_vi
* Some of the on-chip devices are actually '586 devices' so they are
* listed here.
*/
+
+static int via_irq_fixup_needed = -1;
+
+/*
+ * As some VIA hardware is available in PCI-card form, we need to restrict
+ * this quirk to VIA PCI hardware built onto VIA-based motherboards only.
+ * We try to locate a VIA southbridge before deciding whether the quirk
+ * should be applied.
+ */
+static const struct pci_device_id via_irq_fixup_tbl[] = {
+ {
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .class = PCI_CLASS_BRIDGE_ISA << 8,
+ .class_mask = 0x00,
+ },
+ { 0, },
+};
+
static void quirk_via_irq(struct pci_dev *dev)
{
u8 irq, new_irq;
- new_irq = dev->irq & 0xf;
+ if (via_irq_fixup_needed == -1)
+ via_irq_fixup_needed = pci_dev_present(via_irq_fixup_tbl);
+
+ if (!via_irq_fixup_needed)
+ return;
+
+ new_irq = dev->irq;
+
+ /* Don't quirk interrupts outside the legacy IRQ range */
+ if (!new_irq || new_irq > 15)
+ return;
+
pci_read_config_byte(dev, PCI_INTERRUPT_LINE, );
if (new_irq != irq) {
printk(KERN_INFO "PCI: VIA IRQ fixup for %s, from %d to %d\n",
@@ -648,13 +688,7 @@ static void quirk_via_irq(struct pci_dev *dev)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
}
}
RFC: PCI quirks update for 2.6.16
While checking how to fix the VIA quirk regressions for several users
introduced into -stable in 2.6.16.17, I started looking through all
drivers/pci/quirks.c updates up to both -stable and 2.6.19.
Below is the selection the seemed good and safe.
Any comments on whether it's really good or whether I should change
anything?
TIA
Adrian
Bauke Jan Douma (1):
PCI: quirk for asus a8v and a8v delux motherboards
Bjorn Helgaas (1):
PCI: quirk to disable e100 interrupt if RESET failed to
Brice Goglin (1):
PCI: nVidia quirk to make AER PCI-E extended capability visible
Daniel Drake (1):
PCI: VIA IRQ quirk behaviour change
Daniel Ritz (2):
PCI: fix ICH6 quirks
PCI: add ICH7/8 ACPI/GPIO io resource quirks
Jean Delvare (1):
PCI: Unhide the SMBus on Asus PU-DLS
John W. Linville (1):
pci_ids.h: correct naming of 1022:7450 (AMD 8131 Bridge)
Linus Torvalds (1):
Add PIIX4 APCI quirk for the 440MX chipset too
Tomasz Koprowski (1):
PCI: SMBus unhide on HP Compaq nx6110
drivers/pci/quirks.c| 172 +---
include/linux/pci_ids.h |5 -
2 files changed, 167 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 381f36b..5640be5 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -390,6 +390,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
piix4_io_quirk(dev, PIIX4 devres J, 0x7c, 1 20);
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3,
quirk_piix4_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3,
quirk_piix4_acpi );
/*
* ICH4, ICH4-M, ICH5, ICH5-M ACPI: Three IO regions pointed to by longwords at
@@ -427,7 +428,14 @@ static void __devinit quirk_ich6_lpc_acpi(struct pci_dev
*dev)
pci_read_config_dword(dev, 0x48, region);
quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES+1, ICH6 GPIO);
}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,
quirk_ich6_lpc_acpi );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_0,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_2,
quirk_ich6_lpc_acpi );
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_3,
quirk_ich6_lpc_acpi );
/*
* VIA ACPI: One IO region pointed to by longword at
@@ -589,7 +597,7 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev
*dev)
pci_write_config_byte( dev, AMD8131_MISC, tmp);
}
}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_APIC,
quirk_amd_8131_ioapic );
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE,
quirk_amd_8131_ioapic);
static void __init quirk_svw_msi(struct pci_dev *dev)
{
@@ -635,11 +643,43 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,
PCI_DEVICE_ID_VIA_82C686_4, quirk_vi
* Some of the on-chip devices are actually '586 devices' so they are
* listed here.
*/
+
+static int via_irq_fixup_needed = -1;
+
+/*
+ * As some VIA hardware is available in PCI-card form, we need to restrict
+ * this quirk to VIA PCI hardware built onto VIA-based motherboards only.
+ * We try to locate a VIA southbridge before deciding whether the quirk
+ * should be applied.
+ */
+static const struct pci_device_id via_irq_fixup_tbl[] = {
+ {
+ .vendor = PCI_VENDOR_ID_VIA,
+ .device = PCI_ANY_ID,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ .class = PCI_CLASS_BRIDGE_ISA 8,
+ .class_mask = 0x00,
+ },
+ { 0, },
+};
+
static void quirk_via_irq(struct pci_dev *dev)
{
u8 irq, new_irq;
- new_irq = dev-irq 0xf;
+ if (via_irq_fixup_needed == -1)
+ via_irq_fixup_needed = pci_dev_present(via_irq_fixup_tbl);
+
+ if (!via_irq_fixup_needed)
+ return;
+
+ new_irq = dev-irq;
+
+ /* Don't quirk interrupts outside the legacy IRQ range */
+ if (!new_irq || new_irq 15)
+ return;
+
pci_read_config_byte(dev, PCI_INTERRUPT_LINE, irq);
if (new_irq != irq) {
printk(KERN_INFO PCI: VIA IRQ fixup for %s, from %d to %d\n,
@@ -648,13 +688,7 @@ static void quirk_via_irq(struct pci_dev *dev)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
}
}
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA,
Re: RFC: PCI quirks update for 2.6.16
On Thu, 7 Dec 2006 14:24:30 +0100 Adrian Bunk wrote: While checking how to fix the VIA quirk regressions for several users introduced into -stable in 2.6.16.17, I started looking through all drivers/pci/quirks.c updates up to both -stable and 2.6.19. Below is the selection the seemed good and safe. Any comments on whether it's really good or whether I should change anything? TIA Adrian Bauke Jan Douma (1): PCI: quirk for asus a8v and a8v delux motherboards This quirk will cause breakage for people who used an external PCI soundcard with these boards - the builtin sound chip which was invisible before may become the first audio device. It also enables the MC97 device, which does not really work (there is no MC97 codec attached to the controller at least on A8V Deluxe; I'm not sure if there is some other variant of this board which has MC97, but it seems unlikely). [...] pgpyaXzriv0an.pgp Description: PGP signature
Re: RFC: PCI quirks update for 2.6.16
Adrian Bunk wrote: Daniel Drake (1): PCI: VIA IRQ quirk behaviour change Please drop this one, Alan isn't 100% on it and is working on getting a better fix into mainline Daniel - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 09:38:44AM -0500, Daniel Drake wrote: Adrian Bunk wrote: Daniel Drake (1): PCI: VIA IRQ quirk behaviour change Please drop this one, Alan isn't 100% on it and is working on getting a better fix into mainline Thanks for this information. That's the one that fixes the breakage introduced in 2.6.16.17... Looking at Alan's patch in -mm, it seems the best current solution for 2.6.16 is to go back to the pre-2.6.16.17 DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); and revisit this after Alan's patch was released with 2.6.20? Daniel cu Adrian -- Is there not promise of rain? Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. Only a promise, Lao Er said. Pearl S. Buck - Dragon Seed - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 03:57:56PM +0100, Adrian Bunk wrote: Looking at Alan's patch in -mm, it seems the best current solution for 2.6.16 is to go back to the pre-2.6.16.17 DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq); and revisit this after Alan's patch was released with 2.6.20? If you want 2.6.16.* not to risk any reversions of good behaviour then I'd agree I'm pretty sure the new code is right cool and wonderful *BUT* it may not be of course and it may also break broken bioses differently 8( - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
Sergey Vlasov wrote on 07-12-06 14:53: On Thu, 7 Dec 2006 14:24:30 +0100 Adrian Bunk wrote: While checking how to fix the VIA quirk regressions for several users introduced into -stable in 2.6.16.17, I started looking through all drivers/pci/quirks.c updates up to both -stable and 2.6.19. [snip] Bauke Jan Douma (1): PCI: quirk for asus a8v and a8v delux motherboards This quirk will cause breakage for people who used an external PCI soundcard with these boards - the builtin sound chip which was invisible before may become the first audio device. I'm afraid I don't understand the problem described here, when ALSA can assign any arbitrary index number of a user's choice to cards that are detected. Indeed, on my system (an A8V Deluxe motherboard, with this quirk active), my first soundcard (given index=0) is an offboard Creative SB Live, and the onboard card I have assigned index=1. I for one need this quirk to get both soundcards at all (which I need) -- no matter what indexing order. It also enables the MC97 device, which does not really work (there is no MC97 codec attached to the controller at least on A8V Deluxe; I'm not sure if there is some other variant of this board which has MC97, but it seems unlikely). This one can be disabled separate of the AC97 -- let me get back on that. I, for one (however much that is), don't need it either. bjd - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thu, Dec 07, 2006 at 06:27:40PM +0100, Bauke Jan Douma wrote: Sergey Vlasov wrote on 07-12-06 14:53: On Thu, 7 Dec 2006 14:24:30 +0100 Adrian Bunk wrote: While checking how to fix the VIA quirk regressions for several users introduced into -stable in 2.6.16.17, I started looking through all drivers/pci/quirks.c updates up to both -stable and 2.6.19. [snip] Bauke Jan Douma (1): PCI: quirk for asus a8v and a8v delux motherboards This quirk will cause breakage for people who used an external PCI soundcard with these boards - the builtin sound chip which was invisible before may become the first audio device. I'm afraid I don't understand the problem described here, when ALSA can assign any arbitrary index number of a user's choice to cards that are detected. The problem is that -stable patches should not introduce regression. And if this patch would be included in the next -stable release, people who upgrade to this release may get unexpected changes of sound cards indexes. This may be OK for a new 2.6.x release, but not for a new 2.6.16.y. Indeed, on my system (an A8V Deluxe motherboard, with this quirk active), my first soundcard (given index=0) is an offboard Creative SB Live, and the onboard card I have assigned index=1. Yes, now I have exactly the same setup. But before this patch I did not have any index=N assignments in my configuration; after the patch I needed to add them to get my system working as before. I for one need this quirk to get both soundcards at all (which I need) -- no matter what indexing order. I don't question the need for this patch in mainline; however, it does not seem to be suitable for -stable. It also enables the MC97 device, which does not really work (there is no MC97 codec attached to the controller at least on A8V Deluxe; I'm not sure if there is some other variant of this board which has MC97, but it seems unlikely). This one can be disabled separate of the AC97 -- let me get back on that. I, for one (however much that is), don't need it either. Currently I get: VIA 82xx Modem: probe of :00:11.6 failed with error -13 on every boot (and snd_via82xx_modem module in memory). Not a grave bug, but not a good thing either (and another reason for not adding this patch to 2.6.16.y). signature.asc Description: Digital signature
Re: RFC: PCI quirks update for 2.6.16
Hi Adrian, On Thu, 7 Dec 2006 14:24:30 +0100, Adrian Bunk wrote: While checking how to fix the VIA quirk regressions for several users introduced into -stable in 2.6.16.17, I started looking through all drivers/pci/quirks.c updates up to both -stable and 2.6.19. Below is the selection the seemed good and safe. Any comments on whether it's really good or whether I should change anything? (...) Jean Delvare (1): PCI: Unhide the SMBus on Asus PU-DLS Should be safe. Tomasz Koprowski (1): PCI: SMBus unhide on HP Compaq nx6110 Bug #6944 might be related to this one, so I'd not include it in 2.6.16-stable. -- Jean Delvare - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: RFC: PCI quirks update for 2.6.16
On Thursday 07 of December 2006 20:54, Jean Delvare wrote: Tomasz Koprowski (1): PCI: SMBus unhide on HP Compaq nx6110 Bug #6944 might be related to this one, so I'd not include it in 2.6.16-stable. Actually, the #6944 requires more investigation. I've noticed the kacpid going to 100% cpu without the unhide patch applied as well. It happens sometimes after dehibernation, putting the laptop to sleep and waking it up again resolves the issue. I can't figure out why. To be on the safe side I'd suggest dumping the patch, but I really don't think it should fix anything. Tomek -- [ [EMAIL PROTECTED] http://www.koprowski.org ] [ JabberID: [EMAIL PROTECTED] gg#: 2348134 ] [ Life is as bad as you make it be ] - To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
