From patchwork Tue May 14 12:21:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 164168 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2552468ili; Tue, 14 May 2019 05:23:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxSYufb4IGBRFl9+JmnZ1tMj9FyxzN3LrLb8AuMkWNvc2wZlbzTprP83R6ff+Au6mQt2EFg X-Received: by 2002:a5d:9dc2:: with SMTP id 2mr15383115ioo.3.1557836609981; Tue, 14 May 2019 05:23:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557836609; cv=none; d=google.com; s=arc-20160816; b=b6T2xwVFRqV+nRz9YxE/bWMbphZFLONwgslAxc5nBw2NQWaV3/wLXc5liyJVKCKgix kAopp8NRikNNynO1Bz047Nus8v0MTnGORj42phTcx4IC3niWdZdDaOSN3JxIV01fO6fr x5Fber9Gk4Yc1lD2Ro6QLc8K/xAA0TAGJvn2pWIIE+U8VDFrkUBlyPwaoLCO0+ReCPEm bd6JRY4tM7d5R/yHsroAGPyrVoHL1TuMIW5DKpwgvKMMHWre2Ec8ogxGKXl8O8NsRK+f mPxz6+KX/UtLI+FJps8GIFwT8kTbiyXelnPtDNsCIw+OZz7IK3/xMLO8P6NJ8EaLYzCF 70PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=pZ74j0y0SrNT9yb7tlhXi/Tp+d/LhFuEPIFPuJfSjOc=; b=ebORXL7jd3dDJ/qANGFRNpHMRZm3NjYOG0JfZpbYd+pWB6dQcVfZuLGX6knEaIc8m0 PC+L97/aizT/hc8UCEMM5Z5v/t7vnV4P/hsRPBfpOx44hnsyFdnT/YkKAnbmF1xbXr2l KxRhSEh76n0oJ8FwuxQsPUfus7VRxwVJiKLeZmgSfgEJN8y+kuRxYZbYsk5MScNXR36l +d8SKspi4czG6xn7jmpE6lyHUZbNLgnvpTJA3SsO2934ISQUJpJMo7nEkKHOrqrMevCh nAXXumAR7TYGzuprQGEyUm2VpRhsO/ZUPzNhGS4wCEyAjx9eTYIV49J1+BCa6pltVm6D kYhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id l22si8373456ioc.112.2019.05.14.05.23.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 05:23:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQWRX-0008Kl-Ut; Tue, 14 May 2019 12:22:03 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQWRW-0008Ie-Nw for xen-devel@lists.xenproject.org; Tue, 14 May 2019 12:22:02 +0000 X-Inumbo-ID: e05f3726-7642-11e9-87c7-df62b369fcf1 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id e05f3726-7642-11e9-87c7-df62b369fcf1; Tue, 14 May 2019 12:22:01 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6AC3D15AB; Tue, 14 May 2019 05:22:01 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5ABCF3F71E; Tue, 14 May 2019 05:22:00 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 14 May 2019 13:21:21 +0100 Message-Id: <20190514122136.28215-13-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190514122136.28215-1-julien.grall@arm.com> References: <20190514122136.28215-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH MM-PART2 v2 06/19] xen/arm: Rework secondary_start prototype X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Oleksandr_Tyshchenko@epam.com, Julien Grall , Stefano Stabellini , Andrii_Anisov@epam.com MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" None of the parameters of secondary_start are actually used. So turn secondary_start to a function with no parameters. Also modify the assembly code to avoid setting-up the registers before calling secondary_start. Signed-off-by: Julien Grall - Re-order the patch with "xen/arm: Remove parameter cpuid from start_xen". --- xen/arch/arm/arm32/head.S | 4 ++-- xen/arch/arm/arm64/head.S | 3 ++- xen/arch/arm/smpboot.c | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index cb8a3bf829..9f40face98 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -445,9 +445,9 @@ launch: ldr sp, [r0] add sp, #STACK_SIZE /* (which grows down from the top). */ sub sp, #CPUINFO_sizeof /* Make room for CPU save record */ - mov r0, r10 /* Marshal args: - phys_offset */ - mov r1, r8 /* - DTB address */ teq r12, #0 + moveq r0, r10 /* Marshal args: - phys_offset */ + moveq r1, r8 /* - DTB address */ beq start_xen /* and disappear into the land of C */ b start_secondary /* (to the appropriate entry point) */ diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 075013878e..cb30d6f22e 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -582,9 +582,10 @@ launch: sub x0, x0, #CPUINFO_sizeof /* Make room for CPU save record */ mov sp, x0 + cbnz x22, 1f + mov x0, x20 /* Marshal args: - phys_offset */ mov x1, x21 /* - FDT */ - cbnz x22, 1f b start_xen /* and disappear into the land of C */ 1: b start_secondary /* (to the appropriate entry point) */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index f756444362..00b64c3322 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -297,9 +297,7 @@ smp_prepare_cpus(void) } /* Boot the current CPU */ -void start_secondary(unsigned long boot_phys_offset, - unsigned long fdt_paddr, - unsigned long hwid) +void start_secondary(void) { unsigned int cpuid = init_data.cpuid;