From patchwork Mon Jan 11 21:20:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Wool X-Patchwork-Id: 360626 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CF98C433DB for ; Mon, 11 Jan 2021 21:22:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 192CB22D00 for ; Mon, 11 Jan 2021 21:22:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729630AbhAKVVr (ORCPT ); Mon, 11 Jan 2021 16:21:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728040AbhAKVVq (ORCPT ); Mon, 11 Jan 2021 16:21:46 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3086C061794 for ; Mon, 11 Jan 2021 13:21:05 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id r3so261713wrt.2 for ; Mon, 11 Jan 2021 13:21:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TEFDDHpww4S7jZVTaZD1icQ+na1aoV8Oo3KDfAMEdTk=; b=FK6zjLr4+E02JhNbMuXyh1qxoOhquU2JANb2OZm5+JP/nhIfFq6Fz2sYDDAVkW9aOw WLh5iRnl6EzlEiJzp9EHuFt05i+yP3VSFFr9z0eYz4zAJQZ3vCrKASMRirbwW9PKai81 RfDGz/YouiXKy6UHlgMrsBs/By8zRfs5aBovI= 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:mime-version :content-transfer-encoding; bh=TEFDDHpww4S7jZVTaZD1icQ+na1aoV8Oo3KDfAMEdTk=; b=KBHAHGArynDIlDW3Ydfg2CDFoTuNrLehkOOgVC8pWIgxdtkmtQ9oL9WfT9GTavW/PB +MgSkQA28zvDLOOzbSNmgmR+PlM4V/ENrJzEXujPEuM4D/jf457VbFMALOs/ECQJuhYC 9Egg+Y1xOaGdhdYkzs/U7RtwqzNecFk3CvETq4G5smvGzFR6iYILrenuPQ4Jl8BicBuu ZjYs4hX9KyIhr8Rc07+U64ge8z9XuyCCTgEXTpgq0SgdIWsSTEPPlUsmywHIlRkpn4jz z7lAy/3nmjIP9+FSTM3CekV6xW46mugr9E3x5LoplUn1we3BdcigNEJLD6QXofLowju5 becg== X-Gm-Message-State: AOAM5325pY5j0ObFxnfoWOxkq5sHIS9F6HiM8alOBYuUYOCjOxxVQKBR lwFa9ZhPEp+BE+KtTM/O4Ca8dw== X-Google-Smtp-Source: ABdhPJxbI6qQSX+hgbuH8BGJTIUzRTH2XlCvZ2Conpe5ZrK82kVNAVyLheeTcmABEY4tEuX3KlAnpQ== X-Received: by 2002:adf:9d48:: with SMTP id o8mr976097wre.408.1610400064586; Mon, 11 Jan 2021 13:21:04 -0800 (PST) Received: from lootbox.konsulko.bg (lan.nucleusys.com. [92.247.61.126]) by smtp.gmail.com with ESMTPSA id o74sm808960wme.36.2021.01.11.13.21.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 13:21:03 -0800 (PST) From: Vitaly Wool To: linux-riscv@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Anup Patel , Palmer Dabbelt , damien.lemoal@wdc.com, devicetree@vger.kernel.org, Vitaly Wool Subject: [PATCH] RISC-V: simplify BUILTIN_DTB processing Date: Mon, 11 Jan 2021 23:20:32 +0200 Message-Id: <20210111212031.2422-1-vitaly.wool@konsulko.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Provide __dtb_start as a parameter to setup_vm() in case CONFIG_BUILTIN_DTB is true, so we don't have to duplicate BUILTIN_DTB specific processing in MMU-enabled and MMU-disabled versions of setup_vm(). Signed-off-by: Vitaly Wool Tested-by: Damien Le Moal Reviewed-by: Anup Patel --- arch/riscv/kernel/head.S | 4 ++++ arch/riscv/mm/init.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index 16e9941900c4..f5a9bad86e58 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -260,7 +260,11 @@ clear_bss_done: /* Initialize page tables and relocate to virtual addresses */ la sp, init_thread_union + THREAD_SIZE +#ifdef CONFIG_BUILTIN_DTB + la a0, __dtb_start +#else mv a0, s1 +#endif /* CONFIG_BUILTIN_DTB */ call setup_vm #ifdef CONFIG_MMU la a0, early_pg_dir diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 5b17f8d22f91..45faad7c4291 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -615,11 +615,7 @@ static void __init setup_vm_final(void) #else asmlinkage void __init setup_vm(uintptr_t dtb_pa) { -#ifdef CONFIG_BUILTIN_DTB - dtb_early_va = (void *) __dtb_start; -#else dtb_early_va = (void *)dtb_pa; -#endif dtb_early_pa = dtb_pa; }