From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by mx.groups.io with SMTP id smtpd.web11.6595.1612969513889820944 for ; Wed, 10 Feb 2021 07:05:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=Js+WP3a5; spf=pass (domain: nuviainc.com, ip: 209.85.166.51, mailfrom: rebecca@nuviainc.com) Received: by mail-io1-f51.google.com with SMTP id e133so2167588iof.8 for ; Wed, 10 Feb 2021 07:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NI+Vy+rQyrVuu/0OPYZ+TnA7z3f/CKoBBIhX7o8Zrgw=; b=Js+WP3a5HM1nizgLg8wSn2up1iBu89pXd4VFeQKi4WWLWSfwaYZ7H+AH/uf2pup4zz ie10vLxZ9PmWN/vw9OecMn0WzOTco0ST9gUU7GgTMRa9EhyHNs8yjNQIfDIeE1VElbKd jlOFu1RADytH5IZpaRlgZCryEaZpiMTdJ5IZCtcWPNn5zvD1/RLpKH8v5/pZg62II5IX ae/f76ezHzuSSt21ydUt2jJOF2LeGX/5TtZJ1Mn49aFwFX5D3yA1jeqUXs6psXonks+7 eS2kMtBtQ8+4FOaukOrC/hESW7HBJKFq5jYI05rZpp2DbaNY5a88q2oBuIN86YWPtDSY OQHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NI+Vy+rQyrVuu/0OPYZ+TnA7z3f/CKoBBIhX7o8Zrgw=; b=eVSmFKsq4+ukLUAAqKHNtw6sOePJECGvLQwdo84T2ubm840HIghPVppGbRiBdytoX+ V+kQsTA42ylDsmokTeuRM+b4Ue/6cWSqZqoNmL0BJKHhdUyovm2wYoXAeBJSPoehHMsS woEx6Sz2BA/YB3Txr5skM22iXca1bxsczwPncEnCzFE+9kcBdLMviOx3P92+stfj78Ns UoeepzljNm4RjCpOV55B7gRZ/PjCP6cxbAhRrNf7ksz1RsXFcmmQjUBIlIv2hASTEBZG 6i5JH6TFtX6fufJN3ELfmPX6tB9M8aLyw2UGx2GLlpye/ay8TWPdXwDGX+mr8nwf5K/i y8NQ== X-Gm-Message-State: AOAM531WA2qYIivT3FcAOwO3By0OZkKfTa4JpGLk8o4tUNthBCaKiwvP ZljN9qYcaPNBCaxKcQp+TZPIC3NvHyk41eWTFgSwfLkMulAPPzhCi9drAi5tvrxZq0cW1mwLSFQ l/uyTDnM88n0wbh+v96Chyq4V1vnXp7S7EhA0g0NtjGO5WPbf8J60xcUk7t6UVgEskGUL1A== X-Google-Smtp-Source: ABdhPJz2DBoRLL/UwXkRQij8ucM/d6r833+ClDpoIzxgPF6NQznbp0N1Hr9B189rhxeExjLpps9ZDA== X-Received: by 2002:a5d:938f:: with SMTP id c15mr1280079iol.72.1612969512633; Wed, 10 Feb 2021 07:05:12 -0800 (PST) Return-Path: Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id q19sm1098702ilj.65.2021.02.10.07.05.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 07:05:11 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Leif Lindholm , Ard Biesheuvel Subject: [PATCH 1/1] ArmPkg: Fix ARM ProcessorSubClassDxe build Date: Wed, 10 Feb 2021 08:04:57 -0700 Message-Id: <20210210150457.25897-1-rebecca@nuviainc.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The ARM ProcessorSubClassDxe build was broken due to changes in the SmbiosProcessor API and an unused variable. Signed-off-by: Rebecca Cran --- ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c index 0be4403c765f..c78bd41a7e06 100644 --- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c +++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/SmbiosProcessorArm.c @@ -22,7 +22,7 @@ @return The cache size. **/ UINT64 -ArmGetCacheSize ( +SmbiosProcessorGetCacheSize ( IN UINT8 CacheLevel, IN BOOLEAN DataCache, IN BOOLEAN UnifiedCache @@ -66,14 +66,13 @@ ArmGetCacheSize ( @return The cache associativity. **/ UINT32 -ArmGetCacheAssociativity ( +SmbiosProcessorGetCacheAssociativity ( IN UINT8 CacheLevel, IN BOOLEAN DataCache, IN BOOLEAN UnifiedCache ) { CCSIDR_DATA Ccsidr; - CCSIDR2_DATA Ccsidr2; CSSELR_DATA Csselr; BOOLEAN CcidxSupported; UINT32 Associativity; @@ -88,7 +87,6 @@ ArmGetCacheAssociativity ( CcidxSupported = ArmHasCcidx (); if (CcidxSupported) { - Ccsidr2.Data = ReadCCSIDR2 (Csselr.Data); Associativity = Ccsidr.BitsCcidxAA32.Associativity + 1; } else { Associativity = Ccsidr.BitsNonCcidx.Associativity + 1; -- 2.26.2