From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.9308.1653056161941887235 for ; Fri, 20 May 2022 07:16:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=UBLcaLaA; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653056161; x=1684592161; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gpLVGwArCcSzxNPpna+SY1drnLtUtD4C78USnAttqig=; b=UBLcaLaAyujGzthcNq5PQVN4K8GkhPoErW+MRAb1MbsB7Ev1G0OsOs8s FtUsZBWo2yZ5QbPjXOZxz+52tbhboCQrEvFuo4mhP+YWMEmvYK3+pgQVd gmbLbgtYURSO7SHzXaR5K+xPn/ihOkvqo6ISXYaYPSPPvJ/A5LB2iZooR kCkJaVT1sJKFYn6gwHSrsYLezSbKQBrP2AG/Bifd14YbT3MqmVUqR6XpF 0T01kSNjml2bxNQf1A5roSQG89mbUVnlEVuBpU5uWPNTjmCgM3jZpQPF5 whlayRF4UtpPosNLzbr2UYdJIp63TLpX1X5VxynNEZO2Tcp9c5BN9fwBU A==; X-IronPort-AV: E=McAfee;i="6400,9594,10353"; a="333243124" X-IronPort-AV: E=Sophos;i="5.91,239,1647327600"; d="scan'208";a="333243124" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 07:15:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,239,1647327600"; d="scan'208";a="743512505" Received: from shwdeopenlab706.ccr.corp.intel.com ([10.239.183.102]) by orsmga005.jf.intel.com with ESMTP; 20 May 2022 07:15:58 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Eric Dong Subject: [PATCH 2/5] CpuException: Init global variables in-place Date: Fri, 20 May 2022 22:15:46 +0800 Message-Id: <20220520141549.108-3-ray.ni@intel.com> X-Mailer: git-send-email 2.35.1.windows.2 In-Reply-To: <20220520141549.108-1-ray.ni@intel.com> References: <20220520141549.108-1-ray.ni@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Additionally removed two useless global variables: "SPIN_LOCK mDisplayMessageSpinLock" from SMM instance. "UINTN mEnabledInterruptNum" from DXE instance. Signed-off-by: Ray Ni Cc: Eric Dong --- .../Library/CpuExceptionHandlerLib/DxeException.c | 11 ++++++----- .../Library/CpuExceptionHandlerLib/SmmException.c | 14 ++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c b/Uef= iCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c index 5083c4b8e8..da5b96d6c6 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeException.c @@ -16,9 +16,12 @@ CONST UINTN mDoFarReturnFlag =3D 0; =0D RESERVED_VECTORS_DATA mReservedVectorsData[CPU_EXCEPTION_NUM];=0D EFI_CPU_INTERRUPT_HANDLER mExternalInterruptHandlerTable[CPU_EXCEPTION_NU= M];=0D -UINTN mEnabledInterruptNum =3D 0;=0D -=0D -EXCEPTION_HANDLER_DATA mExceptionHandlerData;=0D +EXCEPTION_HANDLER_DATA mExceptionHandlerData =3D {=0D + 0, // To be fixed=0D + 0, // To be fixed=0D + mReservedVectorsData,=0D + mExternalInterruptHandlerTable=0D +};=0D =0D UINT8 mNewStack[CPU_STACK_SWITCH_EXCEPTION_NUMBER *=0D CPU_KNOWN_GOOD_STACK_SIZE];=0D @@ -62,8 +65,6 @@ InitializeCpuExceptionHandlers ( IN EFI_VECTOR_HANDOFF_INFO *VectorInfo OPTIONAL=0D )=0D {=0D - mExceptionHandlerData.ReservedVectors =3D mReservedVectorsData;= =0D - mExceptionHandlerData.ExternalInterruptHandler =3D mExternalInterruptHan= dlerTable;=0D InitializeSpinLock (&mExceptionHandlerData.DisplayMessageSpinLock);=0D return InitializeCpuExceptionHandlersWorker (VectorInfo, &mExceptionHand= lerData);=0D }=0D diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c b/Uef= iCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c index 77ee74579f..9f0af4120a 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmException.c @@ -11,14 +11,14 @@ =0D CONST UINTN mDoFarReturnFlag =3D 1;=0D =0D -//=0D -// Spin lock for CPU information display=0D -//=0D -SPIN_LOCK mDisplayMessageSpinLock;=0D -=0D RESERVED_VECTORS_DATA mReservedVectorsData[CPU_EXCEPTION_NUM];=0D EFI_CPU_INTERRUPT_HANDLER mExternalInterruptHandlerTable[CPU_EXCEPTION_NU= M];=0D -EXCEPTION_HANDLER_DATA mExceptionHandlerData;=0D +EXCEPTION_HANDLER_DATA mExceptionHandlerData =3D {=0D + 0, // To be fixed=0D + 0, // To be fixed=0D + mReservedVectorsData,=0D + mExternalInterruptHandlerTable=0D +};=0D =0D /**=0D Common exception handler.=0D @@ -58,8 +58,6 @@ InitializeCpuExceptionHandlers ( IN EFI_VECTOR_HANDOFF_INFO *VectorInfo OPTIONAL=0D )=0D {=0D - mExceptionHandlerData.ReservedVectors =3D mReservedVectorsData;= =0D - mExceptionHandlerData.ExternalInterruptHandler =3D mExternalInterruptHan= dlerTable;=0D InitializeSpinLock (&mExceptionHandlerData.DisplayMessageSpinLock);=0D return InitializeCpuExceptionHandlersWorker (VectorInfo, &mExceptionHand= lerData);=0D }=0D --=20 2.35.1.windows.2