From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 674E610E8 for ; Wed, 22 Jun 2022 09:10:31 +0000 (UTC) X-UUID: b3ef4931bde04d52bc9f167795624ef0-20220622 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.6,REQID:e75d7dcb-cd20-4817-b6f4-7bdfc6a1aef3,OB:0,LO B:0,IP:0,URL:5,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:5 X-CID-META: VersionHash:b14ad71,CLOUDID:92732a38-5e4b-44d7-80b2-bb618cb09d29,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: b3ef4931bde04d52bc9f167795624ef0-20220622 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1180519457; Wed, 22 Jun 2022 17:10:26 +0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Wed, 22 Jun 2022 17:10:25 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 22 Jun 2022 17:10:25 +0800 Received: from mtksdccf07 (172.21.84.99) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.3 via Frontend Transport; Wed, 22 Jun 2022 17:10:25 +0800 Message-ID: <71bcd318d1bc3c730cb2587bf98d81207eafa8d6.camel@mediatek.com> Subject: Re: [PATCH v23 04/10] soc: mediatek: add mtk_mmsys_update_bits API From: Nancy.Lin To: CK Hu , Rob Herring , "Matthias Brugger" , Chun-Kuang Hu , Philipp Zabel , , AngeloGioacchino Del Regno , CC: , , Yongqiang Niu , David Airlie , "jason-jh . lin" , , , Nick Desaulniers , , , "Nathan Chancellor" , , Date: Wed, 22 Jun 2022 17:10:25 +0800 In-Reply-To: <9265790479c0822796ec7cd02ae6304014edde33.camel@mediatek.com> References: <20220620091801.27680-1-nancy.lin@mediatek.com> <20220620091801.27680-5-nancy.lin@mediatek.com> <9265790479c0822796ec7cd02ae6304014edde33.camel@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Hi CK, Thanks for the review. On Wed, 2022-06-22 at 11:01 +0800, CK Hu wrote: > Hi, Nancy: > > On Mon, 2022-06-20 at 17:17 +0800, Nancy.Lin wrote: > > Add mtk_mmsys_update_bits API. Simplify code for update mmsys reg. > > It is a preparation for adding support for mmsys config API. > > > > Signed-off-by: Nancy.Lin > > Reviewed-by: AngeloGioacchino Del Regno < > > angelogioacchino.delregno@collabora.com> > > Tested-by: AngeloGioacchino Del Regno < > > angelogioacchino.delregno@collabora.com> > > Tested-by: Bo-Chen Chen > > --- > > drivers/soc/mediatek/mtk-mmsys.c | 36 ++++++++++++++-------------- > > ---- > > 1 file changed, 16 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/soc/mediatek/mtk-mmsys.c > > b/drivers/soc/mediatek/mtk-mmsys.c > > index a74c86197d6a..b7c7cd469343 100644 > > --- a/drivers/soc/mediatek/mtk-mmsys.c > > +++ b/drivers/soc/mediatek/mtk-mmsys.c > > @@ -192,22 +192,27 @@ static int > > mtk_mmsys_find_match_drvdata(struct > > mtk_mmsys *mmsys, > > return -EINVAL; > > } > > > > +static void mtk_mmsys_update_bits(struct mtk_mmsys *mmsys, u32 > > offset, u32 mask, u32 val) > > +{ > > + u32 tmp; > > + > > + tmp = readl_relaxed(mmsys->regs + offset); > > + tmp = (tmp & ~mask) | val; > > + writel_relaxed(tmp, mmsys->regs + offset); > > +} > > + > > void mtk_mmsys_ddp_connect(struct device *dev, > > enum mtk_ddp_comp_id cur, > > enum mtk_ddp_comp_id next) > > { > > struct mtk_mmsys *mmsys = dev_get_drvdata(dev); > > const struct mtk_mmsys_routes *routes = mmsys->data->routes; > > - u32 reg; > > int i; > > > > for (i = 0; i < mmsys->data->num_routes; i++) > > - if (cur == routes[i].from_comp && next == > > routes[i].to_comp) { > > - reg = readl_relaxed(mmsys->regs + > > routes[i].addr); > > - reg &= ~routes[i].mask; > > - reg |= routes[i].val; > > - writel_relaxed(reg, mmsys->regs + > > routes[i].addr); > > - } > > + if (cur == routes[i].from_comp && next == > > routes[i].to_comp) > > + mtk_mmsys_update_bits(mmsys, routes[i].addr, > > routes[i].mask, > > + routes[i].val); > > } > > EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_connect); > > > > @@ -217,15 +222,11 @@ void mtk_mmsys_ddp_disconnect(struct device > > *dev, > > { > > struct mtk_mmsys *mmsys = dev_get_drvdata(dev); > > const struct mtk_mmsys_routes *routes = mmsys->data->routes; > > - u32 reg; > > int i; > > > > for (i = 0; i < mmsys->data->num_routes; i++) > > - if (cur == routes[i].from_comp && next == > > routes[i].to_comp) { > > - reg = readl_relaxed(mmsys->regs + > > routes[i].addr); > > - reg &= ~routes[i].mask; > > - writel_relaxed(reg, mmsys->regs + > > routes[i].addr); > > - } > > + if (cur == routes[i].from_comp && next == > > routes[i].to_comp) > > + mtk_mmsys_update_bits(mmsys, routes[i].addr, > > routes[i].mask, 0); > > } > > EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_disconnect); > > > > @@ -234,18 +235,13 @@ static int mtk_mmsys_reset_update(struct > > reset_controller_dev *rcdev, unsigned l > > { > > struct mtk_mmsys *mmsys = container_of(rcdev, struct mtk_mmsys, > > rcdev); > > unsigned long flags; > > - u32 reg; > > > > spin_lock_irqsave(&mmsys->lock, flags); > > > > - reg = readl_relaxed(mmsys->regs + mmsys->data->sw0_rst_offset); > > - > > if (assert) > > - reg &= ~BIT(id); > > + mtk_mmsys_update_bits(mmsys, mmsys->data- > > > sw0_rst_offset, BIT(id), 0); > > > > else > > - reg |= BIT(id); > > - > > - writel_relaxed(reg, mmsys->regs + mmsys->data->sw0_rst_offset); > > + mtk_mmsys_update_bits(mmsys, mmsys->data- > > > sw0_rst_offset, BIT(id), BIT(id)); > > More simple code: > mtk_mmsys_update_bits(mmsys, mmsys->data->sw0_rst_offset, BIT(id), > assert ? 0 : BIT(id)); > > After this modification, > > Reviewed-by: CK Hu > OK, I will fix it. BRs, Nancy > > > > spin_unlock_irqrestore(&mmsys->lock, flags); > > > >