From patchwork Fri May 23 02:30:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 30671 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9A57320671 for ; Fri, 23 May 2014 02:36:25 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id m1sf20324310oag.10 for ; Thu, 22 May 2014 19:36:24 -0700 (PDT) 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:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=cRvEwrVzCxvvsdLlPE/GapTJHRJi9W+0F8I5hDOsjDM=; b=DuuuieQs7hEklLUPCwCIYOsuRksd3h2bnF/5yAwGpXqQRv+dGEx7jkYpSpxDvZaJSI jGX12DTYxYWbVYX26AX7pSLudThWHaZjySo3LswnkadIgE+oKsD0iNvPJaoIbyyL/LMt cvY7AB8YJcdIzJ8+ub4S5A2i7DmFpNs4lPhbMn/hfiqMSgf7TLBhvJRubyJE8W5vHfUT UEWWOw8lwWi3FJL4LNBhjJaPz4M6gRMl7+uudsJWnVf9ccpFH9GindpSchUVOQPzdzF7 Bis6nwAeYGJ5RMsQBl/5eRgQ7TXc6RFqA/58fZOu10c2CZ3HXizcEk6KCD6wBQl5AnFQ rd2Q== X-Gm-Message-State: ALoCoQlwb93CEZUJfHlHsFrgQ4S6c53Tu1AVp1UO3Gb3mQLPvmlT4sDzehPk9r6dQoEBaKWrgdcn X-Received: by 10.42.236.68 with SMTP id kj4mr887417icb.6.1400812584911; Thu, 22 May 2014 19:36:24 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.28.195 with SMTP id 61ls412070qgz.77.gmail; Thu, 22 May 2014 19:36:24 -0700 (PDT) X-Received: by 10.58.116.1 with SMTP id js1mr1425129veb.29.1400812584763; Thu, 22 May 2014 19:36:24 -0700 (PDT) Received: from mail-ve0-x235.google.com (mail-ve0-x235.google.com [2607:f8b0:400c:c01::235]) by mx.google.com with ESMTPS id j8si915689vek.54.2014.05.22.19.36.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 19:36:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::235 as permitted sender) client-ip=2607:f8b0:400c:c01::235; Received: by mail-ve0-f181.google.com with SMTP id pa12so5459396veb.40 for ; Thu, 22 May 2014 19:36:24 -0700 (PDT) X-Received: by 10.220.92.193 with SMTP id s1mr1533221vcm.34.1400812584654; Thu, 22 May 2014 19:36:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp248066vcb; Thu, 22 May 2014 19:36:24 -0700 (PDT) X-Received: by 10.224.53.194 with SMTP id n2mr2417187qag.48.1400812584110; Thu, 22 May 2014 19:36:24 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i6si2021337qan.36.2014.05.22.19.36.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 22 May 2014 19:36:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:40670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnfLL-000393-Pz for patch@linaro.org; Thu, 22 May 2014 22:36:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnfG2-00049Q-J9 for qemu-devel@nongnu.org; Thu, 22 May 2014 22:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnfFe-0003pV-IK for qemu-devel@nongnu.org; Thu, 22 May 2014 22:30:54 -0400 Received: from mail-ob0-x22a.google.com ([2607:f8b0:4003:c01::22a]:61243) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnfFe-0003p6-CG for qemu-devel@nongnu.org; Thu, 22 May 2014 22:30:30 -0400 Received: by mail-ob0-f170.google.com with SMTP id uy5so4738889obc.15 for ; Thu, 22 May 2014 19:30:29 -0700 (PDT) X-Received: by 10.182.246.40 with SMTP id xt8mr23022obc.76.1400812229894; Thu, 22 May 2014 19:30:29 -0700 (PDT) Received: from localhost.localdomain (66-90-144-10.dyn.grandenetworks.net. [66.90.144.10]) by mx.google.com with ESMTPSA id fm8sm5542727oeb.10.2014.05.22.19.30.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 May 2014 19:30:29 -0700 (PDT) From: Rob Herring To: Peter Maydell Date: Thu, 22 May 2014 21:30:09 -0500 Message-Id: <1400812209-26743-7-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400812209-26743-1-git-send-email-robherring2@gmail.com> References: <1400812209-26743-1-git-send-email-robherring2@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4003:c01::22a Cc: Rob Herring , Peter Crosthwaite , qemu-devel@nongnu.org, Christoffer Dall Subject: [Qemu-devel] [PATCH v2 6/6] arm/highbank: enable PSCI emulation support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Original-Sender: robherring2@gmail.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2607:f8b0:400c:c01::235 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=fail header.i=@gmail.com; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Rob Herring Enable PSCI emulation on highbank and midway platforms. Note that this requires fixing the PSCI function IDs in the DTB to match what QEMU is using. This should get fixed. Signed-off-by: Rob Herring Reviewed-by: Peter Maydell --- v2: - Add error_abort on setting of start-powered-off. hw/arm/highbank.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 1.9.1 diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 24231e5..0cbc865 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -241,6 +241,15 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine) cpuobj = object_new(object_class_get_name(oc)); cpu = ARM_CPU(cpuobj); + object_property_set_int(cpuobj, QEMU_PSCI_METHOD_SMC, "psci-method", + &error_abort); + + /* Secondary CPUs start in PSCI powered-down state */ + if (n > 0) { + object_property_set_bool(cpuobj, true, "start-powered-off", + &error_abort); + } + if (object_property_find(cpuobj, "reset-cbar", NULL)) { object_property_set_int(cpuobj, MPCORE_PERIPHBASE, "reset-cbar", &error_abort);