From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH stable-0.15 6/6] pci-assign: Remove bogus PCIe lnkcap wmask setting Date: Tue, 9 Oct 2012 20:08:53 +0200 Message-ID: <1349806133-1916-7-git-send-email-afaerber@suse.de> References: <1349806133-1916-1-git-send-email-afaerber@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Marcelo Tosatti , Alex Williamson , Avi Kivity , =?UTF-8?q?Andreas=20F=C3=A4rber?= To: kvm@vger.kernel.org Return-path: Received: from cantor2.suse.de ([195.135.220.15]:56373 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756742Ab2JISJL (ORCPT ); Tue, 9 Oct 2012 14:09:11 -0400 In-Reply-To: <1349806133-1916-1-git-send-email-afaerber@suse.de> Sender: kvm-owner@vger.kernel.org List-ID: =46rom: Alex Williamson 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 Signed-off-by: Avi Kivity (cherry picked from commit 0cbb68b1ce40e9b7e0b8cea5fd849f5c6bd09aee) Signed-off-by: Andreas F=C3=A4rber --- hw/device-assignment.c | 6 +----- 1 Datei ge=C3=A4ndert, 1 Zeile hinzugef=C3=BCgt(+), 5 Zeilen entfernt(= -) 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); =20 /* device control: clear all error reporting enable bits, leav= ing - * leaving only a few host values. Note, thes= e are + * only a few host values. Note, these are * all writable, but not passed to hw. */ devctl =3D pci_get_word(pci_dev->config + pos + PCI_EXP_DEVCTL= ); @@ -1500,10 +1500,6 @@ static int assigned_device_pci_cap_init(PCIDevic= e *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); =20 /* Link control, pass existing read-only copy. Should be writ= able? */ =20 --=20 1.7.10.4