From patchwork Fri Jun 7 23:03:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 2691141 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4D3FBDFF68 for ; Fri, 7 Jun 2013 23:06:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757848Ab3FGXFz (ORCPT ); Fri, 7 Jun 2013 19:05:55 -0400 Received: from mail-ie0-f181.google.com ([209.85.223.181]:38274 "EHLO mail-ie0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757705Ab3FGXDz (ORCPT ); Fri, 7 Jun 2013 19:03:55 -0400 Received: by mail-ie0-f181.google.com with SMTP id x14so11606203ief.26 for ; Fri, 07 Jun 2013 16:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=a59tVtzIe93vsEUdsX3VUzZV88X1ZBTKuBW+Aho4CnY=; b=BoQFk3ZXa0eea08hexMbc0njLl3nWCoGy4J2m435TX7dceiXHWf3Xwef0XvVN2KbEO S9dYF7sDKVdTtd9/PzB4U9VTx3LLzew4YJG27EI4aYomPKKh2YluUbjU5fKtF9Lg10RC fg2e9OPUrNtOOno02KM7xRnT19BO6LJYR5dKZg+vAlMeX4IbiicVOe75Rb169F1jeW0x +tx3SWLJoBX28ydlyCqL9FJayzSDY7YSV8SQbfJkrXml85xkoQ0XoJXnH4AmXJxVNpg1 +8NWaTBy1C0XeDcXkhpgJYvx1r1/fq5KLE/vgWRQRSdT+A+tz5TYF4tvbWJl2bjfoSWP CdSQ== X-Received: by 10.50.87.71 with SMTP id v7mr453451igz.29.1370646234772; Fri, 07 Jun 2013 16:03:54 -0700 (PDT) Received: from dl.caveonetworks.com (64.2.3.195.ptr.us.xo.net. [64.2.3.195]) by mx.google.com with ESMTPSA id vc15sm163622igb.7.2013.06.07.16.03.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 07 Jun 2013 16:03:54 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id r57N3qoh006719; Fri, 7 Jun 2013 16:03:52 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id r57N3qCX006718; Fri, 7 Jun 2013 16:03:52 -0700 From: David Daney To: linux-mips@linux-mips.org, ralf@linux-mips.org, kvm@vger.kernel.org, Sanjay Lal Cc: linux-kernel@vger.kernel.org, David Daney Subject: [PATCH 27/31] mips/kvm: Gate the use of kvm_local_flush_tlb_all() by KVM_MIPSTE Date: Fri, 7 Jun 2013 16:03:31 -0700 Message-Id: <1370646215-6543-28-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com> References: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: David Daney Only the trap-and-emulate KVM code needs a Special tlb flusher. All other configurations should use the regular version. Signed-off-by: David Daney Acked-by: Ralf Baechle --- arch/mips/include/asm/mmu_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/asm/mmu_context.h b/arch/mips/include/asm/mmu_context.h index 5609a32..04d0b74 100644 --- a/arch/mips/include/asm/mmu_context.h +++ b/arch/mips/include/asm/mmu_context.h @@ -117,7 +117,7 @@ get_new_asid(unsigned long cpu) if (! ((asid += ASID_INC) & ASID_MASK) ) { if (cpu_has_vtag_icache) flush_icache_all(); -#ifdef CONFIG_VIRTUALIZATION +#if IS_ENABLED(CONFIG_KVM_MIPSTE) kvm_local_flush_tlb_all(); /* start new asid cycle */ #else local_flush_tlb_all(); /* start new asid cycle */