From patchwork Tue Oct 9 18:08:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 1571061 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3E2AFDFFAD for ; Tue, 9 Oct 2012 18:09:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756746Ab2JISJT (ORCPT ); Tue, 9 Oct 2012 14:09:19 -0400 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 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id CA8BFA3E1C; Tue, 9 Oct 2012 20:09:10 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: kvm@vger.kernel.org Cc: Marcelo Tosatti , Alex Williamson , Avi Kivity , =?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> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349806133-1916-1-git-send-email-afaerber@suse.de> References: <1349806133-1916-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: 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ärber --- hw/device-assignment.c | 6 +----- 1 Datei geändert, 1 Zeile hinzugefügt(+), 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); /* 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? */