From patchwork Wed Dec 23 15:33:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 351454 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp6294155jai; Wed, 23 Dec 2020 07:35:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIEELOrU2AjanPftgz/czeKuSqyP6ciUp9KHb/GPrlI6WaSoh3huCAkeSWcDjmuFqyB3hO X-Received: by 2002:aa7:d3cc:: with SMTP id o12mr26272416edr.235.1608737735857; Wed, 23 Dec 2020 07:35:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608737735; cv=none; d=google.com; s=arc-20160816; b=LFr4gqmDHdMSDVTFVPx+9VA8Ma7IEO0ynid5HZQSp7+FAupJiM/l5csW4YIz5KmX9U 3SDWVer/U8+38CHOQBHmVPqTICzClLfdbcbtGO+7vkf/J0vAWtzuUCG8odB+dgUG+pi5 y+7sTDhou8/dWaNPR/xcFMfG35vQBxMWNExTDc70isRQf7vrtORS6StEOfPbu0T7ofeW mCfpe81IfvDX7orMh5ikFGkTS+p2gkr5jkon7uq04wZjWwNLKpjPb3+2UvbFSEEveeo+ 0x3g4qrOT9ph6vLpOu1pv1P6kTntvuQODtmXYDIdDUc1HcMCFXoWb8GhC3YVQ5CvRKiw jovQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ddEin7ho+v+RMsKVCVQoyohXiB8jXNjNvEzAfShwGZI=; b=Q03LKHbcLe7HdkG8Oe2QvBXPjkvlYUQQb1i6wpQP986UTO6lMIb21UVwg9rIvFmxbt 26Wl29ZbTO0TwUg7akSABdFEKd8sS0lcUNZfvamOe6YvTAs8/quCJN3fXbHNIl5FrByo gh4wTz7sZz4D/gGACwOwBjwJU7PwNJjao0UthVkRkGAGN0KX4lqP9PWp1LUFcZxbfO/p wuOw++Fp85qzbxF43c89AmVzq5h8DCHWIJSLKt+fsq543tEVibL4xmolb3UZMXOuD9lB 8bJUH7MGxDkeQMiOF2bdFbU4bcRMwUqJzSQhebe8Cn8x70ECbYfKSAEdjLg6y97xrDF3 rbIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cRJtrii2; 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=pass (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 n18si12371307ejr.448.2020.12.23.07.35.35; Wed, 23 Dec 2020 07:35:35 -0800 (PST) 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=@linuxfoundation.org header.s=korg header.b=cRJtrii2; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728607AbgLWPeM (ORCPT + 14 others); Wed, 23 Dec 2020 10:34:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:45138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728588AbgLWPeM (ORCPT ); Wed, 23 Dec 2020 10:34:12 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id AD84E23381; Wed, 23 Dec 2020 15:33:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1608737591; bh=ZedZKbMJqx55QuPuIzHkL77G2DoZZJhKEZNIs1Nag8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cRJtrii21ZsqCvOOFNae6uji8wfvn3gwqNlD2ogoDN/sTBLzYeFomjiOcl9CtTPs7 sZR+2tgW/tKPV7Jvx2QgkQUuRIuDhIfckv6FZLx6vb66uWdpRAlaNkSYV1/lNImQO4 OtfOEJb5OWu/pms/xCnQCdhNB6tlflTHvw/mMnDU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mathieu Poirier , Mike Leach , Suzuki K Poulose Subject: [PATCH 5.10 21/40] coresight: etm4x: Fix accesses to TRCCIDCTLR1 Date: Wed, 23 Dec 2020 16:33:22 +0100 Message-Id: <20201223150516.566047670@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201223150515.553836647@linuxfoundation.org> References: <20201223150515.553836647@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Suzuki K Poulose commit f2603b22e3d2dcffd8b0736e5c68df497af6bc84 upstream. The TRCCIDCTLR1 is only implemented if TRCIDR4.NUMCIDC > 4. Don't touch the register if it is not implemented. Cc: stable@vger.kernel.org Cc: Mathieu Poirier Cc: Mike Leach Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier Link: https://lore.kernel.org/r/20201127175256.1092685-5-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -187,7 +187,8 @@ static int etm4_enable_hw(struct etmv4_d writeq_relaxed(config->ctxid_pid[i], drvdata->base + TRCCIDCVRn(i)); writel_relaxed(config->ctxid_mask0, drvdata->base + TRCCIDCCTLR0); - writel_relaxed(config->ctxid_mask1, drvdata->base + TRCCIDCCTLR1); + if (drvdata->numcidc > 4) + writel_relaxed(config->ctxid_mask1, drvdata->base + TRCCIDCCTLR1); for (i = 0; i < drvdata->numvmidc; i++) writeq_relaxed(config->vmid_val[i], @@ -1241,7 +1242,8 @@ static int etm4_cpu_save(struct etmv4_dr state->trcvmidcvr[i] = readq(drvdata->base + TRCVMIDCVRn(i)); state->trccidcctlr0 = readl(drvdata->base + TRCCIDCCTLR0); - state->trccidcctlr1 = readl(drvdata->base + TRCCIDCCTLR1); + if (drvdata->numcidc > 4) + state->trccidcctlr1 = readl(drvdata->base + TRCCIDCCTLR1); state->trcvmidcctlr0 = readl(drvdata->base + TRCVMIDCCTLR0); if (drvdata->numvmidc > 4) @@ -1352,7 +1354,8 @@ static void etm4_cpu_restore(struct etmv drvdata->base + TRCVMIDCVRn(i)); writel_relaxed(state->trccidcctlr0, drvdata->base + TRCCIDCCTLR0); - writel_relaxed(state->trccidcctlr1, drvdata->base + TRCCIDCCTLR1); + if (drvdata->numcidc > 4) + writel_relaxed(state->trccidcctlr1, drvdata->base + TRCCIDCCTLR1); writel_relaxed(state->trcvmidcctlr0, drvdata->base + TRCVMIDCCTLR0); if (drvdata->numvmidc > 4)