From patchwork Tue Oct 17 17:29: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: 827186 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="J9tmIklt"; 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 3yGj4C0F8qz9t3Z for ; Wed, 18 Oct 2017 04:34:33 +1100 (AEDT) Received: from localhost ([::1]:40848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Vl8-0004wi-8l for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 13:34:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4VkS-0004w3-6o for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4VkN-0006Hb-UH for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:48 -0400 Received: from mail-bn3nam01on0080.outbound.protection.outlook.com ([104.47.33.80]:29984 helo=NAM01-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4VkN-0006Gw-Of; Tue, 17 Oct 2017 13:33: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=6XW41gN0XpgTCchIK67MAWmeft7iHMpvUVihoku2V7w=; b=J9tmIkltF5eCrVHPUPMeEmQ+pWUmr9g6QO2TjvkloDiTz9kIb+chQHIL2RDCrbu2h+SVqG6NMIuqy9jnHYsv2RDoSD7/s2kJFIWNyXWmGAqa6POpfHpPzr3x9CEir8gd2wz+cMAYzFYZjezTaRZFzPBDusO6mMvNWFHT9cH/ykQ= Received: from MWHPR0201CA0012.namprd02.prod.outlook.com (2603:10b6:301:74::25) by DM2PR02MB1339.namprd02.prod.outlook.com (2a01:111:e400:50c8::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 17 Oct 2017 17:33:40 +0000 Received: from BL2NAM02FT020.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::208) by MWHPR0201CA0012.outlook.office365.com (2603:10b6:301:74::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Tue, 17 Oct 2017 17:33: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 BL2NAM02FT020.mail.protection.outlook.com (10.152.77.162) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 17 Oct 2017 17:33:40 +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 1e4VkJ-0002QY-2y; Tue, 17 Oct 2017 10:33:39 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e4VkI-0000mb-Vy; Tue, 17 Oct 2017 10:33:39 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkC-0000lV-MT; Tue, 17 Oct 2017 10:33:32 -0700 From: Alistair Francis To: , , Date: Tue, 17 Oct 2017 10:29:44 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23400.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)(346002)(39860400002)(2980300002)(438002)(199003)(189002)(110136005)(189998001)(575784001)(16586007)(54906003)(106466001)(33646002)(6666003)(2950100002)(5660300001)(50466002)(118296001)(106002)(478600001)(50226002)(2201001)(39060400002)(9786002)(48376002)(5003940100001)(2906002)(81166006)(36756003)(36386004)(63266004)(8936002)(8676002)(47776003)(4326008)(230783001)(81156014)(76176999)(50986999)(316002)(356003)(77096006)(305945005)(2004002)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1339; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT020; 1:4LkJPOrmXe+eR7HzcXQh43br8DlnM0flsI0j4ZnPFNanZLhDwUH4225itOd2yGbOBB2wZ9PMMFIu+VcWwXEP24o5RPVat/cJ8qgOl3bYjc27BgvxVk+VKoX9BDdpGp1g MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a3d77b5-4b3c-4ad8-a870-08d5158534c2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:DM2PR02MB1339; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1339; 3:+irXucXD20u+Ud3ucnOAJ0K/kY2S/Togo9df6ZEjYaFSRVQtAthZD21CJBwvhI20OlRMJWmQaQCex8vPdoHllFilOvpCVTjpxLhg8ecxsfv3byBn4uB5eMtoWjZAscSwFxmUheQRtGApTyNXtPU2Bx+zIaQ9BYIcKpX5W4jFknuUZppOOBVeuTdPwfVBY6kSmJd6Ln7WrxA1tSvzAHn3QDVWObXS+/UGxv57CG61sN3vK00p7e3BARAN+ftFhC7UPxzVGLOZlYpCqqOX+F3C2uT1lGTwVpzRN8TvM1mkMHDxh7JdKh5vP2Pcd6V0pJ6E9Ee6YYnXj6snY7Z9FpDBIt/yq5X2GO1ulxWpfJ27ep8=; 25:kRYkVNhjZwyneYPFI15np5nvjAzc+Rntg9Os9x/x+fLHmPO0as2edanSPcQV+B2/PrVIKbwSslkQX6YzIxPFWf31cXOLW+ZJcb6xiZaV4Wk86FpkPNn5pwl7NizTRZz2ktBt9xCt+W/wHTbgqICRJJ/GbGbmemy6VAvtb/KPmeOY1juNbtuemha0CSIqhOidwa2Sgir0ou1ESOTSuylDHMqx1TIG2zppDK/TgPzjt26zb0oM8fsMtBIob7D1/65VXIhTQDx8ITj3E/IhztCRN7lAn8Rc5IT0U52y8Y4VQUFytmTzpkQv150pb+YWVrpsDtmAArOHJsNs0qyHhwTQeg== X-MS-TrafficTypeDiagnostic: DM2PR02MB1339: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1339; 31:nNhBzO2BGn4XoL7lFR1F6NENi4IUOghkzUiU/puQZvWN3/LwUMIJBFbRDXop7vkUqZrTMQZX1LSAtWXKT5B11dqlGsUCWNUeWJBi++xEnVV+/q9dli6XzabJe1HlRtidKkmdDD4DDvmH9a+js1aOFAWsRpBOScM5tvYwASi1sQ2by9l1vKbNoa02l1/7AJ1HqSgww7hVAsh3hPquRgCWKVR2I3A+eWghqa6cnnYA/N8=; 20:ma32g5WW4U7YlBou90SpgpQaSVDkohGxxej2w5r/4N+sF6A8wO7LrKpwgWpGvkTK8h8vSmVI14UhnmDvlXPPDbjGxUX8zrd6k3XhxCTqhid7QnbyLo1jiOllRfRtV74l+2LdIX+HzaqKcHMWvbMo0cQNYQBl/Mo7zRB/NIyJSlvkFzggESo4m8OunBt0REi6EORhNmPrBWKPbBaKeL8WDGMfdZcJmfizg0ESlgldU4+0J7R+eF8pYwDZRklMZHRa7uykVcIzGy6XmEygcvKK++tgZrm8NS2UNun8WCmtpSha+DZ0vnTwcO7tTaEsvQK163g1oAPIa8W1jy0Q0YgcDrK04aFsQZTQClbcfWVMCkEfL5JQG6Azd98KyTdL/Te1MiWq4sU9gy19BbNKSL6fVk2zRcJBpg2H/d6Pri9SOeAPnteve4zeUJNLgeUn+6ybT8JwiZfP/GO5uzno5/b4dkzACturwbgJ1d9D6ovE/kodJeEx+dXwLW7/z7OhVfw/ 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)(100000703101)(100105400095)(93006095)(93004095)(10201501046)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR02MB1339; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR02MB1339; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1339; 4:6klRrC3vwtAMqBc2Rmg6Q5HCSwfRu5tT+7tJ/UFsCEfo13PoTXyRdKobdUX4UwfwO/FejuFDGPQjN29wwkpGkZyWg/Olpp0p+2EIW2sn5C74OIsvAJLcP2g+2FX/2Ckol9weicGytEbyPj0NcBade8FZJoW2CbImFWvpkMmb1m+mnGHvjYj0oGyreltASJPxGrJtRmn8z5NOuORNT2i352yHSWRZIEJqOJ9rupnrhzSGJ6I2DSKvXYAb5ZMJ1OdFRWQen3u7f64JGq2n++3iFaKbDC0wNXZYuY1zOFGQAnZojmGKM9LEquOQNb3j56neha7CcOQNjs1MuNz8+wMB+A== X-Forefront-PRVS: 04631F8F77 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1339; 23:zkcPYDLIDxdyikQDdAm7gTpf3O/mcWNOBJKi1bd2r?= x3k8AIZ4mA0/ypCOS6yYRITKqVTrV2lTZzIzOwXRwt0K3S88DiIjWW9omQB6DTJNugEawud5pyBRqLEnGDMsucnABIpymIodKVYyWh3BPzzLSRHTMf5nV+x9kROu+ot23PGUArvAcEDnomU4TiJ59gxIUGDfOJyAb6bnjakxia+kTU7NgdEwybA9+er3Oj4E5nga4ctn7vEozZ9iYcGwlzCAKRznVMMwOIDx7QQcJo7O5fRHF0v2T+qU1WuQ8PF7eLWR78unef4ebWw+zhKscC6Ui5KT6YbigNpOqI1hBdF7cNnTdxSG/8uDkIcqY5KF9PMi+CXeJysv++AB53p7BIWRAJgyebcml7BXnqtQwpDlkdJzQ+/YZJsuCEqUqzkJotdPTRe0C7O6YNDHgZRgVfOQcVDuuOtVtCDhpMjpmXThutXbeHq6dD/NbvYbPrr4DHqJE5BbzKm6YxQ9Y5ZjTMYHOQh9MU1YCdVidGQM74wftFNFeW05A7O104vdUswbuInPpQeJwpCkSrI3zH7YqPqAFQp32LRWZPD6x1UyzijqfCbwqP8P6S6di50j0IoV3bIrxAPdQqt7mx30sn06ynt5m1BwbfIHWVuGkOx6E2JBURbeRbfnjguNq7l28i90hoiSPVWHnHCgFjldjmU0xeHkaXdbxYBl1KCb7aCn48vqPODLlgSxXrlBJWFb1/DHVQCL7HW75Yg14MzV1oIG7UbZt7NikrTmJSGcahoaaJ/B0hOd2h24wq32CGBAkTXHPG7hzCLF0R9kFDeV5+iVRNob/HaUI8HAAv3gdxCn+HsN8+0I5YVluVxDWDCyjA11MrHVk9oWh57u8xMzLW992dMlFXCYgu3ieLTJJboyZ2wxN/qwhLtEJxUTUxFwIWYQSJoMqFemFhm83WullHQOzq0A6flCI8P7r8JELwzZTBxnJ8iDEc2J+GBC/Ycop70LjXO9Cu8I4P2zUqNRJb2QfwKvzArsQA70kDxihCV/KugzyYgeFYoopo7Gvwe4EFB8xi8SoImKYkCCQHdt6iE5y+cSYZfTWfuNEljpFjdd3kNqSOqiJ2Cg8QTdZS3pWGp3rhDP8gaio2YRV3DoiYxdjaC X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1339; 6:QmumniH/B91O5Tn/yMToyNgYI4lNLyjNp3v7r5lo3/aYLMN1YD/aUpAJf+gVVFQB2er61RtuMzN3EzTDvmuvIcwjq4ysEnVBrOMj155Ej1JSLKoEQ9lX6AE9Qpi+RO1HlfWNxYFUMMAnsFpu1h8z6pLRLD5ryAtxjlv/m+3/tfofV78WLJsCq/hvnsS44zX4DPJCVvv0u+w6tQ4zUZ1MdWBthBGSnWUNMwIi1TLRcofRL43wF2vKyBB3tewEhmcoXK39FSy9+dsZfAX9a8T/VZ/8DdCjKDUAbVyKqHmWRUyRoLxFuGTIcEyuEBjlbUHtM2oheIOrG1Eg563ObHUEKA==; 5:9LeKrWgh9y6v6BpbXpiBc6nksSXXKadJ2d02Vv/3PqzI0VOx/fO8KLsJ72PjK/R+LSPp+mleDMu3NfHJce+vrASj0p8U1wjtEorx2iVFFmneOqQc6YIKfUthhi8GhmicgidJZi/oa3+hzCVo8UL47+TY79BP3fz+37DpJtMYClw=; 24:d9cacv/Ol5kQOixNkbHvFyT9yMxVMImNoKuLr//gKFhHtlWk+xWRx5M4EotQ19opqKHdAOB3VltM+K15FCg507Ocj6v7rsGDrp7smRp2F7U=; 7:yc4qUDGTj1Ye7Flv85vnHIChZ0WNeV+yaZ4jORlI6wUi+M0kFehnNgrsjQ63o6oWFeJr7wqAOtYIfG2UWwqK2vqgFV09LfzuoUt2iR2V2hRMMbOm9P6OP0xD5LE347QFftyTRtFD/8M4myzBNSvMy6EJ9y0d7JixbRjz83AfVP/L0QQb34I2daaaT6//igO4jU71OOo8ubgBgEpgyNWV/AedkDNUUnQKXauQ6oMP5Tw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2017 17:33:40.0299 (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: DM2PR02MB1339 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.80 Subject: [Qemu-devel] [PATCH v4 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 --- V4: - Rename to remove ZCU102 name 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..ac0f78928a --- /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_SOC "xlnx,zynqmp-pmu-soc" +#define XLNX_ZYNQMP_PMU_SOC(obj) OBJECT_CHECK(XlnxZynqMPPMUSoCState, (obj), \ + TYPE_XLNX_ZYNQMP_PMU_SOC) + +typedef struct XlnxZynqMPPMUSoCState { + /*< private >*/ + DeviceState parent_obj; + + /*< public >*/ +} XlnxZynqMPPMUSoCState; + +static void xlnx_zynqmp_pmu_soc_init(Object *obj) +{ + +} + +static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) +{ + +} + +static void xlnx_zynqmp_pmu_soc_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(oc); + + dc->realize = xlnx_zynqmp_pmu_soc_realize; +} + +static const TypeInfo xlnx_zynqmp_pmu_soc_type_info = { + .name = TYPE_XLNX_ZYNQMP_PMU_SOC, + .parent = TYPE_DEVICE, + .instance_size = sizeof(XlnxZynqMPPMUSoCState), + .instance_init = xlnx_zynqmp_pmu_soc_init, + .class_init = xlnx_zynqmp_pmu_soc_class_init, +}; + +static void xlnx_zynqmp_pmu_soc_register_types(void) +{ + type_register_static(&xlnx_zynqmp_pmu_soc_type_info); +} + +type_init(xlnx_zynqmp_pmu_soc_register_types) + +/* Define the PMU Machine */ + +static void xlnx_zynqmp_pmu_init(MachineState *machine) +{ + +} + +static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc) +{ + mc->desc = "Xilinx ZynqMP PMU machine"; + mc->init = xlnx_zynqmp_pmu_init; +} + +DEFINE_MACHINE("xlnx-zynqmp-pmu", xlnx_zynqmp_pmu_machine_init) + From patchwork Tue Oct 17 17:29:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 827188 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="UkC7+cfd"; 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 3yGj6k6qWzz9t2h for ; Wed, 18 Oct 2017 04:36:46 +1100 (AEDT) Received: from localhost ([::1]:40868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4VnI-0006tk-KX for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 13:36:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4VkS-0004w5-6q for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4VkN-0006HN-SP for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:48 -0400 Received: from mail-dm3nam03on0074.outbound.protection.outlook.com ([104.47.41.74]:46304 helo=NAM03-DM3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4VkN-0006GD-DZ; Tue, 17 Oct 2017 13:33: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=lSCyAUYnSsOUzabSN7Q+n3ALL4n1yVAknuOiXdIf0+c=; b=UkC7+cfdYt5YXy8MhYTuv7nNVNyhIzDXaIS7OkcVHpZkaXW/YPuZduNQc4ywG5iW9vz3bXi9w4uTre4SqoJ+Ry8xj4zHhdGGUBwpfybvSVtChXPqBtgNoq6BPDmnPG3lFUkIIUFJjUN3RLcbJJuCqqFMBP7uzItwyt9sGBV8MZc= Received: from BN6PR02CA0040.namprd02.prod.outlook.com (10.173.146.154) by CY4PR02MB3382.namprd02.prod.outlook.com (10.165.89.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 17 Oct 2017 17:33:40 +0000 Received: from BL2NAM02FT006.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by BN6PR02CA0040.outlook.office365.com (2603:10b6:404:5f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Tue, 17 Oct 2017 17:33: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 BL2NAM02FT006.mail.protection.outlook.com (10.152.76.239) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 17 Oct 2017 17:33: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 1e4VkJ-0002Qf-9x; Tue, 17 Oct 2017 10:33:39 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e4VkJ-0000mb-6M; Tue, 17 Oct 2017 10:33:39 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkF-0000m1-54; Tue, 17 Oct 2017 10:33:35 -0700 From: Alistair Francis To: , , Date: Tue, 17 Oct 2017 10:29:46 -0700 Message-ID: <94d28514b0604f92c262fcbc097245d593f497d8.1508261326.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23400.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)(376002)(346002)(2980300002)(438002)(199003)(189002)(575784001)(77096006)(5660300001)(8676002)(2906002)(39060400002)(106466001)(189998001)(356003)(50226002)(81156014)(4326008)(305945005)(8936002)(81166006)(63266004)(33646002)(47776003)(6666003)(36386004)(5003940100001)(2950100002)(76176999)(230783001)(9786002)(2201001)(118296001)(478600001)(50466002)(36756003)(316002)(110136005)(54906003)(48376002)(50986999)(16586007)(106002)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR02MB3382; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT006; 1:u6HqkHsYeoB0eUg2jTW08gXeTRgE0/CNaBp0Fy7XhrLNFHy4N0fZwaZukMPH2h0ldgIir/7KsjluBDZU8WLj9tdyj4unp0c3P9L5jgNU1mXMSxWcGfgY1zu9F+oJ/gHW MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e704c5a9-779d-4750-f6a3-08d5158534a2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY4PR02MB3382; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 3:9lR6D8ylEE9a/tlGpyTM9hOrWPaJ9MmAR+fugB6Y9O7wtWvfkr+FV/0yhzhLHd41COurBD8Zv5/LTVx1daq7P0mAYweLRJybhs8We5LMR4HxOH3ap8Ftg7d8igjvUGe5pcPU5fg8jMc9Q+S4hNbRSowBPj8A126j7wni02aDMQ4Dw34H6C1Lr6UX5WysSoFO9TE01DOE2u7NmbiTMPq8YuQ4DAzt/fYBBr6ljLgNBPIgnF9iZdtp4pYXOtfos5cqLNh4CXxEDh1m+uKLEHO87YQjYwtkzY7HrDmK8fcA0SQu2RWUeyvAEloWEvA6uzxhF2wdk3oE9PqoqqwA/sM5lgLM2hW7Xx36T+6BVcDFUiU=; 25:BiVUYmXZ2lCZE9HtdfTtHEn8Q4fYOaNYntF1q9gE/qnHcnKEIzqXCK0cdgEfW+OEPH0izm/DZtt3/aQoFso0wicLxsJyIBCYW67ZpWUU1X+PDaDuo0HlpVuvvSw41dxwOI2aQWbLdnHdFsGK1ZkWThRqhfmT+o3Tp4PU+piZTgiOY8Iip4RAT++TwgpLqKbQiwL8y7D3lUElZQtEdrLKRqtrs1O/vtIan0xWWTw0Ax/b8+jnCjNTHeQxTyySMfCu6fVJAYZCo76lmFznqOIw5W0St0F82SzjnrHBaPLJpyQF1QJ2TlSNgMCxV5/+XB0Ovb79HyK8/H6V8oeaXQc2HA== X-MS-TrafficTypeDiagnostic: CY4PR02MB3382: X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 31:OQbtcapo9E5pfRuW7QlvjGZMcawtQa9o9TIcQx2PYuNzzDirW/MJWCyA79i25X2z6ecgTqh/wvjtkJbsNL8YtRgewrmxwvOQT72BsoXZxggK+ddWcqYrJsAS9YkmjNS7ke2apgg+8eBjFFFlfeS75BZcQ2vKr8KJe0Xg/aYHmPYbObwic7NTCBT2EYRe2ExJP0A20ay/JmAEJHKxUsSmjgZCPQJuLGo2I+CT9Lf1sdA=; 20:SWRLgdu7BiCVw+cM7H6ptACTRIirmU4M4g13Y+1JZyV1oGk2J3Bx15iNOq5TN2jrEeK3GdeyJIuTW2xAlXuxTR3FPrqw1zgzNEDG3l2Md+Vbnl0RK0ZpceWNusExA9RXmEKTe1ouucSvI+us4MPx+JEdUzaqkuX++c2xWH6PLV37MRe90zX5iwF5Ykf5hyTchLPAQcPNf0Eh4QizfusMlVaj1flQk26ymiIqG3RoCRWynlc6h2GqkOV6QHc9Ku10xsfGTFs+m/W8EneDu7P8cpOYmKuUa3ZS/KFBV1ycveBw6wSm7S2vaIh5xCnD9IvXQavK31xuk7JAXR4qnZZ3CkO1Wk7C8gRlHN0iwmWLIV8b54vqIhwKlMRzroTx64lyVka1jrYnDDx+ETWRLjFYhrzFUUYYoe899o/Y7Rxfr/1kwUwzDfF9UOl4oRVlif87GGB7dMEUcyxEC8nCw6Dj09T9zRvw3/QbURQXVqOrk4spjy2k0IAUA04NQ9l6AvFn 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)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR02MB3382; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR02MB3382; X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 4:I+2vWeNuMtZBLj+DMB/ln5yGYXRlBIl2isEhoI8B31up18XDvq8rCmtMAQmVkirMNwm7H933AtWBNasgtG/I2LFFJGYkj7MFH0NaLuG/wecQZcRj6NaeTFRK3mknKm7s4+GAtyw+mmDcoEic+4+FPGIWbT64gxB+wGD72YuzPsawm1VQ7DLiUUXPYpw48Nw7lb3IfMxF1srRU5kO3r1OOblRL9lF9TlR5pXd9VAZwmYkhngBK09zkN6gSuKTb2JMMiYpFCxZ0XnxyiLhEhUhGQM4/6pvuypmddWgeU+IkVk18mVPMgPHlv9AtopyqH5D5XIoQbwHpQvBJ5ju+lrc9g== X-Forefront-PRVS: 04631F8F77 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR02MB3382; 23:jNTBsi8Gp6r34TzPLK6QiSSqQw3w5KvF/NCUmYeQx?= /H6l2Y+9Hx6AAE+j1aDd3x2jarwCwXQ+HPcsqfzMXaUNi/sJEemH3i97daG1dblUJKXqdfo1ZLJ4J3okRmk8AuieLdc9RbDGevSzOsxlUn/6IZy9V5bjshOOXrtGLKAkYMXMzPmzEc/zucbJ4pPm2sU6AAUXX05znExFT/zr/57/KJKmkxPl4sUq/zpBzaToy4dnHpFYehMoeS170mPxgVSQivyDRkuAdKMqWkd5yRL/e7wA5Wfvi3SA0ie4PXrMKbTlGt5VygP8msn/iuesKBagLowaln/rx92K9hGR1Jb1gRoYGfpOxOnghV4k1eizbMaxJ3jgPjc50kHLqEigQfxoPKFN9lQogxbhbfuo8hCOceLsg8YzNz8trsnSQtqrPRkyTyibpHLb0p4mf7ODvCeZCY3Wa5Xms7FTldaZqW8tKTRefZdwynBAlk3IOFp+JeQThm19D7hDn3YfZ/c7BkW6EeXKCuIhEcrV/7EQ+NeFzzj+KX9hI9abVOZ/PBZlWPFQA73bpNpoFiFldgl5Fif9pUVeJpS+qEV2XXFjkiYNhgummsKadiGpPCI5n46JK++EaVzVzBiJWGWQV1W//JOYMR2c1LvQHIG3G8QqvUy/S26ygztqkV/H7EwobOqr7H7I75i6Tc0ow+gp3JF+IE40tOqDPnm+h9WrzL128MVLApMhSZVyojwmC3tRecqW+RyHysT+K96ptWTXe1vc+T/nMlsuvyfFVQAcMGVkUQd4fBsANbgdwUAjieL8JFNJH5CG9S5eMAmlCNpjPOxLLZctVI4SMKyyNOcaKU9YVCsmE4PqzcNa/nKWn70mDZAZJUgPXRQzxVEaIW8OLK6CJ3C+r+zaAj5P/X2wHECM3f6B88A4XzmKiyDSEAA9TT1fSlEOui/fiLMUZDa8bRLoHvPiWT/UBx5cOKXDJYcwbZB3woi+pdM4b9YmbAr+hWhGZ1dVfsXAoAvFFVZwRaYOCQ3gwXpynDJ4HUcE1GQpCBxbo+SL96e9I+LsZ7uUlIV8X642m/7bIfbjoSR/DKwli9oZVIw/890fswawMb5lwqWNgFMQnvaEffr6w2SgBM0BL4= X-Microsoft-Exchange-Diagnostics: 1; CY4PR02MB3382; 6:Lz77q4pfwUKEDDLYXvjQWsadbsvxaeJLi+haOufLfgwFDxZUHZ4+fPsyIJOO3Eg+zVbjFCSUUXrkT73WnDE6UfV5ETvrB32dhQB5EDWYaY7WnoxHXzZi5pvKr/Ie28FMvXKhDGpWQjRjEVQ3jB9v8IZKjlc7g41s8kfMVJ64VbyqGCc0Ybc7TPP7oWaMRiMsYQNtT6m4mjvazFUm9m5GzGy4bFNKxKDseDP22z2qXwWwhOidZk1HOi+4jJoRgQdK0t7hNX9vyGK28cRl9Nrjo1lEHpa0fZAzT2Joj7djTf1EgCMUSwKrdzdjrkgKsVMcEFHenoo3CeFHcPVYIx6QYQ==; 5:62OEvKK47w8Uq6em93tx0ZU+nFUiP/vSGJvYFEyqHzw784Dcdis0sT72iu7bJd3sJOLOzx2TGTIjk8ytz11lY1BL6hhRMJtTHlUr0/OqXy6kGD4RZWYvJ/VVyrL6HbMfo5LL6QlE3d8W48nvQs4H/7vmAzbPWpszC783SCx/bWg=; 24:5kvJGK4N+aTY8G4Iz8jVlmvh3x1max62jOp0wGmPSvUcivyzvLA80eyBY3eJGvmnquMD5mCr90B52jUeBeWVjnH8qFy+GOJP1NCwvE2lwfo=; 7:7D3CXl0vYsbm7cCCAuFZ/UjX9s55FMMQZrndrVkCXR4MzRrR7WV3BRBQ7FQK48obuhN4YNwu+bePtiFSUWUyPZmFvY4BDj98IXbXPQHNNc33QdnPofcXBs0qERnDhhIS2xFvRaULgUJyBLL/Ls+hHOdj9kEqahSUdit7OXv1gFr9SiZvdbkCPROQKxY7QobJY0QU/vYcO7N/mD4NxwVITiafr7SQKDcrek7Vao296Zw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2017 17:33:39.8222 (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: CY4PR02MB3382 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.74 Subject: [Qemu-devel] [PATCH v4 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 --- V4: - Remove the ZCU102 name 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 ac0f78928a..c6a0b3b8a1 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_SOC(obj) OBJECT_CHECK(XlnxZynqMPPMUSoCState, (obj), \ TYPE_XLNX_ZYNQMP_PMU_SOC) +#define XLNX_ZYNQMP_PMU_ROM_SIZE 0x8000 +#define XLNX_ZYNQMP_PMU_ROM_ADDR 0xFFD00000 +#define XLNX_ZYNQMP_PMU_RAM_ADDR 0xFFDC0000 + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj; /*< public >*/ + MicroBlazeCPU cpu; } XlnxZynqMPPMUSoCState; static void xlnx_zynqmp_pmu_soc_init(Object *obj) { + XlnxZynqMPPMUSoCState *s = XLNX_ZYNQMP_PMU_SOC(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_soc_realize(DeviceState *dev, Error **errp) { - + XlnxZynqMPPMUSoCState *s = XLNX_ZYNQMP_PMU_SOC(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_soc_class_init(ObjectClass *oc, void *data) @@ -70,7 +108,35 @@ type_init(xlnx_zynqmp_pmu_soc_register_types) static void xlnx_zynqmp_pmu_init(MachineState *machine) { - + XlnxZynqMPPMUSoCState *pmu = g_new0(XlnxZynqMPPMUSoCState, 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-zynqmp-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-zynqmp-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(XlnxZynqMPPMUSoCState), TYPE_XLNX_ZYNQMP_PMU_SOC); + 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_zynqmp_pmu_machine_init(MachineClass *mc) From patchwork Tue Oct 17 17:29:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 827189 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="f1cKnqDj"; 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 3yGj6m0VMgz9t2m for ; Wed, 18 Oct 2017 04:36:48 +1100 (AEDT) Received: from localhost ([::1]:40869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4VnK-0006ul-7N for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 13:36:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34836) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4VkS-0004w4-6o for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4VkO-0006Hq-2F for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:48 -0400 Received: from mail-sn1nam02on0073.outbound.protection.outlook.com ([104.47.36.73]:9672 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4VkN-0006Gv-Qu; Tue, 17 Oct 2017 13:33:44 -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=EzYOU8PpSIPpZGMl73KBPg/PDK9NJUPxEvo68+u8KIw=; b=f1cKnqDj61R5rFbGdB+7j92dM++PkRk3ClT659qx3HqgLBLdToy28FY8b/cSSFoca82MPEAl0eoZViYgs7iJNiPlzSuwNlKRxjZ0lXYFNj51f+J2mGJrr5PCpjOWApqPfXTyza2V6pw3BBQf0tgiizjv80FDiRho8JfXilYzDVk= Received: from BN6PR02CA0099.namprd02.prod.outlook.com (10.161.158.40) by MWHPR02MB3389.namprd02.prod.outlook.com (10.164.187.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 17 Oct 2017 17:33:40 +0000 Received: from BL2NAM02FT024.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by BN6PR02CA0099.outlook.office365.com (2603:10b6:405:60::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Tue, 17 Oct 2017 17:33: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 BL2NAM02FT024.mail.protection.outlook.com (10.152.77.62) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 17 Oct 2017 17:33: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 1e4VkJ-0002Qa-8C; Tue, 17 Oct 2017 10:33:39 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e4VkJ-0000mb-4h; Tue, 17 Oct 2017 10:33:39 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkH-0000mV-LD; Tue, 17 Oct 2017 10:33:37 -0700 From: Alistair Francis To: , , Date: Tue, 17 Oct 2017 10:29:48 -0700 Message-ID: <2c8b07b555fa6f97f4c741e3fa5b478ee80bc68f.1508261326.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23400.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)(376002)(346002)(2980300002)(438002)(189002)(199003)(36386004)(81156014)(50226002)(36756003)(8676002)(8936002)(81166006)(189998001)(4326008)(63266004)(39060400002)(316002)(76176999)(305945005)(356003)(478600001)(110136005)(2201001)(54906003)(106002)(16586007)(106466001)(33646002)(118296001)(77096006)(2950100002)(6666003)(5003940100001)(50986999)(47776003)(9786002)(48376002)(2906002)(50466002)(5660300001)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3389; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT024; 1:C2MK0t7SJiNxL7gjMTHpcX8KeUSUMSst0AK/4UaiiueZkCkFwlsvx5t07pjrTkFRotltYfpN7mWwuPp59BmyM1lNG+Ot41bklUxWWatv0Ysg//Jc8HpKULr3r7BOTdPa MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9deab61b-a879-4b8c-617e-08d515853491 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:MWHPR02MB3389; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3389; 3:AQ6Al3VPX25ORMvib/1xP0SJweszg1vDz9ev515g4i4x0PUvOFT+cRYJKhFS4HLs/BgZObbBITGuFrDG/PtS/ndFanECTD+q+WUCkW5FrL1EfZuBK6aIeujFD3TNrXgBpFhA6aByRMWZ5Or4gp7iOroOFhVAGlrUIi8E4suo3cqKCry/ZU/R1Ddg73fLnW5xZCNnX9iuWkPx442LC16Rfug06P/9kJZWsk98O9HoFLh7Vzqv0JiVbaoAZ5L1BKzSEnWuuVb7hB1o6WJejp7H0ud1Lf7Dlvco3P5WSZLPK6wdHARXoVy0asRbTysOR5XYlUvJUH2pXTHTYkIAk9bpY4mXk55urxTkWSPgwhKfhb4=; 25:qqPZgoYVYT6kGyUduS4cvwce1rcdOlzrkTJZKAm3Qkmiib3WcXdZpeW8wMs1LPW2eLr2/44TI7QGygVMSTtDShC1h/kAHUkN6Im5AKDrkb89mMKetc0GVoTjMhQY5mLTKp3tK7n2wJyNDz2F7F8ZLJrZ+YgG9DiBXDo2aPB793ercDa0E2WuYntz4qU0WPgaBkXuiNW8iPunNKt7WeAavS+5F2HpvknaYZbBGwPerNzC8wdgf271tS+KrQjZ6lkNF6Qk0xnWuDW284NVZAkjCWdJvpwq8osKeBcgIcYZI3jUvYnP5WY8RW2KQ66UbpQwpFPj47Kn8/+LbkhgZ1b1TA== X-MS-TrafficTypeDiagnostic: MWHPR02MB3389: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3389; 31:GcRQRM5Q2sJIMuQfgfMxuhK4sWJEK33Y8MtLZetILLZ5wO5b32TN0/uwoZZOSFzLkI+fIRnVpCLiKBli1sOGXYhkaQ1j0nkPyBWp3NykgCztNLMwkiH3YO9FOxWqegITA3+ftOPyTjPmPVWkWKgKwTAes3rdiqeytUd8daT/5h5bUAYxM9sxWLpYvXTAKPcnlRsOMuNdH/FbCUVcwaHwfG/+8SCaPc+A2BgJHHIgk+o=; 20:t1/cMZMV7r/MAJVTOqh4sAibsvM4UqWlA5bvMh3wOoRFN6cDIy/8g2KAaf+SmnmqOXGBJAzWCPKQKc9+oIxL6MfU6NRaWr1jE7NlfB03/21BXfsXvCfvnytkZFRmNXhAT4kRQ16drCYrY5pjgKIeqdgRpBj9gaf5HfVpFe/uXu3uxB6fD9HmKTWcRHh5ve2mOsZZibjfsYCGEM2fbmh5sCkewa7ubxUkAOvVZ/T1YLxx4V2akfjY02qd5JfoL0A+IgWx/M2Qy+aqOKOigDw7yk1yz2MjLIgtOJuZllgnJlYuepr1PEcLXmcMOwz8uPdzbY/U+1B4y+wkNVjWdcwnDRdNMIhWIlUntLXPB0dkJqgIuaaYREG1nOvZahVCbQrSIwpAavXSrWr9/AbbyNFmzifLdQVsiDiJvkfjhIFRBaSObm0mVuFHveGblYo9mpFqK9hnZHf69tTO9lhGc0epdFNQrC1f7efXl/heFs7zmiP4kQtcCMKyuEGaceTKwav/ 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)(5005006)(8121501046)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93004095)(6055026)(6041248)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3389; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3389; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3389; 4:3WSEDjN6JvMFWbFy1wD9cJZvLdpDy7+31/pxPn7RdQcwT6gOTd2HjyR8n++w2/UffK3MxhcsscdED5afmsZGPaZeOgA0ZyntlWRpkFJ/Qlku1uXmLo906EM5JhzcTNn1awvGCGVTA9OAIpZ1rAfWk2yowKTi3XUlUKEgagFdkIByaWfewcGPwB23d4B3o7fxo5g5NjWx9OOe1emiJwjdD1QrK747eOMt1imavpRrU68sbL5m3QNrj9LvDMYjGDcl4gF/7H8BQsWkLmS+rj8KQln76Y2VuA2q3igMQHHhccI= X-Forefront-PRVS: 04631F8F77 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3389; 23:xHIg/zBctvxnst5RaG+leL4fxZvi6FMaN2CB+R3M2?= 9OJGgTWLepirwgvYVKWx3rcliPrB5YCxhNkv/gwBT0PsNX7ZWl+Xg3/Nc/Fm3Klt2nOHo90HX75AeWwCiI4SmqrnTRDN8WGyUbp4eQvseNkiR+3TZOgFfj+rch/6LZfj6GTytsHyS/yEbYrUT6P4YYMQgYdVL/Kr1hA08ig8L/FwgjEFYoEybQYd07Eg+Y/FZbiDhF6Ytp/H0utCNNFkB0ftqGR91A9HgA1io+abqxBUnk0RQz1wRlzQbIaTY0Er0+WGzc8UTcutME/WHb4WpcZNtfzXbAqwX/tXQj8G+SjnPHlnQZkePWdvcpHIHfGbC7DyLPjswGAHgyIlqjEQYcAUyuvoGN+kuCpmcVUTJU8+6BWJsokR3TAsuvSCf3bnoFicDdD442sYPZrc+GipwGGq+AFn8NBbPJ9ts2FfBvrrHCHUIpDAjV2MEI7wscX3PcXARP3A6yml+YsFQj8xlz0z1UYjixUSQo+OFO3rsjy6vA6z4gg06r0iG5uk1hok03qJ6oCKhwXbaFuOJgZO3DEmpZ/2Esqr8ESru7dpFmPTLQHkUcLMg+3/LCSnPSdRGipQgfk/o2avtGGZUQdNTeLPyc9GDFfHMApTwjB4+gljYroXer3exzr9pcrMrYC9kgULQNLMCxD+hSgwsKU5hOALwSEytGSrjUNk/DLAh8D90giMvs/VgB8ephzpg/vChIEgt1hmL7igrg5QdGf6p6tA5pd7GR2qecrzJK7V+OaNHoxiVPWmY295Y681RFIUQR0pirnL6ARsmJ2aBRBnOGAcKuCEHJttIDGb4d+nC/8P9v2hBXCaK6KidHm7lSH3gbVT3NIoKgJRykbmuX7XTzSfjtBY/siAoHhwyYaWuZ3sPt0drKRDP8G6xK/1GKErJ638JzTPPB2JEH3x7kha5ZtkyarEIAlBzsT6idBFvpTLHWi6TmOttCkejF0r8OYWCxSmc6S0ADcOjzjgk8ERWMDrsOTlC62SE6gvKCUoskPOh8FNWh7sjTnQIhTVn0wpwN0llSYU4bVdcapv2hcjDrO X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3389; 6:UPFlQ1NJBEfVbC4nelAvaetdKsfttPtB3YaAwwyPCwrbc88l0x8fDueyQy9chOAc7fGAq5QmlaOX4eB/VhrTQOS2WzjH2sunmRi1bnMYuVhih+sgOSVoRl6K4mUvO7/ohqqq97cW59zXpTCsxFOOgypSYdlxNoI5nmUymT2KHVRk7ycQ+gjqyHm3Wb3+Lgy/LYvn+4rLOjmLEB8X4JJ5ln5hAi2xfxISZqR5y0n/PVbYtaTzHTEpGH7kR20HEw8jkGWJDHOQAG32hqee4c0eAVBvuiZd2i3Dd09Qc9TlIL7sZIS6amgCewR8JyCZ3eIMKX01GKT+wn3fIdyZJ3xBMQ==; 5:ib+CLQKzf/fe/IfI/9m5UWRSv3Dejf/R1JGOvY4AwfhCqvKvwDSGgzS11GMPNPVIh8wsHcpEeuD1JaDr601nsNBjEBLUGFkrOy9P6dlaRw7od37Ra407DHCcMFY0ip0eWM1J04yj58JTExJmDVVgl8/cM2RQwlXqvkLb1RRnxuo=; 24:vzi1xx4FT/i4+gSP757X7ax2806Iw3f4ft7uHmLeYsprQut7JvcPFQWm6I8aHRJfPnSjkVvOBZDlKTP9PpPEpU7+IZAmLPnFTyb/p3gyBo4=; 7:Z+ALfcviCVl5fDKYAe2WYpZkyNi5a7yjbY1ceqbdRPOixrsCTLpuQZdOziASREqyAzNq1IQyOlC9g4Ww6Ho5eSOyp5+doEUoIgQzU0LOWrJuOpkMdfFkjfLGL0/uP4+lw+HOzkh0fILLLbjAv/6tdIF8rD0wHDzJg5PLcBDBlJP0IczJcvrmj1VzFfmXs0OFgZHFXGf2/qVOyjpuj6ZSsex3kx0xngsjVv+VakwYSWI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2017 17:33:39.7850 (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: MWHPR02MB3389 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.73 Subject: [Qemu-devel] [PATCH v4 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 2794e086d6..1c896bafb4 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 Tue Oct 17 17:29:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 827197 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="ECmlpyqu"; 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 3yGjCc6J2yz9t2h for ; Wed, 18 Oct 2017 04:41:00 +1100 (AEDT) Received: from localhost ([::1]:40902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4VrO-0001wU-Ur for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 13:40:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Vkd-00057l-PO for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:34:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4VkZ-0006Op-DL for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:59 -0400 Received: from mail-co1nam03on0052.outbound.protection.outlook.com ([104.47.40.52]:16054 helo=NAM03-CO1-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 1e4VkZ-0006OB-0M; Tue, 17 Oct 2017 13:33:55 -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=ECmlpyqufVCfsHfmPRNqNSmAIRYDjGrACCLCMwPYm1cTCrno9OVewTnBqDkqRoVa6cKprzxm7Ny8vkT+RSwV9udn15rFyHbbbA0XPlRW1Ul2I0CcUIjQvgRcrAihVSJqchq4qM6ZAtVP52VhCgTS0rS003Vh2E3FLbU44Mh9/kE= Received: from BN6PR02CA0047.namprd02.prod.outlook.com (10.173.146.161) by CY1PR02MB1333.namprd02.prod.outlook.com (10.161.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 17 Oct 2017 17:33:51 +0000 Received: from BL2NAM02FT006.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::208) by BN6PR02CA0047.outlook.office365.com (2603:10b6:404:5f::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Tue, 17 Oct 2017 17:33:50 +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 BL2NAM02FT006.mail.protection.outlook.com (10.152.76.239) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 17 Oct 2017 17:33:50 +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 1e4VkT-0002Qs-T8; Tue, 17 Oct 2017 10:33:49 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e4VkT-0000oi-Ne; Tue, 17 Oct 2017 10:33:49 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkK-0000n4-3D; Tue, 17 Oct 2017 10:33:40 -0700 From: Alistair Francis To: , , Date: Tue, 17 Oct 2017 10:29:51 -0700 Message-ID: <12d01491de4612b533f6525efbf2be189635fd07.1508261326.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23400.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)(346002)(376002)(39860400002)(2980300002)(438002)(189002)(199003)(316002)(106002)(110136005)(36386004)(118296001)(5003940100001)(4326008)(305945005)(230783001)(16586007)(47776003)(356003)(9786002)(39060400002)(5660300001)(50226002)(48376002)(54906003)(106466001)(2950100002)(50466002)(2201001)(2906002)(189998001)(36756003)(33646002)(63266004)(478600001)(81156014)(81166006)(575784001)(76176999)(77096006)(8936002)(8676002)(50986999)(6666003)(107986001)(2101003)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1333; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT006; 1:Pyme1KlKQUKR29kwfxcTq+9dDedmvRmn4NOZZ21VIemn1F+mlwfuiXNLiFDmsMZSrl9jE08m4+L4UwHKp92/mON30q4pfNT+k4ybmnrFXCMShx7aONzR3zvD/CjD1bvw MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00434385-fd93-4b60-9144-08d515853b06 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY1PR02MB1333; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 3:+xtkHQCbmJa9PMVMKST3NyyldyqB++BKW3WiFI/wf1QAiob7Vsaa0rn+bU8m5ALGqNSB9qnfumGOdz5oCYsHpNgbYRBnIiVaIOqivz9o/MoOumFp9/MSzADY3xxxw9z5EknWFHOCZ9vPMl3JbzOJPC2yl8k7zyHT1orIRdj+/6DnvMpAZz4qiYcFcfT1XAKMl/8Js8Jg+QadBvHrTJNpIRUA/RULNoWcEnA6FXPRwPf4w2nSJ6POc5ylY1B7X6x97v9hIq0tcZgXgmdE+damgA40+CNTMT+aXMOKLk23wZY+2/eoWeCuT5oSnlTQ5P4wmpHLV/N914my0cE1GF9GZgqqRauGL+jyij4lb3GPw7k=; 25:UEyLRKOjUpe8rL37JY2WmOh+BzWgXUHcc6aJuYf+UVbo380w2vS7MTQakFJopTNMRryENf7R+ta3aFpdgEPnzaXig3c1nxzbOKwXagm2j5eJZDVxtOe3Tc+HUla5wjC7a9UhTo/eHEIs48NkhVvoAqqlSMGCD3a5vBDMn+snJ+Y19sAb8ovOZoVKIMpmklb+AYd5cWXuQL98Aixxe+YuVSqcxhS3uFV2EKAiPAZmaYczOvhWDvoO7f7QM2nHO9HIpBTqgiqIGhwnerUOS5YmHYW1HawdX/wF7KCjexzEMPaIsA573UJ2//PK7mSTGXc3xtcWRt44bqfDhAs+uLi4SQ== X-MS-TrafficTypeDiagnostic: CY1PR02MB1333: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 31:Fe9Up9yEZyqWb4fSinyexCsA4qvDFIgs9q8Q/btyGXaQykPJt6tujnvI3pSNUW7WWKkMzFhZ2ffcetttPYkQAo+pcrZeWWBFNTW0naWZzurcVBTpulmaL+Xd/zUrVu1IVx2tze/DqOUs2vuwThN5AjM48Fb3JL6L0CioG29qhpyIfk23M9HUX7Adct36N4eS6qbmf8fyXM3XDL9ed6cxQHRny08ugnONJxre5r6g9HA=; 20:9Bd/KfN1lN2mXYRUIOpo9LuvEVwPWYoCBv1JoHKoAoIkC9WkioT0R5qg5VgixKpQtrcoB+gq8ROBzH1bbu0caaGFhlY8JWtEQrVvfnjkSDzd6v+ea+BoW4EZRfLLx6zFicHmtFSm3ylRP1AaRtmvuTz+0s144CczdIfaX1OnV/kc3EG6wXwNCSZd4eIhYvJ1YwnASfslGhkAG70Weqt1Td3jph2osNYNhWaf0XBtDrV7PnE8rx+gtxrgcHhXi210lMOn2qWs0bxJA0IexaQTWr2SzZTDoE6olqeujAo1bmwMWcOisWbNXvMFiLUcZR3hI8JaLyJ2x/k+FDKfMlq8CTLtQp1vdjQweHZmmfDTBDIzLcczShbXJKkNxjVn1qT0j1Ihq+3k7y6ibuiVD/QyeW4hQ4P7ci7J5IzyKBOsayPOKz0iNeEcfLvWYrCZDV9ggwIE+k3r6KmCmisISh03J6ja2K9H4mSvtw+lpK1gqUknHyZKQdPHOtTiWlyStIki 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)(5005006)(8121501046)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93004095)(6055026)(6041248)(20161123564025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1333; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1333; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 4:iGkvycm0KXy/f1iss9hGWwuvecLARlxnG9B3jMwWw4f64/XHW5oNMHUZE8KG/+d4+/uf7V8iN2/jrFhGtkEWpYfD9JMHhHpRx2HvLmlJ9fQStHhSlWCPN/Hqn9ZeyiyRBuKWECsYLG/qz7nv80zCVkeC9RvAhocUzAgy7EvrrPbsTphsiYS71MdnwzyUNCvagWFE8rMO0oDV4P8czJYC7ow3x/cDvd9XIN1q633G2ua6t5ZJK+akxPrhc3CZonR+1XtkTmYLNajdxmTZ6gLeKDtkxS3bgf9qxadAHulfOA8= X-Forefront-PRVS: 04631F8F77 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1333; 23:jxWeNCHnmMzhmu+XMG7NWIGRX5wSnsrlTj351vcT9?= ZrOmpEX9UjdAdlLUZ+l0TbnrZ4uAYvP68c5D3mPRQEkhGTj76zjzS2y6lzlmawGN1NC2lCIk9os/rpzdpLOYKOCUsWn3EyCriDJiT6CriET6B6hSi/kkEX3uOoaHYa5ttyXhrLWBjA+6z3bQ4ezfCw5+g+UUEGb0AERh9MHFCWAtkktycfbeAZ+hKyR8f1PHazSeeP3T1rNVvkE94e7AGjfpuVRah+q2Q7XAFdS4U9DDCTvSQZAMLOHVXkuYlSLRFMny4j5aBcDSKWdr0Ndm6uK47epIaMIeP7/Yd90nJXBkr1Eq2nuMac7zST0etzBintgajmk170lREcp7GalsDQJn0etlskNmA8xNo+8uLZm3HFEpn58saVWA+HfSR+SuNu+BgSunmV9VCkDXCrP/dGikQk0sfAQd547za22fQ2zOtmcCPhoIbuUzEguLER/ufxNPydNzjHOF9i6OPzT9Dti/yU+9C1tCmM/7OppbSzn1pwhNO9vcYLmr/RYzAR7cUGGaargPfhzo5Ot+DTIOU27+l8KfZmFdcfkCnP8hVXd5ZtNUh32RnxBe7ZTJwlcR3YdoBMpEF8RAbI4MeBA7TIe5Qnh+zwTopfyDjlH+9Udnn32OfSUXxpJBjP2rBqmSRzLRyLSm7L/WGn9YXblWlWA5lOcwpA+x9v9hR6fLXVVwwVCQFX7Rg3tQOm+jh4bbfHudlehfaeAVCQ1uo/MKKg4LZfsy134mpsrFGkmTfeD0w+HdYBJ1+fe4kqOX98C+SXOEOm6MLg9nhBLFK3UtI+kZKF6hRAPQYfRN5hiTObcZK1wFvLDN6elwEvFOkAbHKAZ6E3lKo+qF4MYgP9eplV+9+b+8kG3y6qeLA7hjmU7unhVqemH4ptBiKRFnvi4tUfvYh7NHA2OSgQTEReoAhAMO20jYs4I7av4c8CkC7m09bpFoHoLmmMj9AOAlRyKBTR7UrE7Uan3LUJk1t59SE2CqUk7MZuYFqvpZHqcXzfIwT8+BCoi1JgmuXo4p6a6osQF4ORftDQC5ILEcA76yJLLnRPpxVNIAiwTxtFfyE5PePXKmIAw/EqwMbW3Zu8d5rkSbh/coJLMY1QK7IuN7OHq X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1333; 6:B7eK95mqYuPxxgpaZSMohanjMF3d0J28JLMu/6oo59fgkee/FQdsUQfLIMeOaPEjZEXbr3XK+NqgLpaszDxxj7nkq7C5CL+W1WXU0I/shdZAIDoTjeyCRBIXzN+QcDhHHM4cDPDMlsxoOORUaTeYXWl9ntLMIFcpkJpzlsVpW4VgfVsLlX06u6qDXNKribFvND8IbXzwHScvDgEBjiH8yICWO2e452sH5hq789GXndTVWkZabw2Ex1pYNGPQGF49QPqCjOWWEGrEzo2dysK6Q9RovZ9zKTL/0WnqfkSWhDZ4shKVesLr2hJk+vRRGZbprCIwX8np9jlWxxYqGxa32Q==; 5:uoxgrWbfabYKBaAegCwEMiZ7A1DHCCkFM4cUzLVUFXTxbJoQaOAdefyWUDfKaBQJmooU6vkPHtLkk436BcN7fdDfRzpE80lY6F7xCjQAaIX4Int326pb3LNT6owE9iVrgRZXyMF5GzEpIoOO+Nb5Xb/VnLIe3gPxNMxD4VZFWgo=; 24:zGkczAR7ytnrFwvVh2a5F4/pLkJa7783/qlqtKDaX9sMMbDsh0/GV+THImi/DHWNtkmXDf30IszDoZZ5Sp01B3f9Bv5E0T8QazQulXEVyyo=; 7:M4R/r5xLrO2UTs7GuHEwyyOsUyq5+RqX44lgt118tS8xKImdzsiHKGyrc/FEWaNyyxt1uZS8bQfS5ZDxU73VoenNLPKnyIyw1duDZsHa742WuLH2nh3tq04giIubPimZraBJ0SeLdXD1pMdO25DNqPiplo7pmp3iOl49tSR6RnFLHBUlQP3dwfYrYM+RzEyE45YJ5qZvYqLV7ylOAzf/eaXrL7k6YuWOkxcnTWcBL/Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2017 17:33:50.4475 (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: CY1PR02MB1333 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.52 Subject: [Qemu-devel] [PATCH v4 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 Tue Oct 17 17:29:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 827195 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="UzsRkDJH"; 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 3yGj9B0r1Sz9t2m for ; Wed, 18 Oct 2017 04:38:54 +1100 (AEDT) Received: from localhost ([::1]:40884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4VpM-0000AM-8A for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 13:38:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Vkb-000563-Vo for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:34:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4VkX-0006O2-Sh for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:58 -0400 Received: from mail-by2nam01on0077.outbound.protection.outlook.com ([104.47.34.77]:43861 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 1e4VkX-0006N0-JH; Tue, 17 Oct 2017 13:33:53 -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=ooFwvUhRqzPmsbxaakpa9kmSw3Bqf8yqRsJM+MhSmaI=; b=UzsRkDJHNU3eFB+sxe08HQj407mFBXuQYsO2YlDEjFgghC+d9zowtA03dGy/QYPw3Yk3t5npWx/XIHUMJvTFfJxYgnDIBpYRk0U0xBpAvBQ9pyZ7TW6qDZ6y5BGK9lmxhCLstCKA3r+IIC9piqlZx79MK3eoWS+aHCyxbsP40Xo= Received: from BN6PR02CA0080.namprd02.prod.outlook.com (10.161.158.21) by MWHPR02MB3391.namprd02.prod.outlook.com (10.164.192.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 17 Oct 2017 17:33:51 +0000 Received: from BL2NAM02FT024.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by BN6PR02CA0080.outlook.office365.com (2603:10b6:405:60::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Tue, 17 Oct 2017 17:33:50 +0000 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 BL2NAM02FT024.mail.protection.outlook.com (10.152.77.62) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 17 Oct 2017 17:33:50 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:55995 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkT-0003jP-Ke; Tue, 17 Oct 2017 10:33:49 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e4VkT-0000oi-Ep; Tue, 17 Oct 2017 10:33:49 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkM-0000nR-JK; Tue, 17 Oct 2017 10:33:42 -0700 From: Alistair Francis To: , , Date: Tue, 17 Oct 2017 10:29:53 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23400.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)(346002)(39860400002)(2980300002)(438002)(199003)(189002)(39060400002)(47776003)(106002)(110136005)(8936002)(33646002)(76176999)(6666003)(50986999)(81166006)(2950100002)(77096006)(81156014)(36756003)(4326008)(106466001)(478600001)(5003940100001)(316002)(2906002)(63266004)(50466002)(118296001)(48376002)(2201001)(230783001)(54906003)(575784001)(9786002)(356003)(16586007)(5660300001)(189998001)(8676002)(305945005)(50226002)(36386004)(107986001)(5001870100001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3391; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT024; 1:y91duGn+gKywlmtnC06r1r3RJiBkk0ssvZrP2Waz6fQ4AfxajII/8DzgvOAUBO9o3VwKYKgbijUns8vD7C05pqNOyH9LqH6nF58awh2XK0hwnYZ1m5ZRltor3i5GOkgA MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 12325367-235d-40df-020d-08d515853ab0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:MWHPR02MB3391; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 3:ncRnD6sppOTqhr53+09gRFxsOfHOMV6+zPurdiNmQ1Zv+g4BW9FPq/1MhpoEYSIa91c9xNMKGKo2DJi5w2v7k53vuhed0aPRkR9blay5neUtgdCZdPLbN+QeVwrnU/HTQ4JtttPfAnCov3ia5J3412qOieqdY9Wwdz1EEK2WOs38YttEM1h/xgVg0F09ifVzGA3Gj1VzQRoQYo/yVDqRq9FLPOr01KqbHbc5BkPyA+JOj6ntyeYV6nQ/pEOTAwh4wiQSP1MU8P+QQkRR6SVrgoQ9JaY0CPjby9ukcqfRNSFij93iXo6+lovAh8T7CmMXkCN60oK39j9oX9h/ps646eZPoI39iT9poUoaStTJdQs=; 25:XX+1XNXBjr1OyHpaNkF8no8MhYt470AjdfRwuo/s8ozgGQgK2cHSMaX0lzSfTY1Y2gvQ2S7jmu0F2TzFPVdcw0NPLBvsrEAoY7cbqfgyY2zBExAJ9eN4LI0CdauGbfSXmXzxDIhe70s0ESQv1uFalhm+Gkj9TblWaCxSh5a1QESFwaVq0sjp82OF72oJm2IYExGa5MPDYijYIk97OD/xnCalQG8/nz53M9Llg4oM/wd3SkoGOI6JCIf1LvhYYqgAMacAU+zGijHiEyOgIOypkLCfGknq54ozBC55mb/pSl3tVE5IDVEdaiVrRKNcwtoeN82MnP2ckazeDp5meqXHGg== X-MS-TrafficTypeDiagnostic: MWHPR02MB3391: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 31:wbaXHUsIVkfDF+H8jiAsVIFupuchZ1TWNsz0kmVkgn+7CrjVqiGHIlbwpM+Gom7O+ZYA2IzfNwr5ehaqABevJhtwQZv3+ApwHN+VwC0JGrFUEut2tfgBdo5R2qLGZsPH+0J7xBaTeZz01yftn2MG42iIA97aCa1A93et8xpZo1mcv5HPgDrMsKHISgx06qnRBLtHvc+b0BF7H4YSBBII0bQ2SAPA/3raX6HdqrEYBwk=; 20:WUzZEm5kLPo8FZFL5tERkRPNE6oVT06fN46In/q8twUA8sqxtloaw/Qtb9sLt/nd+ZeRbJs4tvMSQ7sAgLlocIc1n13fl1CAgZrdFbNkzNc4yMa+Fujma5gqsFr9W7iDuW9s/OX+ZGrgTrRyFsQByTjZsC/9tsSJCp7MrA7gDP3ynZDwTFkW8nYl8kC9MyTba7m2sPdUR3arvrmAPBiKN3EcNjQBXwVZ0MFRRfOxzkfZh1E3oelF7JpAB0ZtVJS+C9Q7aTU9+uFuiBRcKm6casZd9skMuJ+OUWMcL4Y7ETLol81Wozw9HR3QKsCt9nDX72uuWxg+51ClWMNGQCeiyFnFen4uEWfYuPX9Qtrnyd257/ygXnWhx6pUuWQjWFkCbGPy+e4hhWqA8Pgu0VUxobrghV3rKEIa2n1JUWgVvv9envQ6jwizywJ+Ar/ghq1osqypxlw/xsBYrM8XK8GF1BZIZAxKi69NEVl8l1wLtPnNJsFZKOyNiYOyJ5eMEjSM 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)(93006095)(93004095)(3002001)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3391; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3391; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 4:EyTw+aZ7EA7vmwNzDjOGA8YXEsXb2CW7gWyeAFgOnyIoAgu/vX5sowbPRP7ZVAffbjZ9d4tOnR6ZIyCm1Nq4agUJf4q/56SG2IseJg+Mkq+ho7GnvyGnL4fLMNWvJ6WpkaQIZ3IO+IfmaPTOEZze14w+IqBJp3TxrPYhYGB3fRsot0Ps6TvWi5vuh0O0faKrE0nXM2eBzSykkIG3YeuJyrwT6vfF8GtFeJIHHOL8WV3uLGZI8sSpu/BMy8AyrWC6NoLRBrrlf3hsoUN6mOGdOX3iQYG4i2kyD//lFh9oVQZxljrsWLK2+1tID6wjUicij+DrdaZChh/T3zI1qyHYPA== X-Forefront-PRVS: 04631F8F77 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3391; 23:TrGlF+f7RkVA/W5D9nQR+JaOeDj8lu4341F6pwBym?= oRfpVwnJAOc7WuNbhG3Uohd2OHtiWlHpC/IAFb5SNpQ4eNIfV0LruyHVF+l81slwj3axVOPhm8r9LCVeUAg6dzWWRTYnUsNdiqURB1mKRwPBmsrHPOXxcR5ycT1UNmzl4NSSGuJYP/3a6BR+RND0cbhLtuEt2oCAbTcmhvNC6fp6UFedFAID8PlVOx8nnU8h7THb7gC8+FwuhEHDum8/4XTVxLgJ7yHldjT6YBy1B9B7H+bLtyVXk2rx75InHevy1cQEgUX7Ro7c27OpTYpbOuzclsg8zDdI/v95jZsN/mL6Pj1O6AmAvuly/7z8ak/4VfzfS//K4iEYdoIeQBsT535p9l5IW6Jg/n4QIeDKFifZkxUQrpApTgwfvCi9DP0QmML2QiGB33LXp48FCNEO5LNRhZ9nc4cMioGMOTXcWac0eOasKZYHxLwIurrwS3JmmWG2ikFeWMT8VCCCWo8MfWn718lhOmdZsven/lI9FIUCn8UBEBmtJC2IFttT+zREs4HURmlEbHu1DCEg/A0HNJqtAkUcF8irLFFYXW7KXqL5ekPS9fdgF8W4F/IDhDJx0PVSR197KpBDR6y1Prr2E2I9GKbALz2j9Wgo1uVn58ChociRxfSZfUArfzcNVVs1tjr/2XSJnAp6LZxssXN1CKuRxk5dNbsOBGIjSF6nloFPKm0pczoCPvIvCrFzksGK33Gsn7x7NdEzKfjEw194LbjV39l/ao3z2pl0SjHduO5IQD06e+5vtCEsjqdb4v5hvZeXwDtWNkHAjqMU4Vqg0VLei+RFZ35NzPFjCu/dkFOKNG+jVi3jqTthfg5b8npPhl1tGloZw8nVmraLWh2Y5L/HjNNMrjdXofYpPytTX57LfNHPv4u/yhsVt/vZzPmfWGkYpLUTn7XFMDLQuVyPgbnfbbGIuzkdoHv+xW27qLchPkgBRvw9wwU1v+HaIht9gAwOW2uRkmQQidVpiGpiPBG8ZeQQmE66kzYK997bJ8qc6YSIfhmI8cfdq5izSZZxbHqJmA86HJueESmejDBKH/n2qym9AM/6PKAqpOOfAkzY/TT1FmONE5WP5FJh51XVihLbeFKM/JAwpPKEERyW22Z X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3391; 6:M9Z3OYvsdqJvEHGSmH0DA3EAZlY+XmRP/LCXWV4PAlR35RRa7MW7M0F/elu9hhumoP+XJGewF8L8wkid9JgAdBhKDEQRv5DkXquCLq/6sJXCUcvlHuecp9JVgX+M2qixjZkPPe+zJl/aVpwpTk4zCyJdJueHfIbLjxjd5ZCJXrY6Ed0yfUf14qk9G/bg+5rtKazi8UK7ug7T/TX8gSV2kolT1bBB9AaEehmFfBvcg1nBBsGl9bhwfMamRRIC/jzOU03KMEw9CY173hpq6OI7UpYFIZDhhxXVNErPQoevcHs/RK3nN3fnR7hQCb7XfNnALBbpi8GyMW+zlMEZZYxEDA==; 5:DaM6mKUrHMYlVr5kjVqOG2u63eNWg9Cs4/bo5zyKPQkhq871Lk4eVk2r1BGu4jxM4s3TnbVETm9BayKHa06FRX6VTOwidCsWHE2kpkrtB0ccqswZ6mod3NAAOCHXawrOo0I0y7AgvfclobKO/M8S21ZpWmNTzo1At6K+skdMLzw=; 24:OfUsKf0ll4BYSIa1f+bGX1D0/vbaIHD0nOU5hSnvr0qv+wMeM2eEoc9iVNRG1ROZYV5hL8SqKvEehgz/G8Wfic9s5bb/w9LzRU5k4qcRtjQ=; 7:eEvUWT1sB793aGHW6zOwdQc86qS4Bm1XvHxbI/l0+bOSMiaRVHfjWBR7yleyyUHMImgI14xF75EhCRz2zPt8K606uMriLqr15p9YMMB/ZiL3Gyase5KXNjql58r2QVYg3GRM59O2VnWAxJZ2hLlXgncs4EpnjZxG7G01KHgiPX1jjpCjj5g8pkRBbeNG0VbFP8OUnfRAJatTrbtPaBD5fsOWGpv85K7TK2/7kgg4UhM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2017 17:33:50.0365 (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: MWHPR02MB3391 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.77 Subject: [Qemu-devel] [PATCH v4 5/8] xlnx-zynqmp-pmu: Connect 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" Signed-off-by: Alistair Francis --- hw/microblaze/xlnx-zynqmp-pmu.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index c6a0b3b8a1..828eeedc9f 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -24,6 +24,8 @@ #include "cpu.h" #include "boot.h" +#include "hw/intc/xlnx-pmu-iomod-intc.h" + /* Define the PMU device */ #define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx,zynqmp-pmu-soc" @@ -34,14 +36,18 @@ #define XLNX_ZYNQMP_PMU_ROM_ADDR 0xFFD00000 #define XLNX_ZYNQMP_PMU_RAM_ADDR 0xFFDC0000 +#define XLNX_ZYNQMP_PMU_INTC_ADDR 0xFFD40000 + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj; /*< public >*/ MicroBlazeCPU cpu; + XlnxPMUIOIntc intc; } XlnxZynqMPPMUSoCState; + static void xlnx_zynqmp_pmu_soc_init(Object *obj) { XlnxZynqMPPMUSoCState *s = XLNX_ZYNQMP_PMU_SOC(obj); @@ -50,6 +56,9 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj) TYPE_MICROBLAZE_CPU); object_property_add_child(obj, "pmu-cpu", OBJECT(&s->cpu), &error_abort); + + object_initialize(&s->intc, sizeof(s->intc), TYPE_XLNX_PMU_IO_INTC); + qdev_set_parent_bus(DEVICE(&s->intc), sysbus_get_default()); } static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) @@ -80,6 +89,21 @@ static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) error_propagate(errp, err); 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_bool(OBJECT(&s->intc), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + 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)); } static void xlnx_zynqmp_pmu_soc_class_init(ObjectClass *oc, void *data) From patchwork Tue Oct 17 17:29:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 827194 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="3yJh5VZC"; 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 3yGj8k6J2Kz9t2h for ; Wed, 18 Oct 2017 04:38:30 +1100 (AEDT) Received: from localhost ([::1]:40876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Voy-0008JJ-Iq for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 13:38:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Vkc-00056L-7s for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:34:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4VkX-0006Nx-SA for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:58 -0400 Received: from mail-bl2nam02on0042.outbound.protection.outlook.com ([104.47.38.42]:7612 helo=NAM02-BL2-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 1e4VkX-0006NF-Iy; Tue, 17 Oct 2017 13:33:53 -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=3yJh5VZCtnhx/5Ao4TvtLoCP98hPoy7YAwgmMDO18cMCvgROFJCxuYJsgeW8OaPMZypMBNLdUePW2GWwvOgSP/JV1TVGR6FKAmHhBAlBPafnSkRv2pQgaq5rGJl9sM0JCcCpvS0ZYzYpOPg6i1OrhB38ZQXeiPZ4FSdtRNcNDvw= Received: from MWHPR02CA0058.namprd02.prod.outlook.com (10.164.133.47) by BY2PR02MB1331.namprd02.prod.outlook.com (10.162.79.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 17 Oct 2017 17:33:51 +0000 Received: from BL2NAM02FT032.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::201) by MWHPR02CA0058.outlook.office365.com (2603:10b6:301:60::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.7 via Frontend Transport; Tue, 17 Oct 2017 17:33:51 +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 BL2NAM02FT032.mail.protection.outlook.com (10.152.77.169) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 17 Oct 2017 17:33:50 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:55999 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkT-0003jV-Re; Tue, 17 Oct 2017 10:33:49 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e4VkT-0000oi-Gd; Tue, 17 Oct 2017 10:33:49 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkP-0000o4-2e; Tue, 17 Oct 2017 10:33:45 -0700 From: Alistair Francis To: , , Date: Tue, 17 Oct 2017 10:29:56 -0700 Message-ID: <2d15ee794016babca409bc65f1662337aea54e48.1508261326.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23400.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)(81156014)(63266004)(50466002)(8936002)(478600001)(8676002)(230783001)(575784001)(50986999)(81166006)(76176999)(36756003)(9786002)(305945005)(33646002)(356003)(50226002)(4326008)(106466001)(2950100002)(5003940100001)(77096006)(316002)(189998001)(16586007)(47776003)(54906003)(36386004)(106002)(110136005)(2201001)(5660300001)(48376002)(6666003)(118296001)(39060400002)(2906002)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB1331; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT032; 1:HSYIP0VdvYJaefOEmgAdyhNEI0yVXARaRRBS5psycuJ6Hg3s7P8ediMqK62KpO/aoih9+tbLRefUd7ILG+37z/4Lrd0RTKjFrjapv2zlLthYWXUGaRIFqjL/1srFm1UK MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1846c0f5-2e4e-4aa9-4dc5-08d515853afb X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BY2PR02MB1331; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1331; 3:dFu8PunVbeenojIcCOdTpE/1i4os3rMPzXVXYBexaB/59WvnOkf7qzfIHtggK8ZimFZrsmcx81XvXolPuAutcyXHoNMeeEWDj/eQi7rBPA/WhJssrDP5yedzV2nBxzKczC/VOBxlUwDjJD5SyPg7g8wMA7MrgnFLTEMKBr6XKpc8NTQmf309leGdN96uMckJAqOBRrnZRUAbqEBMb41CQRqNPljqfCVsAGxgLbTmpQMWen0aIG7TvNSLxY7SNBNoL88RwWrEwxDr1RCie48GnRtWfUTBHX2T4XeRjVVThSiK3FS/bFE4myVmAbCY7AyZn6PmSAQ/tCb+mFr7raepqCw7pNAowMVrFhGh3Y8YQNU=; 25:SrvYH8anDqTZen5K+P8v8q0TzHtemPAj3ZYjXnHLr1xCmAmDp1t9FPLixeum7DdDhRHKA1TQsHs2TJ8asA9aMfO3qSwuwKvKhYmM4BdRtFcui+waFI2iFbN1BJsEIAOO114jdtwJvGHl0GCqi5h0njUGZG2RgaFf7tiuge9j0VEmRPoD+TgcekfNQjq/bFMvPpa598kTD9Sjj1mog5jfBeOtd7akWFOf3+gjurxxsrYPPaBEMYei3toTWORxkxWvkFDHj2Nq38Sh+/HsbM/LYwJcQGClIdk2lPtKP1jPFvMkEisy044yP40XVz0s8x75fKsdycEzLq5XZpcseRBhkg== X-MS-TrafficTypeDiagnostic: BY2PR02MB1331: X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1331; 31:Hr1ikd2IU6cbfwD84F+HEbDVuo13GsiEkA9W78NI0bGUKZ/2cUt6dP931RB6ICEqS8NVjdMPdsfGjp2o9FMpDfXiUlYJpK2e6Q6kHAiyAg1hIHSayMcfZMepEf+cpXm2260GZTYi6XkmGFzK9mVuj2FXbLvrBjLlu2zHtgcTSsRLCo/eTNWQr3av+OCF92sP1k1SRxOPpHfFxCrrvblgsq5Zw4dNG040B9sesCCnSMY=; 20:MdpapknxBLW7JHrNktUEuPfrNArR5NgCyS1MOZ56SDCuR/Y+TRh8T9w1ZSI2Y/jljSODDMGW5d629mfl+TYsLfK0tFn4EQxJ9W3V3aQ0/pOxKdFnfgvTnmVNjiF55p8vWqRi2HpxNQCJ1YrcZWYCv8QT+jq5OmnoicJf0+c4Uo5U6rV2w7kJC0XwH51RYAbd3HFiAqA2k87AeBVbS36ySMZUWJfJUvtzx+GSEqRbkW8GgSpb2/yCchw8zYRqLomnK1sODeOjH6cjZkTuPxcJ8zv6Dsjjbsx2yOkN7B4Wwl5hwk2uf22S90aWfiVhbc4sHvnc+QvnxqfJ7Nd9YFc5J1yotW+RaYrUk1dTANk3AOm8rF52Y40WC5+Hakj8UL6eA5hiP2qqVSnQWQCjs5UtCdcy0KCAcDQNF7xlmWYXjgfJNcV/qNXJDJUKkB0uxFZW5nthRLvbmz2KWqrtbj7lM0UkpY0hlcGm9e1WCVK1JtUEHg7Pz9ZZJZLjXPTPRe8n 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)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR02MB1331; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR02MB1331; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1331; 4:sG4qMC2zApsUfxD0yQ+j/HISdNjQDWh3yCXE5bSEo6DUZZ9DUgzuk/Y9gFqyxWST/5TficUP9n6Zr0tcJnqWyHxKrQukbpmQUPqzFIiwL3gDIQ2YJgvCzBgkreDPKU/19mQF1thbpALlbx3noho3mqIt5fZhOyKN83WaNAX4Ot6bU2Xv5vbc2Lb84ExJXnUtcmsZuuvp67BVqI04WbF0G9Rzs+DoTXpej5oJDjSvu4euGSUL1mu6tGNPUMOhK0e4kMMoafYd5KF2C7+syLqpQoalmCWWhhg6q94rJa6zZsY= X-Forefront-PRVS: 04631F8F77 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR02MB1331; 23:nthzSw4ioOaGm0nwWpj0VC9VydWHa1zT74ctQyPH7?= EJnNEoCsPbfHEnhDKV9FLNIihcsGhsrMs9bCyBIPXNIUAIOam+D32+ITxCL1LqVIU7kgJzy9gatoBYzDYHyVEJ/Kpj5KpOPkD+NHYbpmgUVShWeAhAQaArlO0B8laRM+b8n7sNRgsnaEMD8SApQ57l0H4Zc2dAte3AeOF5T5gbmI48Is+EXbXhr2ljHRqPW9sAUpYThiRsqVJBvBZqcY0p2Qwd0dGK/cV+zn8Fdg2kCm/uTN+eJmjZH5Zx529QiDj8q4Sf+9hPVANo6hRNMf2yq7vOwRgV5IHNEAZaQ/e+scf+wiAM8k0Gu1gmit8UfpGS74TH5yzwx3Y8yMcrqvHQOIYJgF7l/78ABjEQTKLAIQel+jVePBICu03s4xtYhQVK7odOCFs937Ku9V0mJCMK3luu9f94qvKYrqlqi0uVcnQ8xDAnbI1qqqaFPofEp7VQ/9Xif4Ab0gEVyVbXKPIXC+ruMC2mkUC10ym2uzcvpAH6LZkagUGFM4Jr6ca1tc0i7LXcLNX2vmOAgdfJEJcgzUYIWq2xd3VjqGcHitUfSlc6LHRMbW7ZMnR98U/oAPQs8V3EkctfzEoEcLRM9wPd92Se7+DQxPRylSX29vqad8TFSQuKSk/Aie4kdI4ZRMAVmMYvUHOzslS5MjVP/dAw1o38FSzDFA1fTykKv9x+4x7spEmG0AFBEeQtJpwn2QK793wCq6zqEFgsE+0qf2MsWKJxHCY/2Wub9MyLpgerHM4CvoiS7d1E5LHIexC2sfBrgH20nj3dvmmNKutooZmg7XPI/ZuiR1ImRSa6PPYhktQ1hzwrv/etM1JH8+F/4nC4yNytwB5Z/QoaunQy6ASkcSB9NK6gCTlFl8doChE0koHkHSe+nGdQzanIeNp3/sGejbYYmpUwCpE0voRqrGQXZLNi9mhIF+/AJcsOPBX3np25tN1RhU8OWNDaPsJviiTJfrY+IFbY43Kg2YCDyXafxXhWejQujZUgf0P64Z/qes+3g4RJy3uyb0ZLEE9QfAvNELjLSrdYNjBF7lgsMbv+LJUJqfOfFZjFIUc4qLVxC2idxSJ/MPY9F2MKXGtP1o6f78oUNDMBAj24VN0eFzUnf X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1331; 6:xX8EwL8SJVClx9F3cKcSp29fxANIDpoDXv9ZzYRaMXJ6L7TIfNOGMP8jR301GVRmBN5wTuAGzRB3fYEReQzMQEbpKw3nu7Mu5YDytPRMVVo2/4XMOLyEtfC8ncgNjgGm0szHF3bgT/mcVu+v9ARWZwqEr2eM9uQ5EY7lZmPt03vHdC0oM/YK9iQxMg8TT6JIiEigCgphMbFzGr1k3syLM9SQsfbNWr72lymp6uwyWqkAZzjDucZfxr+jlsudNoVdj8m0DedR6SDHVZXNKVZMhsu+FCZWunvotyw473w4TW7Pr8G94ZOTfM4EWAogGCoDk00EHWj/ULfWKnaUWWSdVA==; 5:MVjBgIE+iEfzZl10FGk6oR0PVU42HSo788tsVlGPJhkh2XDngsbzJIhvJ4teTvGuqIC+MUiwTlVamDJf8UD7UUxzWFz9lNW6G/edEJghYgke/XH/q3dmYeL3dStOlEwXKnY97Db1YvyNobaycx9d5/n2YppgQMQdeydZ5JxFgLA=; 24:kQb9xrPM3J/0Ql/lgoSID5cgDXccT3vY1fiaN0Qj7TkE1FFq0jn0ikzyn/UyYVv3NPVaVuW96AP99mSu7fdBaRSL9RE0JDwswzGNtG4WSOU=; 7:kKqgOPooyGVQV5fopPYkNA/yM8X15F6EJVqVSkgPZwqvtyLI4cG7S9yfMWD7oJqb8WBpkxlmskAEc/aWJ5IsX0nSZzHDQi12PZWrp4NaiJofEQuC9ZxJzBpgqPZMjfHdVm6qWEINTdwPGZk+GYDopZ2Yr7EhnLe1cp+Bq3x7nz1NfQry/bF5E8xrxee1iQve41MSHYMKnPeQDjpP6IjhcBkW8GVBQ7XV1/EnmqybXls= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2017 17:33:50.3737 (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: BY2PR02MB1331 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.42 Subject: [Qemu-devel] [PATCH v4 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 Tue Oct 17 17:29:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 827187 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="uoQXyPaW"; 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 3yGj4T5l0cz9t2h for ; Wed, 18 Oct 2017 04:34:49 +1100 (AEDT) Received: from localhost ([::1]:40854 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4VlP-0005H5-TI for incoming@patchwork.ozlabs.org; Tue, 17 Oct 2017 13:34:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Vkb-00055n-OA for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4VkX-0006Ni-Ji for qemu-devel@nongnu.org; Tue, 17 Oct 2017 13:33:57 -0400 Received: from mail-sn1nam02on0089.outbound.protection.outlook.com ([104.47.36.89]:51744 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e4VkX-0006N7-DX; Tue, 17 Oct 2017 13:33:53 -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=X73TllCfmCMeQPZrodIByvFjE5ExnorOBPXlVxJt/5w=; b=uoQXyPaW7GmTehsALYAOtMCDEfnqszCOJDxwDFzbpBxH0aZEf1wUwFg8/lwWi5xK2Ix6bl+3L+YfCWasDVWM8e5jdsD+fMSkAxu6CXUCq5y1Mmo3JvEZ3Lz5KGJC1RxaBmgISLWa7gE3sPpkdC1SNZymQ7EvZUfXgrWrgpxzV84= Received: from BN6PR02CA0035.namprd02.prod.outlook.com (10.173.146.149) by BN6PR02MB3377.namprd02.prod.outlook.com (10.161.152.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 17 Oct 2017 17:33:51 +0000 Received: from SN1NAM02FT003.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::201) by BN6PR02CA0035.outlook.office365.com (2603:10b6:404:5f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Tue, 17 Oct 2017 17:33:51 +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 SN1NAM02FT003.mail.protection.outlook.com (10.152.73.29) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 17 Oct 2017 17:33:50 +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 1e4VkT-0002Qy-Vp; Tue, 17 Oct 2017 10:33:49 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e4VkT-0000oi-Pf; Tue, 17 Oct 2017 10:33:49 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e4VkR-0000oS-Ex; Tue, 17 Oct 2017 10:33:47 -0700 From: Alistair Francis To: , , Date: Tue, 17 Oct 2017 10:29:58 -0700 Message-ID: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23400.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)(346002)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(356003)(478600001)(5660300001)(305945005)(76176999)(50986999)(81166006)(106002)(8936002)(316002)(2201001)(2906002)(36756003)(110136005)(50226002)(81156014)(2950100002)(6666003)(9786002)(54906003)(16586007)(8676002)(77096006)(50466002)(33646002)(106466001)(48376002)(230783001)(39060400002)(63266004)(36386004)(189998001)(47776003)(118296001)(4326008)(5003940100001)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3377; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT003; 1:Bcy7CQZ8sAvW2rJznKVRiuSl8d7pVpuvT9hxx/J6nJcm/NsD9i27vQIFfZofJ198O9QqeWSAVGOaWPYuGnHhylN5M56QgHoeAzL28C4HqjRyImx0PM5qNL8w8s8RAo3v MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 49cd9327-0319-4ec2-1314-08d515853b1c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 3:vU4t6cjgXGOIMTh0ZGOYrFcUjFOS7TZ3oHkfYB4WxxwQ2LtPRqi+ePHRdZgR9wwRWUgFcMBc5vYDZvb1xsj7r56WM31fSufHchQ2FwuSuFXFro6+C2yuth/QClqxJ5bJlOB/m4EHC1ILRiu4NxMkAYi2qVe/whIokd0N0yGhmeSJtg/4/ekj6omsSRC/oLUFFg8rdS3WM4kdc7cKKRuhSMsdEDJKtyUYAdw6ZiSvFr52bVOfrSr2BJNnNogcqG2BpGeQILqMvBfdwtNo9caXwZZDIJG/lVAFYONo0w1rIfpOVLEqmSMkcNx+jn1Bsi1ICNN/LhSRHAYVdelX4w79yz6FIN0Tzw/f2YuLlJd3nV0=; 25:Yv6XAsuvCRZyzeq2R5pcBIa6wVgllt1fjPQa8om9zS9spG4n21UjL7IJ2gJ1xz9RYre74vLKpSTPay2FSDCWcODhRBNz1uH5+dIyEz0uUQ4oa5EQA04aNAiyfvaygYgd0CQJtl4L/Xyrdh0GltHL8hAOMVZw9Vl/GwR1ThOl5gToY5sAbAoi7kIZz2Nin05UJ8FSqm8+A+r7OEuUfVZrMpBzukSIRFiKV2YX5FJEclxv8Sc7pvqwnvDG7WAmmBzEXeoI0Uopgf5DZELPPFIcaIPQns8hNJgq8tB3V2sqbxBCzHiFM1+GfFlMkxb1F4UWREVryhVhctslzjBvdHKqjg== X-MS-TrafficTypeDiagnostic: BN6PR02MB3377: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 31:9LcFahXel3lNP93PEM2V/B21Q2M4CEQK1fU+lVDJp5WlXo7Sbqzd+U9JVNxWOMZDyx0IPinjY32yqtGYnvpaAUkhcutMIYM2aSzV7p5mdMEmOdep9gvF4+YWvX5zFsJk2b6dofvPI5qOkd72IN2wuL9oWUVynDYDoY7RI7TB3RtHhTdjky4TlT/tHqehJwEZGk9drztrgt1S1fHmgg0KcRE8IK42rAULio1kdrDagbQ=; 20:Tt4LFi/kx3uEWHQxBjNOSS9Jyn1RcB3II/0T9ZMu/JkSplgTGNzcEugTBJkCVovxLlbC8NRQWKLhglm0Ihb8Dk4EZc63mF5zqgsOOy3I68RZyTQrJrdN1Ab1IVoOcrCn0joHY0kFOYPzKH1cD54NW6h3MUldFEDAAejtpKX0rPxtlbS8KO7m+ijFgSSMKoTxt6bJ11dza/2xDlY1jU4Gq199PdL+hCDadDgDq8C4+wPLqB2AnYGhxhXXi0N9y4N1zWEKvtOIZK0lTLAqEFGZEekHYCfvu1rU5nvn0wkuUazBpqZaZKe7Itww1j9+byiyhz5t0TfN5tusWIWjhOpuB5lpWwXNqAw6aycYvu01Yi4IImDR8hg88ZGPQPE18ueqbHGRcSrUwLvXvjQO4j8JWWaTtlPS4lpk1HJ/n2cJh2WyISncZ9TpdqQigsv875eLGQ/dzQO881VDfNOiMBIwP446a1P9ze8joJlaKltnUtm57O8BTAkpNXCobdK+ezv6 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)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3377; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3377; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 4:rHFi8qE+JNLJ1kUE9ABSxz8tHix6M7MPqLuwz9jHJvm7e3E8MdnPRJKJKUYTRNC/BwHhtTYUoVWKa6A3hL1r7rkJyDx8plHZ8Qk5W5DoM9hpDhH09A4wIklxO7TSGT8EZXxamtqrvWaz/kb93ZyNUuaz+j06NmzfDJMNw2d03Xj/qUu2bzRHp6KvbXLfKncaDVNH2bqbhle8Qt7cONyR9LNX2ejF2emH26ddWAmX4RAe+ND0tfLb3zEfJ/SVYXzrrAVJ9C+iYpm7IA7O5FJDifuMM9S0RZVK/QkQiH6wwd91CWdy4gB5Sd3AzUHVzSbeHf4pqwpgNbmYaZNTZXXxXg== X-Forefront-PRVS: 04631F8F77 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3377; 23:+t5qI6NDXU0/k4n3qFfFLx2qontDcb2jzT5eOqkQm?= cnkxz60eftYOCdbYSK2XwY6IoLf93JMEyrOnT2blacqwiFEOcUsXiJETWWNMXXFmBYI0CbP5IxssrDkjki/KEcxDRfrSrSe5DDSrkVf6JA/QNM83VlHTzKDPoPsIpLBBCltBZ3Qj03lQBAdyTgN+5+GPlxw845tt2A1SxCypSVWUYRwJAzmT/er0sJOq5Rmn1F/EQV5SeKqjBZ75JRuv/wjgVbr1DFKNJX6jU9gFmhZbSFf25kAkDufT0t2Vk0pHVkSnN4/tQHIVE+rIul5wudURRosnLqZz363TyEfyIMpkhGRq8nHqdmsbCpxaTOultBscEUSHMF7F68PUKcH0VbbfcvM8TTZ9ajIW9aMAo4bCSJcfBgDnfh+aaioFKFPyUOQM8ryrd5JQNrAvbuPCInD2myClUcxq9SAvcSEumX8oOrxW+3SY5tDHHs75HQY1D+cLHiAc/Q6Y0wTJkhVPW4auIfyvd2KqVX7C5OSD/4CXV7DLyn9VFNmX45JHinzm1uCD5JscaB8yE7h3HxkH8+unzgsxa6o7/Jn70HDJHY/x3WeNB5x5O3Ax0ofn1BBWEl7JI6t/3sNJJrD4ljpv7bk1L+qKY+0aNz5dY+9VbVQPaWKGZ5wrxsrKjC+Up7cTW59vDtEWtQTP6bgVcS7XGCPqku3c7VmCeRSxjfzOxdE9T2qdsGyP8ULZaOOLXhiKK3gAEHHiq+KALcFDOgLZApT5djOZs0vECL2dF2Yvz/V2SyLHaP3msXrJgGO0bt7l8VNmQvkZeQ7OZ+JepcBCTuHDq+GNcYijlMCrHVkYo6ePD8+FGdYXyDoWRO7k2pao/7yHl101KdaW9VHOcHV+GlmdAtFmgrzMlMdFRKexRHGglG7Jn2Pt0yOaYnjtTW2SSEWo7jNjeLCZFFtHGZtDbZGFnfa2+gYNb4OC6QHUCDn+KCOr/w51TRALnhcLDVqDbNFB/vwIF9xz1VvI4WD9xgisyNuJJpKyjTVukIif+gCsJCVuJsRpBbJjoMteHCyPQ7ZjV/fKSvzY3lQPw8W1VVmijEM33NZzUqZQyTXk0WlCQ== X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3377; 6:/OPbXcMc5/R/Zx5T0X2SHuBMTQmQOjmMiUTafi395+ff5B1Qkrkc3sg8QlV3PhfJvBr6BouHxcuRBUpH1v+AaS0EthZqq/L7WOnX0/rb4JipAr/F0jFb8mKCv2vUO4sHJ8DRawPYlGxxjUXgtSv+iOqYSeGEMcw3pv1UU3g44C9eARjsfQK+jm1vPYsjv3haQmzHHixisVhs/udWSoKtCJ2zt+gmq2D09InHUfU6MJ2Z2vtfaQhfECptEbkmwd0vW6/xcn9gbDcv3dTKecHaop9Lvh7lg+Vr3AsLfh5Jd/WAgmXWHGr+v9T1GJSmhfV+rjsDLz1yWvlrsDbrmQHaWg==; 5:ngODv+fjxxE3VCRpqsIT0OMAYjsDlMczGdw2IZD/w2+t+JjquG4dkBr9uGWY8uMeQKrnlfIKloSDbfMoi8ZL+Ybd4xd0a6Pxf/1h1Kamvq6Pcv9Tq36BiuJJkSA8qTjGSp3W/ZAUzfhLP6ytL7zAK6I8GAIT93fnUp4bj0cq1dg=; 24:G0B8fKMtxKsog5ti98W5P/w7MZzfvgqF46Yun5u2nd/R4ketpc9tTYAWYL4xdWP/ehesTCUpCkgJrz6U9IL8Ab7tIrlMuTsQp0c2DQefJdQ=; 7:yFW3PhsCHQ0eoDimxZ4RFJFJkdHPlaXEZ0JEIhyzw+Weix2dqS9Rqw32tPp7jGK+Vh64ctaBzwMxJwhDeIrRiG0Q2okBwA8mIAfo8BwiwazLhC06OWZf+vpaLRX96GM446rzLPAM/DsjEThLQN7O9mPXDYG/uRfTwm7FBeRA19OzQ6ajzT1cTM7qu/IWpKlTUdijKDyCuja3r6snJimkKMSa2Tipg4allXQckqnwKmY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2017 17:33:50.7291 (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: BN6PR02MB3377 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.89 Subject: [Qemu-devel] [PATCH v4 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 --- V4: - Move the IPI to the machine instead of the SoC hw/microblaze/xlnx-zynqmp-pmu.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index 828eeedc9f..14b8ed4a43 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,6 +39,15 @@ #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 XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj; @@ -136,6 +146,9 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *pmu_rom = g_new(MemoryRegion, 1); MemoryRegion *pmu_ram = g_new(MemoryRegion, 1); + XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS]; + qemu_irq irq[32]; + int i; /* Create the ROM */ memory_region_init_rom(pmu_rom, NULL, "xlnx-zynqmp-pmu.rom", @@ -155,6 +168,24 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) &error_abort); object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal); + for (i = 0; i < 32; i++) { + irq[i] = qdev_get_gpio_in(DEVICE(&pmu->intc), i); + } + + /* Create and connect the IPI device */ + for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) { + ipi[i] = g_new0(XlnxZynqMPIPI, 1); + object_initialize(ipi[i], sizeof(XlnxZynqMPIPI), TYPE_XLNX_ZYNQMP_IPI); + qdev_set_parent_bus(DEVICE(ipi[i]), sysbus_get_default()); + } + + for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) { + object_property_set_bool(OBJECT(ipi[i]), true, "realized", + &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(ipi[i]), 0, ipi_addr[i]); + sysbus_connect_irq(SYS_BUS_DEVICE(ipi[i]), 0, irq[ipi_irq[i]]); + } + /* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, machine->ram_size,