From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2EBCC6379D for ; Fri, 27 Nov 2020 17:53:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E5362224A for ; Fri, 27 Nov 2020 17:53:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tZX3jsO7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732599AbgK0RxC (ORCPT ); Fri, 27 Nov 2020 12:53:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732435AbgK0RxC (ORCPT ); Fri, 27 Nov 2020 12:53:02 -0500 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FBB0C0613D1 for ; Fri, 27 Nov 2020 09:53:02 -0800 (PST) Received: by mail-pg1-x543.google.com with SMTP id j19so4877782pgg.5 for ; Fri, 27 Nov 2020 09:53:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GJXYp4Km0agTKmcKwAJJCl1K2VfvncDElm5EaJE1GqM=; b=tZX3jsO7XY1d7Bx+/7oRpk9LW+lIL2TY8F7PQ43sF9DcYtl43CZZQxZqg2Tp2jeTW0 0fJoHEufWTa+wY/cTgiJDC89f8qz2DWP3MSqguJnUojSvcukb6Ijx4ny7s7WlXPXF53w 49DeTJd4e+7hWT7QoS/gYKv6HxtJTstrmM26taT7T7SsCZW4o/ULWPCA9PbmqP1mZ0lF hqFb7eJZO8UAU1dMKrGpI8hmhthBgWvwshwEuawkkJ3lRxNnErFnTCEkTU1ojzSMjX+7 ge/GkDKxE6a7kvRiuLzpcE884df/tRjDLSlPiwabZw8jU3MNS5qF7JqrF0D9NjTBKfEE Z5eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GJXYp4Km0agTKmcKwAJJCl1K2VfvncDElm5EaJE1GqM=; b=o1O46i87B4IfwTmGgKCSIWGeUZeJBZ/fWQmpvkbf/SweufJ1ElOwDeNdGmMD4pRE2n NoahhOYG6jw70+3BZVNBZxdOdw4e51CdP54a03M291p1CCe8Xb50yP1pUNuVNV1NWP8B eA4xGGP7+pYwUbIKy9N3PGIWfQ4Ty20axbhIFXqapIsq8Ubx2mG2b6QjRQFGgd0n9idi A+r5+KYqR4NaC0rttOpOhrBAF2SfttUT+z0xeI4jlBAGnnTgTVVI8DQluj1rPSSoCgY6 RH2I5rbkcvpfyI4NqKM5QdCWbqtUs1Ae5MdUZKfBL2n0x0st8ryJGiIXxJgUiix/2wrz J0Vw== X-Gm-Message-State: AOAM5328YnbY77dWR6WyEJR4aOOU22eqsiDw5YN+AQHZ9pC9cIYyYYQH a8rC6rmMHXgNcbthl2Ls7s7aHg== X-Google-Smtp-Source: ABdhPJwipCEQSTbORTgFzsLXhdZhD5ZneY/MHZ0luRGd+ozj+YTZGkjNA7l+NBF/crg+DTUcsttiQA== X-Received: by 2002:a63:6e45:: with SMTP id j66mr7428918pgc.238.1606499582001; Fri, 27 Nov 2020 09:53:02 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id t18sm10536724pji.1.2020.11.27.09.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 09:53:01 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/15] coresight: etm4x: Fix accesses to TRCCIDCTLR1 Date: Fri, 27 Nov 2020 10:52:45 -0700 Message-Id: <20201127175256.1092685-5-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127175256.1092685-1-mathieu.poirier@linaro.org> References: <20201127175256.1092685-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suzuki K Poulose 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 --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index e67365d1ce28..af0ab2f44865 100644 --- 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_drvdata *drvdata) 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_drvdata *drvdata) 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 etmv4_drvdata *drvdata) 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) -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5195DC3E8C5 for ; Fri, 27 Nov 2020 17:55:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EDB942224A for ; Fri, 27 Nov 2020 17:55:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="O6le6Kox"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tZX3jsO7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EDB942224A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jfAxUk+6U0yZ3Zo1wFnZ6cAHHaKodK1UPWshfIOtKdo=; b=O6le6KoxOHocfvL0CPMtnhXNE m62BoLH7Z+gKlWUaw4yC0Ac4j19nuTEjDEcpA0eGA8XzLX4PIXHxJDMTzqxpbnFfotj4oWrEYzQm/ GL7ESe20rlkUTm8pdfTXeLrYyIVGvgtlbMWRDhm+h2u9/9A/YvebXZVfX5WiL+4VQ8tsGwDUBbgw4 txGWGq8oNw4pZywi0NqmCp0w4zW77576+3PrLMdzMKV/aPBkaYAXd9h2lSzN5bBvEWfI6hxUdTRpj gm4aVrkR0MF09+0KAhOAGDK/9T9fQBVSev4e0VoTu7Nwmzq9tppAd8SHfFp/k6AO2g8YhqXnTjSMu 1Sige8ilw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kihvz-0004jp-5d; Fri, 27 Nov 2020 17:53:27 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kihve-0004bm-GQ for linux-arm-kernel@lists.infradead.org; Fri, 27 Nov 2020 17:53:11 +0000 Received: by mail-pf1-x444.google.com with SMTP id n137so5189044pfd.3 for ; Fri, 27 Nov 2020 09:53:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GJXYp4Km0agTKmcKwAJJCl1K2VfvncDElm5EaJE1GqM=; b=tZX3jsO7XY1d7Bx+/7oRpk9LW+lIL2TY8F7PQ43sF9DcYtl43CZZQxZqg2Tp2jeTW0 0fJoHEufWTa+wY/cTgiJDC89f8qz2DWP3MSqguJnUojSvcukb6Ijx4ny7s7WlXPXF53w 49DeTJd4e+7hWT7QoS/gYKv6HxtJTstrmM26taT7T7SsCZW4o/ULWPCA9PbmqP1mZ0lF hqFb7eJZO8UAU1dMKrGpI8hmhthBgWvwshwEuawkkJ3lRxNnErFnTCEkTU1ojzSMjX+7 ge/GkDKxE6a7kvRiuLzpcE884df/tRjDLSlPiwabZw8jU3MNS5qF7JqrF0D9NjTBKfEE Z5eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GJXYp4Km0agTKmcKwAJJCl1K2VfvncDElm5EaJE1GqM=; b=BUHtf1Zk99yiUfQ+UG+gjL4+F8HABH9eyDr0R+dstMSHst1F5rc6+CFqWmOc52AMlB S1o6HYflWG9wo0kLUue1DegxuuIJi2NFoX2F7EW91FhZblCDsKSJT8ItftiECwDYA7JQ lOauIF6R34/27cbJVNYGtqAYqMGNcc4Sqd+rK+nxCTrKO1SJ5vS1yYyQPt9CVy1QT/aT uj8klkqfbk8q/yy6Vc0/Z3WkhzZQBK3CugbPLdwxetYIPtzminHZCFPq2hcK/QD4Yap5 mAyaCueeN94fayY500tLwA4wKn6WWIisvLZkwXU2OB3CG4YURiDTy4W1dXeRf9BdfQVi shdQ== X-Gm-Message-State: AOAM5309ijPN/QhGcm7tOahA/HMvpeaZ0AZK7Ka+WLCRsLFh+i5nRlqJ TbchHpymHopaWWRPG/TFh+uaqw== X-Google-Smtp-Source: ABdhPJwipCEQSTbORTgFzsLXhdZhD5ZneY/MHZ0luRGd+ozj+YTZGkjNA7l+NBF/crg+DTUcsttiQA== X-Received: by 2002:a63:6e45:: with SMTP id j66mr7428918pgc.238.1606499582001; Fri, 27 Nov 2020 09:53:02 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id t18sm10536724pji.1.2020.11.27.09.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Nov 2020 09:53:01 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org Subject: [PATCH 04/15] coresight: etm4x: Fix accesses to TRCCIDCTLR1 Date: Fri, 27 Nov 2020 10:52:45 -0700 Message-Id: <20201127175256.1092685-5-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127175256.1092685-1-mathieu.poirier@linaro.org> References: <20201127175256.1092685-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201127_125306_681252_B651F1D0 X-CRM114-Status: GOOD ( 14.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Suzuki K Poulose 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 --- drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c index e67365d1ce28..af0ab2f44865 100644 --- 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_drvdata *drvdata) 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_drvdata *drvdata) 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 etmv4_drvdata *drvdata) 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) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel