From patchwork Mon Aug 17 15:13:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 247796 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2732242ilo; Mon, 17 Aug 2020 08:30:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJza2XjtP5Dfpos+WBQNmfdq1+OpslpXkQPczEdlUZLzgpLUgH515uZDNa5LT2Fs/e8jAvES X-Received: by 2002:a17:906:4356:: with SMTP id z22mr16213660ejm.414.1597678234971; Mon, 17 Aug 2020 08:30:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597678234; cv=none; d=google.com; s=arc-20160816; b=dlr3ZBLFFe0/g6qRRtbxkgnxcFNcp327WFqkcdpZhlbZedn66k99fhKDXlNLYylJEc tyzLks8iy1xOdLc7LOaVCqGQIrHhyrsGNyswOvUExKrwvisngQnSY6lCrVZecrwnEDRr zJ1ApfglBU+J25Eskspxf81ErsyTgiA5cGzXUpBVXxrUaUsqvt2RUsRDQ+lPcJTByGJS zEfTh4/53UKVxhGvFgRr99s48hfNOvrsmMZiKHLZuozcR2+HBd4/XAsGOL5y+m2KCzvR Y/pSkBkAg4gsDoOUGfrcquIC8y2e8NE8il0rI1IFLJezJX1T/s7ICchH4PvSFx3GAg0F Z1YQ== 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=AflbQ4K+pymP36hWGeWaGXYJRNT5FYWBb/ez5mSpf/wB1CEogHWH03uQs9CmWLzsFn dOMmI6v+DNDSTJJK+dWOtHeM+uhgram5ozWOg0YkcttDuh4UQ+OZOvAnj3s05mzTNZYg PU9YjX8ePwb7cU6/Ypvy0PYYw348GikRKqvDVlkKGXKjRyrhVh/QdWVCCpcg93YQ/hp/ Nq0X6IsufboQkaT42F/getw0Gl5slV4ELLd7pvWhFNlRcj8PhIR2WTUd0MdLeXuGO1UK hZzFZXcDdwYRPDkfS45iKbUJwzfZX1ETuJu384N8wMNW8loAMl+oMxyYjLqUNBM1wRJM o/nw== 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 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 n9si10843288edy.290.2020.08.17.08.30.34; Mon, 17 Aug 2020 08:30:34 -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=khNSPnO1; 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 S1729980AbgHQPac (ORCPT + 15 others); Mon, 17 Aug 2020 11:30:32 -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 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];