From patchwork Mon Aug 17 15:14:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247812 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2748582ilo; Mon, 17 Aug 2020 08:53:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxefEy1ZCXMligacdG8HACdhDtdmIeAduqmW3LDggALHQKTbrtb1CFdYZcQBlOk+hYPogX3 X-Received: by 2002:a50:d9c6:: with SMTP id x6mr15980718edj.56.1597679580171; Mon, 17 Aug 2020 08:53:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597679580; cv=none; d=google.com; s=arc-20160816; b=at5LrGbCya+tZ3/CM4j6fIUl9fsivjNbhXoGiZoIc/QUL+j5wh8ZzvZo9QUv/VpC4H DGWSY8rWp2KURJp8G9oJY0xMO3ID2L3HFSreqFIIjKecj3WKzqBRXQcyefYAxXScsCOJ U1X4q1ViANLXmzuR7hsOEZtCJVeVFqDYv6lbpn6J2+zlH7owkDcFY7Ydphdslqq51wla Yt6He+6S4Z07BhqMsD9PZvg1yBmS08NyYjR5Y2xhW1nog61TKqp2TUSiwUsWIVLGD3Cq PQe3dpIWuZU2sWSJC9pk2uRzWamkhEtJ6WIq8w+2QZ5HRcaMn/DvaGZUqIUOw7FND9AP HAKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q6fZRy9RGkrij0OJMRyB6bYTfrHzMyI3wUU6g8kku6Y=; b=wZucHXv0bXt6Uw+i/rwelKpZet+hs62G7RoaLHUsEBwhBbqpFOLj27wyc+x9plEw51 wLzmg+CD22Cq6JNJuKyiggzvRA/2zX1heo8TgWBHZknZFTzzG6K8zYRSfsSBRkJK4BBl xPdT+L9slqkjXsEyNKES0yJOLLCJz4bp+szEgakaikXwZndF38BwwO+aEiAXA2f0OEN7 2zM8XlVX+lxXHToBpUoJqmwoochXIPNj/lLJ5Lh2EBBTBP80HIq8RWCJi2au8lb1/vXq 2MqrIvIjwtiFR1qRktQImL+Z6GOoaLEn1qRk3KqBJGw/FuQa4Rh/nrvMGuZV8Wsn01G9 7xFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xqntu5Nh; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e5si11499227ejq.390.2020.08.17.08.52.59; Mon, 17 Aug 2020 08:53:00 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xqntu5Nh; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387882AbgHQPwz (ORCPT + 15 others); Mon, 17 Aug 2020 11:52:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:39120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387873AbgHQPws (ORCPT ); Mon, 17 Aug 2020 11:52:48 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 222E620657; Mon, 17 Aug 2020 15:52:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597679567; bh=ZKVk/wxZoh+1ON43O4MrsASnLMbbya2SkuJcqE5JLhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xqntu5NhahF7z7oZhD2qzxBOQ7kaAEB9tRPjeaTGg5GarIkW5XRDlgaeexhi2HaUN nsnL9Ro04gFKauNF5tPVKoy8PaZ+dc0QwivXYBQBXhPBKB2OkbVa74FxeakENpY4vd oOQapaWFBqUBXDjr2p/8kuLyo8PFZbO5tntjOu2A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mike Leach , Mathieu Poirier , Sasha Levin Subject: [PATCH 5.7 228/393] coresight: etmv4: Fix resource selector constant Date: Mon, 17 Aug 2020 17:14:38 +0200 Message-Id: <20200817143830.684637147@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143819.579311991@linuxfoundation.org> References: <20200817143819.579311991@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mike Leach [ Upstream commit cb8bba907a4ff4ba42f1d245cb506d55829674b8 ] ETMv4 max resource selector constant incorrectly set to 16. Updated to the correct 32 value, and adjustments made to limited code using it. Signed-off-by: Mike Leach Fixes: 2e1cdfe184b52 ("coresight-etm4x: Adding CoreSight ETM4x driver") Signed-off-by: Mathieu Poirier Link: https://lore.kernel.org/r/20200716175746.3338735-10-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/hwtracing/coresight/coresight-etm4x.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h index 4a695bf90582e..b0d633daf7162 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.h +++ b/drivers/hwtracing/coresight/coresight-etm4x.h @@ -133,7 +133,7 @@ #define ETMv4_MAX_CTXID_CMP 8 #define ETM_MAX_VMID_CMP 8 #define ETM_MAX_PE_CMP 8 -#define ETM_MAX_RES_SEL 16 +#define ETM_MAX_RES_SEL 32 #define ETM_MAX_SS_CMP 8 #define ETM_ARCH_V4 0x40 @@ -325,7 +325,7 @@ struct etmv4_save_state { u32 trccntctlr[ETMv4_MAX_CNTR]; u32 trccntvr[ETMv4_MAX_CNTR]; - u32 trcrsctlr[ETM_MAX_RES_SEL * 2]; + u32 trcrsctlr[ETM_MAX_RES_SEL]; u32 trcssccr[ETM_MAX_SS_CMP]; u32 trcsscsr[ETM_MAX_SS_CMP];