From patchwork Mon Nov 25 12:02:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 21736 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f72.google.com (mail-pb0-f72.google.com [209.85.160.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3FFC123FCB for ; Mon, 25 Nov 2013 12:03:20 +0000 (UTC) Received: by mail-pb0-f72.google.com with SMTP id jt11sf10547774pbb.11 for ; Mon, 25 Nov 2013 04:03:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=qUyRGI1A8XtFkvVdL/Raxvbl8pta55XZWL1tL8RWh4w=; b=bUehQD6QP4TPZomR1J9VWCxp2wnip+96V35l8cVhMNdIKATDbTUxr51T4a/zWUZRBQ cpNLcAorrItwFSUTrupR8j4F5MsOS3kz758PNMRer4BW88hmQFryLHTqmkciVCWY1rdF szK6c74UYKcPsV2eN6ZsDHs87OnMaI9JoY49pmGC42nezs12umyxAtj8LH9RpyInTBe3 K9Aioi+B7pAXHJRh7ZpCZzqtRjhh6gOYMMBs04VkZh8iWd/Sjpk1RPV3rIkAfKI8Yjap B72XCh08lH+At08znOc1bkxlXq5g8akYVNxz8SNCimcZSLbR6rzMPluuUVk5vcFbP7IH RaPQ== X-Gm-Message-State: ALoCoQluTjZhonoH8my8RMtCxQLApKGfxhGUEB5PLOjQe67ywpB4Z9XEfTg8/fXtlOWBnV4iwcSC X-Received: by 10.66.160.36 with SMTP id xh4mr9298534pab.11.1385380999528; Mon, 25 Nov 2013 04:03:19 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.127.46 with SMTP id nd14ls2063470qeb.19.gmail; Mon, 25 Nov 2013 04:03:19 -0800 (PST) X-Received: by 10.220.186.202 with SMTP id ct10mr26685641vcb.14.1385380999396; Mon, 25 Nov 2013 04:03:19 -0800 (PST) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id be7si17774105vcb.35.2013.11.25.04.03.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Nov 2013 04:03:19 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id oy12so2927657veb.1 for ; Mon, 25 Nov 2013 04:03:19 -0800 (PST) X-Received: by 10.221.39.195 with SMTP id tn3mr26043717vcb.2.1385380999322; Mon, 25 Nov 2013 04:03:19 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp128123vcz; Mon, 25 Nov 2013 04:03:18 -0800 (PST) X-Received: by 10.50.221.99 with SMTP id qd3mr12300515igc.49.1385380998662; Mon, 25 Nov 2013 04:03:18 -0800 (PST) Received: from mail-ie0-f176.google.com (mail-ie0-f176.google.com [209.85.223.176]) by mx.google.com with ESMTPS id o6si18365079igi.71.2013.11.25.04.03.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Nov 2013 04:03:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.176 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.223.176; Received: by mail-ie0-f176.google.com with SMTP id at1so6763449iec.35 for ; Mon, 25 Nov 2013 04:03:18 -0800 (PST) X-Received: by 10.50.47.101 with SMTP id c5mr12480711ign.32.1385380998336; Mon, 25 Nov 2013 04:03:18 -0800 (PST) Received: from slackpad.drs.calxeda.com (f053083004.adsl.alicedsl.de. [78.53.83.4]) by mx.google.com with ESMTPSA id p14sm25270238igr.7.2013.11.25.04.03.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Nov 2013 04:03:18 -0800 (PST) From: Andre Przywara To: Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com Cc: julien.grall@linaro.org, xen-devel@lists.xen.org, patches@linaro.org, Andre Przywara Subject: [PATCH 4/4] arm64: defer CPU initialization on ARM64 if PSCI is present Date: Mon, 25 Nov 2013 13:02:44 +0100 Message-Id: <1385380964-22230-5-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1385380964-22230-1-git-send-email-andre.przywara@linaro.org> References: <1385380964-22230-1-git-send-email-andre.przywara@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andre.przywara@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Since PSCI is now handled in ARM generic smpboot code, we can remove the PSCI todo from the ARM64 specific code and defer the actual PSCI handling. Signed-off-by: Andre Przywara --- xen/arch/arm/arm64/smpboot.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/arm64/smpboot.c b/xen/arch/arm/arm64/smpboot.c index 8239590..715c44e 100644 --- a/xen/arch/arm/arm64/smpboot.c +++ b/xen/arch/arm/arm64/smpboot.c @@ -61,8 +61,11 @@ int __init arch_cpu_init(int cpu, struct dt_device_node *dn) if ( !strcmp(enable_method, "spin-table") ) smp_spin_table_init(cpu, dn); - /* TODO: method "psci" */ - else + else if ( !strcmp(enable_method, "psci") ) + { + /* PSCI code is handled somewhere else */ + return -EAGAIN; + } else { printk("CPU%d has unknown enable method \"%s\"\n", cpu, enable_method); return -EINVAL;