From patchwork Wed Oct 31 13:57:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 149807 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6826607ljp; Wed, 31 Oct 2018 06:57:34 -0700 (PDT) X-Received: by 2002:a67:d20d:: with SMTP id y13mr1027077vsi.163.1540994253947; Wed, 31 Oct 2018 06:57:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540994253; cv=none; d=google.com; s=arc-20160816; b=0qqqLxDo60b6iFhAYf980pZKBugnEvq+9JfcDwEm4fJPFRyALM9SQmx9EbW11Oknx5 K1gAi+KktK1vendfXezvPd+x+IVXmmY6PfW7ule6LvmskY6yRxjF7D8qgiRCsshLhPKw 19DbBXb8lHKCJ2aCEUM1k6WXI3BCW/BHgTkJRjjGSkcW3L2BYHbwcn9rca1TT9n2tmvx glETnYPhVA68dkf4Avq6afo4406XPXRf3TNh/ePjJNZyN3lNmGFYH9oqBim/Agkzm8qG 0+t2QVbmh/Zd6DWS4cCKxM7wr/TOU7kylhZnKf2ddmTDN52jfNfvtFscn0CaD52rz9SN SAGg== 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=J5sVUR/i+5tKsUvbcGzZjzlTkYeuB2GN+mL1uymDnUxUSE/hbgC8sErZ+OXstlhWwv kEGPcWsdLLaYwFdsrjHuh+4hwm+l1U1eHngVpTq+WtnnHpjolROWGOYLh5Y0HVL6s3Dd E8b//jpal8Lx7lGifv4mix3KNbHzjqeTdJ1pJEZtanyfQBlEUeF9hHhCvxUkCnCnoP2g qIK7Kn1KMb/cT1rtpnJGBBRlrIGYrOCOQ/67ByXpP/eydX3358ZgjQjA6WCTuftlAUwi pihZA14pjnovopNhD2CGkADtlTTcWWEsgr+Ypt6cg7gFrrBSJ9oPfbBC1PaT/mCvrgNE 9l7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bcGLrUdu; 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 x85-v6sor13408646vke.58.2018.10.31.06.57.33 for (Google Transport Security); Wed, 31 Oct 2018 06:57:33 -0700 (PDT) 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=bcGLrUdu; 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=bcGLrUduYhpyNiIPqH0x17Sdr6YVvh7sX++Ge4EamrEVRSfThgt10G3eQZJYfiPXoa xE0TMO0pX0qAHIezvxvYKa31RFkMoaNcQXO4CBxF0Y/Zl91NkCIvOWq3QltxO2ilhHvz 6YqyWvuz1zK8B8IWSHrm/CQhEeKUMas3JgFus= 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=CY3rnigvemgLGFnMgbRxa1DBQT+/e/6dhQm2iz2YRLBYtOliA/vXLqzO3AlHwHK04d 048WITAru5B1xAmXEnRL5iVkCdIzWbUl9CBwK9J1NGnh8ZPE3PhRd0XjpNyi/AdZ+1kh eglkap7j/YyGKviYWwJFkup9ZekdkK19I/tJ6lXdRZqM41YIzSZXIe4VkL1wO64MFC0u kIT25qDl/FR1Dn9sgrXIV8rO2IbE5RG6FOtKoMZfcXUPoMxEhIwYHyyeXxUnrY0/a/Lt +ktePXGdoaQCkCP4me2CfWRoiAKgY2/sJSywXc6JIdQd46NLZHMfDZiaeLrtbNX18HQE Dq8Q== X-Gm-Message-State: AGRZ1gKMN2gxKIJjtBl5MazPNVZIG+M2iL9TYiDe0DQxsOST0REJaD9A pFU5q3cg84NTo+ulbrWDbipgE7fZ X-Google-Smtp-Source: AJdET5f1vHnl7fC/gvxPNgi3Dn+mFoJGG3Bh+Cx3tOH2TgfraLE8abwcZmcqrQ23CjDcZDzclZGB1Q== X-Received: by 2002:a1f:a014:: with SMTP id j20mr1241969vke.64.1540994253245; Wed, 31 Oct 2018 06:57:33 -0700 (PDT) Return-Path: Received: from dave-Dell-System-XPS-L502X.hsd1.nh.comcast.net ([2603:3005:3403:7100:2c71:8680:34e1:a6aa]) by smtp.googlemail.com with ESMTPSA id s85-v6sm2275624vse.29.2018.10.31.06.57.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 06:57:32 -0700 (PDT) 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 13/24] ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15 Date: Wed, 31 Oct 2018 09:57:02 -0400 Message-Id: <20181031135713.2873-14-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031135713.2873-1-dave.long@linaro.org> References: <20181031135713.2873-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[];