From patchwork Tue Mar 8 21:06:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 594342 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 23F3A1402C9 for ; Wed, 9 Mar 2016 08:14:45 +1100 (AEDT) Received: from localhost ([::1]:37450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adOxn-0005TL-4f for incoming@patchwork.ozlabs.org; Tue, 08 Mar 2016 16:14:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adOtF-0005wD-67 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 16:10:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adOtB-0002oc-V9 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 16:10:01 -0500 Received: from mail-cys01nam02on0077.outbound.protection.outlook.com ([104.47.37.77]:40784 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adOtB-0002oE-Na for qemu-devel@nongnu.org; Tue, 08 Mar 2016 16:09:57 -0500 Received: from CY1NAM02FT046.eop-nam02.prod.protection.outlook.com (10.152.74.57) by CY1NAM02HT244.eop-nam02.prod.protection.outlook.com (10.152.74.255) with Microsoft SMTP Server (TLS) id 15.1.427.7; Tue, 8 Mar 2016 21:09:56 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; linaro.org; dkim=none (message not signed) header.d=none; linaro.org; dmarc=none action=none header.from=xilinx.com; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by CY1NAM02FT046.mail.protection.outlook.com (10.152.74.232) with Microsoft SMTP Server (TLS) id 15.1.434.11 via Frontend Transport; Tue, 8 Mar 2016 21:09:53 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:47555 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1adOt6-0006Cg-GE; Tue, 08 Mar 2016 13:09:52 -0800 Received: from [127.0.0.1] (port=48500 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1adOt6-0000eW-BX; Tue, 08 Mar 2016 13:09:52 -0800 Received: from xsj-tvapsmtp02 (smtptest.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id u28L412j021891; Tue, 8 Mar 2016 13:04:02 -0800 Received: from [172.19.74.182] (port=56664 helo=xsjalistai50.xlnx.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1adOt5-0000eT-Hm; Tue, 08 Mar 2016 13:09:51 -0800 From: Alistair Francis To: , Date: Tue, 8 Mar 2016 13:06:51 -0800 Message-ID: X-Mailer: git-send-email 2.5.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-22178.005 X-TM-AS-Result: No--8.243-7.0-31-10 X-imss-scan-details: No--8.243-7.0-31-10 X-TMASE-MatchedRID: qFVTmFJLgNZWfeDd3aYS8BWCVBr+Ay98TJDl9FKHbrm82TV3yRt/mkbW j9B3pdd86Vf2dihcmNKWmTv5yKHu7y/EHok7hruc58dk5sbwmyiH7D1bP/FcOrDOZkvqV9x1o8W MkQWv6iXBcIE78YqRWo6HM5rqDwqtKHedfOGjY/G0RIo0Tlr6Go/xx8umI3+UAbX90HxHSknvaL 7cP+xH5A== X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(85426001)(6806005)(5008740100001)(87936001)(575784001)(86362001)(48376002)(92566002)(81166005)(47776003)(189998001)(76176999)(50466002)(50986999)(11100500001)(33646002)(118296001)(1096002)(5001770100001)(64026002)(1220700001)(4326007)(5003940100001)(77096005)(105606002)(106466001)(2906002)(36756003)(2950100001)(5003600100002)(19580405001)(586003)(229853001)(71366001)(19580395003)(50226001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1NAM02HT244; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 44e4a953-a7fc-4110-f860-08d34795ffef X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1NAM02HT244; X-Microsoft-Antispam-PRVS: <53ac7b028ef546da9f682dca0971558f@CY1NAM02HT244.eop-nam02.prod.protection.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(13015025)(5005006)(13017025)(13018025)(13024025)(13023025)(3002001)(10201501046); SRVR:CY1NAM02HT244; BCL:0; PCL:0; RULEID:; SRVR:CY1NAM02HT244; X-Forefront-PRVS: 08756AC3C8 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2016 21:09:53.3206 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1NAM02HT244 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.77 Cc: edgar.iglesias@xilinx.com, alistair.francis@xilinx.com, crosthwaitepeter@gmail.com, edgar.iglesias@gmail.com, alex.bennee@linaro.org, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v5 09/15] xilinx_zynq: Connect devcfg to the Zynq machine model 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: Peter Crosthwaite Signed-off-by: Peter Crosthwaite Signed-off-by: Alistair Francis --- V4: - Small corrections to the device model logic hw/arm/xilinx_zynq.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index a35983a..d10b0ef 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -290,6 +290,14 @@ static void zynq_init(MachineState *machine) sysbus_connect_irq(busdev, n + 1, pic[dma_irqs[n] - IRQ_OFFSET]); } + dev = qdev_create(NULL, "xlnx.ps7-dev-cfg"); + object_property_add_child(qdev_get_machine(), "xlnx-devcfg", OBJECT(dev), + NULL); + qdev_init_nofail(dev); + busdev = SYS_BUS_DEVICE(dev); + sysbus_connect_irq(busdev, 0, pic[40 - IRQ_OFFSET]); + sysbus_mmio_map(busdev, 0, 0xF8007000); + zynq_binfo.ram_size = ram_size; zynq_binfo.kernel_filename = kernel_filename; zynq_binfo.kernel_cmdline = kernel_cmdline;