From: "Nate DeSimone" <nathaniel.l.desimone@intel.com>
To: "Huang, Yanbo" <yanbo.huang@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: Isaac Oram <isaac.w.oram@intel.com>,
"Gao, Liming" <gaoliming@byosoft.com.cn>
Subject: Re: [edk2-devel] [PATCH v2] IpmiFeaturePkg: Refine code to avoid warning report
Date: Tue, 19 Sep 2023 20:04:25 +0000 [thread overview]
Message-ID: <MW4PR11MB5821FC039D516DAED69CBFA0CDFAA@MW4PR11MB5821.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20230906021913.54945-1-yanbo.huang@intel.com>
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
-----Original Message-----
From: Huang, Yanbo <yanbo.huang@intel.com>
Sent: Tuesday, September 5, 2023 7:19 PM
To: devel@edk2.groups.io
Cc: Huang, Yanbo <yanbo.huang@intel.com>; Isaac Oram <isaac.w.oram@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>
Subject: [PATCH v2] IpmiFeaturePkg: Refine code to avoid warning report
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4522
"if (FixedPcdGet8 (PcdKcsInterfaceSupport) == 1) {" will not be executed in current code, put it within "case SysInterfaceKcs:" to avoid this issue.
Cc: Isaac Oram <isaac.w.oram@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Yanbo Huang <yanbo.huang@intel.com>
---
.../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/GenericIpmi/Dxe/IpmiInit.c
index 7113556df8..82f6d2a661 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/IpmiInit.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/
+++ IpmiInit.c
@@ -630,8 +630,8 @@ InitializeIpmiKcsPhysicalLayer (
// Check interface data initialized successfully else register notify protocol.
for (Index = SysInterfaceKcs; Index < SysInterfaceMax; Index++) {
switch (Index) {
- if (FixedPcdGet8 (PcdKcsInterfaceSupport) == 1) {
- case SysInterfaceKcs:
+ case SysInterfaceKcs:
+ if (FixedPcdGet8 (PcdKcsInterfaceSupport) == 1) {
if ((mIpmiInstance->BmcStatus != BMC_HARDFAIL) && (mIpmiInstance->BmcStatus != BMC_UPDATE_IN_PROGRESS)) {
BMC_INTERFACE_STATUS BmcStatus;
mIpmiInstance->IpmiTransport2.Interface.KcsInterfaceState = IpmiInterfaceInitialized; @@ -646,21 +646,19 @@ InitializeIpmiKcsPhysicalLayer (
mIpmiInstance->IpmiTransport2.Interface.KcsInterfaceState = IpmiInterfaceInitError;
}
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdBtInterfaceSupport) == 1) {
- case SysInterfaceBt:
+ case SysInterfaceBt:
+ if (FixedPcdGet8 (PcdBtInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2.Interface.Bt.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
- case SysInterfaceSsif:
+ case SysInterfaceSsif:
+ if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2.Interface.Ssif.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
} else if (mIpmiInstance->IpmiTransport2.Interface.Ssif.InterfaceState == IpmiInterfaceInitError) { @@ -669,12 +667,11 @@ InitializeIpmiKcsPhysicalLayer (
&mIpmiInstance->IpmiTransport2.Interface.Ssif.SsifInterfaceApiGuid
);
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
- case SysInterfaceIpmb:
+ case SysInterfaceIpmb:
+ if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
} else if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.InterfaceState == IpmiInterfaceInitError) { @@ -683,9 +680,8 @@ InitializeIpmiKcsPhysicalLayer (
&mIpmiInstance->IpmiTransport2.Interface.Ipmb.IpmbInterfaceApiGuid
);
}
-
- break;
- }
+ }
+ break;
default:
break;
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.c
index 1d8266a0b1..ebc9e7085d 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/
+++ PeiGenericIpmi.c
@@ -343,8 +343,8 @@ PeiInitializeIpmiKcsPhysicalLayer (
// Check interface data initialized successfully else register notify protocol.
for (Index = SysInterfaceKcs; Index < SysInterfaceMax; Index++) {
switch (Index) {
- if (FixedPcdGet8 (PcdKcsInterfaceSupport) == 1) {
- case SysInterfaceKcs:
+ case SysInterfaceKcs:
+ if (FixedPcdGet8 (PcdKcsInterfaceSupport) == 1) {
if ((mIpmiInstance->BmcStatus != BMC_HARDFAIL) && (mIpmiInstance->BmcStatus != BMC_UPDATE_IN_PROGRESS)) {
BMC_INTERFACE_STATUS BmcStatus;
mIpmiInstance->IpmiTransport2Ppi.Interface.KcsInterfaceState = IpmiInterfaceInitialized; @@ -359,42 +359,38 @@ PeiInitializeIpmiKcsPhysicalLayer (
mIpmiInstance->IpmiTransport2Ppi.Interface.KcsInterfaceState = IpmiInterfaceInitError;
}
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdBtInterfaceSupport) == 1) {
- case SysInterfaceBt:
+ case SysInterfaceBt:
+ if (FixedPcdGet8 (PcdBtInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2Ppi.Interface.Bt.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
- case SysInterfaceSsif:
+ case SysInterfaceSsif:
+ if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2Ppi.Interface.Ssif.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
} else if (mIpmiInstance->IpmiTransport2Ppi.Interface.Ssif.InterfaceState == IpmiInterfaceInitError) {
// Register protocol notify for SMBUS Protocol.
Status = RegisterPpiCallback (PeiServices, &mIpmiInstance->IpmiTransport2Ppi.Interface.Ssif.SsifInterfaceApiGuid);
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
- case SysInterfaceIpmb:
+ case SysInterfaceIpmb:
+ if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2Ppi.Interface.Ipmb.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
} else if (mIpmiInstance->IpmiTransport2Ppi.Interface.Ipmb.InterfaceState == IpmiInterfaceInitError) {
// Register protocol notify for SMBUS Protocol.
Status = RegisterPpiCallback (PeiServices, &mIpmiInstance->IpmiTransport2Ppi.Interface.Ipmb.IpmbInterfaceApiGuid);
}
-
- break;
- }
+ }
+ break;
default:
break;
diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/SmmGenericIpmi.c b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/SmmGenericIpmi.c
index 350d6afef5..2349373317 100644
--- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/SmmGenericIpmi.c
+++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/
+++ SmmGenericIpmi.c
@@ -210,7 +210,7 @@ SmmNotifyCallback (
&mIpmiInstance->IpmiTransport2
);
}
-
+ ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS;
}
@@ -335,8 +335,8 @@ Returns:
// Check interface data initialized successfully else register notify protocol.
for (Index = SysInterfaceKcs; Index < SysInterfaceMax; Index++) {
switch (Index) {
- if (FixedPcdGet8 (PcdKcsInterfaceSupport) == 1) {
- case SysInterfaceKcs:
+ case SysInterfaceKcs:
+ if (FixedPcdGet8 (PcdKcsInterfaceSupport) == 1) {
if ((mIpmiInstance->BmcStatus != BMC_HARDFAIL) && (mIpmiInstance->BmcStatus != BMC_UPDATE_IN_PROGRESS)) {
BMC_INTERFACE_STATUS BmcStatus;
mIpmiInstance->IpmiTransport2.Interface.KcsInterfaceState = IpmiInterfaceInitialized; @@ -351,42 +351,38 @@ Returns:
mIpmiInstance->IpmiTransport2.Interface.KcsInterfaceState = IpmiInterfaceInitError;
}
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdBtInterfaceSupport) == 1) {
- case SysInterfaceBt:
+ case SysInterfaceBt:
+ if (FixedPcdGet8 (PcdBtInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2.Interface.Bt.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
- case SysInterfaceSsif:
+ case SysInterfaceSsif:
+ if (FixedPcdGet8 (PcdSsifInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2.Interface.Ssif.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
} else if (mIpmiInstance->IpmiTransport2.Interface.Ssif.InterfaceState == IpmiInterfaceInitError) {
// Register protocol notify for SMBUS Protocol.
Status = SmmRegisterProtocolCallback (&mIpmiInstance->IpmiTransport2.Interface.Ssif.SsifInterfaceApiGuid);
}
+ }
+ break;
- break;
- }
-
- if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
- case SysInterfaceIpmb:
+ case SysInterfaceIpmb:
+ if (FixedPcdGet8 (PcdIpmbInterfaceSupport) == 1) {
if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.InterfaceState == IpmiInterfaceInitialized) {
InterfaceState = IpmiInterfaceInitialized;
} else if (mIpmiInstance->IpmiTransport2.Interface.Ipmb.InterfaceState == IpmiInterfaceInitError) {
// Register protocol notify for SMBUS Protocol.
Status = SmmRegisterProtocolCallback (&mIpmiInstance->IpmiTransport2.Interface.Ipmb.IpmbInterfaceApiGuid);
}
-
- break;
- }
+ }
+ break;
default:
break;
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#108857): https://edk2.groups.io/g/devel/message/108857
Mute This Topic: https://groups.io/mt/101185487/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2023-09-19 20:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-06 2:19 [edk2-devel] [PATCH v2] IpmiFeaturePkg: Refine code to avoid warning report Huang, Yanbo
2023-09-19 20:04 ` Nate DeSimone [this message]
2023-09-19 20:07 ` Nate DeSimone
[not found] <17822DD0A7D23F61.30276@groups.io>
2023-09-11 2:29 ` Huang, Yanbo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MW4PR11MB5821FC039D516DAED69CBFA0CDFAA@MW4PR11MB5821.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox