From c243758ca9aeb50c3fd68d1902a159c0249c738d Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 28 Sep 2009 11:05:58 +0200
Subject: [PATCH] --- yaml --- r: 170366 b: refs/heads/master c:
 362bc24d6746bcd49bb4853fc5aa7d4c728b3f9e h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/sound/pci/oxygen/oxygen_lib.c | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5f75c014227e..f4259fd9d6f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87b61902ce3dec23a2d8256b9cfcf4e28786a320
+refs/heads/master: 362bc24d6746bcd49bb4853fc5aa7d4c728b3f9e
diff --git a/trunk/sound/pci/oxygen/oxygen_lib.c b/trunk/sound/pci/oxygen/oxygen_lib.c
index c9f271419eb8..9c5e6450eebb 100644
--- a/trunk/sound/pci/oxygen/oxygen_lib.c
+++ b/trunk/sound/pci/oxygen/oxygen_lib.c
@@ -307,6 +307,28 @@ static void oxygen_restore_eeprom(struct oxygen *chip,
 	}
 }
 
+static void pci_bridge_magic(void)
+{
+	struct pci_dev *pci = NULL;
+	u32 tmp;
+
+	for (;;) {
+		/* If there is any Pericom PI7C9X110 PCI-E/PCI bridge ... */
+		pci = pci_get_device(0x12d8, 0xe110, pci);
+		if (!pci)
+			break;
+		/*
+		 * ... configure its secondary internal arbiter to park to
+		 * the secondary port, instead of to the last master.
+		 */
+		if (!pci_read_config_dword(pci, 0x40, &tmp)) {
+			tmp |= 1;
+			pci_write_config_dword(pci, 0x40, tmp);
+		}
+		/* Why?  Try asking C-Media. */
+	}
+}
+
 static void oxygen_init(struct oxygen *chip)
 {
 	unsigned int i;
@@ -585,6 +607,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id,
 	snd_card_set_dev(card, &pci->dev);
 	card->private_free = oxygen_card_free;
 
+	pci_bridge_magic();
 	oxygen_init(chip);
 	chip->model.init(chip);