From patchwork Mon Mar 10 14:44:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 25973 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5E9C42055F for ; Mon, 10 Mar 2014 14:45:01 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id up15sf18660178pbc.2 for ; Mon, 10 Mar 2014 07:45:00 -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: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=kSKHdwi2KWp1A2qKm/+kZBcknNpJ3Eh7x2AW4h1trEE=; b=DVDjh4Uygohkqou8zVEP0eiEU144t07pgcvnIsBv0dVCoatG+JAfKsY5/hK6Ola1Bu PVAXhjuwlZ5/5c/GbFbcoQ8PCOGprgj4iW6PJEOJAXjn1rbKQtz/wCSnjzuHAY4saWiz Wc30Yn9tPSROmGONeO8kAAYTDe75Pt+hig3QUli6o4tXcakLawNtZMFhDBLSIr1uFpN1 +FWnR1Y+3a/8J6+jn9eJp6d7StDBuZSFY7g6unBSRmLLlT/usSxXkzAxy7aKmnT9H0w4 /4QTPL3k5GMihHfUHshDkuPfjsJbGkEnOCOq78Rya6osyX739bF2SKYuYpAo3cX+4gB7 npLw== X-Gm-Message-State: ALoCoQmDevnFzhsdnJMrWdl6kWF/W8z9jxrK8srLwiMmH8KXY9dY4eKtsZlxhJrf+n3qAbOESJfD X-Received: by 10.66.65.202 with SMTP id z10mr4245187pas.45.1394462700334; Mon, 10 Mar 2014 07:45:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.85 with SMTP id a79ls607452qge.72.gmail; Mon, 10 Mar 2014 07:45:00 -0700 (PDT) X-Received: by 10.58.188.78 with SMTP id fy14mr2672968vec.23.1394462700196; Mon, 10 Mar 2014 07:45:00 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id yj2si4788461veb.85.2014.03.10.07.45.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Mar 2014 07:45:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hq11so7298157vcb.0 for ; Mon, 10 Mar 2014 07:45:00 -0700 (PDT) X-Received: by 10.220.164.80 with SMTP id d16mr22509900vcy.15.1394462700065; Mon, 10 Mar 2014 07:45:00 -0700 (PDT) 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.78.9 with SMTP id i9csp123893vck; Mon, 10 Mar 2014 07:44:59 -0700 (PDT) X-Received: by 10.180.75.202 with SMTP id e10mr9142743wiw.50.1394462698497; Mon, 10 Mar 2014 07:44:58 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id ci1si2899814wib.83.2014.03.10.07.44.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 10 Mar 2014 07:44:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WN1Rk-0002Jo-TZ; Mon, 10 Mar 2014 14:44:52 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Evgeny Voevodin , Maksim Kozlov , Igor Mitsyanko , Dmitry Solodkiy , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Rob Herring , Peter Crosthwaite Subject: [PATCH v2 4/4] virt: Set reset-cbar on CPUs Date: Mon, 10 Mar 2014 14:44:52 +0000 Message-Id: <1394462692-8871-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394462692-8871-1-git-send-email-peter.maydell@linaro.org> References: <1394462692-8871-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.220.169 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: , Set the reset-cbar property on CPUs used by the virt board, if they have it. This isn't necessary for correct functioning under Linux (since the A9 isn't a valid CPU for the virt board), but it is the correct behaviour. Signed-off-by: Peter Maydell Reviewed-by: Peter Crosthwaite --- hw/arm/virt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 517f2fe..2bbc931 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -390,6 +390,12 @@ static void machvirt_init(QEMUMachineInitArgs *args) if (n > 0) { object_property_set_bool(cpuobj, true, "start-powered-off", NULL); } + + if (object_property_find(cpuobj, "reset-cbar", NULL)) { + object_property_set_int(cpuobj, vbi->memmap[VIRT_CPUPERIPHS].base, + "reset-cbar", &error_abort); + } + object_property_set_bool(cpuobj, true, "realized", NULL); } fdt_add_cpu_nodes(vbi);