From patchwork Tue Jan 17 17:42:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Sverdlin X-Patchwork-Id: 9521643 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 D4F9A6020B for ; Tue, 17 Jan 2017 17:43:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4A5A285B7 for ; Tue, 17 Jan 2017 17:43:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B932B285DB; Tue, 17 Jan 2017 17:43:03 +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=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1434D285C9 for ; Tue, 17 Jan 2017 17:43:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cTXme-0000qB-Ea; Tue, 17 Jan 2017 17:43:00 +0000 Received: from mail-he1eur01on0108.outbound.protection.outlook.com ([104.47.0.108] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cTXmZ-0000nD-Vy for linux-arm-kernel@lists.infradead.org; Tue, 17 Jan 2017 17:42:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tVB8q4lKZw16rmgYoQsMvDfYqqC5ZSEJB5gsd2zp1us=; b=Fw/Z+QLj/ktUpA5sLY/MWjmObTacwQxdaSOdR8QVqdyxtsdgsZ53ZWcoIcVSyYJOkMUoOrJDFR89qgp9H7n8hxvZIXVA49XX6PbvvHryvi7R+dlgEFRQ/H4Cj1SQJXq9REDIwLoGjUXzoCKCzYUrCP8rrVwMpL60GvjfD06pD3o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=alexander.sverdlin@nokia.com; Received: from ulegcpsvdell.emea.nsn-net.net (131.228.2.9) by DB5PR07MB1319.eurprd07.prod.outlook.com (10.164.42.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.860.6; Tue, 17 Jan 2017 17:42:19 +0000 From: Alexander Sverdlin To: Subject: [PATCH] ARM: LPAE: catch pending imprecise abort on unmask Date: Tue, 17 Jan 2017 18:42:10 +0100 Message-ID: <20170117174210.28122-1-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Originating-IP: [131.228.2.9] X-ClientProxiedBy: HE1PR09CA0090.eurprd09.prod.outlook.com (10.174.50.162) To DB5PR07MB1319.eurprd07.prod.outlook.com (10.164.42.13) X-MS-Office365-Filtering-Correlation-Id: 9f49be62-6fcc-46a1-8817-08d43f00300b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DB5PR07MB1319; X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1319; 3:XoNqIYne3NS04Nk4IuIlF8N91EjslibL802HZ/PSB2TINK5z5eO6YCUbu9EeVaaGWAcjhLMUQJwlbm444mCfAx6BFcj7a5caNcNvErbUKS5x9EjjmkmCw/iGCU+7pKDQSNOAmbmADsFL08Fck1KMzMJMvJODRN4lIOAGanQT7R6XEj5rfcRqNwvL4lyXCzmTLXFW9J9xmskdiPZ6Av5XSLOg0KOGU0fsYuFPpWLhknmvBga6Y0Mob8jZ/Q23hLCqeDJ85kKggUW25q8yMZ88dQ==; 25:suWlUT8GD0a85v+4LgHTHh0iMl7WP3a4Td938r5aqFrVPnqMDSeNm95IZzmEf2mn1Erf7VMqLP5cm+vLxDJEC6WXug1D/wP03ojvvZl9EvaLIoA8dlFXaHijb93dN/zJyS49cFbvWGz413ZXzJSmlXbEgPeWwVwGfcZLBVcRbUz7wTGLww0V9UEZOWkunbcHS5gY0q38ut7iMGPRX6xbItpQH02TG5mUpJ7+A7av+s5uSD6E6OFW4TAfcbjx8DtLNAMT0W4u1NbpdWszYaXy3RAFA3v54kbgSLWw39fTj95T7JqaY8djwcURwoq7vzXhG4rvI326EEuZT2buj9S7JO1fBN6TfFkO5O15vxOJUbxc375pIkS+/W5BdhvGAT7IFKvArvLZzM6WH0CInFUlG6llN14WlHHqA2RtTFUtjxNULZT6sQDfl6BfQhSClPHMWcBzyngG9nwQw4jK5Gr/2w== X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1319; 31:HAf7Ob6/exsb9ZqVQNX+fz/zLURqjxMfsFa2IUmHB83el8GjwxJoMbNyf5nGBt1/Q0dwr93DJ5BUW1TwVn3zF4uodaWSq+9D8we4MyedIYCb9rFXvzHZiKoFIHQbdMEKVzib3d09CJzuovWKm3XYzwtZDgqiwa1eRSPnbpwb9BQgaPXNa1WdNO2rNz3mScNNr8dk5uuJCylW/VWE0Aivv1wiyRHdmRb1oZT5CMuaeBz90Gs7mmBwLjTg6S/PtOPx; 20:s9y/Hx0Ph+tMKuAnl/jlJhRUubhmzSOSnUY6PCU9AJp4oYHFmHYSeM5pnZd31MqtY9PtWfI/9EB3SicJB4ugkiElNm7yCX7kiLl/lSE8YxbTtUqSkDNnx/zXUin3xwcCR6NIPbymFHSZ29SQfE0EIvv0fApLr7OJWz3xkqLWQuyBu3LbtZ7wAfVv5B3FyRdejgbZGc8x8M9rxJdlYUiDvqtpft9cpXG4vfrSrOViLZNQo2/sE1yPS3S1nj766iJ/Ln182L6L/Djt+e+9jSi61Dj2aZDmCUqg3alc8Tlk+CfrcU6l/VeSetpIxihzdAeghZxkClewXZojU3AWDVgYZLd1W/uaM8c5TE03HUV28mPhSPShggkM7kefQHjETwTHLIUIal+lnludk0bZ73/Gq7IZbE8dv606XzIrhLWl8ywMv314MdurQC7IgymzM4L59kPlfEjM3aLsVgR1otS+SPY/y1mbSNCpAw8vvlrU4H5aAmaVs5L/7qujGkV4oSU1b6QYKnz7CVdJ6FJiWMi/NxgAgl4dE03CW26Jd6VJG4v9+vsP0UO+MJFKdS0EVJMHxOAMfKZTu86bp+vRyy/g43MDHwZTOPH+g0wJU9nBbhg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(82608151540597)(258649278758335); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148); SRVR:DB5PR07MB1319; BCL:0; PCL:0; RULEID:; SRVR:DB5PR07MB1319; X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1319; 4:BQ6gqz+poK7nWXpWZGHj/CLsWriFiDGD0vZjZ0T1zmUGeVR5ODX29fV4jVCWWCYESz54JPjdxsRCYLqwtRFgfj9H2zSsBxUPTm3W2EHs2ONZNRXTkN3Q/SpT9rqiI8T/OYzBel9AAgrm+EPuj+0Q050XPp2vP9Rq4jGS5sQ2nal8EhGvPs0p+nMJVPQ41cOqtU/qKSrBGsw1nFhGyta5mFZnuU9jm78FMOVKm6DzW3F53wPWo6O41SvXUv+vTQXqvfPrizHlWiwSe0vjn9xKuqmXo31nP3KY9mlQ5QaDntpvEqqGnKaL4eEKjt6VfP+q77V6QsybOl/P/u1tL9MUIu4A14kdE1lLvTpTjVxG7qsMWap6Ssg195LkWTGgAQ4NnQu+Xn5Xy1Etu+87EYxDi93Kcap8O+4DfQNs8RigUkzlPG1T/gVottzVCrMerGnHpv/lvxogDQfEqMNq6YPoGkSvrys07iyfLmk296xmMWvz7Y7Ce3+xdzH/qXz5MN+1Ug5rEm7NbCFwuzLyhrwUjE0epxcdW2X+/B9EgcgLBcQDwByrlc7xH8SPsQm+jV51KIzmUlSo5XutV5iTmB7FK5fY/WNOKZBh1lLlKWhytsLazQ8a5k9Dc7qi6pEL+vBPDeqdOfH+f/9XLpQqU1cRHOP/3RLijSUvalP0n7VCncI= X-Forefront-PRVS: 01901B3451 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(39410400002)(39850400002)(39860400002)(39450400003)(39840400002)(189002)(199003)(36756003)(189998001)(6666003)(305945005)(7736002)(110136003)(97736004)(86362001)(50986999)(33646002)(101416001)(6512007)(6486002)(6506006)(105586002)(2906002)(8676002)(81166006)(106356001)(109986004)(42186005)(48376002)(1671002)(38730400001)(50226002)(92566002)(66066001)(25786008)(50466002)(68736007)(81156014)(54906002)(1076002)(5660300001)(5003940100001)(3846002)(47776003)(4326007)(6116002)(266003); DIR:OUT; SFP:1102; SCL:1; SRVR:DB5PR07MB1319; H:ulegcpsvdell.emea.nsn-net.net; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nokia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB5PR07MB1319; 23:p+sWIqACRt+YwksFiEYnDxgPyKSJoob3SLBcBOYcD?= =?us-ascii?Q?WZrHEy0jAyG/KaU/J0VPme5+WA5W+ddYVgT7eGNQPu39x3Cjyvka9q4PzbI5?= =?us-ascii?Q?5XwhELrc5jZIq1j1B+UIHIwYMaW9br9DaBikOcLN8A+7ql9bkwlUt6b4hEga?= =?us-ascii?Q?mquRpHE8oPJO7Im97IuLl4hLloWV0b4CXZAGkFdC4jLv0ws/nSY9If84tAcM?= =?us-ascii?Q?J7MFdfyUiAo2S/GATdmR3xjJfIE+MKveDpLBrf7ifoanN8TCyqcGHO7JB2vl?= =?us-ascii?Q?U7nLT9PV6hu0Jn5KvGfKYFK+Hn0+/l9X15gikin5P8o9Fv5o+b/29CwG215U?= =?us-ascii?Q?k838jNgs8fc3sJDCHOp6MJHk0P7kmJ2SuBMTXi6ltkXtGHgHJcA2o7Ar4pnw?= =?us-ascii?Q?kOZjXzEVsS5BG/O1C7trIcTv1SB8D23RywO43MZ9KNm/QG8yvwKXli3zXTm/?= =?us-ascii?Q?m+BUJqfs43ZwfXYz0qjo12pqguoFQkY5N4nGQvikzEtXOHbln7gYwLm6Ldzy?= =?us-ascii?Q?QilwMBJzYBTSC/nM1Cb0V5+fNZEMxwAmzEMgWkxcjDM4FcNuKvFzDL+DEE8f?= =?us-ascii?Q?rkS8b8+bD5Lvydgjd2Oph8m/AKbRTadweRo6jNRXRB1ctogu/iKPeXjnUDOv?= =?us-ascii?Q?uQfuGz11CzYgqSkML/rjNoiOWcdHgSaH5NLWHkYqr2m2iFEZ4mRXzImK4Q8T?= =?us-ascii?Q?w//k+uLAa5zpTcSbJbxe6RY2WGydsSuAWI+fwmghzjw68zgZTjITNvJs6/KY?= =?us-ascii?Q?ZupyCRqTxMFEJqsqrA8oGtLfx8Pq4Zzx7790rC78//fVeYBEISZhaKXkSbet?= =?us-ascii?Q?/9WztLpla6/7IbUC95VAIhLTjzFBrxHi4tPvagc2mOIpjIpqxCEZWl8Bpuod?= =?us-ascii?Q?TvebGbS8oHOAGflrIl7Dm/Indwof/Y4zXg9zFawQeXq1wEWHsMJ7X/M1Mbu8?= =?us-ascii?Q?FU5FiGf5bMjcO7i9DxTjt18ITZAbghS34RFFY7L83iJu7nTRDu0iouBeW5zT?= =?us-ascii?Q?b7LkGYRbvOKRwqdYDqTPiDGf76azrj5sAtaLuDK4Kkc2rkKGgZPYyv2DVKAh?= =?us-ascii?Q?f3uIE7BsFCo5JqIpqbwOXukYC0VOU436vfXs6v/u3v+8TUzETCVnuuOJIDVf?= =?us-ascii?Q?8wLqfRORTlgFogjmYt0AjGZZincp0mQKBCxble4y20Cs9au3IKZjcbf/po3x?= =?us-ascii?Q?iawTuioVm1wYav0R0A8zFGOX56aHe3zJRxU?= X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1319; 6:pCYi5BUvuaxvMwDYqRR/urwRFQ3Y7VAN9sXumlf82WLmLZB961Ew/pf3GG8QQG8wl267Do57l9KTUI/fXG6X/gPyCXC0ntbEijIWQo0OkovxHsydP+hC7RIHKcliz1GIBVYOrx9cAU4OdewhKI157aAdWvIGEqatr0WmtIU7cAfPDIBdXQG8gJkkkyAESwHXgWTTi1IS21QwNDu+jCq0NIWsj7HG498REArv2KEdEQI6VTOVP0c+KelaCg/P0BdUUCx1omeblLELcU+bJBjtZYTtd6fvYiQpGWJ97QEzsyinYCcIfPCK9NGvILXMEvQtN0hSzyV1C4vNOD/lHMfB67SAiVYSaY/d2BPLNJACYrNaVtLFhRpzyFKGBPnIEN2SdNyEn2IegDlCXEMG/8KUBOckRiDv06I7VIs/sN/qOO7G//qLsQ1w7Y1wT9WHk1nWHRpBcyg32hrN2Ue2agsDLw==; 5:jsDoQLQRR1qH0EFtGSB/mx+QyVK3y9RKSS6FYcE7gcV9+L91OfEuPJmrVVsgU6C5atCwX659jWe2GVobLlv798slUKRzAm9aW1p5HYUge+uACHNGSrUltwAhZ8x5P4lX0Da+8PRAh6cjJbAwt1PwSw==; 24:ssNMZYLIEJ+k/dZaklCSfHH2PqErcfNU8o7oxsaGPANQsDnxVCaT9omHBthm79c+vmvppAwhoR91qhgiwhU1yD8Ww1PxwGPSfxeiLDJFe+4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB5PR07MB1319; 7:mT6c+K8Twn9eqlClzx/DQ7xbiMBcHIEieLiPgvUNIDjhTRZu3710+26HSMqmfELawDwMf91l4Y5J3heH/bvwAiDTg3YqK+iTedmTag6ldSlm9GgRssp5hAu8s9bQQix7WaTm7+QSDopJ7wJT8yFJvaQ/7v0PtfXtiKag6+9H1PhedWwEnDOdCbBkp7KnaLTnDPnxepJhaUeuUnqE+VQay/ZMyxBQQ0JVN3uLxi/TGdGJ9WY4yFt3EN3+baHToOj+v4RapoNuwz0PNxbAycu3RRdcmrr+LVHfmkqduavE8lFAXXgfqn4S/Sf1s3UjFp77MCJsRnEIKS1VqziIi/XRe75C91iIYdw4WtcrvexkJ+/tuqEXQ3IYynoNSj1ciYAxkcspYQxJ8GEyDHb3vmEc+CX60P4f5F/q7JvgMIVlJ4HlqzTUXzDsrUEDtBgkspcCjqqNI1WttO4mdynCD7+IEQ== X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2017 17:42:19.9740 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR07MB1319 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170117_094256_605244_0AA5D532 X-CRM114-Status: UNSURE ( 8.86 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Morton , Alexander Sverdlin , Russell King , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Asynchronous external abort is coded differently in DFSR with LPAE enabled. Fixes: 9254970c "ARM: 8447/1: catch pending imprecise abort on unmask". Signed-off-by: Alexander Sverdlin Cc: Russell King Cc: Andrew Morton Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/mm/fault.c | 4 ++-- arch/arm/mm/fault.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 3a2e678b8d30..0122ad1a6027 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -610,9 +610,9 @@ static int __init early_abort_handler(unsigned long addr, unsigned int fsr, void __init early_abt_enable(void) { - fsr_info[22].fn = early_abort_handler; + fsr_info[FSR_FS_AEA].fn = early_abort_handler; local_abt_enable(); - fsr_info[22].fn = do_bad; + fsr_info[FSR_FS_AEA].fn = do_bad; } #ifndef CONFIG_ARM_LPAE diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h index 67532f242271..afc1f84e763b 100644 --- a/arch/arm/mm/fault.h +++ b/arch/arm/mm/fault.h @@ -11,11 +11,15 @@ #define FSR_FS5_0 (0x3f) #ifdef CONFIG_ARM_LPAE +#define FSR_FS_AEA 17 + static inline int fsr_fs(unsigned int fsr) { return fsr & FSR_FS5_0; } #else +#define FSR_FS_AEA 22 + static inline int fsr_fs(unsigned int fsr) { return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6;