From patchwork Tue Oct 10 12:52:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Jaggi X-Patchwork-Id: 9996055 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 8AB8D60216 for ; Tue, 10 Oct 2017 12:55:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C1DD285BD for ; Tue, 10 Oct 2017 12:55:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70BDC285C1; Tue, 10 Oct 2017 12:55:41 +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 22309285BD for ; Tue, 10 Oct 2017 12:55:40 +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 1e1u23-00031u-GO; Tue, 10 Oct 2017 12:53:11 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e1u21-00030e-KR for xen-devel@lists.xenproject.org; Tue, 10 Oct 2017 12:53:09 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id EB/B0-31244-4B2CCD95; Tue, 10 Oct 2017 12:53:08 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA1WSfUgTcRjH/d3dbufw7JyJT7MXmmUvtKUIJRV URJGRZUHQCspbXdvB3tzNWDFkQS9rYUiLQjHUoKwhYVagYZkvydaL0HLUaNV8IUwwrYhSgrrz rOz+eu73+T7f5/v78VC4elKhoTi3i3PaWIuWVBHmlcs26e50xg25DZ/WFny/G8A2oK1d431EM dqn4G1Gu7tEYU788pGO0yvcjfFe5EWxbD9SUQRTgUNthZf0o2QKMQaonTxFSkDNnMHgY3M3Jg GSWQCtFZGpejajhXfBwFSNM1a4PjKKpDqd4WGgKi7WlOi6GB4/Pywd00whBEL9CqkGZj7Ees/ ikiSZ2QbBUJZ0rBYlly50YbI8DcJVQ4TsDtAxPIzLrQvhw+swJkUD5hyCho4JQm7OgUtP/Zgs mieOrSEkf2CK4POtTFlfj+Bh9KlC/rmshGeN/aTcsALetr4hZNCghLrwGCGD5XAr+nl6tANaB munu3sUkIh2IxnMhU/1PlIGp0k446tEciYj9NSGlDJoS4X2oSvTAc8q4UtbkfxeGhhrCaNKlF M94+LVMy5eh7AgWiJwzqOcU7dab3TyJrPLyvIWXV7uKr2VEwTWxFlYo6A/ZLc2I3EPksSvBVW 93NmJ5lCYNoPG2+MGdarRfviYmRXMB51lFk7oRHMpSgv0oQ6RpTk5E+c+wlvEZfqDgUrRzqZP SZgWHKxV4E0yeoJ0lC/29iemJmx2G6fJpJskESOJzGW2vxZ/VjKC5mnSaSSGUqc4OKeVd/3PR 1AmhbTpdInkksLbXH8njYghMDFExpGpEC72H9J40bkBsryGDDk2GkqjV2k8+VoTP6iqzrq3qH TP+WKP/1HPAd/+UdeN9wUZJ7buaC+fyBteGtvr73sReXdx0fbEruP533qb7uu8u3/o3Vnum4a viZqk4Dp74b2Ix85G1vND/osBKFadLBz1fOyb5Rl/sCZ/3Ss8ewu3pf/2lyeLfZu1hGBm85bj ToH9De69yo2NAwAA X-Env-Sender: Manish.Jaggi@cavium.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1507639986!109516381!1 X-Originating-IP: [104.47.41.67] 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 16478 invoked from network); 10 Oct 2017 12:53:07 -0000 Received: from mail-dm3nam03on0067.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) (104.47.41.67) by server-12.tower-27.messagelabs.com with AES256-SHA256 encrypted SMTP; 10 Oct 2017 12:53:07 -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=6gV1dj3b0fPFnbBEYuZd8zNye67etRNZvDZReMP5xx0=; b=SaK+zIr0cGazMKiRAbS/l+v0OoWJNEWtslyzddf4O/n+h5tGIHTyS32Y76y3w9hTG9/CZYNncq2xSqRkl2KxairrCk/oH07W9Nda5rV+Pwd0Ed7LvnuEIa6VQM69WRt8/84Aq4wc0lN6gMGaq1cdl54USAdST5tqgaKaxhJe0vk= Received: from mjaggi.caveonetworks.com (111.93.218.67) by BY2PR0701MB2071.namprd07.prod.outlook.com (10.163.156.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 10 Oct 2017 12:53:03 +0000 From: mjaggi@caviumnetworks.com To: xen-devel@lists.xenproject.org Date: Tue, 10 Oct 2017 18:22:31 +0530 Message-Id: <1507639952-31617-5-git-send-email-mjaggi@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507639952-31617-1-git-send-email-mjaggi@caviumnetworks.com> References: <1507639952-31617-1-git-send-email-mjaggi@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: SN4PR0501CA0030.namprd05.prod.outlook.com (10.167.112.43) To BY2PR0701MB2071.namprd07.prod.outlook.com (10.163.156.149) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97e8e22a-17e2-40ae-7c30-08d50fddd957 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BY2PR0701MB2071; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB2071; 3:QFWQ098hZOYUenVIOJi4Q/gAR+h+0w4+P5DHgXW3vnZy7j6dOZaVs3XJawZ3yQjbi4NhU/k33ga0hnTTbBCJpGwVwK0YI8kIpKVaJh7S0I9WGOsUZehkNnpTt+WckjP7rAhzWRhKdyo6pyHmUipLPNQO6VcvnqvX8CyFavXaV1hSjQvIIX+NM4qhSh+2J6wzq2MQ2DFMko8xMLUAGonoyK21NdJxRzcsprwssAlIliEoWg8i5jHUk0hGuE0QS5tz; 25:ZJWFxhK1bX710sa3onnb0SrfNDY8IqOFR1E2owQEWBgiqQoGmlTDTNJEfEA6ry7sjwAZBhmkZSpQsW7y7j0kBrnoXHo2cwaAOo9zOhNKiMNs2+Aj6gQBf2NeUelN6NtllJfWGE7zraKulH0Tg7bwzUrP82HoEGK+5XxHUgpULt7oHeIjCIy3zcyoZwoIMZatODsxpXyTbbgqzhwaC77BZdfabOhzFD+6KY798GddGp4iotPvItlbOhBWniIT5iVfmksBkgP7qEk9yuIz2M+dqzeiwgQnyYEs+NotAdbLNW1pSIxJd2eFeAGJhFfftxWjpuSq2TcRvVqataDHZDe3DuglzWyDtcyJNvLBmti5p5k=; 31:YX+jAN8on5l5g9VQFp1F3BE1FNLum7iQqQ53TE8J8JbLAMb8FCui69WE0OB4msswJ1j0/Ian8E56txZq4c4/K6k3p79Dmsr5+HP98/O8/Y3caKDeGJZvhtabckwDwcvR2TAdZuG05ykWZa8N2mBwGjtveDpMyY7kZ0wUd0lzdpRF+wrqCo3GcW2atIrg97wDhCkZ2BR7B1VjWiCf//vyY4KvgGqPOcyDMHYG2Cv0A0Q= X-MS-TrafficTypeDiagnostic: BY2PR0701MB2071: X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB2071; 20:OnKixOXYTZgjyRjkO+1yvfAuGbXMgMwUMmHacaEinU2PwWDGAZJBP5LMVZCc+Mdc0FcPJ9lMZ71fa3sG+ipJgLwx2d7ZrOiuvO7mk+nwxSJNJW855n/GVzk1USYfO2yk8gvtWTFiRti3p/iiik3dR8CYs3Cm0Za9agtczIXFKSjZJmsJBGuacz6rXjkSfRMjpJM92Vtz9cBTDtfsRRdGu7HBJ6Zox8HGWnbRVwzmw9gRs8o0s61jydEn3uuOQYn86U+JmwyjF/s2UNWmdBDyG8mjXzCR3pURIOzlCCaBbOorapTS2k7fJYxR9dK7yFB8P73zP5W3z/JyFKgJ57Od0gF1y/vLPBFLsk+Ti71Ubo9bHgQ4Rx7unMtvYo/f0kzNkU5Iq5egeUZdnYC3CwU64y5YWrW3SKLaFkTIiKqD8cz8ncd3xj7I76ItJ5cJIDfQzhvyehhq05pil+2EJ98b/0EZsZw94+0VxF7OrG1GHNLScUC+xBdIyUBnlcbAgTiYo+GKXcBseXH7xjiKivQu1fQZ4ue0L9LzcUt3LirpR/gKscE87kqBjsTtvua/5i2eZkyHP381v4XzCRXiiWdCtqwPTP8dHzC2uPSoNMuvXJ8=; 4:FXbJxqSonCa8VaWIj0iC9gUf14sXD4xdcaztiVUfXaDtbpB/e/6betQ4SE+09324acio6n0YRCeMQ38h1l6xvwXX4wxGFnpuJ9C28kYUE1GHDA3tYqdsmsdOKOfh+xvJfVkYsOaoJjQdMcAxb4vQ2WgHcFKW589RdndJ4l4LsBgMT/c0KgbgWZi/rc1JPgWM3yM9oSmQGvZ1g42ABJrwowgS5Hx9Gbgf5KMvW2Uat/iEEv7T2NnXSuPMxipgux66 X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123558100)(20161123560025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY2PR0701MB2071; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY2PR0701MB2071; X-Forefront-PRVS: 04569283F9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(6009001)(346002)(376002)(189002)(199003)(6666003)(69596002)(305945005)(9686003)(6512007)(2906002)(33646002)(72206003)(5003940100001)(101416001)(16586007)(316002)(107886003)(36756003)(97736004)(48376002)(50466002)(478600001)(575784001)(189998001)(16526018)(53936002)(15650500001)(3846002)(5660300001)(6116002)(5009440100003)(4326008)(47776003)(6486002)(2361001)(76176999)(66066001)(50986999)(25786009)(81156014)(2351001)(2950100002)(8676002)(68736007)(6916009)(42882006)(106356001)(7736002)(53416004)(81166006)(50226002)(105586002)(8936002)(85772001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0701MB2071; H:mjaggi.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; BY2PR0701MB2071; 23:zyUf95YRs3/KGSp7L/qmVmiD9Alv4ONXIgiBGSQ?= =?us-ascii?Q?iwI8eQD1jBpA0TO+VRTy+MS0nDGQDJraOHha48XZF73ne+kLG3gHuP8RJyzZ?= =?us-ascii?Q?dPwA1uYEAN/lLqjMac9sxHz5p537+7h3A3wFKH0PvV1WCIpq8eERT0AQ2vtf?= =?us-ascii?Q?BUeTqrOOfsfi3mK5Vmit4DjByEn5OT35x87/sKxLngl7jLzm6TEaaXJfdbz2?= =?us-ascii?Q?oKGZK9hc61aUjF7ArIAu/YAvrJXJsrnc+gdsq/7U1o6jcg5Ih7ur9sZk4aKn?= =?us-ascii?Q?AjJnV/hRba7MAykSl/QhLXZ0fXRQvSh+XwVIl3a6W9ovHLbiR4veC564wxNB?= =?us-ascii?Q?KqjzSY1UPgJmWJhezRMlMsM02zF4cU6nkUvEGaYbkcNYdwFx9a9Ffx1r4NiO?= =?us-ascii?Q?dzu3o1RrcrZcDUQ2vn3dqV2grM0KB4uU9oS9SJwcp3FVkap3f2JJTwHe87VS?= =?us-ascii?Q?+9o+q+AzmVCL9hTbW5fA/fjqWDptYFmS2vuwXUu+iM58kzT+HV8J06XYBZML?= =?us-ascii?Q?8CPXYL7KW7H8rkMcWLGDk53mDGm6imjJjCwmC10WiuA6LKorPIPhBiYzFJUy?= =?us-ascii?Q?3nMNSzVStEnq37jYB+QNfQL61pe3mQjxChUs8VCNDKmkWRBwbd6z9Gr8F8mi?= =?us-ascii?Q?5qQRSIEM4JxPGp4oKftGf9XZkItWldZG68Tpffqdl4Z8ZdnaBPXSG9rWrb8U?= =?us-ascii?Q?GOiQesdzlSMFfy4JfMDVDPeyRwjQNVCkNKK+goHSL3smg2CEILVKSe8fnviH?= =?us-ascii?Q?9hO79JBRXE+6gU1TZePwMqb/JlCJHuEnJsxACjJJMKfAX80rnhtTJVUK2x+E?= =?us-ascii?Q?hFXAoRoX4lcV6tDimQLQy/Wa7IJzOSCaT22rnNb6ifvR1v89gRpZvp/T5wB/?= =?us-ascii?Q?1qwF9lgmVgaHyG5pTSAZrw4PkeVfzKX5yfZwjBkk1qPVNNDqzA9wN6pdAsbp?= =?us-ascii?Q?RMMQVOW+zMTLVdjbDo84YxL5dsveLqW9x5A/D09vn453k1UK60UII4QmNjnd?= =?us-ascii?Q?w7SNw/83JO+0HQUSJFCf+cFpxFfOWrc8EN9UmgLpsSFOCAmgLHw8CKFch9Db?= =?us-ascii?Q?ODO9cxB+KecJmmOWJk1rB8b78fB4hPHRSwhAlaNMxREqV5lfmDdTwABmqAdp?= =?us-ascii?Q?EbjqQX/Vqc31Qj+GQc5WnQIxU4yWZRhVwi2G2ZDdTR3S//nWWHSyC5exGlQ5?= =?us-ascii?Q?qU7zry70AiLEEvYZMGDHSttceiBT2NWGwaiuYG0VzwHbunNNkRvZh1svH2uR?= =?us-ascii?Q?tBlPWhHA2BugKedlmboaFqVDvpLBjPtSgDZ35KoNAB9n37BP4lYT5hRcCG/7?= =?us-ascii?Q?4/ONDQK8gleCe4WKEFbaqXqeXm49l/PygyAc65T2OAIQymR2cbk+3Gd5jAAj?= =?us-ascii?Q?shijkKijDRPOMD197GvWFkarWkh0=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0701MB2071; 6:GD/YS3lpMjH5P7GzvoKRvnXOqzHfT7WrmzdD3Nt59o7qiSSRQ6gn0AmIPm4UniP5J4zdJb9lIm0q3+5RM/JnIDdurAxNCdlTFJ5tP8gf2Vl4UekNMYm4NX8XhQyjbfPp+6dzZIiPx9PwKEH4D0EsUvYoPZXIIBVJmgwjyqdGAxWpMmnuTonb7NQ7QQeq+dPdLLZlvtt+2tw1cuPxL065zXEs+SNpd11LMo50gC5JVBkjnZvtp/fiIkAnHmEneogqcD2DsW30NrlfrZLM32OiA3Fl8ClQEuxLGCPINo9/ZyVs4+M7+oXQeMNAc9/FSaRd8vIxIP29ppx3ApDY1oBzvg==; 5:LjozSPh8lCkFudvKJfoFIzZ3bcW0WdpVmCLjKDTV+SPunF9iCOcUmhoOsrqZNJKs4XwtMbLwkD1eqLR+mtLNtI4VCHwP8i30N8Z2ODu458cbg8U78GFrG5+JGdsYHI5aBPIuXEUMTpn/0l8iAm+pTg==; 24:EA0G06cNsYF5zZCLqe9NQIsCiXjegNY/CrHL0yKe7BMQGrfT51HKyPgzYlJ1MDEsMEfUe3MnOaZotoECuLxB4D/L+iKAvYGO4dgrxk3nnLg=; 7:+g3uitBckMvtSybZd77eP3R5EgtHTAlabpCN/YJXxNozI0/o/5xzsNWfM0H+5JFOMoQ62gGDhEQZdlcrY2PgPC28Y0UG4oz1HrhA0lxzPvF9KKhcPtnHS6uu4ZT4GuY1LJOK+fJFnP+TyKzQ4RVSvtWCFbRcw3eLWFdluKN4t+l79sB0qlqQT5QbPftn6xMPcVeAJE4lwAnf+JPmhk1PkY/pXMA2Zgs4ueKjq4hc+70= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2017 12:53:03.1370 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0701MB2071 Cc: Andre.Przywara@arm.com, julien.grall@arm.com, sstabellini@kernel.org, Manish Jaggi Subject: [Xen-devel] [PATCH v6 4/5] ARM: Update Formula to compute MADT size using new callbacks in gic_hw_operations 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 estimate_acpi_efi_size needs to be updated to provide correct size of hardware domains MADT, which now adds ITS information as well. This patch updates the formula to compute extra MADT size, as per GICv2/3 by calling gic_get_hwdom_extra_madt_size. Signed-off-by: Manish Jaggi Acked-by: Julien Grall max_vcpus - + sizeof(struct acpi_madt_generic_distributor); - if ( d->arch.vgic.version == GIC_V3 ) - madt_size += sizeof(struct acpi_madt_generic_redistributor) - * d->arch.vgic.nr_regions; + madt_size = gic_get_hwdom_madt_size(d); acpi_size += ROUNDUP(madt_size, 8); addr = acpi_os_get_root_pointer(); diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index cbe71a9..0123ea4 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -1012,6 +1012,11 @@ static int gicv2_iomem_deny_access(const struct domain *d) return iomem_deny_access(d, mfn, mfn + nr); } +static unsigned long gicv2_get_hwdom_extra_madt_size(const struct domain *d) +{ + return 0; +} + #ifdef CONFIG_ACPI static int gicv2_make_hwdom_madt(const struct domain *d, u32 offset) { @@ -1248,6 +1253,7 @@ const static struct gic_hw_operations gicv2_ops = { .read_apr = gicv2_read_apr, .make_hwdom_dt_node = gicv2_make_hwdom_dt_node, .make_hwdom_madt = gicv2_make_hwdom_madt, + .get_hwdom_extra_madt_size = gicv2_get_hwdom_extra_madt_size, .map_hwdom_extra_mappings = gicv2_map_hwdown_extra_mappings, .iomem_deny_access = gicv2_iomem_deny_access, .do_LPI = gicv2_do_LPI, diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 475e0d3..0289d1a 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1407,6 +1407,19 @@ static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset) return table_len; } +static unsigned long gicv3_get_hwdom_extra_madt_size(const struct domain *d) +{ + unsigned long size; + + size = sizeof(struct acpi_madt_generic_redistributor) + * d->arch.vgic.nr_regions; + + size += sizeof(struct acpi_madt_generic_translator) + * vgic_v3_its_count(d); + + return size; +} + static int __init gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header, const unsigned long end) @@ -1598,6 +1611,11 @@ static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset) { return 0; } + +static unsigned long gicv3_get_hwdom_extra_madt_size(const struct domain *d) +{ + return 0; +} #endif /* Set up the GIC */ @@ -1699,6 +1717,7 @@ static const struct gic_hw_operations gicv3_ops = { .secondary_init = gicv3_secondary_cpu_init, .make_hwdom_dt_node = gicv3_make_hwdom_dt_node, .make_hwdom_madt = gicv3_make_hwdom_madt, + .get_hwdom_extra_madt_size = gicv3_get_hwdom_extra_madt_size, .iomem_deny_access = gicv3_iomem_deny_access, .do_LPI = gicv3_do_LPI, }; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 6c803bf..3c7b6df 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -851,6 +851,18 @@ int gic_make_hwdom_madt(const struct domain *d, u32 offset) return gic_hw_ops->make_hwdom_madt(d, offset); } +unsigned long gic_get_hwdom_madt_size(const struct domain *d) +{ + unsigned long madt_size; + + madt_size = sizeof(struct acpi_table_madt) + + sizeof(struct acpi_madt_generic_interrupt) * d->max_vcpus + + sizeof(struct acpi_madt_generic_distributor) + + gic_hw_ops->get_hwdom_extra_madt_size(d); + + return madt_size; +} + int gic_iomem_deny_access(const struct domain *d) { return gic_hw_ops->iomem_deny_access(d); diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 6203dc5..0612706 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -365,6 +365,8 @@ struct gic_hw_operations { int (*make_hwdom_madt)(const struct domain *d, u32 offset); /* Map extra GIC MMIO, irqs and other hw stuffs to the hardware domain. */ int (*map_hwdom_extra_mappings)(struct domain *d); + /* Query the size of hardware domain madt table */ + unsigned long (*get_hwdom_extra_madt_size)(const struct domain *d); /* Deny access to GIC regions */ int (*iomem_deny_access)(const struct domain *d); /* Handle LPIs, which require special handling */ @@ -376,6 +378,7 @@ int gic_make_hwdom_dt_node(const struct domain *d, const struct dt_device_node *gic, void *fdt); int gic_make_hwdom_madt(const struct domain *d, u32 offset); +unsigned long gic_get_hwdom_madt_size(const struct domain *d); int gic_map_hwdom_extra_mappings(struct domain *d); int gic_iomem_deny_access(const struct domain *d);