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=-15.6 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,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 6BEFFC433E0 for ; Thu, 4 Feb 2021 13:05:49 +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 F422864F58 for ; Thu, 4 Feb 2021 13:05:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F422864F58 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.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-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FK9UqoBl4Rc33f+q4K7YJBL6Z/lM6G4+oJ1kftDYNz4=; b=lPZzDroDyzWqchNWmww9c7iFr T7vAay8h84AIH4+qb9lmyLV27tNLIeVVlS4Gzw9RqqFohpjbf0DmViQitLf4xqaUXiiXXWPPDiNKM 9IM9D5xhic/TwtQlR6RMTvaz1MRkjXmjnOdJFRH2nzpceBApEhcItNaHcPKZIG5Yk8OM84fkuXdx/ +/BsqBW8KnrpfPHZ5+BOs/e8GnLOTXfC/AfPkyrhVg9GSAdAr/ZWufIIQ+rGMofDLTCULybqFNFnC EklpxxPw7hCihH7OwgbLhbqrYyROm0dasRYWRTK0STozyoHTUpUh0LFTZexYLd/wdtAoYSsy0c40I cQGPWoRUg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7eJ3-0004QJ-JB; Thu, 04 Feb 2021 13:04:21 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7eJ0-0004On-SS; Thu, 04 Feb 2021 13:04:20 +0000 X-UUID: d0dff800573d42e895f39f7d001837e9-20210204 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=SpRqj/dknGv3nf1Y9M0DZAALgLAblS1eViDhlZGJTg4=; b=rYrJ28mgUeE2ohBPZzHotCkVm9SPupNttQ3bouX/Y2Rzfuzlw0L4XZvYOnxMaJXaTEIHJ4IjDeVhmDnj3U9WsrVy196MaO7A24wEuzT1OyRyPp3386l1jindZlcS/XSWcgUgGMjfGQFP2J4Ztq2QjY08JWlX2udfzY0uvoIxd00=; X-UUID: d0dff800573d42e895f39f7d001837e9-20210204 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1163042676; Thu, 04 Feb 2021 05:04:10 -0800 Received: from MTKMBS07N2.mediatek.inc (172.21.101.141) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 4 Feb 2021 05:04:09 -0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 4 Feb 2021 21:04:07 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 4 Feb 2021 21:04:07 +0800 Message-ID: <1612443847.32298.2.camel@mtksdaap41> Subject: Re: [PATCH v4 2/5] soc: mediatek: pwrap: add arbiter capability From: Hsin-hsiung Wang To: Nicolas Boichat Date: Thu, 4 Feb 2021 21:04:07 +0800 In-Reply-To: References: <1605700894-32699-1-git-send-email-hsin-hsiung.wang@mediatek.com> <1605700894-32699-3-git-send-email-hsin-hsiung.wang@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_080419_110083_D7FD10FB X-CRM114-Status: GOOD ( 34.86 ) 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: Devicetree List , Argus Lin , srv_heupstream , Fei Shao , lkml , Rob Herring , "moderated list:ARM/Mediatek SoC support" , Matthias Brugger , linux-arm Mailing List 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 Hi, On Mon, 2020-12-21 at 10:33 +0800, Nicolas Boichat wrote: > On Wed, Nov 18, 2020 at 8:08 PM Hsin-Hsiung Wang > wrote: > > > > Add arbiter capability for pwrap driver. > > The arbiter capability uses new design to judge the priority and latency > > for multi-channel. > > This patch is preparing for adding mt6873/8192 pwrap support. > > > > Signed-off-by: Hsin-Hsiung Wang > > --- > > drivers/soc/mediatek/mtk-pmic-wrap.c | 57 ++++++++++++++++++++++++++++++------ > > 1 file changed, 48 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c > > index c897205..5678f46 100644 > > --- a/drivers/soc/mediatek/mtk-pmic-wrap.c > > +++ b/drivers/soc/mediatek/mtk-pmic-wrap.c > > @@ -25,10 +25,12 @@ > > > > /* macro for wrapper status */ > > #define PWRAP_GET_WACS_RDATA(x) (((x) >> 0) & 0x0000ffff) > > +#define PWRAP_GET_WACS_ARB_FSM(x) (((x) >> 1) & 0x00000007) > > #define PWRAP_GET_WACS_FSM(x) (((x) >> 16) & 0x00000007) > > #define PWRAP_GET_WACS_REQ(x) (((x) >> 19) & 0x00000001) > > #define PWRAP_STATE_SYNC_IDLE0 BIT(20) > > #define PWRAP_STATE_INIT_DONE0 BIT(21) > > +#define PWRAP_STATE_INIT_DONE1 BIT(15) > > > > /* macro for WACS FSM */ > > #define PWRAP_WACS_FSM_IDLE 0x00 > > @@ -74,6 +76,7 @@ > > #define PWRAP_CAP_DCM BIT(2) > > #define PWRAP_CAP_INT1_EN BIT(3) > > #define PWRAP_CAP_WDT_SRC1 BIT(4) > > +#define PWRAP_CAP_ARB BIT(5) > > > > /* defines for slave device wrapper registers */ > > enum dew_regs { > > @@ -340,6 +343,8 @@ enum pwrap_regs { > > PWRAP_DCM_DBC_PRD, > > PWRAP_EINT_STA0_ADR, > > PWRAP_EINT_STA1_ADR, > > + PWRAP_SWINF_2_WDATA_31_0, > > + PWRAP_SWINF_2_RDATA_31_0, > > > > /* MT2701 only regs */ > > PWRAP_ADC_CMD_ADDR, > > @@ -1108,14 +1113,22 @@ static void pwrap_writel(struct pmic_wrapper *wrp, u32 val, enum pwrap_regs reg) > > > > static bool pwrap_is_fsm_idle(struct pmic_wrapper *wrp) > > { > > - u32 val = pwrap_readl(wrp, PWRAP_WACS2_RDATA); > > + u32 val; > > + > > + val = pwrap_readl(wrp, PWRAP_WACS2_RDATA); > > + if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > > + return PWRAP_GET_WACS_ARB_FSM(val) == PWRAP_WACS_FSM_IDLE; > > > > return PWRAP_GET_WACS_FSM(val) == PWRAP_WACS_FSM_IDLE; > > } > > > > static bool pwrap_is_fsm_vldclr(struct pmic_wrapper *wrp) > > { > > - u32 val = pwrap_readl(wrp, PWRAP_WACS2_RDATA); > > + u32 val; > > + > > + val = pwrap_readl(wrp, PWRAP_WACS2_RDATA); > > + if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > > + return PWRAP_GET_WACS_ARB_FSM(val) == PWRAP_WACS_FSM_WFVLDCLR; > > This code is now copied twice. Do you think it'd be better to create a > new function? > > static u32 pwrap_get_fsm_state(struct pmic_wrapper *wrp) { > if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > return PWRAP_GET_WACS_ARB_FSM(val); > else > return PWRAP_GET_WACS_FSM(val); > } > Thanks for the review. I will update it in the next patch. > > > > return PWRAP_GET_WACS_FSM(val) == PWRAP_WACS_FSM_WFVLDCLR; > > } > > @@ -1165,6 +1178,7 @@ static int pwrap_wait_for_state(struct pmic_wrapper *wrp, > > static int pwrap_read16(struct pmic_wrapper *wrp, u32 adr, u32 *rdata) > > { > > int ret; > > + u32 val; > > > > ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_idle); > > if (ret) { > > @@ -1172,13 +1186,21 @@ static int pwrap_read16(struct pmic_wrapper *wrp, u32 adr, u32 *rdata) > > return ret; > > } > > > > - pwrap_writel(wrp, (adr >> 1) << 16, PWRAP_WACS2_CMD); > > + if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > > + val = adr; > > + else > > + val = (adr >> 1) << 16; > > + pwrap_writel(wrp, val, PWRAP_WACS2_CMD); > > > > ret = pwrap_wait_for_state(wrp, pwrap_is_fsm_vldclr); > > if (ret) > > return ret; > > > > - *rdata = PWRAP_GET_WACS_RDATA(pwrap_readl(wrp, PWRAP_WACS2_RDATA)); > > + if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > > + val = pwrap_readl(wrp, PWRAP_SWINF_2_RDATA_31_0); > > + else > > + val = pwrap_readl(wrp, PWRAP_WACS2_RDATA); > > + *rdata = PWRAP_GET_WACS_RDATA(val); > > > > pwrap_writel(wrp, 1, PWRAP_WACS2_VLDCLR); > > > > @@ -1228,8 +1250,13 @@ static int pwrap_write16(struct pmic_wrapper *wrp, u32 adr, u32 wdata) > > return ret; > > } > > > > - pwrap_writel(wrp, (1 << 31) | ((adr >> 1) << 16) | wdata, > > - PWRAP_WACS2_CMD); > > + if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) { > > + pwrap_writel(wrp, wdata, PWRAP_SWINF_2_WDATA_31_0); > > + pwrap_writel(wrp, BIT(29) | adr, PWRAP_WACS2_CMD); > > + } else { > > + pwrap_writel(wrp, BIT(31) | ((adr >> 1) << 16) | wdata, > > + PWRAP_WACS2_CMD); > > + } > > > > return 0; > > } > > @@ -2022,6 +2049,7 @@ MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl); > > static int pwrap_probe(struct platform_device *pdev) > > { > > int ret, irq; > > + u32 mask_done; > > struct pmic_wrapper *wrp; > > struct device_node *np = pdev->dev.of_node; > > const struct of_device_id *of_slave_id = NULL; > > @@ -2116,14 +2144,21 @@ static int pwrap_probe(struct platform_device *pdev) > > } > > } > > > > - if (!(pwrap_readl(wrp, PWRAP_WACS2_RDATA) & PWRAP_STATE_INIT_DONE0)) { > > + if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > > + mask_done = PWRAP_STATE_INIT_DONE1; > > + else > > + mask_done = PWRAP_STATE_INIT_DONE0; > > + > > + if (!(pwrap_readl(wrp, PWRAP_WACS2_RDATA) & mask_done)) { > > dev_dbg(wrp->dev, "initialization isn't finished\n"); > > ret = -ENODEV; > > goto err_out2; > > } > > > > /* Initialize watchdog, may not be done by the bootloader */ > > - pwrap_writel(wrp, 0xf, PWRAP_WDT_UNIT); > > + if (!HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > > + pwrap_writel(wrp, 0xf, PWRAP_WDT_UNIT); > > + > > To expand on Matthias' question on v3 > (https://patchwork.kernel.org/project/linux-mediatek/patch/1600686235-27979-3-git-send-email-hsin-hsiung.wang@mediatek.com/): > is there any PWRAP implementation where a design with an arbiter is > still able to control the watchdog? > > If not, at the very least, it'd be good to expand the comment above > (e.g. "designs with arbiter support cannot change the watchdog > timer"). > No, there is no other wrap design with an arbiter to control the watchdog. Thanks for the comment, I will update the comment in next patch. > > /* > > * Since STAUPD was not used on mt8173 platform, > > * so STAUPD of WDT_SRC which should be turned off > > @@ -2132,7 +2167,11 @@ static int pwrap_probe(struct platform_device *pdev) > > if (HAS_CAP(wrp->master->caps, PWRAP_CAP_WDT_SRC1)) > > pwrap_writel(wrp, wrp->master->wdt_src, PWRAP_WDT_SRC_EN_1); > > > > - pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN); > > + if (!HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > > Please invert this if test: > > if (HAS_CAP(wrp->master->caps, PWRAP_CAP_ARB)) > ... 0x3 ... > else > ... 0x1 ... > Thanks for the review. I will update it in the next patch. > > + pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN); > > + else > > + pwrap_writel(wrp, 0x3, PWRAP_TIMER_EN); > > + > > pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN); > > /* > > * We add INT1 interrupt to handle starvation and request exception > > -- > > 2.6.4 > > _______________________________________________ > > Linux-mediatek mailing list > > Linux-mediatek@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-mediatek _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel