From patchwork Tue Feb 6 22:23:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 870138 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="NxXK2yQq"; 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 3zbfHq6ykWz9s4q for ; Wed, 7 Feb 2018 09:28:39 +1100 (AEDT) Received: from localhost ([::1]:43953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejBjB-0006fh-G4 for incoming@patchwork.ozlabs.org; Tue, 06 Feb 2018 17:28:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejBiW-0006by-NX for qemu-devel@nongnu.org; Tue, 06 Feb 2018 17:27:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejBiT-0003Xu-J0 for qemu-devel@nongnu.org; Tue, 06 Feb 2018 17:27:56 -0500 Received: from mail-co1nam03on0617.outbound.protection.outlook.com ([2a01:111:f400:fe48::617]:45164 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 1ejBiT-0003Vz-91 for qemu-devel@nongnu.org; Tue, 06 Feb 2018 17:27:53 -0500 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=lIOYemBSIO+gpBalbLN9rrbAppU/CGiSku2DMqV6YZ8=; b=NxXK2yQqNzCGrw6Fr2zeQcJDP8OiaLRTj2pKM9QRbYn6IIPadvimbdOZp58tf2i/b/d4DTGltycg1BsseRIRCwDAX8tihe2f/uRwDgnc1i97rfLjB8w1FKfUo6heZ/e8QFZi2iSUmUVB8zwTKyZAwXsd3HEcGOFeB4glfTrFFyc= Received: from BLUPR0201CA0003.namprd02.prod.outlook.com (2a01:111:e400:52e7::13) by DM2PR02MB1338.namprd02.prod.outlook.com (2a01:111:e400:50c8::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Tue, 6 Feb 2018 22:27:45 +0000 Received: from CY1NAM02FT024.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::209) by BLUPR0201CA0003.outlook.office365.com (2a01:111:e400:52e7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.485.10 via Frontend Transport; Tue, 6 Feb 2018 22:27:45 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.com; 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 CY1NAM02FT024.mail.protection.outlook.com (10.152.74.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.464.11 via Frontend Transport; Tue, 6 Feb 2018 22:27:44 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:44494 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1ejBiJ-00025X-TV; Tue, 06 Feb 2018 14:27:43 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ejBiJ-0000tW-QM; Tue, 06 Feb 2018 14:27:43 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w16MRYhc030141; Tue, 6 Feb 2018 14:27:34 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ejBiA-0000sB-D9; Tue, 06 Feb 2018 14:27:34 -0800 From: Alistair Francis To: , , Date: Tue, 6 Feb 2018 14:23:04 -0800 Message-ID: <194e8907cd60d814ae9daab63e2b0948c206989c.1517955702.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.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)(39840400004)(396003)(39380400002)(346002)(376002)(2980300002)(438002)(199004)(189003)(5660300001)(118296001)(8936002)(50226002)(48376002)(305945005)(356003)(478600001)(54906003)(81156014)(336011)(63266004)(186003)(106002)(110136005)(50466002)(8676002)(81166006)(7696005)(76176011)(106466001)(316002)(51416003)(36756003)(47776003)(16586007)(39060400002)(4326008)(2906002)(77096007)(26005)(36386004)(9786002)(2201001)(2950100002)(6666003)(107986001)(217873001)(5001870100001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1338; 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; CY1NAM02FT024; 1:agIBay1HAgUrPxfEJFLvB1soUtJQjflfkMn7jrZlxIBNNZyosv9PukUhA6H7hfOlqxffi7spUhoIMoR2D2B2j6TTTjcf3qNVytJFalQpdDzhzds9SImXkAM3obxcrN4i MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9631d4f4-b5bf-41db-5709-08d56db0d7e3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:DM2PR02MB1338; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 3:8TGTISm5ETMG5t16FvBYCHf/OuKdYmS4Z7/VvMcpEYZ0I04eCDFeKEjGvEuw3T/qGJTm4wTC4rB1JNZ19HPTx9xkWgYaEujcyz+N0shqjbjc5kCzRGJjxk7+Q3RFVbCNnLGvau3wj090ki/vtlF+tVZvc94EKA5WJiqFqaUs1qwbmYLsVUW3ZwvPkTX8BROazWLKG6PkanZ2HgPjEUU9VF24B9QgvVEBWZjmdkwRnk2xrwuMXwPnGkmAI+HSGp4SEUBIvejnWYEf30aK4XK7oTqW4kqAMV7YKUlWWPfldgugmTYq9ax/0g58RfDolif26A2nbbdjT+2vBE8SqpSvOJlk7bPsp+IoDNDXxqW2DgI=; 25:OGvRiRrkMpw3r8t2nY7xNQHp9gM3qebdrz1WpHRcszXRtTLencXR6KcRTniKkd4zECCcQJXxnbyu9pHm1aaBMXF6hlbItQH/NretdpTXhNME3aINgobO2ZiEsN/17m7+9JUyKFmNipesoka+csiBGsY7M4gqhMVarBsxwAciJDi/eOu1mun+a4deo1+WUw/R6wWTi30KtNhGbwEGjnehWi1ERdyR7XIfcLIh+1Mr7y0sCFhjAzJIF+OCCASqC4bjI/UuZKrbqOa4itiZ1et0diKxNuxuzeIUOiMRriH86UHbFBNIRATrMiMNYMiGD0Qp1cJo/QKwZlNwuFo784lQcA== X-MS-TrafficTypeDiagnostic: DM2PR02MB1338: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 31:w9FFNAxaW2kG/R6yYp7YKLnEexCfXLurZG8F/vyCxTZtndhT3H55RpZtsgpLy3yavHUkQU4fPEGdAx9q7SEUDMzMMqCRvmuzlXHY1BYRdMNvnYvRs6ZCAQ8ouPg1S/VYaHwaHhEqYnw3kjWVfMeGJM/wOYd4IIQc15ncO8yPsfkGgcYwkUQ8+lfq8Pd7rRryOMg3lWLESfy9cypFYFI/OX9D9knEuad3JsUjtN3JE/I=; 20:SAKVKHg8JWiaWktOCuj65NMNCSAwYBldJLUMkO4GBT3iQXRLMIwoLladECpYZDynkJ+QXOAK6zG1tGf/VQTY/4si2qUaTQkZydIFM7mYqnLLx+rd4rcdLDClkuHlWDL0YrO0r6/JSyfg4e47S8C7KKVOCboM51YRKOp0Ni+OELwAWTj2Bgi9S7GkE8VwfoNe7bZo4fAJ1VxnmUBBJpfD6cbzTl5STM8hGJPiy7vy9rnB7sZpkktxBC4hPOl0yGimqX0bKQDktt5W8hPysmwYTBX3cyFbghNVVx9SEa7V8YawJz0QoOvZojplMjJFawynLkeFyIVRbCLPIbKwnLwuuD/YbVEDSCc2fRrK6aQAXagb1przeNPkz3v9BEPe9O/Xm6uFww6Rd9Kkjb3vfFVZP9kX7e5h+rXRj8IJYmeulT5dqcv/HjkC2Ld6CaGpWZ4G6nOWp/EKExKJ4JtI/of6Dqts+bCxINHajSkruSqUccPPDiOco4kOUpOexUgZm4EM X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(21532816269658); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231101)(2400082)(944501161)(93006095)(93004095)(6055026)(6041288)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:DM2PR02MB1338; BCL:0; PCL:0; RULEID:; SRVR:DM2PR02MB1338; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 4:4/3p5HFxDQTt5O6eG6vZ5+KCoqnPn0RGjeV9swG4zrLtspzAfzfTwOuTgj6HJmg23oA6vdrCzBtw3iq2z+iOQdr/0mD5wu9YgslDMEj++0FjAKFFf+7PXZW06kuYOf6UrA46ZabC0muImgW6tWS2DneFl7epkY9Ofit8ZOACzqfsqsO9yErPaqGfDYdD8xjxDkItg2UUdjdWQxtYebMgqGV8bRE/uzsyc9fs0oG9CJSC7vlcYm49+JnIe5zirfWP/0Zmhj7sqkL9RMnrrmFki7permI/mXkZV3414TNMd+vQJxrg1c89eSWEd+F+lEcl3cg0EojrlNFlnxvaV1Grbb2xh0V4W1o2wgHf33L23Xw= X-Forefront-PRVS: 0575F81B58 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1338; 23:DcqE08xK8574TezevvCTikFTORcy+rS82usZSYOuW?= sw1GrBp+4IlnWV2kPCl4Co///8DX3vZDK+T11jeu7dp58v+6rAmVjd5ekLXOKZx3WYkaRPdm94STSGXT1whnFi+0qG2calKxlwTLqE8SIibx1jgx5c4dkf5URbGYJGS1NIibpQcaQmhjgHVb3netv1Wb7VrBm0484ux1t9AeDBpwP8yTvMhE1qBPILuuG3iGZOKSxXAoPK8WeqB7xC4rY6ihoobKWoXgLlf7gdsqKbIHt7QRJAGAPhQNYb9CzYoHmTVEoVlQxfks4lWsyArmzn3chzD2ia3mBOYZqceSoC9qjftRaT6wCFdQnSwSMHHKr4Dqf7HFmvJXFAIESQOpj6LFMj3mgbypcaiPTWnFUtVM+n25PBdf7yvLmlKZiBbdbIlPEfKw6Tfg8Tl8/Z/8oSMT4+9yuXPXQ6Qf59HZOXP0p7pKSo9Hm4cn48w9rwBZ3mc2KF/WktdHlra8wv2YFLcQVHPLlMGLonuxAnM1ojl0TeftH5BRrTJp8D0LPar4eJSolVD7q/9ZAw/pELDTGaoGg5YvB71/tgWZtHnE41/YV7BSmsC5jWPTfWmghJOKWKmyywrBBHB4lRP1VcjdE7O4zRSr9K8NV3B7+iWNHcoMZiQa1obv2ROcB5PNI4j+vZbkfcGA9V9RtdvkkFX8zdFdVg67gClg5ER4ro15NjdSCMT5rSt6KafTES7DRE7pv/Mlg7I7e2zFCen2EF4qoJPO+zemjwm9+GqLVKic9P0B1xQzXmV2sY0zszDxCOzkBTUErt7a+L0zirWSGjMMAQQ8KwfD0CvsWCCZ9KoYSGfUmKkJ4zb1IEmACILGx7G6HdNB06q/tS7mJXUe6atyAFfmylQ+yPs/saHsgZKi554sfO+si+93UIXH7p82EUYTvQeTl+QGxZ7Vj51xFFzXYkuFYN/iXBkhSRy2okpafrC92/2m2bV5a+55lPUTTiJFb0xJaeM2D8zyosVmaPB8vpsfnLY/iquOo/k8eoc0Qh3BHykEmqQDDHQhGUpY9KHPs7C1lxqfr1/t1Ba+GrXqAyfF5AQCCOpdaUEI09ANAyFnyzIy1Cm5KH5PPFwwyjW6EgECGqB8DnP4974OsvbWNp0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 6:bckvspq8WMSeekgGWzm7ELxmMGaj499LvXVmNMR0XTbbFjNi+iMkVikoMEjOtFeulmFn+Kf/GT0RqSyBrNd1ig7M5PGCcuD9EtOhmWrw8fYi/UcG3KepwsZw7rozNYS6mjw7iw1JRZ8H9zGiHL4Y5aYuFHZq9kkO2y6kr0DaD/W+PLb5dO/NSduvOUOtrBU5ahkVSf+pbE7i3devzNjWt/AxmccUo2Sn6xM+JPlxmthqKN9mNOgzCaQ2kiqPE1GxMIjeu7OW/WdJfT2kHd8xptFZJaFt04RvICBnbHtD86WTCyY1fIFw3kdc6TildFitodMf4slSkUPCJoJlme3fn5XBhaSJF5fxIjIMWzmHf44=; 5:xSi9qs2bCXRYAXkfP2Mho10uHMroNRAmLokEIrv5u9YGypylSZ+N+tr9jOboxbqe7v8jKFiDcv8PvQFYy1HzBoaA4f5WXU6lrhpxrP472oJHxqmZIpt6bwI4h1XfhoBA5JAtLnGHtLchh6PPtiRabDfTbghGb7rhFQ0axjP8rhU=; 24:gaOheAfPg5LJJLY6tvNxKhH4cT7L+9kl91OCVOmWRA5AJVPVXERbFNOH+7c5yCCyqgObo+m4Klsx5dx2kKCs9l3badAcsBN6eHVyJ5y1WIY=; 7:PeZKFqbVks2z71NwIJnFX112qAC1zx6oD/n5hhNHEjdpjtZ6REGyAGl2VlJtpeKoD+2dlCGfu3YLpu95A6NZJSjNh/fOUWVw+nJQSbBBZwyXbrg1b+0Hr3dLN6J+n1ZqUSsn/AeSk46GITUcK9siTIe6tu3Rz0bgMSGkXRt2weu6EbeH3iHkGl+5XOQTKtiaBJ8/pBI/8VZYOX862TI0IRJZxNZuO4N+g1++q4asa8jJVuv+ATHCMB6sDlgnuoe0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2018 22:27:44.3652 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9631d4f4-b5bf-41db-5709-08d56db0d7e3 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: DM2PR02MB1338 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe48::617 Subject: [Qemu-devel] [PATCH v1 2/2] xlnx-zynqmp-pmu: Connect the PMU IOMOD PIT devices 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, 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 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index 999a5657cf..f466c56e45 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -26,6 +26,7 @@ #include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" +#include "hw/timer/xlnx-pmu-iomod-pit.h" /* Define the PMU device */ @@ -40,6 +41,7 @@ #define XLNX_ZYNQMP_PMU_INTC_ADDR 0xFFD40000 #define XLNX_ZYNQMP_PMU_NUM_IPIS 4 +#define XLNX_ZYNQMP_PMU_NUM_PITS 4 static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS] = { 0xFF340000, 0xFF350000, 0xFF360000, 0xFF370000, @@ -48,6 +50,13 @@ static const uint64_t ipi_irq[XLNX_ZYNQMP_PMU_NUM_IPIS] = { 19, 20, 21, 22, }; +static const uint64_t pit_addr[XLNX_ZYNQMP_PMU_NUM_PITS] = { + 0xFFD40040, 0xFFD40050, 0xFFD40060, 0xFFD40070, +}; +static const uint64_t pit_irq[XLNX_ZYNQMP_PMU_NUM_PITS] = { + 3, 4, 5, 6, +}; + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj; @@ -147,7 +156,9 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) MemoryRegion *pmu_rom = g_new(MemoryRegion, 1); MemoryRegion *pmu_ram = g_new(MemoryRegion, 1); XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS]; + XlnxPMUPIT *pit[XLNX_ZYNQMP_PMU_NUM_PITS]; qemu_irq irq[32]; + qemu_irq hit_in; int i; /* Create the ROM */ @@ -186,6 +197,30 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) sysbus_connect_irq(SYS_BUS_DEVICE(ipi[i]), 0, irq[ipi_irq[i]]); } + /* Create and connect the IOMOD PIT devices */ + for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_PITS; i++) { + pit[i] = g_new0(XlnxPMUPIT, 1); + object_initialize(pit[i], sizeof(XlnxPMUPIT), TYPE_XLNX_ZYNQMP_IOMODULE_PIT); + qdev_set_parent_bus(DEVICE(pit[i]), sysbus_get_default()); + } + + for (i = 0; i < XLNX_ZYNQMP_PMU_NUM_PITS; i++) { + object_property_set_bool(OBJECT(pit[i]), true, "realized", + &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(pit[i]), 0, pit_addr[i]); + sysbus_connect_irq(SYS_BUS_DEVICE(pit[i]), 0, irq[pit_irq[i]]); + } + + /* PIT1 hits into PIT0 */ + hit_in = qdev_get_gpio_in_named(DEVICE(pit[0]), "ps_hit_in", 0); + qdev_connect_gpio_out_named(DEVICE(pit[1]), "ps_hit_out", 0, hit_in); + + /* PIT3 hits into PIT2 */ + hit_in = qdev_get_gpio_in_named(DEVICE(pit[2]), "ps_hit_in", 0); + qdev_connect_gpio_out_named(DEVICE(pit[3]), "ps_hit_out", 0, hit_in); + + /* TODO: PIT0 and PIT2 "ps_config" GPIO goes to The GPO1 device. */ + /* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, machine->ram_size,