Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2632459pxa; Mon, 17 Aug 2020 14:59:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzd7wq8ZrwweK9L6VcTb1kR2vXql154OMePJEhWYgF7SFF6jHCmZG9XdsFj1f1lW0nYFVJs X-Received: by 2002:a05:6402:2069:: with SMTP id bd9mr16633948edb.127.1597701594025; Mon, 17 Aug 2020 14:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597701594; cv=none; d=google.com; s=arc-20160816; b=y4+K0IRnJmIFvrayyAJidcmIBVByqIuN9c0MDOSjVJfUslfMdrXRFjblK5jZPVLdh8 v7D3lL5iqc+jGFvQPysZWEoIzCXKIen07JM6FY7k/Yc62drPhYNB9/PP3oF9e+fggnSO umPbECmS83rnbKYcqKI31MfVyo2x4mptGuM/ZXvHmq+o7qk9RFbTllRNcxxv7bK2xYfP Px2qpJSWos4ZhF6SPmwRYO/Vq6N8Mnke8sEjnJNCjhstOIQ2CVmkAAIT30WjTMkcVr+E JNNDT+v6psq/p4wxsBwVKe8ZR87wWuPhyp0rNdU95dD0FB6gLVMDfqq7PkkFoSjUCWR2 4uTw== 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=Jh7uhOWJPoiS+lEtNFyxKLH1Hifc/k9ZsJ3X5DVKqirTGOiooG7O9O6n5VIBXYb6gC X9ANTy1mI6ELJVoBR9athXe/2zM5gfhMgFRWZQGwh5xU6/Rpa4gVa1VKWG4Ejs2KViR2 zVlwDf+nz/rK4uO+M+lvkS/+AtXig87Ctz7IV6PXkSiVjwzMXawWa1bjMLN6nREkW66D /GnVjxSNP8MCa1/e4k2cgyMW88aeW8ln20U9tzBm/Xnarn6vgARM+VVeeBhat6c3qU6U MoeRdx2v8L3Q5JvNCJmpMryCPftYMu+nonYS+5Wj53RCQ7aBXOvOBvylOGjuLHRn22wp 3Naw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=khNSPnO1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 i21si12024886eje.143.2020.08.17.14.59.30; Mon, 17 Aug 2020 14:59:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=khNSPnO1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1730452AbgHQPfI (ORCPT + 99 others); Mon, 17 Aug 2020 11:35:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:51902 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730168AbgHQPa2 (ORCPT ); Mon, 17 Aug 2020 11:30:28 -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 2DE7622CF8; Mon, 17 Aug 2020 15:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678227; bh=ZKVk/wxZoh+1ON43O4MrsASnLMbbya2SkuJcqE5JLhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=khNSPnO12ZfBQJk9wznhQWlMFdCBrVFtMZ2nApmGuD+JRJ4arwb6abqwyO8ukVfca uIv3NAkN986vb6/rEmFflmYncy+o6C5Qns0rfmAQ04VxgkYtWlk+2Btsc4CfwYRkGu o+2Zc4QWytZsdRhmKdWI3dW38gj3HCBghJ/hZhF0= 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.8 262/464] coresight: etmv4: Fix resource selector constant Date: Mon, 17 Aug 2020 17:13:35 +0200 Message-Id: <20200817143846.339550458@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) 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]; -- 2.25.1