Message ID | 1429853281-6136-61-git-send-email-shannon.zhao@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <patchwork-forward+bncBCOL5N4BVYCBBFNM46UQKGQEIC6CJXA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C86B320553 for <linaro@patches.linaro.org>; Fri, 24 Apr 2015 05:35:17 +0000 (UTC) Received: by wghm4 with SMTP id m4sf9150669wgh.2 for <linaro@patches.linaro.org>; Thu, 23 Apr 2015 22:35:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=qOLQj6hPSEy+vJkzChLlxLAUglb4xpThj/EFx2NdA90=; b=QJMehzqMiLjtA4cyrLC9ulGZ1N/Pv68lQxEV6duFF0v1PuJHX6lggE8soJunvIfWTF DdrVkU7R7i7Q8KYNrg4MrodqwmBpz6AK7Fe/stIHIZQXQKjFWui/Wa0JtVo4vPZY+FBS DMrXDhm1ksvhPERZn29EmR2t2C1nYvfilKv7n6OG29Jf42F31KdcDIsPpyqyRfQXjNAf 6CwMb/Xc1Mybk5UJUMmX7RTHfYlTAlmofXGpGpZrZfScm3+A7yQMRV15B6i8hEPX0wPH ayia4f3wv7RC03dOOxxoIEWI3Jb+p0nTurpUn9louUwdGSdJArVoZCk/QqNTf7Wgaykm D6WA== X-Gm-Message-State: ALoCoQniVpRtlrGft6co5lyj2Q9qDxITykdcieCzj6nqla+HVVwWE813Pxk3v/+5yylHHPFnF0Ki X-Received: by 10.112.130.71 with SMTP id oc7mr3182364lbb.23.1429853717122; Thu, 23 Apr 2015 22:35:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.102 with SMTP id s6ls423085lag.73.gmail; Thu, 23 Apr 2015 22:35:17 -0700 (PDT) X-Received: by 10.112.218.40 with SMTP id pd8mr5392150lbc.71.1429853716978; Thu, 23 Apr 2015 22:35:16 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id rs2si7472396lbb.106.2015.04.23.22.35.16 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 22:35:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbzk7 with SMTP id zk7so28646828lbb.0 for <patchwork-forward@linaro.org>; Thu, 23 Apr 2015 22:35:16 -0700 (PDT) X-Received: by 10.152.9.66 with SMTP id x2mr5437162laa.36.1429853716706; Thu, 23 Apr 2015 22:35:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp979077lbt; Thu, 23 Apr 2015 22:35:15 -0700 (PDT) X-Received: by 10.68.167.66 with SMTP id zm2mr11740299pbb.164.1429853714985; Thu, 23 Apr 2015 22:35:14 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd10si15800741pdb.178.2015.04.23.22.35.14; Thu, 23 Apr 2015 22:35:14 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754591AbbDXFfN (ORCPT <rfc822;shannon.zhao@linaro.org> + 2 others); Fri, 24 Apr 2015 01:35:13 -0400 Received: from mail-ob0-f182.google.com ([209.85.214.182]:36347 "EHLO mail-ob0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754582AbbDXFfM (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 24 Apr 2015 01:35:12 -0400 Received: by obbeb7 with SMTP id eb7so30169847obb.3 for <stable@vger.kernel.org>; Thu, 23 Apr 2015 22:35:12 -0700 (PDT) X-Received: by 10.202.67.10 with SMTP id q10mr5484490oia.124.1429853712104; Thu, 23 Apr 2015 22:35:12 -0700 (PDT) Received: from localhost ([167.160.116.36]) by mx.google.com with ESMTPSA id y19sm6092424oie.13.2015.04.23.22.35.09 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 Apr 2015 22:35:10 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: jslaby@suse.cz, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Marc Zyngier <marc.zyngier@arm.com>, Paolo Bonzini <pbonzini@redhat.com> Subject: [PATCH for 3.12.y stable 60/63] arm64: KVM: Fix TLB invalidation by IPA/VMID Date: Fri, 24 Apr 2015 13:27:58 +0800 Message-Id: <1429853281-6136-61-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> References: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shannon.zhao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index caf3cca..a255167 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -616,6 +616,7 @@ ENTRY(__kvm_tlb_flush_vmid_ipa) * Instead, we invalidate Stage-2 for this IPA, and the * whole of Stage-1. Weep... */ + lsr x1, x1, #12 tlbi ipas2e1is, x1 /* * We have to ensure completion of the invalidation at Stage-2,