From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (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 0CEA721A02937 for ; Wed, 24 Oct 2018 22:49:06 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2018 22:49:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,423,1534834800"; d="scan'208";a="84289954" Received: from ray-dev.ccr.corp.intel.com (HELO [10.239.9.11]) ([10.239.9.11]) by orsmga008.jf.intel.com with ESMTP; 24 Oct 2018 22:49:04 -0700 To: Eric Dong , edk2-devel@lists.01.org Cc: Laszlo Ersek , Dandan Bi References: <20181025022601.25136-1-eric.dong@intel.com> <20181025022601.25136-6-eric.dong@intel.com> From: "Ni, Ruiyu" Message-ID: <13486d61-d219-b6a0-da9a-9b3333c01726@Intel.com> Date: Thu, 25 Oct 2018 13:50:20 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20181025022601.25136-6-eric.dong@intel.com> Subject: Re: [Patch 5/6] UefiCpuPkg/PiSmmCpuDxeSmm: Clean up useless code. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Oct 2018 05:49:06 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 10/25/2018 10:26 AM, Eric Dong wrote: > Remove useless code after change 93324390. > > Cc: Ruiyu Ni > Cc: Laszlo Ersek > Cc: Dandan Bi > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Eric Dong > --- > UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 10 +--------- > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 16 ---------------- > 2 files changed, 1 insertion(+), 25 deletions(-) > > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > index 42b040531e..abcc3eea05 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c > @@ -1272,7 +1272,6 @@ InitializeSmmCpuSemaphores ( > UINTN TotalSize; > UINTN GlobalSemaphoresSize; > UINTN CpuSemaphoresSize; > - UINTN MsrSemahporeSize; > UINTN SemaphoreSize; > UINTN Pages; > UINTN *SemaphoreBlock; > @@ -1282,8 +1281,7 @@ InitializeSmmCpuSemaphores ( > ProcessorCount = gSmmCpuPrivate->SmmCoreEntryContext.NumberOfCpus; > GlobalSemaphoresSize = (sizeof (SMM_CPU_SEMAPHORE_GLOBAL) / sizeof (VOID *)) * SemaphoreSize; > CpuSemaphoresSize = (sizeof (SMM_CPU_SEMAPHORE_CPU) / sizeof (VOID *)) * ProcessorCount * SemaphoreSize; > - MsrSemahporeSize = MSR_SPIN_LOCK_INIT_NUM * SemaphoreSize; > - TotalSize = GlobalSemaphoresSize + CpuSemaphoresSize + MsrSemahporeSize; > + TotalSize = GlobalSemaphoresSize + CpuSemaphoresSize; > DEBUG((EFI_D_INFO, "One Semaphore Size = 0x%x\n", SemaphoreSize)); > DEBUG((EFI_D_INFO, "Total Semaphores Size = 0x%x\n", TotalSize)); > Pages = EFI_SIZE_TO_PAGES (TotalSize); > @@ -1311,12 +1309,6 @@ InitializeSmmCpuSemaphores ( > SemaphoreAddr += ProcessorCount * SemaphoreSize; > mSmmCpuSemaphores.SemaphoreCpu.Present = (BOOLEAN *)SemaphoreAddr; > > - SemaphoreAddr = (UINTN)SemaphoreBlock + GlobalSemaphoresSize + CpuSemaphoresSize; > - mSmmCpuSemaphores.SemaphoreMsr.Msr = (SPIN_LOCK *)SemaphoreAddr; > - mSmmCpuSemaphores.SemaphoreMsr.AvailableCounter = > - ((UINTN)SemaphoreBlock + Pages * SIZE_4KB - SemaphoreAddr) / SemaphoreSize; > - ASSERT (mSmmCpuSemaphores.SemaphoreMsr.AvailableCounter >= MSR_SPIN_LOCK_INIT_NUM); > - > mPFLock = mSmmCpuSemaphores.SemaphoreGlobal.PFLock; > mConfigSmmCodeAccessCheckLock = mSmmCpuSemaphores.SemaphoreGlobal.CodeAccessCheckLock; > > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > index e2970308fe..61d4bd3085 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h > @@ -347,13 +347,6 @@ typedef struct { > volatile BOOLEAN *CandidateBsp; > } SMM_DISPATCHER_MP_SYNC_DATA; > > -#define MSR_SPIN_LOCK_INIT_NUM 15 > - > -typedef struct { > - SPIN_LOCK *SpinLock; > - UINT32 MsrIndex; > -} MP_MSR_LOCK; > - > #define SMM_PSD_OFFSET 0xfb00 > > /// > @@ -376,21 +369,12 @@ typedef struct { > volatile BOOLEAN *Present; > } SMM_CPU_SEMAPHORE_CPU; > > -/// > -/// All MSRs semaphores' pointer and counter > -/// > -typedef struct { > - SPIN_LOCK *Msr; > - UINTN AvailableCounter; > -} SMM_CPU_SEMAPHORE_MSR; > - > /// > /// All semaphores' information > /// > typedef struct { > SMM_CPU_SEMAPHORE_GLOBAL SemaphoreGlobal; > SMM_CPU_SEMAPHORE_CPU SemaphoreCpu; > - SMM_CPU_SEMAPHORE_MSR SemaphoreMsr; > } SMM_CPU_SEMAPHORES; > > extern IA32_DESCRIPTOR gcSmiGdtr; > Reviewed-by: Ruiyu Ni -- Thanks, Ray