From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) (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 77B2E263F43; Thu, 14 Aug 2025 07:04:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.244.123.138 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755155065; cv=none; b=Uy+QbQXrB2xSo38JTZKlbp1s48E3ZwZ6aQaKP/g98F0WBRsnxg2ai6lLmJ6FNaeJyys/7x3mVq6mXCHt8/Ldtw+bK0R/bMp3xGf0DgssSOJq1AHMlu1JVaUa7vOkxnEcNyLrPI9tlcbB/dblOtF0Vyp1jmEMo//EG3EkiVLdmzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755155065; c=relaxed/simple; bh=e1sgwx8KRJWlbhltQvSaPfHyJiGCS4/cY8PihFhlS5Y=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=l7FRzF4P1V+QKMnBP/f1/8OGT2X5K1vw0UM/cmlgexBAM6ve4EkVx7Phr1vAqh1bKXFa5lacP2QEL/u4pM+8TsjMkE+qIgnZu32aOwFhLEbES1tjwGHzlpCiDpe8RlTXkOkUr2F4k+NiwxnJBCOER1Bh3Ye+JoR6AOFQuEintVo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=Gmx9gsIr; arc=none smtp.client-ip=60.244.123.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Gmx9gsIr" X-UUID: e2438ee078dc11f08729452bf625a8b4-20250814 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=5Mv8o+CLdc0s+Yis2yYmhEh9yXB8UEN1ytQldmXuX9Q=; b=Gmx9gsIr6s/K16cRT04K54MrEGwA43He2tzcll6vSyUdlHbyoDtxynLjf1thAt97/5TqADwsn4SK6/TjI9HmCgAXrFe1idZBBGNn/OlWAQuvuJu3aleiMIp8fr3a5HcQ3TNkUxZw1xAK9r8GYFtkOuuCGKa1CUxdWoV7JR2bRpY=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.3,REQID:dd46fea3-4876-420b-96c8-4b70cf643c7a,IP:0,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:0 X-CID-META: VersionHash:f1326cf,CLOUDID:c2407844-18c5-4075-a135-4c0afe29f9d6,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:-5,Content:0|15|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: 2,SSN|SDN X-CID-BAS: 2,SSN|SDN,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-CID-RHF: D41D8CD98F00B204E9800998ECF8427E X-UUID: e2438ee078dc11f08729452bf625a8b4-20250814 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1528078012; Thu, 14 Aug 2025 15:04:13 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) 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; Thu, 14 Aug 2025 15:04:11 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Thu, 14 Aug 2025 15:04:11 +0800 From: Xiandong Wang To: Jassi Brar , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Houlong Wei CC: , , , , , , , , Xiandong Wang Subject: [PATCH v1 4/4] [v1,04/04]mailbox: mtk-cmdq: modify clk api for suspend/resume Date: Thu, 14 Aug 2025 15:03:56 +0800 Message-ID: <20250814070401.13432-4-xiandong.wang@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250814070401.13432-1-xiandong.wang@mediatek.com> References: <20250814070401.13432-1-xiandong.wang@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain modify the clk api for suspend and resume, modify the api for suspend and resume to disable/enable clk, so it can disable/enable module clk and parent clk successfully. Signed-off-by: Xiandong Wang --- drivers/mailbox/mtk-cmdq-mailbox.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c index 92756f5793fa..aa004bcc2dea 100644 --- a/drivers/mailbox/mtk-cmdq-mailbox.c +++ b/drivers/mailbox/mtk-cmdq-mailbox.c @@ -142,14 +142,14 @@ static void cmdq_init(struct cmdq *cmdq) { int i; - WARN_ON(clk_bulk_enable(cmdq->pdata->gce_num, cmdq->clocks)); + WARN_ON(clk_bulk_prepare_enable(cmdq->pdata->gce_num, cmdq->clocks)); cmdq_gctl_value_toggle(cmdq, true); writel(CMDQ_THR_ACTIVE_SLOT_CYCLES, cmdq->base + CMDQ_THR_SLOT_CYCLES); for (i = 0; i <= CMDQ_MAX_EVENT; i++) writel(i, cmdq->base + CMDQ_SYNC_TOKEN_UPDATE); - clk_bulk_disable(cmdq->pdata->gce_num, cmdq->clocks); + clk_bulk_disable_unprepare(cmdq->pdata->gce_num, cmdq->clocks); } static int cmdq_thread_reset(struct cmdq *cmdq, struct cmdq_thread *thread) @@ -312,7 +312,7 @@ static int cmdq_runtime_resume(struct device *dev) struct cmdq *cmdq = dev_get_drvdata(dev); int ret; - ret = clk_bulk_enable(cmdq->pdata->gce_num, cmdq->clocks); + ret = clk_bulk_prepare_enable(cmdq->pdata->gce_num, cmdq->clocks); if (ret) return ret; @@ -325,7 +325,7 @@ static int cmdq_runtime_suspend(struct device *dev) struct cmdq *cmdq = dev_get_drvdata(dev); cmdq_gctl_value_toggle(cmdq, false); - clk_bulk_disable(cmdq->pdata->gce_num, cmdq->clocks); + clk_bulk_disable_unprepare(cmdq->pdata->gce_num, cmdq->clocks); return 0; } @@ -364,12 +364,8 @@ static int cmdq_resume(struct device *dev) static void cmdq_remove(struct platform_device *pdev) { - struct cmdq *cmdq = platform_get_drvdata(pdev); - if (!IS_ENABLED(CONFIG_PM)) cmdq_runtime_suspend(&pdev->dev); - - clk_bulk_unprepare(cmdq->pdata->gce_num, cmdq->clocks); } static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data) @@ -684,8 +680,6 @@ static int cmdq_probe(struct platform_device *pdev) platform_set_drvdata(pdev, cmdq); - WARN_ON(clk_bulk_prepare(cmdq->pdata->gce_num, cmdq->clocks)); - cmdq_init(cmdq); err = devm_request_irq(dev, cmdq->irq, cmdq_irq_handler, IRQF_SHARED, -- 2.45.2