From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32198290A for ; Fri, 28 Apr 2023 11:29:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A631BC433D2; Fri, 28 Apr 2023 11:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1682681385; bh=4GfZF1YyTeJdJDS1wRE4TsBKBvxmJObqjjIn2xNIPq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BZcz6fjLOK1AmCvCjy1dOT66MMT1Zg3DVPd44+ELkdPjtDTLCBSKVTJHQ6k3L9M+U /PFT4Rnzhw8HLJmnfHS7z4mC0LuyTcaqlzvutZl0z9oPK+xWRsSubK9B948nCnh+cm VEon1o9lk1qXCFAtQwlMGqEXA75Z4Go1R3SmS7fE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexandre Ghiti , Palmer Dabbelt Subject: [PATCH 6.1 15/16] riscv: Do not set initial_boot_params to the linear address of the dtb Date: Fri, 28 Apr 2023 13:28:07 +0200 Message-Id: <20230428112040.559101224@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230428112040.063291126@linuxfoundation.org> References: <20230428112040.063291126@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Alexandre Ghiti commit f1581626071c8e37c58c5e8f0b4126b17172a211 upstream. early_init_dt_verify() is already called in parse_dtb() and since the dtb address does not change anymore (it is now in the fixmap region), no need to reset initial_boot_params by calling early_init_dt_verify() again. Signed-off-by: Alexandre Ghiti Link: https://lore.kernel.org/r/20230329081932.79831-3-alexghiti@rivosinc.com Cc: stable@vger.kernel.org # 6.1.x Signed-off-by: Palmer Dabbelt Signed-off-by: Greg Kroah-Hartman --- arch/riscv/kernel/setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -278,10 +278,7 @@ void __init setup_arch(char **cmdline_p) #if IS_ENABLED(CONFIG_BUILTIN_DTB) unflatten_and_copy_device_tree(); #else - if (early_init_dt_verify(__va(XIP_FIXUP(dtb_early_pa)))) - unflatten_device_tree(); - else - pr_err("No DTB found in kernel mappings\n"); + unflatten_device_tree(); #endif misc_mem_init();