Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1768304rwb; Fri, 2 Dec 2022 00:26:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf79t4FkoZy0UPHIBIW5KdvXvHgsxcI1L6SkQzBkeaPSABhzeyYBDkW8DOSoTHU1/A/nKhFp X-Received: by 2002:a05:6402:5:b0:459:cdb:92ad with SMTP id d5-20020a056402000500b004590cdb92admr46412213edu.77.1669969586727; Fri, 02 Dec 2022 00:26:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669969586; cv=none; d=google.com; s=arc-20160816; b=F46vza3xVmv/jlI+TvzIqNIi4L0de2GLAWo1p3Yk0rbCK9FGoAhpkktNQzI3QJgCLb NtdH4cLvkKLqyznBpP8HA7/Lg/KwBFtvXJqQIu6tLxWqVihepIJbWKWRNLnb4R41ULsL S3k6VAqpgcUrHfd9P65w+CvgvD6WOXj4XfP346wwFPQyIsuRfftDf+tiokWQMEaFumnh 55H7w9cszziFz5Mt2mSi2qH+13WWCtMGcWUoJ92KuvsaOTYyqGSWcAXC63KBdiccZ5p7 DRbH1r3QDYaVrw0VW9Ow/Hm+F1rbzSnjv2qwN7BTqYlJ4W2I4CNe85Ty/8g0shBEDvnx eCBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=LnoX7NMS749gHaHaMrlO+RqnODlHQ21OO457WlTgAcw=; b=ORJQW2eiodXAhHbY2KmwOw4gdcpm24NrWQDouSKYMXJ5zBb2VRMMvYX2uk4d49EBld NCzEkDfPjdqN9XPVEx5QWiHLpKsZc/4C/A1Af2vEyb4/VHeaMwbQcXPX15Q2zcNkoN6T cHKqp2rvg4dD/dRrgKKp/uhsPKg1TTBASzXnPpr8x+/rQ1sPw+23GgukNbsFIPTN3E1t ePSubHC+xQtkwh3sCcBEkIWwZkjA8NDpfEL5ErMtYkzIDg0CymYNPBLJZB28RT+Hei1t XM3NVaQ+yX/DjKlbF72LlIXxhQisoot9IynHW2G510OlhyS8OO15I5Vi4oVptPlKMz/n UCNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HsJTbbg8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sb1-20020a1709076d8100b007bc23eb6ca6si6232397ejc.811.2022.12.02.00.26.05; Fri, 02 Dec 2022 00:26:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HsJTbbg8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232327AbiLBHie (ORCPT + 82 others); Fri, 2 Dec 2022 02:38:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232399AbiLBHia (ORCPT ); Fri, 2 Dec 2022 02:38:30 -0500 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA356A808D for ; Thu, 1 Dec 2022 23:38:26 -0800 (PST) Received: by mail-pg1-x530.google.com with SMTP id w37so3739799pga.5 for ; Thu, 01 Dec 2022 23:38:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=LnoX7NMS749gHaHaMrlO+RqnODlHQ21OO457WlTgAcw=; b=HsJTbbg8xWv9wCDADe4WPc6sNNK/QYEpjFVaIE+lN+AsiHupKUSNfq5P3DejWmqvGP g1jBlr9qqom6077HCYBYKI+NwUZ6JQ1nbFqHvQsVzH2NuTNRR8Yykc4VKTHPPGYp6b1Q oQhSyxgIopIXhsUlbnVOU8mqA77jHmcPqL9lGjPw2YStKQZNwzgE5VNRCTphQDb7Fj6P WNaYBk7Q2PtKvgi8geWafakpisAPammljleADgiOaXSjk1QV2DPPAWD0ovIIOUSRMOij qQ1arhbdecZ6F2DoI/78DYvvEAnmGpN3nRq5uZLUjbHplF9QbouSPlGnkfcCQMyrkClo PKJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LnoX7NMS749gHaHaMrlO+RqnODlHQ21OO457WlTgAcw=; b=AE8rNPb6fENDJ8/pT2L492g9LN6zhNb2menE8G2RQmhOYAOp9J7+cIKW2tTVqmj05W R3U0+ZKf1VZ+qUi/5GB5XkaM2NK0Gulk1/YNVuqzaZM468ky4R0oZeKm1ss09q/mRSAe s47W+VMNcQAvP0b+pX38ifD7Hilka2wqab74bCFxEQDr2Z8IIlXFGegoVq52JjYh87U/ aFFiYzWxEVFEV4yh+M778nrx5QyTRLPnCDd1Ls9TAt91EusOSiiBaF58SMbw75FvUc9u b1bGgcEu1UcGwIXLB2f3jct7kkBgowxKmtqsuz4j8WAxqr/znqVBfdGTcw2g2s10aZTF y6mw== X-Gm-Message-State: ANoB5pndkFGK+qf5WPp8wwGWvdzB7TowE5VQDiV9rCFBBVX8FdEVk0ES R2PtZrXtu0RbsfKcIU05o+avpGXEP7nqka8= X-Received: by 2002:a62:687:0:b0:56e:924e:ee22 with SMTP id 129-20020a620687000000b0056e924eee22mr51493018pfg.34.1669966705977; Thu, 01 Dec 2022 23:38:25 -0800 (PST) Received: from thinkpad ([27.111.75.154]) by smtp.gmail.com with ESMTPSA id p3-20020a170902e74300b00189988a1a9esm4892588plf.135.2022.12.01.23.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Dec 2022 23:38:25 -0800 (PST) Date: Fri, 2 Dec 2022 13:08:18 +0530 From: Manivannan Sadhasivam To: Andrew Halaney Cc: andersson@kernel.org, agross@kernel.org, konrad.dybcio@linaro.org, jejb@linux.ibm.com, martin.petersen@oracle.com, p.zabel@pengutronix.de, linux-arm-msm@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/4] scsi: ufs: ufs-qcom: Clean up dbg_register_dump Message-ID: <20221202073818.GC5356@thinkpad> References: <20221201230810.1019834-1-ahalaney@redhat.com> <20221201230810.1019834-3-ahalaney@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221201230810.1019834-3-ahalaney@redhat.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 01, 2022 at 05:08:08PM -0600, Andrew Halaney wrote: > The current implementation has abstractions that don't give any > benefits. > > The print_fn callback (and its only callback implementation, > ufs_qcom_dump_regs_wrapper()) was only used by > ufs_qcom_print_hw_debug_reg_all() and just multiplies len by 4 > before calling ufshcd_dump_regs(). > > ufs_qcom_print_hw_debug_reg_all() is only called by > ufs_qcom_dump_dbg_regs(). > > There's no real gain in those abstractions, so let's just do the work > directly in ufs_qcom_dump_dbg_regs() (the dbg_register_dump callback). > > Signed-off-by: Andrew Halaney Reviewed-by: Manivannan Sadhasivam Thanks, Mani > --- > drivers/ufs/host/ufs-qcom.c | 106 ++++++++++++++++-------------------- > 1 file changed, 47 insertions(+), 59 deletions(-) > > diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c > index 70e25f9f8ca8..1b0dfbbdcdf3 100644 > --- a/drivers/ufs/host/ufs-qcom.c > +++ b/drivers/ufs/host/ufs-qcom.c > @@ -52,12 +52,6 @@ static struct ufs_qcom_host *rcdev_to_ufs_host(struct reset_controller_dev *rcd) > return container_of(rcd, struct ufs_qcom_host, rcdev); > } > > -static void ufs_qcom_dump_regs_wrapper(struct ufs_hba *hba, int offset, int len, > - const char *prefix, void *priv) > -{ > - ufshcd_dump_regs(hba, offset, len * 4, prefix); > -} > - > static int ufs_qcom_host_clk_get(struct device *dev, > const char *name, struct clk **clk_out, bool optional) > { > @@ -1195,58 +1189,6 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba, > return err; > } > > -static void ufs_qcom_print_hw_debug_reg_all(struct ufs_hba *hba, > - void *priv, void (*print_fn)(struct ufs_hba *hba, > - int offset, int num_regs, const char *str, void *priv)) > -{ > - u32 reg; > - struct ufs_qcom_host *host; > - > - host = ufshcd_get_variant(hba); > - if (!(host->dbg_print_en & UFS_QCOM_DBG_PRINT_REGS_EN)) > - return; > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_REG_OCSC); > - print_fn(hba, reg, 44, "UFS_UFS_DBG_RD_REG_OCSC ", priv); > - > - reg = ufshcd_readl(hba, REG_UFS_CFG1); > - reg |= UTP_DBG_RAMS_EN; > - ufshcd_writel(hba, reg, REG_UFS_CFG1); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_EDTL_RAM); > - print_fn(hba, reg, 32, "UFS_UFS_DBG_RD_EDTL_RAM ", priv); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_DESC_RAM); > - print_fn(hba, reg, 128, "UFS_UFS_DBG_RD_DESC_RAM ", priv); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_PRDT_RAM); > - print_fn(hba, reg, 64, "UFS_UFS_DBG_RD_PRDT_RAM ", priv); > - > - /* clear bit 17 - UTP_DBG_RAMS_EN */ > - ufshcd_rmwl(hba, UTP_DBG_RAMS_EN, 0, REG_UFS_CFG1); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_UAWM); > - print_fn(hba, reg, 4, "UFS_DBG_RD_REG_UAWM ", priv); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_UARM); > - print_fn(hba, reg, 4, "UFS_DBG_RD_REG_UARM ", priv); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_TXUC); > - print_fn(hba, reg, 48, "UFS_DBG_RD_REG_TXUC ", priv); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_RXUC); > - print_fn(hba, reg, 27, "UFS_DBG_RD_REG_RXUC ", priv); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_DFC); > - print_fn(hba, reg, 19, "UFS_DBG_RD_REG_DFC ", priv); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_TRLUT); > - print_fn(hba, reg, 34, "UFS_DBG_RD_REG_TRLUT ", priv); > - > - reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_TMRLUT); > - print_fn(hba, reg, 9, "UFS_DBG_RD_REG_TMRLUT ", priv); > -} > - > static void ufs_qcom_enable_test_bus(struct ufs_qcom_host *host) > { > if (host->dbg_print_en & UFS_QCOM_DBG_PRINT_TEST_BUS_EN) { > @@ -1365,10 +1307,56 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host) > > static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba) > { > + u32 reg; > + struct ufs_qcom_host *host; > + > + host = ufshcd_get_variant(hba); > + > ufshcd_dump_regs(hba, REG_UFS_SYS1CLK_1US, 16 * 4, > "HCI Vendor Specific Registers "); > > - ufs_qcom_print_hw_debug_reg_all(hba, NULL, ufs_qcom_dump_regs_wrapper); > + if (!(host->dbg_print_en & UFS_QCOM_DBG_PRINT_REGS_EN)) > + return; > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_REG_OCSC); > + ufshcd_dump_regs(hba, reg, 44 * 4, "UFS_UFS_DBG_RD_REG_OCSC "); > + > + reg = ufshcd_readl(hba, REG_UFS_CFG1); > + reg |= UTP_DBG_RAMS_EN; > + ufshcd_writel(hba, reg, REG_UFS_CFG1); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_EDTL_RAM); > + ufshcd_dump_regs(hba, reg, 32 * 4, "UFS_UFS_DBG_RD_EDTL_RAM "); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_DESC_RAM); > + ufshcd_dump_regs(hba, reg, 128 * 4, "UFS_UFS_DBG_RD_DESC_RAM "); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_PRDT_RAM); > + ufshcd_dump_regs(hba, reg, 64 * 4, "UFS_UFS_DBG_RD_PRDT_RAM "); > + > + /* clear bit 17 - UTP_DBG_RAMS_EN */ > + ufshcd_rmwl(hba, UTP_DBG_RAMS_EN, 0, REG_UFS_CFG1); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_UAWM); > + ufshcd_dump_regs(hba, reg, 4 * 4, "UFS_DBG_RD_REG_UAWM "); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_UARM); > + ufshcd_dump_regs(hba, reg, 4 * 4, "UFS_DBG_RD_REG_UARM "); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_TXUC); > + ufshcd_dump_regs(hba, reg, 48 * 4, "UFS_DBG_RD_REG_TXUC "); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_RXUC); > + ufshcd_dump_regs(hba, reg, 27 * 4, "UFS_DBG_RD_REG_RXUC "); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_DFC); > + ufshcd_dump_regs(hba, reg, 19 * 4, "UFS_DBG_RD_REG_DFC "); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_TRLUT); > + ufshcd_dump_regs(hba, reg, 34 * 4, "UFS_DBG_RD_REG_TRLUT "); > + > + reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_TMRLUT); > + ufshcd_dump_regs(hba, reg, 9 * 4, "UFS_DBG_RD_REG_TMRLUT "); > } > > /** > -- > 2.38.1 > -- மணிவண்ணன் சதாசிவம்