Skip to content

Commit

Permalink
ALSA: hda: Drop workaround for a hang at shutdown again
Browse files Browse the repository at this point in the history
The commit 0165c4e ("ALSA: hda: Fix hang during shutdown due to
link reset") modified the shutdown callback of the HD-audio controller
for working around a hang.  Meanwhile, the actual culprit of the hang
was identified to be the leftover active codecs that may interfere
with the powered down controller somehow, but we took a minimal fix
approach for 5.14, and that was the commit above.

Now, since the codec drivers go runtime-suspend at shutdown for 5.15,
we can revert the change and make sure that the full runtime-suspend
is performed at shutdown of HD-audio controller again.  This patch
essentially reverts the commit above to restore the behavior.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=214045
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Aug 17, 2021
1 parent c0a7f93 commit 8fc8e90
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -883,11 +883,10 @@ static unsigned int azx_get_pos_skl(struct azx *chip, struct azx_dev *azx_dev)
return azx_get_pos_posbuf(chip, azx_dev);
}

static void __azx_shutdown_chip(struct azx *chip, bool skip_link_reset)
static void azx_shutdown_chip(struct azx *chip)
{
azx_stop_chip(chip);
if (!skip_link_reset)
azx_enter_link_reset(chip);
azx_enter_link_reset(chip);
azx_clear_irq_pending(chip);
display_power(chip, false);
}
Expand All @@ -896,11 +895,6 @@ static void __azx_shutdown_chip(struct azx *chip, bool skip_link_reset)
static DEFINE_MUTEX(card_list_lock);
static LIST_HEAD(card_list);

static void azx_shutdown_chip(struct azx *chip)
{
__azx_shutdown_chip(chip, false);
}

static void azx_add_card_list(struct azx *chip)
{
struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
Expand Down Expand Up @@ -2363,7 +2357,7 @@ static void azx_shutdown(struct pci_dev *pci)
return;
chip = card->private_data;
if (chip && chip->running)
__azx_shutdown_chip(chip, true);
azx_shutdown_chip(chip);
}

/* PCI IDs */
Expand Down

0 comments on commit 8fc8e90

Please sign in to comment.