Skip to contentSkip to conversation

MFGPT in 2.6.33-rc5

PATCH New Andres Salomon 1 participant 3 messages Jan 27, 2010 – Feb 5, 2010 6 messages not in the archive PCI

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw
Quoted 21 lines · On Wed, 27 Jan 2010 15:56:16 +0100 Jens Rottmann…

A bit of background: The _real_ base address for the MFGPT hardware is set with the MSR, but this is very Geode-proprietary. So the BIOS contains VSA (Virtual System Architecture) code to implement a _virtual_ PCI device. This means the BIOS simulates a standard PCI device solely in software as a front-end for the MFGPT hardware to make it look like a 'normal' device which can be accessed with normal PCI drivers.

Well, this PCI device's configuration should of course always mirror the real state of the hardware, i.e. if someone changes the MSR, the PCI header should reflect that change, and vice versa.

Quoted 2 lines
[    0.090015] pci 0000:00:14.0: address space collision: [io

0x6200-0x63ff] already in use

....

Quoted 2 lines
[    0.202033] pci 0000:00:14.0: BAR 2: set to [io  0x1000-0x11ff]

(PCI address [0x1000-0x11ff]

....

Quoted 2 lines
root@doulos:/home/leigh# ./mfgpt
6200
Quoted 6 lines

Now it looks like originally both MSR and PCI say the adress is 6200. But Linux detects a conflict on boot and moves it to 1000 by changing the PCI config. At this point the BIOS should copy the new address to the backing MSR i.e. to the real hardware. But this it fails to do. And later the cs5535-mfgpt uses the address from PCI (=1000) to look for the MFGPTs, but they're not there - they're are still at 6200.

At least on another net5501 board, BAR0 appears to have an 8k size. This is pretty clearly wrong, and is why there are space conflicts w/ the other BARs (consuming 0x6000 through 0x7fff, while BAR1 and BAR2 are in the 0x6100/0x6200 range).

Region 0: I/O ports at 6000 [size=8K]

Quoted 7 lines
Quoted 2 lines
Quoted 1 line
Quoted 1 line

Copyright (C) 2000-2007 Soekris Engineering."

Yup, I am about to call them. ...

Hope they fix it. But this will not be the only BIOS with this bug, that's why we have to revert the cs5535-mfgpt driver to read the MSR directly again.

Indeed, thanks for the report. This is the second email I've gotten in the past week about net5501 bios being broken w/ the new mfgpt stuff. :(

CC'ing lkml to ensure others see it. I'll write and test a patch sometime this week.

#7 lore raw

PATCH 1/1 CS5536: apply pci quirk for BIOS SMBUS bug

In reply to a message not in the archive
Quoted 29 lines · On Wed, 27 Jan 2010 15:56:16 +0100 Jens Rottmann…

A bit of background: The _real_ base address for the MFGPT hardware is set with the MSR, but this is very Geode-proprietary. So the BIOS contains VSA (Virtual System Architecture) code to implement a _virtual_ PCI device. This means the BIOS simulates a standard PCI device solely in software as a front-end for the MFGPT hardware to make it look like a 'normal' device which can be accessed with normal PCI drivers.

Well, this PCI device's configuration should of course always mirror the real state of the hardware, i.e. if someone changes the MSR, the PCI header should reflect that change, and vice versa.

Quoted 2 lines
[    0.090015] pci 0000:00:14.0: address space collision: [io

0x6200-0x63ff] already in use

....

Quoted 2 lines
[    0.202033] pci 0000:00:14.0: BAR 2: set to [io  0x1000-0x11ff]

(PCI address [0x1000-0x11ff]

....

Quoted 2 lines
root@doulos:/home/leigh# ./mfgpt
6200

Now it looks like originally both MSR and PCI say the adress is 6200. But Linux detects a conflict on boot and moves it to 1000 by changing the PCI config. At this point the BIOS should copy the new address to the backing MSR i.e. to the real hardware. But this it fails to do. And later the cs5535-mfgpt uses the address from PCI (=1000) to look for the MFGPTs, but they're not there - they're are still at 6200.

Quoted 1 line
Quoted 1 line
Quoted 1 line

Copyright (C) 2000-2007 Soekris Engineering."

Quoted 9 lines
Quoted 1 line

Yup, I am about to call them. ...

Hope they fix it. But this will not be the only BIOS with this bug, that's why we have to revert the cs5535-mfgpt driver to read the MSR directly again.

Best regards,
Jens Rottmann

I'm going to ask for one last round of testing/comments before I send this off to Linus for -rc7 inclusion.

From: Andres Salomon <[email protected]>

The new cs5535-* drivers use PCI header config info rather than MSRs to determine the memory region to use for things like GPIOs and MFGPTs. As anticipated, we've run into a buggy BIOS:

[    0.081818] pci 0000:00:14.0: reg 10: [io  0x6000-0x7fff]
[    0.081906] pci 0000:00:14.0: reg 14: [io  0x6100-0x61ff]
[    0.082015] pci 0000:00:14.0: reg 18: [io  0x6200-0x63ff]
[    0.082917] pci 0000:00:14.2: reg 20: [io  0xe000-0xe00f]
[    0.083551] pci 0000:00:15.0: reg 10: [mem 0xa0010000-0xa0010fff]
[    0.084436] pci 0000:00:15.1: reg 10: [mem 0xa0011000-0xa0011fff]
[    0.088816] PCI: pci_cache_line_size set to 32 bytes
[    0.088938] pci 0000:00:14.0: address space collision: [io 0x6100-0x61ff] already in use
[    0.089052] pci 0000:00:14.0: can't reserve [io  0x6100-0x61ff]

This is a Soekris board, and its BIOS sets the size of the PCI ISA bridge device's BAR0 to 8k. In reality, it should be 8 bytes (BAR0 is used for SMBus stuff). This quirk checks for an incorrect size, and resets it accordingly.

---
 drivers/pci/quirks.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
drivers/pci/quirks.c +17 -0
index c746943..d58b940 100644
@@ -338,6 +338,23 @@ static void __devinit quirk_s3_64M(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_868,		quirk_s3_64M);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_968,		quirk_s3_64M);
 
+/*
+ * Some CS5536 BIOSes (for example, the Soekris NET5501 board w/ comBIOS
+ * ver. 1.33  20070103) don't set the correct ISA PCI region header info.
+ * BAR0 should be 8 bytes; instead, it may be set to something like 8k
+ * (which conflicts w/ BAR1's memory range).
+ */
+static void __devinit quirk_cs5536_vsa(struct pci_dev *dev)
+{
+	if (pci_resource_len(dev, 0) != 8) {
+		struct resource *res = &dev->resource[0];
+		res->end = res->start + 8 - 1;
+		dev_info(&dev->dev, "CS5536 ISA bridge bug detected "
+				"(incorrect header); workaround applied.\n");
+	}
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa);
+
 static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region,
 	unsigned size, int nr, const char *name)
 {
Signature · 1 line
1.5.6.5
#8 lore raw

PATCH 1/1 CS5536: apply pci quirk for BIOS SMBUS bug

In reply to a message not in the archive
Quoted 29 lines · On Wed, 27 Jan 2010 15:56:16 +0100 Jens Rottmann…

A bit of background: The _real_ base address for the MFGPT hardware is set with the MSR, but this is very Geode-proprietary. So the BIOS contains VSA (Virtual System Architecture) code to implement a _virtual_ PCI device. This means the BIOS simulates a standard PCI device solely in software as a front-end for the MFGPT hardware to make it look like a 'normal' device which can be accessed with normal PCI drivers.

Well, this PCI device's configuration should of course always mirror the real state of the hardware, i.e. if someone changes the MSR, the PCI header should reflect that change, and vice versa.

Quoted 2 lines
[    0.090015] pci 0000:00:14.0: address space collision: [io

0x6200-0x63ff] already in use

....

Quoted 2 lines
[    0.202033] pci 0000:00:14.0: BAR 2: set to [io  0x1000-0x11ff]

(PCI address [0x1000-0x11ff]

....

Quoted 2 lines
root@doulos:/home/leigh# ./mfgpt
6200

Now it looks like originally both MSR and PCI say the adress is 6200. But Linux detects a conflict on boot and moves it to 1000 by changing the PCI config. At this point the BIOS should copy the new address to the backing MSR i.e. to the real hardware. But this it fails to do. And later the cs5535-mfgpt uses the address from PCI (=1000) to look for the MFGPTs, but they're not there - they're are still at 6200.

Quoted 1 line
Quoted 1 line
Quoted 1 line

Copyright (C) 2000-2007 Soekris Engineering."

Quoted 9 lines
Quoted 1 line

Yup, I am about to call them. ...

Hope they fix it. But this will not be the only BIOS with this bug, that's why we have to revert the cs5535-mfgpt driver to read the MSR directly again.

Best regards,
Jens Rottmann

Hi Linus,

This fixes a regression w/ the new cs5535-* drivers on some Soekris boards. Can you please add it for -rc7?

From: Andres Salomon <[email protected]>
Subject: [PATCH] CS5536: apply pci quirk for BIOS SMBUS bug

The new cs5535-* drivers use PCI header config info rather than MSRs to determine the memory region to use for things like GPIOs and MFGPTs. As anticipated, we've run into a buggy BIOS:

[    0.081818] pci 0000:00:14.0: reg 10: [io  0x6000-0x7fff]
[    0.081906] pci 0000:00:14.0: reg 14: [io  0x6100-0x61ff]
[    0.082015] pci 0000:00:14.0: reg 18: [io  0x6200-0x63ff]
[    0.082917] pci 0000:00:14.2: reg 20: [io  0xe000-0xe00f]
[    0.083551] pci 0000:00:15.0: reg 10: [mem 0xa0010000-0xa0010fff]
[    0.084436] pci 0000:00:15.1: reg 10: [mem 0xa0011000-0xa0011fff]
[    0.088816] PCI: pci_cache_line_size set to 32 bytes
[    0.088938] pci 0000:00:14.0: address space collision: [io 0x6100-0x61ff] already in use
[    0.089052] pci 0000:00:14.0: can't reserve [io  0x6100-0x61ff]

This is a Soekris board, and its BIOS sets the size of the PCI ISA bridge device's BAR0 to 8k. In reality, it should be 8 bytes (BAR0 is used for SMBus stuff). This quirk checks for an incorrect size, and resets it accordingly.

---
 drivers/pci/quirks.c |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
drivers/pci/quirks.c +17 -0
index c746943..d58b940 100644
@@ -338,6 +338,23 @@ static void __devinit quirk_s3_64M(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_868,		quirk_s3_64M);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S3,	PCI_DEVICE_ID_S3_968,		quirk_s3_64M);
 
+/*
+ * Some CS5536 BIOSes (for example, the Soekris NET5501 board w/ comBIOS
+ * ver. 1.33  20070103) don't set the correct ISA PCI region header info.
+ * BAR0 should be 8 bytes; instead, it may be set to something like 8k
+ * (which conflicts w/ BAR1's memory range).
+ */
+static void __devinit quirk_cs5536_vsa(struct pci_dev *dev)
+{
+	if (pci_resource_len(dev, 0) != 8) {
+		struct resource *res = &dev->resource[0];
+		res->end = res->start + 8 - 1;
+		dev_info(&dev->dev, "CS5536 ISA bridge bug detected "
+				"(incorrect header); workaround applied.\n");
+	}
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa);
+
 static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region,
 	unsigned size, int nr, const char *name)
 {
Signature · 1 line
1.5.6.5