Commit 32cf4023 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai

ALSA: HDA: Lessen CPU usage when waiting for chip to respond

When an IRQ for some reason gets lost, we wait up to a second using
udelay, which is CPU intensive. This patch improves the situation by
waiting about 30 ms in the CPU intensive mode, then stepping down to
using msleep(2) instead. In essence, we trade some granularity in
exchange for less CPU consumption when the waiting time is a bit longer.

As a result, PulseAudio should no longer be killed by the kernel
for taking up to much RT-prio CPU time. At least not for *this* reason.
Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Tested-by: default avatarArun Raghavan <arun.raghavan@collabora.co.uk>
Cc: <stable@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 619a341b
...@@ -783,11 +783,13 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus, ...@@ -783,11 +783,13 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
{ {
struct azx *chip = bus->private_data; struct azx *chip = bus->private_data;
unsigned long timeout; unsigned long timeout;
unsigned long loopcounter;
int do_poll = 0; int do_poll = 0;
again: again:
timeout = jiffies + msecs_to_jiffies(1000); timeout = jiffies + msecs_to_jiffies(1000);
for (;;) {
for (loopcounter = 0;; loopcounter++) {
if (chip->polling_mode || do_poll) { if (chip->polling_mode || do_poll) {
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
azx_update_rirb(chip); azx_update_rirb(chip);
...@@ -803,7 +805,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus, ...@@ -803,7 +805,7 @@ static unsigned int azx_rirb_get_response(struct hda_bus *bus,
} }
if (time_after(jiffies, timeout)) if (time_after(jiffies, timeout))
break; break;
if (bus->needs_damn_long_delay) if (bus->needs_damn_long_delay || loopcounter > 3000)
msleep(2); /* temporary workaround */ msleep(2); /* temporary workaround */
else { else {
udelay(10); udelay(10);
......
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