From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2220351-1523981375-2-7091781585428463323 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523981375; b=oD/ctI7d77fV1B8K+g8ZhaUtzPIyUuJhIo5Bgc0z9iMfKBot6z oqCM0C1OuMna+1pXPZgv/rDtZlvI2tSuMYhY3urMtIMmcSTN/JPP25t4ORGIJRXU TfOFMRGTBWBcCQNx+Wegk9b5fm18rIjcET7ke3GHvisuZZWQSvPgxQn4sNl3C0Nh Jh32nTFPobWBnEILZ8GHKtf0Hj5JpNjvwE+7LYv/JDXNFS1utt2DhQv0gf+D1tSH hHcu/Z97EPXaLQoWKf/2jd24SNpc6Az/OBEq1Eb8GEO28Ioi2LmK5wWNEGU3GGPJ C0eHpfDpQ3/WpMOXvpka42GL55QwDyDiVfSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523981375; bh=DmE9V5T9gCmqelhiR67sG40sHBIMkR zKeszWEGRc5Kc=; b=twJ4RsMels+PCOBEv9+/+ScRTnKeWQALr3JiHXNOisc4Mc uQt4YPzE3F5Z9zJCSRUZUYduZT7VznqTK5hXD1pgS2jmQ0VJI88kwr7EYjUhWkj7 2z/g/HeK1hhaOOz/Tj9vTXYUVWipjDf2vJaSlcDPOVa5gELw37CWaKtPXWjh/hAh umV+oiCCtF6c7aGXfL313LGTUyTi6bFSbEZeL+Nnw+uy2fkh0KzlZnCsfiiqW6+5 fuRutkFAGU0R6C++mXD/4hvSZghIDumhyqqD0VbPrAEmpdLSwQSlqN4qqi17fMQK 3iYkm83YD9L4hwHEGyf4wPcLJhHXDeXcwDiu9rdw== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfI3rsFllVhedrbpR0JdbJm9kjsI0WLiLuayTFXrOv2/GF37tkk3HWvcOxCUMl/RXvRCQGNXK1PLMCFmniOatnGae+V3q/alUVGNBBIlHaj0AXKAdFiTq XsILRvTljONy/Rh2f/ri624EUvUELsHcrZZ1JKkBVNmYuCEXi53PI94J3l+9rJV4QYCPrNsdSW/eaIP6jIYXHOF3S/5ldZIhWJFwMOUl6J2qCLRvljO8/mJh X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=7CQSdrXTAAAA:8 a=KKAkSRfTAAAA:8 a=1XWaLZrsAAAA:8 a=ag1SF4gXAAAA:8 a=Yl9wlt2tm8I-GhEjR5sA:9 a=QEXdDO2ut3YA:10 a=a-qgeE7W1pNrGK8U0ZQC:22 a=cvBusfyB2V15izCimMoJ:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932109AbeDQQJ3 (ORCPT ); Tue, 17 Apr 2018 12:09:29 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36116 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932107AbeDQQJ2 (ORCPT ); Tue, 17 Apr 2018 12:09:28 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Thomas Gleixner , Mark Rutland , Daniel Lezcano , Suzuki K Poulose , Marc Zyngier , Greg Hackmann Subject: [PATCH 4.9 32/66] arm64: cpu_errata: Allow an erratum to be match for all revisions of a core Date: Tue, 17 Apr 2018 17:59:05 +0200 Message-Id: <20180417155647.267387199@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417155645.868055442@linuxfoundation.org> References: <20180417155645.868055442@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mark Rutland From: Marc Zyngier commit 06f1494f837da8997d670a1ba87add7963b08922 upstream. Some minor erratum may not be fixed in further revisions of a core, leading to a situation where the workaround needs to be updated each time an updated core is released. Introduce a MIDR_ALL_VERSIONS match helper that will work for all versions of that MIDR, once and for all. Acked-by: Thomas Gleixner Acked-by: Mark Rutland Acked-by: Daniel Lezcano Reviewed-by: Suzuki K Poulose Signed-off-by: Marc Zyngier Signed-off-by: Mark Rutland [v4.9 backport] Tested-by: Greg Hackmann Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kernel/cpu_errata.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -127,6 +127,13 @@ static void install_bp_hardening_cb(con .midr_range_min = min, \ .midr_range_max = max +#define MIDR_ALL_VERSIONS(model) \ + .def_scope = SCOPE_LOCAL_CPU, \ + .matches = is_affected_midr_range, \ + .midr_model = model, \ + .midr_range_min = 0, \ + .midr_range_max = (MIDR_VARIANT_MASK | MIDR_REVISION_MASK) + const struct arm64_cpu_capabilities arm64_errata[] = { #if defined(CONFIG_ARM64_ERRATUM_826319) || \ defined(CONFIG_ARM64_ERRATUM_827319) || \