Commit fa348da5 authored by Mengdong Lin's avatar Mengdong Lin Committed by Takashi Iwai

ALSA: hda - use usleep_range in link reset and change timeout check

Reducing the time on HDA link reset can help to reduce the driver loading
time. So we replace msleep with usleep_range to get more accurate time
control and change the value to a smaller one. And a 100ms timeout is set
for both entering and exiting the link reset.
Signed-off-by: default avatarXingchao Wang <xingchao.wang@intel.com>
Signed-off-by: default avatarMengdong Lin <mengdong.lin@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6121b84a
...@@ -1054,7 +1054,7 @@ static void azx_power_notify(struct hda_bus *bus, bool power_up); ...@@ -1054,7 +1054,7 @@ static void azx_power_notify(struct hda_bus *bus, bool power_up);
/* reset codec link */ /* reset codec link */
static int azx_reset(struct azx *chip, int full_reset) static int azx_reset(struct azx *chip, int full_reset)
{ {
int count; unsigned long timeout;
if (!full_reset) if (!full_reset)
goto __skip; goto __skip;
...@@ -1065,24 +1065,26 @@ static int azx_reset(struct azx *chip, int full_reset) ...@@ -1065,24 +1065,26 @@ static int azx_reset(struct azx *chip, int full_reset)
/* reset controller */ /* reset controller */
azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET); azx_writel(chip, GCTL, azx_readl(chip, GCTL) & ~ICH6_GCTL_RESET);
count = 50; timeout = jiffies + msecs_to_jiffies(100);
while (azx_readb(chip, GCTL) && --count) while (azx_readb(chip, GCTL) &&
msleep(1); time_before(jiffies, timeout))
usleep_range(500, 1000);
/* delay for >= 100us for codec PLL to settle per spec /* delay for >= 100us for codec PLL to settle per spec
* Rev 0.9 section 5.5.1 * Rev 0.9 section 5.5.1
*/ */
msleep(1); usleep_range(500, 1000);
/* Bring controller out of reset */ /* Bring controller out of reset */
azx_writeb(chip, GCTL, azx_readb(chip, GCTL) | ICH6_GCTL_RESET); azx_writeb(chip, GCTL, azx_readb(chip, GCTL) | ICH6_GCTL_RESET);
count = 50; timeout = jiffies + msecs_to_jiffies(100);
while (!azx_readb(chip, GCTL) && --count) while (!azx_readb(chip, GCTL) &&
msleep(1); time_before(jiffies, timeout))
usleep_range(500, 1000);
/* Brent Chartrand said to wait >= 540us for codecs to initialize */ /* Brent Chartrand said to wait >= 540us for codecs to initialize */
msleep(1); usleep_range(1000, 1200);
__skip: __skip:
/* check to see if controller is ready */ /* check to see if controller is ready */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment