From patchwork Mon Jun 13 16:27:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?S09OUkFEIEZyw6lkw6lyaWM=?= X-Patchwork-Id: 9173569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A86566044F for ; Mon, 13 Jun 2016 16:40:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96C9922230 for ; Mon, 13 Jun 2016 16:40:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B79125404; Mon, 13 Jun 2016 16:40:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FSL_HELO_HOME, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1C0FB22230 for ; Mon, 13 Jun 2016 16:40:30 +0000 (UTC) Received: from localhost ([::1]:57719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCUub-0000Z7-O3 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Jun 2016 12:40:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCUiY-0006Vi-3s for qemu-devel@nongnu.org; Mon, 13 Jun 2016 12:28:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCUiT-0000z7-0g for qemu-devel@nongnu.org; Mon, 13 Jun 2016 12:28:01 -0400 Received: from greensocs.com ([193.104.36.180]:57953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCUiS-0000ym-M3 for qemu-devel@nongnu.org; Mon, 13 Jun 2016 12:27:56 -0400 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 1AD181387703; Mon, 13 Jun 2016 18:27:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1465835276; bh=/LdHN24l+CspqzpToNIGin+pnSxIUuLoaf1zEiwF6Gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bs400dPdBo4KJZ2Ad2v5q3PbrwDT19HcAyZRrol7Fh+quC07+goZi5KQsPrrY7alK BDtEtmujV5tko5cviZuORZvZJobo2gVzA6Rs2U9Zm4kAcJgZPeNZB5vRQhYnNPHXp/ v8A+eWHwfRsy3gIX54AdcuaPkVsJU26kqS9JhGUI= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com header.b=zsysBmTx; dkim=pass (1024-bit key) header.d=greensocs.com header.b=zsysBmTx Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PUmhyUwL912e; Mon, 13 Jun 2016 18:27:53 +0200 (CEST) Received: by greensocs.com (Postfix, from userid 998) id 7A94E1387702; Mon, 13 Jun 2016 18:27:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1465835273; bh=/LdHN24l+CspqzpToNIGin+pnSxIUuLoaf1zEiwF6Gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zsysBmTxz5oMzIK9OhXuLWVTW9wnBmuVJJfwvIqw2Zl9nd2c1RQzmhfXWEHR102gq RY2MMuM9EhHqoxrn0XxiehV4fukWgfJ5fNj861UHssnBu6dsgQXueg+Q/B88nOBCUx UNxP435UcNJpXe1zDN+V76eFqu8y1g2864ur1/hA= Received: from asus.home (localhost [IPv6:::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: fred.konrad@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id E18AA1387703; Mon, 13 Jun 2016 18:27:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1465835273; bh=/LdHN24l+CspqzpToNIGin+pnSxIUuLoaf1zEiwF6Gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zsysBmTxz5oMzIK9OhXuLWVTW9wnBmuVJJfwvIqw2Zl9nd2c1RQzmhfXWEHR102gq RY2MMuM9EhHqoxrn0XxiehV4fukWgfJ5fNj861UHssnBu6dsgQXueg+Q/B88nOBCUx UNxP435UcNJpXe1zDN+V76eFqu8y1g2864ur1/hA= From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Mon, 13 Jun 2016 18:27:38 +0200 Message-Id: <1465835259-21449-11-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465835259-21449-1-git-send-email-fred.konrad@greensocs.com> References: <1465835259-21449-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [RFC PATCH 10/11] zynqmp: add the zynqmp_crf to the platform X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, fred.konrad@greensocs.com, mark.burton@greensocs.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: KONRAD Frederic This adds the zynqmp_crf to the zynqmp platform. Signed-off-by: KONRAD Frederic --- hw/arm/xlnx-zynqmp.c | 7 +++++++ include/hw/arm/xlnx-zynqmp.h | 1 + 2 files changed, 8 insertions(+) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 4d504da..a8b7669 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -135,6 +135,11 @@ static void xlnx_zynqmp_init(Object *obj) TYPE_XILINX_SPIPS); qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default()); } + + s->crf = object_new("xlnx.zynqmp_crf"); + qdev_set_parent_bus(DEVICE(s->crf), sysbus_get_default()); + object_property_add_child(obj, "xlnx.zynqmp_crf", OBJECT(s->crf), + &error_abort); } static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) @@ -366,6 +371,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) &error_abort); g_free(bus_name); } + + sysbus_mmio_map(SYS_BUS_DEVICE(s->crf), 0, 0xFD1A0000); } static Property xlnx_zynqmp_props[] = { diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 2332596..78fed6e 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -81,6 +81,7 @@ typedef struct XlnxZynqMPState { SysbusAHCIState sata; SDHCIState sdhci[XLNX_ZYNQMP_NUM_SDHCI]; XilinxSPIPS spi[XLNX_ZYNQMP_NUM_SPIS]; + Object *crf; char *boot_cpu; ARMCPU *boot_cpu_ptr;