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 47A54C4167B for ; Wed, 29 Nov 2023 12:31:35 +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=gQY4goLzrpPTxPjfvwbXrOLMPu ng9o6cHjCpOni+c92cZnxwZ+XO4ObJ+7LwoUSQJDofKjZN+QIzagWYjWZeIBrYoLnEL/gJCAD5FAn a1ij/g2/6ab+ATeor4Zy03FvX2XzHNdWgnHFx0A7obnCZs7LeJc4/zgMQBkLwnzoaF9NCXjsB5eoP /j8srSAXUexVoWi3WKgFAhRRmMDYMjioio0GGPf5YAS3WH1CL+XtzHTXe2Opl3cGLTgcEcoJ+TJxg nApDAVQS6uJ97ESGqo9mOhFMKMjh8Y1LdfHsrD0DhQxbGWoCg3Dl4imqZLvBdOeZMOvgii7UAs+Lh 0ebM6lEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8Jii-008KFS-1V; Wed, 29 Nov 2023 12:31:12 +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 1r8IZh-007zIo-32 for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:17:51 +0000 Received: by mail-wr1-x449.google.com with SMTP id ffacd0b85a97d-333127febb2so1264743f8f.2 for ; Wed, 29 Nov 2023 03:17:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256668; x=1701861468; 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=fMAzWts9+OT043cOQZLGhAClPHzyx2Ynyt4MAuGNJRW3DbYNDvOZehtF9BsqUkv2rQ 1BNfwxVEGI5t4mjSnISwopL6KnZnfKhK139qrL4mMH7wWwz80YDhZj3djLTHTMXJsDpJ 7jzE/UFcD389+H8tqsf3dXlHRcczBXocsOlXjEntkdJiPwpovYcZDhFEmBtMPkn1K+Q2 Y8pWTY93tQpKfISe5PLbdEfVhCGMK6oFaU3Qy4D+6v6TsvXZq6MHTouEjGP85//qSGZa jbthXproCyw3arRiXyo8zWyL1L3V6wjsmFnyNui8SEQIInoR3One/fqEKLFxcMSH/d3r MopQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256668; x=1701861468; 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=RgEGN9+49El8Db2LkIcMlVhIJ0DgMh5NRwkzyns+nOF0WvKrDquaJIsP4qDELR3//e e6xexIrGw2zsPeWdK50rjdA7OWPZS38uXOSiRvhYB0ggtOkwgYEf8tcl44SGChCdxrXJ cTj1jC6wND2EvSh1yZDspB6UwywD74vwe5jbDqDJdJuxrxysn/bjrV6q5Erl5+0CdlL6 MYIOmAsPwplenvBCivEA2ZRO2Uul5XjrtlRaTRVNlzfY4VnSe9UqPV1dHUeiWr/mCU7O e27x7Bpsi+Kwg8L/C4d9gPHJcQhy4EgBNtJBldI2WEDHZ5EWeEba1vzZJLBCZTLBM24X AW9g== X-Gm-Message-State: AOJu0YyCWZFXH9hOcP1YfCIZSddAQvJa9thUq23Vy6JsukQihSj0/ngZ 7/bzd5icMsZwN3YMvl5iB9enYwkE0+Z5i52RRDcmPPpERCq+DbVwYTKulgPtMlQoAKbe8ctGezf Uotq5mdzIJ4vhtQ++CeBQFOWOwlbSQDqnHUvWpRG+OcsaC8lrOUpxTDtsXGFueDSVBaQX/3VJ+6 c= X-Google-Smtp-Source: AGHT+IG6Pup+3BrCvIHwimpjP9Bg5lV5IChDFJljkYo3AFlXF+Eui68Xj7SCwfkKLInf6W1DhkaGNwCG X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:adf:f6d1:0:b0:331:4466:d921 with SMTP id y17-20020adff6d1000000b003314466d921mr266775wrp.14.1701256667511; Wed, 29 Nov 2023 03:17:47 -0800 (PST) Date: Wed, 29 Nov 2023 12:16:10 +0100 In-Reply-To: <20231129111555.3594833-43-ardb@google.com> Mime-Version: 1.0 References: <20231129111555.3594833-43-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=owGbwMvMwCFmkMcZplerG8N4Wi2JITVdtrqq1jDwTHaiRo+CwUye/GKTnF5PGY0o0xllX2pfH z90ZllHKQuDGAeDrJgii8Dsv+92np4oVes8SxZmDisTyBAGLk4BmIhiAsP/oFbBRRE3N3/s3rBj 9qFOQ6kJR+smse45xta+qSDsjPujiwx/hbWmyPqURrrskJkyM+hqI/evnZuyHWI2PlKsunT1u54 QKwA= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-57-ardb@google.com> Subject: [PATCH v6 14/41] 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-20231129_031749_988040_40EF8FFA X-CRM114-Status: GOOD ( 13.32 ) 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