|
 |
cd9d161 |
From fe7f7d7ae7114fb220ed258e249f9a63834f6fa6 Mon Sep 17 00:00:00 2001
|
|
|
cd9d161 |
From: dann frazier <dann.frazier@canonical.com>
|
|
|
cd9d161 |
Date: Wed, 21 Sep 2011 14:06:25 -0600
|
|
|
cd9d161 |
Subject: [PATCH] e1000: Don't set the Capabilities List bit
|
|
|
cd9d161 |
MIME-Version: 1.0
|
|
|
cd9d161 |
Content-Type: text/plain; charset=UTF-8
|
|
|
cd9d161 |
Content-Transfer-Encoding: 8bit
|
|
|
cd9d161 |
|
|
|
cd9d161 |
[Originally sent to qemu-kvm list, but I was redirected here]
|
|
|
cd9d161 |
|
|
|
cd9d161 |
The Capabilities Pointer is NULL, so this bit shouldn't be set. The state of
|
|
|
cd9d161 |
this bit doesn't appear to change any behavior on Linux/Windows versions we've
|
|
|
cd9d161 |
tested, but it does cause Windows' PCI/PCI Express Compliance Test to balk.
|
|
|
cd9d161 |
|
|
|
cd9d161 |
I happen to have a physical 82540EM controller, and it also sets the
|
|
|
cd9d161 |
Capabilities Bit, but it actually has items on the capabilities list to go
|
|
|
cd9d161 |
with it :)
|
|
|
cd9d161 |
|
|
|
cd9d161 |
Signed-off-by: dann frazier <dann.frazier@canonical.com>
|
|
|
cd9d161 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
cd9d161 |
(cherry picked from commit dd8e93799f13ef82d83c185b8e71e049452f7d40)
|
|
|
cd9d161 |
|
|
|
cd9d161 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
cd9d161 |
---
|
|
|
cd9d161 |
hw/e1000.c | 2 --
|
|
|
cd9d161 |
1 file changed, 2 deletions(-)
|
|
|
cd9d161 |
|
|
|
cd9d161 |
diff --git a/hw/e1000.c b/hw/e1000.c
|
|
|
cd9d161 |
index e4d9ab5..7971457 100644
|
|
|
cd9d161 |
--- a/hw/e1000.c
|
|
|
cd9d161 |
+++ b/hw/e1000.c
|
|
|
cd9d161 |
@@ -1167,8 +1167,6 @@ static int pci_e1000_init(PCIDevice *pci_dev)
|
|
|
cd9d161 |
|
|
|
cd9d161 |
pci_conf = d->dev.config;
|
|
|
cd9d161 |
|
|
|
cd9d161 |
- /* TODO: we have no capabilities, so why is this bit set? */
|
|
|
cd9d161 |
- pci_set_word(pci_conf + PCI_STATUS, PCI_STATUS_CAP_LIST);
|
|
|
cd9d161 |
/* TODO: RST# value should be 0, PCI spec 6.2.4 */
|
|
|
cd9d161 |
pci_conf[PCI_CACHE_LINE_SIZE] = 0x10;
|
|
|
cd9d161 |
|
|
|
cd9d161 |
--
|
|
|
cd9d161 |
1.7.11.2
|
|
|
cd9d161 |
|