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: 351708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A19C5140082 for ; Fri, 23 May 2014 12:36:15 +1000 (EST) Received: from localhost ([::1]:40670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnfLB-000393-KW for incoming@patchwork.ozlabs.org; Thu, 22 May 2014 22:36:13 -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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cRvEwrVzCxvvsdLlPE/GapTJHRJi9W+0F8I5hDOsjDM=; b=TLOKcl7X+/NpU/IEVkFfs6UeJpI6sCTQG3GmIVioZeaRV1k0O6an8T6WO9lYqElMIp ESQC5R3caVR2dDbP3eyYvTBoLtYr1W6AudVOWrrfehZl+ZVj8OcYaxBXSwvfNu5nuxnf mShpiijmaDzK+YsPCC6iuvm9yTjP705o5wUKnhujARCU2ATF1kDB6TujsQmU2fRiTVDX X0+YQRmNctZFojMSqpY7jQOkPrKTrrvG0i1IgRH+f7axOeAngczxBxtyevqlrncqq/+z ee3+3csABCqGGMQTewS24fG4VMWA3Q/m1q0FJcSvdKLVjsbn1yXhokuMzLtbScqZFj5p s7YQ== 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);