From patchwork Wed Oct 31 13:57:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 149809 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6826649ljp; Wed, 31 Oct 2018 06:57:36 -0700 (PDT) X-Received: by 2002:a67:d684:: with SMTP id o4mr1330362vsj.174.1540994256295; Wed, 31 Oct 2018 06:57:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540994256; cv=none; d=google.com; s=arc-20160816; b=XAyzE5DgwMfsgVTCuZY9nhGgH7xl3glIF/1TrZP/VeQG7CP1pAiIastuE/LxKINZMY NVf23eGNBe15U5gynoSsJFfxXkABOgierPAMpqwDpYS2zdJ8p8Y343ig99MyTns89J9t J05Gsgu1hY8F+KBetT96eomR53WKglWXgbTjvEc9O94jh0p/GE6957v213UWn5BwFmKe rQhSjdnvxKEGNsHt2zo21l3E0I1vTn9UX5XNIxTO5W2JQdnbLZ685bgCi0SuoI5ZF6O8 XsGxsQSp8z65YJ6++eiTVUz/ShBDojMuWbo1L8jLQ1cgo7KEyYCg9vPK5r3YLBvlJQIy dS8g== 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=Z+Qt0V/X0rp9/PYEHT57k1RKcIoA/WekeaBBdjP25ow=; b=WrAd8QEORbOZ4iSQ9t3n81kji/nM80uaZtcADYqep/05SiOQJzOqOdgoCXXTGiZk5c ELXDqwMW869O9+zpOzTvCrrzXV5JURXwTu24PUsucbS4zKgUx41k6O/RPVe4epzqieZP WnxgjMuf5l4GJyefvY/wS2UAxd4cjYJpC0EGxPPcKfPEZYudeU88vVLBd/7n65WahPq8 oypXm/ZvU7RbM8WPHTLz4b9qutt06gW6u0mREHiY9LwmndIY3d4YFWFMKFiOF0NjYhQQ kti65fRUk7IZ9bWPMUk10l2pPQe4zK+d0xZxcsqGrSDea55GS/HehMOd8zFu/hb7i3w6 5fAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dvOyo2tY; 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 v11sor5862962uad.8.2018.10.31.06.57.36 for (Google Transport Security); Wed, 31 Oct 2018 06:57:36 -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=dvOyo2tY; 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=Z+Qt0V/X0rp9/PYEHT57k1RKcIoA/WekeaBBdjP25ow=; b=dvOyo2tY6O3+j7vhnwbFBaXFSHprDREpEIqHuDVlAM6SDFbRmbVEuEnaGkMCxrCkJq vGeN/nVRjroFMOy9D1lYItYJr96s1a/HTzpuqpXXnWkT+s0Un3Vr7eTbvig33ENVUfDY TGd2UMaJxhyG8o7kIMUqtbzq7h5EuKI3HzBnk= 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=Z+Qt0V/X0rp9/PYEHT57k1RKcIoA/WekeaBBdjP25ow=; b=XBros/TcTFA6b2nGjLurVaGsveW4e698aooTbjPx7rhY0CAdSSj3eWxWswwymkudsy kHE8LiBnsi7STHyYJpBvn8Pr3t3N32+RPD9CWWp3TC6y/CZCe06alGMsuuUvtjtewHhM B/f1TJF5DSbqDGj6Dqy3qqydYMyFIlVB/7PqVhqhB4Six5uYN7ewx6qAqj1TstPjrLrE RdOnvHx9jmjW3ek8DG2Ec/kTVVfuNT1mkZ9BTCjkPr+aCDbiGMVvacshxfq+gjKFEK66 qEQTs/vkvOeJ0A9KqxJOQ4+p7uITpxgre10XvOjV4t9jzIEQ165iZOTFNfV3Pdap8krQ BKXw== X-Gm-Message-State: AGRZ1gJfUI8w6bSBQfLpOc7FEMpHmkCV7kyu3tJDR0LgFJ8oMOvPlHq5 GDaQMDrdwiJ9owcRR4q2Nfq7eE7+ X-Google-Smtp-Source: AJdET5dGduu7PGVG7B2QwmwnNv9UOmJari+KIA7u8JobaKUMLRYIh1V7M98/xaZN/Wr8uGtTtGX7Nw== X-Received: by 2002:ab0:55c1:: with SMTP id w1mr1364885uaa.54.1540994255726; Wed, 31 Oct 2018 06:57:35 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 06:57:35 -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 15/24] ARM: KVM: report support for SMCCC_ARCH_WORKAROUND_1 Date: Wed, 31 Oct 2018 09:57:04 -0400 Message-Id: <20181031135713.2873-16-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 add5609877c6785cc002c6ed7e008b1d61064439 upstream. Report support for SMCCC_ARCH_WORKAROUND_1 to KVM guests for affected CPUs. Signed-off-by: Russell King Boot-tested-by: Tony Lindgren Reviewed-by: Tony Lindgren Reviewed-by: Marc Zyngier Signed-off-by: David A. Long --- arch/arm/include/asm/kvm_host.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 0833d8a1dbbb..2fda7e905754 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -323,8 +324,17 @@ static inline int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu, static inline bool kvm_arm_harden_branch_predictor(void) { - /* No way to detect it yet, pretend it is not there. */ - return false; + switch(read_cpuid_part()) { +#ifdef CONFIG_HARDEN_BRANCH_PREDICTOR + case ARM_CPU_PART_BRAHMA_B15: + case ARM_CPU_PART_CORTEX_A12: + case ARM_CPU_PART_CORTEX_A15: + case ARM_CPU_PART_CORTEX_A17: + return true; +#endif + default: + return false; + } } #define KVM_SSBD_UNKNOWN -1