From patchwork Wed Nov 7 16:43:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 150428 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5387390ljp; Wed, 7 Nov 2018 08:44:21 -0800 (PST) X-Received: by 2002:ac8:1308:: with SMTP id e8mr944460qtj.201.1541609061099; Wed, 07 Nov 2018 08:44:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541609061; cv=none; d=google.com; s=arc-20160816; b=K/xivoyT573chkzQ++yAww+2OXYi/xbQwyvk0vbEl1bwZrHpG1lalLjgiDAN6LCS7x 5DFgBau/Q11qeZx0iQtAwUwCIA1mxU84gAhZW5+bsl7bhyceL4ihrmJgwGOypQ7QxoEQ pMPVwmWGT55W+vvQTpCLA1LAZNz01/9+1o3o4WoHAG+dTMHYFiyqhrGQ+sCAau89TCAe mhsf2CA6ow48NqKSMTOk/XbEo0TfAgSNAK1q0bY76jfCU7/nVUyhjRMIit6nDroPdvU1 jk+5rLUhsiRa4YWewGPBOAEKd0ySsmZK/OSiUgf9fM9dZvBFZpvltmqnmP2p0pPsax3G UFHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Rh8rkkWbrF455SnPiPNO1Jsvjgvivhhj5pLyFPDZ+10=; b=xtUC2hOERwGP21JnEHdAnjJ/BGeI22sypaJZggSfb5icau9Vuukebp2xHdt44cDNSD 8WYRqgcM8GeTcOyQ53IIAl5rCcgOrTKYxVLPcb11qipwp8CQL2uG3t3o4Jyz6qLnETQN 5z/NtVdbOuL85HcZZjA2rPqiIsnKFdV7rs8jxVs/Ef9OqQZitGkKqttN3xM1TC1SjzQ/ ds63SkhQyHHJZxESfNC32qvsfMu2zn9F/q9ydv1oufVnt6aT+druS3rNdcBPlk5TMb6K Y+PdYsngynk4LTKuKJl5XOOldkN06aXeTKb3prA5WyqPzxldKCf1HXx0GfRN59YyY14T KxGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DUDgO2oc; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id g184-v6sor639877qkd.136.2018.11.07.08.44.20 for (Google Transport Security); Wed, 07 Nov 2018 08:44:21 -0800 (PST) Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DUDgO2oc; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rh8rkkWbrF455SnPiPNO1Jsvjgvivhhj5pLyFPDZ+10=; b=DUDgO2ocEqUfIVufkFKpIlT3I6AQ/m6I6zw5QYxuf2gXyx10AskLEkFwe7pnGRfYpi rS0ZfJqPo0rSEMX43oHZ5JtA9abK9F2svTENG/UeJQB7A9yP0NWsevQa+Zl9fD927zt4 zZXziL4X6BB6imDqD/pv0BZUxN0ZlgmkzKJbI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rh8rkkWbrF455SnPiPNO1Jsvjgvivhhj5pLyFPDZ+10=; b=BMLZUX1Yd48T/6UWXvAlb0AiWL+riF9MhTyEj6EA7l9EeJXwJuPvkjTaAPVG/IO1JQ xftspHHa1uKZOgotLpmwIxa4StCyQSsNMrLDjZZpqBTVZMKsNT+MZYeiwFuWaEembTcM RnRIQSvUxyit6nGJsWtnRZlUVmOoGphL8dBlLdiAO20FQPTYZXvC3coKlpTPXjyckeU/ xM4q2zqXzRLFih0ROPDfBw4qEDc0ZYHbluEfJ39REabQGeWdehFrYJYGm7weLFui4Dj9 CRJTQUtYD8YRleuyrsbGXAU5WWDV5Lv+A1kwhBS00T2vUtEODrOZB/+vFTckBe42txuE DGzQ== X-Gm-Message-State: AGRZ1gJeUQHNXSAgbBe80iStyJ9XG6wXZR9zzib1btvA63p3m1yeWNoQ 2NYvOwhOuD0hjmHqhXLCnVafT7tk X-Google-Smtp-Source: AJdET5cdWbKi3hoe9GQZZJDuCxNwMmum4vOUXKFmjhCYlKaW75hni6UhWVGLdx2/1hYvxV6JJ9dboA== X-Received: by 2002:a37:d2c2:: with SMTP id f185-v6mr922215qkj.30.1541609060644; Wed, 07 Nov 2018 08:44:20 -0800 (PST) Return-Path: Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id 96-v6sm681817qtc.56.2018.11.07.08.44.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 08:44:20 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Tony Lindgren , Marc Zyngier , Mark Rutland Cc: Greg KH , Mark Brown Subject: [PATCH 4.9 V2 13/24] ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15 Date: Wed, 7 Nov 2018 11:43:51 -0500 Message-Id: <20181107164402.9380-14-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181107164402.9380-1-dave.long@linaro.org> References: <20181107164402.9380-1-dave.long@linaro.org> From: Russell King Commit 3c908e16396d130608e831b7fac4b167a2ede6ba upstream. Include Brahma B15 in the Spectre v2 KVM workarounds. Signed-off-by: Russell King Acked-by: Florian Fainelli Boot-tested-by: Tony Lindgren Reviewed-by: Tony Lindgren Acked-by: Marc Zyngier Signed-off-by: David A. Long --- arch/arm/include/asm/kvm_mmu.h | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h index 3ad2c44f4137..d26395754b56 100644 --- a/arch/arm/include/asm/kvm_mmu.h +++ b/arch/arm/include/asm/kvm_mmu.h @@ -257,6 +257,7 @@ static inline void *kvm_get_hyp_vector(void) return kvm_ksym_ref(__kvm_hyp_vector_bp_inv); } + case ARM_CPU_PART_BRAHMA_B15: case ARM_CPU_PART_CORTEX_A15: { extern char __kvm_hyp_vector_ic_inv[];