From mboxrd@z Thu Jan 1 00:00:00 1970 From: Don Dutile Subject: Re: [PATCH 2/2] pci: correct pci config size default for cap version 2 endpoints Date: Thu, 21 Jul 2011 11:52:16 -0400 Message-ID: <4E284B30.2030402@redhat.com> References: <20110720233434.5002.3703.stgit@dddsys0.bos.redhat.com> <20110720234940.5002.26262.stgit@dddsys0.bos.redhat.com> <1311216217.2653.87.camel@bling.home> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, mst@redhat.com To: Alex Williamson Return-path: Received: from mx1.redhat.com ([209.132.183.28]:19447 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751571Ab1GUPwR (ORCPT ); Thu, 21 Jul 2011 11:52:17 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6LFqHsE010043 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 21 Jul 2011 11:52:17 -0400 In-Reply-To: <1311216217.2653.87.camel@bling.home> Sender: kvm-owner@vger.kernel.org List-ID: On 07/20/2011 10:43 PM, Alex Williamson wrote: > On Wed, 2011-07-20 at 19:51 -0400, Donald Dutile wrote: >> Corrected default size of PCIe Cap Structure from 0x3c to 0x34. >> 0x34 is min size for version 2 Cap Structure for an endpoint. >> >> 0x3c value failed on a real device that aligned this >> structure at 0xcc, exceeding the size of the config_map[] >> by 8 bytes. >> >> Signed-off-by: Donald Dutile >> cc: Alex Williamson >> cc: Michael S. Tsirkin >> --- >> >> hw/device-assignment.c | 4 +++- >> 1 files changed, 3 insertions(+), 1 deletions(-) >> >> diff --git a/hw/device-assignment.c b/hw/device-assignment.c >> index 36ad6b0..1d2ee5d 100644 >> --- a/hw/device-assignment.c >> +++ b/hw/device-assignment.c >> @@ -1422,12 +1422,14 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev) >> uint8_t version; >> uint16_t type, devctl, lnkcap, lnksta; >> uint32_t devcap; >> - int size = 0x3c; /* version 2 size */ >> >> version = pci_get_byte(pci_dev->config + pos + PCI_EXP_FLAGS); >> version&= PCI_EXP_FLAGS_VERS; >> if (version == 1) { >> size = 0x14; >> + } else if (version == 2) { >> + /* don't include slot cap/stat/ctrl 2 regs; only support endpoints */ >> + size = 0x34; >> } else if (version> 2) { >> fprintf(stderr, "Unsupported PCI express capability version %d\n", >> version); >> > > Does this compile? Where is size defined now? Also whitespace issues > with tabs. > > Alex > doh! during recent workstation upgrade, i forgot to install pciutils-devel; I didn't look at the configure output closely, and now see this file wasn't compiled! thanks for catch. will repost shortly.