From patchwork Thu May 12 22:46:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 621764 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 3r5Stc1k11z9vK3 for ; Fri, 13 May 2016 08:52:40 +1000 (AEST) Received: from localhost ([::1]:60111 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0zTC-0003Ht-9e for incoming@patchwork.ozlabs.org; Thu, 12 May 2016 18:52:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0zQP-0006h9-Dg for qemu-devel@nongnu.org; Thu, 12 May 2016 18:49:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b0zQL-0002JY-1f for qemu-devel@nongnu.org; Thu, 12 May 2016 18:49:44 -0400 Received: from mail-bl2nam02on0088.outbound.protection.outlook.com ([104.47.38.88]:41508 helo=NAM02-BL2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b0zQK-0002JQ-S8 for qemu-devel@nongnu.org; Thu, 12 May 2016 18:49:40 -0400 Received: from CY1NAM02FT055.eop-nam02.prod.protection.outlook.com (10.152.74.58) by CY1NAM02HT131.eop-nam02.prod.protection.outlook.com (10.152.74.67) with Microsoft SMTP Server (TLS) id 15.1.492.8; Thu, 12 May 2016 22:49:38 +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 CY1NAM02FT055.mail.protection.outlook.com (10.152.74.80) with Microsoft SMTP Server (TLS) id 15.1.492.8 via Frontend Transport; Thu, 12 May 2016 22:49:38 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:57378 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1b0zQH-0007gm-P4; Thu, 12 May 2016 15:49:37 -0700 Received: from [127.0.0.1] (port=37986 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1b0zQH-0005fm-Ln; Thu, 12 May 2016 15:49:37 -0700 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 u4CMhMAn016023; Thu, 12 May 2016 15:43:22 -0700 Received: from [172.19.74.182] (port=36124 helo=xsjalistai50.xlnx.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1b0zQG-0005fj-PZ; Thu, 12 May 2016 15:49:36 -0700 From: Alistair Francis To: , Date: Thu, 12 May 2016 15:46:11 -0700 Message-ID: <180514a5994d4b96e0c25499d90c895ab489b762.1463093051.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.7.4 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-22316.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; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(106466001)(8936002)(6806005)(77096005)(19580405001)(50466002)(19580395003)(87936001)(586003)(118296001)(5003600100002)(36756003)(189998001)(229853001)(50986999)(48376002)(81166006)(64026002)(105606002)(2906002)(4326007)(5001770100001)(5003940100001)(76176999)(86362001)(71366001)(50226002)(5008740100001)(47776003)(2950100001)(11100500001)(1220700001)(33646002)(92566002)(85426001)(9786002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1NAM02HT131; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c1709cdc-510f-43bd-0453-08d37ab7b2c9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1NAM02HT131; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(13017025)(8121501046)(5005006)(13024025)(13023025)(13018025)(3002001)(10201501046)(6055026); SRVR:CY1NAM02HT131; BCL:0; PCL:0; RULEID:; SRVR:CY1NAM02HT131; X-Forefront-PRVS: 0940A19703 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2016 22:49:38.2587 (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: CY1NAM02HT131 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.88 Subject: [Qemu-devel] [PATCH v6 08/13] xilinx_zynq: Connect devcfg to the Zynq machine model 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, alistair.francis@xilinx.com, crosthwaitepeter@gmail.com, edgar.iglesias@gmail.com, alex.bennee@linaro.org, afaerber@suse.de, fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 98b17c9..ffea3be 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -293,6 +293,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;