From: Vitaly Rodionov <vitalyr@opensource.cirrus.com> To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: <alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>, <linux-kernel@vger.kernel.org>, Stefan Binding <sbinding@opensource.cirrus.com> Subject: [PATCH v3 24/27] ALSA: hda/cs8409: Use timeout rather than retries for I2C transaction waits Date: Fri, 30 Jul 2021 16:18:41 +0100 [thread overview] Message-ID: <20210730151844.7873-25-vitalyr@opensource.cirrus.com> (raw) In-Reply-To: <20210730151844.7873-1-vitalyr@opensource.cirrus.com> From: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com> --- Changes in v2: - No changes Changes in v3: - No changes sound/pci/hda/patch_cs8409.c | 16 +++------------- sound/pci/hda/patch_cs8409.h | 2 ++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index 08e991a33344..b53653ef73cb 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -127,24 +127,14 @@ static void cs8409_enable_i2c_clock(struct hda_codec *codec) * @codec: the codec instance * * Wait for I2C transaction to complete. - * Return -1 if transaction wait times out. + * Return -ETIMEDOUT if transaction wait times out. */ static int cs8409_i2c_wait_complete(struct hda_codec *codec) { - int repeat = 5; unsigned int retval; - do { - retval = cs8409_vendor_coef_get(codec, CS8409_I2C_STS); - if ((retval & 0x18) != 0x18) { - usleep_range(2000, 4000); - --repeat; - } else - return 0; - - } while (repeat); - - return -1; + return read_poll_timeout(cs8409_vendor_coef_get, retval, retval & 0x18, + CS42L42_I2C_SLEEP_US, CS42L42_I2C_TIMEOUT_US, false, codec, CS8409_I2C_STS); } /** diff --git a/sound/pci/hda/patch_cs8409.h b/sound/pci/hda/patch_cs8409.h index 2208be2ffad1..71dbbd8e2f3b 100644 --- a/sound/pci/hda/patch_cs8409.h +++ b/sound/pci/hda/patch_cs8409.h @@ -231,6 +231,8 @@ enum cs8409_coefficient_index_registers { #define CS42L42_HSTYPE_MASK (0x03) #define CS42L42_JACK_INSERTED (0x0C) #define CS42L42_JACK_REMOVED (0x00) +#define CS42L42_I2C_TIMEOUT_US (20000) +#define CS42L42_I2C_SLEEP_US (2000) /* Dell BULLSEYE / WARLOCK / CYBORG Specific Definitions */ -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Vitaly Rodionov <vitalyr@opensource.cirrus.com> To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com> Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Stefan Binding <sbinding@opensource.cirrus.com> Subject: [PATCH v3 24/27] ALSA: hda/cs8409: Use timeout rather than retries for I2C transaction waits Date: Fri, 30 Jul 2021 16:18:41 +0100 [thread overview] Message-ID: <20210730151844.7873-25-vitalyr@opensource.cirrus.com> (raw) In-Reply-To: <20210730151844.7873-1-vitalyr@opensource.cirrus.com> From: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com> --- Changes in v2: - No changes Changes in v3: - No changes sound/pci/hda/patch_cs8409.c | 16 +++------------- sound/pci/hda/patch_cs8409.h | 2 ++ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index 08e991a33344..b53653ef73cb 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -127,24 +127,14 @@ static void cs8409_enable_i2c_clock(struct hda_codec *codec) * @codec: the codec instance * * Wait for I2C transaction to complete. - * Return -1 if transaction wait times out. + * Return -ETIMEDOUT if transaction wait times out. */ static int cs8409_i2c_wait_complete(struct hda_codec *codec) { - int repeat = 5; unsigned int retval; - do { - retval = cs8409_vendor_coef_get(codec, CS8409_I2C_STS); - if ((retval & 0x18) != 0x18) { - usleep_range(2000, 4000); - --repeat; - } else - return 0; - - } while (repeat); - - return -1; + return read_poll_timeout(cs8409_vendor_coef_get, retval, retval & 0x18, + CS42L42_I2C_SLEEP_US, CS42L42_I2C_TIMEOUT_US, false, codec, CS8409_I2C_STS); } /** diff --git a/sound/pci/hda/patch_cs8409.h b/sound/pci/hda/patch_cs8409.h index 2208be2ffad1..71dbbd8e2f3b 100644 --- a/sound/pci/hda/patch_cs8409.h +++ b/sound/pci/hda/patch_cs8409.h @@ -231,6 +231,8 @@ enum cs8409_coefficient_index_registers { #define CS42L42_HSTYPE_MASK (0x03) #define CS42L42_JACK_INSERTED (0x0C) #define CS42L42_JACK_REMOVED (0x00) +#define CS42L42_I2C_TIMEOUT_US (20000) +#define CS42L42_I2C_SLEEP_US (2000) /* Dell BULLSEYE / WARLOCK / CYBORG Specific Definitions */ -- 2.25.1
next prev parent reply other threads:[~2021-07-30 15:20 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-30 15:18 [PATCH v3 00/27] ALSA: hda/cirrus: Split generic cirrus HDA codecs and CS8490 bridge into separate modules Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 01/27] ALSA: hda/cirrus: Move CS8409 HDA bridge to separate module Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 02/27] ALSA: hda/cs8409: Move arrays of configuration to a new file Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 03/27] ALSA: hda/cs8409: Use enums for register names and coefficients Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 04/27] ALSA: hda/cs8409: Mask all CS42L42 interrupts on initialization Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 05/27] ALSA: hda/cs8409: Reduce HS pops/clicks for Cyborg Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 06/27] ALSA: hda/cs8409: Disable unnecessary Ring Sense for Cyborg/Warlock/Bullseye Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 07/27] ALSA: hda/cs8409: Disable unsolicited responses during suspend Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 08/27] ALSA: hda/cs8409: Disable unsolicited response for the first boot Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 09/27] ALSA: hda/cs8409: Mask CS42L42 wake events Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 10/27] ALSA: hda/cs8409: Simplify CS42L42 jack detect Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 11/27] ALSA: hda/cs8409: Prevent I2C access during suspend time Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 12/27] ALSA: hda/cs8409: Generalize volume controls Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 13/27] ALSA: hda/cs8409: Dont disable I2C clock between consecutive accesses Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-08-01 8:03 ` Takashi Iwai 2021-08-01 8:03 ` Takashi Iwai 2021-08-11 18:33 ` Vitaly Rodionov 2021-08-11 18:33 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 14/27] ALSA: hda/cs8409: Avoid setting the same I2C address for every access Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 15/27] ALSA: hda/cs8409: Avoid re-setting the same page as the last access Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 16/27] ALSA: hda/cs8409: Support i2c bulk read/write functions Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 17/27] ALSA: hda/cs8409: Separate CS8409, CS42L42 and project functions Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 18/27] ALSA: hda/cs8409: Move codec properties to its own struct Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 19/27] ALSA: hda/cs8409: Support multiple sub_codecs for Suspend/Resume/Unsol events Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 20/27] ALSA: hda/cs8409: Add Support to disable jack type detection for CS42L42 Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 21/27] ALSA: hda/cs8409: Add support for dolphin Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 22/27] ALSA: hda/cs8409: Enable Full Scale Volume for Line Out Codec on Dolphin Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 23/27] ALSA: hda/cs8409: Set fixed sample rate of 48kHz for CS42L42 Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov [this message] 2021-07-30 15:18 ` [PATCH v3 24/27] ALSA: hda/cs8409: Use timeout rather than retries for I2C transaction waits Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 25/27] ALSA: hda/cs8409: Remove unnecessary delays Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 26/27] ALSA: hda/cs8409: Follow correct CS42L42 power down sequence for suspend Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov 2021-07-30 15:18 ` [PATCH v3 27/27] ALSA: hda/cs8409: Unmute/Mute codec when stream starts/stops Vitaly Rodionov 2021-07-30 15:18 ` Vitaly Rodionov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210730151844.7873-25-vitalyr@opensource.cirrus.com \ --to=vitalyr@opensource.cirrus.com \ --cc=alsa-devel@alsa-project.org \ --cc=linux-kernel@vger.kernel.org \ --cc=patches@opensource.cirrus.com \ --cc=perex@perex.cz \ --cc=sbinding@opensource.cirrus.com \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.