From patchwork Tue Apr 20 07:24:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaxson Han X-Patchwork-Id: 12213481 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=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 7B000C433B4 for ; Tue, 20 Apr 2021 07:27:27 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CDD461354 for ; Tue, 20 Apr 2021 07:27:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CDD461354 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zMvbyRmM2asC3+4aytQJMqxNendrBU7ABi2FU2BmR+U=; b=mVZosDiLAc+KdhGMiyqVVa4Gd iLRMVgeUrMakZQnmfn73CDYTH9AHYET/bqKI2+VIjR65Q82ztKWm353a6A5rceqBQBi+vdwtq0Usb Z3Z7btTLK8/s42v6zcbVi4zH6g29HkLq9FXP3pUbgr6SuASeWC5cxau58SxoMMkxP3AoZFi95/Plh SYMowsrB1PezYEjvZBB/n23lRRbK90vqZkpf/zJ3acPL9O1Gz4cBbkM62iHNMtlOoqn993cZApoak 0CaNc975MGPd2Va9zjXIyPB9IJDyPExnQRoQqMSnzI1aqeF1Dx7yN7UwXFMelQEajWR8BKCviRYeW XUzzIfW3w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lYkku-00BSP8-LB; Tue, 20 Apr 2021 07:25:08 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYkks-00BSOS-Oe for linux-arm-kernel@desiato.infradead.org; Tue, 20 Apr 2021 07:25:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=OM2MxkJexqDsU5o6GR1BCATyGuFZ7PwADP3FQnl9dtg=; b=12t52MgZgHNg0mO1MdqFZ9uXIj 0G3quNyYSIgSQF6a96ojfg5OOLQ5azLHEBplsCmTW8iYSjY7woEgLHcOgXDLnf7+XDb4afMy/enti 3KXhLa4h8LspP59Xt/v2zirqCT4sY89l+D97bX4bBLubeJi59L5LW+9SveMMWWBqbk1YV2L8lvfc9 KXMqHqyKmS8pR77jUr9LzDwvhT3wJ8l/QDbYgpAIQKsHwQjfBY9mKylKVdR2XHc4omP6N+d96o7L3 /Pm8uZ+Zumh3nSbzKgGFKWSHk6OMIjB45dqShN4OcIm/KszvvTdLdcs3QbCQdBSFLRAKxxmXD8UPK 3pTF7Wdw==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lYkkn-00BsTZ-Ab for linux-arm-kernel@lists.infradead.org; Tue, 20 Apr 2021 07:25:05 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D0CAB1474; Tue, 20 Apr 2021 00:24:54 -0700 (PDT) Received: from optiplex-7070.shanghai.arm.com (optiplex-7070.shanghai.arm.com [10.169.188.115]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 079353F85F; Tue, 20 Apr 2021 00:24:52 -0700 (PDT) From: Jaxson Han To: mark.rutland@arm.com Cc: linux-arm-kernel@lists.infradead.org, wei.chen@arm.com, andre.przywara@arm.com, jaxson.han@arm.com Subject: [boot-wrapper PATCH 1/5] Decouple V2M_SYS config by auto-detect dtb node Date: Tue, 20 Apr 2021 15:24:34 +0800 Message-Id: <20210420072438.183086-2-jaxson.han@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420072438.183086-1-jaxson.han@arm.com> References: <20210420072438.183086-1-jaxson.han@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210420_002501_455186_7D9833EB X-CRM114-Status: UNSURE ( 9.91 ) X-CRM114-Notice: Please train this message. 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org An auto-detect switch is added to make it an option to enable/disable 'arm,vexpress-sysreg', because not all platforms support this feature. Signed-off-by: Jaxson Han Reviewed-by: Andre Przywara --- Makefile.am | 2 +- platform.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index af694b7..e131207 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ NR_CPUS := $(shell echo $(CPU_IDS) | tr ',' ' ' | wc -w) DEFINES = -DCNTFRQ=$(CNTFRQ) DEFINES += -DCPU_IDS=$(CPU_IDS) DEFINES += -DNR_CPUS=$(NR_CPUS) -DEFINES += -DSYSREGS_BASE=$(SYSREGS_BASE) +DEFINES += $(if $(SYSREGS_BASE), -DSYSREGS_BASE=$(SYSREGS_BASE), ) DEFINES += -DUART_BASE=$(UART_BASE) DEFINES += -DSTACK_SIZE=256 diff --git a/platform.c b/platform.c index a528a55..d11f568 100644 --- a/platform.c +++ b/platform.c @@ -23,10 +23,12 @@ #define PL011(reg) ((void *)UART_BASE + PL011_##reg) +#ifdef SYSREGS_BASE #define V2M_SYS_CFGDATA 0xa0 #define V2M_SYS_CFGCTRL 0xa4 #define V2M_SYS(reg) ((void *)SYSREGS_BASE + V2M_SYS_##reg) +#endif static void print_string(const char *str) { @@ -59,6 +61,7 @@ void init_platform(void) print_string("Boot-wrapper v0.2\r\n\r\n"); +#ifdef SYSREGS_BASE /* * CLCD output site MB */ @@ -66,4 +69,5 @@ void init_platform(void) /* START | WRITE | MUXFPGA | SITE_MB */ raw_writel((1 << 31) | (1 << 30) | (7 << 20) | (0 << 16), V2M_SYS(CFGCTRL)); +#endif }