From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web12.10590.1608300985540771696 for ; Fri, 18 Dec 2020 06:16:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=MGtb6nsn; spf=pass (domain: nuviainc.com, ip: 209.85.128.50, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f50.google.com with SMTP id a6so2488173wmc.2 for ; Fri, 18 Dec 2020 06:16:25 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=GhkHCKHR4XMUlVgqUz9qiuoK4U/y+Be1EOfF+GDmJoo=; b=MGtb6nsnHgEiBC0wf1ldM4BTu9BWB84vZrOHdkxgp6U+JdHTIys0hWbS167hudPH1/ NrU9GP4BRXpK23wKonWNJEH5XnBSzAmJc5IzEpXgbkMt+v7PolV/Ioeoxrovbahwj2c2 WSMmUtN5neI4Zj9gPmQ8GH6nSUyBKgZOnIXbHfutR/mh+YbElwNf7cIk7XozSeVUkJk5 oOdqb0iMRdEx4XRWHH5FXQMKjnpqvcC5dLT4XQ/FmUKvydIL9PwZ+qAHfnsSNE0IppKb Xkcfgf9JznfLxzmxCp1jBSQ2bjA+TS/L0hqqhulwuKbeMV7SVdxHEd6M0BJDveAQhwJN O2xA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=GhkHCKHR4XMUlVgqUz9qiuoK4U/y+Be1EOfF+GDmJoo=; b=AZ1QgnP2pDlHJCzTEfP48lRXpZT2CCm4x8fM8b/u+cksaF+TpFv7qo/otijgzWMDag iXVV6wnEijs82u4FMdvN+GAPdd0zaQfxbeKe9gaqSSZb+qnoyZyv/Nc8gC84xuyW+1vq 4payciA1otSfOKoUuYuNFDOEuLu9Dux7GyJ/pl2kSOtS0jO+IkA45pg3uTYy05L2rcsD 9y1UhdKBZt//0CSpdFHUhMnLh461xJD/3X62dEkKvkoRsNIKY+vZxcaV9jCa4q2KHvs2 r6lfq+ovPNdvVrhtDGXkHKdYo4f22wDpzoluNfgONG2KU+RBL2sd52Kd/d+/asgiPkOX UtfQ== X-Gm-Message-State: AOAM532+QapMyTYkcbYdXvW6+miz71qQ9vvY3zZ+yKSb5TMopC/YuJ3v SFKhgqYHtMsGhLaVKCe6TAa/uLqvGhOT/N6IQXgYIrhU1hF/9hUg69bJu5qWgjW0Am56z7Wly7G P8d12DEvEQ0cdPBANt93vUppcTKF2g6yezyQ0tKnp00msnR9K1EupdQTiNgeJxEQZ9g== X-Google-Smtp-Source: ABdhPJyjDn2icmWJU7xpAGtcX4eqM1ptxyTxL2YZwIiIpVdRlDtPiy9t2cgPAQ6F9wxCAJtKFw/ejQ== X-Received: by 2002:a1c:2d47:: with SMTP id t68mr4590665wmt.148.1608300983834; Fri, 18 Dec 2020 06:16:23 -0800 (PST) Return-Path: Received: from vanye.hemma.eciton.net (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id b12sm18558569wmj.2.2020.12.18.06.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 06:16:23 -0800 (PST) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Ard Biesheuvel Subject: [PATCH 6/9] ArmPkg: use helper to check for Security extensions in ArmArchTimerLib Date: Fri, 18 Dec 2020 14:16:14 +0000 Message-Id: <20201218141617.26947-7-leif@nuviainc.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201218141617.26947-1-leif@nuviainc.com> References: <20201218141617.26947-1-leif@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use the helper ArmHasSecurityExtensions () instead of accessing ID_PFR1 directly. Only affects ARM build. Cc: Ard Biesheuvel Signed-off-by: Leif Lindholm --- ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c index 7c698fe471f3..24d9dae4e660 100644 --- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c +++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c @@ -56,7 +56,7 @@ TimerConstructor ( // If the security extension is not implemented, set Timer Frequency // here. // - if ((ArmReadIdPfr1 () & ARM_PFR1_SEC) == 0x0) { + if (ArmHasSecurityExtensions ()) { ArmGenericTimerSetTimerFreq (PcdGet32 (PcdArmArchTimerFreqInHz)); } #endif -- 2.20.1