From patchwork Wed Sep 1 13:10:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Jagdale X-Patchwork-Id: 12469437 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=-17.1 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=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 8CB52C432BE for ; Wed, 1 Sep 2021 13:14:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 4CC1F60FED for ; Wed, 1 Sep 2021 13:14:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4CC1F60FED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=marvell.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GwDmcN5pDbz3eMbF2kpg/YTJ6+fcUN8uv08M0/D3Fck=; b=eT1Gp3A0epTpmt 8AXsWTVbzEyG+BGGktUsr+xRoDyxdYxBz8CFeKvB90a6CBL9hfnRntMJlkowA16J1r/MUO6FPLz80 YhSnjCI7aJU3053/RULZSe/yP4tnpmDYxf8X8ctQxNE7VYfWDEuYbw7bTlypbtzN09boDn97ThTCo /hsZCeYAy7s6AmZDjAUVwTvrKhWmx5UXXSESYQ+l5+y4WDa1QnARp5DX2QMR9k2aKCsmBXUc9AQrD PRpdUMvS8XGqMN+879PSbRekthi67/lljIg21/yJ0PtMiVxKMduYz/LyPUUAvZeqGwvEORmPsVOXw 45h1BdKhfcwc8uGBeDxQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLQ2C-0066TW-SU; Wed, 01 Sep 2021 13:12:09 +0000 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLQ25-0066S9-Js for linux-arm-kernel@lists.infradead.org; Wed, 01 Sep 2021 13:12:06 +0000 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 181CH1Vm016616; Wed, 1 Sep 2021 06:11:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=v2Ev/doqGuF9r2VSUMtM634LLF/XzeIAP1SYwoOMMjw=; b=J94JkApCG0lrE5C0Hg2AO1gFu5nSeRfYEg+cub8HHQIT5e48BuI0BrqZLA/zHy6a+pOB zSJn5nccUjdPdxw9x9pOTqCIWEXEL1uTiLNGdmYX6VFnRWFM/dPGEmFC7iOaqXsDEO5A MHK+akJx3tO58tfYB05sBt6YpNhp0tArfRQh4IlWkfx2MH5fiH+6Tbzx2UniXaRTaXmq rGleIIEH5Iu3MkrXGT7TWGVyEfVTLr41DiwiPXX68ez/rZLnPzY8Lfny24JBS/XW4V8s uPiB7MrJJbqpMsjCeeoYT5u/E0O4lMdb+PBoqNqqE1UZMr0cRPgIEqyQVs13iA0ZAFa3 Ig== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3at0axa8qv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 01 Sep 2021 06:11:55 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 1 Sep 2021 06:11:53 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Wed, 1 Sep 2021 06:11:53 -0700 Received: from BG-SER530.marvell.com (BG-SER530.marvell.com [10.28.10.218]) by maili.marvell.com (Postfix) with ESMTP id D07C63F708A; Wed, 1 Sep 2021 06:11:48 -0700 (PDT) From: Tanmay Jagdale To: , , , , CC: , , , , , , , Tanmay Jagdale Subject: [PATCH 1/2] dt-bindings: coresight: Add burst size for TMC Date: Wed, 1 Sep 2021 18:40:48 +0530 Message-ID: <20210901131049.1365367-2-tanmay@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210901131049.1365367-1-tanmay@marvell.com> References: <20210901131049.1365367-1-tanmay@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: 5t0ZPzD4E4AdLGprPxjtZNi0iqasnd_S X-Proofpoint-ORIG-GUID: 5t0ZPzD4E4AdLGprPxjtZNi0iqasnd_S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-01_04,2021-09-01_01,2020-04-07_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210901_061201_825559_742AEDE8 X-CRM114-Status: GOOD ( 14.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add "arm,max-burst-size" optional property for TMC ETR. If specified, this value indicates the maximum burst size that can be initiated by TMC on the AXI bus. Signed-off-by: Tanmay Jagdale Reviewed-by: Mike Leach Acked-by: Rob Herring --- Documentation/devicetree/bindings/arm/coresight.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt index 7f9c1ca87487..7971f8dba2ee 100644 --- a/Documentation/devicetree/bindings/arm/coresight.txt +++ b/Documentation/devicetree/bindings/arm/coresight.txt @@ -127,6 +127,11 @@ its hardware characteristcs. * arm,scatter-gather: boolean. Indicates that the TMC-ETR can safely use the SG mode on this system. + * arm,max-burst-size: The maximum burst size initiated by TMC on the + AXI master interface. The burst size can be in the range [0..15], + the setting supports one data transfer per burst upto a maximum of + 16 data transfers per burst. + * Optional property for CATU : * interrupts : Exactly one SPI may be listed for reporting the address error From patchwork Wed Sep 1 13:10:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Jagdale X-Patchwork-Id: 12469439 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=-17.1 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 AAE2AC4320A for ; Wed, 1 Sep 2021 13:14:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 78D0D61059 for ; Wed, 1 Sep 2021 13:14:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 78D0D61059 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=marvell.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2hzX5/YIU2XQSFQRKhfdIe8ywW9ABAp5okgIKXs4vls=; b=tHnbnZz2j3AsyX FkmPwroqGcuoEDITmROTr6wY1l3CK3AOfeKC+/xC2tCfy7F/C7M0GAvLQMEXYqsEqy95b7NQu1vfI L9iAQvQIA+iqYvg+wE9dDJ4C9I1HofofrM5JChaZtAm+7V1M/haD37XoC8fTHjeYuIMJtZZLIxErB CoiiJ23/RdxYBGuMz2uFZfrhyUHmv/apXVltonynEZKmf4pK8eirS0bs2b6fxx6Rk7yYqEdjs9Ulv HbhRjomWHsxF7jzH4Y7DvmYYE/MWqegDEB6XxRJuB3PusPrYvlrsFFbCeeRZ0YB9QMWFMx9v//VRa Rr743K2ZeTZ3yDg4X9SQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLQ2f-0066Yl-7O; Wed, 01 Sep 2021 13:12:37 +0000 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mLQ2Y-0066XI-92 for linux-arm-kernel@lists.infradead.org; Wed, 01 Sep 2021 13:12:34 +0000 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 181CH8ud017734; Wed, 1 Sep 2021 06:12:24 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=RaPX2R4HApZhsQ/JoRdzUb2eFsrThAz7muo+U+Fr4To=; b=Sy030NaZKg77MDCsgCvI9z1HPLTNOJU/GHjaVEXaLGLCO66TJ86yblYWbwsrcJLmQozS O98UfbIkSPs/07Tlbsy5YLaYVofQmTv9VtVK1ffg3vGO3K4t8nmoEalR+F+ieKBKj/31 RwF6Vha5tZ8awY8EHQ/arYxQY46TmjEGYoXaQ27yOJE/JmAAgWgRnJ+scxHI/G3qr1u5 9OEWsml6IXsVitAx1FXoJFR6nf4NhNd7KXANY9jPll1QRSx71NJ0rKYoW6X9JP0x2O1x lb6uBMN0rsxutYBtcay0TNKtSwzGOweoVHSMY7pGjbfx3ktDZcKdsQUwFTkDpRCeHez6 JQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com with ESMTP id 3at0axa8st-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 01 Sep 2021 06:12:24 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 1 Sep 2021 06:12:22 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Wed, 1 Sep 2021 06:12:22 -0700 Received: from BG-SER530.marvell.com (BG-SER530.marvell.com [10.28.10.218]) by maili.marvell.com (Postfix) with ESMTP id 138983F7090; Wed, 1 Sep 2021 06:12:17 -0700 (PDT) From: Tanmay Jagdale To: , , , , CC: , , , , , , , Tanmay Jagdale Subject: [PATCH 2/2] coresight: tmc: Configure AXI write burst size Date: Wed, 1 Sep 2021 18:40:49 +0530 Message-ID: <20210901131049.1365367-3-tanmay@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210901131049.1365367-1-tanmay@marvell.com> References: <20210901131049.1365367-1-tanmay@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: 3FkIByxMkm6PBrXxBEQ21cRETc2wTf6P X-Proofpoint-ORIG-GUID: 3FkIByxMkm6PBrXxBEQ21cRETc2wTf6P X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-09-01_04,2021-09-01_01,2020-04-07_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210901_061230_477755_41FC4A07 X-CRM114-Status: GOOD ( 23.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The current driver sets the write burst size initiated by TMC-ETR on AXI bus to a fixed value of 16. Make this configurable by reading the value specified in fwnode. If not specified, then default to 16. Introduced a "max_burst_size" variable in tmc_drvdata structure to facilitate this change. Signed-off-by: Tanmay Jagdale Reviewed-by: Mike Leach --- .../hwtracing/coresight/coresight-tmc-core.c | 21 +++++++++++++++++-- .../hwtracing/coresight/coresight-tmc-etr.c | 3 ++- drivers/hwtracing/coresight/coresight-tmc.h | 6 +++++- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c index 74c6323d4d6a..d0276af82494 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-core.c +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c @@ -432,6 +432,21 @@ static u32 tmc_etr_get_default_buffer_size(struct device *dev) return size; } +static u32 tmc_etr_get_max_burst_size(struct device *dev) +{ + u32 burst_size; + + if (fwnode_property_read_u32(dev->fwnode, "arm,max-burst-size", + &burst_size)) + return TMC_AXICTL_WR_BURST_16; + + /* Only permissible values are 0 to 15 */ + if (burst_size > 0xF) + burst_size = TMC_AXICTL_WR_BURST_16; + + return burst_size; +} + static int tmc_probe(struct amba_device *adev, const struct amba_id *id) { int ret = 0; @@ -469,10 +484,12 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) /* This device is not associated with a session */ drvdata->pid = -1; - if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) + if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) { drvdata->size = tmc_etr_get_default_buffer_size(dev); - else + drvdata->max_burst_size = tmc_etr_get_max_burst_size(dev); + } else { drvdata->size = readl_relaxed(drvdata->base + TMC_RSZ) * 4; + } desc.dev = dev; desc.groups = coresight_tmc_groups; diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c index acdb59e0e661..0ac2a611110b 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c @@ -982,7 +982,8 @@ static void __tmc_etr_enable_hw(struct tmc_drvdata *drvdata) axictl = readl_relaxed(drvdata->base + TMC_AXICTL); axictl &= ~TMC_AXICTL_CLEAR_MASK; - axictl |= (TMC_AXICTL_PROT_CTL_B1 | TMC_AXICTL_WR_BURST_16); + axictl |= TMC_AXICTL_PROT_CTL_B1; + axictl |= TMC_AXICTL_WR_BURST(drvdata->max_burst_size); axictl |= TMC_AXICTL_AXCACHE_OS; if (tmc_etr_has_cap(drvdata, TMC_ETR_AXI_ARCACHE)) { diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h index b91ec7dde7bc..6bec20a392b3 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.h +++ b/drivers/hwtracing/coresight/coresight-tmc.h @@ -70,7 +70,8 @@ #define TMC_AXICTL_PROT_CTL_B0 BIT(0) #define TMC_AXICTL_PROT_CTL_B1 BIT(1) #define TMC_AXICTL_SCT_GAT_MODE BIT(7) -#define TMC_AXICTL_WR_BURST_16 0xF00 +#define TMC_AXICTL_WR_BURST(v) (((v) & 0xf) << 8) +#define TMC_AXICTL_WR_BURST_16 0xf /* Write-back Read and Write-allocate */ #define TMC_AXICTL_AXCACHE_OS (0xf << 2) #define TMC_AXICTL_ARCACHE_OS (0xf << 16) @@ -174,6 +175,8 @@ struct etr_buf { * @etr_buf: details of buffer used in TMC-ETR * @len: size of the available trace for ETF/ETB. * @size: trace buffer size for this TMC (common for all modes). + * @max_burst_size: The maximum burst size that can be initiated by + * TMC-ETR on AXI bus. * @mode: how this TMC is being used. * @config_type: TMC variant, must be of type @tmc_config_type. * @memwidth: width of the memory interface databus, in bytes. @@ -198,6 +201,7 @@ struct tmc_drvdata { }; u32 len; u32 size; + u32 max_burst_size; u32 mode; enum tmc_config_type config_type; enum tmc_mem_intf_width memwidth;