From patchwork Wed Dec 23 15:33:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 351457 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp6295474jai; Wed, 23 Dec 2020 07:37:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxfNlKJJFy5Hii+jqsY4prBIQwlPOPPdWeJmIkUb8KNM0TISyFJWizWjac1cTMH4ir3VZ4S X-Received: by 2002:a17:906:d28f:: with SMTP id ay15mr23727358ejb.327.1608737845121; Wed, 23 Dec 2020 07:37:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608737845; cv=none; d=google.com; s=arc-20160816; b=sohApLvioiLv9f7BpY2ZfuDNruN1BjuaGqfo0j3jbIOM6zlQqTYWg82v2KF6TVizIn rX1xOQw1r2HAE88NlcOr411CrNA0IBIfif2N6yJ5tCdLW2kOxDZUuiEZzcJ86btmhnvm pSzE99Hg3mMcr0ealVsbASnvXedI0yqC3lGg1bJZfSK7V4iMvI8dxMTTkk6G9DHz63Di GCjwC4gEJnDZm76KH3kzbatlwXVzYj/b1YnFXR8IgnmVcGJAoCUJJl4vTy00iBN41Kx5 P3LjjqO2h1cBWw55s3ocKFLcVHaR6e2bLDB+fcbb2wsyUpYimjFLZRVoY84pIXucEJcV Wr3A== 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=PHw3dTqs3ZjWhnScjJWuVEKw+kjexSlABDgm0srTfCg=; b=r/x5bOB/BBk9pof2NHM8PxwLeGMy3PnTDlylKjdtrA0LIKJjxs/iZmzI9vBkXPGGfK KekOl6VKVkTBnH2bGKRIshgqTXWuGfDE/zOv0dm/lfLUii56HlxMjutYEky/90LWUNtJ YjpSSoeim+xSM7Xr6wL1dqpaeQchxk/xEdWBSE35PCbvyie1If67wsuBoYe+Ikp0s9de kHxMWKc9nAtvc0HmcLMetlQ1iUcMIrz5FQSBoj07VsRIQ7QW5qJpwv8OsAngF7BH8AeP 9PlAkzlxyz7R7MfSu9epRU0dUHsQMVTrPteWnxoc+qtpdw7BvbaGohJ+R2DCV6f4wD+n 653Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=SAPdaceF; 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 l14si14537114eds.359.2020.12.23.07.37.24; Wed, 23 Dec 2020 07:37:25 -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=SAPdaceF; 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 S1726642AbgLWPge (ORCPT + 14 others); Wed, 23 Dec 2020 10:36:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:44556 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728508AbgLWPeK (ORCPT ); Wed, 23 Dec 2020 10:34:10 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4359D23340; Wed, 23 Dec 2020 15:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1608737595; bh=tgkQ2CdyB5JXROwK4Jwqut7hXRS3nEgEUNC4QN/HBIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SAPdaceFlNig8r5dEhBu74Ks/8mawaROIH9RJ/zhWMhuQ849QMBfBSxdG07x56Zy1 cqK1asOtoMkR2CzFGHeajVkvJY4776T7MRleS0e+r4S3XtkftuHqpJAvP+1hyv2jPp l4tax1hUzTL6s/J7SIDiYTvopaNM9QLWUGgesCao= 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 22/40] coresight: etm4x: Fix accesses to TRCPROCSELR Date: Wed, 23 Dec 2020 16:33:23 +0100 Message-Id: <20201223150516.617664231@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 6288b4ceca868eac4bf729532f8d845e3ecbed98 upstream. TRCPROCSELR is not implemented if the TRCIDR3.NUMPROC == 0. Skip accessing the register in such cases. 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-7-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -124,8 +124,8 @@ static int etm4_enable_hw(struct etmv4_d if (coresight_timeout(drvdata->base, TRCSTATR, TRCSTATR_IDLE_BIT, 1)) dev_err(etm_dev, "timeout while waiting for Idle Trace Status\n"); - - writel_relaxed(config->pe_sel, drvdata->base + TRCPROCSELR); + if (drvdata->nr_pe) + writel_relaxed(config->pe_sel, drvdata->base + TRCPROCSELR); writel_relaxed(config->cfg, drvdata->base + TRCCONFIGR); /* nothing specific implemented */ writel_relaxed(0x0, drvdata->base + TRCAUXCTLR); @@ -1180,7 +1180,8 @@ static int etm4_cpu_save(struct etmv4_dr state = drvdata->save_state; state->trcprgctlr = readl(drvdata->base + TRCPRGCTLR); - state->trcprocselr = readl(drvdata->base + TRCPROCSELR); + if (drvdata->nr_pe) + state->trcprocselr = readl(drvdata->base + TRCPROCSELR); state->trcconfigr = readl(drvdata->base + TRCCONFIGR); state->trcauxctlr = readl(drvdata->base + TRCAUXCTLR); state->trceventctl0r = readl(drvdata->base + TRCEVENTCTL0R); @@ -1287,7 +1288,8 @@ static void etm4_cpu_restore(struct etmv writel_relaxed(state->trcclaimset, drvdata->base + TRCCLAIMSET); writel_relaxed(state->trcprgctlr, drvdata->base + TRCPRGCTLR); - writel_relaxed(state->trcprocselr, drvdata->base + TRCPROCSELR); + if (drvdata->nr_pe) + writel_relaxed(state->trcprocselr, drvdata->base + TRCPROCSELR); writel_relaxed(state->trcconfigr, drvdata->base + TRCCONFIGR); writel_relaxed(state->trcauxctlr, drvdata->base + TRCAUXCTLR); writel_relaxed(state->trceventctl0r, drvdata->base + TRCEVENTCTL0R);