From patchwork Wed Sep 20 22:01:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 816526 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="iRLz9DEk"; 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 3xyDNC0FTkz9s7c for ; Thu, 21 Sep 2017 08:06:19 +1000 (AEST) Received: from localhost ([::1]:50845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun8L-0000rg-2M for incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 18:06:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun7Y-0000oC-O4 for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dun7X-0007wo-FQ for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:28 -0400 Received: from mail-by2nam01on0085.outbound.protection.outlook.com ([104.47.34.85]:14688 helo=NAM01-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 1dun7R-0007ZT-E7; Wed, 20 Sep 2017 18:05: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=iRLz9DEkf3T4r6MKevzwpeyk8AvBVMtDKsO79NBXaiyWPP14BhJ28xOSn6sznmamG75ICIq3WHA0/Ffr+dK4Ske6WBJzVUqvcPdDZD1FbfXJuCnIIzDkH6WZYI7iBpY1ltdhyRnAolIoUCQq1Twj0wf62mW8iSphbu/W8I32jGU= Received: from CY4PR02CA0002.namprd02.prod.outlook.com (10.169.188.12) by BLUPR02MB1122.namprd02.prod.outlook.com (10.163.79.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 20 Sep 2017 22:05:19 +0000 Received: from CY1NAM02FT048.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::206) by CY4PR02CA0002.outlook.office365.com (2603:10b6:903:18::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Wed, 20 Sep 2017 22:05:19 +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 CY1NAM02FT048.mail.protection.outlook.com (10.152.74.227) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Wed, 20 Sep 2017 22:05:18 +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 1dun7N-0000e9-6a; Wed, 20 Sep 2017 15:05:17 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dun7N-0002Ig-2T; Wed, 20 Sep 2017 15:05:17 -0700 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8KM5Cth025598; Wed, 20 Sep 2017 15:05:13 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dun7I-0002GY-SE; Wed, 20 Sep 2017 15:05:12 -0700 From: Alistair Francis To: , , Date: Wed, 20 Sep 2017 15:01:33 -0700 Message-ID: <3e3eaffaff956a406588ed26cddcbe3a7fb385d6.1505929556.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-23340.005 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)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(50986999)(47776003)(36386004)(356003)(76176999)(106466001)(2201001)(2906002)(77096006)(316002)(39060400002)(54906003)(50226002)(5003940100001)(9786002)(63266004)(305945005)(230783001)(118296001)(48376002)(6666003)(4326008)(16586007)(50466002)(110136005)(189998001)(478600001)(36756003)(81166006)(2950100002)(8936002)(33646002)(5660300001)(81156014)(8676002)(107986001)(2004002)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR02MB1122; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT048; 1:yzE+o62imn6uxG9nVdf+UEB8992wuGutBjqh0ILBEUzc6n7VTF+fvnuKzwCV/QkW/8cmKdlQKlPhLauQcQ9EiNU3l5LQEr8wZNj+9S3jdSAwD49ADVOPtKCmkzYXjXpg MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ae97a95-41a8-442f-3f69-08d50073ae39 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:BLUPR02MB1122; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 3:sH/qxDq7MRbMl3uhkxl6ABmJQnb0duncp4RpVhE+dKDatsk1ufgK8opDrMwr5l+sIOsBSLxXvYAWwNFT8JhM6UCGOU+6dS9xCFbUKK0PUym2df7YXxwNPrKCLwIEsaT4QrUFZCY1O7CSrO+yx4/0Ij9Em6k5AnYWgr8DerbOA/4mqydz+KQxB/OkJES/ROGd2r39UUZh+QGDaF7pI3NPVPCDMMbzfAgYWymFjd6THlowtBzKeW5TSDLG4KB13PNdspuL7kFbWExM5Zhk13VaFJ4yFYs9jTAXa/wK98fdyPF/A01sHv2Ig3HX5FNPQf7U58Dd2lsuJhSkBnFbTkRw+Bo60LBYYQj76+mOe3nhYmw=; 25:gwet4ViyxLEOWD8T9zj2VC5FVm3V9c6WLdqn3SJ/5ICvoeEXjO4uTbKZ4aPy7DJRZkxgMre1tRiif/c/E62rOMLA85s6TyeGKVrTUrTRcZ0m6qj8FTZyIWUw6eJ6U/55m+NERF332RpcUaHvTf+6u81zHNpDw33bccv1dfq7bO8qGm/L20aFPrgwiHrGjo1Poi7PMbjdo2EOzw7YRXsMPKEo9F14xRaCidkFY0C3QR7JHlqnnESHPNb3ZgHRyo3GEcv+HmluEGjv8SghAT80R/31fWfl/oU3tDUS2FQ+CVWPPnJTxGgQOvlbuwqTx7iMzRxSR+Yyk0kn5Krqp5UBQg== X-MS-TrafficTypeDiagnostic: BLUPR02MB1122: X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 31:cILII8LvJOOx4MU5i+csr9lSN8Y3PCmb8GmTMPUhn/KsM4zQJTmMZQXYhvwl74xKHL33wYrEh7z/0sishHjr4Cdc6i51WWE52C61ob+JOpmjoUBvWe+lJEiLYpxawdfM0amus7VkkWQ43uSygzV4RgLa9pdqiDAV8R1byIBB+sCQT6B7stl3oIeNLVzmMpaz5R2P7k9OA51nsUQT+w3BRL6mcf7jg2lttJdnoyeTvrk=; 20:aIVdDBmNNo+vzalzfjHHQBCufBG9oRwbUhJ+RgaGmVG8JT/iSX6df4Ir5st7zAfB2nsGY6Co8eO8q0UNLqZm/wETVPH0O4K36lM2EhjIKG4h5Ml2rmqH4WEbK33j8D7J15QFHdNNbpuxVwfCngCxwFmMA7GdDV4Tu7uLQW8yCvxsbUMCraglWZA0ihAbK+ElRUlz0ZLZ/XNyxBFHFpwtYVb5x32RTkSiOF9TTkLSbLhs+nznAoPojj4AwQ4RcGsBVjfg14oCp59zVeppVVXRHatLFAC/CLjCcu1g6EJUoItOWGpqk7b13RszMOCaFNR9xPkNPokjq5hRN2RDkKy2gQfGznbs2CBsTyPMt0T7LVoUVxKFRm/6vChFuIx0fpiY/Gn3wGjR5xyYlDclEK1PEgtnQiXNGPXpmMS76BNfH9zn2STsO8zRgEInE6TMzNEA4Kn5MsyfI+WvqvCDpGTk35zOnMuUg81GgF95s+FqFVDDcPRkDpJf81xfDc8e2RmA 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)(2401047)(8121501046)(5005006)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR02MB1122; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR02MB1122; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 4:QqVRu1yMO1nT3wqyz86IK6v8VmbQflFfqSoO470lw0Z7lN6uyATrHMziw8wqdcrNaB/IUn/j1EmWJOCDoOhdSSPzRv2kXdTW6s5DeNrxjwmCgsOZg8mlUCB/7+eBLsWad/x1VrkOYXAL1m/TLgBFhM5FG+Dbav/DETUrc1q5GyKq2BNEYxinhA9a2cHhbXlGxzMajhK4ZrtMhbZpLU3XxbklirpP9PQFP2UEQt9f+aVQ6AoLnYAJrF1UUzX0slG8LQIMpMzFermUtmfK6ZP6eHS7wPVAQir9p/RIky2YHahvXQMxEBoJT05C9Dt+PfiikEWVteaLm8U0yXuzMQWbNw== X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR02MB1122; 23:1Aodie/j9a6HM6IKqhZ17bauH0uDedlaEg9zVKwld?= P7wp2jTgQXc9Q7F3ZX8JRvJbEt5TgccFXMc/jTHd8S8RN4LVK7t1nF9R+GLgHHiEkkFjvZ9gOiqw51jSF72En2bqUE7rh5rZRpmvfjXDjewbc7WLq06fgjqCrYn9fmLV0fSNxuxPzE4WaZYnhj54k1KOHQkiSjfOfi6blnROZTw9HpQThbZRGthD1VlB19TITGFZlL0p1SyIqFzHbuXf9xUj4VPMpPMzYGLpv8r135F7tonUlj5Ive1AQMxs72dx4VgdSCK7iLIialax8jM4J24LvpiEeZefYji8qtv2MFwxsbtAxBEJb4AT1kt8llor0DSWSnbaCspY6YtClivvfuqY3M5tgScPIyH6OMA7NVK+rJrWvKzeGntBqjarr1UU0X5Amt+SVm2QRIs7GyT4ARy8W9T1qMJzJ1ZBNRe8SmBNOGASbeik4gzhQ4N+Iy3bJhf8uvqQJlbS1kfF6DyAAhHeV32n7fio9EdGoQXJyjy3H1SKWUDLt0mbp9wpEhoJhkxIAZAO+AViQwmuKD7NmHi4/kHyN9f5giGvzX4WKJieZfZHOkn3jHohP1utnZRfyxsPELkqJStO4LfOfD31X0sgIemk5AFLFB7zAGGDyQyMGlEfmp+S5xKybBcv49VksSDRyxLonV8VIg/g0X4VNHxiz2y1J5I242UQijw9yBkzqLR8jNfeygg7GsFRD8VGzThhXFI6Putt4Wdo8lW9beVm60uxdeIkCRkiUQ0swLcYbmXACCEhUm1EQIvUZXSqsktzu545UTWSs9Y2FowYB5mnSfx+EDgGW/5mlTVIA+ooIFfbaibDcnuypuVmOa9pmG0hdapmrCIePUSJQGShAOfURlLhwbAuKUHnyxG+63Jp3I+4lOrS6YcDjLLbG/SoiI6Fhe71TTGtkGxVrxC8omfXyi47xUbJ3sle1/a6Dzd9v/KW89/gvEqNh06O4EtmcXxOXYBy2BsIEI3wD2s8k6CXccCrHZZxp5rB8rUK/qnxinX3KUJESDb6ghWFMI4QEb43vI+BZDSZrvbRMrA5c7a08P1vtuPYESiSUkXt+VjaA== X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 6:Fh7oWbXnsB/3K2vfyK8mJq32EwWHq5LEmvxUqlB9ljvk2GxZrwVL4oGe/37cok9+b1Cw1L9XP4OXivgper+fV1pXddIdWtXOm1UPzF5bzdURJRpOKNpcIVGcM1JVW1xj1h01v4dSrq6nQHtr2FeTTKFh+eF3RuXAilrRrRghvWtLwuJyDZJGKkcdFk1zzJ9DkEc3WUpKdLjHDZaAhimUf0AABOiUxCXsYHh74CpykkqoEBNUJxTysJVlhE1uPy4ub0lXYCo3r8IfdYm7EJ0BUbPdXYlj2JNdKcFZ7yiBIJJOYcTqlw1nCI8Xqk3G4DTjv9j2l8CCA2TAOOZtGpifRw==; 5:ldc5qDRFY4czVdiDMCgZ/ZqFbVznrGz8D2nv6bJb6JDTnuEFRHSSxaoZGD9A1VvDN4qWvG1m0O5UZ7fctN+Fy+aW19ggpGIlS+mHFaNIGRwmIIYQ3O3L4rxIkgOIT4OzvLSa6Y3Ln1HiKJay5EOWKw==; 24:IzCSI79+09KDFzJO2murmt8RXcDZ1fj4TyDKRvnyPYW93zGRriqYGzpyhJ/AinAy/ULVsPZVvhl1tX8lOVPl//c7Lvq8kS7kfXWRFnjk8/k=; 7:ZmVQPWuUJaxhdJQ4tf+zIBFxiP0sT+b1UjKPItcpcARxZgJyLrIjm1CK7vzyFYpQITZf/W3HFVkCmh6EWPCRA7FS+7dAiWIy7EvFYKSakavZsV3MbzzRE/nAXjqsxG2lwppPiurXLSmdc4vhCzVdaMdsFTDSjXR+xWOBLVdUm4GWbpunGl2dHZjPrCDVEJKTWbSwmmoLj7p/20f2mM/xJMyMiwZlx7to7pAmstfHgOU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 22:05:18.2800 (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: BLUPR02MB1122 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.85 Subject: [Qemu-devel] [PATCH v3 1/8] 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 Wed Sep 20 22:01: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: 816529 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="Qs5V2zza"; 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 3xyDRK36PNz9s8J for ; Thu, 21 Sep 2017 08:09:01 +1000 (AEST) Received: from localhost ([::1]:50863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dunAx-0003KJ-Hj for incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 18:08:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun7j-0000xL-3B for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dun7h-00005l-SJ for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:39 -0400 Received: from mail-sn1nam01on0083.outbound.protection.outlook.com ([104.47.32.83]:25952 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 1dun7b-000891-Oj; Wed, 20 Sep 2017 18:05: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=ZfXuBbWSckWLjFZRIvCdK3Me6iosARxqu4q7MGMDWtE=; b=Qs5V2zzahX9WVLVodM3m1UCe9BSY68MOt4ukIom53E6YUK/f1mbz4vYRhKUkTYK2bnU82lnAPZLmMbFymAus0JIadbaAYpT7hBivBhxKypRThLBcwmpPS/DDr7Vqk4ZqqKxgeOtvO9Oe/uqYSpYXMKxbihfyYrSSzYNaUtn6lRA= Received: from CY4PR02CA0012.namprd02.prod.outlook.com (10.169.188.22) by CY1PR02MB1135.namprd02.prod.outlook.com (10.163.15.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Wed, 20 Sep 2017 22:05:29 +0000 Received: from BL2NAM02FT042.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::209) by CY4PR02CA0012.outlook.office365.com (2603:10b6:903:18::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.9 via Frontend Transport; Wed, 20 Sep 2017 22:05:29 +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 BL2NAM02FT042.mail.protection.outlook.com (10.152.76.193) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Wed, 20 Sep 2017 22:05:28 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:56148 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dun7X-0005iU-Ut; Wed, 20 Sep 2017 15:05:27 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dun7X-0002LI-QN; Wed, 20 Sep 2017 15:05:27 -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 v8KM5G5V025692; Wed, 20 Sep 2017 15:05:16 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dun7M-0002I7-Bt; Wed, 20 Sep 2017 15:05:16 -0700 From: Alistair Francis To: , , Date: Wed, 20 Sep 2017 15:01:37 -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-23340.005 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)(346002)(376002)(39860400002)(2980300002)(438002)(199003)(189002)(50986999)(48376002)(63266004)(76176999)(47776003)(50466002)(50226002)(118296001)(230783001)(106466001)(316002)(36386004)(2201001)(33646002)(36756003)(9786002)(2906002)(77096006)(478600001)(4326008)(6666003)(2950100002)(39060400002)(5003940100001)(189998001)(356003)(16586007)(110136005)(305945005)(81166006)(81156014)(8936002)(54906003)(5660300001)(8676002)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1135; 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; BL2NAM02FT042; 1:SOqidzD/OgVwcYccyPM9FWNe6Us5JI1xFfEpKTdwVJBy2ZCGQfux250/+m9460Hqz/qzKRw59GXkP1wRmJ+bEs2HIx4Y65luqIjabte+sYAHGeodip61oKszBLOf6vGM MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 43a99376-c8c6-4f4f-1a02-08d50073b482 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:CY1PR02MB1135; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1135; 3:s89d/bO2g8I4srx8ImM7xmr7Ea77DlTuJlGf4Wci3pqOkFhZ4mVv86r3fshJHoS0yLJc7gHta4dmi1NLH++cozOdElPAUX/r43unfMCbGW7tafV+q+V7H6y3K3hATicHvwEhYLfqrFlUnmgDj963mr2NAqbDfr351Dc9k6tIDIlbb61WxdAEaQdJ28J/vz2sC98lfz5lfGnXjSibVi/UA0PqS4KqmEauEsAy/r/NEu7hLVGC7EBx5GUcTbfkWYb3l5G2fmvHMQA355K4EL6vhb+H6IU+csuQTVj1AOIWEjQnB3l4eN8tqtCHOc+cY4bRQoMt/Ex67eNzdAwmX8+EwMznGoCbZIwXpB5IOAxtRvE=; 25:XMw+hf0JQEYJsiylsbYkUdnpginMjU27BfQ9TJCM14Cdg+HaQJNG5kigZcdG1vCKLdicXEl0XKpxSLHWx7LtEcCjIAWzDN6Yu9hv95pBW6+ZJK3j9XKfcp2MLv5NAMuZKv81ji6GTH8nNAxxnsFN6L1yNXsA1Mk4j2bOoXBXCZIx+DSabuJ9FZCzluW/UZBWh33fOkAiY/QaW6s0ENu8T2L5Ehw6c6CuGAvEHM15Wg3+Lxw9WMcNyPFJeEiGbyaaoma7QYpgLcUeW096icWhM8f/iI59gV7eqJUb7D9JAMTsRwgYC6hgFZjKl1B3InOpfHbcwwr88qTNavI+xh0ATA== X-MS-TrafficTypeDiagnostic: CY1PR02MB1135: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1135; 31:5/e1+xBrXQMuEiyN6ZNLm0r1eOVrIW3hW9drMEUVbjI5AmkudAn44hingmaeU+FNgr7YrxCxdbjXiM6HUgHM6ibp589cLv6oSid9YdClvKvExhMsXk3uncDyvtKgQdeqECHUTiAolEX0FjAvD3RiahojJAhaAKyeVkgLO2R8mEeCjblPPfPpjKZoVpC/6wwIbx7ubtZ/jDDWvCK1qu4bXMlItko41WzqPGmMrOSbb6M=; 20:osMxOk3jlqHIoliXZQyBXJMoalxDAdrVP4aRjHQ7v5+BWbcB/fjFb+1UX3HL9Tfm78/A16mg3XpgVeUMTzsSiO3HKXwVKa/lz9a7jsTjHtlgypjzpcank7w/Lqzke6BNJaxxdbGSkIUwRvy9nuUAlhFn0jvwUeHSLV+iFJUAwWSQMVeYpmKqxICrOsLLcs3XEjX3lfmGfnPtFGZK/GnA4oJ5yUfxAoslwu1uOfoameg1SurIPvohIE5Y/7AT8fAOlMnZ4NETxC2PYF1/jxIldhzvAXovGgXlcd5iVOCHEVLhKDutzkSwkZ0QOj1kznHcen6iQs/HoU5P+OTWosf1Tql2PBBgBD4i6K7+tRjdBLe6blLsRnkWM25CUDlWPaPrc1XCJKx5OumDRrSnZ2w3Z9Q+UzsZVWMHL78Mj4aE+pgZS3uBm5Bqzj4FIRdusjHuFkvGKawU44M7f8tEXc3EM8ROkprWyVYefyzLicV2zNCmvAbhbs2brbSm1OvD4Arl 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)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123558100)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1135; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1135; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1135; 4:lL/QhugpLou/SgOueJyqE7EvuyPJFpH+84a/sHexEvfu8/2EQDzDjp0HUkMmZWzFrJ3p3p8NsM0GQkHtNBsX/kWr9vlvM2k2qdJ8GlgCxc5eG6cO/KFj+X7IFdvx5LUeDnzGgxTuW/b5pYk2Fv2ocoUIjnIl6QRvYSg/Hl91jK0BN6CZBqSVW80zuiZorSK7yFJA/xDi5Dek6evNREsM6q4YElYXreXSVmxHIQENlvYvPOqRSvk8soCEyJHvgN4RSK3rTutuGq8ssZrYg8q3vmR9j/X88eN+FF11YzUBmMuJe3hHektqx8xT4PlBeNd6K72cIX5YS6N19nb+5x4gsw== X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1135; 23:DCtZ5Z2kLkj3Y59RljwU8XeR/ANJePMon3jq31n+Y?= E6+ywupZuwD6rRBR5EeuH94FEEl9+jpU5H0rHT0K/dknEonp/cGcjZ8qkrm7D34Kha/uv0mE6y6qt5PZUWQOpTSNp4ikzvdgnFHf6bw6flb3GGd9hM3cCX7tOkI7+p+nqLoNcXbi7S8xq2wmH1eZuF7qIAUIdZkT6cN5IISAEEuUXwuE9KHc3aseDcIpFzU+5MEKh0js/jtrWZDxAEX3JpknJdgHIwLzD9kCSFIOwnCR23++JeaGH2cT5L9g0SnLoNvdnXASUIjfgQb1G3+ol7qPkv4KPBGwD9fyzkNx4VwrMteP4gdtXFaPLT7qtTMFOXpIan5YDRhsGbzXg/u2tcmHlZMD18fS1/gDsgYA5RA07+ft6eyuF5glirXHkuRyapDMANchV8T9CeK74RNWgyleEDEOkR2WAjcNVVRllBGzOoKN/RTWNRPjJD7nCD+4xShve4Pza9Ma9/1MHqrp/IpTgiH0/lTNQ+oeuwd2MmY14Vvo2Tf4yiMJbZjPc7MhmhjIQQExHF/aUVIab/KBQuYVvw5ug1QhhaeayIrzPBZK6ZgvH12qk6OuPyo5W/vXFAhMsvrWWo1TYulJ7obN5U8qpp6klk6e8lOYeaaEbEHXjuHiNNz1Kymr0N13bRdyaYCwbupOmZuYB6lUFLMieP/9yXJ4wVcGybuJoKgQ2PF4Wev9ZYVT7P/Mpn3BMfc7CC4nsTkvp1SpHDpny7nK07uQ+r6/q7XdlEc7Kl3NOVi8ipn5P1RkVle4nBKCs8kLfjZUzL03lhhZ2zpa4cnIY74CkYxe2kmoCP7OxdOq/AWwIWvtk1ZC3ZsS1k07KqagOQ3okJ7INN8nhKeNR2ktRx48DnU8Jciu2EEfF5OAZ9zh2a3JhKfRnP6LtBJqelGhXbrSGxK97Y4dEDbS86dwMhTp0jBBgnrHw8+9wn6CGnk+5AwzieA5KoihdSViP0+9TBNwTuYkNAxxQ60raGVRVqqL9iNnleVcRrF6XqPOZSZFZBdPspc9Fdhria/OBjFQS2GFsHXmOIor4l4kwGDUhaT1UBR/Ctm/7/uc6aOS1skvoLrNdalvPCD0hrGUMa8cl4= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1135; 6:4S3xU8CQXNX6v8Z0f7HGE1UBcst7AR9J3HzI7pPmneZiCg0komE68Uh9wv3118L8BKVQmcPv2vzh6xoivnWKdZGoP/waTc2aaB9QH2RDRc36ncmYDpbaKpEFCLWJwqjzBpUY3Az6738mYdavOjgE3QxjnqiBQitLPV2O8EQhfs9Q8lv2if60Q76DBB/+UBvt/WSOAj+QlZGfC1AAHLEyhy/MrFotG/PYHMP720nRFGnGsWhzsp4zzo7uWKxd0lXpusZixh+yDmq8MXWjedQaIDMgqnIEwUaWqs+uf2/4Q1GPX99opco6TQSIJY5xu5rKo8Elc4n4Lz9tYRt3Bau2UQ==; 5:xPyTPGPvqzO1Ln1YOZHGXrUP7eFmwgAu1AnFqapi/FKQobx1z2iKsK2K/09olNXKnpx5Ho9V930ZMHWdmreoh0YqM1XZReZoyFHf1CWGQb+J71rAAkJ9AAFWc2vDu9dO5cd4MUP772qTZKg0oJRggg==; 24:gJV3aiJZkscr2QMRJ3dQU7U+AQtWx4tYr/TK3oU4/nhQdBFVs8nhh2bJgiXlgDiig1je3nuS0G3rnVyC8QyL+PEupKvw2DZWGwDA74i+BNc=; 7:6aw0lBmkc/rYk4UXetuLryWGyl3ptoXB8epu8D1KVk+1v1dt/2Il4Lw0XhS5Olu+HQZDRq2zX87sD6XuLBDWwafwZ7gPTRVW9wgMK7TJmE2BGPK/5bbM5+IaIPu109K2bPtNJbKtzTlQAEmpv8xxQr1AyknRW6bBYHJVrjx5dDoU+3OKugcTd6AVBOvwYMXyGDJXHkeqe0H/jTPKAHXgVwyIX9ErJUwmwxOJPhvbiEE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 22:05:28.8552 (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: CY1PR02MB1135 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.83 Subject: [Qemu-devel] [PATCH v3 2/8] 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 --- V2: - Fix the pmu-cpu name - Use err and errp for CPU realise instead of error_fatal hw/microblaze/xlnx-zynqmp-pmu.c | 70 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index fc3c8b236f..b643125704 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,56 @@ #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); + Error *err = NULL; + + 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", &err); + if (err) { + error_propagate(errp, err); + return; + } } static void xlnx_zynqmp_pmu_class_init(ObjectClass *oc, void *data) @@ -70,7 +108,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 Wed Sep 20 22:01:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 816527 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="Gv93M060"; 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 3xyDNj0bNbz9s7m for ; Thu, 21 Sep 2017 08:06:45 +1000 (AEST) Received: from localhost ([::1]:50853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun8l-0001Ej-3I for incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 18:06:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun7j-0000xZ-BJ for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dun7i-00006t-6g for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:39 -0400 Received: from mail-by2nam03on0042.outbound.protection.outlook.com ([104.47.42.42]:50240 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 1dun7c-0008CB-Ez; Wed, 20 Sep 2017 18:05: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=eGu65dTBtQds8MX3oPaYsmT69iz5y1r6bIITTky91oc=; b=Gv93M060tS4qv0dlFsCAj70R6yv6Gf9SiYaU9EVmEn/J5LI4Eo8Evp2MiU2ck6DOgxCfC8uAF8xM64y8mMDGe8T2+7b1QoXVWg/tP68Y+5iQrdZAyJjWZ3FJuxOf//yHBAO0pnwqTQRAamtD6uVjFybju3rE7NeGTduiAr9QnO8= Received: from CY4PR02CA0026.namprd02.prod.outlook.com (10.175.57.140) by BN3PR02MB1127.namprd02.prod.outlook.com (10.162.168.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 20 Sep 2017 22:05:29 +0000 Received: from SN1NAM02FT015.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::205) by CY4PR02CA0026.outlook.office365.com (2603:10b6:903:117::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Wed, 20 Sep 2017 22:05:29 +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 SN1NAM02FT015.mail.protection.outlook.com (10.152.72.109) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Wed, 20 Sep 2017 22:05:28 +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 1dun7X-0000eL-LX; Wed, 20 Sep 2017 15:05:27 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dun7X-0002LI-7Q; Wed, 20 Sep 2017 15:05:27 -0700 Received: from xsj-pvapsmtp01 (smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8KM5KjT025722; Wed, 20 Sep 2017 15:05:20 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dun7Q-0002Jm-3k; Wed, 20 Sep 2017 15:05:20 -0700 From: Alistair Francis To: , , Date: Wed, 20 Sep 2017 15:01:41 -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-23340.005 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)(346002)(376002)(2980300002)(438002)(199003)(189002)(305945005)(189998001)(77096006)(39060400002)(76176999)(478600001)(4326008)(36756003)(356003)(50986999)(2950100002)(2906002)(50226002)(50466002)(48376002)(5660300001)(47776003)(63266004)(118296001)(33646002)(16586007)(9786002)(110136005)(316002)(54906003)(8676002)(106466001)(36386004)(5003940100001)(6666003)(2201001)(8936002)(81166006)(81156014)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR02MB1127; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT015; 1:JNFDHOiTaM3H9czD9bKndUED8mFw9cDYFzdk3cbEDpVxfYtPMnbYXIxYqvxdMR5geGJLjMZh7pFLZaQz7dHYmbYOwvakXjecVYAKzasJe4p+Mc7x2xqAvEVY2nvWzKM/ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3476bb3-995e-4495-8d77-08d50073b43d 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:BN3PR02MB1127; X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1127; 3:UNOSsMvEBRNGyt7YdZtRV2wYZoYukZdm1lx27A8yaoVhqmyfb2IgYrq6/6xfV/2lCA8REJFzQaQ/ilZyuLFliu93FeBWQ6gBMOHP7Z+M3r45LQO685Qv1qZx7WSZyB6t3v4vTVQfa73gWw4+p6BnFMG1JZId/haVtjJqSzwUUbc9xSNZHUbxk4TOKg8AUjzCGhG2jIuCPLxunIqpSmOEZeM+bzN2QN8I7V4xph01HQFGofu3OlBn9g/bII85XzwcTMbQeOkMe/Jy4EUGoIVck4VjgZ+0z8lEWR04ele4UM9SFLZM3a+Jpu9wgaeQAHgJM/EWqf37csKHHRxadIPBXaqbR/WVrRjDnpgjotDjd5Y=; 25:xR4ACgtmqd4jE9PGZ4Ds0SSf2s+ts8YeZNH0OT3TsFwq13oJMeQwMQ7vS+pgC1knz4ze1YyATtd99pT30XtjtydufZFNdEeagFyE5sIyL2+bffVaBycXdtto8KM77O7sVXSt7PLlVU97sq9W9zeNgnNzg1mkUdUGNv3h4lfmWBAmEJHYoXitiBLbdSm6XbR5MBkoew9UtZ03dVSTuw+eXp5dD0bzt+0ooILP9WZlsokfGptNjS3nt/P6blE2uMzYy7Mba2LhgTGnPmjL3q5e5k1YEcdkI9wAlnSsMbkCl9J6cPupWmbOcmOwYKQMSCJu5BdvXuVnt4oOLfYtmalqXQ== X-MS-TrafficTypeDiagnostic: BN3PR02MB1127: X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1127; 31:kyagCXv53ZveFQnj3n93kgkob4UhMi8QbGbBRgbybuBBU8W+qsixgNlJPK67GBnuBU9Zzo6uw50ZdrfZEVpXMv4iZ1r51oDroEp46vVnwTkPE8mhbIBOIQXvcGoTThz7hmy41f+tyO5ULFhAgfC9+QbZgnT13sakqUmntGwcss+nJOqN9ud2Xys/17zbDr83K/A7P63K8MM8QhqifPW9MB/Nv3VHzDudUNGJIEIMHIA=; 20:8AmocngW/9oBuRd1N5EQLDyreC0m86Lktgt4ZvjLtuum3Nc1aicsXtH1bQD+GBbdnlJm5jkJgfS8UZzxOjir4lHUoJttcpVx9rmWydqyij/1Pg3uKFAnttypt2v5wZmdDYho57bco+8ykgo90J38Ivp1lckM/x+4BT3SOnARrtzcbKBHKHoHV94RRHNugk3nswZxWlSV0hw6ZB5YAAGIgO4RImAJ78zAtYddHDtHt/014k8/Cl0seLQBBQ9g8sGPNtte8sFGI1246om5HkAJsZO3kGozvdMKAnjOkma2UJi8YtErZKS6sdugPdXs87Up8e1tV1v3LejyuL0eF+DB5vvFV+V9lYMze+fe5QXKSJOuqch3ggoKqje06F3PQ4w+6P82KU52fWp/Jg0MYKZE8xIA1sPJetj/6Dde6xL/snsr156uLFCZwTNJ3oN9PcNvqgm0MB93WJdKrzvr4HEIJ8fPkwLggAHfwtAidZ/wT7pUBqLUTyCEgyob37qoFi/D 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)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123562025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR02MB1127; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR02MB1127; X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1127; 4:Gk4oN+D4AspDchRG9n8E0BC8KNMyV/D8raPFaMd/9eXEyREqnYu48WZT0E7xRBqydQa3Vs5W5kX89GUqTQJyzgeljNMdKv4OkWzWnJpp0JtFJ/oWkVAIITUfzt2WqkzhtQlyD4L2fVBZJ/6xcJT9bAoYx72Edea5Y5hN73OL+w5udlelGllbanjcQKl4FlDH7IATy+bM1j0uu68SZXiutkViJ054hxhoMHuZ1Qnr8SLOIAggTeGsLPcdjsbPLtLEFQtHWARxirnln10jAlUllCsYQ3UJYzzL+tv8KMezcXs= X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR02MB1127; 23:NwtPLBhoPJeTbPBW1HUBMn772YR8Kr/+5FaNCwCPC?= D1/Jc0N7obsHHjP49LiMZMvQY4lQd8NvvhwU2DpL3+YAdOYe3Zf5xBC6XLpNTYpVccnR3oGhK8TwS0pf7qtsZfRklOu4XX8EnsuJ8vUSfP667Zlew7Eua/cMG2MgpV292C7KGg5/plfgsQXQbz3ETCoopkl2hDafAMvqq2w2MM9cAqSHoiarkJgAlvmKS1nwZU4QoDkRU47XnEEnq/cSGuC+PinitcYP7no3NYNLBG+YmpY1GBPvMzHGFKWJlNGkETqx+CxpLWWkmKD4jGnomoddRDIjdD6cQGHFHmQoyRpEOXZnthPkCsD1Xb07bsd4cKrUNh3lkSEVYiYmCPpjBrXVSXvwGX8T6RlJ90z9R+iOJVYVppQsV9DZCi5zhd804B4MNGbi6tAnhS46CRK49l7R61yMeSZLUm8lnmvkw580NtC8T2xNdjEHGkPEuDAwb4oQzWFEWxvBx4Vv+zX5JS5gawGfBCo8i/C+5twKYYAHeYilbjpdUXTuFCuR4vYLHphBsCY2JvVB/2a+dBt+1HemOmK3ran1RIS+0FgCNkLjBiyZhmaJwAaJLWEl+F2L7MaDD1F6KAXr9P95Biz9zhQmWnVxNt2aEasslfBo9GujIJWaEgfmCvdY79bPNVpX1h1fKujLMDaynsv8gypEYebrJ6d1iUzG/RtuDIgpVTpSIXhucyuJoy2S2ZFUCkH9x+yIJkgp0ktQbGrLA4eFJMMMSqlf7txeHZjjEhqN4hgP2dc0TqEesXSzjBLK8I+yDeluxXnx/0YSnkvjAy1Vb6dMJHo5OTBkzZ50AaMIn3TsznR+3lIye2kMPC9l+aQZGECllKymMtlba1+t/FKw8+Yrk7lv6sJdZrA6cZKrxTgfzstLhKZUuG4YyA05uYVScYqoBlhCPU9xZFLdGNgyJzmPmEXM7PRY6gKwzdDib8jzYSiAdOSnf+CW8sFDsz0Qtu6k0PfDcOeYliCj5okf0Gs8VrpozC6C6SgnpkMGsox/tu6cTPAhuKOMMdBUIj+Imk= X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1127; 6:LL6+xU65R5LtoYV48m7WmIqOhsUAyDbHEwjsBMCMMm0qAOaC5S4kJP7NC0zgq98rf4PHMkI94BA8M7GeF8EJWVG+OuzuyjExVlpIIbdapY3WUHZgu+f3W2bBtV4wBl24It/q68CS9usTi8p1sik96hW/XVGaZddySuJEFQw2+6zRlfrzd9V+LURWTw47maSVbHdpwqmAGUoTaLUty6V/aNVxSyaTunrUJ4YsPIjLgW29asBQmduZLroytC+LUEOQrrgdnItk+EIdt2QjzKBMB8NpMD6fyoKq2k9Fh2jUeP/VtZTGr+5kP8ml4Zf8vTgqe5vmSBWFTKOR4Og4Z0xE5A==; 5:cuNuBKVq3YIcMHZfqyH5sGh9Kz9RNR9I0VoradtTcm0VlOpXvMn3wwjymRX8uaQJhjKQu3qqriF9G/Zf84HYUhFKhM/4LQ8MdCLwkr6rrhkh7Q2lWud/EsccD4drInCQaNNliz7QTj3V7/ACfy9gYg==; 24:iTYdAunBorbo85b+CftTd9r06FsV8Q15piv7dpvFL51dqhfOYMpMSnikrT5bGzksOMgnaMZxYmfjjhySWn3fPVGisVo5vo8gW2HliVqx/Zs=; 7:PU7TCHBXSDyjdS0N38sJdgCmrgiIkixyaQMNK/qrt5VT8doVl0tNosvxLe15hpSfp7DbjoOW+AiDcjN96CJRrI78hW2fAEi0z5awwnckJ7Cpz10T5ixFMgzOY060w4UzoRwRtlgTusYdlQ4/IkfFaV4WQVljaxtRPbglnAqV7Qg6JmGNFkPLP5VA2mMcCDqr/4LA0Kl6f/cvEUUldlpS9MHUqWe/gk8cR2n0Gr67NTQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 22:05:28.5152 (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: BN3PR02MB1127 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.42 Subject: [Qemu-devel] [PATCH v3 3/8] 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 5ee6f7da5b..01138b05f5 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-zcu102.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-zcu102.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 Wed Sep 20 22:01:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 816530 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="qoxWUg1K"; 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 3xyDSZ59btz9s8J for ; Thu, 21 Sep 2017 08:10:06 +1000 (AEST) Received: from localhost ([::1]:50871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dunC0-0004IY-RN for incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 18:10:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun7r-00013j-2F for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dun7m-0000P8-Qu for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:47 -0400 Received: from mail-by2nam01on0041.outbound.protection.outlook.com ([104.47.34.41]:56192 helo=NAM01-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 1dun7f-0008L1-1G; Wed, 20 Sep 2017 18:05:35 -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=3ZqkR+YXndSB/HweNqMSMeXD6ktPmdO63Po/LqRhGbU=; b=qoxWUg1KBuYCeNd/srwNqAli/saNO8jPtBILVtL9BNQCTFPX3DcpqnUS/q2OnNsJKLMV9IrQ2e2Z3I+cvqd+y0e+T/I9wHxjZD6wbi1uyxuCvPyttadU5zZoKIFj9lQSrWe2X3SKT3GAbr+BKmpyoRbVs2b7Pter/TS5iSV+h/8= Received: from BN6PR02CA0043.namprd02.prod.outlook.com (10.173.146.157) by BLUPR02MB1122.namprd02.prod.outlook.com (10.163.79.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 20 Sep 2017 22:05:32 +0000 Received: from BL2NAM02FT008.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by BN6PR02CA0043.outlook.office365.com (2603:10b6:404:5f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Wed, 20 Sep 2017 22:05:32 +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 BL2NAM02FT008.mail.protection.outlook.com (10.152.76.162) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Wed, 20 Sep 2017 22:05:28 +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 1dun7X-0000eR-Qw; Wed, 20 Sep 2017 15:05:27 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dun7X-0002LI-N1; Wed, 20 Sep 2017 15:05:27 -0700 Received: from xsj-pvapsmtp01 (smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8KM5N7G003815; Wed, 20 Sep 2017 15:05:23 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dun7T-0002KY-6Y; Wed, 20 Sep 2017 15:05:23 -0700 From: Alistair Francis To: , , Date: Wed, 20 Sep 2017 15:01:44 -0700 Message-ID: <37d4c6fb8fb41bd8dc04c61c5d604ec8302ed545.1505929556.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-23340.005 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)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(50986999)(47776003)(36386004)(356003)(76176999)(106466001)(2201001)(2906002)(77096006)(316002)(39060400002)(54906003)(50226002)(5003940100001)(9786002)(63266004)(305945005)(230783001)(118296001)(48376002)(6666003)(4326008)(16586007)(575784001)(50466002)(110136005)(189998001)(478600001)(36756003)(81166006)(2950100002)(8936002)(33646002)(5660300001)(81156014)(8676002)(107986001)(2101003)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR02MB1122; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT008; 1:BceH9UksX8vZWMgFRH4anIzOHYiPjl7KUd54/iURSjSQwXYWDD307w9v7cR6XvJDqcmpDXXVKeyI1JtGgicWbMkbEHFmrAYBQrB4MTYQ5BbSCt3gV4lryztidabDW42c MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1b17423-cb15-412e-e935-08d50073b4a2 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:BLUPR02MB1122; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 3:1L4sPbGTAn3UHL1KEhnLvoao6Ctin50l6s3vg0DLkPKYvLaJnm3lPPQP6FMHWpDiFRZkAGSxhdr+QvQGaI1s7GOX2WadMmau45l/VRm070XE9e37bkoG1lGoMp8C+yM6ohE0uj0270nEeWL1CZEYNMOAjLDyDjWQB6KuCxzOH7llNr4Jj7KACH2GY8+0PGEBMxdLGC4vtHneH8UuawS5Ka4EO9CQCV/zwK8ewgvPMecynDhIX1/g6NMCEVzuItQcdIlvvpmJm8UF339A822aIfHz/H6iYY++WRzmSu1SNZmz+IVhxwL3wU28FGfFlB94eeqBL8EYnjjcLaGFWk1XK53cr0qK93QWETSggwGuxv0=; 25:tYYREE4BoZCdYSnNnINt/0JjBKxjS+AJr6bhQqtCW0J/FcTdv/AubaQ2i6/BV7A0cAZ3d0z31XgHEtfNlXKyBmtjLXS6bNjzZ6VZBM4i9Q6kmj3GNf1ls0CJtqJjP44CEM2R57Kt1SUShHSaS+WSSqxGO8jmWa5DvhAu5YMxiudee6Hp3fcHumhxOISA26b88UOsPRslnFxpROONXMzuIWpToRdVCMseqG+IhOcyiN4JzzXrL1EN/NRLJ+BkxzVf6RSWUpI8PocSMUem8m143snzUEk3KOInJ+/M0T0humXShaXA7xXk/lsvOGK3gswD/NOqBUIByLFSaKf8Razcjg== X-MS-TrafficTypeDiagnostic: BLUPR02MB1122: X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 31:zxVDVRzPhzQZ89CC7GMmKiFoTuiQpdzNLRw/pM1oQfPzbauebpllRLmDAnA2K9KJvHdKlH6mJDihPGYqHKy7kxkBX3dUmINrmeudm3Kw2uWodtTP436NfqXaydqCbngxsWTcBUS4drGTWLew/C2e1+FDyOSTm2xxh3FAuKWCZIRuEnGOpSXCV426zfGY4wcHt59+q5lg9sYNS1zavFE1KpXzom86+tRIj8hI+Co0KMo=; 20:OnszwSerLkQiPUvd9fjaJnjgTqIeN1fdL9nmkQ3jcmSC5qyuUGREjlda+k+j7xXJ3bX32Qp1xEjT3iamYfsUiC1GuXYeKI1LMw8JpwzmGDN1wplupqrSMg3DxcU2YqOYVpzz3kjGAvfsFokMxiKVZBoxQ6RdGeERz6491qeeOm16WvO0zALfOkhevMA6ysHxL7Gz50NU7Fat1l8teijDrDedh/znhBjF9DbuJLCvbtSkUE6sRkkkJo/B3d9McOmJM9B8/GsREsU1Z+KzAOO1zWiHz6KrEVeUcamcB3Fx6Sw3UmgBSR+/bal7QoubKWA5sl1RzhJHO8NP8SUHczqUjldLwk9gYfJ05X30876PJuhuo+CQrbolbrDALPbxFK/g5lt7KKUFoKN1Q1r+j/QdmI0iH3v/cJwHeDaXKG1wBlBmsIhn4cG+lXuzjsEgS0pC0v91XV3KsEfPzUUm6tc7iXphUjOJHWxJVSdcWwH2/PMiMfwlDfy0O3psXfLgB1sP 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)(2401047)(8121501046)(5005006)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR02MB1122; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR02MB1122; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 4:N1sBeAoistP1PKxJc9+weOZk2MGdbGhibxn3siz8WqG5SD7uqb/r6C09e3/u/pS8IfuLXdyx+lqA1/2MykuVCUsDEZBQSeECIpssOfENuKEFNvlKPrJBn5uFVOno9G3WFTNlVjgfaedQShN8MHDLmrbZqx8xshBWyp+CTCBwC7bSmKX84FYI3CMpESecKVzh6vo0lcKn7B5l9y5ckzLWaP0m82bwT486+4Kug6VhHmxNH6jiozcWvISBEKgugbnDdzQ6GUxu9/vuVDqakgdx1Sw7u67flLg6jkvjElKWBcg= X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR02MB1122; 23:3UPNfSJ/OMVq/HPt9RQimZuWyJqB4n3yWEkUQyX+G?= Awhx9cyAXTet8qGSD402FPuo6cR/9EUCGHru1zm+EcRlS3+EiaNE2/ZE8iQ5zsfpdpP8a6PoJrd/t3GrBMwr4RHb6Tn50sY+CbDfnnAYNq3132NkAlOderPZV07blPH8ydKemisgTdvHcAYQb3AMwHArbSyz3zLeLtKGca1VnJV1tiphL/GkSJusgfTCr6/l7HjYv9H2PIW1u72Zpri4qVw4Ny9pgUXIKy2ugA4xoqB5FbDh+8HRPJRcp0CeJ3hyi1AISvOeMEHysNbOJCQokmm9+blgAgACsbEroy3q0wm0FfEnDVP9xQCp2UAuHaqTyDH86eJMAz8xO8vdwizMTAISJqFvPMV3dScsaXOKG7uoyFQbAcLB1bpqAaFKnlT8Ae0iPe3jGcmLWquq4p/0Eoi4gp0z3N7wdSziGVGeUaOjBaU1YaduAHq+/e240A64cUmLOp8Ru70ajfUJZHPkwKuKTHNVbNmf4HR58742Ak6u053CDcxgO1rn+WoxoJva+Um6GTpL5hC7YJ80iJyHLXM9kVr8kt0mJ9AOYmTEcyMMwPvsNJ8KAZwiJQDcCC7nuHMnEnGvA7cUSpD3OSLhXYBkg/3GtsuWfaojFJN5tSd/bHxyDtH9Z2X3GF9Z/jjLw2dGrGqyVrvjhA5qIvUfQInuVAtwjS+zpSqHvJMIauiQmV1duS1qZo6VzwL+K7aZ8ieCwv02mCY70LJluM40bzQyV4WrHi2o8h7V4aawygc83ZVyqcBzH82OSdmjv2+LrQmbpLIHeM1ZNEzjmCEIkoQF0K/K73uBsgn8ct3OZulbWNIb9SCEJ1tyS8e+K8+OBViz9WGRcuIcxZ+Tz1O/4L2beOO4KpDszsr1Gt74s7pwd+cHh+My++bzBhhXzuyY20FxFsRdGECc91xZzNoHzocvK3+X/BcqRf/x5/6IK9T8ws+j1xeTD5+WEKNlNZ5a4snzr+zhIE++I2ojYHbYuK4MBrMFOreq5YqVE4ZojuhdmkttUFMaIL+TjH+O/o1C8jhEbUWcvMQLZ7HHWpbLKoo7whQ7lx4FMxCZHrvpouimdZrJUdwR9V7EXv4/siJQBM= X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 6:VezH5n3A9xVl76Jyu5209wPHgRvE0bhSHJhfBtW2JHmdphuXXB0HM3jqjSwlRZc6U1jICN0xRdvukNtH5XhN979KGYvkgORVEG8owHG9eUdx9rZ43kVwbvWBxmOSV6s+Yrd165RcPK+onRg1dIWWJoGbb0fthG+wfpDG1THRINJlt6tQhP2KdJOK1E8lybjB4V98ZuA8UULfRyJy/6PAVZnbemHH4ClfQAlU2Zy4VansAsQhryMz09VrxBEZ/2YRVQlA6zOEcpejXIS3pCv+N4A0RYehCIUWxyZzvYfwSvP+AIZhx6twINaKweF5RvFmiTB27nYS8RegbfOI4MfuOg==; 5:WBYS1hMevKvBPpgnP6OtOQEJn+ORLnV2wUQiBoDFTHRnjQ1ckQf8rsdsfSV36Tyr4+ER19kX/GhNwwm9n9Gf8bg6JTvnchKv6OdFlQi3ebnT0UnENQ9MtS75bb9gPF8Hcam48qn/lLoCc0ZixbHZ3w==; 24:4YPHa4aQnDgNIXtTbQ0LUh9FCMFQkc6Zl/LzLHsGlKQczSmK16l8he3GYGnPAcRn3Pfz/uuGceTEeara+VDfsDHQdMQVgQKJTxKFczoRy6o=; 7:kGSGJninRT8l2ULnVUepfnvo0dqppi4i7t06RvVq1F7Gt2Nkb32B46VPVdg7iRdEy7AS8jpk9Yr8eUESwcYkSVgGNx7JOGMqb8kR92PWlKEaZ8/xFPY7275WIimQyfde8XFS8Lgd7Yz6Oiqu/vv2NwKGFEt/G91XCCDbREWX/YiZRuZOgCyy9AQ1o6dyMEiqLjTAGIkN/pAFeMjGxOkO5nr01jkhQvrfBzieLtrHE38= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 22:05:28.8982 (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: BLUPR02MB1122 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.41 Subject: [Qemu-devel] [PATCH v3 4/8] xlnx-pmu-iomod-intc: Add the PMU Interrupt controller 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" Add the PMU IO Module Interrupt controller device. Signed-off-by: Alistair Francis --- default-configs/microblaze-softmmu.mak | 1 + hw/intc/Makefile.objs | 1 + hw/intc/xlnx-pmu-iomod-intc.c | 554 +++++++++++++++++++++++++++++++++ include/hw/intc/xlnx-pmu-iomod-intc.h | 58 ++++ 4 files changed, 614 insertions(+) create mode 100644 hw/intc/xlnx-pmu-iomod-intc.c create mode 100644 include/hw/intc/xlnx-pmu-iomod-intc.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..0fce61e2ce 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-pmu-iomod-intc.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-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c new file mode 100644 index 0000000000..4ec7991f4f --- /dev/null +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -0,0 +1,554 @@ +/* + * QEMU model of Xilinx I/O Module Interrupt Controller + * + * Copyright (c) 2013 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-pmu-iomod-intc.h" + +#ifndef XLNX_PMU_IO_INTC_ERR_DEBUG +#define XLNX_PMU_IO_INTC_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do {\ + if (XLNX_PMU_IO_INTC_ERR_DEBUG >= lvl) {\ + qemu_log(TYPE_XLNX_PMU_IO_INTC ": %s:" fmt, __func__, ## args);\ + } \ +} while (0); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +REG32(IRQ_MODE, 0xc) +REG32(GPO0, 0x10) + FIELD(GPO0, MAGIC_WORD_1, 24, 8) + FIELD(GPO0, MAGIC_WORD_2, 16, 8) + FIELD(GPO0, FT_INJECT_FAILURE, 13, 3) + FIELD(GPO0, DISABLE_RST_FTSM, 12, 1) + FIELD(GPO0, RST_FTSM, 11, 1) + FIELD(GPO0, CLR_FTSTS, 10, 1) + FIELD(GPO0, RST_ON_SLEEP, 9, 1) + FIELD(GPO0, DISABLE_TRACE_COMP, 8, 1) + FIELD(GPO0, PIT3_PRESCALE, 7, 1) + FIELD(GPO0, PIT2_PRESCALE, 5, 2) + FIELD(GPO0, PIT1_PRESCALE, 3, 2) + FIELD(GPO0, PIT0_PRESCALE, 1, 2) + FIELD(GPO0, DEBUG_REMAP, 0, 1) +REG32(GPO1, 0x14) + FIELD(GPO1, MIO_5, 5, 1) + FIELD(GPO1, MIO_4, 4, 1) + FIELD(GPO1, MIO_3, 3, 1) + FIELD(GPO1, MIO_2, 2, 1) + FIELD(GPO1, MIO_1, 1, 1) + FIELD(GPO1, MIO_0, 0, 1) +REG32(GPO2, 0x18) + FIELD(GPO2, DAP_RPU_WAKE_ACK, 9, 1) + FIELD(GPO2, DAP_FP_WAKE_ACK, 8, 1) + FIELD(GPO2, PS_STATUS, 7, 1) + FIELD(GPO2, PCAP_EN, 6, 1) +REG32(GPO3, 0x1c) + FIELD(GPO3, PL_GPO_31, 31, 1) + FIELD(GPO3, PL_GPO_30, 30, 1) + FIELD(GPO3, PL_GPO_29, 29, 1) + FIELD(GPO3, PL_GPO_28, 28, 1) + FIELD(GPO3, PL_GPO_27, 27, 1) + FIELD(GPO3, PL_GPO_26, 26, 1) + FIELD(GPO3, PL_GPO_25, 25, 1) + FIELD(GPO3, PL_GPO_24, 24, 1) + FIELD(GPO3, PL_GPO_23, 23, 1) + FIELD(GPO3, PL_GPO_22, 22, 1) + FIELD(GPO3, PL_GPO_21, 21, 1) + FIELD(GPO3, PL_GPO_20, 20, 1) + FIELD(GPO3, PL_GPO_19, 19, 1) + FIELD(GPO3, PL_GPO_18, 18, 1) + FIELD(GPO3, PL_GPO_17, 17, 1) + FIELD(GPO3, PL_GPO_16, 16, 1) + FIELD(GPO3, PL_GPO_15, 15, 1) + FIELD(GPO3, PL_GPO_14, 14, 1) + FIELD(GPO3, PL_GPO_13, 13, 1) + FIELD(GPO3, PL_GPO_12, 12, 1) + FIELD(GPO3, PL_GPO_11, 11, 1) + FIELD(GPO3, PL_GPO_10, 10, 1) + FIELD(GPO3, PL_GPO_9, 9, 1) + FIELD(GPO3, PL_GPO_8, 8, 1) + FIELD(GPO3, PL_GPO_7, 7, 1) + FIELD(GPO3, PL_GPO_6, 6, 1) + FIELD(GPO3, PL_GPO_5, 5, 1) + FIELD(GPO3, PL_GPO_4, 4, 1) + FIELD(GPO3, PL_GPO_3, 3, 1) + FIELD(GPO3, PL_GPO_2, 2, 1) + FIELD(GPO3, PL_GPO_1, 1, 1) + FIELD(GPO3, PL_GPO_0, 0, 1) +REG32(GPI0, 0x20) + FIELD(GPI0, RFT_ECC_FATAL_ERR, 31, 1) + FIELD(GPI0, RFT_VOTER_ERR, 30, 1) + FIELD(GPI0, RFT_COMPARE_ERR_23, 29, 1) + FIELD(GPI0, RFT_COMPARE_ERR_13, 28, 1) + FIELD(GPI0, RFT_COMPARE_ERR_12, 27, 1) + FIELD(GPI0, RFT_LS_MISMATCH_23_B, 26, 1) + FIELD(GPI0, RFT_LS_MISMATCH_13_B, 25, 1) + FIELD(GPI0, RFT_LS_MISMATCH_12_B, 24, 1) + FIELD(GPI0, RFT_MISMATCH_STATE, 23, 1) + FIELD(GPI0, RFT_MISMATCH_CPU, 22, 1) + FIELD(GPI0, RFT_SLEEP_RESET, 19, 1) + FIELD(GPI0, RFT_LS_MISMATCH_23_A, 18, 1) + FIELD(GPI0, RFT_LS_MISMATCH_13_A, 17, 1) + FIELD(GPI0, RFT_LS_MISMATCH_12_A, 16, 1) + FIELD(GPI0, NFT_ECC_FATAL_ERR, 15, 1) + FIELD(GPI0, NFT_VOTER_ERR, 14, 1) + FIELD(GPI0, NFT_COMPARE_ERR_23, 13, 1) + FIELD(GPI0, NFT_COMPARE_ERR_13, 12, 1) + FIELD(GPI0, NFT_COMPARE_ERR_12, 11, 1) + FIELD(GPI0, NFT_LS_MISMATCH_23_B, 10, 1) + FIELD(GPI0, NFT_LS_MISMATCH_13_B, 9, 1) + FIELD(GPI0, NFT_LS_MISMATCH_12_B, 8, 1) + FIELD(GPI0, NFT_MISMATCH_STATE, 7, 1) + FIELD(GPI0, NFT_MISMATCH_CPU, 6, 1) + FIELD(GPI0, NFT_SLEEP_RESET, 3, 1) + FIELD(GPI0, NFT_LS_MISMATCH_23_A, 2, 1) + FIELD(GPI0, NFT_LS_MISMATCH_13_A, 1, 1) + FIELD(GPI0, NFT_LS_MISMATCH_12_A, 0, 1) +REG32(GPI1, 0x24) + FIELD(GPI1, APB_AIB_ERROR, 31, 1) + FIELD(GPI1, AXI_AIB_ERROR, 30, 1) + FIELD(GPI1, ERROR_2, 29, 1) + FIELD(GPI1, ERROR_1, 28, 1) + FIELD(GPI1, ACPU_3_DBG_PWRUP, 23, 1) + FIELD(GPI1, ACPU_2_DBG_PWRUP, 22, 1) + FIELD(GPI1, ACPU_1_DBG_PWRUP, 21, 1) + FIELD(GPI1, ACPU_0_DBG_PWRUP, 20, 1) + FIELD(GPI1, FPD_WAKE_GIC_PROXY, 16, 1) + FIELD(GPI1, MIO_WAKE_5, 15, 1) + FIELD(GPI1, MIO_WAKE_4, 14, 1) + FIELD(GPI1, MIO_WAKE_3, 13, 1) + FIELD(GPI1, MIO_WAKE_2, 12, 1) + FIELD(GPI1, MIO_WAKE_1, 11, 1) + FIELD(GPI1, MIO_WAKE_0, 10, 1) + FIELD(GPI1, DAP_RPU_WAKE, 9, 1) + FIELD(GPI1, DAP_FPD_WAKE, 8, 1) + FIELD(GPI1, USB_1_WAKE, 7, 1) + FIELD(GPI1, USB_0_WAKE, 6, 1) + FIELD(GPI1, R5_1_WAKE, 5, 1) + FIELD(GPI1, R5_0_WAKE, 4, 1) + FIELD(GPI1, ACPU_3_WAKE, 3, 1) + FIELD(GPI1, ACPU_2_WAKE, 2, 1) + FIELD(GPI1, ACPU_1_WAKE, 1, 1) + FIELD(GPI1, ACPU_0_WAKE, 0, 1) +REG32(GPI2, 0x28) + FIELD(GPI2, VCC_INT_FP_DISCONNECT, 31, 1) + FIELD(GPI2, VCC_INT_DISCONNECT, 30, 1) + FIELD(GPI2, VCC_AUX_DISCONNECT, 29, 1) + FIELD(GPI2, DBG_ACPU3_RST_REQ, 23, 1) + FIELD(GPI2, DBG_ACPU2_RST_REQ, 22, 1) + FIELD(GPI2, DBG_ACPU1_RST_REQ, 21, 1) + FIELD(GPI2, DBG_ACPU0_RST_REQ, 20, 1) + FIELD(GPI2, CP_ACPU3_RST_REQ, 19, 1) + FIELD(GPI2, CP_ACPU2_RST_REQ, 18, 1) + FIELD(GPI2, CP_ACPU1_RST_REQ, 17, 1) + FIELD(GPI2, CP_ACPU0_RST_REQ, 16, 1) + FIELD(GPI2, DBG_RCPU1_RST_REQ, 9, 1) + FIELD(GPI2, DBG_RCPU0_RST_REQ, 8, 1) + FIELD(GPI2, R5_1_SLEEP, 5, 1) + FIELD(GPI2, R5_0_SLEEP, 4, 1) + FIELD(GPI2, ACPU_3_SLEEP, 3, 1) + FIELD(GPI2, ACPU_2_SLEEP, 2, 1) + FIELD(GPI2, ACPU_1_SLEEP, 1, 1) + FIELD(GPI2, ACPU_0_SLEEP, 0, 1) +REG32(GPI3, 0x2c) + FIELD(GPI3, PL_GPI_31, 31, 1) + FIELD(GPI3, PL_GPI_30, 30, 1) + FIELD(GPI3, PL_GPI_29, 29, 1) + FIELD(GPI3, PL_GPI_28, 28, 1) + FIELD(GPI3, PL_GPI_27, 27, 1) + FIELD(GPI3, PL_GPI_26, 26, 1) + FIELD(GPI3, PL_GPI_25, 25, 1) + FIELD(GPI3, PL_GPI_24, 24, 1) + FIELD(GPI3, PL_GPI_23, 23, 1) + FIELD(GPI3, PL_GPI_22, 22, 1) + FIELD(GPI3, PL_GPI_21, 21, 1) + FIELD(GPI3, PL_GPI_20, 20, 1) + FIELD(GPI3, PL_GPI_19, 19, 1) + FIELD(GPI3, PL_GPI_18, 18, 1) + FIELD(GPI3, PL_GPI_17, 17, 1) + FIELD(GPI3, PL_GPI_16, 16, 1) + FIELD(GPI3, PL_GPI_15, 15, 1) + FIELD(GPI3, PL_GPI_14, 14, 1) + FIELD(GPI3, PL_GPI_13, 13, 1) + FIELD(GPI3, PL_GPI_12, 12, 1) + FIELD(GPI3, PL_GPI_11, 11, 1) + FIELD(GPI3, PL_GPI_10, 10, 1) + FIELD(GPI3, PL_GPI_9, 9, 1) + FIELD(GPI3, PL_GPI_8, 8, 1) + FIELD(GPI3, PL_GPI_7, 7, 1) + FIELD(GPI3, PL_GPI_6, 6, 1) + FIELD(GPI3, PL_GPI_5, 5, 1) + FIELD(GPI3, PL_GPI_4, 4, 1) + FIELD(GPI3, PL_GPI_3, 3, 1) + FIELD(GPI3, PL_GPI_2, 2, 1) + FIELD(GPI3, PL_GPI_1, 1, 1) + FIELD(GPI3, PL_GPI_0, 0, 1) +REG32(IRQ_STATUS, 0x30) + FIELD(IRQ_STATUS, CSU_PMU_SEC_LOCK, 31, 1) + FIELD(IRQ_STATUS, INV_ADDR, 29, 1) + FIELD(IRQ_STATUS, PWR_DN_REQ, 28, 1) + FIELD(IRQ_STATUS, PWR_UP_REQ, 27, 1) + FIELD(IRQ_STATUS, SW_RST_REQ, 26, 1) + FIELD(IRQ_STATUS, HW_RST_REQ, 25, 1) + FIELD(IRQ_STATUS, ISO_REQ, 24, 1) + FIELD(IRQ_STATUS, FW_REQ, 23, 1) + FIELD(IRQ_STATUS, IPI3, 22, 1) + FIELD(IRQ_STATUS, IPI2, 21, 1) + FIELD(IRQ_STATUS, IPI1, 20, 1) + FIELD(IRQ_STATUS, IPI0, 19, 1) + FIELD(IRQ_STATUS, RTC_ALARM, 18, 1) + FIELD(IRQ_STATUS, RTC_EVERY_SECOND, 17, 1) + FIELD(IRQ_STATUS, CORRECTABLE_ECC, 16, 1) + FIELD(IRQ_STATUS, GPI3, 14, 1) + FIELD(IRQ_STATUS, GPI2, 13, 1) + FIELD(IRQ_STATUS, GPI1, 12, 1) + FIELD(IRQ_STATUS, GPI0, 11, 1) + FIELD(IRQ_STATUS, PIT3, 6, 1) + FIELD(IRQ_STATUS, PIT2, 5, 1) + FIELD(IRQ_STATUS, PIT1, 4, 1) + FIELD(IRQ_STATUS, PIT0, 3, 1) +REG32(IRQ_PENDING, 0x34) + FIELD(IRQ_PENDING, CSU_PMU_SEC_LOCK, 31, 1) + FIELD(IRQ_PENDING, INV_ADDR, 29, 1) + FIELD(IRQ_PENDING, PWR_DN_REQ, 28, 1) + FIELD(IRQ_PENDING, PWR_UP_REQ, 27, 1) + FIELD(IRQ_PENDING, SW_RST_REQ, 26, 1) + FIELD(IRQ_PENDING, HW_RST_REQ, 25, 1) + FIELD(IRQ_PENDING, ISO_REQ, 24, 1) + FIELD(IRQ_PENDING, FW_REQ, 23, 1) + FIELD(IRQ_PENDING, IPI3, 22, 1) + FIELD(IRQ_PENDING, IPI2, 21, 1) + FIELD(IRQ_PENDING, IPI1, 20, 1) + FIELD(IRQ_PENDING, IPI0, 19, 1) + FIELD(IRQ_PENDING, RTC_ALARM, 18, 1) + FIELD(IRQ_PENDING, RTC_EVERY_SECOND, 17, 1) + FIELD(IRQ_PENDING, CORRECTABLE_ECC, 16, 1) + FIELD(IRQ_PENDING, GPI3, 14, 1) + FIELD(IRQ_PENDING, GPI2, 13, 1) + FIELD(IRQ_PENDING, GPI1, 12, 1) + FIELD(IRQ_PENDING, GPI0, 11, 1) + FIELD(IRQ_PENDING, PIT3, 6, 1) + FIELD(IRQ_PENDING, PIT2, 5, 1) + FIELD(IRQ_PENDING, PIT1, 4, 1) + FIELD(IRQ_PENDING, PIT0, 3, 1) +REG32(IRQ_ENABLE, 0x38) + FIELD(IRQ_ENABLE, CSU_PMU_SEC_LOCK, 31, 1) + FIELD(IRQ_ENABLE, INV_ADDR, 29, 1) + FIELD(IRQ_ENABLE, PWR_DN_REQ, 28, 1) + FIELD(IRQ_ENABLE, PWR_UP_REQ, 27, 1) + FIELD(IRQ_ENABLE, SW_RST_REQ, 26, 1) + FIELD(IRQ_ENABLE, HW_RST_REQ, 25, 1) + FIELD(IRQ_ENABLE, ISO_REQ, 24, 1) + FIELD(IRQ_ENABLE, FW_REQ, 23, 1) + FIELD(IRQ_ENABLE, IPI3, 22, 1) + FIELD(IRQ_ENABLE, IPI2, 21, 1) + FIELD(IRQ_ENABLE, IPI1, 20, 1) + FIELD(IRQ_ENABLE, IPI0, 19, 1) + FIELD(IRQ_ENABLE, RTC_ALARM, 18, 1) + FIELD(IRQ_ENABLE, RTC_EVERY_SECOND, 17, 1) + FIELD(IRQ_ENABLE, CORRECTABLE_ECC, 16, 1) + FIELD(IRQ_ENABLE, GPI3, 14, 1) + FIELD(IRQ_ENABLE, GPI2, 13, 1) + FIELD(IRQ_ENABLE, GPI1, 12, 1) + FIELD(IRQ_ENABLE, GPI0, 11, 1) + FIELD(IRQ_ENABLE, PIT3, 6, 1) + FIELD(IRQ_ENABLE, PIT2, 5, 1) + FIELD(IRQ_ENABLE, PIT1, 4, 1) + FIELD(IRQ_ENABLE, PIT0, 3, 1) +REG32(IRQ_ACK, 0x3c) + FIELD(IRQ_ACK, CSU_PMU_SEC_LOCK, 31, 1) + FIELD(IRQ_ACK, INV_ADDR, 29, 1) + FIELD(IRQ_ACK, PWR_DN_REQ, 28, 1) + FIELD(IRQ_ACK, PWR_UP_REQ, 27, 1) + FIELD(IRQ_ACK, SW_RST_REQ, 26, 1) + FIELD(IRQ_ACK, HW_RST_REQ, 25, 1) + FIELD(IRQ_ACK, ISO_REQ, 24, 1) + FIELD(IRQ_ACK, FW_REQ, 23, 1) + FIELD(IRQ_ACK, IPI3, 22, 1) + FIELD(IRQ_ACK, IPI2, 21, 1) + FIELD(IRQ_ACK, IPI1, 20, 1) + FIELD(IRQ_ACK, IPI0, 19, 1) + FIELD(IRQ_ACK, RTC_ALARM, 18, 1) + FIELD(IRQ_ACK, RTC_EVERY_SECOND, 17, 1) + FIELD(IRQ_ACK, CORRECTABLE_ECC, 16, 1) + FIELD(IRQ_ACK, GPI3, 14, 1) + FIELD(IRQ_ACK, GPI2, 13, 1) + FIELD(IRQ_ACK, GPI1, 12, 1) + FIELD(IRQ_ACK, GPI0, 11, 1) + FIELD(IRQ_ACK, PIT3, 6, 1) + FIELD(IRQ_ACK, PIT2, 5, 1) + FIELD(IRQ_ACK, PIT1, 4, 1) + FIELD(IRQ_ACK, PIT0, 3, 1) +REG32(PIT0_PRELOAD, 0x40) +REG32(PIT0_COUNTER, 0x44) +REG32(PIT0_CONTROL, 0x48) + FIELD(PIT0_CONTROL, PRELOAD, 1, 1) + FIELD(PIT0_CONTROL, EN, 0, 1) +REG32(PIT1_PRELOAD, 0x50) +REG32(PIT1_COUNTER, 0x54) +REG32(PIT1_CONTROL, 0x58) + FIELD(PIT1_CONTROL, PRELOAD, 1, 1) + FIELD(PIT1_CONTROL, EN, 0, 1) +REG32(PIT2_PRELOAD, 0x60) +REG32(PIT2_COUNTER, 0x64) +REG32(PIT2_CONTROL, 0x68) + FIELD(PIT2_CONTROL, PRELOAD, 1, 1) + FIELD(PIT2_CONTROL, EN, 0, 1) +REG32(PIT3_PRELOAD, 0x70) +REG32(PIT3_COUNTER, 0x74) +REG32(PIT3_CONTROL, 0x78) + FIELD(PIT3_CONTROL, PRELOAD, 1, 1) + FIELD(PIT3_CONTROL, EN, 0, 1) + +static void xlnx_pmu_io_irq_update(XlnxPMUIOIntc *s) +{ + bool irq_out; + + s->regs[R_IRQ_PENDING] = s->regs[R_IRQ_STATUS] & s->regs[R_IRQ_ENABLE]; + irq_out = !!s->regs[R_IRQ_PENDING]; + + DB_PRINT("Setting IRQ output = %d\n", irq_out); + + qemu_set_irq(s->parent_irq, irq_out); +} + +static void xlnx_pmu_io_irq_enable_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxPMUIOIntc *s = XLNX_PMU_IO_INTC(reg->opaque); + + xlnx_pmu_io_irq_update(s); +} + +static void xlnx_pmu_io_irq_ack_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxPMUIOIntc *s = XLNX_PMU_IO_INTC(reg->opaque); + uint32_t val = val64; + + /* Only clear */ + val &= s->regs[R_IRQ_STATUS]; + s->regs[R_IRQ_STATUS] ^= val; + + /* Active level triggered interrupts stay high. */ + s->regs[R_IRQ_STATUS] |= s->irq_raw & ~s->cfg.level_edge; + + xlnx_pmu_io_irq_update(s); +} + +static const RegisterAccessInfo xlnx_pmu_io_intc_regs_info[] = { + { .name = "IRQ_MODE", .addr = A_IRQ_MODE, + .rsvd = 0xffffffff, + },{ .name = "GPO0", .addr = A_GPO0, + },{ .name = "GPO1", .addr = A_GPO1, + .rsvd = 0xffffffc0, + },{ .name = "GPO2", .addr = A_GPO2, + .rsvd = 0xfffffc3f, + },{ .name = "GPO3", .addr = A_GPO3, + },{ .name = "GPI0", .addr = A_GPI0, + .rsvd = 0x300030, + .ro = 0xffcfffcf, + },{ .name = "GPI1", .addr = A_GPI1, + .rsvd = 0xf0e0000, + .ro = 0xf0f1ffff, + },{ .name = "GPI2", .addr = A_GPI2, + .rsvd = 0x1f00fcc0, + .ro = 0xe0ff033f, + },{ .name = "GPI3", .addr = A_GPI3, + .ro = 0xffffffff, + },{ .name = "IRQ_STATUS", .addr = A_IRQ_STATUS, + .rsvd = 0x40008787, + .ro = 0xbfff7878, + },{ .name = "IRQ_PENDING", .addr = A_IRQ_PENDING, + .rsvd = 0x40008787, + .ro = 0xdfff7ff8, + },{ .name = "IRQ_ENABLE", .addr = A_IRQ_ENABLE, + .rsvd = 0x40008787, + .ro = 0x7800, + .post_write = xlnx_pmu_io_irq_enable_postw, + },{ .name = "IRQ_ACK", .addr = A_IRQ_ACK, + .rsvd = 0x40008787, + .post_write = xlnx_pmu_io_irq_ack_postw, + },{ .name = "PIT0_PRELOAD", .addr = A_PIT0_PRELOAD, + .ro = 0xffffffff, + },{ .name = "PIT0_COUNTER", .addr = A_PIT0_COUNTER, + .ro = 0xffffffff, + },{ .name = "PIT0_CONTROL", .addr = A_PIT0_CONTROL, + .rsvd = 0xfffffffc, + },{ .name = "PIT1_PRELOAD", .addr = A_PIT1_PRELOAD, + .ro = 0xffffffff, + },{ .name = "PIT1_COUNTER", .addr = A_PIT1_COUNTER, + .ro = 0xffffffff, + },{ .name = "PIT1_CONTROL", .addr = A_PIT1_CONTROL, + .rsvd = 0xfffffffc, + },{ .name = "PIT2_PRELOAD", .addr = A_PIT2_PRELOAD, + .ro = 0xffffffff, + },{ .name = "PIT2_COUNTER", .addr = A_PIT2_COUNTER, + .ro = 0xffffffff, + },{ .name = "PIT2_CONTROL", .addr = A_PIT2_CONTROL, + .rsvd = 0xfffffffc, + },{ .name = "PIT3_PRELOAD", .addr = A_PIT3_PRELOAD, + .ro = 0xffffffff, + },{ .name = "PIT3_COUNTER", .addr = A_PIT3_COUNTER, + .ro = 0xffffffff, + },{ .name = "PIT3_CONTROL", .addr = A_PIT3_CONTROL, + .rsvd = 0xfffffffc, + } +}; + +static void irq_handler(void *opaque, int irq, int level) +{ + XlnxPMUIOIntc *s = XLNX_PMU_IO_INTC(opaque); + uint32_t mask = 1 << irq; + uint32_t prev = s->irq_raw; + uint32_t temp; + + s->irq_raw &= ~mask; + s->irq_raw |= (!!level) << irq; + + /* Turn active-low into active-high. */ + s->irq_raw ^= (~s->cfg.positive); + s->irq_raw &= mask; + + if (s->cfg.level_edge & mask) { + /* Edge triggered. */ + temp = (prev ^ s->irq_raw) & s->irq_raw; + } else { + /* Level triggered. */ + temp = s->irq_raw; + } + s->regs[R_IRQ_STATUS] |= temp; + + xlnx_pmu_io_irq_update(s); +} + +static void xlnx_pmu_io_intc_reset(DeviceState *dev) +{ + XlnxPMUIOIntc *s = XLNX_PMU_IO_INTC(dev); + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(s->regs_info); ++i) { + register_reset(&s->regs_info[i]); + } + + xlnx_pmu_io_irq_update(s); +} + +static const MemoryRegionOps xlnx_pmu_io_intc_ops = { + .read = register_read_memory, + .write = register_write_memory, + .endianness = DEVICE_LITTLE_ENDIAN, + .valid = { + .min_access_size = 4, + .max_access_size = 4, + }, +}; + +static Property xlnx_pmu_io_intc_properties[] = { + DEFINE_PROP_UINT32("intc-intr-size", XlnxPMUIOIntc, cfg.intr_size, 0), + DEFINE_PROP_UINT32("intc-level-edge", XlnxPMUIOIntc, cfg.level_edge, 0), + DEFINE_PROP_UINT32("intc-positive", XlnxPMUIOIntc, cfg.positive, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void xlnx_pmu_io_intc_realize(DeviceState *dev, Error **errp) +{ + XlnxPMUIOIntc *s = XLNX_PMU_IO_INTC(dev); + + /* Internal interrupts are edge triggered? */ + s->cfg.level_edge <<= 16; + s->cfg.level_edge |= 0xffff; + + /* Internal interrupts are postitive. */ + s->cfg.positive <<= 16; + s->cfg.positive |= 0xffff; + + /* Max 16 external interrupts. */ + assert(s->cfg.intr_size <= 16); + + qdev_init_gpio_in(dev, irq_handler, 16 + s->cfg.intr_size); +} + +static void xlnx_pmu_io_intc_init(Object *obj) +{ + XlnxPMUIOIntc *s = XLNX_PMU_IO_INTC(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; + + memory_region_init(&s->iomem, obj, TYPE_XLNX_PMU_IO_INTC, + XlnxPMUIOIntc_R_MAX * 4); + reg_array = + register_init_block32(DEVICE(obj), xlnx_pmu_io_intc_regs_info, + ARRAY_SIZE(xlnx_pmu_io_intc_regs_info), + s->regs_info, s->regs, + &xlnx_pmu_io_intc_ops, + XLNX_PMU_IO_INTC_ERR_DEBUG, + XlnxPMUIOIntc_R_MAX * 4); + memory_region_add_subregion(&s->iomem, + 0x0, + ®_array->mem); + sysbus_init_mmio(sbd, &s->iomem); + + sysbus_init_irq(sbd, &s->parent_irq); +} + +static const VMStateDescription vmstate_xlnx_pmu_io_intc = { + .name = TYPE_XLNX_PMU_IO_INTC, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, XlnxPMUIOIntc, XlnxPMUIOIntc_R_MAX), + VMSTATE_END_OF_LIST(), + } +}; + +static void xlnx_pmu_io_intc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + dc->reset = xlnx_pmu_io_intc_reset; + dc->realize = xlnx_pmu_io_intc_realize; + dc->vmsd = &vmstate_xlnx_pmu_io_intc; + dc->props = xlnx_pmu_io_intc_properties; +} + +static const TypeInfo xlnx_pmu_io_intc_info = { + .name = TYPE_XLNX_PMU_IO_INTC, + .parent = TYPE_SYS_BUS_DEVICE, + .instance_size = sizeof(XlnxPMUIOIntc), + .class_init = xlnx_pmu_io_intc_class_init, + .instance_init = xlnx_pmu_io_intc_init, +}; + +static void xlnx_pmu_io_intc_register_types(void) +{ + type_register_static(&xlnx_pmu_io_intc_info); +} + +type_init(xlnx_pmu_io_intc_register_types) diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-pmu-iomod-intc.h new file mode 100644 index 0000000000..3478d8cf6c --- /dev/null +++ b/include/hw/intc/xlnx-pmu-iomod-intc.h @@ -0,0 +1,58 @@ +/* + * QEMU model of Xilinx I/O Module Interrupt Controller + * + * 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_PMU_IO_INTC_H +#define XLNX_PMU_IO_INTC_H + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" + +#define TYPE_XLNX_PMU_IO_INTC "xlnx.pmu_io_intc" + +#define XLNX_PMU_IO_INTC(obj) \ + OBJECT_CHECK(XlnxPMUIOIntc, (obj), TYPE_XLNX_PMU_IO_INTC) + +/* This is R_PIT3_CONTROL + 1 */ +#define XlnxPMUIOIntc_R_MAX (0x78 + 1) + +typedef struct XlnxPMUIOIntc { + SysBusDevice parent_obj; + MemoryRegion iomem; + + qemu_irq parent_irq; + + struct { + uint32_t intr_size; + uint32_t level_edge; + uint32_t positive; + } cfg; + + uint32_t irq_raw; + + uint32_t regs[XlnxPMUIOIntc_R_MAX]; + RegisterInfo regs_info[XlnxPMUIOIntc_R_MAX]; +} XlnxPMUIOIntc; + +#endif /* XLNX_PMU_IO_INTC_H */ From patchwork Wed Sep 20 22:01:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 816533 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="5iPLWCLi"; 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 3xyDWK11pxz9s8J for ; Thu, 21 Sep 2017 08:12:29 +1000 (AEST) Received: from localhost ([::1]:50886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dunEJ-0005y6-95 for incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 18:12:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun7w-00019l-U1 for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dun7u-0000n2-EX for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:52 -0400 Received: from mail-by2nam03on0041.outbound.protection.outlook.com ([104.47.42.41]:61447 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 1dun7n-0000Mj-1C; Wed, 20 Sep 2017 18:05:43 -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=GWBzmC0nxls+1+1GbTw2ChPNol9jt0y8owOEPKmYAVM=; b=5iPLWCLiF7zehPXJxB6iVYH5ln53SlYFYxV/ki13OWpkVFZHxzVQcqDaGIgJ2iJpmjBMhyaHyo3IARLqWqs8l1KmOLXWVuNzhr6ctOIfKF7nE0ajLhLfRDXg/5hVKrwmqNqiAZdonhynfiDv4oW5QnoV7mh9VIgcFHL5M5sk1wE= Received: from MWHPR02CA0024.namprd02.prod.outlook.com (10.168.209.162) by BLUPR02MB1122.namprd02.prod.outlook.com (10.163.79.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 20 Sep 2017 22:05:40 +0000 Received: from BL2NAM02FT038.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by MWHPR02CA0024.outlook.office365.com (2603:10b6:300:4b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Wed, 20 Sep 2017 22:05:40 +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 BL2NAM02FT038.mail.protection.outlook.com (10.152.77.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Wed, 20 Sep 2017 22:05:39 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:56532 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dun7i-0005ig-8P; Wed, 20 Sep 2017 15:05:38 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dun7i-0002Pj-5a; Wed, 20 Sep 2017 15:05:38 -0700 Received: from xsj-pvapsmtp01 (smtp3.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8KM5T5r003853; Wed, 20 Sep 2017 15:05:29 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dun7Z-0002M6-0Q; Wed, 20 Sep 2017 15:05:29 -0700 From: Alistair Francis To: , , Date: Wed, 20 Sep 2017 15:01:50 -0700 Message-ID: <036217613544270ed280f8beddb846bc6b78b4b6.1505929556.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-23340.005 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)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(50986999)(47776003)(36386004)(356003)(76176999)(106466001)(2201001)(2906002)(77096006)(316002)(39060400002)(54906003)(50226002)(5003940100001)(9786002)(63266004)(305945005)(230783001)(118296001)(48376002)(6666003)(4326008)(16586007)(575784001)(50466002)(110136005)(189998001)(478600001)(36756003)(81166006)(2950100002)(8936002)(33646002)(5660300001)(81156014)(8676002)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR02MB1122; 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; BL2NAM02FT038; 1:LJRhdU9v0OAAp33Vb9meIM9Iyej5hAbYkYC/VgPZDEEWMPOoEJ93eQcoMaTe95PnKEozLqRwEmjgAdDjTQMtE2jSpCk+SwV6JmC19kXSZwyVEwaQcjTdKg7rbOQFdGL0 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f16f6797-917c-4a11-3da4-08d50073badc 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:BLUPR02MB1122; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 3:ZHai5ALTumgoKWf7bB3DIFv0MO2rqrNJH++glZJPrW8kFblrPs68982y0tixrMvmVQxSNgysmaXwCAVU4FtaY/v1T4S1qJPGS0UQOjsma5uG+N17BtMBIacd7ZyN5ivpOMIpxtvNWhXL3kRwi+j1irsrsDtPcBCw2i8J3v2QjfF3eprYe26sJPT/Y8ZPhfs9B7DAtG0klD/DIr0tijU1eLgZPcnG6J+9H+zjLHAKXK8b20wzBmcB/Jt1NiALnp2DsReQDaFb7KIlcsZY/VsHZsib38f81/BYFinWSv/QtS+zG2t4Q/k7Ta6Cw01JE4ZSFUjHQTJK9GukHdSD4yfPfg2MvLHtWwx3XAtZ69D88Fo=; 25:cB0FsC8rjkrPIM/UfvRfaec30h1dX5bIrzWZ2Cq6+PMc962B9iZx5OaNWhNAxuUUDuUDKHeo5ov7eP+zYJR6C47DGLgy/Qhv3uGXokIjtIHoLyD30kFo9pyjqkaGwIZ4EqMtzSzA0Auk/3hm/p2w8EaXRr7brBWvsW9neatTxg1Oj6XFKa7CvMJwLfDrotDQk2BqKmoaCmZ2KVKSA6H82c9glqXXBWTtzPCDfZ6i6SylhDAzN5bFViUCf6bY8Zltn1FnlyQ6lXA25gr3KWTW83KpMKMvMf33wnzfssz76mlnqKJOaS4w+2/ZtpbyZUloJSdK5h0t8gAXgeXLU+tkXw== X-MS-TrafficTypeDiagnostic: BLUPR02MB1122: X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 31:SsOX8el7tAG9ZCtcvA9ykGDiAL5gtGOLl/eaJk4ivJgqO6b6fG5DLcspZFrXkXo7yZRblfiLfqm0wVW2sZkK3dgshtySFhymqt3tiSeICfSTRERbFBUZ9IjFezQZ2GVuRUeTbTb6rNXcfikyjYvlnHBnsD6REgL5i2ZrRsk8jzGWmGjS1Mtq29G0pwJ0irDUcNX9pkcK/7nGqPOWje9UcJxdzv7vMUEkWBX9jdhFeus=; 20:DA8fy1oSQavVVknzilmzeN7guuXkyMBp19w94hcTa6PVskiKV9BdjHYyZMMlutB8LtD8TkLM7358ZAdhY80OFX0ytMYHd06r5Ulaf3PeyYljg6f2+4fOLnoTUn4lvCBGzfmCxTE3G6jWzHKAwtrDAy8ZMpXKA/LLFaw0Hn03SmHRYmpnSPnk5jSdjO5klf+VIe8jRfdteKCVdKP2d1+GL/gNzVuPOEggZqdMxt5Z86Zao4zumwTnTC3A+aOObmLaE1+ggsrfjsBBOBiBmABpdiJ5Kyx7lDJZ5gDpwHFa48sfEB3ZexgjlZNkgq8m+GrjS7wd2G+ZZuHHWDD/MF8uGVZbV/YqUO6kXGNW8LYfaeYUDnC1ow0hFy8seJL6gA5Iuce8/VUoUh5U7u5xAe51QzdAPPqW0uZeOthVAmhoy5OFcMnxW9a8nkt97ggGi8Qg2ORFlTsJRXYUI0LimSja2nOd+H+o8kKsuB/fH/qVyvaNENe7DX2oIY2H2drpmLD3 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)(2401047)(8121501046)(5005006)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR02MB1122; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR02MB1122; X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 4:tsUW5agyan6/SQmATpPWU0K1Y2V5107AqKnB0aWHkbKJcoglcqx4TQCcUQe83TT99cu5KqKfTXMpG4BZYb9J8f7L44kwp4CIlKKrEytZEd69B5wgdPaEc2jKptbr75Obm6uJgoEQhRlk7zpuUINDGIpdazLgmcXaoolCWSb8o6czC8x0cdChOWVwt2sl/9utBNzQ5NVFg2xtMCqRy0+O24rhNfq/vBc3zPgtthY+xYcdvAJQHT7et+mXnen7ADAW4rGpPRm642dFSIaiABlDvgslGIr/txynNwfyp4Kb+aI= X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR02MB1122; 23:8nxtFfFJroEKrr0L33lCN92JQJztedJcDEtKV4L4t?= OIm2TNPz88OQQPSDdWFC334qRPO9mqlaoSKE624+3Ww8NYoV/wsR/jiXXLZjfGe45TNTsLhOiBhpUae4Y9ePZOaj3Qn1HmsYB7F//1AQ9Z8xlwjHznAE0v0EvfZ+5tVbwhuNgNmtNbPbx66Ry8qDj6g365bztTKXOBgWGYR6rgO0tMOZOqLk9xQKDL6FwLdom1RZs8ufpCNr6ttyz1rJp8TL4OGJj6z9/qy2P3cmWHDo5JES2M6xOUwWkKh6MVoRFXMhrDyupo1LJwuWjN2nv1z7MRAaYPxXrLaz2oHujzwxqtc5ChwfhEUV4M6bgMhyBidt6h1/EuMB72E2+TKwVG6ui6/IlphIc+rkkZpb6qcT1v5DQzwIhl2BpjajF5mKvAFdOw5etSLHy19+WTn64u2Tb/W4cHBY/r2z8lYGkqS8LfDcuNcLOVcH48r9I2laDcU/E2621UZ9UbD5Zfb+9y2ER5elgTeiKfLz63TUPoQqDk9rW7wCONEuIiuV+KFSDsKERLx67SVg+K+Fs+MZR2iSPkPhwhcNJMGMFkEkr9UbLT6tBoK1BLtjmLjZyRG/xhy8lGWBK0dwhpzG0A4O4Cbe3JzFB6sEHSjv/IBRf/PptIuu/46Vf+Q8ZSXEQ1zbXM1hhV2BiVpSY87//yr0teiDCFravx40Gw4AOjPHNjWwVga83SdHwIbpjOFlbfzDFD1nIdNxd2CLg/LEzy9Jte8frTStd+72idl0rA93SCNzCb3i9pmpghcAoAf/ToQozSjdNT4JN0Cp5pjQuQhRp335dTa3Gh3giyzDbQUJucBS/h+zGn1TfEPH/+QnFCQkDZ6Ny7yKI3L2heqCVD7wVYZJuHNv20l2CmpOq5XHzbUBjl1a9bq0Xsvl9YtIHQYlkF/gfvM5zSkDmHvi0qVgfnkFrnDaJQJSdfQAxI1ZFPPnJDVevICSM6jDOD9iLX+ojAr3J1gud33N996Tst04fPP+G0qwQXGrQ/TIlBu+td9KwZd/KnCLzVhsOAAVYxuR5RI+eM8FcUBaMxnGioGn1JSHNfStGCaVfSMdaqy5QdA2EfH/h8bcSWIG4Y3Uy1/twZWKN6UHUcYctNwE8Wu2U/n X-Microsoft-Exchange-Diagnostics: 1; BLUPR02MB1122; 6:yDVGgLGS2ckK4U0095EV23BqpRDVfNFebKiP7fbbYyrv5AoFs3qjZlIsKse5CDUbAJPG+MSr3SSi/XmyGRalMjGSqOvUZkfO1+Jlcn5hHxxILqoA1BTil6CZ4WDAcXf4rHpnDWlGgzI02x+DPmMGlHjKzD3/7qrk3rePCzAzWEoPg68hPI+Gm/JpUqBDdxbe0y5gxsck7EdgcX4Tcorm9bAhT+9WK27LHMeIwu9FzfPwwYbPTil3UIZtjz71G+U1l4Mywrt51/0SqV8+89HrGuthhleBBahatj2UMnc3guHq+5jW/v7ulyBTwS/GmfBfJaJz0WDVVa/LGA8D61R5YQ==; 5:11O1afzOZ2BcbNY5DX07yKwE/vEUs5yMC7bccifQHvXcjYQ0lwMNCYDARY22O0tfMLblSW74yMyT0mppgJRzNX4Hc/kgFtBJ9V35F+ysrv8soNxhDJuOu5uAqM3em8flPWn8IkmT30RWveXlkgUnUg==; 24:6ZSVyckgrR5ZbDC5BK6Tnwxc9DyrzoSupqbuRso3tzT3SKqBiN5MrOpVZ+FNtzoitW0vNkKsD7XGdvvJdmUGxjgwpO1KfEDXtsCPb7l6ER0=; 7:UwMGlxJ+rd7iNATKgL1lpyrTsKHR33OqYTkYz7jk+KmYIk2VlHe9UM7CQjFQLylnQ0SJZgQjfvK1h9VKII8XJjBVrIdjjeX26fI8F46frogloawj+cT/uxRxxB0Al1w3H9AeRjLLBmir77wJEf7ZqH39vr6PWCt4GKVs3SQx6Bs48GCmz9zhKttHLTyi2HXyfrl+J/+W6oNt2E6xtnBUGmvySGTNLdn0gG5huQ4nkYI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 22:05:39.4027 (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: BLUPR02MB1122 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.41 Subject: [Qemu-devel] [PATCH v3 6/8] 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 --- hw/intc/Makefile.objs | 1 + hw/intc/xlnx-zynqmp-ipi.c | 377 ++++++++++++++++++++++++++++++++++++++ include/hw/intc/xlnx-zynqmp-ipi.h | 57 ++++++ 3 files changed, 435 insertions(+) create mode 100644 hw/intc/xlnx-zynqmp-ipi.c create mode 100644 include/hw/intc/xlnx-zynqmp-ipi.h diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 0fce61e2ce..8497d05695 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -4,6 +4,7 @@ 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-pmu-iomod-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 Wed Sep 20 22:01:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 816528 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="Xf8dk27q"; 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 3xyDNt6Wjkz9s83 for ; Thu, 21 Sep 2017 08:06:54 +1000 (AEST) Received: from localhost ([::1]:50856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun8u-0001Mo-Ts for incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 18:06:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun7t-00016T-Mb for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dun7s-0000gv-Cn for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:49 -0400 Received: from mail-cys01nam02on0054.outbound.protection.outlook.com ([104.47.37.54]:6368 helo=NAM02-CY1-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 1dun7m-0000La-Pm; Wed, 20 Sep 2017 18:05:43 -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=Ov0okFM1zctGJe8TrTeRo/7Vz9XRsUJZG2xhf9WQd78=; b=Xf8dk27qW6GeXZQOQuUCJczITUX8o/pTLAob0QM+yD+xWYOjBn6rUK3nMi8mlwKZwtCmi7hnCvL48TlWDXM5lf2vK6yqkRdrlRDGHL3s3aC6rZheq24V/fh0sL+3KdRjbVLkZD92EDjeSAbMtlWKXiY48k0hNfbs1FyHbri/HAc= Received: from CY4PR02CA0047.namprd02.prod.outlook.com (10.175.57.161) by CY1PR0201MB1932.namprd02.prod.outlook.com (10.163.56.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 20 Sep 2017 22:05:40 +0000 Received: from BL2NAM02FT018.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by CY4PR02CA0047.outlook.office365.com (2603:10b6:903:117::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Wed, 20 Sep 2017 22:05:40 +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 BL2NAM02FT018.mail.protection.outlook.com (10.152.77.170) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Wed, 20 Sep 2017 22:05:39 +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 1dun7i-0000ee-Cr; Wed, 20 Sep 2017 15:05:38 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dun7i-0002Pj-8n; Wed, 20 Sep 2017 15:05:38 -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 v8KM5Vot025835; Wed, 20 Sep 2017 15:05:31 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dun7b-0002N9-Kh; Wed, 20 Sep 2017 15:05:31 -0700 From: Alistair Francis To: , , Date: Wed, 20 Sep 2017 15:01:52 -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-23340.005 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)(346002)(376002)(2980300002)(438002)(189002)(199003)(356003)(50226002)(5660300001)(106466001)(63266004)(118296001)(9786002)(230783001)(8936002)(189998001)(305945005)(2201001)(36756003)(478600001)(50466002)(77096006)(5003940100001)(39060400002)(316002)(47776003)(48376002)(2906002)(81166006)(110136005)(33646002)(6666003)(8676002)(2950100002)(81156014)(16586007)(54906003)(36386004)(4326008)(50986999)(76176999)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1932; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT018; 1:k0lVsZVWS4uXO+h/mSnQQKc77xNxtt7mzNYVmxnk9clLcpNXJ5qiZMkt4pzoA1Y0TT+4IOVMh+p+Cju5z4nIt7QDPuINQeqIix1xfLswt67akvE92Dke7Z98z0baxG9E MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 717984fd-629b-447e-4dea-08d50073bad1 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:CY1PR0201MB1932; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1932; 3:+ClZKBE0hsCcncx8OkRZap6XUZAo3s5R5NXBwBF084B3n6HIHpdfAWRRuVkQTpbGb5IWmf2eDQOgonjBBEI/6bqktFi39kow0Pkv3qHJU0O6+3Qp2lRqHmw+3davLEAhgC86Fa0OZOjbqJg1Quk/sI620G6S5P0QRFVVe0Pl4ScCCKZn7BQfWtaPhmjyU7iHUMobnQ9kuE2LVrhuQRi//F7DPrKo4oMPoEeANwOnPCN++8ntaeIIBai+1BjfKm3mFII413/NgmgwC7zHkNOHRLK5M6mi4mOK/vSEewEpOCsGkwW5ZK85x0bCPSRKAa5tPogbQRmYBrPrb7+Bd1a8Wback/1ZY/2/v7L1MyYoW24=; 25:5/0SsfJY76Et57nO92RDt1gFL4GebXqve/zfCWdQoo0rAt7qi5VC9lVmUuwLdeRnSnPgxCzdP4FUrKTlFy1rJdMibjwVV4u5oXjNQ4VM8orZOcFY/bkTDf/ONa3LCFAZ/Qam6K6rEh42i83sKPpQaZLEKBN0rBNQhcw32mrqkLUZLqsPfQXeUiVHwhhg7JDrWS7IxM1YkTATZ9+/JZEWw5i+X3MdA9NCSYvbm13dW9NZqfcBOSI+T4B3ulzv4w4g3Fo1pYGmVT6zUT2IRKYJqRfXxk6IiDj44P2Whf/S/1Mk8H1pHWqu+FWEUttRLXhH0JmKXCx5SUVvDju5BT4+JA== X-MS-TrafficTypeDiagnostic: CY1PR0201MB1932: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1932; 31:EbkPqyLjQq5Fh7iOHXVFopEUF+2Ok7Ccu1HREH/uyn5KpfTs4mYRmYH7ToDsUZiyg0PWav0acgHBLhM7yH8T2sor/YhgCchTiCqMYrdY6EXTrmuuLBdg9fQL1/nibMbCMGee6VMv4ojvHs7mGIf3cMKSanIccV/mb/H22uUe45yK4nsEZIGFGn7LBBnUEQ+lU8GPpve/En7MO4zK5xwHTFpK2rpDZQcXQ3T/ZFD0rxs=; 20:yvkSlSZy7M8J644lJz7yywme0S+ifUsoLCmqlsjQMdU+6v+PiThorWFgNeoZ519WVFyy4hwr/Y5pCdMov3zWTg6ZyHsJgVsjmlBnDH3Sd/Zo342d9AWk0ZHmrmsQr0rEkbbADW5ccE6522A14xo2YTz1k91YDQ3o8e7sNhvf7bPGoCbOmqBnMbAVZao4/fXxyaGIkw9R4rD4LpQkFekzo29BGwRqEerwGdzEx6uFwgP/0vBlXQxbU2YKvEW3HyD+Y/g0T9kd5N1NpwlJStEXbdqHjGfD//FkkFbQxr5fg0AZlce2ZYy4pEudCSnztfhBGyOhUHMcYLbqbVE9IxjJZNUZYQ9xKazPA0c7gH5He6E3xTA0z8/7rZzmzvsnQZvB7eedgdnr6J4uGn06h6LXJ+BcZSbFEiU9Jv/MRcuuLeIJPzma0i6I0w8nB3TsO6fHjJDVOuLcZ54zV3Amg1tpb7F66i3bAR3/tuSLy1b7O7XjB4Jb3zB9oZ2CUtxHjQsZ 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)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123562025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR0201MB1932; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR0201MB1932; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1932; 4:ctH8GB87feyUSJpvMR3hTDsWPl2UVv+mOM/HRDdtPVHYqMyq90fy/NOIL4BUVU7yufUdZk4FjFgsEHTirx5QDIGHWeJle+SN5cFeLIZGnsOIJvS9GTJxrH9RcUKeN5dXTo0QgIlRTT3DSoPnYfphtv9cTWNhf1A4ZnXifVeLAIxFp+yTHRxgQyUjdJuRQ9bx5Uwhf5DS0sqzFVsi3IYTBCVyKCKrP440W0Keq84U57arsaebU1TPS/7O6JVR53P7jWpTyGkWkz4WSGkbuk95x4bUV7dEcnbc2cq4frL0QbRK5A2xXJ8c2ZdSPWazhNHZGKMkCCpqdp5Aehg4goT7Fg== X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0201MB1932; 23:SoQkPz/L/xxytszhvIgVpL27adFdbq+Is+/XG7e?= B27qclYB6WG/M7huC/r2nnT1owXHJ1K1b+sxVk1gWwZK6VTwvQwEsett8x9Z4J+kzA89/YynEOstVc9olarMSHzJnbb050I6qwdGmbCctYMMf3HU5CiDIGqJnzKY+MDdDZI1bQKvdCgKqOiOZVlebrlnXWC81FfDBGak2fyvdrHkky4xZZAmzILLXFMAcl/g+w566fmpH+HULrPJEvmt0G2almGsf53umlhilRLdWk/7wp4LQ5NoJr7SGu6G3qMcWLO0vhksocRMpzXEL6/wpZMB6/LRtvj6gf6fRxsRqrmA04pdeAH6wZEcQeEV5Bz849XK5Y0I6VNsyT7/LKEGXOUPVmKtK0ECA6OSlX0PKjRNUIuqZKmPorLymTxIdl1ZHG0bJRsPY6niWHmWYIqLd3SOHpw+5y9jzLTmuQ96Wei62oXoYCdiYbypaqyBItVSJQ1PL926hlqzPtWszvJ08gdZ2sKayVc/W0Kb19Sk96oLrudS1bIdokeOGRWki9j8GAjceMez6G6N5R1aneEdEwUX5MU8+xesvP0rmsSVwvCt6as/xJFZ/E4rKSNKMIdNbhkspdla2C596S/QkObL5KXRl5bi1wUilGWokmgNZRZ3hyXHd1R2L57BVwLx9ShWGfnF63Dm4NF5xAoHC3WzklH4699h0Q5ud5MZsAfc2hysrEOEWTt50/Q8u1KIYIwIINbwOZG/TR9+EiVuctlciGc58Kg4DJC3XE9ShvSkn4EmVYAsKp84lP/wiMF11bJeAcWVTzS5KoosKew2zsez6kGIZU06IkAm7HcwQ0EDHsQeO2UQLcAslAY5aVda5OJ0JxM5xdI+eyKfAr3lB/aYMhPSPddPgHcPZ3bNUgFH0liSs8YzJg/rge2FARq5VwLhWvtL8dpnCOeNbX8a91S8UaRY+DL58gJoe29pWmHhW7Axx3d48u4mAn+ShdEoNksOT57vUtAPDupwnI6+otRBQqBVo0mNX7BoO2KPcQ0qrwhwKfvy6wQF0+F+3TBkFg4fJxgCCfZLEohJ4Tvh2yQkxsTNi X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1932; 6:/++s16u0OYJ+KV+sMk8MLia5uaDJV0Dkfa0iGRfwTHl6nsLkm0RPIa44yk4FGtBHUwhoK8d5tY24aQN5z/RMkPirk41UGgaPcTFibbyOjmhfy264QTMvHtDMZXs6OdspJrbj+KY2+SHCVeuodn6umY2HpOd3OF51tKEPDq8kcsnqtAyolI8HX1rchcIFws1yFV3/btR18pRxdVheYXSvJiyUNT6Eprf8Hbk8oQrLgU5oClukIot4TL9lNbQ1DVaklX9H+HJyesEHYxDoMj0BRBdk4fXAIV5fmibSrHJstvBakMP96xj+lxEitvwQgASfYuJSMgWLKHN03DVdI76klQ==; 5:fk6jsDnl75pwDFPlWdMYvGfBOO5ep+15LT/XywF+i+oNOfFiXxcQ9xSE4n9owSv0awoCPfnWxMkzeY7T3l8s3veSdgdURJosG4VM74TVDzMl8cF6eOAGn9v85pl9zda8D/ra1/2fhTDccGwl/fRTDg==; 24:18OdjXKGOd+cDWLC8aaYrCTz6ygTWC7SqPLZEVSeucjPn5HuXdtkFkHihto6rjiT2rruZeyR/SfiObFfDUoP9/KFrj6zoex2CQNNWO7lj/M=; 7:PC9zSwlG2avwXPYN4O96zE5Ytfnh8MJwgAB2uZ+aFgx8xqHEwEldZi3l2rR3+muUKcXixWi4JQkVJiZvHA5HuhJg/jI5mtbqKT8W8jysHamDd7YbAAyij1Bgs68lWDdVzp3p1glqYGrL4kVzOFDy6KzGAEALszC9mWDL84uvUuU1pts8WngYSiGGzSF5ICo19Ym/+AmVevT23zM/EyTgiRGL497CE2zBQY84txNYFPs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 22:05:39.5030 (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: CY1PR0201MB1932 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.37.54 Subject: [Qemu-devel] [PATCH v3 7/8] 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 | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index ca98d82e87..2016e34db6 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -24,6 +24,7 @@ #include "cpu.h" #include "boot.h" +#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" /* Define the PMU device */ @@ -38,18 +39,28 @@ #define XLNX_ZYNQMP_PMU_INTC_ADDR 0xFFD40000 +#define XLNX_ZYNQMP_PMU_NUM_IPIS 4 +static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS] = { + 0xFF340000, 0xFF350000, 0xFF360000, 0xFF370000, +}; +static const uint64_t ipi_irq[XLNX_ZYNQMP_PMU_NUM_IPIS] = { + 19, 20, 21, 22, +}; + typedef struct XlnxZynqMPPMUState { /*< private >*/ DeviceState parent_obj; /*< public >*/ MicroBlazeCPU cpu; + XlnxZynqMPIPI ipi[XLNX_ZYNQMP_PMU_NUM_IPIS]; XlnxPMUIOIntc intc; } 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); @@ -58,12 +69,19 @@ static void xlnx_zynqmp_pmu_init(Object *obj) object_initialize(&s->intc, sizeof(s->intc), TYPE_XLNX_PMU_IO_INTC); qdev_set_parent_bus(DEVICE(&s->intc), sysbus_get_default()); + + 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; + qemu_irq irq[32]; + int i; object_property_set_uint(OBJECT(&s->cpu), XLNX_ZYNQMP_PMU_ROM_ADDR, "base-vectors", &error_abort); @@ -89,12 +107,9 @@ static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp) return; } - object_property_set_uint(OBJECT(&s->intc), 0x10, "intc-intr-size", - &error_abort); - object_property_set_uint(OBJECT(&s->intc), 0x0, "intc-level-edge", - &error_abort); - object_property_set_uint(OBJECT(&s->intc), 0xffff, "intc-positive", - &error_abort); + object_property_set_uint(OBJECT(&s->intc), 0x10, "intc-intr-size", &error_abort); + object_property_set_uint(OBJECT(&s->intc), 0x0, "intc-level-edge", &error_abort); + object_property_set_uint(OBJECT(&s->intc), 0xffff, "intc-positive", &error_abort); object_property_set_bool(OBJECT(&s->intc), true, "realized", &err); if (err) { error_propagate(errp, err); @@ -103,6 +118,19 @@ static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->intc), 0, XLNX_ZYNQMP_PMU_INTC_ADDR); sysbus_connect_irq(SYS_BUS_DEVICE(&s->intc), 0, qdev_get_gpio_in(DEVICE(&s->cpu), MB_CPU_IRQ)); + for (i = 0; i < 32; i++) { + irq[i] = qdev_get_gpio_in(DEVICE(&s->intc), i); + } + + 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]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ipi[i]), 0, irq[ipi_irq[i]]); + } } static void xlnx_zynqmp_pmu_class_init(ObjectClass *oc, void *data) From patchwork Wed Sep 20 22:01:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 816531 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="mXgAmdmG"; 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 3xyDTQ3jcNz9s8J for ; Thu, 21 Sep 2017 08:10:50 +1000 (AEST) Received: from localhost ([::1]:50877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dunCh-0004m5-Fy for incoming@patchwork.ozlabs.org; Wed, 20 Sep 2017 18:10:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dun7t-00015y-9z for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dun7s-0000gi-Ae for qemu-devel@nongnu.org; Wed, 20 Sep 2017 18:05:49 -0400 Received: from mail-by2nam01on0053.outbound.protection.outlook.com ([104.47.34.53]:47392 helo=NAM01-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 1dun7m-0000ME-Pv; Wed, 20 Sep 2017 18:05:42 -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=7VW2k/OHxNy6TkZ/r0t9CxmbY5Sz3LNDOhMxcPxFv08=; b=mXgAmdmGBxgVfsCnVrgyktx5ytxgiB68NACxxDQTvCI0CWhjF1haNU1uSBmevLLDHBR+Dx0BfKXya6h5wR/2r3JQ/kBpV12pNUK7Olp/uGGUYuTQ+AjqC1McDTffOBnkvvKmbNjYwJ7UOsUtFCpRs75i60C7aCUy1/qyZG3sNBE= Received: from SN4PR0201CA0030.namprd02.prod.outlook.com (10.162.76.16) by BY2PR0201MB1928.namprd02.prod.outlook.com (10.163.75.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11; Wed, 20 Sep 2017 22:05:40 +0000 Received: from CY1NAM02FT018.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::203) by SN4PR0201CA0030.outlook.office365.com (2603:10b6:803:2e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Wed, 20 Sep 2017 22:05:39 +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 CY1NAM02FT018.mail.protection.outlook.com (10.152.75.183) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.35.14 via Frontend Transport; Wed, 20 Sep 2017 22:05:39 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:56538 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dun7i-0005il-BE; Wed, 20 Sep 2017 15:05:38 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dun7i-0002Pj-79; Wed, 20 Sep 2017 15:05:38 -0700 Received: from xsj-pvapsmtp01 (xsj-smtp1.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8KM5YFt025875; Wed, 20 Sep 2017 15:05:34 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dun7e-0002On-6f; Wed, 20 Sep 2017 15:05:34 -0700 From: Alistair Francis To: , , Date: Wed, 20 Sep 2017 15:01:55 -0700 Message-ID: <062f70761df156e861bff162d02e6f0b7d8d0bff.1505929556.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-23340.005 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)(376002)(39860400002)(346002)(2980300002)(438002)(189002)(199003)(50466002)(9786002)(356003)(2906002)(48376002)(106466001)(77096006)(5003940100001)(118296001)(478600001)(63266004)(50226002)(575784001)(2201001)(189998001)(8936002)(36386004)(4326008)(2950100002)(36756003)(47776003)(316002)(5660300001)(39060400002)(76176999)(8676002)(81166006)(50986999)(16586007)(54906003)(33646002)(81156014)(6666003)(110136005)(305945005)(107986001)(5001870100001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0201MB1928; 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; CY1NAM02FT018; 1:m6u+5ERS+MOFaOoqdNnLVclBZS26W8QcbeQMAS1cBOJEBMkXbCE2Nwm4uRTyqvkt5egD6czAnm4YYH5KjZzeuQQK68LbdaX4Cgp6sjsUNPY1h3eazr4TJESdKrCruQYi MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ac63fda-7685-405c-41e0-08d50073ba9c 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:BY2PR0201MB1928; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1928; 3:LYX446qcHeiB4Q5zJm7IfZ9Z9ik1EjdfwsNNk4qKObqe+tWTQaYzVEWs76PWV6aAXw9te4MCAJNuxGgzkQYMoOcSbG4JV43JOfNH4edo/7Q9hZipCkUEJ49QH1UTLI+WJL9msP4gv3Zs8bCV/Vp3JqrUnTXq6gdrzEumrG4AYvAD0EPfWBQZlH7Zbd3kDpDPEt62AHExj+jDzUcB2g70JU8lFqrntj2gTy6B0NVcceIK0ydjTiO+Lx+GNXMilKcvjCvoRoXTtZ4c3Qex5ol04KBGv8bLBwE6RNzIfDNZOMoXOBm5suhSepENnxytfWtOG9fXcNl6E/6DGo6oA8y6GndhgZ7rL95MhUQin8fftyM=; 25:Pg765vm9lGr1itIMBzhofg33qMzYs1L+uXAd2iyxnnV9XbIeIuRV8sffCwcQPlER4mm/Nynt+t7Wt5cdJRu8VJbi/plqDZ8eRLJSz9aFoKhh4PuukNzM0c9IunDvWmSkl7nF/SqZdX95HLfIHFJiDtFONbBsv2zML796ykFyhABG8hsaIrHP2cXICXmfIIpiEHOkxWDJLFcllwgts4QBs/35npoD3pXe7fcbNa4PUuTij6R88CMG6C+2dfCBK5oqdOQLuwgs5MJSYySiU9vDZFLZbudg3h4sjdMPwt/HmMFj0EMO52VEfyQI94Gq9n9+xxnFDWGUrr2CcFXUinmkNg== X-MS-TrafficTypeDiagnostic: BY2PR0201MB1928: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1928; 31:XOa7DB7iPr8vUWQ1s6jZInK/EONpbbQ4j5VhjdlH67UrCBY8MQ7e2HVcPkEYflKfB9rYynx2ZFW1dEeLJ4aQuZkga6S65a+rAh61hltydZ1zDsxHh3YC+qew+OPNQXeIDm0rThsdeGRV+SuMzWexlzvQY4lIAFgzUCUWZ2M5vfxfyq3aOZbmhKGHjcg1U7mRZGCAdgbgR9L7nXslHFUQvuJd3e/dHkrIrgLlPdZACm8=; 20:/lx2X93Kw+4neuLVFtgUCKqu8GdDaL1UPgtuz4aaMw4GTc2wHMJZbIlkUiRE+1IpDyS3c/S69GsD3ELppcnFVGbkNr7EjfIPJJCYGXOo/vJn3IqdDhhhICZWfo9PIG/90KBFikpiv1YxS+MLYBybXpbDJ39sQbAtnYyA1WYdQGrsBrdjd2dJR4d6ss8T1I2/19oKdxje5fmNgTzIb/YVfaMcz5DtyPMm3dw4ojHReDj/37NHBLCbVRRwlxDPAjLgTRgvXiYytUVoroRRomDpFES6OWbcpe6FL2kd6tQy3lMg+bVGgTEoFYa8RF/5SKCfDBUgsP7vn2khji1L5iM2VV+wuNZ6xVJ+2Rn80RL1bwSigTQV6zyDuwCaRMN1RJMCKjiI8vGGSyK8GU8t6ZXRgmTnXvL9BO9knXFMesjUW+alHdBBKFchCYNh0fMdrRnVMwiTJg0VqAV9tvGcIlHD1myh1im1kJjgsQ1NP5mNdCEMk/yfoKW/3ajosegUJaMg 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)(2401047)(8121501046)(5005006)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123558100)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR0201MB1928; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR0201MB1928; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1928; 4:zJyjbRYfuI8MY4inWRJhvxCeM8lCaF56D7pHzzLycmTjxT+pixDtP+nCa5F/GC8SKhbRvP8IOzzGYrmTqe4efPlq8ggahNfKvOlnNrR820pJe0KNGbt3iOqnsdiDOrKO12a0m5pG7xrpH6iAkqLWJV3LubR3YcuSaChTilLMR9CISSx3ksgqLnB1JKwKzvG7priTi1SclxD2I32dOB/ANBFPWKWbxrycMKJpRLIUTBxlJXRZplulU7ptoQy/5Cyaex+KmNbAiGTdcNezDmktI9RnMxF4o0aKCFgHXQvX4FWc5YsMCqCPtdWQphxoFYmyJl41naGB50qKFSnFyna2JA== X-Forefront-PRVS: 04362AC73B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0201MB1928; 23:BhHkqUYmt98foBhK9Mvo9mEjxuxfFbyB5CigiLX?= uyYKrt0cZ7xM9UdiUbyAOnG4Bi6zl31t1aro+Vlzc6ON84kebiE2fxxM0RHrjQfb+OljKCQtx5Caq+C51+JGQnIWfIGJJbROxW3Vf9tdZnKUSQOds5osbPy7wtkrXVlQOh6ubmKOm6uMn2bYKVVN19pl5ZdJUZrroozfdCpoLeMWeGGXQps5KaYzeX6UBsKDzmk1JKo7VZpG6FfIwkqwe8tOO8BxFfsA8KDjOCQZpljEW5TNo4bIQBGgJPUrGMv81m6ibsxyOVGc5vcePan8ssTnk8xEMheeiwJ3l9czB0F9n+GiY5tMsS++Ggtbaqfcb3eUZDuub9MMDdwC9FJo4wZ6h0zd0VjMdWlTkso4bH7x87NIHYBo0CDWulqaX2yEOnltI9VHxzcaQZIpXJI11LBufmkm88lm5F7tZWqbhOHWuZ5ptZbn8hv9+MDCOsuI9rjDRmA37l8SBCSYEwIqX6a/VI6Ni0OKNse8auZ4W1eaZ7hmAbyZr0O3wpyLdISxmQaIYD0SpoyAR+vgzBuaOnPRLH1eNV11E/Ec8VnCAvOEwWpaYzoFOQGyEtHopkTy/yYPfQT8yM1Ol4JsR8YV21gW8h/drRKrp+UtPQcsxndJkpV3vC4uBFEzcdrBc9gDqwCKpPEUB/66tHF6QSZdJ+BZxKyZOiC1V2VpcWNtJiA3wFq4br3haglC7/7n4HmkU6Bttb/dI48av+okYxoWBWnXv5IWxaEAEb7yI5LVt44qqQNOWMFIXIrtS3q+T6GIw66mOzhFCaEhC3EW0M8+3z1W7rrEeAmB0L4gXXvcUxtbPv/f2v7Ck8RL2uIndttT4jicWAYLmpRqG/DYlscDyKf9i+Py7zIJL51iXL5nNlMq0NVUZjRe7lO95GcCYamww8yF5Pzbs6tJTQbffcOYiq8iP8jvG5NfkxzCZB192sRynKblI17duNXsRzr0voCoe9hEZ1i24ToYGVQq3qLDtHktoEEjDzQSysX3YSxA9HE/7Gg+vt0DebPA/2ctJygFDihAoVABKEE1GaMsef4oDpw8XzOze4hjrWk14s8pWw1N3FFYzs2j/e3xmbiCQHZkUsK4= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0201MB1928; 6:F5WRk22KubnChK5/x7qQ4wC3wVOsETTDdIh2ietme48VCBpvUxePwCkVX6lC6kSEHxt/dv80QDLWiWNLvbALUa3QImc3qkpUgOyvnem9V3BI3Z0DlMLOahyhgvMNYyfTwrQHDMfAHXisr7AJrjpiNW9wC5+QTTeXHtd0Q1M2OZacDvxnajBEKG+Yif7iUpuPr0rC+1tljvJtvN7lmLh3O94fiF+Ticd2YaIr/P5+GKQCabJl7tzjDWxpVRklkaOIdl+YEwHvAA/UIgXBJ8UML5pknLjEoW3Uy4tWpTkXKxvMfkBuRdUOMAmYnXslWodF/atHpcUugJXBiyskITjGhA==; 5:KitEVf3XS4l0g7FJ5UOYjXWt+fJU2wr412PU5MCRmMxuIflY2B/zUXFvjjzkPEEFZfMjS7eAJ3Aq8cICntP6SSRAUAtlgOmn+Cdli/04Ux+jYI6TzzXZIRqInQ7rmYFDadpMLJfX0Al7PQhvRvj2Pg==; 24:dIRiSuTrohkdUYJpBko/dK+BZWiND2NIPESF7rOO4v4MmqK4pH9ZLC+Q5zvfDnI2LIiXWwGfrXqunS3W8T1EkRRrkZTXIRDpw9gdg06UVSo=; 7:j+wesUR2ShQLRpLPobOr32AdKZtMqMbnZGJGfOz5ZENXifOfUpfqbDNh70e8hyIqxIUpXiQRMEzRkiLNlkhEs/mEQRk5zqxicInCztji0M0R1RQ61Rs5XxoCq/yRZJYNmo+8IZ1pthdnz6HHvpHaEd3hYAqKVmxyHFpbMg2vjeBXesYip1/06IZxaKOmohTsWEUVAeDf6AcKe6lOZWKE0VF4kxdkuQIqkUdzwFv7y+I= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2017 22:05:39.2022 (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: BY2PR0201MB1928 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.53 Subject: [Qemu-devel] [PATCH v3 8/8] 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 2b27daf51d..8aa1f02c62 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, }; @@ -174,6 +177,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) @@ -422,6 +428,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 6eff81a995..dad2bda7b2 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;