|
@@ -11,7 +11,7 @@
|
|
static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
|
|
static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
|
|
{
|
|
{
|
|
u8 config, rev;
|
|
u8 config, rev;
|
|
- u32 word;
|
|
|
|
|
|
+ u16 word;
|
|
|
|
|
|
/* BIOS may enable hardware IRQ balancing for
|
|
/* BIOS may enable hardware IRQ balancing for
|
|
* E7520/E7320/E7525(revision ID 0x9 and below)
|
|
* E7520/E7320/E7525(revision ID 0x9 and below)
|
|
@@ -26,8 +26,11 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
|
|
pci_read_config_byte(dev, 0xf4, &config);
|
|
pci_read_config_byte(dev, 0xf4, &config);
|
|
pci_write_config_byte(dev, 0xf4, config|0x2);
|
|
pci_write_config_byte(dev, 0xf4, config|0x2);
|
|
|
|
|
|
- /* read xTPR register */
|
|
|
|
- raw_pci_read(0, 0, 0x40, 0x4c, 2, &word);
|
|
|
|
|
|
+ /*
|
|
|
|
+ * read xTPR register. We may not have a pci_dev for device 8
|
|
|
|
+ * because it might be hidden until the above write.
|
|
|
|
+ */
|
|
|
|
+ pci_bus_read_config_word(dev->bus, PCI_DEVFN(8, 0), 0x4c, &word);
|
|
|
|
|
|
if (!(word & (1 << 13))) {
|
|
if (!(word & (1 << 13))) {
|
|
dev_info(&dev->dev, "Intel E7520/7320/7525 detected; "
|
|
dev_info(&dev->dev, "Intel E7520/7320/7525 detected; "
|