From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id D60C2940CF7 for ; Wed, 6 Sep 2023 02:19:45 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=t6HrOFy9c3ZHREOKid7JcLwN3+KD3MF1tTIBa71AfUo=; 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=1693966784; v=1; b=cmtTHxUt9Bc9l/3HteaK0eIv9kVTt4Vpe7HT/RhGgyIDFQM9IuBed7oG1kWTj2mtZaXcGHsw Zx7W4Fgr9lz1LrbGAwCoNgODsuMDvn2IM218opeHQSELdB8Q/7AXnHCy18cZIj2/CFWypQ4xzEE 8UWyXMAQjwDNbaBJJlSPARTA= X-Received: by 127.0.0.2 with SMTP id 4FQzYY7687511x3T80v3BUvN; Tue, 05 Sep 2023 19:19:44 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.2853.1693966783877947178 for ; Tue, 05 Sep 2023 19:19:43 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="357258658" X-IronPort-AV: E=Sophos;i="6.02,230,1688454000"; d="scan'208";a="357258658" X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2023 19:19:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10824"; a="741339353" X-IronPort-AV: E=Sophos;i="6.02,230,1688454000"; d="scan'208";a="741339353" X-Received: from shsi505.ccr.corp.intel.com ([10.239.146.206]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Sep 2023 19:19:41 -0700 From: "Huang, Yanbo" To: devel@edk2.groups.io Cc: Yanbo Huang , Isaac Oram , Nate DeSimone , Liming Gao Subject: [edk2-devel] [PATCH v2] IpmiFeaturePkg: Refine code to avoid warning report Date: Wed, 6 Sep 2023 10:19:13 +0800 Message-Id: <20230906021913.54945-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: lDLwwEzEfFvUmdYnLadg8mMqx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=cmtTHxUt; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io 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 Cc: Nate DeSimone Cc: 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/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 (#108296): https://edk2.groups.io/g/devel/message/108296 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] -=-=-=-=-=-=-=-=-=-=-=-