From patchwork Fri Nov 22 17:17:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 21704 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7D40D23FDB for ; Fri, 22 Nov 2013 17:17:23 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id e14sf4650362iej.0 for ; Fri, 22 Nov 2013 09:17:22 -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=5shUTjPSHfKLiO1girrwjK7QaprrI7p28nbgdoLalY8=; b=XLnfEgauM3WzUzUN0X+sjdEXC3NXtqUTvLSVBLFDT+jKslgOE1RQCBsrj5ZpVhvToH b2IiNMcIMU7J6lwFojR4HiiGq6y9izKW63S41ODbuWuUpqrgL3B9E/+KaAVwBMPoz7Be SsyHTOwSQFAbwqYon/Tfa/nPZkQ77GR9SOHRJB92YoPq4TIHbxgiQT3MaL8QkABuGOdt O71xjGhjmbJeIoHirFv4AHLydophCgBsnwgTZIiMDosVF4jlS+FN9KkeAdRns1gf08xe 0FworWq3EFjP7wDWWAgSndYESJZ69DaWJjHOpRF8wp4QxK+K8BFftFX3sEUcfMPFftyB sEUg== X-Gm-Message-State: ALoCoQlnzFIHAStqCHMIAzuMtQkU2UEbVpSu2ZYHneIIGrCjQ6ntkVv6LRG4UwGugXPIzD2T+WLZ X-Received: by 10.42.210.68 with SMTP id gj4mr3862045icb.1.1385140642544; Fri, 22 Nov 2013 09:17:22 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.131.233 with SMTP id op9ls1057755qeb.60.gmail; Fri, 22 Nov 2013 09:17:22 -0800 (PST) X-Received: by 10.52.227.6 with SMTP id rw6mr10331963vdc.19.1385140642364; Fri, 22 Nov 2013 09:17:22 -0800 (PST) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id qy6si12947744vcb.76.2013.11.22.09.17.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 Nov 2013 09:17:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.44; Received: by mail-vb0-f44.google.com with SMTP id w20so1087575vbb.3 for ; Fri, 22 Nov 2013 09:17:22 -0800 (PST) X-Received: by 10.53.2.36 with SMTP id bl4mr556306vdd.32.1385140642181; Fri, 22 Nov 2013 09:17:22 -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 u4csp54987vcz; Fri, 22 Nov 2013 09:17:21 -0800 (PST) X-Received: by 10.180.219.75 with SMTP id pm11mr3472468wic.21.1385140641118; Fri, 22 Nov 2013 09:17:21 -0800 (PST) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id wr5si13389358wjc.49.2013.11.22.09.17.20 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 Nov 2013 09:17:21 -0800 (PST) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1VjuM2-0002jA-Va; Fri, 22 Nov 2013 17:17:18 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, kvmarm@lists.cs.columbia.edu Subject: [PATCH v9 04/11] target-arm: Provide PSCI constants to generic QEMU code Date: Fri, 22 Nov 2013 17:17:11 +0000 Message-Id: <1385140638-10444-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1385140638-10444-1-git-send-email-peter.maydell@linaro.org> References: <1385140638-10444-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.44 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: , Provide versions of the KVM PSCI constants to non-KVM code; this will allow us to avoid an ifdef in boards which set up a PSCI node in the device tree. Signed-off-by: Peter Maydell --- target-arm/kvm-consts.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/target-arm/kvm-consts.h b/target-arm/kvm-consts.h index 6f56f72..4062f11 100644 --- a/target-arm/kvm-consts.h +++ b/target-arm/kvm-consts.h @@ -36,6 +36,18 @@ MISMATCH_CHECK(CP_REG_SIZE_U32, KVM_REG_SIZE_U32) MISMATCH_CHECK(CP_REG_SIZE_U64, KVM_REG_SIZE_U64) MISMATCH_CHECK(CP_REG_ARM, KVM_REG_ARM) +#define PSCI_FN_BASE 0x95c1ba5e +#define PSCI_FN(n) (PSCI_FN_BASE + (n)) +#define PSCI_FN_CPU_SUSPEND PSCI_FN(0) +#define PSCI_FN_CPU_OFF PSCI_FN(1) +#define PSCI_FN_CPU_ON PSCI_FN(2) +#define PSCI_FN_MIGRATE PSCI_FN(3) + +MISMATCH_CHECK(PSCI_FN_CPU_SUSPEND, KVM_PSCI_FN_CPU_SUSPEND) +MISMATCH_CHECK(PSCI_FN_CPU_OFF, KVM_PSCI_FN_CPU_OFF) +MISMATCH_CHECK(PSCI_FN_CPU_ON, KVM_PSCI_FN_CPU_ON) +MISMATCH_CHECK(PSCI_FN_MIGRATE, KVM_PSCI_FN_MIGRATE) + #undef MISMATCH_CHECK #endif