From patchwork Tue Jan 16 23:22:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 861943 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="lkQ4OFrm"; 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 3zLmby1djmz9sNV for ; Wed, 17 Jan 2018 10:27:58 +1100 (AEDT) Received: from localhost ([::1]:45521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebae4-0004Ka-9Q for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 18:27:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebadD-0004Hd-Bv for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebadC-00025n-Eg for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:03 -0500 Received: from mail-by2nam01on0048.outbound.protection.outlook.com ([104.47.34.48]:31025 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 1ebad7-00022e-Qo; Tue, 16 Jan 2018 18:26:58 -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=4+13ndKvdm+NMXVUJO1qUJtn9+xN/3sqO/Cdwz9Fp90=; b=lkQ4OFrmHdKBBSo+VJA8hfW1A62heir+GwErBEZNKRlSLdcbBfVJyFdjz6HXcKsZDdnMZ5urYZ4rQ+bMg2UnE+KXXUrHBTa1FdKkH+VURXYa4ElfuAIOpQp0NNuyWWh5uwlP0TtzqAd+NO1N9iGDM3oljIapK+tbmdQ8Qs3Jvfc= Received: from CY4PR02CA0040.namprd02.prod.outlook.com (10.175.57.154) by SN1PR02MB1344.namprd02.prod.outlook.com (10.162.0.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Tue, 16 Jan 2018 23:26:52 +0000 Received: from SN1NAM02FT027.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::206) by CY4PR02CA0040.outlook.office365.com (2603:10b6:903:117::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 23:26:52 +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 SN1NAM02FT027.mail.protection.outlook.com (10.152.72.99) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 23:26:52 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:55886 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1ebad1-0004Nb-O4; Tue, 16 Jan 2018 15:26:51 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ebad1-0003Kp-MP; Tue, 16 Jan 2018 15:26:51 -0800 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w0GNQftK030945; Tue, 16 Jan 2018 15:26:41 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ebacr-0003K6-48; Tue, 16 Jan 2018 15:26:41 -0800 From: Alistair Francis To: , , Date: Tue, 16 Jan 2018 15:22:20 -0800 Message-ID: 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-23598.006 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)(39860400002)(39380400002)(396003)(376002)(346002)(2980300002)(438002)(189003)(199004)(5890100001)(36756003)(54906003)(2906002)(4326008)(8676002)(9786002)(50226002)(8936002)(76176011)(356003)(106002)(39060400002)(81156014)(81166006)(59450400001)(26005)(305945005)(2201001)(110136005)(478600001)(8746002)(63266004)(51416003)(7696005)(50466002)(118296001)(2950100002)(48376002)(316002)(106466001)(47776003)(36386004)(5660300001)(77096006)(6666003)(37363001)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1344; 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; SN1NAM02FT027; 1:jJKgOiFBuq6XrR724TIzIMrJibujzXXDS1eRLMFtsikk0315338Fyg6r1e3yUmA1qqhk/JmEge/d/HY/VNIVSCp6W0QgCMymjb0nqHSibx9rYFbbgW5a2LHU8X0mIlig MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36626571-89af-4c5b-be66-08d55d389fe2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:SN1PR02MB1344; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1344; 3:zaNOEM4uvna50AujnBgPXbsCdjQ8Y9yX/mqlYoBynPEbtNyFk/ZqxGJEFp5Q4lzakoDNJLXSg87j2eQHaiynMqzGy0sxDviMXfS+5oCkUgbe+amdqaC4NMZOox9rBXxlGKssVcEzWXjOpVI/F3BNGcxA51Rz2YWza5GnlgjwDDOnruQ/vFGBL2q0vPb51UEnNEVrNH+kXF0+1n0FSppfL0QXvwsEGmHdWJefqDmBC3qM5WGN40oVqv0tVLW743pDFE2ndWRNawjNU/T1IW0FN4PwLvq6acZ6YmrCB5MFFzspGv0z9aMaVqWd5KUNaPJHGNfJNG3lR63XCx9ZHHKP9JuGFJbV6rv4rePzJWrEcKQ=; 25:Ynw0RaaLU5sZmEmocmH6uOPfx+zeSwqPECYpynKAOM00Ept1ptjVwWEbXiDdn2v/bWXWCE1becn67ErZBU3mDKSH3tLaIPp/CX39zvyENKjjllLJLP1cmmwmlackMOLBGrUalw1ojdYzLeu4bOCpW/kFCiyMyPsF6TF8xalW+GtuS/GRi+BGI/lTwUEApwBdXdEF9DzpRWAeh9lKkRm8mOESboawXUKRNJxaEvlT6VU3bXHAElMCTF5IIHilR4TffrCCF+AbdivzG93aeDBdbUFgqYzrM3k3+F9l73HHXHNLTDNCtL7GjZEzD+eE36eGHGY4YZD3YCrchlZd2oFifg== X-MS-TrafficTypeDiagnostic: SN1PR02MB1344: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1344; 31:PTVubWhaWQJAIWjSvNj0JyNaTp4BEWFMVpUGxw2mIGaAdnr8f7rcQLlVMZ3Eo48GRjp9SR8rOAxwieCUyzV5XyIydbc7gwK+ZaMjv6I3tr7mbRUbOCNf6o2/O7BEU2rooWYt4PSz0ErVru3X/kf8ikYXy/6N0tTN91WiuTVpiic2fMFw0R5VRaVuH44NM9a/aleIj40+Som0g39y473wwnt6bTSm6ghENKxn5aDnIeU=; 20:Bk8bAXWBQ83gxxs/3bNzz/hPJsxKSU4BIDBqfk1sQ+Cw/xJQQtf5BrI4DY0KqREYJRpDibklliRZ0K7WlO60ggwrHSO7ETkkCkKRh6PvjjQf6zhZR8lHdBFki0hxOjGf79c9f+OeoXr+5wVu5jkS8dK75KoZvmmNo+vLbjcZxGKCv8OiB/Y1VvPgYx8lnHz/DOt0hb8TzksH46Q/vB/TsyQGei6CYgIEo3mO8W284w/f31Dchu6UUnPoL+YhoFpwL1lFfgqMVOykkXPIq4HtjCSCPlFamNl1NragcbLZ7FC8kWLHOvq2JBcTqD4qiQ9wnUVawzJoPKDCTsBmzChPEUso9iGX5WI2+FjiytSEWf73nRy4ydG83TAqa6M7ExpemXugdWcZlbNp/gf66B7xCcVlILeEuPT0Ag2bqEiXurwOfeZks2297MOgHFiPlcfJOXzLM0JqeoxReoYyvb6oPiV46DLiWhcpd+0vY/M7CHMy+eCnhvo07uUqb1Tlyc/+ X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400039)(944501161)(3002001)(93006095)(93004095)(6055026)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:SN1PR02MB1344; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN1PR02MB1344; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1344; 4:EFXARsQDXdtBaIk3RUcySHRQc2SwK4CIBrVr82DNOsXmn/QiChPJLPWMaxVnMCRzuNmilweoAe9Npl8qvshCGctswhGPeAIE7XSf8HM0VS9R8BDwVSbSpoBxchya5EbzltLUTsOQYFfFdxxCKaiqzQLZLFH/JvZb9K6aLhlrKrRfbW2wTgzWhb4ukg2Jl/H6tzJ354i7OS8rXX6vG/7z2q/FBTQiCAT7xDvVYoBYKK14PWdmzOp4wHFmjNebcZkbQtuQ/vASB5TOsMtsl+r6K2X5Va5vIM1TuYyzcyAXWd8xt++J2bnD1UuI0mIONCwD X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1344; 23:7uHISMZLmaPLxGXFxvccCa/22GvAr3t7fVnybS00B?= soBlWdD9Xf/Y1dc8f/9mppvJtU7cZYjGMkrHWk78ZALljJ7PieBxopyB3SBwYVXgbHzw0ZzxgcTXNCEYvU9cBmZgFPvCak/fvAzpmtVVQ1Jd1JVey68O59jFIO9S2JT07LSjRZ9NswzK9wz8XaUda8ocL7fPKw7QJZdsBHjT1kVMNUKL5v76mHPB2MHHfE8auRJg2HqtT82Q2BKa1kFwvFn4A9XbNBWBAHq0T3ZQPOhlAumOIbL/A8gdyeCvD/yBQC6PzbWNSsAJiMxfmU4scg4lznL/AKmN9HyA0y40q/Fv3NB6UwU0c0EczG+ikrLzMcIq8EhQXTyjHeB8Mf8iYK6EYc1q9ztPUp3xG3WnyzuH1dPQSY9om/yQMrf2pZOteuTL1gIHXRIS4HU/mfISP2aTt2TAFayH/mCYd06xDv84aZ5gP9h5aKgoDX12GUmIKznpJse2dt7J0pDu46GSVrzck+nvRDzlW+mGxtfhN6iXfY1c4y9BleHr6T7Inft4taw0dSGVd9fJT7aBeyciwV+6kVIzMaiV3g+NrObxzip0uiaHniSHzn7n+Ln3HmtNVTYU2wQyAwRYvsT2BujCehiHduGY3dacGNHkiVgzXPbac1buuCScTdxzDNjN+wOceddQM1C52pTBlF4Ro/7GSsXKMZ6T1WO1NVGtm6ENxqCs2XKF+z+zy0wXz3PJTvdzXjLFNJLk4FC0WgD5rr5QrKV2LCQRRYvlJqT/q9Qn4GVLTyQRCKAz3uLOqEfsqKM+U8orshCjszkOsEi5Vo3FkGckXc+78TbWKt8+lOV0mN2ZUErv98azceKWpey9HD1ewqqpZu/fdGRy0buWeJjwXldYUMacAS/LCxpqHVEOe2RT9y8FEF8OTRuAQSGHRaU3vIvoaELwz3Ux/IGFNJSpuMOGwzDX+P8XU5kxq+6aiPkpgTADWE/0heje6PHjP/tlhH26Gkku6fyHGKV0Mq1bBHTdN9wiKnqIBxkuYLJS7HH/mGkBlEiPdhO2dfEUqHWJ519IWiz6TKlke/vEOM0Ol0yzPMNDC12+7ztlfc1fpW1nz3mS+FON8KDlRZpjDXB1HfbzR0QscKhYQ3Ilt8/QNPRg314fNS95l5q2Xgqmmprhg== X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1344; 6:RhyhxGrWBipYPtAL+4chCi9UeNWkmNq7IexfZYnguPRA9pzuSwWylZLwYk+Sh8ZKdkls4dlROoW/6aWHFY7tmQKNoa6Ajq/AjVuE0WmDogZ9V/FYYF773Tl9JMUZPcuFgyzT7DjYjYP4sTHocdHOQikXmf7h6q1g+ZbdSo5gmB2K3iBQxYZHAybresI8M5VhpqtnDpteApw80H6HFpgLiwpvvT12jrUdgFRTBvT5GIzvK8pm5dzOu8rFK4lt8jtOH3q/0t6v8osoNqXkGcD2cWzQADZlftbcDAA7PbGgt3gCkugDt5hcq/JufOxD9WphlGnBvssYcoeSu42F6i4eFS8Y41rlLiExn2lgpXXC9ck=; 5:F0EpUFPQwv1INsU8tgLyD1d1uPVto9hMv7qfkFDSdaX24p3oZRN1UiasLB2GIr6Zmd30IpUX+S/eQifujWMHWYo8+r9d1o37niXzfxwwr5tE8DY06miqHmzrP8HQ+iIzpgVZ59K/W8FwKUTIGckxSxIj4pCI4fxqVyYjDHXinPg=; 24:XGWNm1SmlYL6exdoLXTtxbMbIe9zVeYHPL72x7Cdi8L/1KtNJ62V+ePaEkLHzmhznAl7mV1Oz8/iQJd+JgV7mylKrhOGp4VxUjGKXgtvOKM=; 7:sZgd7OiL5zKRhSJs/mZ8QmZPjdobrM3tIkKs0P5XUfFM3BDGd/xUgAuGufx7SWPtG4EA5EEdZNmSwe0roOOE808Q8eSP0m11ktlKU8MHKEgARZ8RpHz6r0KT3H3+kZkBLgyTloXvySN/hMQOY7K3ghzAQx7jo+2b4c7JrNmTdchWNuhbNuk0MbZsmYbTA/+d50i40TKREakfeJgdmosM0ov8hItfc9R9Kk7lHGSENFRx4y8BLbv0VKd9xBXeo1QH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 23:26:52.2751 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 36626571-89af-4c5b-be66-08d55d389fe2 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: SN1PR02MB1344 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.48 Subject: [Qemu-devel] [PATCH v5 1/9] microblaze: boot.c: Don't try to find NULL pointer 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" Previously if no device tree was passed to microblaze_load_kernel() then qemu_find_file() would try to find a NULL pointer. To avoid this put a check around qemu_find_file(). Signed-off-by: Alistair Francis Reported-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daudé --- hw/microblaze/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 457a08a2fe..35bfeda7aa 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -124,7 +124,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, kernel_cmdline = qemu_opt_get(machine_opts, "append"); dtb_arg = qemu_opt_get(machine_opts, "dtb"); /* default to pcbios dtb as passed by machine_init */ - if (!dtb_arg) { + if (!dtb_arg && dtb_filename) { filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename); } From patchwork Tue Jan 16 23:22:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 861944 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="fq+gInUR"; 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 3zLmcn5Cgjz9ryk for ; Wed, 17 Jan 2018 10:28:41 +1100 (AEDT) Received: from localhost ([::1]:45524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebael-0004xc-NR for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 18:28:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebadC-0004H3-ME for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebadB-00025N-Kz for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:02 -0500 Received: from mail-dm3nam03on0624.outbound.protection.outlook.com ([2a01:111:f400:fe49::624]:52064 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 1ebad6-00022P-PR; Tue, 16 Jan 2018 18:26:56 -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=38oCpqmuL4PFVkb9D4N0cQToIZriMVomWUm436memO4=; b=fq+gInURg6I8bAf9cEhvn7FR5qAOlB/Ns8D5oCCU4MFW2xh1z2HrDMLRUD9fuSBCu2luzBh9GNPdh/lYixqSjn48V4/tAMtE8f4RFmTQLlfmhiigSlq8qUD0yvguCuCSQVZdwMl3vi0Cn+TCTLzqmEEvB0QUKs0XAElFEhH89O8= Received: from MWHPR02CA0047.namprd02.prod.outlook.com (2603:10b6:301:60::36) 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.407.7; Tue, 16 Jan 2018 23:26:54 +0000 Received: from SN1NAM02FT063.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::203) by MWHPR02CA0047.outlook.office365.com (2603:10b6:301:60::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 23:26:53 +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 SN1NAM02FT063.mail.protection.outlook.com (10.152.72.213) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 23:26:52 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:55906 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1ebad1-0004Nn-VA; Tue, 16 Jan 2018 15:26:51 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ebad1-0003Kp-UF; Tue, 16 Jan 2018 15:26:51 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w0GNQh4h031019; Tue, 16 Jan 2018 15:26:43 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ebact-0003KI-II; Tue, 16 Jan 2018 15:26:43 -0800 From: Alistair Francis To: , , Date: Tue, 16 Jan 2018 15:22:22 -0800 Message-ID: <3ce133738e77a4d370e117467754369c738a926d.1516144891.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-23598.006 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)(346002)(396003)(39860400002)(376002)(39380400002)(2980300002)(438002)(199004)(189003)(8746002)(59450400001)(478600001)(39060400002)(50226002)(77096006)(5660300001)(8676002)(36756003)(6666003)(81156014)(2950100002)(26005)(4326008)(8936002)(118296001)(230783001)(81166006)(2906002)(7696005)(76176011)(36386004)(106466001)(575784001)(50466002)(106002)(2201001)(5890100001)(63266004)(47776003)(356003)(110136005)(305945005)(48376002)(316002)(9786002)(51416003)(54906003)(2004002)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1338; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT063; 1:FTFzscuEs+iOvz12fyqCEBjMSBUL++MB9WNx8520Vs+XyZCFFraxVroHhyGENRALKcdKVrNBUru6VJuFOOpu6gm6R0Pd62SKg7ehux1qPmLnNSzHkzASEPSZ+SF2xEEs MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b41fad16-9fe2-452d-2a5d-08d55d38a045 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:DM2PR02MB1338; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 3:B8WsAeQ5uAcXE1xCwWaS/CJ04nxOqJKAPBul9jUtT+N+idrPfBCQHWS1XE0bS8QNjH8iSJ8OTpPNqAKF4SQlEwAerg7gB+04Okp5cXQJrTEDWbhkCZ5AIFj3J+azJ+6KHjXBbjyyj5BLVGHBf32aWL9JVpjXsk9zb1KjMNmzQMqPAfiHJQouuxPLMnZKTGqJwKs/v8JRirZSSy4gSTBk2h0xRJxdsbDqRzGBmScCMr5Uy1uOBLX+/n7EI3ZlNap9Mw9v4wlpNUc6LKv4cQmOKG7U+/MEB4rr788kR86xGw5+xnGX/jNNQLLRsYhRJqiKtrGrTBenl5LUD0hp+hC7+JIwXYWYKfGSsmMJ5vElxYY=; 25:KhNGQxPepfA6rHI84D32Lu0ebs97jG01ZIh1WlEYMtKZOIdLZRZ1AhBiTJsYhw6A1KOLW7boDAWWIwnVZe9ewqFwmgNWdMQcPqKy8oc8oMGH/2dJnlKd/HUEfCNRpnNt7cWNdNR/vbUCULFS0nBEYdk1ZR0Bkac3e+WjdHmz9j+/20chcK5hL/sdOiU2wFepxyoQ+4bvrrjvqf8KiSE2OXYArIU6VZw3SQzvOhvw88I/7RSfRJeuH0bNoCiby7y0bN5ltk0pvHciLgIuBcC3aE1g8xtxstfkmLHVR12fy3i6R7Pup/q4/akCSvqi5SEQS0rZdtGOUN6Uv7lZPpCbDqwlsyHOTMQsVe2X1jhp3mo= X-MS-TrafficTypeDiagnostic: DM2PR02MB1338: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 31:adxlP3slmVkkRE4uLoQFb2j0KWWkoWOfYpgj43KeOx2b/4GDa1uAZlIyjyjo2jKh011A5SLMEqGMZmpbxKOrmITrGuxXjz9ZqRl78Ecsu7vL/JBU03Uvt/z5p3xhILzHoObn5LehAlV5r4IGlwQlPeGpFbqT32tvTjFNwnznemWsb+QdOiJkpZOAAAwMVmH96oNTwCevvCXRlnXeEeIL24ktg+pvD2qsgpJA3OYwuW8=; 20:nhZZUu7Qwvy00b0nMM99GU17opS04UtmU/Xb/v/BOLfZJCZc4nImlEDTGtYA4oYOpcQ8Bt32uEOmXohqxO76JNg7seQZhoa7z9CJ9EsQMmJjL+cBs9P5VeK9Yu8kdi2g4c/SiMBmX0isqzUU8VOYEMY7InBaCf+Oblyx7SAeN6wks/xAv8jalV+ryLHHJe/XvWK1QuAm0OGK0q3Y2fFmVqcYUB9gaTmSptnRGj2Fat+rPZdCdXEi7ZJ2BGgN4NE3kXHnlEie5eUnTUKHE5Dw+IVNhgmL8faN5zJ8M66UCWWrU5hinEyB/GCZAk23YcF4AXdrH7waT/E1t6QVniyVan94xypMY56XegyPTdildL0jweTk78gm6BbGx1WYefn2eC8CII6j5suDgdA1sq2/dgtvrhRPzS7MAQpSmKBPNw7UMcOJ3lnL6PiAFWVXyzrjnQAua1lIUCQcWPt/cijxcyCLtfA09Vj4Va3O6Ny4564YAQ/upycoWDljggZPZXV3 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:(6040470)(2401047)(5005006)(8121501046)(3231023)(944501161)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041268)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM2PR02MB1338; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM2PR02MB1338; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 4:AdpStYHZM5pR5CTpk3XW+6riPsnIFFD9fi5z1Ra8szNZM8Zk8/UJTilj121olZ9z561VHPOOgnry6ZC98yWKkuAOS2IXMAqcjx2tEmGFuN4zKGClir7VgxNHBKpV1dqdSDP0z1fGBrX1wtAJx0lL/5lQKvixzIT+/QRvvhzfTMS5MiVX7nHVRKqnx7A3lrQ4wOtNiSO1DhIvxyHjbHwC7AF+321qBqEWkI35oz3k8vRzlHoVMkoSfN8+TipQrhjxIkWVjW6lYWzD5xCFvwxleHDq9RHlj0Eb+6b1ktSvCog/PD/cIVhGmSGrNs0aLDg4nCk97BdDvOZdNdKB4WJRq01YHJbzSbsEa5SwZFSZbTs= X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1338; 23:e9yxULq4gaYvxzO9YUYdVUcp0lILx9mFRDezUUYK9?= O4YTuoefc0jWGPDexA/Csf11de1HTONmqpmf3EcPazkRUG37EIo0sXhAtw82VD2HYRw3ySrmwX7jFQBJ+dpJfvSNzGdMJumN3NbBqRbydgVF4Z86+kJiyaI3f2Awl3lkOd8QdYXOMd7gmeMQFVtjGX/YQmJjBQvk3icngmQ/djEpO7HljgJ60plbWnZZiMNRP3AwsLdV1EM9Lp11xbdlWgQxNsCDwyEGzQqSSdSEKRMiwqp5kYY9Lck9Vllg3m531nq+R5ssiJsOqcHzQ4BbSWytSNNWtDnBzNMYc9guPgJCmN41lFdbSrqdG/Te6cTCbSzKed0ju1p8vSwkNmRl2sqKd1Zq1zymrY7q5pcJh7XAZr3fIsN6c08hOAUqBfy7Oo0pnYH/luTSC17UWTeE8XZ+FbStFjkGzRuMHRJELY/GKEWHNkiW4lknuuqhLCfOahASxYwghP75LWan7XXNqXX6GXJxXXq0EkAWrAwUq9QtCh1pZZAepiXVL2095d1ugZMvKbb6lREVYoLrda3OHXtmNKEHMAhkZUdtXn+H5NeaolnyJW/CnwjGLZT5iN5cg7ni92bq0y9sGwcLIY1szc+yKUexMX0BMf75DkZMyWr7t+0d+fpKhrUOzPa0NJ1/0upb5FriiXFZbWgAK7E+S+4Ovr1vvwH3aJuMfzqb/QaTIVqXK7tF2wbtXS1Ykc027vEfri+zWkh+ylwMcTfyPYZ3MwDPXfV+THLC0OJs5KAyalSEKAa45yrY3vCekIEhQP36BnWFvajPRnXitmje4Fb+VO+4hDThU4Kcr0KOWajK74Jnha7kJDSf1K34umwoRgwTxMOTP9Ob4WO0axlpJO7MwSyxwaXnI2Ym2hgkmAdhVtgn5qxWi4kEIF4WLm7Y5mNSnzNL8b3x1K8PTLI7MeoU62OX1NpoxiL2FU1uPdaTz8HTc+h6+oLZku/yP1JYkxxd0iLQq11IS07ylzD8aRvwEJzeBf3Wr/jihMHBj23AcV4ibQJXzYmokFVJflN0HBiLIX3q6REHEEccAkoZ8lo+WAHOjoty6+Hw275cx/vrMTHd6NZDCYKM603Vu5m/fB6RFB+OYelqQtH7Nfn4Fc6OLXWW2Yw5/ZdxitwbOsFyEAXkrA5MIAUEZ9wRrLghMM2m/maagtunPyBAOhjBgc4 X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 6:Dd1EvtnQsTpga7bQQzV4muW7ARbxTIWmpVEJf/6ltMz27XqkkhL37nQgw7KeQ38TCBJJ5t6UjimekNkOSuCCgsK84dUSXUuFswTn/hP61dk/XXkDY+elkdXZg4EzNRDB1wqi/ZvtfdOM8G/ol7B02K7vxpNXP0ONmHnydOgxx4knbhcmPniB9cEjctwKGz0Oz10O3mwDaBEpCH+zcdZOjx9yOlZ95BdKrB4Lpvkbb2kqNOyQJXnetp7PTeOoHy/chuZfqUjuLx9XJiPLJjDf9+81JIfQWD/76vKF+khqK8p7n9Be1Go3CEtlQU7+n53kTWci+J8XL2RSXC4owwT4TA0vtGeTri71V6TWCP+36Kk=; 5:k7gEWzbKx+h5371yE+97vB5wTfV6GG+pCmS9GK81sdRXNlZVJ4315Jl86Ld8zwiIVur2aDnvXsoLS45DU4DbRpbMwxQ54fv1ZhLmnqkUuxikVQWNvjcBVuK7JJKZvAN4c/NBiJRbEqdrukuLJ6TtmfasR+5ozjLao2bQ2CvNR6E=; 24:sFsxyNjWA4XOEnFWCUP1jOje7ANPLLaBW28XqOK7RAbd6t7zmUUVO9D/a8k3TQUejVPR40+eRyYF/MuzssnG4EUI6e1N+MtZ91I+2ilcIsU=; 7:GLF/elasQ8xN7F6dUexhKnZJKT82quEQ0keAU8OJjYxvOIpA3asgDGbUSh2i4EYnhDAaPg2OTfrFUR9bQqiJwvdSmDSBQyKBZmHM3q3yoh9//R5EAAljfj+EMLnBixUrRm3qAvdHBCUd9byogdEbn3CI/FTYYK8quv1JMgXt6jlGDifQIqJYho1+PyEVqG6zfmKfQSIaKCzy751S5rXAyFVgTaTHS/urkAyiUKEJKljWxlP0vYCqPJa6KQp4pNDA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 23:26:52.8576 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b41fad16-9fe2-452d-2a5d-08d55d38a045 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:fe49::624 Subject: [Qemu-devel] [PATCH v5 2/9] 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 Reviewed-by: Edgar E. Iglesias --- 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 -- 2.14.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. 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 Jan 16 23:22:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 861946 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="DS2pC9IM"; 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 3zLmgQ2j6vz9ryk for ; Wed, 17 Jan 2018 10:30:58 +1100 (AEDT) Received: from localhost ([::1]:45551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebagy-0006xV-Ev for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 18:30:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebadD-0004Hn-Nq for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebadC-00025u-Jj for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:03 -0500 Received: from mail-dm3nam03on0070.outbound.protection.outlook.com ([104.47.41.70]:55712 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 1ebad7-00022d-GL; Tue, 16 Jan 2018 18:26:57 -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=DFLERS8qygjQ39/GrQ7OycQfe4LsWetSMgLos3LKq4w=; b=DS2pC9IMSaWIeE1eEvMrWZxrejB8jyKBOZh1/3nJMBaeWKA2kJuPq3SLeeCID13vAvdjxfysqiOx4LDyi1ni+voEUBDaD7EbSaFMuIntKMytW3T5Yt/T7yz5R+To461+3XsDBMz2wuqrjOfEVhb4dAmQF1Lzr4YZCAL2pi0j9Ok= Received: from MWHPR02CA0001.namprd02.prod.outlook.com (10.168.209.139) by BY2PR02MB1332.namprd02.prod.outlook.com (10.162.79.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Tue, 16 Jan 2018 23:26:54 +0000 Received: from BL2NAM02FT042.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::204) by MWHPR02CA0001.outlook.office365.com (2603:10b6:300:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 23:26:53 +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 BL2NAM02FT042.mail.protection.outlook.com (10.152.76.193) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 23:26:52 +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 1ebad2-0000Mp-3H; Tue, 16 Jan 2018 15:26:52 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ebad2-0003Kp-1A; Tue, 16 Jan 2018 15:26:52 -0800 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w0GNQlWv031031; Tue, 16 Jan 2018 15:26:47 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ebacx-0003KY-1g; Tue, 16 Jan 2018 15:26:47 -0800 From: Alistair Francis To: , , Date: Tue, 16 Jan 2018 15:22:26 -0800 Message-ID: <63f5e8b2687502e1d6c53e190869e88d134f5f14.1516144891.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-23598.006 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)(39860400002)(39380400002)(376002)(346002)(396003)(2980300002)(438002)(189003)(199004)(2201001)(50226002)(305945005)(63266004)(5660300001)(8676002)(81166006)(6666003)(36386004)(575784001)(2950100002)(316002)(36756003)(8936002)(8746002)(2906002)(9786002)(81156014)(48376002)(110136005)(77096006)(59450400001)(4326008)(47776003)(478600001)(106466001)(106002)(50466002)(7696005)(54906003)(356003)(5890100001)(76176011)(118296001)(39060400002)(51416003)(26005)(230783001)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB1332; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT042; 1:DaPZI1Qqf5IzUe6trFzy9lBimAOFqjb3gsGqwoHmrg/OKUolRHhaq3wZCCIuVoPZE8C+S1MAmv0zhnu9J6oSb/BHlmz5eze3aRCh1/nn+eh0rTh6ye4cVnBI8Dii2MAp MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a9e13a1-d28e-4909-4159-08d55d38a055 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:BY2PR02MB1332; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1332; 3:RoWYmzgu4qdONExPhKACrsA8+CyHsPmDbKDfYGj3z9vRFrOeoClk2U0W1OXy1FXKImB/gxW2FLfNUa4ZtZfMVhhb9CInRenhpGupTzffMOpKNvayeIpzA4JmM9onZKpfFeZCzkwZTjoGSy8ZrjR8uYaWnxYtaD9gOBDSo2mXMhV/dMFIJfPjZ/9r2qrx1zOIQLZuUQmmmjs7rCSDTYeA1hcu9KR73vW1Ya2BqSGhDhW0fKMdag31q0yJOh0m2fsybbHW6qjbqgl3KLotelhHBIU2OkHCkfdh4FNI5aCaasK9tsvprGTG+iHE2R3wmpud8ATsfUlEa5hiHmSHqALo5/S1p9ghQ4mTmTBW9HHjBvA=; 25:5zy6vEPFlBXphxrcxyRvGKUk1vrdHfHtKqzmKOM8nMVltC0h7eRb9uJpjjylGEA3FPYif8AeK+0ZvQU+OaFk5qIpB2mIHN9nwVJA7I3s0cGlAdxHa4RVefb6FMJlMNm1OJTPaB4QkfIZmB0RFKUJ0wgH0vquhp2iyhV7WzBMCwyiR5s9iYRVSVFcc7/D5fdCaSG5qXJxntHw3co4wrNSE/vZonULLQXO96grlFbI68w45SWW7MtW7VpE9S4lfKMuTVGPzStUvQwi13Bnum5+wYvJC4h1NPqWUfjMgkgaOuEa3WshVmdbMlzAc0ok+vPhcwAqfir2qJN9FO801z0OI0PP4HlEH9/XF2XZI/G+9uM= X-MS-TrafficTypeDiagnostic: BY2PR02MB1332: X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1332; 31:vWu3RnKkLRJ8bodUUw7Uqv4nQM/JqYqunpN9TKjyacrb/Dwx0FFMHh+2IU/ikwojw2vGD59Igvs3ZsJcLlVQ1XRauSCfwILQsHPm0kx8CAmaTVfTYY89Fyea7noFFIA2s4p6dxh9Y7tYytHXdK3YKqIRcHHkn54B2mJiB1/t3ZvvZXBazdbgGnPBp/x2QsvwVTB+FmrC9dVxJRSJkQWte0f8sbfDVZ6BcOMXjGuUgn4=; 20:H2KQzZy6UzuppG1UJ3DqqbAa54jRHbyB4WTwUxNGlqrBYI0sKHKRrusRW0SxhjomXxuPoMMxvpcK6Xj8lGC4qJgEJEeimMnukwC1arPH8QQM8v6DEOYwA8FBKhbYDFHxDyCSNUkGTgfyJNKGsmmdcGfV5vC1kFayJ+SvMJrBcF54FYnqpbxZ4t93NrKzJifELOdzaV2yPPmuW6BQ80h5DiNVVnc9IthlLsxs4qFbGRKvuRE76wu7vGYAlaXfgYQordRZGKhWyrHfvoCIhiqocRr9rr5IbMzZ7rZ0UBJcZMYpo4rZquryuc6iUpvPtswbUtAoxZLq5MRdRAMWNy/WQEtDkP5blkJ1R5881rkVgX6/ZpoznHa0MlD1pzII0v73AR0gMPxIBzxtPPS2X+z97XP2yX2fFvspYh3ctEe9MDorcCqXRzwotG5u9J5Ly2JITjUHmVVY7r1bI+luAKpUjP+IIqjkvUf9pfR+VGfOWxPlyMrIh19L50EFjfyOJ7c6 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:(6040470)(2401047)(8121501046)(5005006)(3002001)(93006095)(93004095)(10201501046)(3231023)(2400039)(944501161)(6055026)(6041268)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:BY2PR02MB1332; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BY2PR02MB1332; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1332; 4:G8W1+w+tLO1RqYIeqUUtEuo25u+togbRkYyAyHmDZxj3Cg8K64Wa3VyMPHa9ROca3/PN+/o53bb+4Hos8rCErjqHOa6B075RFJP43679WY9eqaCGOrwjprFeFxD6g9FmXsgxL6oeoebJpCyZ4x9yu3+mbjeQN9Blivm0HRDsCVn2Sn+X8IYEy8FH9tr1dDYV9pPF/61s/WVEGl/7SJzl0lQ9/d0a0iFTtntwL2DlnWhENZFyHud7qeJiK1Pbw2I95Xu6rt1iOMcAF+fmMmqQe68OidiTqGs49ZZER6tV5pP602Ydw39PHSadv+RXpTHzQyXvocIQmICGD71KslqvZE3mpMj8Qkm2o6cD76Rqmeo= X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR02MB1332; 23:pAw0viyaw2mye2d8U11UxjacmVN0ztuf4UqpJdLE3?= KBUrt2mze0ysNfE9f/cqliW01KRCMIuddeRcF6WJsyPZQY8xWf6L+ED8GU/IaMuy7NE5umYoJ/qNeptkes6IoesRTUnkLozBMLrZtCBF/HOBWemOedI62TLkyQLHvv2hG7pIkHELm335LiJSnWbKcBouD0lwN2rOS/V2MZq/b2xaQQKGjoDDC9F6YenLPDfh7asstMDTc39mZpS3+V7wt2iOltiV8TlOy2fFEEOLkjL+WSCmy36egXXkUFwWiQlBf8hElJ5RmorDAmGQoEte8p7NPC7Yui3GDVSot2VoptSJEobRvJzRfEyqX5vmLtoweWYCH94sx/BHMCbz3ZzJbj+0xvQe9X2vh+3slmk7XVtzc9BqlT9xx1DXiHw/fchnra4AWje+LihHcOgagQHSX+lfJr/9T1SqSn/UzCT4C5TGdG6PdW8M0RUZDy0ADlyvSKEKJhMRXygb3xzPIWag/N+VCfN5cvILSJhrcG0r8qiK/KcVg7rv4sYKT6guHgwBGd5Objpg8l6bMzespkxaXoPOvKvaUoNzufC7PZqyhzGTcWfQFSx714B50hhUHYos3Ci/TkNak/ILu0N5gVyIOJWUkAWllA9MoBh6kvjI68QU5LHK6BtlZV+DnLuVPkJTamL0QUV5YJsPrZBOwwdKnFcvWiXGoBj8VSyKcgHFM8uVSzLjlUwwoHx7pEukdknV4UCMS+OtVci+e9iZiPsEbR+cGzZ5CbC/IJc+i6Xr4c7w7ojHdlQy7B2L4FavWSQUD4lhHuIsFUHCsdVVqPLZI1DsPzHg+OdsN8KBKBeFub8drARBvKWnJjOmiAi3pIZC5gpZcVWUzlklU1S6kyKEdxnwDJPTbdZEb5QjR2Cr4vx69x7zOeTkB7oEbR6uDK6hhByfzCu/5broKGoJF+jTf+fki8tc8wUBAY9OYalTIrQ+g2BTu6D5MiG/2L3LARMKDYl0fiLoykhCW7WHW2BhTgNkdkA4XqcLnAGs4I75ZkgYLpZfOSPyMp7QRZepOMvWdVP61DKK9GWefG7XcFowfViH2Z9UQb5mL2bKMvl9qDIMPWW5LiDrt0N6ufyZDtus+bwjNaB9YUieFDJB7wSw3eYKXCFQT3Yoxvb3cHbJ4fycQ== X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1332; 6:xbB6ytXTrZbPeSUlrj8hjvddn/7RSWeZtEG5QJm8riop3u8zsTScnosh8Sysz8eStNS9vk9RIsdXtgeSY7e090Nw8wM0PwQBQ6olNtEiLwRDoGPg4FPGaE1C5Imii+L0J4xekPrOoEJYGgKpkdI7t4W321qjbifwfv3Xa/ZPCK3ZdmTlqa9ELH4tFYz+67Tkcbt+VcLjkZ5TLtPqfbTkuNXOzfH98MA2/jMsPToSOvoGUJDDHrgMnOYMMaxC4AMXdaPgCil0VpO2snbzv2V/U66RYd4b292av40KyggQ58CXfjzPwcswUiEsjEOhg4xhS3HNHu2TMIot4lYWu+NHbCatjDEhJZLfaCoXgqHzvPo=; 5:FUCRomASKBDr/RpOs0aJecgnDCt3UwJWIwperS1VnCV1kVsV7dj1nOhmG5zk0w+YIy1aCJNpbMFuGb7+9NgBm8QtTlpKJcqUols6UunT/mYqDBCAFkfHioHTcSri4mrFym+R0EBtaLQJUYv4GOcuBox6nCsn+fyS0522MR6LWQs=; 24:SPLma2eGdKjv6DPfu3wixBMV1eqv/gYWWXqv/jaUIJ4AocgWuDI7CPAOLHxmfWQyKx1htjh7aCytwui7Tm5y1k9jG81oqXJb8EAFYNc0gm0=; 7:pUdLAdnEBnKpJkKjwr7+e2YyRL47txv5ore2cM8o9V/OAU8gXAemDeXA0DlLyi1eH1wDyR56tYDCnxQP6JPLLvQLrWAynxTQOoCYaUf8mZQSpOF3YvLe9CeN2ewXrY7dkfTwOj5+1m5PDvW0zWrWxisNmOKLsYp2XwGRwGWB41gNsICp9r7j5azQHtVwaxwo7FPBrs8aocxkBUB3jNoxKw3xSo3k7bhkewC5E4qEmEX9OCVX1/DqY8mNPN3DJ7b4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 23:26:52.9630 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a9e13a1-d28e-4909-4159-08d55d38a055 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: BY2PR02MB1332 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.70 Subject: [Qemu-devel] [PATCH v5 3/9] 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 Reviewed-by: Edgar E. Iglesias --- 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(-) -- 2.14.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. 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 Jan 16 23:22:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 861945 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="IcZNgb9c"; 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 3zLmg94095z9sNV for ; Wed, 17 Jan 2018 10:30:45 +1100 (AEDT) Received: from localhost ([::1]:45547 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebagl-0006nW-K1 for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 18:30:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebadK-0004OY-Dj for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebadJ-00028l-CL for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:10 -0500 Received: from mail-sn1nam01on0073.outbound.protection.outlook.com ([104.47.32.73]:48405 helo=NAM01-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebadC-000259-Hw; Tue, 16 Jan 2018 18:27:02 -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=UGEKrBJpmNqH/Nx9XnTinanDpFtqIhrUaYmddG//cNM=; b=IcZNgb9cWhNhZ+YvdPDivLbZyFeWDZ6aUoX/OGWIBl2/Uv4D5RdvPm4ViMa7d2cDMqkI5JDZ0JfqU8EKa4fPMgt0Fk01nQhEcdrduuPUp66Ad7iv9MeK8br/24U6MiKEO8e2iRzd8ChfHrVbyI6xJZzONFZlxYhJNjkk63aVI64= Received: from MWHPR02CA0039.namprd02.prod.outlook.com (10.164.133.28) by CY1PR02MB1335.namprd02.prod.outlook.com (10.161.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Tue, 16 Jan 2018 23:27:00 +0000 Received: from BL2NAM02FT060.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::205) by MWHPR02CA0039.outlook.office365.com (2603:10b6:301:60::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 23:26:53 +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 BL2NAM02FT060.mail.protection.outlook.com (10.152.76.124) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 23:26:52 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:55902 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1ebad1-0004Nh-Th; Tue, 16 Jan 2018 15:26:51 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ebad1-0003Kp-Sc; Tue, 16 Jan 2018 15:26:51 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w0GNQoCS031037; Tue, 16 Jan 2018 15:26:50 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ebad0-0003Kk-Eh; Tue, 16 Jan 2018 15:26:50 -0800 From: Alistair Francis To: , , Date: Tue, 16 Jan 2018 15:22:29 -0800 Message-ID: <6603dc74caa9a754b1a331055130096efab79a92.1516144891.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-23598.006 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)(39860400002)(376002)(39380400002)(396003)(346002)(2980300002)(438002)(189003)(199004)(50466002)(48376002)(77096006)(7696005)(51416003)(76176011)(63266004)(5660300001)(2906002)(9786002)(36756003)(6666003)(2950100002)(59450400001)(106466001)(478600001)(305945005)(110136005)(118296001)(356003)(8746002)(54906003)(2201001)(50226002)(4326008)(47776003)(81156014)(5890100001)(39060400002)(316002)(8936002)(36386004)(106002)(81166006)(8676002)(26005)(107986001)(5001870100001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1335; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT060; 1:OXW+bSs9JZ3m+DISqvJhr1tFaBzTQ92qBmPhEDG48n77gBIm6NVLLYz0i68cTQz8vjXFh7Fdyfvb+q22x2Z1C/UgpMHIrX1osCvTZ6afbRI9UmUOzjZvx9PpB0kSNV4h MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e2c80f83-2af8-4016-c7f8-08d55d38a027 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 3:Wia/04yERULGE3JKfbvAEK9OCK52fbpIneAZRN7z1jH2Jz0G4EYx+fFdABTT6fVaboow1zE9eX1vXIN8FL4uxT2JiM3s9rx7rXwR+yUwn/7NcUQooGb6fg7r9efl5GGfzqmOcqSEdbLwG7jmS3mXYKi0rm6TT4lXf8PYOfdBbbp3eS6IyrQPwHTg47BnsX5RE/jPbXXSL/aJmK8vRhCq6doSCqR+cqUD1GlAxp0h/qYDcvG4RIsGxBuUJpXWY6yVQBmhzVqL9hYl47Rr32AZiBRRDZRDHzMV45T77Sm/F1CpQSGX6Kt1Xe65SHfAQK+8FUmdU6Sk97ywsA0x9knqDCcC9UtxdIJgpJ0JXg3gPeo=; 25:i9IiOc1UXLzOymIURejkZ5vhMVns7JA6/XZ9wHmzP3mOsxaM0etEzi9Dp32HfdcFulBqasWb78Yn9uKy4N1EW1alBBjZL4mNbo1CF5qQ4axjaxzxOxzg+nhSiJoI2klwd/nmr99wg7/SP4Oc3+tSzz6WDUGKw93XhQ0k+wO7rLp5sH+ueBfC3AlZxZ98GaYTSkShcO+8EPgoCY6+n8Cqh2IuITkqR+XfHLH/P4TSSMwHNWm+qxC9u7BL8n7VF8KU5BWNKK6nl8d0Kq4OtD9Ecs6tFxQKnoH4s6YRehuO5bK/J++P7Cx3abU3NtbR5zYm+pnC5y3Qo+gevGOcdCb460xL9t7Zl6K/16XdaJcsUxc= X-MS-TrafficTypeDiagnostic: CY1PR02MB1335: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 31:SL63CTKVPsFnBDz421bpTSrAkXJqYjmPuclnCYWZO3lz7bXuFjbor9d3h6QxTgJ8N6d2gFnXe1a/UMIuM82IFkLUGEwf3qF4kY64UFlkriVRqqZ4ARMehp8BNjJ3RS2mQmL7wH847m6my6qNnU+BcihsdgiVXN8cx3ZQP/oI9o6qzU4S//GBuobI1vm1ESvV5++W6lSON3/GtN430yKoKAqO0UJyRek1/mMrta5Wn6k=; 20:ofAvJSHNhWluGCa5mY62b+3H4CjYdR6xHsYfDVvmVcXedJy/RY5SP4apMnyvRxa2ktjU6p/pDxqQ/Rc1y6MqZEN0rpJHCacHNkQLW4Kb1rKX6ZiR7ChT3KnT3z0UAMO3epC/0J2P7Yjq4m3wam71x4ZgnM0X0Pf2XpNPMYye3eq+kwJo1vVQyUQePnlouQv3S6lyvzKgvtedBXA1ATkNoZpdqDNmx4F0zuJklVcmLAcu2cseVHoiK7ZXoTx5VbNVIZRCVIEdEN5B8KMP84u8ETJDEQY3kVacJSJ74Qm5pv99SppDOEyhuplAw015jwrWCTDTir4BiNtr2EeMXJD7IjcQYXb4XLWwBjLkQ9UtvzQpyx4R015fEEwza11LXIFNOtYXNmCIa8CREi3YE09EWf6NH0nbW8uSs7hqa5plka6nAHdF/dBRt5N7hpVkkqJyREjdn9hLcQ51y+13Tu652uaxxkHm7u9PvERPIPAD+bWWFn8N2BbVLW/MTl4Iwzf2 X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93004095)(3231023)(944501161)(6055026)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123560045)(20161123558120)(6072148)(201708071742011); SRVR:CY1PR02MB1335; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 4:Ib5S1ONjHEDFd/z0hhZ1AeKdm+CbIUlExl24OcdVg/FQJ/bgMgTVNj/blFj9kDyq7Jqae/isEokTxIG8cD84W4Fac5Ww7wDFmVfECNFqdIx/Io8knPTA2AZmMJ9pIxJqwE2buA4qPqpQpQaRu1VgUN3PzyD8Z7zD46xXxrve6BlrUzQqCGw+aBzUE+ps0cx5rfqPoF3rjjRj4jqxdPcpZZog40+tZWGXu0ktiNvKCCApwJ+dcYbBu8f4Gd3c4YdsvHMB23jZ4CXOyrySPrsQH2ahAbFElfs3KXah+mpyMhjrsFM0mu/EIJoNjugZPcCv X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1335; 23:dcZ7rS8tnmBH+mhU31d2YZxHSXlwuP+vTSwXaLGoa?= LxgvLAA0W9OaizHqNmdPgfsp36/WN9Ndk3xmoyf9q2SSzn/hhbY9Rjha5pSzWoMrYKET5RyiKMW1LryRtZZ69JsnuioDIFWTgzrqJB5f5aCIUIBZ0FDUwyv9PceGWHA3LKXISmgn21zTIFsJe05g7XRXW1QNg3RtKxVJTCR4sjjHaBIEpRm27ozyJFaw3Kk+lLweHTAABafvgHzcW8xIDdCXJvg41yz6BwJ8kVAwQrT01zizV3Y2iGVH1pyZyVZA+8Rl90qXieObJShzRDJLgv58vuTB2QmSag2fMNxbikdIwbMyf6580d/XrTOV1ic+YbrCi3VBhMx1brqYCyAUbBHODIxPhsX/FfZa//gJBWs4HIl1rPSqKQE8501ngVYBhqyZ9AMsyu0/89mT2OCP3A/757JUE3InY2L4iUsw6WpobkOiXvJsj+/mGm8f4pBb1of0TbdNpl0lF7pzCTwNiLwwWQdAflslFZ68HJurK1ZH+qin9E+LRTmIbVcE/fS4a+52rFAPL5K8k37taEYBOKHA6HWI0yuLG5h4Sqwg6F8lvJCok6RjZo1V6rb3wkmf23/xAlvfKMqeJoHQws6Hx1nWExhB1S+ZgKry0kFmaiEV2DnAu3PrrqPZWp1XA8Qpzj48D0Pkw/DOpgJZ7lQEjGP1Eog5YMlRsWFfanUQ5BptpJs6f/h/RmxaZ+NflmOpolaIRJYtYFU3dtgre/t4ef/7bj/fjlDttDcZ07gLy47EZo8rZ4n9XrBEvQLdL2VrXe+JBzkLHhXnG2uivNFqmODqOsxnUxAjIcJQuPeqTIZbyLBVZiQOJ2dPtqmhIU2fylx7TG4YbvPyeK7PgW54GYGG2UVBhxn+rlo3NyvHCUORpw4JUr5pLyn+L/tJ/ts0MyvaLaEwOR9V4R6XzJzA/l39AT41B+muhEBCTib6XaRNiIgBpczUxj9mUIF1/VtbUu/8UPxRKJG1kFa7MlgvQlyaYhs3ejw/frtGtONetbQq3GflEso3v+uc+aRE44sa/VQVBbP2PDYdCbolCp6HBCKSPWjxm/uwR+pkBmfcdMc1gE/YV80E10s5bpA93BhN8otQM0rBq4E2D88k0I8JPQc X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 6:50Sj0ZfRD5zXXYFnLoXq0p3m9V54P8f20mzbavXj9LwADR2CBu6vXZhhZ/ZeLmbLvTxlq7z5AWvHBkmfWhmUxAWDXSxIYJrcMOqLW6QQ+7Q2SmJ9g7sY/WAWf7CbtO9GgCRhuMXjKZoQpJVBsYMXa31C+Zw8vgTNWM93pkfJgu9JVXA5rOWuxVGLQfa7E/QLvDA0ouuiuXy3cEXoVjy7UldAoRuN2HWhP2v/5ByotkhmKYvbuEiiYckWs69sJKDZdvs09NGU+Jxsvf19fqop0McaDMgf9JZ5sVUpZn5o7yf0/u71L3PI/DJ+2uGCt/r7fXU03AOqt61Fgw/eqdJKWaELGaCaazJ7ZcRCNr+Snsk=; 5:i80e0qmqTpk7Zkdf0cqvlv8jQKyXaC9iz7VXTgL3wPlrrMc5h8oFF2iyMRdPlhA3XhJzsW3nVHB5L6lcPqK8p5DXRX0q82sh5Ojz7JIJs8Awumj7o7Jxz5ZRNSZ1etQ2jfjOQKdDgjM3CcWOqWMhgHuSDp+7f1NDR6Pnl3LqYkc=; 24:ejOa8E0UHJsS535D9aqK+hQoryI5G0BjtDTRQvhsSL6NKuvrnsQXy9UHj/QFscGCVWjxOEB5ShdBDUu5xFOX0xIBQpQB3cItQew6Zj2ZgSI=; 7:sCVzngRk++iThjR1MAwcXHk9Qb6aBW4Fh6mIrFddrM/CC21OzBYMpLhdY5rvNKokPQbP/XEjmjLPq0dhxGBNTf45mJF5x8RqXEB3sLbJ6h5RlAgccMV6FXXyzl/89aNfh1Gz2RGq7wwNYIoeFSIjSISo+Cd5OWDdqNHpCklAZIZ6Umvt+t5BzDtMCO4N53U2cNzhAbNn3iTMGyNjzwpUKYhr9XBPOls5PFsjrgzL0rNbmvtxxzhLnjW1DPw8fIwh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 23:26:52.7567 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e2c80f83-2af8-4016-c7f8-08d55d38a027 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: CY1PR02MB1335 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.73 Subject: [Qemu-devel] [PATCH v5 4/9] 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 Reviewed-by: Edgar E. Iglesias --- default-configs/aarch64-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/display/Makefile.objs | 2 +- hw/dma/Makefile.objs | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) -- 2.14.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. 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 0b3a009b87..c2afecbf73 100644 --- a/hw/dma/Makefile.objs +++ b/hw/dma/Makefile.objs @@ -9,6 +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 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 Jan 16 23:22:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 861949 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="AdIn2QTX"; 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 3zLmmZ4gd3z9sNV for ; Wed, 17 Jan 2018 10:35:26 +1100 (AEDT) Received: from localhost ([::1]:45667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebalI-0001tz-Ky for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 18:35:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebadR-0004UT-Dz for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebadO-0002Au-Me for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:17 -0500 Received: from mail-dm3nam03on0050.outbound.protection.outlook.com ([104.47.41.50]:60704 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 1ebadH-00027c-Cu; Tue, 16 Jan 2018 18:27:07 -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=kli1XjtiQ69hxp6JXdCpoU+XtCYTevumEyxDmH/zc8g=; b=AdIn2QTXPEyQVXoFZERdQavMPzjma6me7CKSftqB31UBriIXcG7FcTJCepq2kOm3lqtSE6zmtBFhfZhUIug3AcowDKcwIoikf9XU8JHnmQOUgL40ipbPUXPshb49AwShej9USul3i8cofLasqNXbptSsKiatupjHg54XdHdwTRc= Received: from MWHPR02CA0043.namprd02.prod.outlook.com (10.164.133.32) by SN1PR02MB1342.namprd02.prod.outlook.com (10.162.0.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Tue, 16 Jan 2018 23:27:04 +0000 Received: from SN1NAM02FT008.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::203) by MWHPR02CA0043.outlook.office365.com (2603:10b6:301:60::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 23:27:03 +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 SN1NAM02FT008.mail.protection.outlook.com (10.152.72.119) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 23:27:02 +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 1ebadC-0000Mv-Au; Tue, 16 Jan 2018 15:27:02 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ebadC-0003M3-9Y; Tue, 16 Jan 2018 15:27:02 -0800 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w0GNQqGT031049; Tue, 16 Jan 2018 15:26:53 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ebad2-0003LH-SJ; Tue, 16 Jan 2018 15:26:52 -0800 From: Alistair Francis To: , , Date: Tue, 16 Jan 2018 15:22:32 -0800 Message-ID: <0e03927fb6c990f877cf847434b0ed230a52ea2a.1516144891.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-23598.006 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)(396003)(346002)(39860400002)(376002)(39380400002)(2980300002)(438002)(199004)(189003)(5660300001)(47776003)(81166006)(478600001)(5890100001)(8936002)(50226002)(9786002)(81156014)(63266004)(26005)(118296001)(8746002)(8676002)(106466001)(305945005)(4326008)(356003)(36386004)(230783001)(39060400002)(6666003)(77096006)(51416003)(7696005)(54906003)(48376002)(110136005)(76176011)(575784001)(2906002)(106002)(2950100002)(316002)(50466002)(2201001)(36756003)(59450400001)(107986001)(2101003)(309714004); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1342; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT008; 1:QrdoIBZ+2xfy+9eyYrQDoTBcDF9xc4TIRvxRZ3EwCzmGyXfovV5QgjE5XUx2TOWy278WCAH9MPjT0gbMI2mbQDPONm2N355Xv2aSrqSj91KP59beo3ge/s+2aLsau3qf MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0bcf2826-b700-4aa0-eccf-08d55d38a639 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:SN1PR02MB1342; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1342; 3:A52GCtIV2P3fO8wMejbl+y8wyYLk5e12iozJlXmGLQGAwi53NyWY0GY/pTgERHuLx8EBZdUyb3sFfnScpEwERZFeVTMXA0XevQBjXtpu2106QzaCKJ6j1oYHLkjvRVj4g3j9WKpz+hgcdXIFDWn66Z82GuektVzpvY6vjZHkYw0u7JqO2HCsLb7uw/zE7nW6sogBdiI8wMCK3iqDJ0YIjCJgAddV+6Pz55JHUteQu92LYpki5/FCMSnxWzoInKdfL6ujCjwk/GaSjd/nAyP29ALHLYQXt5OAJ7LjwVW9C/MEIiCQEsh8sMTWXYXsHiUurzbIyCxwYD5khot0uVx6i/Mr8YGKZhttQmYL2LfPBcc=; 25:P4WU0xSfaOATpkkcLf2rgMN+x7y0Gdz0q8I0v21aKFr+HvoVzny2sQJ7mKP1W8lOYmGZA7HM4J3qx9tys59jSS+0ABjURkjiTVKrMy7dFT0sfWYu25OUpokPnI3fUm66u1Y8aU53zqvIWdTc8dbf5UJl5L6hszGCmWKp2E01HdcFe4oTcaEtc7UyYiapnlkQ52M1iv9WIEHJOBonUmErQGqEPpeN+pd95Zglkex/xq17PpUlvfGv9h0KaXMqXtopxiEoGK08vx+bdq3KSfjoZ/rQjYaQZv3+O58LLV8WTrrnCvtTOARJm6LKSAJrntqqnLEiJo1L10+lQcgp8kukPpCmiu6OlKmAXw+DSLHkFzM= X-MS-TrafficTypeDiagnostic: SN1PR02MB1342: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1342; 31:/Kf681WWmtaBRyf6uZ0afhIjqVwgWsvnUJeK+j9mUNEBpR+1ZV2OSuJNDvf/Hhjmhcdgj7scMJOBRo3LB5gn1MO3mOzknLZN9CdpZQFcJAfzWJD7IOeCc0tkXoNAx4gMjdEb6WHKysYXrUP3k6UHKqGjKtsYE+zoKY+Y5MzYkOTtcenb0Fc4IkxqiQ/B010AECsubDgXdz4FlBNmZdthQ/MIIQCKXx6iRx7sErUWpaM=; 20:Jc4TsbZdRUbkhzrygnDHVlQzgzl6bORqhEnQMqEHST+L6iJIfGNLvFJr4p0iUzifv+1gZQKRACQd5B1kaOUXJaTVWpdUWolFNdiRAClW5Lvnm+s1gSTvsJhqCg6I9AuPmjsgVgxhEkoKgoqEVsm2/4C0+QV4ZVE16zNKPDLvqxRwbOJmTCH5kDBl6tLgH9Gqfqf/SNiFNfhjOQhd8pmb3oPaYbsL6/RgLxVDbF6DZN2J3yawKWrx8vL9kF/n+z3A7hsXwlQsn9yVewB3UqL4t7jW02GFEMHMcy1kZOlHjRwrWXm1rvT14uNMmGGRvHPwwiB3fdoGkluctxE77qHLwTu8u3yYuIP6g6vugnF+2vY4Kcu8yui6eAiT8cSRYBa5Z3Rwa+g4jb69zlHfEZSVr32xR1ivWfEYj+k/ZlNGDw+Fsv0bNfrTfMLHujj+ht+KEHT6fU0Y7idpKLgwL7KP6PCXph/97lgzKpdPooo0jBfzPJEP0H8iwUFAtPuuNNnl X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(93006095)(93004095)(10201501046)(3231023)(944501161)(3002001)(6055026)(6041268)(20161123562045)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011); SRVR:SN1PR02MB1342; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN1PR02MB1342; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1342; 4:U15N9qeo08xi76xDS8LdbsETZJ7Hq4QIAzJJcWV8u2hXnD2Oen7ntc+IfWEOh1n/KQK49a0Y1AwMY+Q6abW+k5oQDUQ7kKR52Q2exvGS/aUYcvGdgqySwpt1TXzycVdN7Fqe6P/vwjdoA/oHy/0O1wyC6zmBLGpuXkWPAR/NoGlhcDtzv8dtRCbgGXAhyUR6lm6lAwUUuUhwgvPm2cz4Mmivr4QIhNU7i/Zpdc0dmEfdksoJxU28JuOok9R3qoqfdnZeqnzpUcLnT+0hagTt0rmFqL/C58CDV0QNRc/ZA7m7NqC3BEbDGUDIRtSv26Kh X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1342; 23:kbBxuYLOjThiW0pTrZWG55Y/ZJM6h3wABXlbqaB6M?= t6hatRTu9Bz5xgL+z1ihFWsUCCXH4s5ms/aUzuA6aQdxT9eEVDM6+bH/6PIRhPV6faKwA/ssX5LBCr2bMqcxzG5Uv/N8GQzMcq7trHXYGpgPpG+8mhY8MYoK/7tuI6+vNyVJKBhbnbpegNTK5pa6Kv1fnEa/9hspLZ7vwK4XR+Van4ye+uwOQmb5K2jNZJtI9e2Vud3Nx2HyCLbN5ryBgBcDFkVOFoWCoMhFyG8t/zNu73fA0iGO+9BhHycCenNAmzMzpLVXDO0AAGcw+1V98fpDrTnRIKTRS8kDaJjz5JRqovsl/SfZEMlhTD0KQK5BOlhRZtH+zurR8Agl/K7k1gsbbhBfRaEuNhthzuGF3bq+nQpgTYqsdhvQ1nA58xdjpjlYViIUIHMUJPgljk0G8R1jAZdV++DicwOpAzQrF06Cej+y6fnm8RuporCJXqcOON7KxGNA+EpVdoExtGLs4AxVcnxC2iUrWp0cXjDzKp9QZCzjz55V/XMrpCrabrX4DQv8SF6uWtp/jsnRdsnKYci+k2GgKffa99+3O//vpelD0oLAs4V98SsbOu6GAJpQfivtAwazGSwYL8O15IS3Vk1kAS9fXyAVm9T1YkGeuvyXv4qpWsEMRSjoGpdUL42PkD+cjFQnTQEWwcudhf6gqml0EiH8nQr/LOpsf98QRqXHFr6rZ3AYQTZ2NPFYSHgFtWv2ouKXCfQ9Epeol5D4ifxV4pYgLgfsONVHLq4rBpSqqTkRwN6D7FaDSx8bOToMQ1AGMzTEdYbyadtjSzZn9b9RuyaYX2BhRySDBaRkMhkzTNKm9c0SUh9aHIwiRghn7H4/mvp2BX1VySLFoyirdliCiAe3XgzM72KeY4Rj0I1Ii5j56HU5ip/dCzvDd1YE2gV9kI3PoJjI6tng33qXnagXfPiiYOOTLrObJN08ImAw8K3u8DESSE6KChJIdfx02kVoFgDAqo9MIykIoje05mCPbDStfrVY/FPFiS8Po4PPFJe+9SKTeonES7YnZlFqCOmxhYxVrOskcr8dL94vbIBIezRg4feKnfecmWmC0vRUQ0+iitictgCfQn7XP5TQJOAzOpcNAxzcuLKI46/DufSKa3JaS2yYZXPv0rtZ+DUUQKcoFzZBW9vyi1YP/7+rI8= X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1342; 6:3kNL+WJRah3wtwTLZ97s8AWF/KLQzGcIgR0Vkdtbil7JKp5iZ/ar5LO2NMvdDMOOF3w+CZGANdggFINF9RDUuOKGRgaahfQw0vRj4bBfK259j8ZERc3EQLWGMuKrpIuleX6nDMBpQR5hSTts45az/YTpHrJoKztxEr9OmJij+1CJgW+LsoLKnzWgK0iZfdeCr6csvFaQCRK1dJOSEEs049dqCLZZtdQjnaZaykTXCn8/wpUXOLWxEuVrIuCMEPv39kNCj8tqbVOlv6+UAnZfCJXhbdo4zXrSMWoi78+HZJ2QIlZde05vM41Mm2KjAfDw3suV1bjmQc0sovpm1s2EjOHl0h04RjApl+5eXmaUk5s=; 5:AfjmYRdEdR5dwTuu9Hy8AlKlfbSFcnfbuaBRnEurjYeNiUDKezDwIT7MZRfTlLxj76ZCx+gNfsP48czEs9+XhXoqlG/YDFeUKNWhbv6cG9IglA4RJ0YBEFQtSRQqFTyL0AHDBeWj7gmPCBi/D9S9ESTA6LmJd+DG4688FCyM+CU=; 24:wFaAlXoBT+Ku0T9rsjG+t/rLyf2AlVPzLbMTnzyOiENEC7l3Losw0mVK/d/NakrPbs2P7Wn+GlS1aHiFwoNRoJp1DgO1+vLTEVK+F/kFRTk=; 7:p90T+smb1PmNACoaKy/kHkC2YmTCqK/gZG3IknbFOSvCln/CVSdbhBJAaZ9dYtGYNKc8t41XmCerD3Y37BrB7baq9P6AoPSd/pkt5wCIbHeyPJ/kccDfYMExlQsvhpc8uT8Xrcgh3Fpb0O0oLt0OLiNBYf2v6PweZE0+TjYB4QTYmoGAK2erAj/ybXE5qek1je1oiq2jTu1A1f/eSJgaOoC6nIIrvxnQc+a7MuWcKIJEO2da0vUTHN9N6tu1z3Ga SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 23:27:02.7877 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0bcf2826-b700-4aa0-eccf-08d55d38a639 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: SN1PR02MB1342 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.50 Subject: [Qemu-devel] [PATCH v5 5/9] 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 Reviewed-by: Edgar E. Iglesias --- 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 -- 2.14.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. 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 ae358569a1..211655023e 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..1ce2f4fa6b --- /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 Jan 16 23:22:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 861947 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="G2SYo6mX"; 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 3zLmhl5lDYz9ryk for ; Wed, 17 Jan 2018 10:32:07 +1100 (AEDT) Received: from localhost ([::1]:45634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebai5-0007mA-NW for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 18:32:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebadL-0004PU-9x for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebadK-00029D-EI for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:11 -0500 Received: from mail-dm3nam03on0604.outbound.protection.outlook.com ([2a01:111:f400:fe49::604]:25696 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 1ebadG-00027U-No; Tue, 16 Jan 2018 18:27:06 -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=QZoWndFWeGN1rUg99N43hPHqmAyyZLXrsqQgLjTfbl0=; b=G2SYo6mX/VTz4eF3K/X3YvFmUHCH0ykRDQciZ3rb1dQji4S9vWDKgDJn9uuXBMJ4XpBkb9iIkI2Nj8s041VaiMa16+8UnwKNpwEZvr+438FYFNKXlebYCHLQYLSTICxiG2458633hDH6QZV0+nGgXzdvdLfmnFkI7NhlfFT2dDk= Received: from SN4PR0201CA0028.namprd02.prod.outlook.com (10.162.76.14) by BY2PR02MB1329.namprd02.prod.outlook.com (10.162.79.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Tue, 16 Jan 2018 23:27:04 +0000 Received: from BL2NAM02FT047.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::204) by SN4PR0201CA0028.outlook.office365.com (2603:10b6:803:2e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 23:27:03 +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 BL2NAM02FT047.mail.protection.outlook.com (10.152.77.9) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 23:27:02 +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 1ebadC-0004Nt-80; Tue, 16 Jan 2018 15:27:02 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ebadC-0003M3-6N; Tue, 16 Jan 2018 15:27:02 -0800 Received: from xsj-pvapsmtp01 (mailhost.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w0GNQtUc031055; Tue, 16 Jan 2018 15:26:55 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ebad5-0003LP-AN; Tue, 16 Jan 2018 15:26:55 -0800 From: Alistair Francis To: , , Date: Tue, 16 Jan 2018 15:22:34 -0800 Message-ID: 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-23598.006 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)(396003)(376002)(346002)(39860400002)(39380400002)(2980300002)(438002)(199004)(189003)(356003)(5890100001)(36756003)(59450400001)(36386004)(478600001)(110136005)(230783001)(575784001)(77096006)(8936002)(118296001)(81166006)(51416003)(8746002)(2950100002)(76176011)(2201001)(26005)(54906003)(2906002)(50226002)(81156014)(7696005)(63266004)(47776003)(316002)(106002)(5660300001)(9786002)(39060400002)(305945005)(8676002)(4326008)(50466002)(6666003)(106466001)(48376002)(107986001)(5001870100001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR02MB1329; 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; BL2NAM02FT047; 1:56Z+4M99D1wjhaEyc9x03zwrkwKOadELCMQUSkoJ4l1zf4MCA2Mgn1p9yUwH3jlk1KLds9xJ2iCxW/Ys6XqRCq+zb8Qi76/6xGRbHZevJRzJMkEjnXvZZm5EaEiEuSqZ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3adcb2f2-e9b7-4123-71ed-08d55d38a623 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:BY2PR02MB1329; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1329; 3:wRgonysnMYUyBDAn4ve0y4LNlgBsv30C8Lv7O+l2BXEA9E+Fe2egcVXfDmmZveTOQoSRjPcX9vIb9JPLhHNc3l8rq9YF1IFIX9yNwZh5ghxv7FQ2fJZO/j+JyisFHHsEexAepgRE3L9TtPmsL6JReh1fZqANxGLNukmb2+UAHpu2bfW91cDjq9MSyW3LUwI7hXmni4LXmTyS1Icgq1nqCHfLbJv3VqsqjOvBd8eJLBD7SKnTVAmku4xZHA7BHCcyxSWPmGiTME6ByXUo0VIy/LnrM2f6as0cKluxwaiEwnjT8VZDF0ri04I5G1ejpqR/Zg3kp/9BJaCMtyNZ2Ua2gtLX+OpgAvkAaFEDoETTyD0=; 25:tDCSM6mm59AklybUqHUx6bJLPfsj3eUevijVX7XUUpyhERS53teUbg+tFQHjFLUn8dA0zE5c8dC6XX9Kg1BvvjaNNlE5XNgym3ZZs+ylNsuR+r1fO+GA5Llak/KuQss5bwPGZMToYSxWv99GNN1BE+JVRrm82wx+LCPaM+46G5cfhiU/MiCIjN0Q0IG0GzZDp3qdixOXZS/GyADCvvo+AtembRRawByXcRSbRf/GqbBwI6x/zO6JI9PGtScrEqj/ggyJjf7oAKFa0ecBrLLDHibcZ5vyj2CX7+HZe+cEGGQ9nlSy2FYuFaQpvtrfBO8fIEteNIpx//3czLiIpe4fZLIlRlyW2Z2+w4t9ZYuCQ3k= X-MS-TrafficTypeDiagnostic: BY2PR02MB1329: X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1329; 31:M3ckgSUpF0Ki/gjirAOXN5GDcIQi/0hoFvfrdfg+Ib2aVHwThTsdaEUgSMC/XVEXaWP5lnufYgMEHtXIyAxIFNyfPdJqBFVf2j9Bp2KWkGx9xZULB8S5LAXPFyAPujuiOvWtMVOiRu6qlX2njIoHIADgXsRbBaOI2czV3Voudp+WtnxQHmSFA7rU9KM4ufoGp/nbBDfsVggNv357G2XmSUpCt7B0YaIl9dl8+FauL00=; 20:BnhcTQBjiWqz05EaOo1q9oRT5IOzUWYokB2/jXtQYs8MKKIfiK+TkPNdlehPZ9sWq5RKj2ka/zrUPucOF+OtaSb6g/FoLTQHL+OTZmw4BBk5m87xaRpl/HsRWSq8mv7G9QQkufuCuDVVknVitioySe7OpzanB6/gggzjeGNG2a/7118VFPUiZ/vrw37euuyzwRqxLgLdnLvKG3Bm8nI8ah3ZaDHrZU6C+4LOU4cdr0TzH7flVODBBjcc+0j3aDRIl9EEmFsjY/Yj9qJsqVt1jtTFfffk+tUlv/8oce0hzvAOLSoT9v3C8gkMQzOFOuGWpLrKXtvfK/WnYvtClnVK1V+TYhz+DjWnB+UB71gUlHtTAFx7K09D63LUhAyyHdZ0OmdoM4ikLWhv+uUkC/CcqUtZfgsQksS6RnzJq9p1ikMGnea1Hss+zVhSMaTHgyuv4/jLf/8XMDW9DZfG4KNjVL/+piDI9Uou9GxWoEygyvbPQu70x/ocVdrG/FRJboob 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:(6040470)(2401047)(5005006)(8121501046)(93006095)(93004095)(3002001)(3231023)(2400039)(944501161)(10201501046)(6055026)(6041268)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:BY2PR02MB1329; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:BY2PR02MB1329; X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1329; 4:P8gGgBrJkNg0Ooza2lIVL1ftudUrGJlamD/i1fhs1dQjC2OW6WbUWYD95reqzOtfiRHDNjyqWkw9JB0ztmRVbDXITIzBrR8vuNC//x7LmUT6eSU9B4w9efc/BXCJY74g2GPXhAfPfBYU/peEzBAEKQCcFYQzXLzfy4UVWq8siunRhyVZOuBYvzzzYjgfipvpa09HX7gR75/Uv2owLt2u/COFgamnQboWK1Gl9Pzdlj1nVFpIerQkEq6CXi4TyBF977pzhTg+p0yZr/9OgOO3ZzIU4rBaoRnpCaycFNY9z+8nb5Vm7iBRtJ9kVY+gRz5jvwJtEB8QbNcES4uonSs2DHms2L56Pnew8XSTLUiJdk8= X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR02MB1329; 23:cwC5JKHkWtrei/NmgjPTz5DKClRLCWyI9JZwmyzlP?= LhktGp2YUCeERc2/dPBt79LaEFYuEUFnOOaP56Pmsl1fCbmFJl8rrjMlFy61sd0h662sAPVJ3YCRrAWsHlaBWYcXM45UIvseJBmlGAQBpVT1UtnXDG1PkY5vthdqkAfQ7s5S5a8fVkRg7++3lSEVbgWypCR5OTaq96pxZJ02WhxCk5xA8bPzfLkfk+jyJqPwWNxQouIKjcl+87xlBmPwB3K+4tXozTJoeop80DpdzkBDqUIUNimoVje7rppputN1v10mfRtYt4424GrPJ+1BOD6OdEqRjw9cfA5+Olg40y//02UUN0DIsfzlOYVM5i1V5GQ4ystK5P/40hIZlAots7ep/Emm+aUDCxdSMZnFFJH1f7qieG4dkGf+q+1gsScqRSc0gkVnA3CGS6bDJghu7QnQlUB8kufu0EvvTFT/NgZv1ZA9rYVguGluHt6FrfcKxXiJX18v9MEDJsDBWYn/tmygtYG5bOBE0tryS11xRlSCtZkw6ndi4g31AX3y/U6i9hp07Ahs0+TXYiABY9feWt0v8zq/1KJu/Af4E5ybA4a8rvfZ9XDvdtcV3KwlSlVRDGMTWqCPShMgQGSO0nBLPOEExi/CnYgL2S/4G00TOEoA6yi9OPC7UoUpjapDTdfLdlnQaBUzxo+KqDl2e+EWEMWSsmn/82tGf51QKwJ9/zOb/FS6urKAortzHPmR1g+8JZN12t8SLwnGdwLv7kaqNVG+k8CVTMLkeQzWDPPzQX+G+WmtFC51/rBfG1GbGBVYP0O8lhcCv8Lqk/Hj2CnfBY2KYXs3GeG5+Ht0MiwMUQnEWzOYQM0n0saYMn9/QpOwQFdlLgZukvvTJJZRdVVLP7dnL1ok0VtgBcOej/bJVX8HZNj3kPjyA2Nde6VF7M1SU2rNbuG2g0lbYmToaGu0COPiYdlwbw5hO/6bET0dY8tGuh7phA0otCxRvdK/ePFUoeG/YWVY4qLEIJ55jBwqqhyKUDspdrlWtScPkMw7IC7+mfBC/hbOMvE3uyh4VIf4ls8TERYs6qd2jtSqU2bYoRtrwH/opHifNPlLwf2RNovU9ndY/5TiQmIKWLpu3ufGmUPAajlXyEDpm6u9irP6JUa0ApKjbccOMU6+UweWmHqAVw/uJeFyV93Thds41doQ8c= X-Microsoft-Exchange-Diagnostics: 1; BY2PR02MB1329; 6:LRqBzyi5w4tqK3V7KNWrZTDhPV2ZrSxMBdMRx7a1QODL894ioWaUdAPFqtPfeuA2JCnm7Qu8ePYRRfUC2shttSPNZItR2R0IWg5rHJBixRTbV864dhYyiPfivOO7e/W49xf+h/Ch355RsL4Aj5HH33Y5RRFJ+zzPtp3X6mBOKxnCdZu6dMhyHjNjMWpclhYrYK0e5qxCZlyGQxVhS4C70o29zX3m1eILryPn63/8HXboXjL6eJCQ7JM7A/ujKOVxA3uzXGe4w5W8oo4yY1fxsn4Ne+sr42m68ugsR0b56JYEMBFIlOrINpyg6VEQqyC5FL5VgtTa/4JYAnYX/6TY75xcnvuzly7fpkOGAzrD1OY=; 5:Ge225HvYo+NvIxL4uXPHoeED0oZh2Zt6im33p3GCZ97MDyYJFvUQyxL+vwm9VHME70CDOzet5zJ/9xjOKAn1BbYUzcXU8bfBqiUg3PXuhigH/9wvDDaiDROik20F6MMYyXGthZwn6hCt553CCx9K+990apZdxm9thjrUu9ZDFNc=; 24:rPux+lFYtT0Yqv4lE7sOLfwVRawqaf87fcM0oAzkFrPBBqrDSWAohvJWvw3T4GKonwettKDSk5pmcL4KHqcLkUMqN3Baqvq0GtS/nc1e8s0=; 7:bJmDmw8w05PNR5/anRuNnK3ed/3hcUWAkji4Ezamrlx5AP+WFKqu0nuCIiKzm1iDeq4Un8F1SNLYjhQhZVVTSGAK0oG3Cll1T+Epgho/dAkF+N7gq1E0zqyOh/gvWbS/9ZA/N0Mesip2A5MPF/ge0tK59AZeqpen+ZqmPI3vnSbggJNW0m+C+zCQoyWWE0NK8i20zBybTbpYdIl/nacF3CiOCBD6HJ51k+FYPSIgwoc1wOs+bcg4GeinD61RZF5V SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 23:27:02.7810 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3adcb2f2-e9b7-4123-71ed-08d55d38a623 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: BY2PR02MB1329 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe49::604 Subject: [Qemu-devel] [PATCH v5 6/9] 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 Reviewed-by: Edgar E. Iglesias --- hw/microblaze/xlnx-zynqmp-pmu.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 2.14.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. 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 Jan 16 23:22:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 861948 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="cioLs6VG"; 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 3zLmlV3qhcz9sNV for ; Wed, 17 Jan 2018 10:34:30 +1100 (AEDT) Received: from localhost ([::1]:45645 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebakO-00014g-JS for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 18:34:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebadQ-0004Tr-VA for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebadO-0002Ay-MX for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:16 -0500 Received: from mail-sn1nam02on0057.outbound.protection.outlook.com ([104.47.36.57]:47952 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 1ebadG-00027O-Nh; Tue, 16 Jan 2018 18:27:06 -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=9cXrMvi4sS4uCjm+s1cSNv/rott3VZ9i/aEUl/4hVpI=; b=cioLs6VGa08h8I4K2rjGi/CCmM5vdVRbJsb6BhIH1WeKnGgN/B+52npM5c31qwYPYA1jNViT3wid/8lVrKgeSppoUlMWDQXwmqLXXyR+PNIe/QS0jWsg/z0RScih2QoHBJ/LWcXdxScvdvoAFhXhW0k1ahgbvnQml0j24uicPQ0= Received: from BN6PR02CA0048.namprd02.prod.outlook.com (10.173.146.162) by DM5PR02MB3388.namprd02.prod.outlook.com (10.164.153.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Tue, 16 Jan 2018 23:27:04 +0000 Received: from SN1NAM02FT053.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::200) by BN6PR02CA0048.outlook.office365.com (2603:10b6:404:5f::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 23:27:03 +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 SN1NAM02FT053.mail.protection.outlook.com (10.152.72.102) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 23:27:02 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:56015 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1ebadC-0004O5-Fc; Tue, 16 Jan 2018 15:27:02 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ebadC-0003M3-EI; Tue, 16 Jan 2018 15:27:02 -0800 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w0GNQvXI031061; Tue, 16 Jan 2018 15:26:58 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ebad7-0003LW-Or; Tue, 16 Jan 2018 15:26:57 -0800 From: Alistair Francis To: , , Date: Tue, 16 Jan 2018 15:22:37 -0800 Message-ID: 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-23598.006 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)(346002)(396003)(39860400002)(39380400002)(376002)(2980300002)(438002)(189003)(199004)(2201001)(50466002)(118296001)(39060400002)(4326008)(478600001)(356003)(6666003)(8936002)(26005)(230783001)(575784001)(9786002)(48376002)(36386004)(316002)(305945005)(106002)(2906002)(5890100001)(110136005)(54906003)(2950100002)(50226002)(77096006)(59450400001)(106466001)(63266004)(36756003)(76176011)(47776003)(81166006)(8676002)(5660300001)(81156014)(51416003)(7696005)(8746002)(107986001)(2101003)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3388; 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; SN1NAM02FT053; 1:A7e/NO010bINb12cbhUcjKA62JdsehrLbIrIQMBQ687/zWl53GM+an1/Hey25DX8DQUDG6LX8LuI2ifkIh59EnOmujssSOlBalTvJT5a+49jsQRiYmLd/bH3zmaD4YRD MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7cf0235f-922a-4e95-e572-08d55d38a621 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:DM5PR02MB3388; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3388; 3:lE9jNOkWSZvj5OE3T8NzZzzX9JG7N0FpuvN9BX6NcEY0s6BSEoMQ02bbT+NEd57dx+l8QACLC/xHUcY+AE2tTlpIqxTva7ElVbDscOvieAwQFsvY/iQpukyGT28jJqV9dR7gL/0C3VvvsJjDDZitxLVLAbvayIShhoxsu6UeDP99965tnlm2C2NnTCtZfkyy9Y/Zu03ypAgl4cT13CbPPoZQwTn8ljDtT4Q17H/aspYLnfFhXsYSwUZrRpWVDo+jPQIEQ6V8wN6ws16BNYhsB46lKHGJGgxCnvikCUnVDb4XCXXrXn3uHkIusNt1pkBcYJ1XY14rByc2KGdbNr2EzlTFNgE90ubindSc1bu+wDk=; 25:WMu8BHSugoDcCOzJ0Fif+vybE0pU/hHF3/wWRNFgI4r8SXnJ1x0s4AwlLJpQN+H3FdPjPpX4RWQAZp42LgnsRst9qyJl/QLXY9r3UOLcW9RNkXdEztnW1WdMw1cMEB1mVIfW3zEtJ2SXBF5Fc5JEhsw/+Oh//o6Rf6PGXcS1p7WDEb2RJ9mJHN7ZulzljoPj0pNzr/DdAqDsEc/OjNmZGsWGZeXVg7sczXgttb5uvpiGVIhhBlwOIiimey12s1q2xBrykxm1xc1guBHaAn3XdH2L0AGM9mN0KzsQCPDCHMvvulHcmQuySUP92VQZNxIqnGgGtODbhGD5jwbwa+87RA== X-MS-TrafficTypeDiagnostic: DM5PR02MB3388: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3388; 31:hpkaXIJ5NW5hcOjJBIcz/zRbeooQ91CLUWNYEkQFekGuPBhG4gFiHSpOq83p0Knv84nkWHd/6/wsaUyOa3PLEo555BMm2wm2gV+9n67jxeesl4ZiLfxSAPNfZC6yhNOz6jcdXoi4Z7ESYvr6n+9T4sWTAwi7E4v+pVfmJ8/g+po2JDYclw1vNb1kRKwMeU1vQVp6V7YY3O5q7pmqsZjO8g23sq7bLaMkrvBIc53QVgU=; 20:dQLk9gLr7XU970vVTRDHUKaKOKHzPXmHdCzR57kEcBkWNlwwEj0ZQfQjv8mnyaAalvagrio5B+ZOaaT+zxA4WALoKztOmbUsrAokIvtoycqOp457B0GKM5KPcicWK9tx00dGP7F73odE+4COalq4XtgfbKEO3jnMfn93/1AUIZWlhHND1AWflYCPV2/eBAFmQDyH5WFnIGuToQuNXPv/osrJTAijuDesq3qH+FE+Ur1UWVTV9/ptOddorgR/6qC9so/eHPfleSm4d13k+/8a15yvifE5EMrTAN8arNBRKO5Ppl6Dq3b5x0PP4XP5isw5fFlCatGd7uK0dzYMbPWEgrN0rlvLL3iOw1zNVmdnbNZOq8/AMH2M8xjglCgj8BeH+lJhW1w+yH7xwSzjqEEJKR/tjowuWqTpN2UeMjR4V6q3QFUCoP22jk3jzqHIGu/F3aLiN6Qijee0Ibha0R7pMCv5nw1s/HDny+/JNWy8NE+Qodnb01zs+V1jcfwOhvHc X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(3231023)(944501161)(10201501046)(93006095)(93004095)(3002001)(6055026)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR02MB3388; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR02MB3388; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3388; 4:aIfxlAR+LBzK9oh+C+24o+fV3Dw1+70rNpc+3apR+58C+T8Hf0SVJFVw34SlqUyqrpqy9+QuR1Vgg1AsWmxdzbCETJpEjf51jqSuUxpCbjHQUglzZhq/zh39UUQl6I6TRclA+S5J/X13PDo7+VClLqSQV3SuEZqU3rXjoCuBvwShQUq01bVNo4pPpTYxZuYK1ihhPQLfGLDt5w1s8iKfzSx++fosO6rJt/4iD2sMX4K4ylQER7EzQcgNGpI5KravyXQC7kXcsvKtPYUOp//X+NyPAXhNfCrtwhr9HgmYyHIYxtzEiRW2mHupYA0UYRy3 X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3388; 23:fna8qSteeSyy4vhwx1yTP3yw7bGKO6IQEdLrw9aA4?= HcwGW3Vw3uzw01CN2qVPD4y5ryIYbuxkQM9hNOvIryKZAEyaMbvS2CY1cVpWrXhNbGyN4lNnd1Ss7pbtacbD0qvW+mo8fFVz3smNFuRGDrw8TnqC5+sTuuy4zVCz28rV18Ier8cS3GA4drcHoBkHPQfJ+TJJAvga2Y/gVyIdF7ruQ7u25FXv0vF/8KeJscs9QiWDETRi5h/5ahoSVzvOI98qFWvC8YBIqO9ZH90ugMLI9tHGltrH8cbv0XqVkVgFsUCDKruX4BBnVJCUgBsYPYwA3O/+cnjNrY9Yj8/fWQu44tsleBMCTOSTt1xMTBMM1sVEg9z1y2t/S3n2P8yneqY7U7hv6q2LsHkJAyA+K6dQbXxy48qVKZ7Nfzqr5lL0Y7vj88bu6Ko+AGv55J6gzAIESmRWSlNrBVvkUUTDQ7VzMbw8wVsu89VpLSWCofuCmFItzuBx2u9uPobKXA1xUMIYYFP+TQFKNoNSdYu3wh5QlSomomOknG5CeLi+y3xTpdIXJ3CMSLWIqlFSCtuZ6TsxySPq4XrfyiQjaSdI3MK40+TKvD8IzQVzKqgmub1+ngpiFZ/65901/X4Jvm5fD0kXi9yAx2VI3odCOBKYNVh7A7tAonlKAaTAw2UGmP59dVSmalli+LuoDjnp0BREdw96L5hiz6y6LivJsO7MM8O9seNUpOKl52+kb/D60Y4ksICcjZj54PHE4/Vd/PFA+6BRBeKXw1KpSbyXDTXVfdVysADHY7MwsyoEw97iUaICZobC+8qFmTU9Sfms39yfUkya+g82OdsqcBZep+LoAz1SnKdJwTciSPd6UeS89MIMGODWAmYT5IqBaqAQ/Hz83kNXw5uoEunHmbx9BhIx0Im6Qk6shbeGZUHdB/8RDhMg+KjIQtwlPMN38PFH+XcfGNqsCMfEYkpeLmuZ8AqMJAN8uZaLjrNnAWV7Svg1/6se/HF4aqpxK757b17O7/sdF7Undyh/izAPFY+4awcMxbFhstZHWgx3ZlF5m41PQLLTE4EH/M5WgeJNeaU6DBDiyrhdwnukI1pIQHExKyW/7nBclqgvc/kH3h5ZMuy8R95scQZLgLzbN/bT9aZlGfd/WIuIuSO46HxrtyNyodGEjKgNOHkPNKwUV9buB55NREDPEU= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3388; 6:fvdHK+oWv+F7GkVUhuTBhzAxyU1Q9XigNFtrvuwpMI8/hByIZSqg3ixpCrJXvsK8DMc56J0hAma+38eMAfarpMjcOsOJdaWaLe94hnIeFVbDJhBuLq3ZwZkBN4WAJMs6gBRhvL3AbvkIb5aZ4b1CRmBJbpOb3t8R9MiYcLu/QSP5HdioB612tqI52i4TmlhaoGNxDjWcHahnT/CqAKplR/hI59bixfs5GvCNDfzxLMl9YEE0r44NWymYY96uyY/ltfmFBml4liJ+YgdSWuHhxQH32xJYZiuBmjMKRWI1e3A9p4E9YnmdV30ZrxQtw3px3If+PQ28eNmMk4NnuJB+Vcpr1biKdOil/cQvGKSTK5g=; 5:bWlfEJ4ilJSDzC9dFqwQaPSdUWUDkhWMgAymR52NSIrHVO7uB3fmR6DjLjaQEbi+kQBSYniOGTcV9J+AD8iHd7e0sBqeZ+/oVu+mbvbfkRntN1cVNEwrNNgt1YNz9lZ5oiMgxn5aXbprYGd3a8eM9ql0iZjPnk6BjKtBChG4Yvk=; 24:s82ep5yiMcQ4Y6uP6gcdOO7GBlbBre/hz8k7/2L3LIqdYXjzDizz9T/QfBnbSfxkaVPCODSjA7eZB8Hb/wsGcJ++Pt/+CzrEw5f/D6mWOhI=; 7:m2+rJ91vdzTEIbYVPVZTfGswp2uNsPUU/MVJnuF0BoebGixCHuoFTDYrxCMhCxujCdC2768/mqMaI8zQmL/1VNKbc9FhY8rIFff+7XFqmKdVgsR1vIltVtDuyc+2mlAY5Hoic26xX1xA0I/aXFNWXgbqXMKJWWqhnnfNUhh7aiyLb6yb14SslTn4++LnIEmIu2bWsQy1cWeLOrkK5xHOO+6/7HAr8kFibAsnGtwf1A293G+r1PwxaYKQx2B1zjLs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 23:27:02.6615 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7cf0235f-922a-4e95-e572-08d55d38a621 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: DM5PR02MB3388 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.57 Subject: [Qemu-devel] [PATCH v5 7/9] 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 Reviewed-by: Edgar E. Iglesias --- 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 -- 2.14.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 211655023e..571e094a14 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..aa50a8ac08 --- /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 Jan 16 23:22:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 861950 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="3BiK9Kde"; 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 3zLmn12lvWz9sNV for ; Wed, 17 Jan 2018 10:35:49 +1100 (AEDT) Received: from localhost ([::1]:45676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebalf-0002DF-DX for incoming@patchwork.ozlabs.org; Tue, 16 Jan 2018 18:35:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebadP-0004SD-Jw for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebadO-0002B4-OZ for qemu-devel@nongnu.org; Tue, 16 Jan 2018 18:27:15 -0500 Received: from mail-co1nam03on0058.outbound.protection.outlook.com ([104.47.40.58]:36359 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 1ebadJ-00028Q-8X; Tue, 16 Jan 2018 18:27:09 -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=2s7rlJdJaEnsoEZle9199FBi14M1+2v79x/reo8m8nE=; b=3BiK9Kde9BL64rBN0Nx1akSu7+Pg57D+0q1o1gzd+Eax4ljstJ8PqfuRx/Qw5bolcvOAJQ3NzC+Hiq7Dk9Bqicsix4TXuj/Y6GTviWXPz/5xfghUJk8qOEz7UnjJkhTSXm6WEY+xufFTuGQEdH5Yf1mfOPHshGEU7laicnx3+cA= Received: from MWHPR0201CA0076.namprd02.prod.outlook.com (2603:10b6:301:75::17) by DM2PR02MB1340.namprd02.prod.outlook.com (2a01:111:e400:50c8::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Tue, 16 Jan 2018 23:27:06 +0000 Received: from BL2NAM02FT049.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by MWHPR0201CA0076.outlook.office365.com (2603:10b6:301:75::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 23:27:05 +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 BL2NAM02FT049.mail.protection.outlook.com (10.152.77.118) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 23:27:03 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:56010 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1ebadC-0004Nz-Dy; Tue, 16 Jan 2018 15:27:02 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1ebadC-0003M3-Cg; Tue, 16 Jan 2018 15:27:02 -0800 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w0GNR0kv031071; Tue, 16 Jan 2018 15:27:00 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1ebadA-0003Lm-5K; Tue, 16 Jan 2018 15:27:00 -0800 From: Alistair Francis To: , , Date: Tue, 16 Jan 2018 15:22:39 -0800 Message-ID: <78ad4020fc887be02bcd4b0147da131f3a95ed47.1516144891.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-23598.006 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)(376002)(396003)(39380400002)(346002)(39860400002)(2980300002)(438002)(189003)(199004)(2950100002)(6666003)(39060400002)(81166006)(81156014)(9786002)(118296001)(50466002)(48376002)(230783001)(478600001)(106466001)(63266004)(106002)(356003)(36756003)(54906003)(47776003)(110136005)(53936002)(2201001)(305945005)(77096006)(8676002)(4326008)(5890100001)(316002)(76176011)(50226002)(8746002)(7696005)(59450400001)(51416003)(97736004)(5660300001)(2906002)(8936002)(26005)(36386004)(107986001)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1340; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:ErrorRetry; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT049; 1:xXxN5D2T7gP3bcbgfX2B1SDiMWAPSViZeIEio3i9G2lpg5bDCENHGttMlCHTi5OlWO3eeODClauQsZrj0PRDgax/N6Zm/cCgpSnLj0DNU6YouTwXq8NG2Pu2anx1M9Kh MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cfa77c9b-4f36-440f-b24e-08d55d38a64a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(4608076)(2017052603307)(7153060); SRVR:DM2PR02MB1340; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 3:SyQ36DuN8RXjZu8rAsM4ndi6S9U8jCDNpqCP6rRKafPI1YBSKmy9SMaZtf/LrbFV+fd2Y+jGf36deuOZNjQpiBqoINFhEiXjUpb5R4q+j+uhLLC2q3V3IUSBK+U7mLmm3vuH1k9dTFiDzNvXJjmyOETcOxyEhV9wmjkKAIWzwY0/pgAitfmfKtjoOY9m2/jxxkCersd27wS0d//neqxHYZuqVxijDOB0ATFluA+wPF3USKT0IL40aqVDW3JVOZZWcOecx6aMNVGhb+WR38NdPRKgnOpjfEjqIQYk5l8j0safiCyl6Y3vnXm2yeZcUVDfQ1erJBwjn0VM3r/mQ4/PoNCfNdaXlbbEDUfiMk6oVfY=; 25:RYXnqKpCiBz/8oIj+Vat9UmcZIKqkT8pveMaAAr8AfJOtmNJJqiuZ7NxWH2WpCp8ma7fIHCsKPVfxKT6IajeVrPBYhT5pqOlshp4vIE4uUWA7HwsuUKmXyLDk2wBL8vydvRDTGejZFxnHTUcsH3nyHvG7FMId2Jv1g9rylfE39qvpLvb0Kx/aGq453ZmgauEvZmCSynrmZtYvIbaEPadBEKufRVTxzke3BJvnHUhEWYCtOH9747JPivHmb6c/iaRdg93eZ5ReGjgV8hNlKxd0xZx0SoGjRl3fDi7qLPrUaKV4iPN9cEMuf7HibagKMVQIZD/wabNN2CQK4AFPluTn4203CM2/28ccRhVHdh3e1E= X-MS-TrafficTypeDiagnostic: DM2PR02MB1340: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 31:OrtIOHUpIy0EVIvhv3CcciiJPKBLg4HVnJ5UtxBKvAeiW2Q8ReUYw/YRzveysmtBvU1I+SRH3ZTY2cLGRaiGfmrH+QgtiwQ/BEa1ZcdR+SLNRZFJE5JOkWdMluhuE+1bLWxZRxVVJQHpp0nhN5H38S8x3ekuUr1BMAG3S5ZqpcKccarhUi06mbZAdrOVvMSyIcK81nHYsTs7S7zIWtAd9loLZks1yl/4wa5oaVEQHlc=; 20:ELeE51zIqDbGXw8Q6/q8pZjnM0uoUhQwl6/NXYktdvYuzc0DNx+0bBFZAjUV9+OkpCcMNohY3NvVfZJN6m7a5CNuldTTBw1AIZ7zVNIe/qUz4n3NZvAuz++YdO4zuMy/5VjKqwL6YL4nnReozOw5X9oIif2FsLswlV3bmMxigl1Prl73sW6dT8rAhdYBHnNjLO+FlDCOuojd5vUB5v6lc4r5rRjseIrEKB9i+m69LIeSTVK2y8FgfACrffrprUsVZX+jH5S8GdOthiZ320C8MCY9CnXWMuIz3vN/EZGKzcAGv3v3NWfpVVmBKcjBUlHTGFm4zXB6k9sKFpsoYnQH7/8r59O/nre8/0sOqAx/bStWzIlZk+5AsNCKdunp//60COxSM+nUlmPnU1hguhimI1dTFaYIALVLPqKey7DAmEvZBU7wotwmEPGaGAVoP15rOzdZUgUNPP02rqKG5sKw8JH0iyZgRcgZoY+PeEuWBuQKbqdVHMR95VsI2anY4fSL 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:(6040470)(2401047)(8121501046)(5005006)(93006095)(93004095)(10201501046)(3002001)(3231023)(944501161)(6055026)(6041268)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM2PR02MB1340; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM2PR02MB1340; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 4:Gdta5ki6e5siL5NexwddN9KwvAXGazEOd0iu0NANVQt2vJapXzLy2lgwQbMxy8rHjbKi1IMwQXMNYR5vIx9+GHFFMHa3VvhEDO1vwy3/aszRJTlNbsz7BAHGmuuaKd3jSRS/8L1png4lq9xOL/IdO58Kb+zgSt6hsrBwEWIHPMAgyo5cWYAmqXdZ7c8c6VKD0fASfEWK9KHjH0piPdOW4B52R9pDksUeoQeHY2ZH013WWTHhsRmKxjjzU6XbJYstgpyDJXHWr+i2HGynQLafMy/qj0bYmSL8mTjB21TOQrdPOvFIHvdcuKasBgJU+75ZoiXZ7p05pFmAn6DW6tA56MWuo57myYI217H0/jXmGdU= X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1340; 23:/7jFG6hkzFkJvN01yqH5zMQ8zYpwL/5azaliHZy//?= k1x92fsVzQCqK28dzP/3JYSslyuafNMbi5keEn7/Pf3ZWF8ZWNwsnp1TEB922YGjazDT76FW0nYrlQVoajNOQxMVIhNZF5owWrbD5munLDtec3H+FWwQ7JyoTQfwg3degeZn5+F5jfbDSXk+37a2Oq5FbvMIeYnUwPFxyKZjFfd5u/gyDdvthWImiLL2sUsodaiGZQUZQFlodogI1QlKQX8PLX/LbmaZukAnDWUaNVohD9U30yG/VFV+h7o4kuNwc3AxKKdB3N4HOb8lR2eqPaJqz9alyVvA/61hy+/3BanTpPa0063pGoQay6PfNLmtGABkHE4Xv/2tNrrCJNr9k0wNW+T7wcJQc019bQH13o+ZVxs/6j4ODGnxN8AR0LTEAT6K2/ov7j1AQKdOxcJ2KwMVofbYetGOgQEqTY7+irpFiEYESC8FUvA/Dl/s4LFQ6SE+z608XYLeai9Z2u6WOfq1j/yc5Pz4r+JKCV7N2poga6gBABmyfELQHqNXtVTInNDONT52qm6/qTtY09HI9BeuIn4aBllFYHeQAIIzHbBKGuap6ZCoIdg9cIzOfNu7rn3Dk4SLnWj4ScMxSiC28EmY5r1wxmjK1gA4J+BhaoSzmlzcjkEdUERQG5zmgHUpJEn4dAOBgkh0+2k2CFXAFlnybFFV7xCeCwoOygJFiIqy053OHRKcX9kOgSs2/uqHz0zkJ2qLnhUf3daxZXvlc52oqbj2F4gAsvixLT9Crc6TWiLLJI7kOqN9Hp2kI9V6eOusdJzl5MtCiePGrWH5pTsNXtDRTsEAfvPBltqvkDACtGA+NXq/G5zW/FuuYvIFI4kbmn7S1GbYSNe7Dc1u0XL2ueK1fxx2wdRNUvlXOpDOT8av2HJnsME45XYdnhp0u0m/oTacm9ytwhdzstnhgFtQGspn4GnQNPlA8rJrMiMIRVAzuguloBWK6PKHVrtklGp82YzBkjnbKwH+6VmzYuI3UrYoTylLCnMKfBP7T0Y0YWqLkDvYYhZDhgYoZisQzscJYyo3hSpQ2tpqPUddgapLIks2GcEdQ7EiWJGO50mLVPQ+bG9zSBOyYiHWDEH8b93qxsxJ5bktzvin1GsYQVJ3odRtREz9bZQdL/Gqhuf1A== X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1340; 6:9y5tsEQwjzQ6i2Pn/nM+snQvoEyd50VX1dBYEFGWRpXDPqx62vNDYRi+nXQE7ZZ/+K/Z3vEwKdwOoARGmpaMCTQo+8pls7mdyh7zbUUiGvDg54XPwustWNxTqHm5XnTE4pCAnMEWpR0UwmYkcIi7HD/N29rMtf4vG3zh56iYi3E6ZNV43sXjAFp/5/YLfiJFBqsZYk8GtVkLua9h9yw+ZCIZEkCgO157Cd4g/C+bqJfYParxk5zl808NDjl7c6yUATlmodbIHt6UxznmBGRL/dsyxEfX98C/hodey0xlTfBPuxWQe6dxgkvsyv96D9WV+wyPGKdSsI1SANybkLKx2aL7YV2ZkXI9YxiD1gyGIz8=; 5:j1MT/MzUMAzPPb8em/qj0Ioye/8TQAvPPUT+Qqh1rmRKXU0ASz/W9gc1swMohVN4QXRF5S9nICdSvSKsyML9hG0Wdncwhn2s8Tbe3MS7Ix3FVvBOCRJnnUVbWo+gNFkFbwxiffwYwkcjlwy3QLF655/1mlkYqVT4/0tdUF2zzrY=; 24:bgMLyRAmzZrZCnJfD6h03jXsIBr8wsqTfDnqfwNjnJqWhZ2cEpPUTzW69jDTioosG0kISsxt7svmHargnZN4DxuzxK+10a8mfmrnT6/9vpo=; 7:BUhDS8Pk9VwUOJOwSmWaIRZ+STEvgYs3cVrw/7KBfcFamrP9WH4WWWXJ3fPbarTGMswC0wjBehTUaZewb3aWYbkUcubZ58TnfGENf3aqEFco+LUwgZWtudHBKHLBcUHjIP3Q7do0ahmjJfe8zICe6pF4rAgUWQgR20V0wfLQeCgoT5sFWn/vPDkiOR2oHSOmxikB8sddq4FGqbgDwBVj0G44jqEjDgwaZbw5V2I5pK8RgNC8cxOBPX9W6HUEP1kd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 23:27:03.0383 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfa77c9b-4f36-440f-b24e-08d55d38a64a 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: DM2PR02MB1340 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.58 Subject: [Qemu-devel] [PATCH v5 8/9] 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 Reviewed-by: Edgar E. Iglesias --- V4: - Move the IPI to the machine instead of the SoC hw/microblaze/xlnx-zynqmp-pmu.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) -- 2.14.1 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. 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,