From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web09.11907.1583413158640837158 for ; Thu, 05 Mar 2020 04:59:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=kjSoI+8G; spf=pass (domain: linaro.org, ip: 209.85.221.65, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f65.google.com with SMTP id 6so1472846wre.4 for ; Thu, 05 Mar 2020 04:59:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SfugH+pTROPudtVFqSzYd4MvdJndQPpX1Z9B7ZOMEms=; b=kjSoI+8GpANkqV/fn8XmMR/XZgrD/w+CTlp++A2qTRtLurIWaClIMmrrnMSrJ7I4Ci DBBE2Ej7ZtBlO6CKc7dIcMGvnyWYLdb+4LG/rxJ5XhzZIVYf71IqdtXvWCqgyrZVrw/g UQXlhoiMbtDWST17w8mYN4/xmDKEETi/qBLJW0+n2wMjlylxkjBge0won13uE3Sh5AbZ vqpLpckYYp5Y+sMPN8d842Y/6GTfqd1ZhGa4TDMYgsNDG27DUkvqkvcadDY+Oac+byrE EXI5HDTdRIPFLwM1v4GgWzKxoubjxGwt40sDlgat5Gf1rGQDEz1DaqCuXeofvIP4r9Yo OJTQ== 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; bh=SfugH+pTROPudtVFqSzYd4MvdJndQPpX1Z9B7ZOMEms=; b=CePpmsIRCEX6pCIsRC2mmw/iQbpothLkuGTFf6b/Gq3+88lZ0znHirAnJY6XNy6jRs 3r/rQlQcw2jAOoaAF/Mh0gM+3sYrg/+lZthWmxCG0/JMIm/NoDBkkVJkiYezQ1CtZolE sTG/BrBGw3uhCDKdD4xoYywKDgltQGSpoL+ooaABmshRJ9iLdmE0E7Pz4EoOsWYloKWi Fd33XlaNn7V/Few4nNeyT13rlRutH0JO8exe+WMJAyBVvS4pOX/jyGLI1HvvmfufwVgd 8fBF4d5VmQm7q+v5EwJJ7JO+CLPVU9W6uuHOJegKe+6zkLhgpD/HFNL91S2bG/yd1III 1VHw== X-Gm-Message-State: ANhLgQ20YjAQFCVbz3nACjW3P+NbzfMnT2mtaNI/i+jNObNKEL623pZq SWTqBc1rdq/IHLiHTJFcoFic96I/lod4Dg== X-Google-Smtp-Source: ADFU+vve+GwgOFujE+1GKm+ppwXu5XjgmONTRmJixoUSuIzM5bBfB6ER6coE/WiKClEKWiWujfowCA== X-Received: by 2002:adf:fd92:: with SMTP id d18mr10607843wrr.16.1583413156963; Thu, 05 Mar 2020 04:59:16 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id v8sm43019476wrw.2.2020.03.05.04.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 04:59:16 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif@nuviainc.com, Ard Biesheuvel Subject: [PATCH 1/2] ArmPkg/ArmMmuLib ARM: simplify assignment of TTBR0 system register Date: Thu, 5 Mar 2020 13:59:06 +0100 Message-Id: <20200305125907.13680-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305125907.13680-1-ard.biesheuvel@linaro.org> References: <20200305125907.13680-1-ard.biesheuvel@linaro.org> The expression passed into ArmSetTTBR0 () in ArmConfigureMmu() is sub-optimal at several levels: - TranslationTable is already aligned, and if it wasn't, doing it here wouldn't help - TTBRAttributes is guaranteed not to have any bits set outside of the 0x7f mask, so the mask operation is pointless as well, - an additional (UINTN) cast for good measure is also not needed. So simplify the expression. Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c index 11a1e704beab..a6f44dbd5f21 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c @@ -392,7 +392,7 @@ ArmConfigureMmu ( } } - ArmSetTTBR0 ((VOID *)(UINTN)(((UINTN)TranslationTable & ~TRANSLATION_TABLE_SECTION_ALIGNMENT_MASK) | (TTBRAttributes & 0x7F))); + ArmSetTTBR0 ((VOID *)((UINTN)TranslationTable | TTBRAttributes)); // // The TTBCR register value is undefined at reset in the Non-Secure world. -- 2.17.1