From patchwork Mon May 10 12:07:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 12247807 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=-17.4 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 C4373C433ED for ; Mon, 10 May 2021 12:10:35 +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 76FAE613E1 for ; Mon, 10 May 2021 12:10:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76FAE613E1 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:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=AlMoORQmjBsBiVmA5LlMrd6mAeRXzkbcmSoJkRVeyOM=; b=q9BWsfQ2zYHKNpsUfvq8aPaP+k X7zGX/Efp0NEZnD4Iyd9qPivksvWqq4mdbmtbqqvS9NwSMdjnU00v6wb2EZVjRT3TS4BvfHMTjQRL VDXowwTndWJ5n5Oy0tV9P5ShDmaM1yhul7XirPcTFOplFt7YH4F3aYtPl8jld0ehHK2NfS9Zz2W1r pxSmHr5KlRG77gKovOwx0SXL5KLofs9msdeYBjRUNvMX3yJVAfSBXT4tFeEpbtzuuQkgiXvxJsTt1 /ORK/TZM3srXjW4FiRLinckQCWqvsiqSyXk+p8/PAjPmPNo2EwekY7k4iQvMrMMjCxiyPSEspZFJl icLVbGjQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4iZ-00ECTM-3Y; Mon, 10 May 2021 12:08:59 +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 1lg4hu-00ECOZ-89 for linux-arm-kernel@desiato.infradead.org; Mon, 10 May 2021 12:08:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=+U5g0ekAFTxiDLQfh+2l7ZomrWhHL85DnjvjrikGs78=; b=dE7rH7OqC+7mBy5D76S4/TnGyT sR0OMfRwVqlicsy5NDT194oNCk34oCKypQF+86mbxeZO55NP16mEjgIYraUWFETF/uLZZiss7yAIV a2rvsVITi6KvM6ABySrWiOiunLUkOCeemi4tzaxjjgQ380+NvdgoNRgMV0TqqU73YBKx/LFamy/D6 RrnCWBGTeaOu9vXvSV+XYy5PDTL9aYFKQZhMA8zTkN0fjN8Jyxhz52NheiMWZyexh+S7pPdZE8T6q t3v1Q0HP9oaQnqWL5gaWJ1nxJ8ZghzA9kBR4FHskF3ICD16ocPtmZDHXtaiUOcYia0o3VcaFvnnwf o3Otzmig==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4hp-008ffY-C8 for linux-arm-kernel@lists.infradead.org; Mon, 10 May 2021 12:08:16 +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 C3AA8168F; Mon, 10 May 2021 05:08:12 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 05B743F73B; Mon, 10 May 2021 05:08:11 -0700 (PDT) From: Andre Przywara To: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org, Jaxson Han Subject: [aarch64 boot-wrapper PATCH 1/6] configure: Make PSCI the default boot method Date: Mon, 10 May 2021 13:07:21 +0100 Message-Id: <20210510120726.5242-2-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210510120726.5242-1-andre.przywara@arm.com> References: <20210510120726.5242-1-andre.przywara@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210510_050813_482613_A61DD48B X-CRM114-Status: GOOD ( 11.47 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When the boot-wrapper was originally conceived, PSCI was a rather new feature, so support in contemporary kernels wasn't guaranteed. The boot-wrapper consequently defaulted to not using PSCI. Fortunately the times have changed, and most people expect PSCI these days, so let's enable PSCI by default. We keep the --enable-psci/--disable-psci configure switch, so it can be still turned off if needed. Signed-off-by: Andre Przywara --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6914eb4..852fd9a 100644 --- a/configure.ac +++ b/configure.ac @@ -82,8 +82,8 @@ AS_IF([test "x$X_IMAGE" != "x"], # Allow a user to pass --enable-psci AC_ARG_ENABLE([psci], - AS_HELP_STRING([--enable-psci], [enable the psci boot method]), - [USE_PSCI=$enableval]) + AS_HELP_STRING([--disable-psci], [disable the psci boot method]), + [USE_PSCI=$enableval], [USE_PSCI="yes"]) AM_CONDITIONAL([PSCI], [test "x$USE_PSCI" = "xyes"]) AS_IF([test "x$USE_PSCI" = "xyes"], [], [USE_PSCI=no]) From patchwork Mon May 10 12:07:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 12247811 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=-17.4 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 BDDAEC433B4 for ; Mon, 10 May 2021 12:11:33 +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 61DAF613EE for ; Mon, 10 May 2021 12:11:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61DAF613EE 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:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=ed5GvK9f1sWX4ao04CR1GL+z0dCKssSGSCy5dCjMrW4=; b=Bddvcqkd4m8ObzDrf3G2oBFgo0 AeDbxfp+ILZFL2P8G3e7UWKxi0Hfo9WH4sYMXTI4ueiFSQE5GXYCHNwNRGfPE47lJiVlYW5axxnMO +tbxlQbcINVFvPF0dxPIOg8f4sK28t1w31IO1YADTKCBD9n/gJ7Ubi6VxViE6Fsaw3ghP4/lkMyez jdWYejYLB66i8aQ5dusuSwwjIha0m8SHkiUtNE5lDsetm6IXInk3+skfNSSlfJh523NZPGk+SKOVG MS5bJq0E/iX5rlrJ8imTFxwOVfrZWxk33HSTy9BD/7yrsIuCXOuKsGLjjQ3tN4aNAmD2nFVK0K9IQ UMTJEAng==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4jE-00ECZY-UA; Mon, 10 May 2021 12:09:41 +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 1lg4hu-00ECOa-87 for linux-arm-kernel@desiato.infradead.org; Mon, 10 May 2021 12:08:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=gvcmLUlY9djhCLdYVYnV0sOD/aNlpwuhDTqLc0F9lm8=; b=oE7oHwBDea7IfXKuRBRIujYSLU iRgHJ7ytpnhGGko74pLbrSFcu/BIIDow17YRHSmZ1jINCpbEdheSi1IDUhrtvcPLuR7yNloIe10/C bK7RHlTikrt1Z/c5Rrd+kSYl/gGrsdfd87T4NzTkiCVQUg77c9jhTeHRyKrwoMIQROsPf4JCxy2hB IIwa7du2OO9x9PUDaM28YwfpXkxVFiuY9YUwp5KNGNOifF21WvWgd8/Hx0E+pbixTSGfkiAv55eZy AOVEEGC2zNXFxrHuRikfYJtkDPzj0VyV8wAJCwLokHsfk+RN+6bvnYE85AwxLscQrsDlA55Q1KpLJ ttpBPE2w==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4hq-008fgG-TG for linux-arm-kernel@lists.infradead.org; Mon, 10 May 2021 12:08:16 +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 C1BE81692; Mon, 10 May 2021 05:08:13 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 084B33F73B; Mon, 10 May 2021 05:08:12 -0700 (PDT) From: Andre Przywara To: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org, Jaxson Han Subject: [aarch64 boot-wrapper PATCH 2/6] configure: Fix default DTB Date: Mon, 10 May 2021 13:07:22 +0100 Message-Id: <20210510120726.5242-3-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210510120726.5242-1-andre.przywara@arm.com> References: <20210510120726.5242-1-andre.przywara@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210510_050815_004273_2B8A2C48 X-CRM114-Status: GOOD ( 11.97 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The DTS files for Arm Ltd. boards and the fastmodel have long been moved into the arm/ subdirectory of the arm64 kernel tree's DT folder. Adjust the default path to make this build out of the box. Also change the default DTB to the more modern FVP RevC model on the way. Signed-off-by: Andre Przywara --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 852fd9a..2b295de 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ AC_ARG_WITH([kernel-dir], AS_IF([test "x$KERNEL_ES" = x32], [KERN_IMAGE=$KERN_DIR/arch/arm/boot/zImage], [KERN_IMAGE=$KERN_DIR/arch/arm64/boot/Image]) -KERN_DTB=$KERN_DIR/arch/arm64/boot/dts/rtsm_ve-aemv8a.dtb +KERN_DTB=$KERN_DIR/arch/arm64/boot/dts/arm/fvp-base-revc.dtb # Allow the user to override the default DTB AC_ARG_WITH([dtb], From patchwork Mon May 10 12:07:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 12247813 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=-22.4 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,MENTIONS_GIT_HOSTING,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 2BFDBC433B4 for ; Mon, 10 May 2021 12:12:23 +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 DB24A61400 for ; Mon, 10 May 2021 12:12:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB24A61400 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:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=Rs6a+VMjSgJcpbOIQTfRdFOQjaSVax8CCxlbTKdpnHc=; b=Wb0gdTUNtpgbTwklG2dJYQTj3y RA2mOKflusy2kAukm/qvHtaEHDVbvsBT+btqxInC7V7dEXmEW+7eAIiWGECiDN8gpI32WrCYAG4ps 546sREv8oJzn1ZFhYHaH0LX5Zf4m/gCiXmz8EjE+Go86ienw2ObyjtnuzDJv1U6igl0gnK+ydez/6 LjAIk67Z49EX0s+sOEL5bi2YpCIHKC63IvNcDgfLAk3/Twhvnr89EowPpHXMsYpXpkvPgtXHsj3cX teHpiu5tW/ripGA3rSNDvB6U4ZRTS9coQgk5JEMbvjpPt7O9FhCpG92bUghiCwOP2xnVQmgv6XhRY c55cHDsQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4k7-00ECl9-Fq; Mon, 10 May 2021 12:10:36 +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 1lg4hu-00ECOh-U8 for linux-arm-kernel@desiato.infradead.org; Mon, 10 May 2021 12:08:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Wd9nR1MpxqnjtIYQL+plF5PasxUK0/OO+MW3V5y7q6w=; b=kynVGwHN/Td4MDs15bxc1dd5y5 rIBRxq/LzOgB/XSirqYKiGWZFWoyd6jQo4VUrsRz8RMFfmWsogSSJvqd/pWRgXNxBP00rTqrPbIde V/rYN+hkiR1wZ79AxpcmGLkJvGH/xJ0REKXdkbRxHu65G2qPCkfRds7UgbiOEeHHwwGCBgwOyU74Q kCnDAp0TrhWXWGzrPEC1pIKsIRTxSW65CFkUcavrMLVBRvWM+8nK5NMf8w4sxrg2qiS3rJKyVfaRH s0O3/sBktbkxRDYI3a7h89E3FxAgxOuQDnkHz8J86NVnClc/lyaDKnus2YDUQMFOdDtBgv/lcqf1k 2N5ih1lA==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4hs-008fga-2F for linux-arm-kernel@lists.infradead.org; Mon, 10 May 2021 12:08:17 +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 BE9BA1691; Mon, 10 May 2021 05:08:14 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 060843F73B; Mon, 10 May 2021 05:08:13 -0700 (PDT) From: Andre Przywara To: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org, Jaxson Han Subject: [aarch64 boot-wrapper PATCH 3/6] configure: Use earlycon instead of earlyprintk Date: Mon, 10 May 2021 13:07:23 +0100 Message-Id: <20210510120726.5242-4-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210510120726.5242-1-andre.przywara@arm.com> References: <20210510120726.5242-1-andre.przywara@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210510_050816_172186_FD29D1C3 X-CRM114-Status: GOOD ( 12.94 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The arm64 Linux kernel dropped support for the "earlyprintk" command line parameter a long time ago[1], instead it uses the earlycon parameter now. Replace earlyprintk with earlycon on the default command line, to see early kernel output. Ideally we would just say "earlycon" (without specifying an MMIO address), but this relies on the stdout-path property in the /chosen node, which the model DTs do not carry. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8ef0ed95ee04 Signed-off-by: Andre Przywara --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2b295de..9e3b722 100644 --- a/configure.ac +++ b/configure.ac @@ -99,7 +99,7 @@ AC_SUBST([FILESYSTEM], [$USE_INITRD]) AM_CONDITIONAL([INITRD], [test "x$USE_INITRD" != "x"]) AS_IF([test "x$X_IMAGE" = "x"],[C_CONSOLE="ttyAMA0"],[C_CONSOLE="hvc0"]) -C_CMDLINE="console=$C_CONSOLE earlyprintk=pl011,0x1c090000" +C_CMDLINE="console=$C_CONSOLE earlycon=pl011,0x1c090000" AC_ARG_WITH([cmdline], AS_HELP_STRING([--with-cmdline], [set a command line for the kernel]), [C_CMDLINE=$withval]) From patchwork Mon May 10 12:07:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 12247819 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=-17.4 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 1FCC4C433ED for ; Mon, 10 May 2021 12:14:34 +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 C11EC613EE for ; Mon, 10 May 2021 12:14:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C11EC613EE 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:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=ya5Q1j6/Ki/bH3M8ngn+7+XwQB5/ENUZY6FAWyMCdy8=; b=JggSjKGWvYKk9f7vwxVRQEZZ3T j7j7PeWNFLIq77G5d0mHc0MjHt8dtY4E5YNLvAcGa1TyHMXXtCzRtmXBjf3cFNzpEz8qNyS93/r2V rQVpLdtBULr3gDvXKDMnVaB1QFGbrdXCXWA9/vzlPlbK7zgXYrPxGJrE4tsPG2oiDp4KQRpbUJe6h 0mSwIBu/7LvGTzChjQ3J/gc+nHLuPIRX4ZqM0AijhJQwsdl5bFyAVIFh3HMDA83T5Mzmwhakry1Tx uwWcwiUYUM0PVouEhAhIs+RAQphAdgIHiqw7BKBRyjJL3qJ6D2cvz4iFTO9vP9xUK0Uvdmihilwen OkOMW6Kg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4mc-00EDL7-SY; Mon, 10 May 2021 12:13:11 +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 1lg4hy-00ECPS-Ua for linux-arm-kernel@desiato.infradead.org; Mon, 10 May 2021 12:08:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=AYveGEpY6E7DAEvAzetAJsqldLzAlDwfmI+o8pRd6sY=; b=HYwdviNfLg+WXZInyFp2bA8Q+L HmYr6Qv+C3UwkQDQYM8CqLO2eZnGUzQHgAgZ7R/Z680oCvvILdVPCUj6S+iPBnMi/K+Qdwr5djnhD X4JRQ13JQA+Z9WKOwNSBx/75ZMtMqra1KFPbwIDJLFimpN5nx99hLaYmShjjHznEY8JBpjWq3hmVx 9Obu+qJSn0BHSYeA9D1KmA7pi/Ekf4O8UvLHLd+JKDRwiYHhGTYuEEsY4mUcbqZICR3oRzyGwQzG1 5X16JKTcyOKlQpxJN3JRQSLsSooCVNVbDR+E8Xr95drf3Wx5mrqrtChAQkqiMDJW3QxXwMmHk8omm 2gz73E0Q==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4hw-008fhO-7N for linux-arm-kernel@lists.infradead.org; Mon, 10 May 2021 12:08:21 +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 BC50B15BE; Mon, 10 May 2021 05:08:15 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 02F9B3F73B; Mon, 10 May 2021 05:08:14 -0700 (PDT) From: Andre Przywara To: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org, Jaxson Han Subject: [aarch64 boot-wrapper PATCH 4/6] Fix arch counter frequency Date: Mon, 10 May 2021 13:07:24 +0100 Message-Id: <20210510120726.5242-5-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210510120726.5242-1-andre.przywara@arm.com> References: <20210510120726.5242-1-andre.przywara@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210510_050820_331979_C468027A X-CRM114-Status: GOOD ( 10.37 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As the comment states, the frequency of the Generic Timer in the model is 24 MHz, and not the currently used 0x1800000, which is actually 25,165,824 (~5% higher). Use the proper number, and not something power-of-2 based. Signed-off-by: Andre Przywara --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index af694b7..b8c0a49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,7 @@ PHYS_OFFSET := $(shell perl -I $(top_srcdir) $(top_srcdir)/findmem.pl $(KERNEL_DTB)) UART_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,pl011') SYSREGS_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,vexpress-sysreg') -CNTFRQ := 0x01800000 # 24Mhz +CNTFRQ := 24000000 CPU_IDS := $(shell perl -I $(top_srcdir) $(top_srcdir)/findcpuids.pl $(KERNEL_DTB)) NR_CPUS := $(shell echo $(CPU_IDS) | tr ',' ' ' | wc -w) From patchwork Mon May 10 12:07:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 12247815 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=-17.4 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 CFDAFC433ED for ; Mon, 10 May 2021 12:13:09 +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 86DA0613DE for ; Mon, 10 May 2021 12:13:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86DA0613DE 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:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=jCkM5HLLMhT1lwjkmyjDCFcV0D1idpgAZI7/sMs4cWY=; b=ZJmSOk30c77VwQRcpNULrPf6TQ PH/qW/MuApFjZoC9mxPnGVVl80tFc3BFQDevmrqOcXYuyoRjicB4F47nf91fwbXahFRwWqAU3SyM/ aM29ZmfU95ByfzJRjbgG6pAxXH05eXZy/7TdrZssm4WaRaved6UruZuKSYb13pSHgYfs4ttrBV3e1 Df31S0nNCSh34OL2+/E0TOxXKIxOgrgh2RVlfS4ubz4Isb/P1g5CLucGNR3NyvQC+uaCmIoPUyfQh 7uoSdKPtDFQTCX+V2mTMQpE/jmksBMdfnO8HQOp1bFdh5BYChDL3oBeXyy/L3dtf22Gjb/ZA1CVU6 186rkVnA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4l5-00ECyS-D4; Mon, 10 May 2021 12:11:35 +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 1lg4hw-00ECOw-2f for linux-arm-kernel@desiato.infradead.org; Mon, 10 May 2021 12:08:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=xdT08IkFJdyTBJjEFC43eltDp8ETKVPG6meT9Pt1iHY=; b=upy9fiyorSu8mC00TBArEVGtIv C2MzGfXx0zfSDnA0YSnvpVxAcMxrPRyNTf4A33vcikh0Tt+CpGI1a/ieR+XAkoKNfVcdvWgfL1NbV wi1/PMOmZ4GaLaaOiANBv32TSo6b0AdVutfqrhCZE9yK1Xzg9eSn0CjTUc+o/Z/xECRRXtl8nCTvH 3VhEuZj3SxvSG/R0IuPfZmOLBYInbQZ4mR96oQPF/ZgI5NdKV7zudF6poEGDJedrUnJlskhCnDMVt +1/PfEQE9ykWsFAg/sGsh3EtNpa2/avEmJVRXUQdUO42xfYtgHA5B9ibNHZhiFmJVh20woevKmw8e zXue2O6A==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4ht-008fh2-DR for linux-arm-kernel@lists.infradead.org; Mon, 10 May 2021 12:08:18 +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 B9C65169C; Mon, 10 May 2021 05:08:16 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 006AB3F73B; Mon, 10 May 2021 05:08:15 -0700 (PDT) From: Andre Przywara To: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org, Jaxson Han Subject: [aarch64 boot-wrapper PATCH 5/6] pointer auth: Document CPU feature bit mask Date: Mon, 10 May 2021 13:07:25 +0100 Message-Id: <20210510120726.5242-6-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210510120726.5242-1-andre.przywara@arm.com> References: <20210510120726.5242-1-andre.przywara@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210510_050817_513986_818D4296 X-CRM114-Status: GOOD ( 10.01 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When checking for the pointer authentication feature, we actually look for *four* different CPUID feature sets. Add a comment to make it more obvious that the 0xff is not a typo. Signed-off-by: Andre Przywara --- arch/aarch64/boot.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S index a9264de..663f9fc 100644 --- a/arch/aarch64/boot.S +++ b/arch/aarch64/boot.S @@ -41,7 +41,8 @@ _start: /* Enable pointer authentication if present */ mrs x1, id_aa64isar1_el1 - ldr x2, =(((0xff) << 24) | (0xff << 4)) + /* We check for APA+API and GPA+GPI */ + ldr x2, =((0xff << 24) | (0xff << 4)) and x1, x1, x2 cbz x1, 1f From patchwork Mon May 10 12:07:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 12247817 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=-17.4 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 6531DC433ED for ; Mon, 10 May 2021 12:13:53 +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 C1D40613EE for ; Mon, 10 May 2021 12:13:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1D40613EE 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:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=E9xegb/3nUvjZFA3HTHW9QTSX/hOUGaRGLQXZciFg18=; b=Xm6BCwSNw0TBPoigoFOJwtRSGH LqjKJ9uIvW463/I5ICT5/ATdUyaJw5EmfsJONtntREWnBe4mkFoEOgJPHP4ViP39K4The32N/wEMr fNz+2ZrDo3B8hzbAk+EsZhh1IGJG4EMC7i/kKFapXeR6BMuqTmPAQomFbgtJj0dEUK6iABa9ZoV8s gQvjViwG4OYnmYkiPkWdPoIfwOV7iKi7nzxOKOyKo9Q5PNBscdeAjyRnjHSW8upi9Ewv2APaUPB53 dtfP7xeQnD3r9lQUZ2shFyXIDaO8lNJ3+RQRryKGNe8KUKiY9JM2fKLM64VFFxeeiM5m1fQfnQr88 sOz9xU4Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4lw-00EDAK-0F; Mon, 10 May 2021 12:12:28 +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 1lg4hx-00ECP1-8U for linux-arm-kernel@desiato.infradead.org; Mon, 10 May 2021 12:08:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Vp2IehB1eF3l/LtDexZsDLDSIHmJ8fXqhWCmTIC42SA=; b=Ved/UxUjgdEOupXzOjR9k0/BGJ vakibX4vTPPeIINeV78L5urmVNAAaCj0gFkHtW/tIWekQPvOrXAxmi/u1Q8qG6IRnFtvt5D3+FXbg 7rf5DASI8Anpm0qtPfvZKuWxuz4kuWALbMc2+O65zKLVRE3qEsmpLBmP36XoGQTf5kSO9mFhYeNeN 4pSTjMfcOlgSn9jyOXsnGWzcLLZ7emJsqes4U5Vt/M/z/61JFnB+DrsT8Y9D5+TecfZa6rGEwOeSd zgoU+hkOBUOMQEmdpa3ZVTKgFN2NwrtRrffQCpVUeCku6/f7szq1viuB/eK+JHZNpXDSB1/AGWKPu trda4+eg==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg4hu-008fhO-DJ for linux-arm-kernel@lists.infradead.org; Mon, 10 May 2021 12:08:20 +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 B7CC2168F; Mon, 10 May 2021 05:08:17 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F23D53F73B; Mon, 10 May 2021 05:08:16 -0700 (PDT) From: Andre Przywara To: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org, Jaxson Han Subject: [aarch64 boot-wrapper PATCH 6/6] configure: Autodetect GICv3 Date: Mon, 10 May 2021 13:07:26 +0100 Message-Id: <20210510120726.5242-7-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210510120726.5242-1-andre.przywara@arm.com> References: <20210510120726.5242-1-andre.przywara@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210510_050818_583716_3D10EF19 X-CRM114-Status: GOOD ( 12.06 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently the user has to specify the GIC architecture version (v2 or v3) on the ./configure command line, even though this is actually redundant information, since the DTB can carry only one GIC type. Unconditionally query for the two GIC compatible strings in the provided DTB, then choose the GIC type automatically depending on which string is found. This saves the user from specifying the GIC type on the configure command line, and avoids errors when the wrong type was accidentally named. Signed-off-by: Andre Przywara --- Makefile.am | 21 ++++++++------------- configure.ac | 8 -------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index b8c0a49..9b3c0ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,19 +58,14 @@ PSCI_NODE := CPU_NODES := endif -if GICV3 -GIC_DIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,gic-v3') -GIC_RDIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 1 'arm,gic-v3') -DEFINES += -DGIC_DIST_BASE=$(GIC_DIST_BASE) -DEFINES += -DGIC_RDIST_BASE=$(GIC_RDIST_BASE) -GIC := gic-v3.o -else -GIC_DIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,cortex-a15-gic') -GIC_CPU_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 1 'arm,cortex-a15-gic') -DEFINES += -DGIC_CPU_BASE=$(GIC_CPU_BASE) -DEFINES += -DGIC_DIST_BASE=$(GIC_DIST_BASE) -GIC := gic.o -endif +GICV3_DIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,gic-v3' 2> /dev/null) +GIC_RDIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 1 'arm,gic-v3' 2> /dev/null) +GICV2_DIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,cortex-a15-gic' 2> /dev/null) +GIC_CPU_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 1 'arm,cortex-a15-gic' 2> /dev/null) +DEFINES += $(if $(GICV3_DIST_BASE), -DGIC_DIST_BASE=$(GICV3_DIST_BASE), -DGIC_DIST_BASE=$(GICV2_DIST_BASE)) +DEFINES += $(if $(GIC_RDIST_BASE), -DGIC_RDIST_BASE=$(GIC_RDIST_BASE), ) +DEFINES += $(if $(GIC_CPU_BASE), -DGIC_CPU_BASE=$(GIC_CPU_BASE), ) +GIC := $(if $(GICV3_DIST_BASE), gic-v3.o, gic.o) if KERNEL_32 MBOX_OFFSET := 0x7ff8 diff --git a/configure.ac b/configure.ac index 9e3b722..ed3e094 100644 --- a/configure.ac +++ b/configure.ac @@ -111,13 +111,6 @@ AC_ARG_WITH([xen-cmdline], [X_CMDLINE=$withval]) AC_SUBST([XEN_CMDLINE], [$X_CMDLINE]) -# Allow a user to pass --enable-gicv3 -AC_ARG_ENABLE([gicv3], - AS_HELP_STRING([--enable-gicv3], [enable GICv3 instead of GICv2]), - [USE_GICV3=$enableval]) -AM_CONDITIONAL([GICV3], [test "x$USE_GICV3" = "xyes"]) -AS_IF([test "x$USE_GICV3" = "xyes"], [], [USE_GICV3=no]) - # Ensure that we have all the needed programs AC_PROG_CC AC_PROG_CPP @@ -144,7 +137,6 @@ echo " Device tree blob: ${KERN_DTB}" echo " Linux kernel command line: ${CMDLINE}" echo " Embedded initrd: ${FILESYSTEM:-NONE}" echo " Use PSCI? ${USE_PSCI}" -echo " Use GICv3? ${USE_GICV3}" echo " Boot-wrapper execution state: AArch${BOOTWRAPPER_ES}" echo " Kernel execution state: AArch${KERNEL_ES}" echo " Xen image ${XEN_IMAGE:-NONE}"