From nobody Sat Nov 2 16:24:23 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1486438398668931.4920033900491; Mon, 6 Feb 2017 19:33:18 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C0219820B0; Mon, 6 Feb 2017 19:33:13 -0800 (PST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7F995820B0 for ; Mon, 6 Feb 2017 19:33:12 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP; 06 Feb 2017 19:33:12 -0800 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by fmsmga004.fm.intel.com with ESMTP; 06 Feb 2017 19:33:11 -0800 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,344,1477983600"; d="scan'208";a="222151721" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Tue, 7 Feb 2017 11:33:03 +0800 Message-Id: <20170207033305.609040-5-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20170207033305.609040-1-ruiyu.ni@intel.com> References: <20170207033305.609040-1-ruiyu.ni@intel.com> Subject: [edk2] [PATCH v3 4/6] MdeModulePkg/IncompatiblePci: Use MAX_UINTN to match any IDs X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jeff Fan MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" When the VendorId/DeviceId/RevisionId/SubsystemVendorId /SubsystemDeviceId is MAX_UINTN, IncompatiblePciDeviceSupport driver doesn't use it to match any IDs. The patch fixes this bug. Since PciBus driver always calls IncompatiblePciDeviceSupport using IDs read from HW, MAX_UINTN is never passed to this driver. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Jeff Fan Reviewed-by: Feng Tian --- .../IncompatiblePciDeviceSupport.c | 10 +++++-= ---- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/Incompati= blePciDeviceSupport.c b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDx= e/IncompatiblePciDeviceSupport.c index bf0d47a..149662d 100644 --- a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciD= eviceSupport.c +++ b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciD= eviceSupport.c @@ -283,31 +283,31 @@ PCheckDevice ( // // See if the Header matches the parameters passed in // - if (Header->VendorId !=3D MAX_UINT64) { + if ((Header->VendorId !=3D MAX_UINT64) && (VendorId !=3D MAX_UINTN))= { if (Header->VendorId !=3D VendorId) { continue; } } =20 - if (Header->DeviceId !=3D MAX_UINT64) { + if ((Header->DeviceId !=3D MAX_UINT64) && (DeviceId !=3D MAX_UINTN))= { if (DeviceId !=3D Header->DeviceId) { continue; } } =20 - if (Header->RevisionId !=3D MAX_UINT64) { + if ((Header->RevisionId !=3D MAX_UINT64) && (RevisionId !=3D MAX_UIN= TN)) { if (RevisionId !=3D Header->RevisionId) { continue; } } =20 - if (Header->SubsystemVendorId !=3D MAX_UINT64) { + if ((Header->SubsystemVendorId !=3D MAX_UINT64) && (SubsystemVendorI= d !=3D MAX_UINTN)) { if (SubsystemVendorId !=3D Header->SubsystemVendorId) { continue; } } =20 - if (Header->SubsystemDeviceId !=3D MAX_UINT64) { + if ((Header->SubsystemDeviceId !=3D MAX_UINT64) && (SubsystemDeviceI= d !=3D MAX_UINTN)) { if (SubsystemDeviceId !=3D Header->SubsystemDeviceId) { continue; } --=20 2.9.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel