From nobody Fri May 10 11:04:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1602696067; cv=none; d=zohomail.com; s=zohoarc; b=VG5b7zA6nN5RRFk8/1SZrGyCBF/LmCnIz86CbyUk9bqh9k5HJx9XHBGw6np7uJspvvZ0doF6Rdl1WkjG7WOFiN1QSmmOayNcUM9gGt6ZZXnj3Uf3k0aMwwlexXzgan4cJLFVIKBNia+S52hfeadwa9ZcTTIaWz7erP97zeBmmts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602696067; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=HWi2frmDu2zKeksJ9srsssLn/7ROZA1EqTF0VHIJiiA=; b=fNp6F8BFIgG/fdmcdlNdU4rP7uIXzXuRjVv3lzu8yzNcJea8rOt4f7bt3K0+0JQOIQv/GPGWtgdwpeoAch8/KeLqkYcVcncuCwMm0BZY0W6kWUuw6hJGWrB5P1ncYoq1MtPAtvfLAQ+QoFiCeN29CgH7aIO00dIyT3oG6cvHlyg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602696067277345.8322118734002; Wed, 14 Oct 2020 10:21:07 -0700 (PDT) Received: from localhost ([::1]:47476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSkSX-0002Yo-8b for importer@patchew.org; Wed, 14 Oct 2020 13:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSkQo-0001lN-2Y for qemu-devel@nongnu.org; Wed, 14 Oct 2020 13:19:19 -0400 Received: from mga12.intel.com ([192.55.52.136]:55064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSkQk-0002mt-8d for qemu-devel@nongnu.org; Wed, 14 Oct 2020 13:19:17 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 10:19:06 -0700 Received: from pankajk1-mobl.amr.corp.intel.com (HELO bwidawsk-mobl5.local) ([10.252.132.199]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2020 10:19:05 -0700 IronPort-SDR: 8d1geM8x2kXh+SDKn7pB0VfHyIGmqZnA4HrTIfT6bokoLBkCKG82PLx7y3L99KIteofqL913UR wYoCESTw+TLg== X-IronPort-AV: E=McAfee;i="6000,8403,9774"; a="145459485" X-IronPort-AV: E=Sophos;i="5.77,375,1596524400"; d="scan'208";a="145459485" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: kaA1GFl4kDHVKz75dR3UklRjlRIj3EGgwtQwNVH9iejDpsxO3cr77kHp4KohBALUeAbSF5/+lO HZxV3abT1Vuw== X-IronPort-AV: E=Sophos;i="5.77,375,1596524400"; d="scan'208";a="314234682" From: Ben Widawsky To: qemu-devel@nongnu.org Subject: [PATCH RESEND] pci: Disallow improper BAR registration for type 1 Date: Wed, 14 Oct 2020 10:18:53 -0700 Message-Id: <20201014171853.71130-1-ben.widawsky@intel.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.136; envelope-from=ben.widawsky@intel.com; helo=mga12.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/14 13:19:06 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ben Widawsky , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch informs future developers working on root complexes, root ports, or bridges that also wish to implement a BAR for those. PCI type 1 headers only support 2 base address registers. It is incorrect and difficult to figure out what is wrong with the device when this mistake is made. With this, it is immediate and obvious what has gone wrong. Signed-off-by: Ben Widawsky --- hw/pci/pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 3c8f10b461..55b0302c57 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1141,6 +1141,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_= num, uint32_t addr; /* offset in pci config space */ uint64_t wmask; pcibus_t size =3D memory_region_size(memory); + uint8_t hdr_type; =20 assert(region_num >=3D 0); assert(region_num < PCI_NUM_REGIONS); @@ -1150,6 +1151,15 @@ void pci_register_bar(PCIDevice *pci_dev, int region= _num, exit(1); } =20 + hdr_type =3D + pci_dev->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTION; + if (hdr_type =3D=3D PCI_HEADER_TYPE_BRIDGE && region_num > 1) { + error_report("ERROR: PCI Type 1 header only has 2 BARs " + "requested BAR=3D%d", + region_num); + exit(1); + } + r =3D &pci_dev->io_regions[region_num]; r->addr =3D PCI_BAR_UNMAPPED; r->size =3D size; --=20 2.28.0