From patchwork Wed Jan 29 13:39:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 23854 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A4597202FA for ; Wed, 29 Jan 2014 13:50:47 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id oz11sf4384700veb.8 for ; Wed, 29 Jan 2014 05:50:46 -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: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=qStYoMfEoCjV/znvLCiyMjd0nhWKWz1t7/hN/DKm/oQ=; b=VOsMFTG3N5n8v9bpP19vKVrWdtFXkhf3+q9URProOI4XS/YGBq8Hoj1fqKjikYIRZv Zl74rjB7z0vrzgyy130iOCEvJ1So2My1kO3CK7bkQppVbgZ+/IP9b1pPWvgST4wk5O2O 37W26ShEJjopF4YDkXrsOi1lYmvtlX8T3NQ6/Gl9v2uMn1kNjkBwcmRStxFAQha9DFL8 WjBJOKzO9+XOvSXofZ4oXiK+FQdQFCjCfj+2JR7SFm6KAGdSJt0DFpEWaj8C5hndVuE0 y1M34CyRbKuclgxTUgb/FhJb9lyBfCXb+DPE21rlVSxHZIfhX46F0K2yvy6h1J8acZvv 4JVQ== X-Gm-Message-State: ALoCoQn2MVYtC8c+n/LV7A9BIWv7F5hDQwR5dUBdgbmwLWsc4eKf0WmD7t8nA/1QwSHipA0mo98R X-Received: by 10.236.78.232 with SMTP id g68mr2604755yhe.19.1391003446829; Wed, 29 Jan 2014 05:50:46 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.102 with SMTP id a93ls103997qga.33.gmail; Wed, 29 Jan 2014 05:50:46 -0800 (PST) X-Received: by 10.58.161.227 with SMTP id xv3mr432313veb.31.1391003446633; Wed, 29 Jan 2014 05:50:46 -0800 (PST) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id 6si812380vcu.51.2014.01.29.05.50.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Jan 2014 05:50:46 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.175 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.175; Received: by mail-ve0-f175.google.com with SMTP id c14so1195627vea.34 for ; Wed, 29 Jan 2014 05:50:45 -0800 (PST) X-Received: by 10.58.66.137 with SMTP id f9mr6756292vet.11.1391003445874; Wed, 29 Jan 2014 05:50:45 -0800 (PST) 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.174.196 with SMTP id u4csp114190vcz; Wed, 29 Jan 2014 05:50:45 -0800 (PST) X-Received: by 10.224.52.3 with SMTP id f3mr12166696qag.26.1391003444597; Wed, 29 Jan 2014 05:50:44 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j50si1761514qgf.187.2014.01.29.05.50.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Jan 2014 05:50:44 -0800 (PST) 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]:42402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8VXQ-0006qw-7K for patch@linaro.org; Wed, 29 Jan 2014 08:50:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8VNm-0001LQ-Hx for qemu-devel@nongnu.org; Wed, 29 Jan 2014 08:40:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8VNh-0001Ky-RR for qemu-devel@nongnu.org; Wed, 29 Jan 2014 08:40:46 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:45249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8VNh-0001GJ-FS for qemu-devel@nongnu.org; Wed, 29 Jan 2014 08:40:41 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1W8VN7-0006wH-Oc; Wed, 29 Jan 2014 13:40:05 +0000 From: Peter Maydell To: Anthony Liguori Date: Wed, 29 Jan 2014 13:39:40 +0000 Message-Id: <1391002805-26596-14-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1391002805-26596-1-git-send-email-peter.maydell@linaro.org> References: <1391002805-26596-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno Subject: [Qemu-devel] [PULL 13/38] 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.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.128.175 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Alistair Francis 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 Message-id: a3754b10d150af72e4688a993e484fa2b9b8fa21.1390176489.git.alistair.francis@xilinx.com Signed-off-by: Peter Maydell --- hw/arm/xilinx_zynq.c | 7 +++++++ 1 file changed, 7 insertions(+) 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));