From nobody Sun May 5 16:42:52 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 1493012767681309.6315673895185; Sun, 23 Apr 2017 22:46:07 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 721C921954090; Sun, 23 Apr 2017 22:46:03 -0700 (PDT) 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 E6CDB21A0483A for ; Sun, 23 Apr 2017 22:46:02 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP; 23 Apr 2017 22:46:02 -0700 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by orsmga004.jf.intel.com with ESMTP; 23 Apr 2017 22:46:01 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,243,1488873600"; d="scan'208";a="80192638" From: Hao Wu To: edk2-devel@lists.01.org Date: Mon, 24 Apr 2017 13:45:56 +0800 Message-Id: <20170424054557.6992-2-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20170424054557.6992-1-hao.a.wu@intel.com> References: <20170424054557.6992-1-hao.a.wu@intel.com> Subject: [edk2] [PATCH 1/2] MdeModulePkg/UfsPciHc: Remove unused field in UfsHc private struct X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Star Zeng 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" The commit removes the unused field 'EFI_HANDLE Handle' in Ufs host controller private data structure 'UFS_HOST_CONTROLLER_PRIVATE_DATA'. Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Star Zeng --- MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c | 3 +-- MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c b/MdeModulePkg/= Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c index 23ebbf108f..373e55b4c2 100644 --- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c +++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c @@ -2,7 +2,7 @@ UfsHcDxe driver is used to provide platform-dependent info, mainly UFS h= ost controller MMIO base, to upper layer UFS drivers. =20 - Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -32,7 +32,6 @@ EFI_DRIVER_BINDING_PROTOCOL gUfsHcDriverBinding =3D { // UFS_HOST_CONTROLLER_PRIVATE_DATA gUfsHcTemplate =3D { UFS_HC_PRIVATE_DATA_SIGNATURE, // Signature - NULL, // Handle { // UfsHcProtocol UfsHcGetMmioBar, UfsHcAllocateBuffer, diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h b/MdeModulePkg/= Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h index 89f19feb7a..d9d977a5c9 100644 --- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h +++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.h @@ -2,7 +2,7 @@ UfsHcDxe driver is used to provide platform-dependent info, mainly UFS h= ost controller MMIO base, to upper layer UFS drivers. =20 - Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.
+ Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -49,11 +49,10 @@ extern EFI_COMPONENT_NAME2_PROTOCOL gUfsH= cComponentName2; typedef struct _UFS_HOST_CONTROLLER_PRIVATE_DATA UFS_HOST_CONTROLLER_PRIV= ATE_DATA; =20 // -// Nvme private data structure. +// Ufs host controller private data structure. // struct _UFS_HOST_CONTROLLER_PRIVATE_DATA { UINT32 Signature; - EFI_HANDLE Handle; =20 EDKII_UFS_HOST_CONTROLLER_PROTOCOL UfsHc; EFI_PCI_IO_PROTOCOL *PciIo; =20 --=20 2.12.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Sun May 5 16:42:52 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 1493012769614555.0427567734727; Sun, 23 Apr 2017 22:46:09 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A772021954088; Sun, 23 Apr 2017 22:46:05 -0700 (PDT) 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 8213521954093 for ; Sun, 23 Apr 2017 22:46:04 -0700 (PDT) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP; 23 Apr 2017 22:46:04 -0700 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.13]) by orsmga004.jf.intel.com with ESMTP; 23 Apr 2017 22:46:03 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,243,1488873600"; d="scan'208";a="80192651" From: Hao Wu To: edk2-devel@lists.01.org Date: Mon, 24 Apr 2017 13:45:57 +0800 Message-Id: <20170424054557.6992-3-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20170424054557.6992-1-hao.a.wu@intel.com> References: <20170424054557.6992-1-hao.a.wu@intel.com> Subject: [edk2] [PATCH 2/2] MdeModulePkg/UfsPciHc: Avoid overriding return value in BindingStart X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Star Zeng 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" In function UfsHcDriverBindingStart(), the return value 'Status' may be overriden during the original PCI attributes restore process. This commit refines the logics to avoid such override. Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c b/MdeModulePkg/= Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c index 373e55b4c2..241d9bac9f 100644 --- a/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c +++ b/MdeModulePkg/Bus/Pci/UfsPciHcDxe/UfsPciHcDxe.c @@ -671,13 +671,12 @@ Done: // // Restore original PCI attributes // - Status =3D PciIo->Attributes ( - PciIo, - EfiPciIoAttributeOperationSet, - Private->PciAttributes, - NULL - ); - ASSERT_EFI_ERROR (Status); + ASSERT_EFI_ERROR (PciIo->Attributes ( + PciIo, + EfiPciIoAttributeOperationSet, + Private->PciAttributes, + NULL + )); } gBS->CloseProtocol ( Controller, --=20 2.12.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel