Skip to contentSkip to conversation

e1000: fix init values for command register

PATCH In review Michael S. Tsirkin 2 participants 3 messages Dec 9, 2009 – Dec 10, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e1000: fix init values for command register

Command register for e1000 was initialized to values out of spec: all of bus master,
io, memory and interrupt disable bits were set.

This breaks the device now that we actually respect the interrupt disable bit, unless the guest happens to clear it. Fix, and make the device more spec compliant, by not touching
the default.

There are implications for migration
from old qemu as well, will be addressed
separately.

---
 hw/e1000.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
hw/e1000.c +0 -1
index 8566fe3..ad7a267 100644
@@ -1089,7 +1089,6 @@ static int pci_e1000_init(PCIDevice *pci_dev)
 
     pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
     pci_config_set_device_id(pci_conf, E1000_DEVID);
-    *(uint16_t *)(pci_conf+0x04) = cpu_to_le16(0x0407);
     *(uint16_t *)(pci_conf+0x06) = cpu_to_le16(0x0010);
     pci_conf[0x08] = 0x03;
     pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET);
Signature · 1 line
1.6.6.rc1.43.gf55cc
#1 lore raw
Quoted 10 lines · On Wed, 9 Dec 2009 22:35:37 +0200 "Michael S. Tsirkin" <[email protected]> wrote:

Command register for e1000 was initialized to values out of spec: all of bus master,
io, memory and interrupt disable bits were set.

This breaks the device now that we actually respect the interrupt disable bit, unless the guest happens to clear it. Fix, and make the device more spec compliant, by not touching
the default.

Quoted 3 lines

There are implications for migration
from old qemu as well, will be addressed separately.

FWIW, I've tested the others network cards (only for the slirp case)
and they worked fine.

#2 lore raw
In reply to Michael S. Tsirkin
Quoted 10 lines · Michael S. Tsirkin

Command register for e1000 was initialized to values out of spec: all of bus master,
io, memory and interrupt disable bits were set.

This breaks the device now that we actually respect the interrupt disable bit, unless the guest happens to clear it. Fix, and make the device more spec compliant, by not touching
the default.

Quoted 7 lines

There are implications for migration
from old qemu as well, will be addressed
separately.

This patch is also appropriate for 0.12, it will make migration 0.12 to master less painful.
What's the process to get it there?
Should I create pci-for-0.12 branch on my tree?

Quoted 18 lines
---
 hw/e1000.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
hw/e1000.c +0 -1
index 8566fe3..ad7a267 100644
@@ -1089,7 +1089,6 @@ static int pci_e1000_init(PCIDevice *pci_dev)
 
     pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
     pci_config_set_device_id(pci_conf, E1000_DEVID);
-    *(uint16_t *)(pci_conf+0x04) = cpu_to_le16(0x0407);
     *(uint16_t *)(pci_conf+0x06) = cpu_to_le16(0x0010);
     pci_conf[0x08] = 0x03;
     pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET);
Signature · 1 line
1.6.6.rc1.43.gf55cc