From patchwork Fri Mar 31 13:07:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Chen X-Patchwork-Id: 9656375 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 89BFB60351 for ; Fri, 31 Mar 2017 13:11:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A35827F93 for ; Fri, 31 Mar 2017 13:11:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F27828669; Fri, 31 Mar 2017 13:11:13 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,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 F138627F93 for ; Fri, 31 Mar 2017 13:11:12 +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 1ctwIL-0008Bu-GF; Fri, 31 Mar 2017 13:08:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ctwIK-0008AS-3y for xen-devel@lists.xen.org; Fri, 31 Mar 2017 13:08:48 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 90/E3-06437-FD45ED85; Fri, 31 Mar 2017 13:08:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA1VSbUhTYRT2vbubV/PKdbM8Wxm1GGg10zQSgpR S6Rspf5hIdZfXbbhN2Z0y6UcTP0Ir0BLNVRpqiCV9mKVhmElqCloaWeZHpUkiZilaqDG61zvN 3l/Pc57nfc45cAiR1CFWEIzVwphNtEEpccf9klx2qodjhmMDHa2bQiunK/BwdKC1cRGLRnFiv UmTbD0j1lV0PJSk/FpnrbreJ7EhuywPuRM4ZRPBaFMV4omUKsagqrDdVSDtGFRfyhbxBFG9CB pbS0SC0oQg49srJynAIGeimyNuHClDUPwjhMcSajNcLsjAeexN+cLdvBuuPBZRmQjuzUfxWEY dh4HSm0t1nFJBW8eIhMckFQZ17xoRj4HaCP3duUv5bly9t6scE3rthXnbU1fB7wUdJV9xIR/g xfi4cx5fKB7scubIoa//DecnOLwFOrOOCeW3OOTmKPhdgKoTw3TXVaf/KJQXV7oKuBTB1H1/w fQah5mRRVwQaiQwWBfOY09KCvWfn2GCqQGDK93Pnb9TYCzX4fywB3qKyiSC6YIIijJnJflIbV +1hX3VFrcQdgf5sYw5jTGrg4IDNGa9Vmcx0nqDOigwOMDIsCytZQy0hg04m2ysRdwtuHCvAT2 pP9iC5ASmXEv+Hh2KlXpqkhPSdTSrO21ONTBsC9pAEEogF04Mx0q9zIyWsSbqDdxBLctAeCi9 yWjupKQkm0IbWb1WkDqRmnDMNE9iUtyUbGIUPuQUn0HxJl2qaSVi+Sx7ka9CRiJuKKlHCmM26 i3/6xPIh0BKGTnAp3joTZaVThPcEBg3ROjcED+Ehf4nKWzIoyzopEG1/1zYtWhflwztrkm3aP XjKOspt8z27faY/EG/6uyE6nTr+k+3axzD8Uoi67z8e5kq/uKRQ9sWHuEf/EnZ7o8tSYk7+n+ O6L/MVcrFY+8TIysOl9DVWTTRzMbZhmqbZ1wimrwaxGsiX/5RJU4/2DdkD2lL6wmX+8xGFCpx VkcHbRWZWfovRUN9sJEDAAA= X-Env-Sender: Wei.Chen@arm.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1490965726!35126294!1 X-Originating-IP: [40.107.0.50] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39123 invoked from network); 31 Mar 2017 13:08:46 -0000 Received: from mail-eopbgr00050.outbound.protection.outlook.com (HELO EUR02-AM5-obe.outbound.protection.outlook.com) (40.107.0.50) by server-4.tower-31.messagelabs.com with AES256-SHA256 encrypted SMTP; 31 Mar 2017 13:08:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=sfsKf03z9aHLHQDfXQadi/hs6sCF3LpaQlz95ZZppNA=; b=cDFJNXceRpIDOlg6ce0YmMeOvwlfCBAVQlNHxTsWcou466a2EWcrPkexdlyYhvZPj+uCDjpFrQj6pOWMr14k42EPFwjglOyWXctQmugH1b3RwrGGMbjxCuAlGxEC3F4vny0LWxZRiwmvYtnSv+GjdfCdG9LvnoW27fjWKga/QAY= Received: from DB3PR08CA0027.eurprd08.prod.outlook.com (10.161.51.165) by HE1PR0801MB1676.eurprd08.prod.outlook.com (10.168.149.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Fri, 31 Mar 2017 13:08:44 +0000 Received: from DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::203) by DB3PR08CA0027.outlook.office365.com (2a01:111:e400:503c::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Fri, 31 Mar 2017 13:08:44 +0000 Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 217.140.96.140 as permitted sender) receiver=protection.outlook.com; client-ip=217.140.96.140; helo=nebula.arm.com; Received: from nebula.arm.com (217.140.96.140) by DB5EUR03FT012.mail.protection.outlook.com (10.152.20.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1005.5 via Frontend Transport; Fri, 31 Mar 2017 13:08:44 +0000 Received: from P300.p300.shanghai.arm.com (10.1.2.79) by mail.arm.com (10.1.106.66) with Microsoft SMTP Server id 14.3.294.0; Fri, 31 Mar 2017 14:08:30 +0100 From: Wei Chen To: Date: Fri, 31 Mar 2017 21:07:51 +0800 Message-ID: <1490965679-619-12-git-send-email-Wei.Chen@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490965679-619-1-git-send-email-Wei.Chen@arm.com> References: <1490965679-619-1-git-send-email-Wei.Chen@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:217.140.96.140; IPV:CAL; SCL:-1; CTRY:GB; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39450400003)(39860400002)(39840400002)(39410400002)(39400400002)(39850400002)(2980300002)(438002)(189002)(199003)(110136004)(4326008)(38730400002)(104016004)(47776003)(6666003)(48376002)(36756003)(2351001)(54906002)(76176999)(50986999)(77096006)(8676002)(189998001)(50226002)(8936002)(5660300001)(6916009)(2906002)(2950100002)(356003)(5003940100001)(86362001)(305945005)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0801MB1676; H:nebula.arm.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR03FT012; 1:w+xaoSKwh0fsfkdXjsIfT5FR1IfdPfhuSZ1BWPKes0cfLVQcQTDMPnRIWooxPOVwvKyJ93RWwL10wNrBsysnUv3V5ij4am2hnOG1nhaP26OSlCs2mu3RK564cZJOU5pVmTK0WzFfFc04sN4h9ZnfSmwje7sVGGO/9UYM76J9uNOlgOotz5VZhKQlJZJsFK5u/rUoZXJhq5ksOufwmZArDg0HZwbXEYtPYpqkUk7Xk8yccb2YvjpM7fok/qT/bKUiL9/VH7J892Klwf7dAlJ7CCkxkdncMHRIW+irvgTs1efmQiIGUT8oRn3ZaQFnpt/yARxZUz4+Q8qE4rPkIbFXWDkvEFmjfIrnIL5prlcIkIlx/vobN4EfVzUmsa6TAO8iRsLC8dUVTxY3vgxQ/WW46OzyVq37CjgcADEnkLD4RGSfrZQQtGsRDqhtuEZXe2CutwOnt9pO+QzUHk3VoUigJY3lO/r5a+13tKmyscuNNpXo3/Tw4y+6eznCZJkNjq2/oZX+KbNt1fVkpxvP86DX+Dfh+xF3DWS9dl6lfJjIbglJyViJtfHJmcY6TNlXhIX2g1Pmn17tAAWrB3UyeTsIcwb5+x0OTolPtv5GF3uu1E8zTbHFzx2R0WGwUn3yu9O1 X-MS-Office365-Filtering-Correlation-Id: 2e3976b2-a2fa-4292-e965-08d478370f79 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:HE1PR0801MB1676; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1676; 3:K/nq/NBwtAHPEzqK5Xuu8z2iLe6xJ+DfjpE1WsgEG6MCVju+Nne5QelSOxURxG8bVxIHDOiD1wKltK7lK0yowiYJ3QNGtyjvKHgNrtkD2KnMgrpm5DkjBYUMJ1G61d3zJ4MRiKdMAyOFMna4BwFIH/k/uYP8OcMf5gX/6+H7zhEs5FjRECsNXuunGt1l6ltW559A4XHBCn8PBTZ3cN472vtj1suZm4Cab0BUcEXo3uVcOVFB0cXXtGK2rLh/2jILA5V2tMM6fygnuMYIxUGO4C92ZZJgkRK5riOf9sj7d5tyfKwTc17XpbrEg1/jJELYgtw0PagrLfTX3o5V8WQ8FjbcLZ96rzUAEMVHxq36hYoX8Afy/r9raDmXZZplkyB0Df6v5poY+NChQOz1br2Ly/izXXr1hGZb6y6tJvUg0HgrRSPqR5EYlup3bqRmfSMIS0nWJjLqh7aAjJ+TQ8tr1qyJTAXVmqACM2hUqKYm1r53YzvcRu0+WuY5KYaAys4k3GwN2QDrcaParuPzXceLuw== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1676; 25:SDDBpHWnNYe4Y3hqNlgx1g/bocMVqMRYInGsqX/WgzdE/q7k5sCujsOfeR6irEo2BYVOaM69XBEgngpZPQIyUY+BwdW7swMBxj2jBSOBg+gjdbMvAACo6bNkpadWlJoWTLKpJpXmKcjfDyPGY2bGZNMCsiDhi5B+04FK8nMeCjYAeZNkUpfcMAjVql2ELdgfQ4jZM+uI03NCGIbis44j2/btynVzhlnzbCHhZ84PJCPJuKg9+KDXp8bD8CeAZS45Y2BiiD3bEw86Y4C3H7uzcf00AmV1r3zr6t/4vg7OTE/2r+uEeOzEkf32OHHyXGaAcfBaDDwQH14Mg8iA3CI/JtI37VaXOzHLeLORRONuhHM8rimVd0E14K1IkXktw+XKF/CHblXMIZ6NkYzGg1fm+V0MLKN0ubD3v64vBFEIto0/PA0UHP8xuzgOnOWapDvqRO85MwtLAlfaV/LM9HL9vA==; 31:KhFBc+p0pJweBP6TWSmF1G7+Inl/56Txn+ZAFG1ePWStmmj0t27ZrU2CaEjij0s0cydOzh2+7xxSMyHtHyntRB103rJ6qDXAovRJkwQ6q659RufuW7gb7HPnK4r1Pd4x0LeUqiJPVpAZ711cr2ExaHxw1urhTRIRC/X425A3TxVXQnfQz/iQRFRYWifbyQFd6duptY0o/4hjRVO9jwIoP38u7kFoHVzA/979MEjEdQSCXwl1uNp569KugVSZqsQ19f92H51D0jxEo/toKLluPw== NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1676; 20:LvHrjJqwrB23sj3u4LijFWag5+7RzbUc/X7wvWWv3fgbo9xBC9HrUFhwxzpxKEaO7BuOd/T43MQfSiLlx8HMssjNybdhLThwF50884OKVNkDsxpQV5zZ3PvBZ0zmIucl6nAvyK9IK0f4L71dCNan9WJJ02phDKmFDY1jq6cOzyRCOj1lkf5HpOjN5TgpjLIQ/2H6FYdBguuBIKspFl9BaHg7OXzUzgxTw0prU6dXcqMtjsiUbmBdnfJ2qHC8/Fu/ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13020025)(13023025)(13024025)(8121501046)(5005006)(13013025)(3002001)(10201501046)(93006095)(93004095)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(20161123555025)(20161123564025)(20161123562025)(6072148); SRVR:HE1PR0801MB1676; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1676; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1676; 4:kJWeOLZ9J86/sHMJldsUoyckuwYM36lihDEY8VIz5GmvBWyGKykZdtD4M46e7ZZ7zOTvFP7AgICOfGAPAaNZB3tDqEbKfq6MK6XcfUrDwq0fapm4kEZne6jrb0q8N8Hz018cpGb3g5kfS0cfMNwSuFD+zlvxR1MMeFSdaauC89tRfQNiIRy5v3OHcCB4IMtb4cF0tuLLgBubqMdZ64JEl5NDbMMRb58lrWedniksoqc8uQxZyPoN3RQeHHNHp+ODvf8nqedCfM8YQVsftQo3zIeBkQZstxZvNAP04Rt/5uwwtQEAWJ/pJ2x872cGQH6ztI647VheCnFGEfuD1eJMbw8nfnDRZBg50U7UAHffAjCqa0u6PJ6jYM33QiiLvaKA2xIf62mQrw34dLbW/Mzn8+KQ0iCq+6lHmthqN7KH/opXxsL7HujxUJAzoH7CgLaWI6DK/LNPn9ceiqVVnJAyVv16dKjA8qR6ExWmXakJw6XdRHXgcL1+J9QjETPe9OneLH0DarefJCXgQGr4TYH2ZzFGLrO3O6mtXmyNIhABRD+Pol3G59YR2frimgYBFZqtF/NwVqLcF/UEGlTAmsHcRlE49QH1AS+Z+ISx2k/hnYpNGebK00Dk8JB3bzDmY+NhpSFCGO6VyXIlzv64tT0dbsIpbc7WTZJkWZc9jft7JZVSU+5DI6aoMXrpL3GcvnxW3Fi/if9j/6uFC4FmBQ65Ce76+zmgiQwJsIA7KTqNbV71HlJxGmQUq8v+9W0Se6jaousS6O8F9vCliTTCAPy2iXAIJR92YK+Qh4zaeVKrCLuqnxPQhwrP41IwPqVrG5pDfUIFErD3JdvyLvPgG+mC919ydGvCVdSEaEFs8Q5Sma8= X-Forefront-PRVS: 02638D901B X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1676; 23:eaNtFwRoMlSsTwP770GmK/qIkyKb59HU6Xdx6nmk0pfCSEFLNbRwZrAA9e276z/7QKHVSbxasVIuqJa8NmN1u5WG3lTaHONvmCJOG8VRWVqPgYttRSFqbXtanuRK7YORSBzb0AwOKKbBiQg6Wp3R+zLItQkTVACCZlLGtSqzG3yqtwFGI3Kav4rVQoNEV+IlFDPF4ZAkQjtq8HA0X1hS9vlYYeH3nwhPgTB1t4EldMvYysDORpVg0z3d3qBnnYTOk6MprfEaNGHPmFT4+xIXIEJ9dnVyHq36OKT8vFvp+HeZDkZBJO1/sT5OvDrfbPcsOWHvxgEJc7NQ/M0uqoXuCihVvcDI64n8Gaf6TPT3N7DTHXkAiiKdhgzd6FTIxyaa85xpfJq8b9x8GQerHcTtmdyb3Hew6OSyJN1FAXXHOzOK35skXfJkjXQsT+T4T9a8D1h+g9oEjFTHfGnmnSiR6MAK51ivCYOw9YeESxceAb3ov7DiHQ+v7+5Wou1Kz2KjdIGSWHUp0/IfaXCqGHBVTwV78giVmcFMgMG9Q7aG6nBDtrM3yNo0Oua35uh8fstZKoQuEVolpLy6ptQShN2ox5CktyRanphG91eFsKn6N1clkD0a8h8xTCh88n/IDwTOumLH3y+OYySrWaxhWLkFWVcg5579Qmf2mLPhmY7SteKKOWoVtqfEB8RjKQrx8PIS6Wur0WJr21ffhbMM6m25sG9xnruJwvOBYRl9lbJf7ccwXycVjj+4BxHqsGR64R2V+mv2WJ9S6zWeHpnewhuTgFwkO2iYSmRhOR3DePYDjZwCpsZwXBGGelc5kiY+RXw+hMQDaDZDuKTJ0//i4obNyNQ53N1yjaWf2nd3oFhdjh/4eCNdEqrQ4YsJusP3Z2yZ4sRJVDcoDqF4HN9AN7ZU4TpxLw3pmJ2z33ow097i791pyQQjuJDVkJfqwHmmkjjX X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1676; 6:ts1U6x5bsHmLa5pcF5ER9ILruJ+i3ecdZ/9jbeIbRtVn/TVl2Rlm5d3Bx49zFLQlwNsg5EmH/VbIQMgphLb8oIXxPA9rJpSVwkfcdsHE9RfooYGi6BPzT7YToolf7DlZsfSNgpqpk1cUp2d9Wvj9uIxGT+nPRRB7iufUrHeT7sHdXe4ndYpQzjSw2mwvl8doCcQ1O1NalqG26riDJffxbzK66e5OxuIzJDAQ/Yi1/6JihYTFEdADCXR+8eLEgj56XnI5XzLYLxwfLsCRP1gR9fHTikTALpeeRVazF2sQW8Uavtl2S6w03sGPd3tblEL4YC+X9bZdZeS/cpxHjsvoLTBy5zNxhOU04l/EQJmTf/BYFFcip+p3Mj9NSqcJNpD5H4CSsaXg4h9hQAz9d2aZrR66YwbDUpPFcjhn6/iE/HI=; 5:6EwXdbvZABEa3egr4hdUb/4K3Ix8+BpuxPjidgUWoMc1Hh8qqSuCj+pl0KT/FNi2gIQQEAJ+YNdBrJEHbPSdkvzRe44MD1YI76V5uQJwHNLF7FZXUfwsVbD0O+3XrbXKwgNgolJbTTmOTCMgQH8CsZ3WECbyzVJ9XT/jwqTDdOc=; 24:mixi88vKWKgprYmFhNZyaLBuKTZd0ZRPh04RK5e7JH7N8Pj3demMiGWgfqnpj9+Livsp5MQQrieZLC78S3cZctgfuJNpArqSzNBhq44JqUw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1676; 7:ZX8ntD3XRlfuECdmZN2UwZK1zKf0sy/Nr9+/YwbUAbbbuDmcBEh0IfoFQ+v+THyHXLC+yC3WAuDDlCk6toTPmq46QqHCOdukMxAR6Znhz7uL0hlTLVg19QkkM7xHFTSC4uYVbGSs/0nR6OIroyPO9Qv9ZY6lYeOf64iIIsw4CWCW+7ZUmoxOp5KirnG1SrAOrdK0D4KJWvg79JGj+OT1gc+QpeuRnUqVfK+3JUVUv7zd8+5fI9vSq6aIJjYfaYoBztH1Iubv5aLw+qEbyTMPEnxYuq6Bul8p/F1MmSXxUHTqMrdRhNna6xvXVgBQUAjM4aEWJmoD128+dK69Xpw01w== X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2017 13:08:44.1764 (UTC) X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[217.140.96.140]; Helo=[nebula.arm.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1676 Cc: sstabellini@kernel.org, wei.chen@arm.com, steve.capper@arm.com, Kaly.Xin@arm.com, julien.grall@arm.com, nd@arm.com Subject: [Xen-devel] [PATCH v3 11/19] xen/arm: Move macro VABORT_GEN_BY_GUEST to common header 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 We want to move part of SErrors checking code from hyp_error assembly code to a function. This new function will use this macro to distinguish the guest SErrors from hypervisor SErrors. So we have to move this macro to common header. The VABORT_GEN_BY_GUEST macro uses the symbols abort_guest_exit_start and abort_guest_exit_end. After we move this macro to a common header, we need to make sure that the two symbols are visible to other source files. Currently, they are declared .global in arm32/entry.S, but not arm64/entry.S. Fix that. Signed-off-by: Wei Chen Reviewed-by: Stefano Stabellini --- v2->v3: 1. Modify the commit message as Stefano's suggestion. 2. Add Stefano's Reveiewed-by tag --- xen/arch/arm/arm64/entry.S | 2 ++ xen/include/asm-arm/arm32/processor.h | 10 ---------- xen/include/asm-arm/processor.h | 10 ++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 4baa3cb..113e1c3 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -380,10 +380,12 @@ check_pending_vserror: * exception handler, and the elr_el2 will be set to * abort_guest_exit_start or abort_guest_exit_end. */ + .global abort_guest_exit_start abort_guest_exit_start: isb + .global abort_guest_exit_end abort_guest_exit_end: /* Mask PSTATE asynchronous abort bit, close the checking window. */ msr daifset, #4 diff --git a/xen/include/asm-arm/arm32/processor.h b/xen/include/asm-arm/arm32/processor.h index f6d5df3..68cc821 100644 --- a/xen/include/asm-arm/arm32/processor.h +++ b/xen/include/asm-arm/arm32/processor.h @@ -56,16 +56,6 @@ struct cpu_user_regs uint32_t pad1; /* Doubleword-align the user half of the frame */ }; -/* Functions for pending virtual abort checking window. */ -void abort_guest_exit_start(void); -void abort_guest_exit_end(void); - -#define VABORT_GEN_BY_GUEST(r) \ -( \ - ( (unsigned long)abort_guest_exit_start == (r)->pc ) || \ - ( (unsigned long)abort_guest_exit_end == (r)->pc ) \ -) - #endif /* Layout as used in assembly, with src/dest registers mixed in */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index d7b0711..163c39c 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -711,6 +711,16 @@ void do_trap_guest_error(struct cpu_user_regs *regs); register_t get_default_hcr_flags(void); +/* Functions for pending virtual abort checking window. */ +void abort_guest_exit_start(void); +void abort_guest_exit_end(void); + +#define VABORT_GEN_BY_GUEST(r) \ +( \ + ( (unsigned long)abort_guest_exit_start == (r)->pc ) || \ + ( (unsigned long)abort_guest_exit_end == (r)->pc ) \ +) + #endif /* __ASSEMBLY__ */ #endif /* __ASM_ARM_PROCESSOR_H */ /*