From patchwork Mon Mar 23 11:53:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 46183 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 34099214B0 for ; Mon, 23 Mar 2015 11:55:35 +0000 (UTC) Received: by lbiz11 with SMTP id z11sf26946875lbi.2 for ; Mon, 23 Mar 2015 04:55:34 -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=42fzRAmH2CMUWRmNpcTZfdTBOKrYJdDZ2aMQvDBy9FM=; b=bpMLfoN2xkgLgY0y8HPwEbpTYXL6xbPvuiGTYnG7DXf6lno11UGFHlTs+cvuj/IW8H O1VNp70rxDQtSQtIi9LQNTh/LhFIH5UAk2CkrkES8OF7qv8NBTC4XDRQ6vwhNUVHRHxk Vp0Zrt3q/ocJYc7SpLE77CcbFuYfdydwseJAGDoyKWRtLkcwseC0UsOawj5zgZqKSkgD C82jLWtGXG+fJzGrbYMyoKTHdPNM2ftHL98oq/7zebLeLGT7OEzKXTl6EQXrHGXbiO9a nFm6eSLUiRyLWE4duXDa6pLVyZziynieqe8DS8Wd4/exgPlMSyD7YVXHL2dkDXXkCDeq BLNA== X-Gm-Message-State: ALoCoQkxnkhOqIS6G5qeMOSb7UJqu6o1YgIw056/5sVHgN6CZc5Fy6Et/QXTMi6bp6hwz3qrgfbE X-Received: by 10.112.77.101 with SMTP id r5mr15899145lbw.4.1427111734175; Mon, 23 Mar 2015 04:55:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.48 with SMTP id t16ls625848lal.55.gmail; Mon, 23 Mar 2015 04:55:34 -0700 (PDT) X-Received: by 10.152.18.225 with SMTP id z1mr84928852lad.124.1427111734002; Mon, 23 Mar 2015 04:55:34 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id ac10si514295lbc.6.2015.03.23.04.55.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Mar 2015 04:55:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labto5 with SMTP id to5so24248873lab.0 for ; Mon, 23 Mar 2015 04:55:33 -0700 (PDT) X-Received: by 10.112.130.100 with SMTP id od4mr60987476lbb.86.1427111733877; Mon, 23 Mar 2015 04:55:33 -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.57.201 with SMTP id k9csp776216lbq; Mon, 23 Mar 2015 04:55:32 -0700 (PDT) X-Received: by 10.70.88.234 with SMTP id bj10mr187092426pdb.165.1427111731275; Mon, 23 Mar 2015 04:55:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sq5si670004pab.179.2015.03.23.04.55.29; Mon, 23 Mar 2015 04:55:31 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1752667AbbCWLzX (ORCPT + 27 others); Mon, 23 Mar 2015 07:55:23 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:36225 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752288AbbCWLzT (ORCPT ); Mon, 23 Mar 2015 07:55:19 -0400 Received: by padcy3 with SMTP id cy3so189513291pad.3 for ; Mon, 23 Mar 2015 04:55:18 -0700 (PDT) X-Received: by 10.68.252.69 with SMTP id zq5mr20519655pbc.35.1427111718388; Mon, 23 Mar 2015 04:55:18 -0700 (PDT) Received: from localhost.localdomain (61-205-5-195m5.grp1.mineo.jp. [61.205.5.195]) by mx.google.com with ESMTPSA id ok8sm799377pdb.66.2015.03.23.04.55.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Mar 2015 04:55:17 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, marc.zyngier@arm.com, mark.rutland@arm.com Cc: christoffer.dall@linaro.org, geoff@infradead.org, broonie@kernel.org, david.griego@linaro.org, freddy77@gmail.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, AKASHI Takahiro Subject: [RFC 3/4] arm64: kvm: add cpu reset hook for cpu hotplug Date: Mon, 23 Mar 2015 20:53:58 +0900 Message-Id: <1427111639-4575-4-git-send-email-takahiro.akashi@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427111639-4575-1-git-send-email-takahiro.akashi@linaro.org> References: <1427111639-4575-1-git-send-email-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: takahiro.akashi@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.215.52 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: , List-Help: , List-Archive: List-Unsubscribe: , This patch doesn't enable cpu hotplug under kvm, but is a prerequiste when the feature is implemented. Once kvm_arch_hardware_enable/disable() is properly implemented, arm64-specific cpu notifier hook, hyp_init_cpu_notify(), will be able to be removed and replaced by generic kvm_cpu_hotplug(). Signed-off-by: AKASHI Takahiro --- arch/arm/kvm/arm.c | 9 +++++++++ arch/arm64/include/asm/kvm_host.h | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index b879cf6..08804d3 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -925,6 +925,10 @@ static int hyp_init_cpu_notify(struct notifier_block *self, if (__hyp_get_vectors() == hyp_default_vectors) cpu_init_hyp_mode(NULL); break; + case CPU_DYING: + case CPU_DYING_FROZEN: + kvm_cpu_reset(NULL); + break; } return NOTIFY_OK; @@ -1168,6 +1172,11 @@ out_err: return err; } +void kvm_arch_hardware_disable(void) +{ + kvm_cpu_reset(NULL); +} + /* NOP: Compiling as a module not supported */ void kvm_arch_exit(void) { diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 97f88fe..a97b2fe 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -261,7 +261,6 @@ static inline void vgic_arch_setup(const struct vgic_params *vgic) } } -static inline void kvm_arch_hardware_disable(void) {} static inline void kvm_arch_hardware_unsetup(void) {} static inline void kvm_arch_sync_events(struct kvm *kvm) {} static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}