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 96395C7EE29 for ; Thu, 8 Jun 2023 10:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rPaYGjVj1TEp+C1B/Yy+LrTUj9x1N5as8r8xa+Fjbsw=; b=xaWjElLe7WCbaVqD7EUQ0bFoyR XkZw903CvvXBvSldWkysUvbs4PpOg/Mx81TGkxUZA05zsH1xzKYlOAzCQfjMzB3RmoBope1qmRQ+0 bNgooEvzJ62PsZYoP9O6F884YG1Ehn5jBJtyxlCCI5ijjg8kaDPY60p0Z+cwVwLWY5Przazyr+2yN WLz0Z8QQKjFrqbDup2RrYXLbAE0C2apnGzCWctoFBQWrsxZbUKcbbFGVN/qXGC8Tvx1FgerR1vBXN vuvJtsKNhNtvfP6g1gZsTSF6qR2CxBOThjv4mC+hpQMb0OrJsFLmlHoDPJRlIU15+6H5Td/RNs31j YZ5C+0pA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q7CYc-008n49-1k; Thu, 08 Jun 2023 10:07:54 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q7CYZ-008n2a-0Y; Thu, 08 Jun 2023 10:07:52 +0000 Received: from [IPV6:2001:b07:2ed:14ed:a962:cd4d:a84:1eab] (unknown [IPv6:2001:b07:2ed:14ed:a962:cd4d:a84:1eab]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id C56256606F15; Thu, 8 Jun 2023 11:07:48 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686218869; bh=kTirSk7klKbmof6mTprY1BidGMbSjx0FDTUI2y5uxbI=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=aKlx9zY32oJUfPcHhRgNz3XOnyGvkSc3DKlfrNhMWTBeQ05YZYiMLC9QiEQ4uB0gB UvtiqowiYgQwEYpD7aUIOo7mUWD4BPQuphxMN+RbrVbPCkLbilixPjthLBI9+tftpA /1n9QbLHQ8fGsYPKY+5Lg7OJOz5rgXkXAYQmQnOl9srVNbjEUw0jwGfReDAbWQQjqT NIKNAB7VeMH/x2wb2PWT2Y7z0O2Y9Nu4lLt2eWUK4Tl/gOdtvbeCOmZg6KEVeIiZq9 tiR/hDeG3uhOHfO7vZKaVP4mEORGBj4FFnq4MDq0ish1VZ0u4Xsq5FpAXlZk+lAEly DrfAMI1s1RLLg== Message-ID: <169f78a9-179d-deee-df98-d22e82604432@collabora.com> Date: Thu, 8 Jun 2023 12:07:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 Subject: Re: [PATCH 5/5] ASoC: mediatek: mt8188-mt6359: Use bitfield macros for registers Content-Language: en-US To: =?UTF-8?B?VHJldm9yIFd1ICjlkLPmlofoia8p?= , "broonie@kernel.org" Cc: "linux-kernel@vger.kernel.org" , "linux-mediatek@lists.infradead.org" , "kernel@collabora.com" , "tiwai@suse.com" , "amergnat@baylibre.com" , "lgirdwood@gmail.com" , "linux-arm-kernel@lists.infradead.org" , "matthias.bgg@gmail.com" , "perex@perex.cz" , "alsa-devel@alsa-project.org" , "dan.carpenter@linaro.org" References: <20230608084727.74403-1-angelogioacchino.delregno@collabora.com> <20230608084727.74403-6-angelogioacchino.delregno@collabora.com> From: AngeloGioacchino Del Regno In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230608_030751_473768_8E2050F8 X-CRM114-Status: GOOD ( 21.96 ) 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: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Il 08/06/23 12:03, Trevor Wu (吳文良) ha scritto: > On Thu, 2023-06-08 at 10:47 +0200, AngeloGioacchino Del Regno wrote: > >> Replace open coded instances of FIELD_GET() with it, move register >> definitions at the top of the file and also replace magic numbers >> with register definitions. >> >> While at it, also change a regmap_update_bits() call to >> regmap_write() >> because the top 29 bits of AUD_TOP_CFG (31:3) are reserved (unused). >> >> Signed-off-by: AngeloGioacchino Del Regno < >> angelogioacchino.delregno@collabora.com> >> --- >> sound/soc/mediatek/mt8188/mt8188-mt6359.c | 32 ++++++++++++++------- >> -- >> 1 file changed, 19 insertions(+), 13 deletions(-) >> >> diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c >> b/sound/soc/mediatek/mt8188/mt8188-mt6359.c >> index 5b2660139421..ac69c23e0da1 100644 >> --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c >> +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c >> @@ -6,6 +6,7 @@ >> * Author: Trevor Wu >> */ >> >> +#include >> #include >> #include >> #include >> @@ -19,6 +20,15 @@ >> #include "../common/mtk-afe-platform-driver.h" >> #include "../common/mtk-soundcard-driver.h" >> >> +#define CKSYS_AUD_TOP_CFG 0x032c >> + #define RG_TEST_ON BIT(0) >> + #define RG_TEST_TYPE BIT(2) >> +#define CKSYS_AUD_TOP_MON 0x0330 >> + #define TEST_MISO_COUNT_1 GENMASK(3, 0) >> + #define TEST_MISO_COUNT_2 GENMASK(7, 4) >> + #define TEST_MISO_DONE_1 BIT(28) >> + #define TEST_MISO_DONE_2 BIT(29) >> + >> #define NAU8825_HS_PRESENT BIT(0) >> >> /* >> @@ -251,9 +261,6 @@ static const struct snd_kcontrol_new >> mt8188_nau8825_controls[] = { >> SOC_DAPM_PIN_SWITCH("Headphone Jack"), >> }; >> >> -#define CKSYS_AUD_TOP_CFG 0x032c >> -#define CKSYS_AUD_TOP_MON 0x0330 >> - >> static int mt8188_mt6359_mtkaif_calibration(struct >> snd_soc_pcm_runtime *rtd) >> { >> struct snd_soc_component *cmpnt_afe = >> @@ -265,13 +272,13 @@ static int >> mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) >> struct mtkaif_param *param; >> int chosen_phase_1, chosen_phase_2; >> int prev_cycle_1, prev_cycle_2; >> - int test_done_1, test_done_2; >> + u8 test_done_1, test_done_2; >> int cycle_1, cycle_2; >> int mtkaif_chosen_phase[MT8188_MTKAIF_MISO_NUM]; >> int mtkaif_phase_cycle[MT8188_MTKAIF_MISO_NUM]; >> int mtkaif_calibration_num_phase; >> bool mtkaif_calibration_ok; >> - unsigned int monitor = 0; >> + u32 monitor = 0; >> int counter; >> int phase; >> int i; >> @@ -303,8 +310,7 @@ static int >> mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) >> mt6359_mtkaif_calibration_enable(cmpnt_codec); >> >> /* set test type to synchronizer pulse */ >> - regmap_update_bits(afe_priv->topckgen, >> - CKSYS_AUD_TOP_CFG, 0xffff, 0x4); >> + regmap_write(afe_priv->topckgen, CKSYS_AUD_TOP_CFG, >> RG_TEST_TYPE); > > Hi Angelo, > > Because CKSYS_AUD_TOP_CFG is a 32bit register, it should be better to > use regmap_set_bits instead. > > regmap_set_bits(afe_priv->topckgen, CKSYS_AUD_TOP_CFG, RG_TEST_TYPE); > The previous call to regmap_update_bits() was unsetting RG_TEST_ON and RE_SW_RESET while setting RG_TEST_TYPE: using regmap_write() ensures that we do exactly the same, without the overhead of performing the additional register read and bit swapping operations. Using the proposed regmap_set_bits() would change the behavior of this flow, which may result in unexpected hardware behavior, as we wouldn't be unsetting the previously mentioned two bits. Regards, Angelo > Thanks, > Trevor > > >> mtkaif_calibration_num_phase = 42; /* mt6359: 0 ~ 42 */ >> mtkaif_calibration_ok = true; >> >> @@ -314,7 +320,7 @@ static int >> mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) >> mt6359_set_mtkaif_calibration_phase(cmpnt_codec, >> phase, phase, >> phase); >> >> - regmap_set_bits(afe_priv->topckgen, CKSYS_AUD_TOP_CFG, >> 0x1); >> + regmap_set_bits(afe_priv->topckgen, CKSYS_AUD_TOP_CFG, >> RG_TEST_ON); >> >> test_done_1 = 0; >> test_done_2 = 0; >> @@ -326,14 +332,14 @@ static int >> mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) >> while (!(test_done_1 & test_done_2)) { >> regmap_read(afe_priv->topckgen, >> CKSYS_AUD_TOP_MON, &monitor); >> - test_done_1 = (monitor >> 28) & 0x1; >> - test_done_2 = (monitor >> 29) & 0x1; >> + test_done_1 = FIELD_GET(TEST_MISO_DONE_1, >> monitor); >> + test_done_2 = FIELD_GET(TEST_MISO_DONE_2, >> monitor); >> >> if (test_done_1 == 1) >> - cycle_1 = monitor & 0xf; >> + cycle_1 = FIELD_GET(TEST_MISO_COUNT_1, >> monitor); >> >> if (test_done_2 == 1) >> - cycle_2 = (monitor >> 4) & 0xf; >> + cycle_2 = FIELD_GET(TEST_MISO_COUNT_2, >> monitor); >> >> /* handle if never test done */ >> if (++counter > 10000) { >> @@ -361,7 +367,7 @@ static int >> mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) >> mtkaif_phase_cycle[MT8188_MTKAIF_MISO_1] = >> prev_cycle_2; >> } >> >> - regmap_clear_bits(afe_priv->topckgen, >> CKSYS_AUD_TOP_CFG, 0x1); >> + regmap_clear_bits(afe_priv->topckgen, >> CKSYS_AUD_TOP_CFG, RG_TEST_ON); >> >> if (mtkaif_chosen_phase[MT8188_MTKAIF_MISO_0] >= 0 && >> mtkaif_chosen_phase[MT8188_MTKAIF_MISO_1] >= 0) >> -- >> 2.40.1