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=-11.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 038ECC388F7 for ; Wed, 4 Nov 2020 10:54:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AE54E221F8 for ; Wed, 4 Nov 2020 10:54:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729538AbgKDKyG (ORCPT ); Wed, 4 Nov 2020 05:54:06 -0500 Received: from foss.arm.com ([217.140.110.172]:35034 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729519AbgKDKyC (ORCPT ); Wed, 4 Nov 2020 05:54:02 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2903113D5; Wed, 4 Nov 2020 02:54:02 -0800 (PST) Received: from [10.57.20.162] (unknown [10.57.20.162]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 438CB3F718; Wed, 4 Nov 2020 02:54:01 -0800 (PST) Subject: Re: [PATCH v3 10/26] coresight: Convert claim/disclaim operations to use access wrappers To: Mathieu Poirier Cc: linux-arm-kernel@lists.infradead.org, mike.leach@linaro.org, coresight@lists.linaro.org, linux-kernel@vger.kernel.org References: <20201028220945.3826358-1-suzuki.poulose@arm.com> <20201028220945.3826358-12-suzuki.poulose@arm.com> <20201103183625.GD2855763@xps15> From: Suzuki K Poulose Message-ID: <9d6bedd7-37b3-ff2d-51b1-7fd4d2f7024a@arm.com> Date: Wed, 4 Nov 2020 10:54:01 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201103183625.GD2855763@xps15> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/3/20 6:36 PM, Mathieu Poirier wrote: > On Wed, Oct 28, 2020 at 10:09:29PM +0000, Suzuki K Poulose wrote: >> Convert the generic CLAIM tag management APIs to use the >> device access layer abstraction. >> >> Cc: Mathieu Poirier >> Cc: Mike Leach >> Signed-off-by: Suzuki K Poulose >> --- >> drivers/hwtracing/coresight/coresight-catu.c | 6 +- >> drivers/hwtracing/coresight/coresight-core.c | 66 +++++++++++-------- >> .../hwtracing/coresight/coresight-cti-core.c | 17 +++-- >> drivers/hwtracing/coresight/coresight-etb10.c | 4 +- >> .../coresight/coresight-etm3x-core.c | 8 ++- >> .../coresight/coresight-etm4x-core.c | 4 +- >> .../hwtracing/coresight/coresight-funnel.c | 6 +- >> .../coresight/coresight-replicator.c | 16 +++-- >> .../hwtracing/coresight/coresight-tmc-etf.c | 10 +-- >> .../hwtracing/coresight/coresight-tmc-etr.c | 4 +- >> include/linux/coresight.h | 16 ++--- >> 11 files changed, 95 insertions(+), 62 deletions(-) >> >> } >> >> -static inline void coresight_set_claim_tags(void __iomem *base) >> +static inline void coresight_set_claim_tags(struct coresight_device *csdev) >> { >> - writel_relaxed(CORESIGHT_CLAIM_SELF_HOSTED, base + CORESIGHT_CLAIMSET); >> + csdev_access_relaxed_write32(&csdev->access, CORESIGHT_CLAIM_SELF_HOSTED, >> + CORESIGHT_CLAIMSET); > > Indentation > >> isb(); >> } >> >> -static inline void coresight_clear_claim_tags(void __iomem *base) >> +static inline void coresight_clear_claim_tags(struct coresight_device *csdev) >> { >> - writel_relaxed(CORESIGHT_CLAIM_SELF_HOSTED, base + CORESIGHT_CLAIMCLR); >> + csdev_access_relaxed_write32(&csdev->access, CORESIGHT_CLAIM_SELF_HOSTED, >> + CORESIGHT_CLAIMCLR); > > Indentation > >> isb(); >> } >> >> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c >> index fcf25740116c..e35d79e74e30 100644 >> --- a/drivers/hwtracing/coresight/coresight-replicator.c >> +++ b/drivers/hwtracing/coresight/coresight-replicator.c >> @@ -45,12 +45,18 @@ struct replicator_drvdata { >> >> static void dynamic_replicator_reset(struct replicator_drvdata *drvdata) >> { >> + struct coresight_device *csdev = drvdata->csdev; >> CS_UNLOCK(drvdata->base); >> >> - if (!coresight_claim_device_unlocked(drvdata->base)) { >> + if (WARN_ON(!csdev)) >> + return; > > I don't see a need for this check. Function replicator_reset() is called from > probe() where the validity of drvdata->csdev is checked just before. > Correct. We only needed drvdata->base earlier, which was fine. But we now need csdev for the reset. That check was added to make sure that we don't break the guarantee. I could take that down. Cheers Suzuki 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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 180ECC2D0A3 for ; Wed, 4 Nov 2020 10:56:04 +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 9D04420867 for ; Wed, 4 Nov 2020 10:56:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="loONL8ds" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D04420867 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com 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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=j/YEVMqIX0BatDCR80CXThHG6zVxbb9O2HPxBXfrnIg=; b=loONL8dsqXEMij5SKi12eJlAD v3rn3ABqQfred1NzTq7HTU0x/3QHPwKROo6giJBIBHafaI8vfeZ15Oum99tvaAfqOHhnPYBd5p1UB JWg3jAE2fr5GrHkq2EnQT1rGMXcAoTLMDSuBfXFBjbAgOwSiXluJMh3QszUL0c2wI6V9rBxYLI/Iu JapiAsbFcx/WybxJkkZMW8d7lL0r/Ffh4pOfeeYda4kx471+sZHx6dOPameedPsKBkn05oBxtQPLJ KhPUbwoZK7ByJdHx2TuDpdg4QdtBIS9Xlqj3BYyFWZcC4Hq73XyHyNnwNfERIuLh+jMxTCtfRzIWJ oi7Epd5IQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaGQx-0001Jx-4P; Wed, 04 Nov 2020 10:54:31 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaGQW-00017y-47 for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2020 10:54:05 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2903113D5; Wed, 4 Nov 2020 02:54:02 -0800 (PST) Received: from [10.57.20.162] (unknown [10.57.20.162]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 438CB3F718; Wed, 4 Nov 2020 02:54:01 -0800 (PST) Subject: Re: [PATCH v3 10/26] coresight: Convert claim/disclaim operations to use access wrappers To: Mathieu Poirier References: <20201028220945.3826358-1-suzuki.poulose@arm.com> <20201028220945.3826358-12-suzuki.poulose@arm.com> <20201103183625.GD2855763@xps15> From: Suzuki K Poulose Message-ID: <9d6bedd7-37b3-ff2d-51b1-7fd4d2f7024a@arm.com> Date: Wed, 4 Nov 2020 10:54:01 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20201103183625.GD2855763@xps15> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_055404_336025_DAEB8FE1 X-CRM114-Status: GOOD ( 18.95 ) 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: coresight@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mike.leach@linaro.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 11/3/20 6:36 PM, Mathieu Poirier wrote: > On Wed, Oct 28, 2020 at 10:09:29PM +0000, Suzuki K Poulose wrote: >> Convert the generic CLAIM tag management APIs to use the >> device access layer abstraction. >> >> Cc: Mathieu Poirier >> Cc: Mike Leach >> Signed-off-by: Suzuki K Poulose >> --- >> drivers/hwtracing/coresight/coresight-catu.c | 6 +- >> drivers/hwtracing/coresight/coresight-core.c | 66 +++++++++++-------- >> .../hwtracing/coresight/coresight-cti-core.c | 17 +++-- >> drivers/hwtracing/coresight/coresight-etb10.c | 4 +- >> .../coresight/coresight-etm3x-core.c | 8 ++- >> .../coresight/coresight-etm4x-core.c | 4 +- >> .../hwtracing/coresight/coresight-funnel.c | 6 +- >> .../coresight/coresight-replicator.c | 16 +++-- >> .../hwtracing/coresight/coresight-tmc-etf.c | 10 +-- >> .../hwtracing/coresight/coresight-tmc-etr.c | 4 +- >> include/linux/coresight.h | 16 ++--- >> 11 files changed, 95 insertions(+), 62 deletions(-) >> >> } >> >> -static inline void coresight_set_claim_tags(void __iomem *base) >> +static inline void coresight_set_claim_tags(struct coresight_device *csdev) >> { >> - writel_relaxed(CORESIGHT_CLAIM_SELF_HOSTED, base + CORESIGHT_CLAIMSET); >> + csdev_access_relaxed_write32(&csdev->access, CORESIGHT_CLAIM_SELF_HOSTED, >> + CORESIGHT_CLAIMSET); > > Indentation > >> isb(); >> } >> >> -static inline void coresight_clear_claim_tags(void __iomem *base) >> +static inline void coresight_clear_claim_tags(struct coresight_device *csdev) >> { >> - writel_relaxed(CORESIGHT_CLAIM_SELF_HOSTED, base + CORESIGHT_CLAIMCLR); >> + csdev_access_relaxed_write32(&csdev->access, CORESIGHT_CLAIM_SELF_HOSTED, >> + CORESIGHT_CLAIMCLR); > > Indentation > >> isb(); >> } >> >> diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c >> index fcf25740116c..e35d79e74e30 100644 >> --- a/drivers/hwtracing/coresight/coresight-replicator.c >> +++ b/drivers/hwtracing/coresight/coresight-replicator.c >> @@ -45,12 +45,18 @@ struct replicator_drvdata { >> >> static void dynamic_replicator_reset(struct replicator_drvdata *drvdata) >> { >> + struct coresight_device *csdev = drvdata->csdev; >> CS_UNLOCK(drvdata->base); >> >> - if (!coresight_claim_device_unlocked(drvdata->base)) { >> + if (WARN_ON(!csdev)) >> + return; > > I don't see a need for this check. Function replicator_reset() is called from > probe() where the validity of drvdata->csdev is checked just before. > Correct. We only needed drvdata->base earlier, which was fine. But we now need csdev for the reset. That check was added to make sure that we don't break the guarantee. I could take that down. Cheers Suzuki _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel