From patchwork Fri Sep 1 21:00:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 809004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="W/YCeZrW"; dkim-atps=neutral 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 3xkX365N0fz9sPk for ; Sat, 2 Sep 2017 07:10:55 +1000 (AEST) Received: from localhost ([::1]:60824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dntDH-0005rO-Hp for incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 17:10:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt7D-0000Sj-Vc for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnt79-0006pB-Nh for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:35 -0400 Received: from mail-by2nam03on0059.outbound.protection.outlook.com ([104.47.42.59]:61310 helo=NAM03-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnt6z-0006hs-4w; Fri, 01 Sep 2017 17:04:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=FNAzIUiukrqNoMRKfQ1Q6SiXhV7sOE9PEpQnRfqV1lc=; b=W/YCeZrW58wm4lxpwueEmf4m24iAM3gbVFEkEZN/ze4qWBjLYQUnNRiY05nGQTo9cYSC51S6wg+onvQ9PDtIDO8kscDCsUwWpMo8RHAkWNL/8JOF2/1VIwsev3Auwfr/ATCLFpahiyVNJ4f4O7QwCuw2pNmVToR+smu6vy+JKeY= Received: from MWHPR0201CA0036.namprd02.prod.outlook.com (10.167.160.177) by CY4PR02MB2696.namprd02.prod.outlook.com (10.175.59.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Fri, 1 Sep 2017 21:04:18 +0000 Received: from BL2NAM02FT027.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by MWHPR0201CA0036.outlook.office365.com (2603:10b6:301:74::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 1 Sep 2017 21:04:17 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by BL2NAM02FT027.mail.protection.outlook.com (10.152.77.160) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 1 Sep 2017 21:04:17 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1dnt6u-0004gE-LB; Fri, 01 Sep 2017 14:04:16 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnt6u-0007fC-Hf; Fri, 01 Sep 2017 14:04:16 -0700 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81L4BaA021007; Fri, 1 Sep 2017 14:04:11 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnt6o-0007eP-Ub; Fri, 01 Sep 2017 14:04:10 -0700 From: Alistair Francis To: , , Date: Fri, 1 Sep 2017 14:00:35 -0700 Message-ID: <15b2a02d1aae37b49a13a32c5af466e2b63c11ac.1504293917.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23296.003 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(2906002)(63266004)(9786002)(5660300001)(305945005)(77096006)(33646002)(81156014)(76176999)(50986999)(106466001)(81166006)(5003940100001)(8676002)(8936002)(47776003)(189998001)(2201001)(36756003)(478600001)(626005)(36386004)(39060400002)(118296001)(48376002)(50466002)(50226002)(2950100002)(356003)(6666003)(54906002)(230783001)(4326008)(2004002)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB2696; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT027; 1:6l5TA89FYD+s3xGgT2uFw2PpebnSNPML5hOY7VQkEmyGVa+JsbfpeopenJEAA/QLzamk28lVMRXZIR7owySulnkPn/DyJJhmbGjNMUQYXb2jfqcOPF23wpk20huwnY4Q MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 25bd4ad4-bab5-45d1-fd45-08d4f17d0222 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR02MB2696; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2696; 3:26w2OZN4AWOowXALJeilsNhrUwTWgK5R3NsVXbItYoMflqyct5pvVKcekRdIGeLSl7MONbaF8WgqI8oEeZFaLNRYvsE+qK3XCu/CIFHvEuj9VfpxBaz/5lbkAbEGo75D7vaSdjVAiHTiqG6jQbLIsz1Y8blSqvOaqJSipG9HRWslUiFrQcf2Fb94b9pHr8xEi+sqJjj1N3LbG+Bf09GDv8AF8f+gmymCouxP+puvogHcqysgTQwT00vy9HXNJXx+e14yMdW6FdOAPG7tsJ90NQB0EklhvSC1xmzZJyaBUCxLk4h/G07WEDN5OwL3D7mqObTFyl6SNIFCJRYFGVOfERq14c8sx5oi2YJuLMuAVZg=; 25:UA1wQPi0zCpn3gIBrt2bk6SiBfNyOJXCboxcu5Horg7nSmgcBkt2LUW8As0CFbF9VDZyFv+cIYou2hLw5RYoUq3/AncmUlNFf5UCG4qSV6ukSgVpkuo5b5VPUiLa4wKAKkt5I/YThpAsQD3pP2gCmOeFpi2GG8FrjmZ/fxYRjbl2A+6i2F9cET2l+HkxalK1/k9zUqUHiG6ULeqvIYa0qPkswhvGEnKLtdGH76p+KD1YtJBiaJSZ86quppGtUC6+Q0emL95vBGb7oI1htjy1uXKw38JPW5PqXmSXhqNTjjrz6/2cL02xuur753aMIh4cIavBzRexMCLda3yhp4YgAA== X-MS-TrafficTypeDiagnostic: CY4PR02MB2696: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2696; 31:wPdx6Ix1jOsXZhJ3BvwNoPzGf3mq01Mfq9zbjgLmodYnWmzvdsXb2AAfkFmKS2lZ/KVlSrTA5nTg3kT4TBMeP5gaL/pAgMw7l8jfqpdzK0MSa/Q/Yrcp42H6vnzQY0tWSjaC4xGTEysbo3/C+THWbRX08SlpJ6iAq19jb9+nnthaKRird9teLw5QmA5i+kcS3NnyezjlS1wwBEwhz7I24ZA+b8s7nUHH5Eul1LaZ0qk=; 20:FSZaZu1Dd5YhoeFYUvEzeSoy43q4Ftoj7GvFFH9mzbA0SqUDhQt79ExXUG/D7dswtx/4r+wx72UyXQ5CdxBQVKiiQV8lbE7HCe77Ax2Wj1RqSSuJFfLjFY/MhwOpJKMMIQkhWUf39MnOLKfLMc8Abo9H8HV+GtnKcbM3OasKSs2VKfCBNhlExNdYXd7wQkOU8mjqvz1EuAOGR/yI7Dmdfj4/CdnrDA1oa3WqfV+1WEZpYwZtP4EG8N6NKir941kW3RWJRsehw/ZuvlDBd9KGhdujiJmX3dfHeTPYkbQ2NI7/cc3IpUlmO0oVuig07rewoL5r3cZ3c0nkbKHcUzt41iXd1pKUGHVKMz2AVOlXQRdpovCgmtuHn1dvtSHsbSc8Dp+/+4uoi6PImiob53Rx8auYAN4s8f37C+kdbcSCfltZ5n4OYSs0GXE7Hjjss5m1TNEjhSrl5athWFAv03zXckawSlHsB7/HCpoqvz4rVlXSEpOtNn3twS/zBtH9q3yi X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(21532816269658); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(100000703101)(100105400095)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123560025)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB2696; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB2696; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2696; 4:ELF7DAnt1j6lR88WTH/OqT47ZI+fkWBplTV5dANZ6DxbJHHBxtfvc3rSb1hrAd6l58kTJWg7YNJ+y6WulzdsX9IhZfjm082lvf5lv1UvDxWr1z8zZ3onuwybTEFNYT67L+zF97vmmGpxqzBcFMVcQiSw+rsgL8tur9OIkmQatHIN3u8ZDMSVDYvtE5yvBJIM5t8J4zSf0UyuQXojs8pTz1XigNvTZ3X3TyxqtMcr4uItKSkHOFHJP4gxhwZuWVFjTbqKe98f9F2cKD91d8LN6rwebO3rdvGTmh5ci9P7yrL+kSxEsDNp8y7tx5ZmjGZpOPnsvHxprASLEseleDOqJw== X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB2696; 23:UDPdGnIBheo+3ZDLbirVegFzoDDU14Vvcc2uKNSH9?= 1iGrPqGhd1wKr0A24x1lv/TJTUiOzOJx6wi40pTqo8KQRcai3RsxXAy5QlnfblssSR9OP2FOp1g3tt2XfzSmHavdTHTZMrqGbktSUKqpVhqusOFYGi+aPc54gEhoegf0Z1oY6J21lTQn0SVwFa8QccEjVA0J2FTXrwwVeE8CQ763AisTkrZCMa+6aW3yvnzerqM9QAcXpQ5tl2HkIOsIrkZdoL9gMUKqX7iIKthKLKfKKsH8wjFSQhNLWFzfHQsduMDg88lJI7C9WqHlcJ/YPAvmRm6k06BsQvpg5QsOvCe0sSBH5nnTgTbOeaPeH7SN1sHN2Pf9YAQw37vm58dYmArR2nXPAh1f8PpwuE2D69DqtifF20/j5uHo3277QaSN7Ls6DHP99qw75ZS9Tq9P5z2fHmPJmqW42JSifQ0RA/swG6j7yIMxMdmZEOthnfv+bRzBwuajudlnquyHZJl7oOyEPTH1K3HbsEKnkdoQ3a+LPwwMebqEqFHwGDHRFKQkEV0jfTXmtyXCJLfUsCMFkEz9iMIn9GlApeoGUuXazOdTYMsTSC+Bgk7I35I+mvIs5OVjNy8ZUP8r7hWLN8S560Sf/+c3lji7zroBmuCP7Tp57d95ultsoq5NgF+0Z8orEd19NFkh3zMulfYa5h9xkEsnyVDUWgyavS/It6N/GTI5DEd4I9cB40pi0c5E73QPhJcnw1iNqRCRtGROd+w/8Qd1MB9jIknXyXMvlZ+SNqNJQKdA3XPhKm4hsIZGJcizoyXBHLM8xb1vGtzVReIrsirv20iUP5byMwKHTD9rMn0ZvY1pl0ZZl5Pk7sfjwrqMBOwrqwurIgvkh4lKQFQuQLcwTwu3/7mYYk5U0p/Vuv0S2JJ5ungmoWJytLkesNwaOsRL6RoqpwPxC7FlaxWVhv7uZ6pUnKx/Z3lyI3PnHH0i2dU6OFUEM/RmqezKNQnILijZ6Aj703aZ4YPv8bZdeRfR9GG0W46/48JuQ1WQGtk0w== X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB2696; 6:20EdJNWwgG5OZ0xX36rst/9HZ7/Cq7hAFhL8jEcgAY73xRyW0czeayjBYWGH/inf0Jp+EQP5HbNs7ot9CMHXkOOAFwV/Hpb4y9BFRhkBkVZXV884rxDBW57kA7VrkYRt2zHz1yODfQZEQtNVLx0dpCmYozoY6iIUGxQeHMpTFxOiojpuoA8cUV/r6E5LuabDHBqJHDx1D0Rh8WMjOFh9kiVfEKZrRKrGtX8IeOd9LYo64Hr9wxyiYBifQ31YwI7yB1NIKBK20XiwEJwPIrA1UA2TIncwSZ21yLYGgJcE58BRtvnjutdGe5Rdz6jPmT0cyDsIM6+XYFL+nbNoQRD1wg==; 5:l+F39Um2ppU+DzveAeDjJ/rv8iN3OR2x2QEu+nDKu9fIuAOqtPmC7fPWr0UKeLnoI3h2tPC4rdABODkHLZXHkkk7FsRVM5bMeZ/7x2i/E7g5VFRzUNPJyce/SdQrdvc+rmpf6ng13ptBO1cLJGPJgQ==; 24:dnVGAaAwNxNpthNw0Ff8tpD0p6To2fYyPLu7BVlCLMFbNvoNyc8t0SD9ywPncoZIdjfsXNfRZ3l56zbFzW1+ZJhgeiJtoKaSd9dnoxh9Joo=; 7:18wPGo00L1udMMn/TXkXUF3iEq2sRy/uG7IyKFKiPF13ymZElrzBT7+JOUbrDmuvFGwNtIocl6x71K3+ljxC4olSJLJxcLQufeJelz1c+1qxSQq0L9hDHQOCllr+4JQD1MlwAO+JaJnTKIrM1lBfNY/Ckpx0SWAsqlJN/QUTJYfKFsTifeqnbmYtQf9uk1atdBsZV3SspEI5LSvddMzpzpQogyJrxPYvrYWsxkoNMgw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 21:04:17.1073 (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.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR02MB2696 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.59 Subject: [Qemu-devel] [PATCH v2 1/6] xlnx-zynqmp-pmu: Initial commit of the ZynqMP PMU 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The Xilinx ZynqMP SoC has two main processing systems in it. The ARM processing system (which is already modeled in QEMU) and the MicroBlaze Power Management Unit (PMU). This is the inital work for adding support for the PMU. The PMU susbsystem runs along side the ARM system on hardware, but due to architecture limitations in QEMU the two instances are seperate for the time being. Let's follow the same setup we do with the ARM system, where there is an SoC device and a ZCU102 board. Although the PMU is less board specific we are still going to follow the same split as maybe in future we can connect the PMU device to the ARM ZCU102 board. As the machine will be fairly small let's keep them both together in one file. Signed-off-by: Alistair Francis --- hw/microblaze/Makefile.objs | 1 + hw/microblaze/xlnx-zynqmp-pmu.c | 83 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 hw/microblaze/xlnx-zynqmp-pmu.c diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index b2517d87fe..ae9fd40de7 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -1,3 +1,4 @@ obj-y += petalogix_s3adsp1800_mmu.o obj-y += petalogix_ml605_mmu.o +obj-y += xlnx-zynqmp-pmu.o obj-y += boot.o diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c new file mode 100644 index 0000000000..fc3c8b236f --- /dev/null +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -0,0 +1,83 @@ +/* + * Xilinx Zynq MPSoC PMU (Power Management Unit) emulation + * + * Copyright (C) 2017 Xilinx Inc + * Written by Alistair Francis + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu-common.h" +#include "hw/boards.h" +#include "cpu.h" + +/* Define the PMU device */ + +#define TYPE_XLNX_ZYNQMP_PMU "xlnx,zynqmp-pmu" +#define XLNX_ZYNQMP_PMU(obj) OBJECT_CHECK(XlnxZynqMPPMUState, (obj), \ + TYPE_XLNX_ZYNQMP_PMU) + +typedef struct XlnxZynqMPPMUState { + /*< private >*/ + DeviceState parent_obj; + + /*< public >*/ +} XlnxZynqMPPMUState; + +static void xlnx_zynqmp_pmu_init(Object *obj) +{ + +} + +static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp) +{ + +} + +static void xlnx_zynqmp_pmu_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + + dc->realize = xlnx_zynqmp_pmu_realize; +} + +static const TypeInfo xlnx_zynqmp_pmu_type_info = { + .name = TYPE_XLNX_ZYNQMP_PMU, + .parent = TYPE_DEVICE, + .instance_size = sizeof(XlnxZynqMPPMUState), + .instance_init = xlnx_zynqmp_pmu_init, + .class_init = xlnx_zynqmp_pmu_class_init, +}; + +static void xlnx_zynqmp_pmu_register_types(void) +{ + type_register_static(&xlnx_zynqmp_pmu_type_info); +} + +type_init(xlnx_zynqmp_pmu_register_types) + +/* Define the PMU Machine */ + +static void xlnx_zcu102_pmu_init(MachineState *machine) +{ + +} + +static void xlnx_zcu102_pmu_machine_init(MachineClass *mc) +{ + mc->desc = "Xilinx ZynqMP ZCU102 PMU machine"; + mc->init = xlnx_zcu102_pmu_init; +} + +DEFINE_MACHINE("xlnx-zcu102-pmu", xlnx_zcu102_pmu_machine_init) + From patchwork Fri Sep 1 21:00:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 809002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="mEma8X0Q"; dkim-atps=neutral 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 3xkWzC5rRJz9sNr for ; Sat, 2 Sep 2017 07:07:35 +1000 (AEST) Received: from localhost ([::1]:60630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dntA5-00030X-QU for incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 17:07:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt7E-0000Ss-3G for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnt79-0006oe-3u for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:36 -0400 Received: from mail-dm3nam03on0066.outbound.protection.outlook.com ([104.47.41.66]:35517 helo=NAM03-DM3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnt6y-0006hY-OD; Fri, 01 Sep 2017 17:04:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=r/oCzN7daSCrEzmA/ntMi3DWADu5eCpF6MxSxjE58bo=; b=mEma8X0Qj37czeeMdr4aBRyo+ZNwpkd1L3R1HD8n1jedTAfC5OopWR39lagh2+55hL8TdI0o99OQSNP98Jhaq/tB7oAL1YWBbnZPpiwwUMWHuZOMiWgHhQzIfZjKkInOp6/C74uQ5dKU154SYrVKNFd6frnJW1nPE99kVWCJ4Jc= Received: from CY4PR02CA0001.namprd02.prod.outlook.com (10.169.188.11) by BLUPR02MB1121.namprd02.prod.outlook.com (10.163.79.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 21:04:18 +0000 Received: from CY1NAM02FT047.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::204) by CY4PR02CA0001.outlook.office365.com (2603:10b6:903:18::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 1 Sep 2017 21:04:18 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by CY1NAM02FT047.mail.protection.outlook.com (10.152.74.177) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 1 Sep 2017 21:04:16 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:38161 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dnt6u-0002Q4-EB; Fri, 01 Sep 2017 14:04:16 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnt6u-0007fC-9T; Fri, 01 Sep 2017 14:04:16 -0700 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81L4D6q021015; Fri, 1 Sep 2017 14:04:13 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnt6r-0007ee-EC; Fri, 01 Sep 2017 14:04:13 -0700 From: Alistair Francis To: , , Date: Fri, 1 Sep 2017 14:00:37 -0700 Message-ID: <241130c59df31aebaf4f23b5f151b6b5c91f36fa.1504293917.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23296.003 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(36756003)(356003)(76176999)(50986999)(8936002)(54906002)(626005)(2950100002)(6666003)(63266004)(305945005)(106466001)(33646002)(9786002)(77096006)(478600001)(47776003)(50226002)(5660300001)(39060400002)(2906002)(4326008)(189998001)(2201001)(5003940100001)(50466002)(81156014)(48376002)(230783001)(8676002)(36386004)(118296001)(81166006)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR02MB1121; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT047; 1:Iye/H7JRnJNXpEaiQZ2/WUtzfA4bSH6oHxJHuOqWYkU6oLjJZZvOYcOwQwwSl+azu/63CbKfTLuf8vXh1Xm5OuF5jTl+Znobh5Bdzwa+bNCk0oPd54hzk3Krii7LEnG3 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7036275-104e-46ea-7d0e-08d4f17d0217 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR02MB1121; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1121; 3:/UNoEEjZoKhf+WNK7RfWTVBVmuxhtUymfHNeZtw2WYcPeB2uwqX3e6taxhKwvOVLWUTQsHr9E+bQoFF4rPogNNYvsL+3wZB1iBVr9glpiaCENREe94jYHY7WcAreECXWsFNmwk6EECARItKzLUxfns5Ij+XZH9yMNZ688w93PyQXu0LGxaEWfjn4svNCQ/30B32utCUtaKhoTKQlwhp3FwVrqmaqV7BdVe3TI5sKPCDKu7GES7t1Go9eIArvjcelcVlpNAmLrFk69qUh3KDlAlGE0SE6UlgdEAACfmQwpS77KqOHBsUdDNTMcwLCrivhiwubDeBekhVD0CbXIFwcE7nWw48dpHue4kYFKB4To2Y=; 25:razIpMud3iWzC0B2sVZ5jcu2RmNJUjWM3huCVWiB1FlfizAr60ppSlPBc+PXTvSlXpVyo/x9TXx8DayGtGgHb5gLOA/Lu9nd6XHUfHLcAqt2l7fatgcBdmVWp/LzBgJevfVG1Gel9T2J9PAfoKYigaWrAgUAIvAhhXlsGpRae+Tq1CUWjxGBxgnr1ah7X4GMzZXMsZfwEaT+KPKHH02AqCDpAoN8zDY/YR2lVic72BnlYaBZOR5Jcjl/HQ8jbrNarUXKlYYBOXpfsy63KfxXVMohDQ3yDcL4WQjapopsYAv2U/XWxr23eN0y6sovYEcZwfwv//Azi/Mxtu7lnSebrg== X-MS-TrafficTypeDiagnostic: BLUPR02MB1121: X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1121; 31:/Qr2Fau/SFRpLXXYE4eGaz2dXenbCNUNEtrtpOxp1qxKBD/NPjNQzP0HQDl7VzecJIay8LKdUSXhFCS25cwHAKi42IZrXk6Uc0zsFj8tCNI7Nc6esdM66+dph3HuEirEQPZybFREjJJPpal5OK1sMYX0iKg8ABKMSXQCbyBY5fDY3ihCQab+PCG7EcaQno3s976iP0t7EutMfXqvZ91hHeEu/m8kKAHlTg+T5hKnJic=; 20:LhFZ9mcSHZeZzMBRFKhil4IObQ2wxfoN1W+lMAF8p4/5MgFn7AAEHuXKhonocXVgDOEqmI941IrHhfclCbhgfe+3hPwZQpscikfI/I53QEsvPc/omsLjRvPvhbB7ET/1NoC9NBmznk5L1r5o6SQ4sgCVEBfEk/rs7UFq1Hyz/frFtOLYJdEy0AmqCAX6SaIzavkFrDr7hxWGIq+wauXRjX+AggOhjvMtoBVaXJuW5OMFgyYRglum3c6w0iskko8vTvWKKRewS0o5Ub6gQ3A8x8p12IEHftgxhsKwumGwuiGB60ZqLSpZIPucB8GbSLo23rut4yaFU80GGbALiebmZDHeqtUfphjGa+p4/gdSddgBuf9MtLRlDh8pRB1N41PQgG7opftMwdnSgDKFAq2RuH2n97+bqMwalutJ2WIb378rOln3F5UVbe7i6dAcag/zKngKHWhHMq/wLW1M3lV0mkMLQuf05bA7PS87cVG12e+RIN/MNz7cgckhi2pkgnXZ X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(21532816269658); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(13018025)(13016025)(10201501046)(3002001)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR02MB1121; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR02MB1121; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1121; 4:6GOGKrm1rv8Mixy49PRZxEvSeD8f2+S3pwK1Zkog4ss8fl486RVat5GxMfZAR5V+NTOWJ7kmvjAbWAXsn1xrGLQbUp7YPGOK8XTa9nqQMZpa4J12e2O+20dtIBotRZcQH7LhlnaYJpEjDXbJdjZsymPeoLb4F/n8DOR57ss05hSbdgjZvuYqIVPkTSKvXoWPErz48MgLC77wvk5cwynza+W1/KOY1wORwiFl6m5drY7oUXfANdNPKqDH6jONd5CNfM3FXDXkFSASvtpsQ/sTSvHh5AYWjyMkz2p9D9SVc7bAw9Q6ugdux6Po5j8iKlQ/PjFehCcxeste/jxuQ44aWQ== X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR02MB1121; 23:GS6U7Xw5zZimDSmiKChRGb6mqxmwWiNm58MEy+2Zv?= Yau5YyFtvPLb6XMO+g2v8tNChYdRSztr1ao7kKiiBSlwOpdBNxc4bVjmGrBgrum69219l0HzGqWX6y5ukde6urc6lGGxFM3l30bMEIRWGGqIXcBMR42ZQmQEpccnqcSKCFlucvO/vPREsco3g76zOopScImt0ZNGvNYDDiF1jgykg/GQsywANHMk0Wqhs93q9oR5J4Ivzr15Fo5KcVdmuHQdeNxPLXh7aS2q+eSDikxQLZ3ik9jdn9sUZjn/QEAzj5Ipr6KYxD5rn1uZZtcx2N0+ay2OeK5g3ynJ97qvZhtS2MQ1SIE4Bd5eUqECNExZu+cVNfDM4Yu8u/jWDyk8lL2M5Tvzb+55qf2Ls5kNUCBvwbluogJI2AVmmS5+X1XJ3GkqHLt1zn2t1K5T+6bj7pXBFYII+R8CzmL9gTXAu4LIgsAmRLJDmVFbkRfGPVwVY2m760k8rCAW5pXp4Y8feHMhsgSh+7f5mGUJM8vZ7MJtBz7Rlrj0nI0RoDVASgkZD2D6cPu8YJTDyPGbU+jlMhpHK+1zv+qi8a+JlSHnat+66KSY+0Sl4SoLiqj263WDYKEshN24XbseDj+RdK8W5glCj51T3tABChjn+mLbJoORDYzXWKirWt/kzee6QW5RyTjFulUk1FifSBzgkz/WaxHA/3rim0P8fxlU2UCm8GeSC8zj5Dwl3ZWa9KYIrnB9KoVcfUaoH1UQFhFTPRAN+ttaPlYEN+bM0tbDXHfPkTK7s5O1+E2Kjpft7o+ayFfmn2/NkUg4WGzFWb57JmLAozKb2QdnE2DG3RrvoBUm/sMms73nBXKW/FvIF+wjIjQcyEbB7Q7/abwdrIvFyN9g1yoMwUMCXGAucU2YzgQ8Wv+EL2At1gxP7BNCf3gRhYspJJIpSI4SsfcT1CNWZe+loyv+uCOffbvaTgmXSlII/r1jUC5Rhk5xi4IWRUxGeCe9ICEt7mLU1luoICwqQDuCdWxBmqoiyLiejI6JSD4zQi6kg== X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1121; 6:CPV8uQztpTmezf5jxCIZSpqXq3adv9ih6D9dYfCzOWTeYyU2UaZbdsuyTbVBSQY85HOnXHrdDzNN+5PhUOGLRzAkDZuZhLw7KuypNJwESfTdM2uXKYLC3rv2/wrimBHVUkDL0Slb53rhsLJkXNBxaXC2/V+f//SqLQOFZDM6cYuGwnIxioDtg7ZsQimVadMOHIrFVYfnLaCKL6nDliGXpX7G850L34/KidCMSbsrPfpwWF/DfEiKIOESsnYJzBVV/KoNJQcceHYysAseERgb8hK05LT1J4anayobBK+/G7NY4K+tshRydfnCg558GQ9uvBzRHL+pfFLb64DYH7upxQ==; 5:SSnruznjo4beRgbKITYh+IRdfTi0Ox8Mm8VO6QZjyA+c8E2PTgP9j8uv6oYUCniQk57OTiSi6fCLwpzJFRsHZ+/+A9xRtiEasxXB6d2KfrrvdBmPqhzcuM+8DrRk4ojDyMVIPAxJNLstvEY5XlIo1g==; 24:Vq2LdqNrffu9y55mXCDztbBU5jWnLeu4tvRATH84jkoITuG8DiiK6WJzVvRB9KdIUmfoTLZXfAbQwibcI2cSWkb9N/9Bg5ZLj3LJYCy9BYY=; 7:PTJRe3e0k7eR4MfSo6zjbe8zq2daS+xaz8tGl8ZLu7fYgnihLo6/nJk9gbnYssDy1p5E0NJLvN8u5r4VwoERJH/tuo7mBb7tEdXmWuNMRDjCCA1xY/LpsgWgULvKP6jDkNitpnU7UgNGhSqGUL1Ql641A7yAdxZzqYid4MkH/CaS/Nk1HOk2ZmQ5lQ7+ngm5Am7EqQWJUkoxro7tLr60c8uWgtImWKCCVLJTkGbDaWA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 21:04:16.6725 (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.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB1121 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.66 Subject: [Qemu-devel] [PATCH v2 2/6] xlnx-zynqmp-pmu: Add the CPU and memory 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Connect the MicroBlaze CPU and the ROM and RAM memory regions. Signed-off-by: Alistair Francis --- hw/microblaze/xlnx-zynqmp-pmu.c | 65 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index fc3c8b236f..33584cfa4d 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -18,8 +18,11 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" +#include "exec/address-spaces.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "cpu.h" +#include "boot.h" /* Define the PMU device */ @@ -27,21 +30,51 @@ #define XLNX_ZYNQMP_PMU(obj) OBJECT_CHECK(XlnxZynqMPPMUState, (obj), \ TYPE_XLNX_ZYNQMP_PMU) +#define XLNX_ZYNQMP_PMU_ROM_SIZE 0x8000 +#define XLNX_ZYNQMP_PMU_ROM_ADDR 0xFFD00000 +#define XLNX_ZYNQMP_PMU_RAM_ADDR 0xFFDC0000 + typedef struct XlnxZynqMPPMUState { /*< private >*/ DeviceState parent_obj; /*< public >*/ + MicroBlazeCPU cpu; } XlnxZynqMPPMUState; static void xlnx_zynqmp_pmu_init(Object *obj) { + XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(obj); + object_initialize(&s->cpu, sizeof(s->cpu), + TYPE_MICROBLAZE_CPU); + object_property_add_child(obj, "pmu-cpu[*]", OBJECT(&s->cpu), + &error_abort); } static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp) { - + XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(dev); + + object_property_set_uint(OBJECT(&s->cpu), XLNX_ZYNQMP_PMU_ROM_ADDR, + "base-vectors", &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "use-stack-protection", + &error_abort); + object_property_set_uint(OBJECT(&s->cpu), 0, "use-fpu", &error_abort); + object_property_set_uint(OBJECT(&s->cpu), 0, "use-hw-mul", &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "use-barrel", + &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "use-msr-instr", + &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "use-pcmp-instr", + &error_abort); + object_property_set_bool(OBJECT(&s->cpu), false, "use-mmu", &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "endianness", + &error_abort); + object_property_set_str(OBJECT(&s->cpu), "8.40.b", "version", + &error_abort); + object_property_set_uint(OBJECT(&s->cpu), 0, "pvr", &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "realized", &error_fatal); } static void xlnx_zynqmp_pmu_class_init(ObjectClass *oc, void *data) @@ -70,7 +103,35 @@ type_init(xlnx_zynqmp_pmu_register_types) static void xlnx_zcu102_pmu_init(MachineState *machine) { - + XlnxZynqMPPMUState *pmu = g_new0(XlnxZynqMPPMUState, 1); + MemoryRegion *address_space_mem = get_system_memory(); + MemoryRegion *pmu_rom = g_new(MemoryRegion, 1); + MemoryRegion *pmu_ram = g_new(MemoryRegion, 1); + + /* Create the ROM */ + memory_region_init_rom(pmu_rom, NULL, "xlnx-zcu102-pmu.rom", + XLNX_ZYNQMP_PMU_ROM_SIZE, &error_fatal); + memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_ROM_ADDR, + pmu_rom); + + /* Create the RAM */ + memory_region_init_ram(pmu_ram, NULL, "xlnx-zcu102-pmu.ram", + machine->ram_size, &error_fatal); + memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_RAM_ADDR, + pmu_ram); + + /* Create the PMU device */ + object_initialize(pmu, sizeof(XlnxZynqMPPMUState), TYPE_XLNX_ZYNQMP_PMU); + object_property_add_child(OBJECT(machine), "pmu", OBJECT(pmu), + &error_abort); + object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal); + + /* Load the kernel */ + microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, + machine->ram_size, + machine->kernel_filename, + machine->dtb, + NULL); } static void xlnx_zcu102_pmu_machine_init(MachineClass *mc) From patchwork Fri Sep 1 21:00:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 809001 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="mUl+y1F2"; dkim-atps=neutral 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 3xkWyF2fkFz9sPt for ; Sat, 2 Sep 2017 07:06:45 +1000 (AEST) Received: from localhost ([::1]:60620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt9H-00021Y-Dv for incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 17:06:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt7H-0000Vw-MW for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnt7G-0006ur-LT for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:39 -0400 Received: from mail-by2nam03on0042.outbound.protection.outlook.com ([104.47.42.42]:45690 helo=NAM03-BY2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnt7A-0006ob-5i; Fri, 01 Sep 2017 17:04:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=P5OShS5KdOQE+i7mWTXki63poW5uo8nxMIid7u6qqNQ=; b=mUl+y1F2NcNojKZcZe9M+irhXaK+14AuE53vp72M9pirR9huXoorTJbvWuFeNtWQ4uaC/jx7hRX/8SYm/K9nS6XUWtW6UoEj8N/BLrz2NRwaom9ZlUw6x8gRg+sL+TYach2R+IqQldAEhx14Ly6Q3iMWlzCVSQcvBP4MRRuCksM= Received: from BY2PR02CA0114.namprd02.prod.outlook.com (10.163.44.168) by BLUPR02MB1123.namprd02.prod.outlook.com (10.163.79.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 21:04:28 +0000 Received: from SN1NAM02FT016.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::207) by BY2PR02CA0114.outlook.office365.com (2a01:111:e400:5261::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 1 Sep 2017 21:04:27 +0000 Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT016.mail.protection.outlook.com (10.152.72.113) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 1 Sep 2017 21:04:27 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1dnt74-0004gP-VG; Fri, 01 Sep 2017 14:04:26 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnt74-0007gz-RY; Fri, 01 Sep 2017 14:04:26 -0700 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81L4FdV027538; Fri, 1 Sep 2017 14:04:16 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnt6t-0007f0-Sz; Fri, 01 Sep 2017 14:04:15 -0700 From: Alistair Francis To: , , Date: Fri, 1 Sep 2017 14:00:40 -0700 Message-ID: <26b702658b5bf9984edaecb22b1190be0a9d7052.1504293917.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23296.003 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(76176999)(9786002)(50986999)(54906002)(77096006)(8676002)(2950100002)(81166006)(6666003)(81156014)(50226002)(106466001)(33646002)(63266004)(5660300001)(50466002)(2906002)(8936002)(36756003)(48376002)(189998001)(5003940100001)(118296001)(36386004)(478600001)(356003)(305945005)(39060400002)(626005)(47776003)(4326008)(2201001)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR02MB1123; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT016; 1:vBw60s0keESfnk5zigd0wXM5JqezKAb6CAHdkuhiLn7YNs84iy5zdgzglsOplypIwMUz2fTPzLvyk4TmJ0soejl76acvGNfSTPwGRgkyeycSxo+QQbYMcFGr8wDzT102 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3dddfef3-004b-4751-9a77-08d4f17d0857 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR02MB1123; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1123; 3:/t04mMrtQqptX35hZk6V+IPbdIvh/UFsGAZwlDMMj6vOHmhtFXgrjj6TheX5HcjMjb6sBaRCcugz5QyF1hzo+jMwBuSoY4RCkwyVVx4b19J5/u/Nv1vdfWi1MO5E8/kKGL+QFTxFKfHj79j02WHQpPeUvhB+OxeUgafPQFlrLGPMUPuy6awwm7tt7lZLUCUFpHM3ppp0CG0N3xzofBeYwdTAC2+V2eSmT8hRJLvZsmhKb8VpG0VRpe3mE4P3PHhNu3ASOYrELuPLy06QuWsAd7wRyzqHnnKhTuX/VLj6l0u6AeZoBOw7sAcyz7gZuBxdcXD8ZXVE6lU/i24q7/a0xbYWkbiZbw5k35BQCOzgXm0=; 25:IMC0dBeKjR/QmPyVQDW3GuVpedfD7myV2YHlPf2YZ1UskbnKOZzAm5dr/cas1Yo/Yl/HeZUqTfXB6YpxlfJpvAsKpqcUVTW5T7rYdF7Fa3qxrAUmyUADfWvG30Iz+cBas7GCSoVnhd/ZHc4nDWpjq4bhVwDZDy+b5oWpf7TQZTk4ISKY9iuUtc9AQr6e2OuBMxcqFCOo1KNE3fgLgXxqWAZ67duqQV4qV8I6VEbtj2j4KLp7W+6MltJRFfarPy4OEIDmJyg0642qdEh7bznalh3KlPZtMexNuW5fUOnhGmmbyuLu+zD7dKG6Pou5t2vpD7g8VhNWirpU6TIzzaCMcA== X-MS-TrafficTypeDiagnostic: BLUPR02MB1123: X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1123; 31:EpsvIH7tf01+HFQSTJvYjItm3aesV6hBDYAkIbUlIq6TzNgWxwU/fEyFghRcvZC81795OhZNWx4wvQTDF828cA5v5qA7Z0uVjfLPNkn+3gDY4O7+Evu2dGXFc8p0BrRllgqXsR7mrXQLOoXYgL7jglOhqv6Cpd/Ml7V1egMUKFk29/jaTg1oQnf152eGvy8ZUBz2wTXvIns9YdORJr7JwPfX4oIZC7y3KFMXZiddlv4=; 20:m8bT4kmr3F5+zKPNtU1ePO6IpUUKiT3zEDx3JZSr5aNjpA3ukRi97oR3UloGm/SYXwYYykkfKniw3PrvuL4+no9Of3fUu9cKLzA+sNQH1ie1nAztekeqAIJQe5NxLpuTBeRe+lYUirY59fNhuQ61uPReC6y1pHpd2iCRatVYTxtAybqMahF3eup5etLTPiCHF6kQjOoixalOLMbMSuqZlgmzMqZk/BMQjzFQA7Lpq7C1OCUXvI2iOY9QsBvfGApMNI/bX8exk+agZ6lEWuEa0dLBpHMNzU+uxdhy4DlY4FBCL7ohm67LwcnAoizliaM8Fj6CGQT+aYznicSLID3YJNnuD/8uf/F4na8qOujwY7KI4LpWY4lo/LivuleOwqschpLP6tFNZbbnKwksYqIIiW4Q8Rp9wu/WiMa3872tNB+jAPzO8SYLI/uwLdl7z87o7zfe/rLGX8R+Ivj3esZsrH5l4UZkAg9Jojqf7TpDvdTWc8A6oii5RWIyyOS9tXtd X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(13016025)(8121501046)(13018025)(3002001)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR02MB1123; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR02MB1123; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1123; 4:SJkxoqONo+Uo39+VFF3fhuNihe6o0JrBMWgBEXbopEDNxsFrBxedzP7db30h7Qvlhhlia57Z4P6WfZpiDJT5JoFl6+3ZK5rtzoDAnM1CBdkdVVtd1V5CIbJd+E+VV8SIsTZWwURRg6PN5pfK4fSDJxqGIViBAtPV9QIFkqOl7P7fQOU0+s1gg+OFJoKKCl97m0tnh7yykTFjRs5pPsOzIZrGQ4NrEC1e0EmM3TC+FTYiJn1o2+Qiw8y00H4NbVi8YyIzXvUIA0bHUBQLHf0PBHKVLyqGuXvO7ThevQ3Nqmo= X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR02MB1123; 23:v8auP9Qjd8LBsrrB/qroTQ1sr1obgOUtOl9M1Ek32?= uktCofLK+5ZSIFdz8xulzmvERSDNPiF7Mgpkt1FHSIyvHVy6lwvkfJWG5yZusRjpkb/AR7WIu1u9T0t2wzgrsavETPQDlxmYogm43s3tmW0rgVKPc//5ZMWQcZwOrnBN63NQIwt6NvX6LCWk6O/aFXXZA466DttwLZcBtNF6tZCCS8V2kvHQHwvGnDXgK7VhQabiMm+HqWkKhIxoqEpAT0qNj/EOL/X4t366PyiOIuDnMKRuUD+/kc8SivdLYeIjmHF/vWAD/0+Cj6BUZ2Rk+VDrMlHQHb5TrrA1xutNwHdc/it3edVzYMEerxLSiMZ3hz+Nr/8iEzRDLSN62b1Fn0SmufCxdXpznDvuddRfvNDgDytUeu7y+/ZZDkQUqyHaTdrKFcNUkHdx377ffqyAUAA42ozRqaLPp/VeJF/K3LfUWDU6VvkAXdjCSKc/OrvfCLZRGgj0JFCHIyYhajiSgV8wG4NFwusAfM0HRForEqYxI0YCdHdULnk18pc2l7Ve4ZF8o5JkvUW6qYECuE/ABY124Pw6FWXZOA6IczNMgYXF1eH4krP4+ycxs3esQlnpXYNiPZK4AdpRw9NFyq1LN98b5jcz3pSbI/haOA2hq4rvgcxyJhRP4/JUFngdELVWCQrEeF0CHBeEKztAYNAnnvfijemrFUpqhWbcdmfPFjL0q70Rr6/wbwPrVmVwx43owaLHxXF0JUMc+ADMmdBMznP2ciZoKuMotLhvWxbXCWMKxdP09U2zpq90RGMhaL8NcJnR6MJvBOBIdbL8gC+JMSq/nAjxRiq4pI7RPjeGQIL8iYDuLT3Kk7HShGJis5N/QwriFNJQeJJ/Cosb4RlZ3Xi5CL2RYFt6Z32Z5DG2f+yKbBPgGDSsX6YvEiwa5EYRMo+v1cEPgoHBoilS5SqiuUsXWIJjEmQ/FbD464uIARHMr/X0YRG7TlEIR7b1rpnpJE= X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1123; 6:S+7RqP0liMS4etnC7vP80rsNNiYBF8M8m8AxGQgpK1ARZSKnu8UlFi5j4ndOzU3O+G5tY0VnLQ8HYFiw6dBdHFUDPPeoaep6jylXryeBRNa5d52XCVSsYdsi/OREe1fW6i77k77Bpv038GgSNWeaju84x1/dLpO6xoLptwuwjKriVfiMXqccPsFXZGkjURINWaMo0VEnyH3PpmS7O/AwOa6JltjvIn0P53lxDhQqekuVaoqdCnDomNbzwB7fgsesM0ILWOGiBG0k62qqWQYYv+xgolFgnmEgZjALd3ojD1gA1gaJEdvbo79w1dTpHtcB0orsMISX06Q9gFFAFxgNvg==; 5:Wq8oEZ2ROMuFC6DF/JZnYB8iU8zazoIM9Irf5UysNZXBQDylSsWbtMs397447mgsz/osLrWAaCa5mMEqxWbG62XkFM5wvLT+N34E9EtiQkAt50aSgxZMBUPmPP80DD/9lK6Ha3hTXzC71b4BZuDRrg==; 24:Q24R1rpBgI7lx10kZHYrpU1ooG5Ema2JeCVn+mg1gwNZoPeRM1/7rYZ2deW2M6kzwGC/TjRb/p/XCzY8BEjRi55peLqzoARjU6MqyLgnIoI=; 7:TrhEJnY0F6ceEjm3s8ewV+0Sz/0HwV/PatFBx4dgaNq3gj/LcE9TOZZuDlbz82rX0f6ZpHxQWMM8JFy1dsrRSH2HTh1h4eMYaBS+QgmHOMOgPZfPLSqMnZfFo0JEVoKQmlDrBg54q4k5Xaeiu/wWnYkrxcGNGmncPdWIICf/58S+SEAnCOkkAWaWw6wojARS6ZKmd1eLCGeJR248NiBPTlvVX6T3sR5KjtBUBvWcPRQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 21:04:27.7372 (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.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB1123 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.42 Subject: [Qemu-devel] [PATCH v2 3/6] aarch64-softmmu.mak: Use an ARM specific config 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In preperation for having an ARM and MicroBlaze ZynqMP machine let's split out the current ARM specific config options. Signed-off-by: Alistair Francis Acked-by: Peter Maydell --- default-configs/aarch64-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/display/Makefile.objs | 2 +- hw/dma/Makefile.objs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak index 24494832cf..9ddccf855e 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_AUX=y CONFIG_DDC=y CONFIG_DPCD=y CONFIG_XLNX_ZYNQMP=y +CONFIG_XLNX_ZYNQMP_ARM=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index a2e56ecaae..95daa67836 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -13,7 +13,7 @@ obj-y += omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-ep108.o obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 551c050a6a..d3a4cb396e 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -40,4 +40,4 @@ virtio-gpu.o-libs += $(VIRGL_LIBS) virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS) virtio-gpu-3d.o-libs += $(VIRGL_LIBS) obj-$(CONFIG_DPCD) += dpcd.o -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dp.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs index 087c8e6855..be98d5d3d8 100644 --- a/hw/dma/Makefile.objs +++ b/hw/dma/Makefile.objs @@ -9,7 +9,7 @@ common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o common-obj-$(CONFIG_STP2000) += sparc32_dma.o common-obj-$(CONFIG_SUN4M) += sun4m_iommu.o -obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o From patchwork Fri Sep 1 21:00:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 809005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="sSwhiMRB"; dkim-atps=neutral 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 3xkX4d3BFSz9sPk for ; Sat, 2 Sep 2017 07:12:17 +1000 (AEST) Received: from localhost ([::1]:60861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dntEd-0006le-II for incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 17:12:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt7P-0000cT-8z for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnt7K-0006yz-7z for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:47 -0400 Received: from mail-sn1nam02on0081.outbound.protection.outlook.com ([104.47.36.81]:39053 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnt79-0006nz-AJ; Fri, 01 Sep 2017 17:04:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6s8IlTG7rJAoxlkF/dEU8PPQJ/D0rkbTxO/7xjwCW8Q=; b=sSwhiMRBtmOTeiiDZDPp9Hp/ek6eusZNdvjQuXpb7/z7hU7CcpbNkosfDr/9a5sHe2kBNgVIeG1LY9EUyOz21ejP/myCwyM3LI1aG+EdZ6F9tKC0jPpCEIQjfQ3bk2Rh0hXdP7XX50z/yFP68e3j0XU96K7+2d0nxBGymcCgO2Y= Received: from BLUPR0201CA0020.namprd02.prod.outlook.com (10.163.116.30) by CY1PR0201MB1930.namprd02.prod.outlook.com (10.163.56.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 21:04:28 +0000 Received: from SN1NAM02FT060.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::200) by BLUPR0201CA0020.outlook.office365.com (2a01:111:e400:52e7::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 1 Sep 2017 21:04:28 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT060.mail.protection.outlook.com (10.152.72.192) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 1 Sep 2017 21:04:27 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:38307 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dnt74-0002QH-Qs; Fri, 01 Sep 2017 14:04:26 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnt74-0007gz-MY; Fri, 01 Sep 2017 14:04:26 -0700 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81L4Ipr027555; Fri, 1 Sep 2017 14:04:18 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnt6w-0007fj-BO; Fri, 01 Sep 2017 14:04:18 -0700 From: Alistair Francis To: , , Date: Fri, 1 Sep 2017 14:00:42 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23296.003 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(189002)(199003)(50986999)(76176999)(118296001)(6666003)(2950100002)(63266004)(5003940100001)(33646002)(77096006)(106466001)(54906002)(189998001)(626005)(478600001)(36386004)(9786002)(230783001)(5660300001)(356003)(305945005)(81166006)(8936002)(81156014)(8676002)(2201001)(50226002)(50466002)(4326008)(48376002)(47776003)(36756003)(39060400002)(575784001)(2906002)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1930; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT060; 1:Z8hA5WCVrmLG+Ki6l9ix8nyebIZoWmI1fnqm6NJFJhTCHpLd3VEzHUvR9lYdpNYrpWqGAFOD8PmAJykdiWAa4WykzgQ7nDoqVPe5x2XoraV08r0BdV4SU1WZKVF9MXMx MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 976f1976-ad2f-4a07-ed83-08d4f17d0832 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR0201MB1930; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1930; 3:b451EjS5aPyfE6NZ3Dwb9c3f5rDAQX3eIDR7nFDPGVfw4gdHV3hS1NaXVylfKNAK1ia70XTVkyeudu3tb8IfifSmU9hUp1Lnio3slxedD1rmwpWyCuStwFBUti2a3MxZTrO5a5Tg3NtHMexFRl9YS1ItFIapeWDicl7P5/K+x8pcF5Mww6FRAM7uuNkI0nQRmEPXKFULdqmmPDyOmRGviriusGlcEGVBGLmEZRww2MPsydj0So+XCzPdga7hYtweHvxjKoPQNuQKuIqHqhqWlo8MADMQqkvrwGOmIyT0445cCb+CdokY0tuMlHCH3lvVoMpKT5forl0NEhihG3ocH5nTJMTXXN0j/7yGpjuQIlE=; 25:0KHGhBAHQFt6phm79jinnD/HxAFdhulP7m4z/pBgoupsbnZ51domO3BYRmcO0xAadbikpftpCMGD++xQurq/LMoMRu6JIXGggXBCUxTzQAOlRTXWmzIKgadm9zKkMiLzWdIfumF/RMjifffz6F3YYPJf36qeruvP2oP7ZlOtLzIoxRcn4zeijPHeaiKqJydZz6MjEzn4k1ydZMuNcEFM4z6yDK+5tA5Q01e3L9fTG9QuX4tEiykSb4MF972LtaEwJ1CpLNFXQJwZbnCWrOn15mpVH/XKh3wLkboPB8e/ij5JSv1/B2bGQaQXUKQ95+pIe79m7a/IQdKkjDIgg+CrHQ== X-MS-TrafficTypeDiagnostic: CY1PR0201MB1930: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1930; 31:C8DZi8N7WXD6YoieiUFGz2OG0lq7YZLpoF50IhJYWjr5P+VNr1togmTYrdhHZC1dPZ99F9lyCbR7SCTObfhSFkfDQF44dqxqJBD0vyqf40fsNkcL50SlfMtCIxZTY3vmOy0KUsBm5xSKINtjjKQlsV8hsIN6oHSUBEFPv+cFW4GHs2rs2k93xppcQWxu9HrLbmSkukTjIFASoTwF9yy34PCHzVyxaa2EUZVKMwZ+DyQ=; 20:oJSIIcCucpPNQ15B/Zi1GTDViuE2YYrJAx/MOg6tmIZYZJBertBBlmROaYaG6iZcVXXqjvF3HtwoXveTGks+6EUOESCsg928sWbVqbj/WxjQDnLTqD1198lJndh9/5v1ekPXX8JaFaGVaOes9GB+l21E6btTcHLHgNIux0q8qQlP6JrxHxrY8rJriFONvux3ak0FPwCvPsqmk5anjZlpLbYQw8UrF3OfjDRz/kvtGH/M9UIUfRjkJvKY9Y8EksFmtfavxVq0s0pFyiFqMTTknjseEXDp25+AZPolUrNmLbK5bvtQTgq+sFBJXmUGwWysE31WvAW1rduYk33J/TRFGXZj32hZWCFa2YiRn4Y8DVgvYiGuOXLbSq/lGfieIjdoluIcbjohMPBCyVChXepte9syC1vSlhsxUco8uXF5WwXZ4LGw66dgV54QN1CwVnCE5Picu9oDM6gSN0vm1pzXK8oF3TOqn6yUTjdVf5/tDifFJdwU3iCf5W3bPuN+6yv0 X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13018025)(13016025)(100000703101)(100105400095)(10201501046)(93006095)(93004095)(3002001)(6055026)(6041248)(20161123555025)(20161123564025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR0201MB1930; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR0201MB1930; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1930; 4:tOXbp7NzD+OlNrQwK8k7mRZJ9RllOIk1gXcjx9uttYbT+UmdwtSRsa7UXMVa5x5sM3CRo3RtsppB4XhY3rnHGTqffyeyZV71jzlFi2ARJwTtPDCVyDAcAyxuO3JCoNewO18ecTI+xVjSqSvshnQawzrwQyzIMI5mZwPduqsPFQNrN2ucy4Qkgjy56KW1EflVOhYhZvYtyXBAq/m109u4zio9mRBvv7og6sY89LWnJbqW+KA87/zoS9EixtNn2T7bzkBBXdOtXyvjWHT2F/XNLE6evEcvjKLrLB6OfHnl64A= X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0201MB1930; 23:8CqCx14qZjyFgQFm7g7Y5lE0/w2nA5ki8mFNYoc?= F6f/EsJV66chfRVypYDdVHiAoTB5HOX17dAPQORs8OgNbFKa5OB9me9rgdDGiZeRTexvsvJJFyEDP5ZHodhVyZGa2K+Dj1egOzqiXT0unwpBXrof4o+Bs2UG4/xL1d8TbeRe7qa4L98guYyeEXTTujc2gwVDFP5SOiHKzQZQeUpnXJeHvuImjQgW2DAzI1qnCw0DoA3ry+ybzqG4SwFqcSTUuJZZWjFdyvv6I4j+m5pexDRfOcHDeQilSdL6cDohffaLNHYj8zaAOvCJyKNMTUu/A1tk+7WaBt/ZHmt9QOSBL3xMlKGLbmW3XPJwKUHTkSzqhgeNffvN1rjx6N18Mpn8330RxZQkr4RNpiBDb/Ov2c1MjnAp2ZbnQ1iEExUt+qZ+IrlGxdgaGq6Wp3KXlQfmdV3wu6OBpHsohM9mjAZu0TPFIWzEA2LuppHmFs9quRhZHyXXAkNPYknQgJzSz8PMncaoDNrr9RyV0LRtuKaECwtJJmX2Wix8eVZRu/4YSUdp5v6qPi8jAoisXPC45F0vYaV/xmZZGMb3XoUjrG11PVGu663fHU8VyeyAbQ4VQxHzBYrCK5G1OP68EnQKB1mckHqqKLHAy2tJylc81sdf71qB2Q4QrOP9F5JxqqNCsOuBfbbuhm771uPSUYDkhH6LeW3u0vEaWf+sIiDId3F+XHfC3icWbE2S0qsl5zA96m5106xva5QYKiLijbWuY66F7PJ5EqlcYyLLljroKKwvhw0cllJy68NipSHTOQvTqJwd5ZmDhwI923y2s/aukFiuyde8n2+BYjELyQzLO1vHZ9858y7G+tMz5wH4DD1oNxOHId/4fL9l+i5ORhR2bk3zQvJSzGFn3M4nTGkzy1TFEYUiW+u7cECpsIGEywc3865PdyRy/nmjDhU90RD2zYA6186fLS63t/riGtCMMIy6B9hVGEyPAGfx5koJ+CsAAr9rSUs3d8bCkDB2nbVIKWiv5S/Jej/6Vb2nLRKG55A6dz5FFK4heY1V4Zuo4THGnirQ= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1930; 6:JbDik1vE1Vu6rF7AuOc29zXzdCr4a55Y1oAo2C0qhmP3T5cKd20Y6do+F4jRI2GafG3Uc5Tqyd+uuZ2vpd/zTcdZN6hyAADP+4iTZ9gJMXMRsZNKQhO8oTjPMxQualu/F8ZTRCPJ1ydatBbvLuea5Dx9YGyjM/diDUq888kA8BtXAPVZ+ntp8/cIUNnWwjpxIFpXVDIVVKPPwKXa6c9J/0wEIfnoz7KPQam7TwdkoKByoP3JDF5lY7myw8loMv4d59uFW4t5usGr5u70n7/4q7YFrko47ifCkhwhDuQSwxYxlixglaApAZkmNNH0PhLZV8NNn10/JoBIg37cFbEiyQ==; 5:pOR2OLk+VPL7Yu8EKcm3OHbLbmSl6589AfB3jL16o3bT63QxLhpF3KJojKkZvqhoJ8F4eCyNU/ANK8sl5TfdaAY3gEnMGnrOprHzyLyUFSeB5FYhcv4EOG8N9aML3uskmjt/nYIEys83t7E4N5nnLg==; 24:hOvB6rUduVt3YFey1P57x904QtdNkzs8yPKP1LjdiH7YZOyFSbccFUmiuLk1kvxQ6vFRt0fOqwbaG/lyS0UAtfRl5TYFQFKiYT7toUxFfXA=; 7:DT+EQz/xlgkra5d2+B9KEEzOWxbGD0ik3lHp+zaJFQD2txbtkc5E9GwRtQlsM1cwOjt2EJKHb8hBvjERND0UrT6LyQ/4f4jZFwscS32lGzvLXsOYpAIpjIGvE6T9qkqILFoBSPMC1PYE7Tywc3qNeg4RlNZcyaJyMw8OgPDLTPdx75klnEUUYKoS8UBOexJ9fqO3du44C7Hzg7TRs8eOYEZ0CazM7VflR+0Laq4fcVs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 21:04:27.3718 (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.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0201MB1930 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.81 Subject: [Qemu-devel] [PATCH v2 4/6] xlnx-zynqmp-ipi: Initial version of the Xilinx IPI device 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is the initial version of the Inter Processor Interrupt device. Signed-off-by: Alistair Francis --- default-configs/microblaze-softmmu.mak | 1 + hw/intc/Makefile.objs | 1 + hw/intc/xlnx-zynqmp-ipi.c | 377 +++++++++++++++++++++++++++++++++ include/hw/intc/xlnx-zynqmp-ipi.h | 57 +++++ 4 files changed, 436 insertions(+) create mode 100644 hw/intc/xlnx-zynqmp-ipi.c create mode 100644 include/hw/intc/xlnx-zynqmp-ipi.h diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak index ce2630818a..7fca8e4c99 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -9,3 +9,4 @@ CONFIG_XILINX_SPI=y CONFIG_XILINX_ETHLITE=y CONFIG_SSI=y CONFIG_SSI_M25P80=y +CONFIG_XLNX_ZYNQMP=y diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 78426a7daf..be3a1873d1 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -3,6 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o common-obj-$(CONFIG_PL190) += pl190.o common-obj-$(CONFIG_PUV3) += puv3_intc.o common-obj-$(CONFIG_XILINX) += xilinx_intc.o +common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o common-obj-$(CONFIG_IMX) += imx_avic.o common-obj-$(CONFIG_LM32) += lm32_pic.o diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c new file mode 100644 index 0000000000..6203b27e56 --- /dev/null +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -0,0 +1,377 @@ +/* + * QEMU model of the IPI Inter Processor Interrupt block + * + * Copyright (c) 2014 Xilinx Inc. + * + * Written by Edgar E. Iglesias + * Written by Alistair Francis + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "hw/intc/xlnx-zynqmp-ipi.h" + +#ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG +#define XLNX_ZYNQMP_IPI_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do {\ + if (XLNX_ZYNQMP_IPI_ERR_DEBUG >= lvl) {\ + qemu_log(TYPE_XLNX_ZYNQMP_IPI ": %s:" fmt, __func__, ## args);\ + } \ +} while (0); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +REG32(IPI_TRIG, 0x0) + FIELD(IPI_TRIG, PL_3, 27, 1) + FIELD(IPI_TRIG, PL_2, 26, 1) + FIELD(IPI_TRIG, PL_1, 25, 1) + FIELD(IPI_TRIG, PL_0, 24, 1) + FIELD(IPI_TRIG, PMU_3, 19, 1) + FIELD(IPI_TRIG, PMU_2, 18, 1) + FIELD(IPI_TRIG, PMU_1, 17, 1) + FIELD(IPI_TRIG, PMU_0, 16, 1) + FIELD(IPI_TRIG, RPU_1, 9, 1) + FIELD(IPI_TRIG, RPU_0, 8, 1) + FIELD(IPI_TRIG, APU, 0, 1) +REG32(IPI_OBS, 0x4) + FIELD(IPI_OBS, PL_3, 27, 1) + FIELD(IPI_OBS, PL_2, 26, 1) + FIELD(IPI_OBS, PL_1, 25, 1) + FIELD(IPI_OBS, PL_0, 24, 1) + FIELD(IPI_OBS, PMU_3, 19, 1) + FIELD(IPI_OBS, PMU_2, 18, 1) + FIELD(IPI_OBS, PMU_1, 17, 1) + FIELD(IPI_OBS, PMU_0, 16, 1) + FIELD(IPI_OBS, RPU_1, 9, 1) + FIELD(IPI_OBS, RPU_0, 8, 1) + FIELD(IPI_OBS, APU, 0, 1) +REG32(IPI_ISR, 0x10) + FIELD(IPI_ISR, PL_3, 27, 1) + FIELD(IPI_ISR, PL_2, 26, 1) + FIELD(IPI_ISR, PL_1, 25, 1) + FIELD(IPI_ISR, PL_0, 24, 1) + FIELD(IPI_ISR, PMU_3, 19, 1) + FIELD(IPI_ISR, PMU_2, 18, 1) + FIELD(IPI_ISR, PMU_1, 17, 1) + FIELD(IPI_ISR, PMU_0, 16, 1) + FIELD(IPI_ISR, RPU_1, 9, 1) + FIELD(IPI_ISR, RPU_0, 8, 1) + FIELD(IPI_ISR, APU, 0, 1) +REG32(IPI_IMR, 0x14) + FIELD(IPI_IMR, PL_3, 27, 1) + FIELD(IPI_IMR, PL_2, 26, 1) + FIELD(IPI_IMR, PL_1, 25, 1) + FIELD(IPI_IMR, PL_0, 24, 1) + FIELD(IPI_IMR, PMU_3, 19, 1) + FIELD(IPI_IMR, PMU_2, 18, 1) + FIELD(IPI_IMR, PMU_1, 17, 1) + FIELD(IPI_IMR, PMU_0, 16, 1) + FIELD(IPI_IMR, RPU_1, 9, 1) + FIELD(IPI_IMR, RPU_0, 8, 1) + FIELD(IPI_IMR, APU, 0, 1) +REG32(IPI_IER, 0x18) + FIELD(IPI_IER, PL_3, 27, 1) + FIELD(IPI_IER, PL_2, 26, 1) + FIELD(IPI_IER, PL_1, 25, 1) + FIELD(IPI_IER, PL_0, 24, 1) + FIELD(IPI_IER, PMU_3, 19, 1) + FIELD(IPI_IER, PMU_2, 18, 1) + FIELD(IPI_IER, PMU_1, 17, 1) + FIELD(IPI_IER, PMU_0, 16, 1) + FIELD(IPI_IER, RPU_1, 9, 1) + FIELD(IPI_IER, RPU_0, 8, 1) + FIELD(IPI_IER, APU, 0, 1) +REG32(IPI_IDR, 0x1c) + FIELD(IPI_IDR, PL_3, 27, 1) + FIELD(IPI_IDR, PL_2, 26, 1) + FIELD(IPI_IDR, PL_1, 25, 1) + FIELD(IPI_IDR, PL_0, 24, 1) + FIELD(IPI_IDR, PMU_3, 19, 1) + FIELD(IPI_IDR, PMU_2, 18, 1) + FIELD(IPI_IDR, PMU_1, 17, 1) + FIELD(IPI_IDR, PMU_0, 16, 1) + FIELD(IPI_IDR, RPU_1, 9, 1) + FIELD(IPI_IDR, RPU_0, 8, 1) + FIELD(IPI_IDR, APU, 0, 1) + +/* APU + * RPU_0 + * RPU_1 + * PMU_0 + * PMU_1 + * PMU_2 + * PMU_3 + * PL_0 + * PL_1 + * PL_2 + * PL_3 + */ +int index_array[NUM_IPIS] = {0, 8, 9, 16, 17, 18, 19, 24, 25, 26, 27}; +static const char *index_array_names[NUM_IPIS] = {"APU", "RPU_0", "RPU_1", + "PMU_0", "PMU_1", "PMU_2", + "PMU_3", "PL_0", "PL_1", + "PL_2", "PL_3"}; + +static void xlnx_zynqmp_ipi_set_trig(XlnxZynqMPIPI *s, uint32_t val) +{ + int i, ipi_index, ipi_mask; + + for (i = 0; i < NUM_IPIS; i++) { + ipi_index = index_array[i]; + ipi_mask = (1 << ipi_index); + DB_PRINT("Setting %s=%d\n", index_array_names[i], + !!(val & ipi_mask)); + qemu_set_irq(s->irq_trig_out[i], !!(val & ipi_mask)); + } +} + +static void xlnx_zynqmp_ipi_set_obs(XlnxZynqMPIPI *s, uint32_t val) +{ + int i, ipi_index, ipi_mask; + + for (i = 0; i < NUM_IPIS; i++) { + ipi_index = index_array[i]; + ipi_mask = (1 << ipi_index); + DB_PRINT("Setting %s=%d\n", index_array_names[i], + !!(val & ipi_mask)); + qemu_set_irq(s->irq_obs_out[i], !!(val & ipi_mask)); + } +} + +static void xlnx_zynqmp_ipi_update_irq(XlnxZynqMPIPI *s) +{ + bool pending = s->regs[R_IPI_ISR] & ~s->regs[R_IPI_IMR]; + + DB_PRINT("irq=%d isr=%x mask=%x\n", + pending, s->regs[R_IPI_ISR], s->regs[R_IPI_IMR]); + qemu_set_irq(s->irq, pending); +} + +static uint64_t xlnx_zynqmp_ipi_trig_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(reg->opaque); + + xlnx_zynqmp_ipi_set_trig(s, val64); + + return val64; +} + +static void xlnx_zynqmp_ipi_trig_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(reg->opaque); + + /* TRIG generates a pulse on the outbound signals. We use the + * post-write callback to bring the signal back-down. + */ + s->regs[R_IPI_TRIG] = 0; + + xlnx_zynqmp_ipi_set_trig(s, 0); +} + +static uint64_t xlnx_zynqmp_ipi_isr_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(reg->opaque); + + xlnx_zynqmp_ipi_set_obs(s, val64); + + return val64; +} + +static void xlnx_zynqmp_ipi_isr_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(reg->opaque); + + xlnx_zynqmp_ipi_update_irq(s); +} + +static uint64_t xlnx_zynqmp_ipi_ier_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(reg->opaque); + uint32_t val = val64; + + s->regs[R_IPI_IMR] &= ~val; + xlnx_zynqmp_ipi_update_irq(s); + return 0; +} + +static uint64_t xlnx_zynqmp_ipi_idr_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(reg->opaque); + uint32_t val = val64; + + s->regs[R_IPI_IMR] |= val; + xlnx_zynqmp_ipi_update_irq(s); + return 0; +} + +static const RegisterAccessInfo xlnx_zynqmp_ipi_regs_info[] = { + { .name = "IPI_TRIG", .addr = A_IPI_TRIG, + .rsvd = 0xf0f0fcfe, + .ro = 0xf0f0fcfe, + .pre_write = xlnx_zynqmp_ipi_trig_prew, + .post_write = xlnx_zynqmp_ipi_trig_postw, + },{ .name = "IPI_OBS", .addr = A_IPI_OBS, + .rsvd = 0xf0f0fcfe, + .ro = 0xffffffff, + },{ .name = "IPI_ISR", .addr = A_IPI_ISR, + .rsvd = 0xf0f0fcfe, + .ro = 0xf0f0fcfe, + .w1c = 0xf0f0301, + .pre_write = xlnx_zynqmp_ipi_isr_prew, + .post_write = xlnx_zynqmp_ipi_isr_postw, + },{ .name = "IPI_IMR", .addr = A_IPI_IMR, + .reset = 0xf0f0301, + .rsvd = 0xf0f0fcfe, + .ro = 0xffffffff, + },{ .name = "IPI_IER", .addr = A_IPI_IER, + .rsvd = 0xf0f0fcfe, + .ro = 0xf0f0fcfe, + .pre_write = xlnx_zynqmp_ipi_ier_prew, + },{ .name = "IPI_IDR", .addr = A_IPI_IDR, + .rsvd = 0xf0f0fcfe, + .ro = 0xf0f0fcfe, + .pre_write = xlnx_zynqmp_ipi_idr_prew, + } +}; + +static void xlnx_zynqmp_ipi_reset(DeviceState *dev) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(dev); + int i; + + for (i = 0; i < ARRAY_SIZE(s->regs_info); ++i) { + register_reset(&s->regs_info[i]); + } + + xlnx_zynqmp_ipi_update_irq(s); +} + +static void xlnx_zynqmp_ipi_handler(void *opaque, int n, int level) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(opaque); + uint32_t val = (!!level) << n; + + DB_PRINT("IPI input irq[%d]=%d\n", n, level); + + s->regs[R_IPI_ISR] |= val; + xlnx_zynqmp_ipi_set_obs(s, s->regs[R_IPI_ISR]); + xlnx_zynqmp_ipi_update_irq(s); +} + +static void xlnx_zynqmp_obs_handler(void *opaque, int n, int level) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(opaque); + + DB_PRINT("OBS input irq[%d]=%d\n", n, level); + + s->regs[R_IPI_OBS] &= ~(1ULL << n); + s->regs[R_IPI_OBS] |= (level << n); +} + +static const MemoryRegionOps xlnx_zynqmp_ipi_ops = { + .read = register_read_memory, + .write = register_write_memory, + .endianness = DEVICE_LITTLE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, +}; + +static void xlnx_zynqmp_ipi_realize(DeviceState *dev, Error **errp) +{ + qdev_init_gpio_in_named(dev, xlnx_zynqmp_ipi_handler, "IPI_INPUTS", 32); + qdev_init_gpio_in_named(dev, xlnx_zynqmp_obs_handler, "OBS_INPUTS", 32); +} + +static void xlnx_zynqmp_ipi_init(Object *obj) +{ + XlnxZynqMPIPI *s = XLNX_ZYNQMP_IPI(obj); + DeviceState *dev = DEVICE(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; + char *irq_name; + int i; + + memory_region_init(&s->iomem, obj, TYPE_XLNX_ZYNQMP_IPI, + R_XLNX_ZYNQMP_IPI_MAX * 4); + reg_array = + register_init_block32(DEVICE(obj), xlnx_zynqmp_ipi_regs_info, + ARRAY_SIZE(xlnx_zynqmp_ipi_regs_info), + s->regs_info, s->regs, + &xlnx_zynqmp_ipi_ops, + XLNX_ZYNQMP_IPI_ERR_DEBUG, + R_XLNX_ZYNQMP_IPI_MAX * 4); + memory_region_add_subregion(&s->iomem, + 0x0, + ®_array->mem); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); + + for (i = 0; i < NUM_IPIS; i++) { + qdev_init_gpio_out_named(dev, &s->irq_trig_out[i], + index_array_names[i], 1); + + irq_name = g_strdup_printf("OBS_%s", index_array_names[i]); + qdev_init_gpio_out_named(dev, &s->irq_obs_out[i], + irq_name, 1); + g_free(irq_name); + } +} + +static const VMStateDescription vmstate_zynqmp_pmu_ipi = { + .name = TYPE_XLNX_ZYNQMP_IPI, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, XlnxZynqMPIPI, R_XLNX_ZYNQMP_IPI_MAX), + VMSTATE_END_OF_LIST(), + } +}; + +static void xlnx_zynqmp_ipi_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->reset = xlnx_zynqmp_ipi_reset; + dc->realize = xlnx_zynqmp_ipi_realize; + dc->vmsd = &vmstate_zynqmp_pmu_ipi; +} + +static const TypeInfo xlnx_zynqmp_ipi_info = { + .name = TYPE_XLNX_ZYNQMP_IPI, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(XlnxZynqMPIPI), + .class_init = xlnx_zynqmp_ipi_class_init, + .instance_init = xlnx_zynqmp_ipi_init, +}; + +static void xlnx_zynqmp_ipi_register_types(void) +{ + type_register_static(&xlnx_zynqmp_ipi_info); +} + +type_init(xlnx_zynqmp_ipi_register_types) diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqmp-ipi.h new file mode 100644 index 0000000000..4afa4ff313 --- /dev/null +++ b/include/hw/intc/xlnx-zynqmp-ipi.h @@ -0,0 +1,57 @@ +/* + * QEMU model of the IPI Inter Processor Interrupt block + * + * Copyright (c) 2014 Xilinx Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef XLNX_ZYNQMP_IPI_H +#define XLNX_ZYNQMP_IPI_H + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" + +#define TYPE_XLNX_ZYNQMP_IPI "xlnx.zynqmp_ipi" + +#define XLNX_ZYNQMP_IPI(obj) \ + OBJECT_CHECK(XlnxZynqMPIPI, (obj), TYPE_XLNX_ZYNQMP_IPI) + +/* This is R_IPI_IDR + 1 */ +#define R_XLNX_ZYNQMP_IPI_MAX ((0x1c / 4) + 1) + +#define NUM_IPIS 11 + +typedef struct XlnxZynqMPIPI { + /* Private */ + SysBusDevice parent_obj; + + /* Public */ + MemoryRegion iomem; + qemu_irq irq; + + qemu_irq irq_trig_out[NUM_IPIS]; + qemu_irq irq_obs_out[NUM_IPIS]; + + uint32_t regs[R_XLNX_ZYNQMP_IPI_MAX]; + RegisterInfo regs_info[R_XLNX_ZYNQMP_IPI_MAX]; +} XlnxZynqMPIPI; + +#endif /* XLNX_ZYNQMP_IPI_H */ From patchwork Fri Sep 1 21:00:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 808999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="P9PZlkzF"; dkim-atps=neutral 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 3xkWwx24fnz9sNr for ; Sat, 2 Sep 2017 07:05:35 +1000 (AEST) Received: from localhost ([::1]:60602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt89-0000ZW-BB for incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 17:05:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt7F-0000Tc-7f for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnt7E-0006sk-6m for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:37 -0400 Received: from mail-sn1nam01on0088.outbound.protection.outlook.com ([104.47.32.88]:11530 helo=NAM01-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnt78-0006na-C5; Fri, 01 Sep 2017 17:04:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=EMacYEwxJ8+u4w4EUG4eQ6ytZ4g2Igr2UDyPTuOmtFU=; b=P9PZlkzFRs2hYDrYvM8bbiP2HWKQJ0BlgYRPwqCV5lD5P4UZRhy/YXvYE8Os0Un5g7FSB4GySeTgZT+IRmEEFVMbpXweIGUsdK6gILYNXaAuDjh788DpWmPovYbi41IKW5ftfVlPF+JBljuigGvYxcfBWIXF3ShINeZZKW5BY7o= Received: from SN4PR0201CA0003.namprd02.prod.outlook.com (10.161.238.141) by MWHPR02MB2704.namprd02.prod.outlook.com (10.175.49.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 21:04:28 +0000 Received: from BL2NAM02FT025.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by SN4PR0201CA0003.outlook.office365.com (2603:10b6:803:2b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 1 Sep 2017 21:04:28 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT025.mail.protection.outlook.com (10.152.77.151) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 1 Sep 2017 21:04:27 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:38308 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dnt74-0002QI-RF; Fri, 01 Sep 2017 14:04:26 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnt74-0007gz-OC; Fri, 01 Sep 2017 14:04:26 -0700 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81L4LUg027573; Fri, 1 Sep 2017 14:04:21 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnt6z-0007gI-1l; Fri, 01 Sep 2017 14:04:21 -0700 From: Alistair Francis To: , , Date: Fri, 1 Sep 2017 14:00:45 -0700 Message-ID: <58a155d758561fd2011596b211db9080a78aa2ac.1504293917.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23296.003 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(189002)(199003)(54906002)(81166006)(50986999)(5003940100001)(81156014)(76176999)(33646002)(63266004)(36386004)(8676002)(6666003)(106466001)(9786002)(48376002)(77096006)(230783001)(2950100002)(47776003)(356003)(39060400002)(50226002)(626005)(36756003)(2201001)(5660300001)(8936002)(50466002)(4326008)(118296001)(478600001)(2906002)(305945005)(189998001)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB2704; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT025; 1:AULsRV5h5uYHFV+0/YIL8sxNjZ6bI/yqVnU5zgURICbkfXf3fRV/UeF0V6kTBtEscO1Q9iDFkjcZO1Bo1vCAFxKq/FPOv5J0gamsI+mjrSN8mNvfQ/O2m/HNL4PygIkM MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42559dd5-d735-4c6f-c617-08d4f17d0855 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR02MB2704; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2704; 3:Y37nieHpnUIacKVgcXZGFY7Fet7nxiaw/CLN22cK3T9gQU9KOEJJaMHxkxkLdkziKPbjBhEcu9CBIJTjyfLMQuRQa2vtrW7+dr/hjJbWNKJVmrkF0mTmzmEB3MA6BfCYJWqEtTmtnO3Rl3cnDAhXWPKjYYZwTUJU5GUuUya7Wl+GEq4u3Ro0q5bUuf7bi06/FBKq4Wiy6syLA8Skl5nb9T6XmDAB10rBJeQJ3KIP5mxtrrF0B0o5GhKi09Dwc1pg8CC+Pzut1BiSj/V0kRw+00iD7ohEAPLfpRD4xm5bwFy4TtTNBq8qvtY2nMaqVWddoqO4++0ZCaGtzG26ElaOaVrjiRF0buCGBkSUh6QnL1w=; 25:2hF0RyQ+reAD22DLROLoOYwwTfDRGM+P+qqWbNpjZLJoRNrBD2fC/XW99Upd9tQ2sN1sP5XjJ+guCohuPaMA8Y9CCqcwQRGPUIHhO6QfOCcd8fYTmbhI7m3Wgwel9wUjVNqkZOS5y9WPYq6YryiEkdf2JmOdZka963b8NWWvzgU+d3vrnTpk13ErTn7t5HVI8YFpDIf9D7zEIwoFakurH4O4QsMdklSldzMKtZUJUAC5dwyG1+u6NXcVBcnv/hhVZphBjYOcUbe89HGKnJS1JyV+i6ehmM7Jc4BJr7YgYl2DAjGUlHcgPy/y9e9ZvGLUpdrod0JnmUQ8qliRm8AOZQ== X-MS-TrafficTypeDiagnostic: MWHPR02MB2704: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2704; 31:EdhlL4yQogaJwODQCDLyPPISJB4KNaSTzRtFlCcDE1GQxErF+4/ame3e74WxmVD4jjVHOsGbXyw6BNvwBzCJyBho+WpYMZoSu930ZO94nMK9zxW1x7n7RxiIVJvSw8v7bjJMpFrTAIETxpFzwljzOvI6trHwOvaikpe6NC91YtMNfoiexZ5QJBQN+tyF4mQOynGmML5D+k43RFRI0Er8yf59qhJ5hMIWlZ/ybkhhtVI=; 20:3b1dMDzl5ts55lKZDjN4d9yU0WS4oeKfp7OrVhr2E5r/HglP0WtZigpzMuNZpLaq76hKMQHH6S7/fEb4iVXXuMWhZcTaB1yqJVTKaDizAJYJtTd2YO91Zodjtho0LoUSEj2hB1uWVilPv/OV9J+w33OLXEU/8j76LRWxi58nI4xBguRZ72eJEAmklqZgn/TMkj4CyxbZvkoQtgNPjmuD1jJxkajTiOfpzQhETK/pIfx3NDrlhLjVVILVE336QvYDMWz+0IuZE1d7W7LQ0syWZz+laQjKI6fhuODIB3n+JpU1UXHY8bMv8WvTqfRMnM5XRkgYM5N/R6j75mj6J3kBdMQWpT00rmn9xBnIvfkFvPQ/nhF9zcctAZuCQbWv2ivM34u2ZZPrx2oSDsvr4s1ktUE0FP8fQEFdVNP5Ok0sCL2k7SoJ7/0PSlAJNodhzuvz8iFabuIqQKwCczFUdiufB78ZI4QS0QSITfmIUtdL3NDXVmPV7qFucPA+E1d2ci6k X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(21532816269658); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB2704; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB2704; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2704; 4:s2RHzMgbKgm2Woj7lQcWh6vzf3klchcIMoAu7VT8Nyt4CS/kN6SLz3KzZYetN9+3VKH6v+V+hGqXsLWdkymuAimZFQ9/A/C9NQ6HEkwzvubj8U0+gVAwlRgXs4i1n7KnNBdzxp6xq4Mmbw14TdEI1YrY+onGr1IlS3USCK0tLtIX9oNHtp9Qx7QQ+xDall6tn9KDHN/1MlTUPnphb0rnm76nxs+XgLKWoUmq3XqKJxbkPJcDOTVEhgs8MsH1uN0j2zGRZwC1z7IXpN+JwvIHKtabV7mEIDhiYNK/V9Ucg+KqN9ut6UCZP4mLQiVSHeosUMaUIPXvoax15gNtjINfYQ== X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB2704; 23:zfQ/11tI5AousQyuV4Z2d9z0N86gX3Xw+cv4ukKUF?= INH29XIL3YaPL7zYaInbwn892V07iUuR4nrlF1OIy7A0tHYSxACLrB8o+GOrX6LoJI/DSb2d40RjV7SHI6lsj7QxSU9xCj+v7cwRFIWamCJX8p0lWQc4hwxrWWa+nqN6AimSt1JMZwOBzwPwPmUg+M2tRcOhcsaRgndQzfjM1y5kTXbVd0oQmrwqZFQEqj+wdqn0tozODJTKi1/noAsKnVPTJ2j2OOwB/2N/YrqTAefDeJoA2DnE4dKZFouIPMVhttWNQq+LFAqBoQIOBfuqnRzAALGnyp5/VUZUZXZLStTjnHZLWFC79apsS3MznvUKZb9Q/YM2thyp+4sbyEiIo7NeoQWBF7rl0MolLsatB1vWX0BRf10vMvIZiWhnasRmPStRe9/nT84JSat28JxOA/z/RZwA7TQZTUs07hm7bXXSYwxE/7gV1x9Z4nXYkemz6GEfgzCDlbboPvZSCTeJs6ekFStLhNo32HzYyXI9eN7jnXNq/6qnLmpNNWNJhrJEvPLm8huZNZIEA4sdNIipwqSkCFKCI6W62sxFWuly/UHXTBLqDgOf91nHNIWVRxajagL3uPEgXZEQtj2yNltYKt7Z8k6DXoYy8p4AvYQDTlL5Iplha2of7DuxW3Oxw0V65qrPFt+XL5TMGBknzvqoTGrVMiiNlEbl7Ebje7HPXbhbeBuNMrPaeNvhZOMRmKh3m+zWqphVavcRRSA6O33thr3zDvsFCcMRUZv51BkpsPBN+6/aezU2ytzlG4A5MSh8vbXd5KaDlYxptbnEtcP3tvuBi1G4WsiP+a2sJa13ywrPl40vF4vGpuXiG2mXwcOrwEuJfUTmFUK7Ma1WoMGcihV6D9ZYNEcOuISgenHCZPRg2zB+DUi8dGjEYf1gL57I5ZEhl6vi4abXVZkOTLPd4jbU9xJXfAheBOdKu8x4jXFivXA0t6X46npAo93IKvW7TiSK3o6VTANcHBPtoOE1kn1Eh8mDia/2AmmVkW7H0DVHQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2704; 6:CJvKsTkPfkcA5qmdPe5D+ueJd/KbDdhiltw0nqWpTfgGR0A7ZMXRaq1PG8PjK4bcidl6Tz8X4ewuNsfRrlSE0Gv10Mjt4d0HrikNj9O3RD01eBqwJ+1weheU6BE6cl9XTQLinEBQ1PC8SO5+8ws74TkZnBa3xYcWH99z8hYFzemlM4IldTyflvuRVUkwGTYUhkp0K/nlspMc35F61tQVuOcWg05J0tDUlxqDI2OxHNlytEb6b/n/MTpbyZy6KDsiGLf23HXjCvabGRcByHVnC65aYfPWJmxyh4Zzj/W3LoPG7ybL+midGEHXGMK+OSSJPcCUQJL2KQD9j5Vd3foTXw==; 5:/GzfbrtXL1hxs+OwHb7ht9TY9xsezasBVxwqhae8Y5mC1e9voyAWqNQ349OYfnGB7FyZG9uc9XAGmLwlPsboX6O28IreBf2HiRFF1cDnFfPPAshHG5m6kOwSdEEMG+CXucGNJVH/1N5FM4rQKcbbVA==; 24:iuBhdagwf0BJtpZbQsFYxAD0bCFEXcmD4PYQ0jDyGngR9oCBl/5ZUk3bBrk8ihrbgWVCD2ToQvug3DRqNodQWdyc5iKnmAu74+eyz7zyDBs=; 7:9e2RGjl1joWRTZUbFhzmRAzmnsoEntFYdkQCSF1rOAYHsyX5piDquXA7pyWceXVm3T2EHwdIH8UyREu+ldEn0PwRmjORQ6Gr9UqXs74EG0CYGSgIUPaX52Yfkmsptp3lZm6kI62SeBui19Vekv0cRz8OAkR2VLPjjxysgVUEZp+Mf4TyH8mCoqCHBHmzxWrX0v40wk9IVMYAoiAHTifvivX5VgeInp8APOE2ALOcqZg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 21:04:27.7252 (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.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB2704 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.88 Subject: [Qemu-devel] [PATCH v2 5/6] xlnx-zynqmp-pmu: Connect the IPI device to the PMU 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alistair Francis --- hw/microblaze/xlnx-zynqmp-pmu.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index 33584cfa4d..a6c14495ec 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -24,6 +24,8 @@ #include "cpu.h" #include "boot.h" +#include "hw/intc/xlnx-zynqmp-ipi.h" + /* Define the PMU device */ #define TYPE_XLNX_ZYNQMP_PMU "xlnx,zynqmp-pmu" @@ -34,27 +36,42 @@ #define XLNX_ZYNQMP_PMU_ROM_ADDR 0xFFD00000 #define XLNX_ZYNQMP_PMU_RAM_ADDR 0xFFDC0000 +#define XLNX_ZYNQMP_PMU_NUM_IPIS 4 + +static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS] = { + 0xFF340000, 0xFF350000, 0xFF360000, 0xFF370000, +}; + typedef struct XlnxZynqMPPMUState { /*< private >*/ DeviceState parent_obj; /*< public >*/ MicroBlazeCPU cpu; + XlnxZynqMPIPI ipi[XLNX_ZYNQMP_PMU_NUM_IPIS]; } XlnxZynqMPPMUState; static void xlnx_zynqmp_pmu_init(Object *obj) { XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(obj); + int i; object_initialize(&s->cpu, sizeof(s->cpu), TYPE_MICROBLAZE_CPU); object_property_add_child(obj, "pmu-cpu[*]", OBJECT(&s->cpu), &error_abort); + + for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) { + object_initialize(&s->ipi[i], sizeof(s->ipi[i]), TYPE_XLNX_ZYNQMP_IPI); + qdev_set_parent_bus(DEVICE(&s->ipi[i]), sysbus_get_default()); + } } static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp) { XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(dev); + Error *err = NULL; + int i; object_property_set_uint(OBJECT(&s->cpu), XLNX_ZYNQMP_PMU_ROM_ADDR, "base-vectors", &error_abort); @@ -75,6 +92,17 @@ static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp) &error_abort); object_property_set_uint(OBJECT(&s->cpu), 0, "pvr", &error_abort); object_property_set_bool(OBJECT(&s->cpu), true, "realized", &error_fatal); + + for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) { + object_property_set_bool(OBJECT(&s->ipi[i]), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ipi[i]), 0, ipi_addr[i]); + /* Need to connect this to an interrupt controller */ + } + } static void xlnx_zynqmp_pmu_class_init(ObjectClass *oc, void *data) From patchwork Fri Sep 1 21:00:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 809000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="Irlil5uB"; dkim-atps=neutral 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 3xkWxT5bZ7z9sNr for ; Sat, 2 Sep 2017 07:06:05 +1000 (AEST) Received: from localhost ([::1]:60617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt8d-0001DC-RG for incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 17:06:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnt7J-0000Xo-M7 for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnt7E-0006tH-TB for qemu-devel@nongnu.org; Fri, 01 Sep 2017 17:04:41 -0400 Received: from mail-bn3nam01on0073.outbound.protection.outlook.com ([104.47.33.73]:10332 helo=NAM01-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnt78-0006no-EA; Fri, 01 Sep 2017 17:04:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=7D0J84rGZ7R5hZDHdABR61FZiVrE6onyxuym3B1dl+s=; b=Irlil5uB7GLHixzahuTsEOHTSu3ybP2vbWieyNNraRabGPO0rdiOzk3+8z7Sx27vxAvM4jzWgbQhrU3VxqlAn/0HHDSp5CxkP4AbHneD5pOUk810K9+EAR2ERtOTlaE6DFcSkoH8G78XxShHmTRKlW7nDYPJ2N0Y4z/96FnMzrc= Received: from MWHPR0201CA0007.namprd02.prod.outlook.com (10.167.160.148) by SN1PR0201MB1935.namprd02.prod.outlook.com (10.163.87.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 21:04:28 +0000 Received: from BL2NAM02FT027.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by MWHPR0201CA0007.outlook.office365.com (2603:10b6:301:74::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 1 Sep 2017 21:04:28 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT027.mail.protection.outlook.com (10.152.77.160) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 1 Sep 2017 21:04:27 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:38302 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dnt74-0002QC-O7; Fri, 01 Sep 2017 14:04:26 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnt74-0007gz-Kr; Fri, 01 Sep 2017 14:04:26 -0700 Received: from xsj-pvapsmtp01 (xsj-smtp1.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81L4Nui021037; Fri, 1 Sep 2017 14:04:23 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnt71-0007gY-Ha; Fri, 01 Sep 2017 14:04:23 -0700 From: Alistair Francis To: , , Date: Fri, 1 Sep 2017 14:00:47 -0700 Message-ID: <75dabbf39e5c9e84a82a6d7a3e82ed4ff247a707.1504293917.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23296.003 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(36756003)(356003)(76176999)(8936002)(50986999)(54906002)(6666003)(626005)(2950100002)(305945005)(63266004)(106466001)(33646002)(9786002)(478600001)(47776003)(50226002)(77096006)(5660300001)(39060400002)(2906002)(4326008)(189998001)(2201001)(5003940100001)(50466002)(575784001)(81156014)(48376002)(8676002)(36386004)(81166006)(118296001)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0201MB1935; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT027; 1:WfMxOVlE3yWihQrQ449BhIXrwhg1L4xkJ7JSzrDe71o9q0vVoC0kZfMAbal7ZYxUo/ozu4gSEkL4wSoRhasXKd5i3wyJapu/ovJ1P64G5OX33cf299BS9LVoagVDtnK0 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a506430-ddc2-413c-d5e8-08d4f17d0824 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN1PR0201MB1935; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1935; 3:LgoYc43qhJuf/0BBbOhp4cUzluC+QfzRR3fcGNI/cNXifoeLOpt3BQHidaK+T6UP/Rj76qhiWgbJh0wb6o/WEaUp0heTbBIsPLceFMuhAAVIicM0565deRTV0z9sYwt633KpeW0m8sLaiSD5QKd1Q4oUH7cIYWE+2KoegeUqp6OVj+SpETC21yPuWAw6tbd25J3MyEd/QUe69ZZHFheQLFnkFTy1J+kr9FWHEO/H+QXFYhvcjzRFoihPKdRIN33eO86i4Hah8A4923CCcOgecxDW4qwpx0pwiqZrL8xdqXhxa+BLMEDAHlQXLlFp9QTXjGobVMJjWTjrFoH5VPc5WAU28q3ny+O/5pyzcDSUwuw=; 25:nhGEPi2UmbjbcH5NV/eeIu3nVlRRz/DkqBcR0Bsd9qk9cymOGY/mtaC+F6dP4cRwZzVVLwrlT9ZMSPP0pnd/474ytNh4o2DvZqFUj9wseVHhRDX8GmqF6vy/OpqQcEn3++V9tZeYkd8RHpGg5dLJXLmDlH6SlqOe26LW7oFn7CgeoFVmc7KjRscs1Nnf4ab+N87G/acOTMzVJXIn9X99kd7xLAhGF8MmSDWnL5rW9GTehGBe8qeH4nleZMMrZ2X0BnSzIbB2jswSWZBaJXMkdfwT6DH/Ad/SDs+a5WWXp9lKmxk9NT/Vd1k3O2zezWs4iKbEbSOCTgrZDSi0IZzSmw== X-MS-TrafficTypeDiagnostic: SN1PR0201MB1935: X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1935; 31:p+M4EIFUzP4NuOYKILn4714VVLlGc3jjX/bs7clUU/HJpk4cXJ4LzTJN8CDWK4rJieOYhZk4S0wexYEoAUYDWnD/jY5yJCDiyp4K8SloV408t+m5dvfLIH5b55U3EruYKvnHOQYmSN5E3kF1r7d2CZfnFpFBXOTGQSjDEJHTaB61GIRBfZhVXduK8xQqTReADd+H5yqG3v+12RfBGmvgslP4vhBQM0siiOMwSyHpV+g=; 20:mG427sAVMn5WTiRdzyEgt/i4hnkI5Vkh9tglxCn1o7vJxVmbNg7QvtBkvAiJi2IQRItuF9EwIe3d8uGet5auGP+xeLPunjBi9x3sSsSLlwtGQnAhldqEr2BE5mUY1cfq3fqq1mcSoqyhmNzEZqONiEovn21DWo0lyISq53Yn6/gP/pVtf8HLeteo/9jAA+K6+t5/pydxxXWPJgUsulRgOHMLAN73rfoSE9N8/UsHwR4zGidWMm958qctTXzAN0jsYmUSxSK+iaIalRF+pTtnLCvUG0sYkzndPU77t7QelqKnzW9ADN5IR32nYYjEnxi/5/xi3PNM/EOSfsgvs9xhtq/RiXJ279JPxkeVsbvTRH4uJS6MewvU76g7sJJulofL+CTycwepqO4UuFFzpo0aDIPPvm0PDXyj7AYsKk1A5ZfjK0wKJZPsSwaU5gLW0LaYN+XdqjBdRGbJhDgKEujGEX/0WT4cKaY7j4xjU/eLNtEtrcLHdJ3Fla8FJCY8Rgwx X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(21532816269658); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13018025)(13016025)(100000703101)(100105400095)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR0201MB1935; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR0201MB1935; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1935; 4:w8aRtnQ+O8VWIIei8L0SvcOK8CF/YxBEQ6Epp4cG7GCE8vs/ZolT4cKjfonOXKqQup1KU15Bu9Mk2XYfUITvw4cWg+GwwTOfHk8tQwf3hnwze2xdd7qelm7r81NWFWwIkvghIEWEEHVvTj5OtS1rXyuJ0ezK5Vu0dq7ppKAKTMQL44iyWkmFczJHL1LYUTFzBcIqpqig1yD+JwOHYsboohiE4/FNrLSGJtzy4RNlGc2AHbVgMQZ2Q4bIgs9FvnBckg8XW6xqInLCxrIqL+g8QpF+1gbuDU/1Abfk6qQhRX3E0Qs9uiTLMA8+G6vFeRmO1uAdSvGV4+n257yqg7talQ== X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0201MB1935; 23:tQlbfe57EJzXYzrn8EJgZIPdyw9DJyuO3w/2oHj?= Rzx5fGQ7byCI2F9si7ThpgbX5MNnPO1eGmybf2yEXUyC3f63gKxfPOhG/D0kjOTf34kE7Uhycye3h9y9W1OIQ2lExLBA+u7n9A+2xEe4DRNqrJvFjxE5VOkEbY6Ctgc0+c3COpgGTmd+1U0oYV+EvWkeCeSxSmND9GW1Cw4ewPRbTRDVQMPiz547DvtcIhc9RNCXGCdxmuuDrW6+Dzx5KCI/fZ98eLeCAK3a/LM3IGlJJhGpQK8jS5up1Qqwmg+wkM7cI6ZQiV7pLNdsO9D25853dDPREdeA01flmaxx8sER1TYvpMAaMdF5YN96BZ+jJh3ThzIhqQ8faKj0U3YU2/4kGJF9J9CNJIARHoejpcvWUENZRVwd8rxoiYYC6Ib6S3ufnEDY5ZctqE6NyqZ3SJthNOAMSU83Cx+b9G7xR0yntGJs3mnShabdCbCH1Hwy08YkF1mA6vKzTxPh3UWKrWsrwBASjNzRtd9l0b54gxxWiJAaf0j0+V2pQOvLTtCvoTalUNfizXfHIdRp+IzSLk5YsdnhF6TiIZ/LTLCtYd2hIISigfcUmXrEHwzZwGCKAZyJ6PbfZJr29O72YpG3ut3Hq/tyXuJ7Q8/k3Jqq9lvXHaY6FmjwEjnuooNVfJQCOR3fgy0DdfBA0VpPMXALCK6DQBX3CUqlMdELIkd65szK1J9f8nRdgaWPixDazpcpP0YokZEDvKwFuQh4kR4PBaqEIfDYGwtEPp8IS/jUwnpel3BDIBea7Be0HVIwBiwjZPOChXn6c0Yu2lBJ8cvRr6suNzul7mWPpjG8qNwmfDJJvR8pM7cbBJdJ/qROe/y5NM5TcNls4jKMdW+r25ky7fMYl0ZAib1t6zjnj39j5Fa4ERqbKZos5vhyLBsPzIE8oWis4mHu0GH/maigryWmrJfHZIUGSzsPcPFnGsyNfJibbDCr2esnoQuU3+7Nd2bS0JPHBjO5HQT+TB2qUbF563XT15qrcRJbLKv5OqaJj7KmbRg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0201MB1935; 6:iveuqWLHKDAz6BrqtFVWMMNKYpw/bQS+cXEUzN1d0B0TRCcN9W9SFU+g2Va8s/wMIw2coWs7Ml7JKPxWS6TRsAtCLcSkd9TznAIyq0MrDljByZJ8rPt0tNclaa0KFWWekRDNSUq8r6omBElV8qrRBY5SeCMe1L0OtiuvXCGVWLs3UuLaebp01cHossIcKy77MINkfsFwVevA4Xr/SKunrjNP3l36r0FI9WzYDv7VV5kNV0S5x/spRVRC+20naUQFRBWvk9BuoWp4LwDLcRjK07IOGZHmSOIadcl6dtTJKqgbesibJy2AP8IExiKMU8buIf3BaciTZe4w0RvfLiA+wg==; 5:MnN8VhORe5r8p5qYBNu+bTlAm3QM3hsqerdt4eN8pFUMXhCInuXYGMStBjs3PhF8T4NPop3C8bfrhA7YeOZWb81YaQmaplXC7Z4o/+gdKSDNNwPilv5aVxPVy1CoM3pl4y4S1DCelLEoWOaGKeQyog==; 24:fulLuTBu/iu5N0PinbtsFOpTmN/G0abjFSp9BcqxsUGW3GVwWEe2JTrPrIs15Cxrs/qAkWkALLy/lgXW/3UtfmAGNlFrMrtNxqxqJNM6Vyw=; 7:GWnkqTtTSdGgfE4vyipWzG3Qfu/Zkz9eNaxRCkAc9XrICcdwlulIzIi/9HrkvM6YWAI+Zkwh2KdpwNZW6d4zaH09POOkrMfq8T3J/OkDEVBMIP/U/pq/v1MQ4UPYcLmunQSmrnf1+8pU/3syt6hVwlXnuAZ2AlVXQ7jQWzjUaH990CF+KB/Vo06O/frCFwnutI+RRbOcDiR1He1tPIHNNLt5i/K8Ac2H8Nn+Bt0GLjE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 21:04:27.4045 (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.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0201MB1935 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.73 Subject: [Qemu-devel] [PATCH v2 6/6] xlnx-zynqmp: Connect the IPI device to the ZynqMP SoC 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alistair Francis --- hw/arm/xlnx-zynqmp.c | 14 ++++++++++++++ include/hw/arm/xlnx-zynqmp.h | 2 ++ 2 files changed, 16 insertions(+) diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 9eceadbdc8..1988cb47f4 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -46,6 +46,9 @@ #define DPDMA_ADDR 0xfd4c0000 #define DPDMA_IRQ 116 +#define IPI_ADDR 0xFF300000 +#define IPI_IRQ 64 + static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, }; @@ -179,6 +182,9 @@ static void xlnx_zynqmp_init(Object *obj) object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA); qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default()); + + object_initialize(&s->ipi, sizeof(s->ipi), TYPE_XLNX_ZYNQMP_IPI); + qdev_set_parent_bus(DEVICE(&s->ipi), sysbus_get_default()); } static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) @@ -427,6 +433,14 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) &error_abort); sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR); sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]); + + object_property_set_bool(OBJECT(&s->ipi), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ipi), 0, IPI_ADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ipi), 0, gic_spi[IPI_IRQ]); } static Property xlnx_zynqmp_props[] = { diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index c2931bf39c..02a89766e8 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -28,6 +28,7 @@ #include "hw/ssi/xilinx_spips.h" #include "hw/dma/xlnx_dpdma.h" #include "hw/display/xlnx_dp.h" +#include "hw/intc/xlnx-zynqmp-ipi.h" #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ @@ -85,6 +86,7 @@ typedef struct XlnxZynqMPState { XilinxSPIPS spi[XLNX_ZYNQMP_NUM_SPIS]; XlnxDPState dp; XlnxDPDMAState dpdma; + XlnxZynqMPIPI ipi; char *boot_cpu; ARMCPU *boot_cpu_ptr;