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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9EA7DC3ABCD for ; Mon, 12 May 2025 10:10:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6VbUAEeV39eL80nnS9lHM6fAPeFr3119Wt/l0LVAUKA=; b=myMJTzJhgBwuNtPM12va6EqO8C +OszT7bjPcczjg4Y0ymOB7VKp3RLa9+MQHu3kv6y/Ew1vtGT/kMYqz8LXCBzsWvKiZQaHf5039h2m t4K9wQS3atRTfgLuAgc8JdsPshL66yTN30rHdEQ/gRM3hKFJn1RkivmjohE5v8PihmiOWeD+shwp0 75Uit2zM0sBpi4zFCAw1N4hxz57f7a9F5ssaC69rami6Iku5CZwAmBDDTUe6IcoL1it38GSYH/fBp 7KHkYgnBa7qkTsa+dA3P4uyyAxqMHbgTVWbd+IqACtU6UayPxYHK8/5/OFQTLdTXlCipLjpeEJ4a8 YW2m4aHQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uEQ7L-00000009459-2n0p; Mon, 12 May 2025 10:10:39 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uEPNd-00000008ucy-3tga; Mon, 12 May 2025 09:23:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=6VbUAEeV39eL80nnS9lHM6fAPeFr3119Wt/l0LVAUKA=; b=S53Hq4wvnltT29AbpjlMgQx43v 3iLYXZU3GTtGx/W5RGXZaL0nSa7nMLXNN85yGaZKw3y0nwACuqQJ/qcxdzAb4qtdOSU++szpZduaA iBKDbvVhRxHqdVrA94zHvSjh4vKsv+lM0Nwa3Nb59zlA4wnAX3bP9HoClMryB23uZ5xkki8iutBhj NLWWp7IM+kBgu+vFd20ilwmEQzOd2XzkbGxFaU1fYPxVz3Okgat2tQ/y6nM/bu1jbEB7imUfg2PFl dknsed9SO2G7EuDOw3TPwG5g1ripBmiMn1SreYAACUT4W6rNxjYKVu9XzGZvYCsd+QJPF7K5a6npL qHa10Jiw==; Received: from mailgw01.mediatek.com ([216.200.240.184]) by desiato.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1uEPNZ-0000000GjpU-0NZl; Mon, 12 May 2025 09:23:24 +0000 X-UUID: b397c57a2f1211f08d385d50fb11b32d-20250512 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=6VbUAEeV39eL80nnS9lHM6fAPeFr3119Wt/l0LVAUKA=; b=O1BBzG+RGWV3E/CUJrNCj+iQEReByPNN5P9SOm/ZwCF2zAa55QP8lcVVnxg0Hh8yyZkdfPwoAV/M8fvHw/YPQOQ6G/oSys/SBX2EH01YecVuypf/qn0nrgJ8EmAkyT8gbOlv77ZeoczWVMJVYZGh57GqlE8jV503m6OQKwlYx0w=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.2.1,REQID:4f1c55d9-b5ab-4915-aa4d-0381146737ee,IP:0,UR L:0,TC:0,Content:41,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:41 X-CID-META: VersionHash:0ef645f,CLOUDID:7b75ebf9-d2be-4f65-b354-0f04e3343627,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:4|50,EDM:-3 ,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV :0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: b397c57a2f1211f08d385d50fb11b32d-20250512 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 552294916; Mon, 12 May 2025 02:23:01 -0700 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by MTKMBS09N2.mediatek.inc (172.21.101.94) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Mon, 12 May 2025 17:22:55 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Mon, 12 May 2025 17:22:55 +0800 From: Jason-JH Lin To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jassi Brar , Chun-Kuang Hu , AngeloGioacchino Del Regno , Mauro Carvalho Chehab Subject: [PATCH RESEND v5 20/20] soc: mediatek: mtk-cmdq: Remove cmdq_pkt_write() and cmdq_pkt_write_mask() Date: Mon, 12 May 2025 17:19:42 +0800 Message-ID: <20250512092252.905629-21-jason-jh.lin@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250512092252.905629-1-jason-jh.lin@mediatek.com> References: <20250512092252.905629-1-jason-jh.lin@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250512_102323_202580_CD5E7435 X-CRM114-Status: GOOD ( 15.17 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Moudy Ho , Xiandong Wang , Jason-JH Lin , Singo Chang , Chen-yu Tsai , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Project_Global_Chrome_Upstream_Group@mediatek.com, Paul-PL Chen , Xavier Chang , Nancy Lin , linux-mediatek@lists.infradead.org, Sirius Wang , Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org The original cmdq_pkt_write() and cmdq_pkt_write_mask() only supported generating GCE instructions with subsys ID. They have been replaced by cmdq_pkt_write_pa(), cmdq_pkt_write_subsys(), cmdq_pkt_write_mask_pa() and cmdq_pkt_write_mask_subsys(). These 2 functions can now be removed as they are no longer in use. Signed-off-by: Jason-JH Lin --- drivers/soc/mediatek/mtk-cmdq-helper.c | 49 ++++++++++---------------- include/linux/soc/mediatek/mtk-cmdq.h | 35 ------------------ 2 files changed, 18 insertions(+), 66 deletions(-) diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c b/drivers/soc/mediatek/mtk-cmdq-helper.c index 0a718ffa5f3b..5822a3d13bda 100644 --- a/drivers/soc/mediatek/mtk-cmdq-helper.c +++ b/drivers/soc/mediatek/mtk-cmdq-helper.c @@ -201,18 +201,6 @@ static int cmdq_pkt_mask(struct cmdq_pkt *pkt, u32 mask) return cmdq_pkt_append_command(pkt, inst); } -int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value) -{ - struct cmdq_instruction inst = { - .op = CMDQ_CODE_WRITE, - .value = value, - .offset = offset, - .subsys = subsys - }; - return cmdq_pkt_append_command(pkt, inst); -} -EXPORT_SYMBOL(cmdq_pkt_write); - int cmdq_pkt_write_pa(struct cmdq_pkt *pkt, u8 subsys /*unused*/, u32 pa_base, u16 offset, u32 value) { @@ -229,27 +217,16 @@ EXPORT_SYMBOL(cmdq_pkt_write_pa); int cmdq_pkt_write_subsys(struct cmdq_pkt *pkt, u8 subsys, u32 pa_base /*unused*/, u16 offset, u32 value) { - return cmdq_pkt_write(pkt, subsys, offset, value); + struct cmdq_instruction inst = { + .op = CMDQ_CODE_WRITE, + .value = value, + .offset = offset, + .subsys = subsys + }; + return cmdq_pkt_append_command(pkt, inst); } EXPORT_SYMBOL(cmdq_pkt_write_subsys); -int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys, - u16 offset, u32 value, u32 mask) -{ - u16 offset_mask = offset; - int err; - - if (mask != GENMASK(31, 0)) { - err = cmdq_pkt_mask(pkt, mask); - if (err < 0) - return err; - - offset_mask |= CMDQ_WRITE_ENABLE_MASK; - } - return cmdq_pkt_write(pkt, subsys, offset_mask, value); -} -EXPORT_SYMBOL(cmdq_pkt_write_mask); - int cmdq_pkt_write_mask_pa(struct cmdq_pkt *pkt, u8 subsys /*unused*/, u32 pa_base, u16 offset, u32 value, u32 mask) { @@ -267,7 +244,17 @@ EXPORT_SYMBOL(cmdq_pkt_write_mask_pa); int cmdq_pkt_write_mask_subsys(struct cmdq_pkt *pkt, u8 subsys, u32 pa_base /*unused*/, u16 offset, u32 value, u32 mask) { - return cmdq_pkt_write_mask(pkt, subsys, offset, value, mask); + u16 offset_mask = offset; + int err; + + if (mask != GENMASK(31, 0)) { + err = cmdq_pkt_mask(pkt, mask); + if (err < 0) + return err; + + offset_mask |= CMDQ_WRITE_ENABLE_MASK; + } + return cmdq_pkt_write_subsys(pkt, subsys, pa_base, offset_mask, value); } EXPORT_SYMBOL(cmdq_pkt_write_mask_subsys); diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h index 4a2acceb8581..f4663fbfb5a0 100644 --- a/include/linux/soc/mediatek/mtk-cmdq.h +++ b/include/linux/soc/mediatek/mtk-cmdq.h @@ -113,17 +113,6 @@ int cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *pkt, size_t siz */ void cmdq_pkt_destroy(struct cmdq_client *client, struct cmdq_pkt *pkt); -/** - * cmdq_pkt_write() - append write command to the CMDQ packet - * @pkt: the CMDQ packet - * @subsys: the CMDQ sub system code - * @offset: register offset from CMDQ sub system - * @value: the specified target register value - * - * Return: 0 for success; else the error code is returned - */ -int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value); - /** * cmdq_pkt_write_pa() - append write command to the CMDQ packet with pa_base * @pkt: the CMDQ packet @@ -150,19 +139,6 @@ int cmdq_pkt_write_pa(struct cmdq_pkt *pkt, u8 subsys /*unused*/, int cmdq_pkt_write_subsys(struct cmdq_pkt *pkt, u8 subsys, u32 pa_base /*unused*/, u16 offset, u32 value); -/** - * cmdq_pkt_write_mask() - append write command with mask to the CMDQ packet - * @pkt: the CMDQ packet - * @subsys: the CMDQ sub system code - * @offset: register offset from CMDQ sub system - * @value: the specified target register value - * @mask: the specified target register mask - * - * Return: 0 for success; else the error code is returned - */ -int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys, - u16 offset, u32 value, u32 mask); - /** * cmdq_pkt_write_mask_pa() - append write command with mask to the CMDQ packet with pa * @pkt: the CMDQ packet @@ -460,11 +436,6 @@ static inline int cmdq_pkt_create(struct cmdq_client *client, struct cmdq_pkt *p static inline void cmdq_pkt_destroy(struct cmdq_client *client, struct cmdq_pkt *pkt) { } -static inline int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value) -{ - return -ENOENT; -} - static inline int cmdq_pkt_write_pa(struct cmdq_pkt *pkt, u8 subsys /*unused*/, u32 pa_base, u16 offset, u32 value) { @@ -477,12 +448,6 @@ static inline int cmdq_pkt_write_subsys(struct cmdq_pkt *pkt, u8 subsys, return -ENOENT; } -static inline int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys, - u16 offset, u32 value, u32 mask) -{ - return -ENOENT; -} - static inline int cmdq_pkt_write_mask_pa(struct cmdq_pkt *pkt, u8 subsys /*unused*/, u32 pa_base, u16 offset, u32 value, u32 mask) { -- 2.43.0