[stable-0.15,6/6] pci-assign: Remove bogus PCIe lnkcap wmask setting

Commit Message

Andreas Färber Oct. 9, 2012, 6:08 p.m. UTC

From: Alex Williamson <[e-mail]>

All the fields of lnkcap are read-only and this is setting it
with mask values from LNKCTL.  Just below it, we indicate
link control is read only, so this appears to be a stray
chunk left in from development.  Trivial comment fix while
we're here.

Signed-off-by: Alex Williamson <[e-mail]>
Signed-off-by: Avi Kivity <[e-mail]>
(cherry picked from commit 0cbb68b1ce40e9b7e0b8cea5fd849f5c6bd09aee)

Signed-off-by: Andreas Färber <[e-mail]>
---
 hw/device-assignment.c |    6 +-----
 1 Datei geändert, 1 Zeile hinzugefügt(+), 5 Zeilen entfernt(-)

Patch

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 43029a4..3908144 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1481,7 +1481,7 @@  static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
         pci_set_long(pci_dev->config + pos + PCI_EXP_DEVCAP, devcap);
 
         /* device control: clear all error reporting enable bits, leaving
-         *                 leaving only a few host values.  Note, these are
+         *                 only a few host values.  Note, these are
          *                 all writable, but not passed to hw.
          */
         devctl = pci_get_word(pci_dev->config + pos + PCI_EXP_DEVCTL);
@@ -1500,10 +1500,6 @@  static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
                    PCI_EXP_LNKCAP_ASPMS | PCI_EXP_LNKCAP_L0SEL |
                    PCI_EXP_LNKCAP_L1EL);
         pci_set_long(pci_dev->config + pos + PCI_EXP_LNKCAP, lnkcap);
-        pci_set_word(pci_dev->wmask + pos + PCI_EXP_LNKCAP,
-                     PCI_EXP_LNKCTL_ASPMC | PCI_EXP_LNKCTL_RCB |
-                     PCI_EXP_LNKCTL_CCC | PCI_EXP_LNKCTL_ES |
-                     PCI_EXP_LNKCTL_CLKREQ_EN | PCI_EXP_LNKCTL_HAWD);
 
         /* Link control, pass existing read-only copy.  Should be writable? */