From patchwork Mon May 16 12:54:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Evans X-Patchwork-Id: 9102861 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7624BF29F for ; Mon, 16 May 2016 12:57:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD93F2025A for ; Mon, 16 May 2016 12:57:15 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0A24820122 for ; Mon, 16 May 2016 12:57:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b2I3r-0004cK-SF; Mon, 16 May 2016 12:55:51 +0000 Received: from eu-smtp-delivery-143.mimecast.com ([146.101.78.143]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b2I3T-0002uv-TE for linux-arm-kernel@lists.infradead.org; Mon, 16 May 2016 12:55:32 +0000 Received: from emea01-db3-obe.outbound.protection.outlook.com (mail-db3lrp0078.outbound.protection.outlook.com [213.199.154.78]) (Using TLS) by eu-smtp-1.mimecast.com with ESMTP id uk-mta-65-aZ_D97m3TriaPPWXikiW4w-1; Mon, 16 May 2016 13:55:02 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=MXINHNcg317VyeAdPxfQYZm4/yBxMZxOx5s+8dezv8U=; b=TAsebZbK6HkC/X2zz8tLET7GK4qz7Xl6AWOsdDlPv5UcR57SaF2eyRen2DJIb0jNzp13CoiuPNiFbELM0tcYhOrxApdgqNCrlDN3j9/zJJciGdyoj4IXOYBKGnJp0cOp4Oua7PG7M5k62HmIZkFYlwRnjOVRgOyRM1omsITvCSo= Received: from [10.1.193.119] (217.140.96.140) by AM4PR08MB1057.eurprd08.prod.outlook.com (10.166.134.24) with Microsoft SMTP Server (TLS) id 15.1.497.12; Mon, 16 May 2016 12:55:01 +0000 To: , From: Matt Evans Subject: [PATCH] kvm: arm64: Fix EC field in inject_abt64 Message-ID: <5739C320.6010602@arm.com> Date: Mon, 16 May 2016 13:54:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 X-Originating-IP: [217.140.96.140] X-ClientProxiedBy: HE1PR01CA0020.eurprd01.prod.exchangelabs.com (10.163.2.158) To AM4PR08MB1057.eurprd08.prod.outlook.com (10.166.134.24) X-MS-Office365-Filtering-Correlation-Id: b808c51c-0594-4cc0-56c3-08d37d894b43 X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB1057; 2:+7rvm/8c4NppsSbp2edjXJheFrTacoKVebIMcVWCYh1yjT8B81KKeoq2K8RRHZyjMdH/icwm7CsIaw+vawGmKxz5SbNjBtyqi/pqVx5p7MqMjThbO1invZVvVIcGIEXNXkaQk7mDYk7dhM+ihBwxgVNTeqJTfkdavvRpbojvIdCmhnRBpSsISQT71s+0554U; 3:BZQs3DcsrC4Uu1GqdUxR2eFDgv2cRxRMnZZgS6Lzb8w3UkTWY7NrEZm9DUhIRnH/phdicVfkph2zxMDeozuFrXtA3oTnd/td08pVU+uhl11uHXMhf6QQIw6zuEOWB61l X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM4PR08MB1057; X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB1057; 25:hlbGPxy6sRBf0QbQn3zOW3I47v3Hvg5eNs5ET7RR4f/kTWKUtCAHnsiX6eEDmqjWhjE4NFvCjKNEjI0BwogU1BD0SRSn1vCnAaeC+v8NOonSZMdk37whZnuiu1hDw44jFmkm9NsoVy0yj346IpAymbS66kmuoTvH+SYm/g8eXyrI8MGVcwcbd10WVIs5o9my2QktH3nCw3lPOSVkwJ5HRa4hNlZC5ANGXsnZ9BnRfvleLJ6w8t0R4ahBUN9xhMMyG0P47CDrm/7TQf4+LfoulJu6+frW+vKpvBcAb2PSIm8RiR9a+3JgHEkcXdtmBK/4qfg9QlfowXcXrW/768icgAxXrgF1XFs+ysorwWaiq48mps8EwZ5bKptKYhtgZ/WdmqlNt61AlFxToiOfijTvM1LrqglVukdupb9Z/UJ3vUWSMNaj0NSi+RAiuOpxRfBS1x4sVFAZxhJ4sSReNKaJBtW3LqXifcRwhAH13biSrCHsiyEXg5nrCzSCG/Hapl/pb2ijKI6rzyQL3L/ai9fjQsQaH0PS00cpvpCJ7XObYfFVqaRvpc2FQa3Letq+yodLPSY34qsGNT9QLIdkxfHvC827dfQ2t/+fXWZ4MLCoAYqJfa26IobznXKr1wY0Qfd+s/B4t1q+Wcj2B2rOxQmrcM1UNDvDxJHw1IyxwZs83nttMkUbwgPNNxtNS0zKOUiTJwT3K6Lcl1Wnv0Aii5x2zw==; 20:HweJ9YD+TUfsVFxDfPcaCGVbWMl9WhrlF2JZp7qjLUTshns2sdGlhl9KF1QlZvagy9SBBfofd8xtUznn9EVzhsYY1ffU5E6x2N7V/RXfr8a4ky/GIzw+1b+tQQ04He/LB204s9znZy9X4Rr7nPHec9PNXUOGXZznE1AfKEemuGc= NoDisclaimer: True X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:AM4PR08MB1057; BCL:0; PCL:0; RULEID:; SRVR:AM4PR08MB1057; X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB1057; 4:rUKZjrDmv0nTPsLdCIHpqNLd9yKqbauI+mmyjIiWkF/efoEO1CLpUK50DZGi9wi1nzlTlZT3ZZtTXeEzpS6/yhtXeiUs7ObJ/QT8s26aZA8yFX7mW9KOOJn9JCD/7jnvcJmxAkqkvb9N9IJ4I33AdN0PDUB7oejCh7s7oJbhXl99KTzX+q0XMMj+mUYKIP113PoGACM28WyI7FvI6QkAGfoUUd1pC3IEjaGcQBLwa/KQRYrCuDKGZHqmPvGmLuKGFWX+gvAI95DbsRivwq/WkkLZf68SU0yTuONRWN8GbFvjOnQP0rV531tFqJ6oMKD4H2HlppLhRDQi2qO+UVwvfHZHWogipEcyeX1o/uYDqIMXPhNhw+12kUhkSWfx6nPC X-Forefront-PRVS: 09443CAA7E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6049001)(6116002)(54356999)(50986999)(65816999)(3846002)(36756003)(5001770100001)(8676002)(42186005)(189998001)(2906002)(81166006)(4326007)(5008740100001)(92566002)(59896002)(23676002)(77096005)(80316001)(19580395003)(19580405001)(4001350100001)(229853001)(575784001)(50466002)(5004730100002)(586003)(65806001)(230700001)(66066001)(65956001)(33656002)(86362001)(64126003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM4PR08MB1057; H:[10.1.193.119]; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTRQUjA4TUIxMDU3OzIzOnA4TkhrYnFRbm12YTR4UGt0dzM3VFFqcVRj?= =?utf-8?B?MHZLcVo0cEc1WEhuNDl5MmxiRlJKbXJ5VUR4dHVCWXlqV3NFcUNTU1lkVGF0?= =?utf-8?B?Z1pPQ1Q1ZDhMWFRJajhrNVRYeEdScWtpVCtGT0hTQW1LdlJxSTVnV2ZUc2tN?= =?utf-8?B?OWcxRGFtdlYwT2c5d29YcjhtWGR5Q25PbXJralh5YlNtcXllN0NOYW54MlhV?= =?utf-8?B?aUM4NFhlckhFanZDdlNQZ0ovZ09yOUo4eWxsZk9JaXNZN0Z0R2lkTGtNaWJw?= =?utf-8?B?Y3hiNGpXbHBBZGFMTExSb2J2cHcxblRKQWg5TDA4Wklkam5za0pWMGF0YnRL?= =?utf-8?B?djdZaUxyQXVucnljbXJhUnRxbXc4cmt4NWJLZFE1YTd2UUNvSmxzbTRqa2xV?= =?utf-8?B?VVBHeGJxYnhVSDJDb2FVTE1vY3dMY0Z4dFlQWVZZbWRvYXM5VTQyNHQ4Nmdz?= =?utf-8?B?N1VtRWFSVVl4OWlPbmJ2WlI3ZHM5Qy84NHBhU1BnSncrNXRVa3kyUVlQMGFB?= =?utf-8?B?eUtzS0JHaUFPRVZQWFAvdHBYRWRzcGtoK085cjlscHhzNEt3UFdVL3gvM0pZ?= =?utf-8?B?enlqckp0T2VCdjlCVG1ZekoyTFBJU3dPRmNiTG82MjZ6SWg2aDNIY1E5MlNR?= =?utf-8?B?bTBWdFJEdWJPRWlXZW1FZFIxbEQ0bWRobVZ2ejk2cGZ4MjF6WHA5b3RDVzBY?= =?utf-8?B?ZjhKZEpKS2dsS2tsTkpmaHRoSURLWllHd1Y3UFJJVmxOR1VnVnNJTGlNeFpP?= =?utf-8?B?T0IxZFM0SHF1K3VIUDUxMHJlWDM4Syt2ZFRBYkk5bVIzYlFVb1FCZ1A4SXE1?= =?utf-8?B?Z1pkSzIrc1ZQUkFTVEg4UWdyM0N4cEgrenh6cEZWU1hydG5tbTBCQlNHb1Q5?= =?utf-8?B?SmVVM0thenV5OXhwQkl0MlBlMjJRZ3pFTjRsSHZmQkxrQWRsd0RkTkNMUGJI?= =?utf-8?B?YklVUDNBeW9IeTVSV2p1TlZzSzRWV0VrbGR2TUpoNGVuWEpsd1o1THVPSnYy?= =?utf-8?B?MjJ3aW4rSzJyYksrdExzeVMveGpUdytsYllLaTZSblFNMXErUitDK2J4a1pM?= =?utf-8?B?NnlITlllSjJSc2l5MjgwNU5EK1ZheGd6OEZvZTNTQlU5dFdZTWx5RXhRNVlk?= =?utf-8?B?QWlmb0plNFpTYmRSWjhRUFNDZFIvRnlqa1E0aDJQc0F5RFBwOVFzRVlVSUpk?= =?utf-8?B?anA5c25pTXUxYno4SzZkS0N5L2dLT0k1cEtsbmRJMDVzQlQ2YXdheWwrUWlW?= =?utf-8?B?N2VqSkUxMDlXVFdXZjk0OXVsVmJMMU1GR2RCR3QzUWxiVmpuZ0ZaMldFRDE2?= =?utf-8?B?TG1mMlMrMzg1elRGd0xobnVqMEp4WjdUbFpQS3AveXhQMU9kN1hqQ0xTSjJk?= =?utf-8?Q?fTPMTQiQ?= X-Microsoft-Exchange-Diagnostics: 1; AM4PR08MB1057; 5:/FDtY2t2vHTkiP63OFQs2MYdm30MJx1RgJaDCBAUXcjHtEIPt9+hGySfpvlQaDKuT9XciGETrt4Cu0xyjFBT2WaXzPe0Qrb/I8SNKD6HBL7wy0Fc5HHRS/NIpmPTEAe84npiFkz42sXijuceA/ooMQ==; 24:ZrjpJeJJ6oZwO2yCLjK9vEMn/QfuFA9D2iHYqYFkaII1aNS4mziZG+m5MupOq+N9rp2B4UUhxmTjENnTwofhKpbr/c8yY9gdOTX00BPFyJQ=; 7:77d2nkAnAsIN72pGHWuLGL2NyfGF1Rm0p3payD3Z0xWfHzZ43Rtl8JK0SBr49KdZiXPx/V2EcLzr5yC89LSOFxbOuMjLDU0LQ6VmM1weWdXqyOYogne5Dql0QKb/xqOT34kfT6/3VCTNhNbMX3U+JhUV/dx7pgX1UGimufvl00u4kIHok5bIq+la/1bpIoW0; 20:y0K69cv1SCnd/uAAJ7Q6paiokG01dZCBNv8q8bmV94ZIE8jGlh5EXFAlnLv4qmuOJ/F+SoeE0a/zaZPKzZx2hJAPA21SggSlkui5YP4XSRQ+UkgFwVL1LTOEqNBPkdgaZDl4KlPRj03uwHlsZg8JW8RYpWz2MqSXM/OFW6NRdsc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2016 12:55:01.0755 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB1057 X-MC-Unique: aZ_D97m3TriaPPWXikiW4w-1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160516_055528_730904_32BA0A4D X-CRM114-Status: UNSURE ( 6.85 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.1 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nd@arm.com, kvmarm@lists.cs.columbia.edu, 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-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The EC field of the constructed ESR is conditionally modified by ORing in ESR_ELx_EC_DABT_LOW for a data abort. However, ESR_ELx_EC_SHIFT is missing from this condition. Signed-off-by: Matt Evans Acked-by: Marc Zyngier Cc: --- arch/arm64/kvm/inject_fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c index 4d1ac81..e9e0e6d 100644 --- a/arch/arm64/kvm/inject_fault.c +++ b/arch/arm64/kvm/inject_fault.c @@ -162,7 +162,7 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr esr |= (ESR_ELx_EC_IABT_CUR << ESR_ELx_EC_SHIFT); if (!is_iabt) - esr |= ESR_ELx_EC_DABT_LOW; + esr |= ESR_ELx_EC_DABT_LOW << ESR_ELx_EC_SHIFT; vcpu_sys_reg(vcpu, ESR_EL1) = esr | ESR_ELx_FSC_EXTABT; }