From nobody Fri Oct 3 18:02:33 2025 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 BFC942D6E7C; Thu, 28 Aug 2025 08:09:14 +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=1756368556; cv=none; b=nk/Uu5QZgcIUCWiFarcOG2Y9uD93symtcLhG6ATgnOzpyJKMIE780B2g+CxrHLAp0xDjzAQsEUn9MIgjw6//Q9b+cnDijUKF+01S9JY+QMMIpjj/INUkEMAmU9RvXVu8BHZhFPa2eKZQgMO7kCYABa8isWTb+UKw/1MC4p4o7WI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756368556; c=relaxed/simple; bh=IeHQRLtedZGXGvOUXW3T2CxiElJADoqiX/OPQukQsWo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=AeeZMtrrMLMG2VW8sHzgzU5x207CFa5APjqVazOKYFGXy0UD9F6/G/ZxqkSPCNHHOAwxjA88VVQEsOfMHnmd0Xz5lPNGtIHAlNU8nNk+wkN9bKxb9Wl/aZcDaocZd0BUTrob9pOK6oaiKP8vRK4HSw4tZ/52Q4HnCVx2OK8+SFs= 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=RbEjfOZV; 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="RbEjfOZV" X-UUID: 44071d7283e611f0bd5779446731db89-20250828 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=vIUvJDPGS4Dw1VUMAmTrLQ5eazcx2pQQKieLKSwhI7c=; b=RbEjfOZVrpX5ukL2igsIdL3BuI9IPPh0RuGZC2iHAO+RxIghMl+IbetKWvMg8maDsJhHf2ylZQqlmjx37KNL/lcNsjQimjI6Tk7g2QtrBAh8WYP5vXKjDWplJ7V8VlO78YK6I93z17/rmV3C+Kpv2VCLQ+pn4N/dL5wXQSJXG0o=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.3.3,REQID:f8e111c6-008f-47c2-a3fb-6528bb4bf203,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:140b9920-786d-4870-a017-e7b4f3839b3f,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: 44071d7283e611f0bd5779446731db89-20250828 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1070065189; Thu, 28 Aug 2025 16:09:05 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.39; Thu, 28 Aug 2025 16:09:04 +0800 Received: from mtksitap99.mediatek.inc (10.233.130.16) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.39 via Frontend Transport; Thu, 28 Aug 2025 16:09:04 +0800 From: Paul Chen To: , , , , CC: , , , , , , , , , , , , , , , , Subject: [PATCH v4 09/19] soc: mediatek: mutex: refactor SOF settings for output components Date: Thu, 28 Aug 2025 16:07:04 +0800 Message-ID: <20250828080855.3502514-10-paul-pl.chen@mediatek.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250828080855.3502514-1-paul-pl.chen@mediatek.com> References: <20250828080855.3502514-1-paul-pl.chen@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: quoted-printable Content-Type: text/plain; charset="utf-8" From: Paul-pl Chen Refactor SOF settings by adding mtk_mutex_get_output_comp_sof() and extracting SOF logic from mtk_mutex_add_comp() and mtk_mutex_remove_comp(). Signed-off-by: Paul-pl Chen --- drivers/soc/mediatek/mtk-mutex.c | 57 +++++++++++++++++++++----- include/linux/soc/mediatek/mtk-mutex.h | 4 ++ 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/drivers/soc/mediatek/mtk-mutex.c b/drivers/soc/mediatek/mtk-mu= tex.c index 1e5df5aa0bd5..c48983d8a6cd 100644 --- a/drivers/soc/mediatek/mtk-mutex.c +++ b/drivers/soc/mediatek/mtk-mutex.c @@ -913,19 +913,57 @@ static int mtk_mutex_get_output_comp_sof(enum mtk_ddp= _comp_id id) return -EINVAL; } =20 +void mtk_mutex_add_comp_sof(struct mtk_mutex *mutex, enum mtk_ddp_comp_id = id) +{ + struct mtk_mutex_ctx *mtx =3D container_of(mutex, struct mtk_mutex_ctx, + mutex[mutex->id]); + int sof_id =3D mtk_mutex_get_output_comp_sof(id); + unsigned int offset; + + if (sof_id < 0 || sof_id >=3D DDP_MUTEX_SOF_MAX) + return; + + WARN_ON(&mtx->mutex[mutex->id] !=3D mutex); + + offset =3D DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id); + + writel_relaxed(mtx->data->mutex_sof[sof_id], mtx->regs + offset); +} +EXPORT_SYMBOL_GPL(mtk_mutex_add_comp_sof); + +void mtk_mutex_remove_comp_sof(struct mtk_mutex *mutex, enum mtk_ddp_comp_= id id) +{ + struct mtk_mutex_ctx *mtx =3D container_of(mutex, struct mtk_mutex_ctx, + mutex[mutex->id]); + unsigned int reg; + int sof_id =3D mtk_mutex_get_output_comp_sof(id); + unsigned int offset; + + if (sof_id < 0 || sof_id >=3D DDP_MUTEX_SOF_MAX) + return; + + WARN_ON(&mtx->mutex[mutex->id] !=3D mutex); + + offset =3D DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id); + reg =3D readl_relaxed(mtx->regs + offset); + reg &=3D ~(1 << mtx->data->mutex_sof[id]); + + writel_relaxed(reg, mtx->regs + offset); +} +EXPORT_SYMBOL_GPL(mtk_mutex_remove_comp_sof); + void mtk_mutex_add_comp(struct mtk_mutex *mutex, enum mtk_ddp_comp_id id) { struct mtk_mutex_ctx *mtx =3D container_of(mutex, struct mtk_mutex_ctx, mutex[mutex->id]); unsigned int reg; - unsigned int sof_id, mod_id; unsigned int offset; - int sof_id =3D mtk_mutex_get_output_comp_sof(id); + bool is_output_comp =3D (mtk_mutex_get_output_comp_sof(id) > 0); =20 WARN_ON(&mtx->mutex[mutex->id] !=3D mutex); =20 - if (sof_id < 0) { + if (!is_output_comp) { if (mtx->data->mutex_mod[id] < 32) { offset =3D DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg, mutex->id); @@ -941,8 +979,7 @@ void mtk_mutex_add_comp(struct mtk_mutex *mutex, return; } =20 - writel_relaxed(mtx->data->mutex_sof[sof_id], mtx->regs + - DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, mutex->id)); + mtk_mutex_add_comp_sof(mutex, id); } EXPORT_SYMBOL_GPL(mtk_mutex_add_comp); =20 @@ -954,10 +991,11 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex, unsigned int reg; unsigned int mod_id; unsigned int offset; - int sof_id =3D mtk_mutex_get_output_comp_sof(id); + bool is_output_comp =3D (mtk_mutex_get_output_comp_sof(id) > 0); + WARN_ON(&mtx->mutex[mutex->id] !=3D mutex); =20 - if (sof_id < 0) { + if (!is_output_comp) { if (mtx->data->mutex_mod[id] < 32) { offset =3D DISP_REG_MUTEX_MOD(mtx->data->mutex_mod_reg, mutex->id); @@ -973,9 +1011,8 @@ void mtk_mutex_remove_comp(struct mtk_mutex *mutex, return; } =20 - writel_relaxed(MUTEX_SOF_SINGLE_MODE, - mtx->regs + DISP_REG_MUTEX_SOF(mtx->data->mutex_sof_reg, - mutex->id)); + mtk_mutex_remove_comp_sof(mutex, id); + } EXPORT_SYMBOL_GPL(mtk_mutex_remove_comp); =20 diff --git a/include/linux/soc/mediatek/mtk-mutex.h b/include/linux/soc/med= iatek/mtk-mutex.h index 635218e3ac68..515e2d8bfc90 100644 --- a/include/linux/soc/mediatek/mtk-mutex.h +++ b/include/linux/soc/mediatek/mtk-mutex.h @@ -69,6 +69,10 @@ enum mtk_mutex_sof_index { =20 struct mtk_mutex *mtk_mutex_get(struct device *dev); int mtk_mutex_prepare(struct mtk_mutex *mutex); +void mtk_mutex_add_comp_sof(struct mtk_mutex *mutex, + enum mtk_ddp_comp_id id); +void mtk_mutex_remove_comp_sof(struct mtk_mutex *mutex, + enum mtk_ddp_comp_id id); void mtk_mutex_add_comp(struct mtk_mutex *mutex, enum mtk_ddp_comp_id id); void mtk_mutex_enable(struct mtk_mutex *mutex); --=20 2.45.2