From nobody Sun May 19 06:23:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+108295+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108295+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1693966692; cv=none; d=zohomail.com; s=zohoarc; b=g47Ongedrl5T/24kg5mK/i1n+5ZmYkf4N/DkPm5eC9ZqF6vtG6HwjmWXfEAEyqM3vyzWz65acHMhliUD1fMY+t6AO87AIHlsc92FeTZdRDSM8I+6yN1oOU9XR5h0jiaYFn+Sglzi1T3myrIPNo+itdo8p8tz+Ow6TTnIFJj4hyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693966692; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=oh5kd8hCbQe19o7i5N36T6xic6k3Ej9vf8KcFbaCpws=; b=lJvbYUnWYq/tfZ+wcJWsqabOg6h+hPIVPb9ke6kdHRJT4CvJSz126yC0LyYaOprQhH8mzyjqDGZuAE/Ogj4nu7SvdNcdAgyuG0MFWPVoLIqjOq0BI/haxylCwCu2N1bE+ujvZE/9df/+iFxDg9nX0kLr49vJCGrLQzXkt3EA3mU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108295+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1693966692567246.87349892350448; Tue, 5 Sep 2023 19:18:12 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=8eg6SSjoqA3PxYfkkEKdM8NfhObWSJ2c4uf06NUTGVE=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1693966692; v=1; b=fRMi98hORXgHUdraLJbXpHLR+oiuMebfe6f3MFIbd7cZ0R4lbnJQJaivUKzS9d/6gs/XglB0 D3vpIF+SL1CEvEQbyrt6EMORm/w6AHFEOfPvzCn5Z0SeEcwsuezzWroE+4DpClEwIMj37oht8Gs itQLl55ykL83QYfDORI7nVg8= X-Received: by 127.0.0.2 with SMTP id syM2YY1788612xkEzOXsAbU3; Tue, 05 Sep 2023 19:18:12 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web10.2783.1693966691232753859 for ; Tue, 05 Sep 2023 19:18:11 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="374341284" X-IronPort-AV: E=Sophos;i="6.02,230,1688454000"; d="scan'208";a="374341284" X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2023 19:15:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="864977420" X-IronPort-AV: E=Sophos;i="6.02,230,1688454000"; d="scan'208";a="864977420" X-Received: from shsi505.ccr.corp.intel.com ([10.239.146.206]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2023 19:15:51 -0700 From: "Huang, Yanbo" To: devel@edk2.groups.io Cc: Yanbo Huang Subject: [edk2-devel] [PATCH] IpmiFeaturePkg: Refine code to avoid warning report Date: Wed, 6 Sep 2023 10:15:16 +0800 Message-Id: <20230906021516.54886-1-yanbo.huang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,yanbo.huang@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: HAxRpgDrYMAIVpmzwQs40rJYx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1693966693639100001 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4522 "if (FixedPcdGet8 (PcdKcsInterfaceSupport) =3D=3D 1) {" will not be execute= d in current code, put it within "case SysInterfaceKcs:" to avoid this issue. M: Isaac Oram M: Nate DeSimone R: Liming Gao Signed-off-by: Yanbo Huang --- .../IpmiFeaturePkg/GenericIpmi/Dxe/IpmiInit.c | 36 ++++++++---------- .../GenericIpmi/Pei/PeiGenericIpmi.c | 36 ++++++++---------- .../GenericIpmi/Smm/SmmGenericIpmi.c | 38 +++++++++---------- 3 files changed, 49 insertions(+), 61 deletions(-) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/= Dxe/IpmiInit.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericI= pmi/Dxe/IpmiInit.c index 7113556df8..82f6d2a661 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/Ipm= iInit.c +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/Ipm= iInit.c @@ -630,8 +630,8 @@ InitializeIpmiKcsPhysicalLayer ( // Check interface data initialized successfully else register notify = protocol. for (Index =3D SysInterfaceKcs; Index < SysInterfaceMax; Index++) { switch (Index) { - if (FixedPcdGet8 (PcdKcsInterfaceSupport) =3D=3D 1) { - case SysInterfaceKcs: + case SysInterfaceKcs: + if (FixedPcdGet8 (PcdKcsInterfaceSupport) =3D=3D 1) { if ((mIpmiInstance->BmcStatus !=3D BMC_HARDFAIL) && (mIpmiInst= ance->BmcStatus !=3D BMC_UPDATE_IN_PROGRESS)) { BMC_INTERFACE_STATUS BmcStatus; mIpmiInstance->IpmiTransport2.Interface.KcsInterfaceState = =3D IpmiInterfaceInitialized; @@ -646,21 +646,19 @@ InitializeIpmiKcsPhysicalLayer ( mIpmiInstance->IpmiTransport2.Interface.KcsInterfaceState = =3D IpmiInterfaceInitError; } } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdBtInterfaceSupport) =3D=3D 1) { - case SysInterfaceBt: + case SysInterfaceBt: + if (FixedPcdGet8 (PcdBtInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2.Interface.Bt.InterfaceState = =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdSsifInterfaceSupport) =3D=3D 1) { - case SysInterfaceSsif: + case SysInterfaceSsif: + if (FixedPcdGet8 (PcdSsifInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2.Interface.Ssif.InterfaceStat= e =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } else if (mIpmiInstance->IpmiTransport2.Interface.Ssif.Interf= aceState =3D=3D IpmiInterfaceInitError) { @@ -669,12 +667,11 @@ InitializeIpmiKcsPhysicalLayer ( &mIpmiInstance->IpmiTr= ansport2.Interface.Ssif.SsifInterfaceApiGuid ); } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdIpmbInterfaceSupport) =3D=3D 1) { - case SysInterfaceIpmb: + case SysInterfaceIpmb: + if (FixedPcdGet8 (PcdIpmbInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.InterfaceStat= e =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } else if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.Interf= aceState =3D=3D IpmiInterfaceInitError) { @@ -683,9 +680,8 @@ InitializeIpmiKcsPhysicalLayer ( &mIpmiInstance->IpmiTr= ansport2.Interface.Ipmb.IpmbInterfaceApiGuid ); } - - break; - } + } + break; =20 default: break; diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/= Pei/PeiGenericIpmi.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Ge= nericIpmi/Pei/PeiGenericIpmi.c index 1d8266a0b1..ebc9e7085d 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/Pei= GenericIpmi.c +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/Pei= GenericIpmi.c @@ -343,8 +343,8 @@ PeiInitializeIpmiKcsPhysicalLayer ( // Check interface data initialized successfully else register notify pr= otocol. for (Index =3D SysInterfaceKcs; Index < SysInterfaceMax; Index++) { switch (Index) { - if (FixedPcdGet8 (PcdKcsInterfaceSupport) =3D=3D 1) { - case SysInterfaceKcs: + case SysInterfaceKcs: + if (FixedPcdGet8 (PcdKcsInterfaceSupport) =3D=3D 1) { if ((mIpmiInstance->BmcStatus !=3D BMC_HARDFAIL) && (mIpmiInstan= ce->BmcStatus !=3D BMC_UPDATE_IN_PROGRESS)) { BMC_INTERFACE_STATUS BmcStatus; mIpmiInstance->IpmiTransport2Ppi.Interface.KcsInterfaceState = =3D IpmiInterfaceInitialized; @@ -359,42 +359,38 @@ PeiInitializeIpmiKcsPhysicalLayer ( mIpmiInstance->IpmiTransport2Ppi.Interface.KcsInterfaceState= =3D IpmiInterfaceInitError; } } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdBtInterfaceSupport) =3D=3D 1) { - case SysInterfaceBt: + case SysInterfaceBt: + if (FixedPcdGet8 (PcdBtInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2Ppi.Interface.Bt.InterfaceState= =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdSsifInterfaceSupport) =3D=3D 1) { - case SysInterfaceSsif: + case SysInterfaceSsif: + if (FixedPcdGet8 (PcdSsifInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2Ppi.Interface.Ssif.InterfaceSta= te =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } else if (mIpmiInstance->IpmiTransport2Ppi.Interface.Ssif.Inter= faceState =3D=3D IpmiInterfaceInitError) { // Register protocol notify for SMBUS Protocol. Status =3D RegisterPpiCallback (PeiServices, &mIpmiInstance->I= pmiTransport2Ppi.Interface.Ssif.SsifInterfaceApiGuid); } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdIpmbInterfaceSupport) =3D=3D 1) { - case SysInterfaceIpmb: + case SysInterfaceIpmb: + if (FixedPcdGet8 (PcdIpmbInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2Ppi.Interface.Ipmb.InterfaceSta= te =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } else if (mIpmiInstance->IpmiTransport2Ppi.Interface.Ipmb.Inter= faceState =3D=3D IpmiInterfaceInitError) { // Register protocol notify for SMBUS Protocol. Status =3D RegisterPpiCallback (PeiServices, &mIpmiInstance->I= pmiTransport2Ppi.Interface.Ipmb.IpmbInterfaceApiGuid); } - - break; - } + } + break; =20 default: break; diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/= Smm/SmmGenericIpmi.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Ge= nericIpmi/Smm/SmmGenericIpmi.c index 350d6afef5..2349373317 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/Smm= GenericIpmi.c +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/Smm= GenericIpmi.c @@ -210,7 +210,7 @@ SmmNotifyCallback ( &mIpmiInstance->IpmiTrans= port2 ); } - + ASSERT_EFI_ERROR (Status); return EFI_SUCCESS; } =20 @@ -335,8 +335,8 @@ Returns: // Check interface data initialized successfully else register notify = protocol. for (Index =3D SysInterfaceKcs; Index < SysInterfaceMax; Index++) { switch (Index) { - if (FixedPcdGet8 (PcdKcsInterfaceSupport) =3D=3D 1) { - case SysInterfaceKcs: + case SysInterfaceKcs: + if (FixedPcdGet8 (PcdKcsInterfaceSupport) =3D=3D 1) { if ((mIpmiInstance->BmcStatus !=3D BMC_HARDFAIL) && (mIpmiInst= ance->BmcStatus !=3D BMC_UPDATE_IN_PROGRESS)) { BMC_INTERFACE_STATUS BmcStatus; mIpmiInstance->IpmiTransport2.Interface.KcsInterfaceState = =3D IpmiInterfaceInitialized; @@ -351,42 +351,38 @@ Returns: mIpmiInstance->IpmiTransport2.Interface.KcsInterfaceState = =3D IpmiInterfaceInitError; } } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdBtInterfaceSupport) =3D=3D 1) { - case SysInterfaceBt: + case SysInterfaceBt: + if (FixedPcdGet8 (PcdBtInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2.Interface.Bt.InterfaceState = =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdSsifInterfaceSupport) =3D=3D 1) { - case SysInterfaceSsif: + case SysInterfaceSsif: + if (FixedPcdGet8 (PcdSsifInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2.Interface.Ssif.InterfaceStat= e =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } else if (mIpmiInstance->IpmiTransport2.Interface.Ssif.Interf= aceState =3D=3D IpmiInterfaceInitError) { // Register protocol notify for SMBUS Protocol. Status =3D SmmRegisterProtocolCallback (&mIpmiInstance->Ipmi= Transport2.Interface.Ssif.SsifInterfaceApiGuid); } + } + break; =20 - break; - } - - if (FixedPcdGet8 (PcdIpmbInterfaceSupport) =3D=3D 1) { - case SysInterfaceIpmb: + case SysInterfaceIpmb: + if (FixedPcdGet8 (PcdIpmbInterfaceSupport) =3D=3D 1) { if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.InterfaceStat= e =3D=3D IpmiInterfaceInitialized) { InterfaceState =3D IpmiInterfaceInitialized; } else if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.Interf= aceState =3D=3D IpmiInterfaceInitError) { // Register protocol notify for SMBUS Protocol. Status =3D SmmRegisterProtocolCallback (&mIpmiInstance->Ipmi= Transport2.Interface.Ipmb.IpmbInterfaceApiGuid); } - - break; - } + } + break; =20 default: break; --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108295): https://edk2.groups.io/g/devel/message/108295 Mute This Topic: https://groups.io/mt/101185469/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-