From patchwork Mon Sep 11 21:33:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Jaggi X-Patchwork-Id: 9948167 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8CBF2603F4 for ; Mon, 11 Sep 2017 21:36:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8897F28D79 for ; Mon, 11 Sep 2017 21:36:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D7B028D7B; Mon, 11 Sep 2017 21:36:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 554B628D7A for ; Mon, 11 Sep 2017 21:36:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drWLH-0004VO-Mw; Mon, 11 Sep 2017 21:34:07 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1drWLG-0004VA-JK for xen-devel@lists.xenproject.org; Mon, 11 Sep 2017 21:34:06 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id 95/15-03610-D4107B95; Mon, 11 Sep 2017 21:34:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpik+JIrShJLcpLzFFi42LJ0NfS0/Vh3B5 pMO27scX3LZOZHBg9Dn+4whLAGMWamZeUX5HAmtHz6yRrwVbPis+tSg2MD0y7GLk4WAR6mSVO HW1k6mLk5GAUiJSY/6uVDcQWEuhgkuidWQtiswnIS+zsvQRWIyKgJHFv1WQmkGZmgU5GiRvXl 7GDJIQFPCR+7zoH1swioCqx4/FxMJtXwFPi15YOsGYJATmJm+c6mUFsTgEvibfdL1khlnlKtP z8xwhRLyhxcuYTFhCbWUBC4uCLF8wQvYoSz26cBFssAbL44O2VUJeqSUw73QW1QFbi6Nk5LBC 2r0TzjQMsEA1PmSTW9T1ghXCa2SWefe+FGqsjcfnwO3YI+zK7xO8TUN0WEhMaTrFB2AUSa5ev YIRoPsYqcfb2OlaIhIzEtilzoFasZZVonP0d6qYkiWPzT7BDJG7zSEzYcgOqai67xIF9MxghQ SYl8X7HScYJjGqzkHw+C8nnCxiZVjGqF6cWlaUW6ZrrJRVlpmeU5CZm5ugaGpjp5aYWFyemp+ YkJhXrJefnbmIEpgQGINjBOPOy/yFGSQ4mJVHed8e3RArxJeWnVGYkFmfEF5XmpBYfYpTh4FC S4L37f1ukkGBRanpqRVpmDjA5waQlOHiURHgngKR5iwsSc4sz0yFSpxiNOX5MuvKHiaPj5t0/ TEIsefl5qVLivMYM2yOFBEBKM0rz4AbBkuYlRlkpYV5GoNOEeApSi3IzS1DlXzGKczAqCfPeA FnIk5lXArfvFdApTECn8FzaAnJKSSJCSqqBMSum+W7s7YWBf/hnyzJu7Fs0v01POO9KEOO6kE XPvIMEg2IiFQ0FNz6xfbvwxuF3FrVzOPZ0bo97Oev6Nh57/tvHlFTFAqPzPOcfL9RR4AxhVfL XVzeruVYu7vzRbasPV1TXxy+dxh/4tWrnO6q+OvN3iaeMjOqcOr4CXbn7xhFTuAx+tsorsRRn JBpqMRcVJwIAbu5VlJUDAAA= X-Env-Sender: Manish.Jaggi@cavium.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1505165643!82303502!1 X-Originating-IP: [104.47.42.46] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16554 invoked from network); 11 Sep 2017 21:34:04 -0000 Received: from mail-by2nam03on0046.outbound.protection.outlook.com (HELO NAM03-BY2-obe.outbound.protection.outlook.com) (104.47.42.46) by server-12.tower-21.messagelabs.com with AES256-SHA256 encrypted SMTP; 11 Sep 2017 21:34:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=u5e91Dg8MDZi2heBxcCJ4ROcUprhCk079VSFHPP8MUA=; b=k6L7nt8urhUVSpyHOIwRe1XyeLnHww5XxOuwgfYP/GBkYdoukFH4zmMkAzfNAHqmUAcW/PxJWZblqfrt0FW0DCi914gsYUw1h+8gc5kRJWpOLOYXUhbV2CNb9MYhXe7jbyfRICozljvLFYfmXvNVGw0im4SUN8Mr5mX8m8pQKWg= Received: from mjaggi.caveonetworks.com (111.93.218.67) by BLUPR0701MB2068.namprd07.prod.outlook.com (10.163.122.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12; Mon, 11 Sep 2017 21:34:00 +0000 From: mjaggi@caviumnetworks.com To: xen-devel@lists.xenproject.org Date: Tue, 12 Sep 2017 03:03:26 +0530 Message-Id: <1505165606-11731-3-git-send-email-mjaggi@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505165606-11731-1-git-send-email-mjaggi@caviumnetworks.com> References: <1505165606-11731-1-git-send-email-mjaggi@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: BM1PR01CA0106.INDPRD01.PROD.OUTLOOK.COM (10.174.208.22) To BLUPR0701MB2068.namprd07.prod.outlook.com (10.163.122.150) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d38ba085-5914-40e0-7fdc-08d4f95cd200 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BLUPR0701MB2068; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2068; 3:Qu97yDLTFLmqCWLMXQlh8cGvByusL5Lb49OrtwY/+3YxJF+V+pg34MqNzu9/WH+zZGEafokwTf925Mh696o7funzmYGAvARZG1g/r1Eb0xHUJgEi5RKagiB4d0hL+mBj2IB5mDgxgVsNayQCiYY+A9Ik2phWG9ihwInV8a3QvmLlv0CG8NGpR943zpO5Nd/UpsYUbuCa67nAHDSw9E/VfV3YlsXxCJhgqF86M/AwnFoPsYPgcVcVqZKzqpMmkxpg; 25:3tBl8c7jzHlFnPUG2VuOySoHnnFmaa0C2GBbD/9s8XoGV+gDZa34rYLTD8ckS5j23+0HfYYuxKQKVpg8O1F93p3MsWfcHy/RY17MdolbVYYkbJ8ZuA2rXUHq9HZuNqBr1tQMN3hT+/A2ZB9VUixffFPcMaTzMsAtOCElzaMUSFFXFv1qL209RAmeoSsXqTQ6Bk1kNnXb1hDuuqEI0RcbP6NjbO4K59YkfWMyeWrpl4z9lFsIg72xtjvUsm0takaBBLsHKUvrLIRwEykSnoCmBUh5SkW+WA/K9sqnThB6QnX1lvzezFx5i2EQ6ZjztrxCMOej3JVQD9mZxmlfC238OA==; 31:vB1QHZbS2xyZo1ZC5Y+VK+T3hultecKiAg/BINB77hnPKk0FubNtdNLnceC4Lo+JRRHWmZq2hRyekk5j9VqiZuDjOnLt/hrOqcTbN7LA1+pnz/5ffUuOgA0BivBE7ccLE7x/0jK6RoAnvEq5CsdQdNa5hubyYZGcirABIyQVAoo73QpkpCj+pzbHetaYureuMzz6s/oo29YEFcmuj6txUT9voQngXWW2xXMEbwyjwIs= X-MS-TrafficTypeDiagnostic: BLUPR0701MB2068: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2068; 20:XLmM1VBnYdoseOyMPWta6niQ1tZRBawva5yODEeZyNj5zOj/37zwApwZPZKXrJ5bGETw8rbH4SjbnCPljHafFCMbJ5TIeZ0VWzO6dJcFZczcSjoefHanqW0cWn9eHnbvKUMa8ef6q2hRJBbtxea7kVgLcuyBdWqEWq/a8drC0L3ZM7M6WQN620G1TQ9qfBGseNA0C8BHiWeffzfeuUCfhcRBUzTBj0DGtmyiyv3mP5WXaK56hZj8pE4+0yqYLO4mRCjX8Jct2l76iag6w1wgEccHiR5E0N4gqbc8kfSYpwh6BPCVYkaJ5O4pqNVfP0aHwquY1HyDSN1gOk1peFTVBbb7G2RNcdsrMGfhnEF64cHDuAtivpmzMMOmeSWBr4nv32il5jNdr3dBVx3Q/D7ICXkfi3fpND8YhHg8lKGomNyGvHamecSLf0NBE4vT11faOGHV41q8gqBSeDyuhEF6Spo+LwfvPLYXWhxkhpso0HBQdvzbCVhwDouW6ti+g4p6vxfI3uT9xx3lhdlOKCeCLRd5VmNyUffbrnQqBX8wwS8J/AJcmMGMEt8PD5xzTCo7sWzHy0MRBJi6D2lKZdYdiCqVnQY99HruBklHSuNqldM=; 4:rX9efQB4p/OzD6oaJLFajhD1p9ojhDEtQcipmjJv28Xy3Vwi1TNF81u66Q+e9rm0VqcOL5JPDszrXLLA7SVSPCl6OJZDC1Zto15Bws7XbIrnxDnjhb45Q/9XxZuPGBUfcvXak5AbCXSh6EXa6AiYsEBqFRko1hvP7P94JBmPGBu6oCkxB3TwkB70TTVZ2IUXVPTeGqUAiaOWcqD2kYHpFMVtrxjdZwrJjvCSs8K4U3fKCXprYjl9+AX2gJmfjPVqqbQ8BVJahMbRkw8xYTq4NEsxeTBCbSsMu/sY9edk/Ks= X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(100000703101)(100105400095)(3002001)(10201501046)(6041248)(20161123564025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0701MB2068; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0701MB2068; X-Forefront-PRVS: 04270EF89C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(199003)(189002)(101416001)(50226002)(42186005)(81156014)(8676002)(8936002)(76176999)(53416004)(50986999)(72206003)(81166006)(6486002)(50466002)(2950100002)(6916009)(25786009)(189998001)(69596002)(53936002)(42882006)(48376002)(68736007)(4326008)(5003940100001)(5009440100003)(6512007)(107886003)(6666003)(9686003)(97736004)(478600001)(305945005)(110136004)(2361001)(36756003)(33646002)(6116002)(105586002)(106356001)(3846002)(2351001)(7736002)(47776003)(5660300001)(2906002)(66066001)(316002)(85772001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB2068; H:mjaggi.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB2068; 23:zg+mhN9bE8j/mZ+lA7ZZWeGuaySqybbczVrD+Hm?= =?us-ascii?Q?2hEIvLU078VLvbYhZfJlPVFM2g7co4LW2vOUH54CEvlpifIFYi/tHmq6PKFm?= =?us-ascii?Q?OoP9rw32cobsvMp07lFFrfmWGaZPfP96asbSjBa49qBTlG4M6tx4oBHERs1I?= =?us-ascii?Q?r/vQn+lFgxapBazVDJ5vhCKjQoz3QcZFuzWCDva37F1uan540D5mlrtUV1xp?= =?us-ascii?Q?XRnc+ul7Fw30cKqEfokPqJsDyi47l1Xmu0c7Db0HsgrdqrXQn3hSXjwx09Km?= =?us-ascii?Q?kat8QNWKREEsZi08hTulhVwq8b5X4IUqUnq4Ele3aKQ5rIaJlYuB+l/sOtiC?= =?us-ascii?Q?OwdOECbywPjSP11wysj8b8t8eS4vle/du6uULepSTL8BH30+SFpng0uHtZGS?= =?us-ascii?Q?ZIT7tj1PowVjWi9wBzAZocyOJ+nHvu154DD0pIrKjZ2XSRjSKrOKrCkFrHmI?= =?us-ascii?Q?lbG8kqbty/ReUfclGeqh6r5e/0/F2RcNSDifIneJJ5fZdLuxILkhGovYE4+a?= =?us-ascii?Q?tnhIBjc2TWairVzA0geuIBl+6QH2iOO1KObKQygsdY7XakSH8RfxyBJs9Nnr?= =?us-ascii?Q?dkd+Mm4Y2VgSe8EBgsJ/9/cfDZJK5SU8LLXS32VVjmarT9l+9PdQKZ6tDN9C?= =?us-ascii?Q?+j1sR2UGEBFGjI0nKnj0YE3Exs6YtyaPmtezrqm16kenWNsTMF/w/V4yucDF?= =?us-ascii?Q?9R3SD8JuPdWH+b24wM8HjkaBD143be8dda+pyj7rLhH03D1wUwT0GapHLdah?= =?us-ascii?Q?mmIwy7kV55pqjBj69zSjM4kDF5ImvLCqbmTofA5f/4cMakzeD8HyTZolJavU?= =?us-ascii?Q?sNatwPmOhyCmog10vw5kFuKF2/c1X7VfqJkMciIZMtPg2vXt3MF6YMi2guzv?= =?us-ascii?Q?tGUqyvi5ffvRCn2fdHnqpUEW/9+pdRjYf07YzBK/9FwmcTYQNVoMsPKUdiQY?= =?us-ascii?Q?RtmeO8YZRFuOIK7UMrkmOVTwAVUGab9VbjaABTq7ep++lAmAqzXsU+YVvXnU?= =?us-ascii?Q?aN28op8j9vwTDI3Vk0WiGefWlT0UpYluSaE6agbAGbXzmiXZlueguChn+8Gj?= =?us-ascii?Q?dRbfoGgOrUtmzM8JirceCkUfyTsahbCztKcJwWNch0hit4WE/N/T1+MGIqhl?= =?us-ascii?Q?3ReDwICJx7k8+F/y62CV1GP7x6Y7o1UqtwR56BKZUdRn8mnVDqK3OnyMYABH?= =?us-ascii?Q?YYWZezIS71KHyPIAcAmMD9nTIol6ALvnvBCs6?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB2068; 6:IvEwI5HfOXfGW4XSOFX5wviZLCyjZayWOCil3+xtvM35Gj0F3X44Bxk7jMVXUmyggJ+vQ0mHJ2G7pP9sNjN5palP3heQ0GpszF3yaXyg+Q/VG9D01MbR6CIeAGbzZwI9vzZ33619Ht0JxgPP8hfRX/gyNIC00eQaRHnlFMBzJDhEo54o+sjxVUI4psvxrUllDTy4q1U+xmMe8XKfWndnabChlSf9ilKLZKQURFEj1wTgytDvsJOqLbVy1UgLlNuRjUVC9gz9sONul7oCfxkK0JzBAz9awjFcHCe2pjqrHfeTMrim2GGw90VyanfntBQjRNaUuOKMdz9GgPMRxOiyPg==; 5:uJVR58qJ03ndovASlEQAmCwW5gMCkhDCImXfZ1MTQNU+bDVZ0mSNZMLupVmVbW5dJmkMxi3jxpzs4YxHtyaKUY26NkW8+hzC4f05aObAaO7tOsQ5WFBHk9pBXsr4lCrj3AcDET/UktE9HD57TUre9E96amsuWC3Au72qvHkTESQ=; 24:MvMEMK25ebPNyACeUOt5ybr2DJ5Q+Nm29CYj256aJ2lig1b8XXkZdizL0/5HGuoFTPdD/5e4metDLGvFNfuIIi50v9J3OMsDSSMsHv7mep8=; 7:aPHYLcJybL9aY/YdKypTegoWMgKaAV84JyT56n7tqBXs9WUsNtPmDBlXirtkuDP8Yk5eH64U1AzkaVjyEmreORdJ7/DW2kR4x0DDKjdhTj6Vcoi7dp2D7onqtLVT0is7XVFCFk1tVM0Muo0A0PI+ISrkQGG1D+g/Nyb74e/P/Q3vYDWMkfQTl5ZgEOb2KjzQU77qjabsb43n1ET36pM0Sp5iFlB/EnPpYJg15S7+Bao= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2017 21:34:00.4293 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB2068 Cc: Andre.Przywara@arm.com, julien.grall@arm.com, sstabellini@kernel.org, Manish Jaggi , tomasz.nowicki@cavium.com Subject: [Xen-devel] [PATCH 2/2] ARM: ACPI: IORT: Write Hardware domain's IORT table X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Manish Jaggi This patch writes hardware domain's IORT table. The steps are: a. First ITS group nodes are written and their offsets are saved along with the respective offsets from the firmware table. This is required when smmu node is hidden and smmu node still points to the old output_reference. b. PCIRC idmap is parsed and a list of idmaps is created which will have PCIRC idmap -> ITS group nodes. Each idmap is written by resolving ITS offset from the map saved in previous step. Signed-off-by: Manish Jaggi --- xen/arch/arm/acpi/iort.c | 172 ++++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/domain_build.c | 38 ++++++++++ xen/include/asm-arm/acpi.h | 1 + xen/include/asm-arm/iort.h | 3 + 4 files changed, 214 insertions(+) diff --git a/xen/arch/arm/acpi/iort.c b/xen/arch/arm/acpi/iort.c index 01914cb..d506adb 100644 --- a/xen/arch/arm/acpi/iort.c +++ b/xen/arch/arm/acpi/iort.c @@ -240,3 +240,175 @@ int estimate_iort_size(size_t *iort_size) err: return -EINVAL; } + +void write_itsgroup_nodes (struct acpi_table_iort *hwdom_iort, + struct acpi_table_iort *fw_iort, + uint64_t *ofstmap, unsigned int *pos) +{ + int i; + struct acpi_iort_node *node = NULL; + /* Iterate over all its groups in firmware IORT table + * and copy them in hwdom iort table. + */ + + /* First Node */ + node = (struct acpi_iort_node *)((u8*)fw_iort + fw_iort->node_offset); + for ( i = 0; i < fw_iort->node_count; i++ ) + { + if ( node->type == ACPI_IORT_NODE_ITS_GROUP ) + { + u32 l,u; + /* Copy ITS group node into dom0 IORT Table */ + ACPI_MEMCPY((u8*)hwdom_iort + *pos, node, node->length); + + /* keep the new and old offsets, this would resolve smmu idarray's + * output ref offsets to the new offsets in hwdom iort table */ + l = (uint32_t)((u8*)node - (u8*)fw_iort); + u = *pos ; + *ofstmap = ((uint64_t)(u) << 32)| l; + + hwdom_iort->node_count++; + *pos += node->length; + ofstmap++; + } + node = (struct acpi_iort_node *)((u8*)node + node->length); + } +} + +unsigned int write_single_pcirc_node(u8 *hwdom_iort, unsigned int pos, + struct acpi_iort_node *node, + struct list_head *new_idmap_list) +{ + unsigned int sz; + struct acpi_iort_node *local; + struct pcirc_idmap *pidmap; + local = (struct acpi_iort_node *)(hwdom_iort + pos); + + /* write the pci_rc node */ + sz = sizeof(struct acpi_iort_node) -1 + + /* -1 as acpi_iort_node has an extra char */ + sizeof (struct acpi_iort_root_complex) ; + ACPI_MEMCPY(hwdom_iort + pos, node, sz); + + pos += sz; + local->mapping_offset = sz; + local->mapping_count = 0; + local->length = sz; + + list_for_each_entry(pidmap, new_idmap_list, entry) + { + ACPI_MEMCPY(hwdom_iort + pos, &pidmap->idmap, + sizeof(struct acpi_iort_id_mapping)); + pos += sizeof(struct acpi_iort_id_mapping); + local->mapping_count++; + local->length += sizeof(struct acpi_iort_id_mapping); + } + + return pos; +} + +int write_pcirc_nodes(struct acpi_table_iort *hwdom_iort, + struct acpi_table_iort *fw_iort, + uint64_t *its_ofstmap, unsigned int *pos) +{ + int i, j, ret; + struct acpi_iort_node *node = NULL; + + /* Iterate over all PCI_Nodes */ + /* First Node */ + node = (struct acpi_iort_node *)((u8*)fw_iort + fw_iort->node_offset); + for ( i = 0; i < fw_iort->node_count; i++ ) + { + if ( node->type == ACPI_IORT_NODE_PCI_ROOT_COMPLEX ) + { + struct pcirc_idmap *pidmap; + struct list_head new_idmap_list; + INIT_LIST_HEAD(&new_idmap_list); + + /* hide smmu nodes and update new_idmap_list with output + * refrence of pci idarray as its group + */ + ret = scan_idarray((u8*)fw_iort, node, &new_idmap_list, 0, NULL); + if ( ret ) { + printk("%s: scan_idarry Failed \r\n", __func__); + goto end; + } + + /* fixup its_group offsets as per new iort table */ + list_for_each_entry(pidmap, &new_idmap_list, entry) + { + /* search output reference offset in its_ofmap + * and replace with new offset + */ + for (j =0; j < fw_iort->node_count; j++) + { + if( !its_ofstmap[j] ) + break; + + if(pidmap->idmap.output_reference + == (its_ofstmap[j] & 0xffffffff)) + { + pidmap->idmap.output_reference = its_ofstmap[j] >> 32; + break; + } + + } + } + + *pos = write_single_pcirc_node((u8*)hwdom_iort, *pos, node, + &new_idmap_list); + hwdom_iort->node_count++; + + /* free new_idmap_list */ + list_for_each_entry(pidmap, &new_idmap_list, entry) + xfree(pidmap); + } + /* Next Node */ + node = (struct acpi_iort_node *)((u8*)node + node->length); + } + return 0; +end: + return -EINVAL; +} + +/* + * Prepares IORT table for hardware domain, removing all the smmu nodes. + * IORT table for hardware domain will have the following structure. + * [IORT Header] + * [ITS Group Nodes] + * [PCI RC Node -N] + */ +int prepare_iort(struct acpi_table_iort *fw_iort, + struct acpi_table_iort *hwdom_iort, + unsigned int *iort_size) +{ + unsigned int pos; /* offset into local iort table */ + uint64_t *its_ofstmap; + + pos = sizeof(struct acpi_table_iort); + + its_ofstmap = xzalloc_array(uint64_t, fw_iort->node_count); + if (!its_ofstmap) + goto end; + + /* Copy FW iort header, node_count and node_offset updated later */ + ACPI_MEMCPY(hwdom_iort, fw_iort, sizeof(struct acpi_table_iort)); + hwdom_iort->node_offset = pos; + hwdom_iort->node_count = 0; + + write_itsgroup_nodes(hwdom_iort, fw_iort, its_ofstmap, &pos); + + if( write_pcirc_nodes(hwdom_iort, fw_iort, its_ofstmap, &pos) ) + { + printk("Error in write_pcirc_nodes \r\n"); + goto end; + } + + hwdom_iort->header.length = pos; + + xfree(its_ofstmap); + *iort_size = pos; + return 0; +end: + return -EINVAL; +} diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 0328926..0fcc206 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1653,6 +1653,9 @@ static int acpi_create_xsdt(struct domain *d, struct membank tbl_add[]) ACPI_SIG_MADT, tbl_add[TBL_MADT].start); xsdt->table_offset_entry[entry_count] = tbl_add[TBL_STAO].start; + acpi_xsdt_modify_entry(xsdt->table_offset_entry, entry_count, + ACPI_SIG_IORT, tbl_add[TBL_IORT].start); + xsdt->header.length = table_size; checksum = acpi_tb_checksum(ACPI_CAST_PTR(u8, xsdt), table_size); xsdt->header.checksum -= checksum; @@ -1701,6 +1704,37 @@ static int acpi_create_stao(struct domain *d, struct membank tbl_add[]) return 0; } +static int acpi_create_iort(struct domain *d, struct membank tbl_add[]) +{ + struct acpi_table_iort *fw_table; + struct acpi_table_iort *hwdom_table; + acpi_status status; + u32 size; + + status = acpi_get_table(ACPI_SIG_IORT, 0, + (struct acpi_table_header **)&fw_table); + if ( ACPI_FAILURE(status) ) + { + printk("Failed to get IORT table\n"); + return -EINVAL; + } + + tbl_add[TBL_IORT].start = d->arch.efi_acpi_gpa + + acpi_get_table_offset(tbl_add, TBL_IORT); + hwdom_table = d->arch.efi_acpi_table + + acpi_get_table_offset(tbl_add, TBL_IORT); + + if ( prepare_iort(fw_table, hwdom_table, &size) ) + { + printk("Failed to write IORT table\n"); + return -EINVAL; + } + tbl_add[TBL_IORT].size = size; + + return 0; +} + + static int acpi_create_madt(struct domain *d, struct membank tbl_add[]) { struct acpi_table_header *table = NULL; @@ -1895,6 +1929,10 @@ static int prepare_acpi(struct domain *d, struct kernel_info *kinfo) if ( rc != 0 ) return rc; + rc = acpi_create_iort(d, tbl_add); + if ( rc != 0 ) + return rc; + rc = acpi_create_xsdt(d, tbl_add); if ( rc != 0 ) return rc; diff --git a/xen/include/asm-arm/acpi.h b/xen/include/asm-arm/acpi.h index 9f954d3..1cc0167 100644 --- a/xen/include/asm-arm/acpi.h +++ b/xen/include/asm-arm/acpi.h @@ -36,6 +36,7 @@ typedef enum { TBL_FADT, TBL_MADT, TBL_STAO, + TBL_IORT, TBL_XSDT, TBL_RSDP, TBL_EFIT, diff --git a/xen/include/asm-arm/iort.h b/xen/include/asm-arm/iort.h index 3b4cd7b..229fe7b 100644 --- a/xen/include/asm-arm/iort.h +++ b/xen/include/asm-arm/iort.h @@ -3,6 +3,9 @@ int estimate_iort_size(size_t *iort_size); +int prepare_iort(struct acpi_table_iort *fw_iort_table, + struct acpi_table_iort *hwdom_table, u32 *iort_size); + #endif /* _XEN_ASM_IORT_H */ /* * Local variables: