From patchwork Mon Jan 13 23:48:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 310413 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 04B2E2C0089 for ; Tue, 14 Jan 2014 10:48:59 +1100 (EST) Received: from localhost ([::1]:45657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2rFY-0007s1-VY for incoming@patchwork.ozlabs.org; Mon, 13 Jan 2014 18:48:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2rF0-0007ic-Uk for qemu-devel@nongnu.org; Mon, 13 Jan 2014 18:48:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W2rEv-0004Ux-3U for qemu-devel@nongnu.org; Mon, 13 Jan 2014 18:48:22 -0500 Received: from mail-qc0-x232.google.com ([2607:f8b0:400d:c01::232]:37057) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W2rEu-0004Ut-VH for qemu-devel@nongnu.org; Mon, 13 Jan 2014 18:48:17 -0500 Received: by mail-qc0-f178.google.com with SMTP id m20so2395213qcx.9 for ; Mon, 13 Jan 2014 15:48:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=bH80P6jxOL3iRvPTfGs/WeL5Sie54hT46bQaZzLWyZ4=; b=Jvqn9smR4YVty3dAFlZNNk52R9/BcV6NBZ8F4zobHn9skkEQvOyjIB9DBR+85Hlvej UhDvRRrRlBU92LcIdFVTts7qbqh2p8fxXGYbxbzUdiPixKs/1rj+FUBOefbhGjmZJaSA fZwOg7Gv6chT2dhr9tcXPTzlaTQmE7pHLPLmc+tT7LnkvqebLdr6eIA2VfLWLmHRF1t2 XIMetRpAZE4nEAWNq85iG3jxDoDqL0/FG2IOgipz5QfarUo0wvZxVCbuqEuc9/3/kjTu ObpkyXR2I+MeJumcv6cOKoUxuyahPRtDvidWpVWaFq9k6snT+XwdsHTVo5ZZXEoht4j8 0Jjg== X-Received: by 10.224.36.197 with SMTP id u5mr43610671qad.67.1389656896549; Mon, 13 Jan 2014 15:48:16 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id m7sm31140060qer.16.2014.01.13.15.48.15 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 13 Jan 2014 15:48:15 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org Date: Tue, 14 Jan 2014 09:48:12 +1000 Message-Id: <48b5e4810f9d87b0d4e34aea8d5efaa0cea03d55.1389656647.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::232 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH arm-midr v2 2/2] ZYNQ: Implement board MIDR control for Zynq 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 This patch uses the fact that the midr variable is now a property This patch sets the midr variable to the boards custom midr Signed-off-by: Alistair Francis --- hw/arm/xilinx_zynq.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 98e0958..9ee21e7 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -37,6 +37,7 @@ #define IRQ_OFFSET 32 /* pic interrupts start from index 32 */ #define MPCORE_PERIPHBASE 0xF8F00000 +#define ZYNQ_BOARD_MIDR 0x413FC090 static const int dma_irqs[8] = { 46, 47, 48, 49, 72, 73, 74, 75 @@ -125,6 +126,12 @@ static void zynq_init(QEMUMachineInitArgs *args) cpu = ARM_CPU(object_new(object_class_get_name(cpu_oc))); + object_property_set_int(OBJECT(cpu), ZYNQ_BOARD_MIDR, "midr", &err); + if (err) { + error_report("%s", error_get_pretty(err)); + exit(1); + } + object_property_set_int(OBJECT(cpu), MPCORE_PERIPHBASE, "reset-cbar", &err); if (err) { error_report("%s", error_get_pretty(err));