From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F40ABC61DF7 for ; Fri, 24 Nov 2023 11:31:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=heR6Q2m2q2c/fpyM4ByDedsD6+ALcokXC0c2w7PcLPw=; b=r6OSQos9a1UechO60WSwM2bXmi +mx7Mf/rUW9nvLq0FLslWUp0EnChzZT0+X5D2yMMuOG1uO33hTs7vLTimpbwLpsw+mfhcn3fKGGXN +Ew7nmvHOrNjGdfVAR21tDaXvfYMVf7t0z86v+f9uyEW/vbjOImarBufxgekxkTyKKeygwuEsnO79 6EU4YfuV+lyDuQe+bMqhY6uC9KgP/0oZzH0V5R0y+P+2Y+yIDSeG46qLqOydG09WOQy10RPjCLfiX rWu+cIOkEVhSiMc5Z+EYjAbDpfkiADrBqgERNg5vTkfyw/cCA/r0W5mPvwGU57N1hiJKKmEBPOq5L 2DNxNv4A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6UPU-006ySq-2d; Fri, 24 Nov 2023 11:31:48 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TIl-006ofX-2M for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:20:50 +0000 Received: by mail-wr1-x449.google.com with SMTP id ffacd0b85a97d-332cb6be78fso931638f8f.0 for ; Fri, 24 Nov 2023 02:20:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821245; x=1701426045; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4UHjHe6FpBX2R/nrdj2QZAPajpngeY6jPATfzVcbFAU=; b=ItKde8mt9hCRPHGqdAlP+io01jgnnRaET9sFFWNI2HxrOAj1ZTpjwl1oHvenCSOnlG reUNyb/ZlajlxaTEndPBMXr5U+VeHKhWSupZUx/WeYhn4IvG8cqDc9qwOyDkKkffe9G0 5EvFeJ0zxocdez+c/IxjyeyR0ID98O1/cHGZE3i3tGD/yceZhKRfaoQS3RWWmjD06M+K XtXKlZ8R1Pl+nyM8PJU/9EICsNO0ftNVNdravidJzgvoTAO4iDY21d2bIcZtszQwf9jq arI/kw1Fm0Jkosm0Rw3ZtzA4rc/7kqxydNVdB3BuxNMI3Q/2pi8nO8iQRGIXtJKT6Lf7 vogw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821245; x=1701426045; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4UHjHe6FpBX2R/nrdj2QZAPajpngeY6jPATfzVcbFAU=; b=A+jLd5mVLjMLNcDvrhnL3EnUQLNU0cDGueFaNpNO6N2fTdbKvpeii6UTsDzf0ds/eM XisWWAhiZJsxhToP9eRWK5EamM3hIw2w4z99Eh+f1s/m8K5sP3bSwUQKGskFTbThFQwM CU3HTbHmmNaUesPT/JFOylrBeA7Vm3V0oPT4WJuAqMH77Sixhq0XFsJzqLexpPkxo4Rs /vA5spsUGl5cFGVj/eRGLsIQMy1LFkeZJhRF/1bkY1bMAA8fIoEVzl4jaDYLLh+LEmx3 KWztVQ36YuSBp8AGYRHQ9kouq1VWDXQUwgyS++me1ulvqiYejKr5ilwMZy1eBsAKIqJp fgUg== X-Gm-Message-State: AOJu0YwsxoBQnLReOhNwh8iFpfsRigz6naWwviZAl+8R2Qxi7aTIt9I3 7ChQrYrYEjMjgozjhV9HByKmcAYiOrJ9G9Cax1ObzDXSAmx6GPK1YXtIH/a4V7ayelIADDaU2Pq ba6qLfF33VQ8+MS98jJa04d1zTBS/4ovc5YZAPoHdQVpGv+9oxzLREnB8074Fft0+ApmIbIRTut Q= X-Google-Smtp-Source: AGHT+IFfBfp/ISOMg9SMOE3RVxbZ70tLeitDCjr5vAVS8ubiPa7/5hkq/aTcKYUGDqNp+7JoDtGU7Bi9 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:adf:ce10:0:b0:332:e67f:ce87 with SMTP id p16-20020adfce10000000b00332e67fce87mr36121wrn.11.1700821245546; Fri, 24 Nov 2023 02:20:45 -0800 (PST) Date: Fri, 24 Nov 2023 11:18:54 +0100 In-Reply-To: <20231124101840.944737-41-ardb@google.com> Mime-Version: 1.0 References: <20231124101840.944737-41-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1689; i=ardb@kernel.org; h=from:subject; bh=3dYQ52MFTwqSSF83zbcTUGZxpjv7uRO4dzR3QdL/tgA=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhYkJVrWHgmexEjR4Fg5k8+cUmOb2eMhpRpjPKvtS+P n7ozLKOUhYGMQ4GWTFFFoHZf9/tPD1RqtZ5lizMHFYmkCEMXJwCMJGi2YwMnWfbjwsJnAud/1og 4tG7q0sqt2mGcv2Xb8+q2LI//fb73YwM99fw9ludfv5E4uPZmfUT3hwv+yxYFX3iyNXDq5dzOYr eYQMA X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-55-ardb@google.com> Subject: [PATCH v5 14/39] arm64: idreg-override: Omit non-NULL checks for override pointer From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231124_022047_790176_3792A22F X-CRM114-Status: GOOD ( 12.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel Now that override pointers are always set, we can drop the various non-NULL checks that we have in the code. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/idreg-override.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index 3addc09f8746..536bc33859bc 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -216,9 +216,6 @@ static void __init match_options(const char *cmdline) for (i = 0; i < ARRAY_SIZE(regs); i++) { int f; - if (!regs[i]->override) - continue; - for (f = 0; strlen(regs[i]->fields[f].name); f++) { u64 shift = regs[i]->fields[f].shift; u64 width = regs[i]->fields[f].width ?: 4; @@ -319,10 +316,8 @@ asmlinkage void __init init_feature_override(u64 boot_status) int i; for (i = 0; i < ARRAY_SIZE(regs); i++) { - if (regs[i]->override) { - regs[i]->override->val = 0; - regs[i]->override->mask = 0; - } + regs[i]->override->val = 0; + regs[i]->override->mask = 0; } __boot_status = boot_status; @@ -330,9 +325,8 @@ asmlinkage void __init init_feature_override(u64 boot_status) parse_cmdline(); for (i = 0; i < ARRAY_SIZE(regs); i++) { - if (regs[i]->override) - dcache_clean_inval_poc((unsigned long)regs[i]->override, - (unsigned long)regs[i]->override + - sizeof(*regs[i]->override)); + dcache_clean_inval_poc((unsigned long)regs[i]->override, + (unsigned long)regs[i]->override + + sizeof(*regs[i]->override)); } } -- 2.43.0.rc1.413.gea7ed67945-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel