Commit 0165c4e1 authored by Imre Deak's avatar Imre Deak Committed by Takashi Iwai
Browse files

ALSA: hda: Fix hang during shutdown due to link reset 

During system shutdown codecs may be still active, and resetting the
controller->codec HW link in this state - based on the bug reporter's
tests - leads to the shutdown sequence to get stuck. This happens at
least on the reporter's KBL system with an ALC662 codec.

For now fix the issue by skipping the link reset step.

Fixes: 472e18f6 ("ALSA: hda: Release controller display power during shutdown/reboot")
References: https://bugzilla.kernel.org/show_bug.cgi?id=214045
References: https://gitlab.freedesktop.org/drm/intel/-/issues/3618#note_1024665


Reported-and-tested-by: default avatar <youling257@gmail.com>
Cc: youling257@gmail.com
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/20210816174259.2759103-1-imre.deak@intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent da946920

sound/pci/hda/hda_intel.c

+9 −3
Original line number Diff line number Diff line
@@ -883,9 +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)

static void __azx_shutdown_chip(struct azx *chip, bool skip_link_reset)

{

	azx_stop_chip(chip);

	if (!skip_link_reset)

		azx_enter_link_reset(chip);

	azx_clear_irq_pending(chip);

	display_power(chip, false);
@@ -895,6 +896,11 @@ static void azx_shutdown_chip(struct azx *chip) 
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);
@@ -2385,7 +2391,7 @@ static void azx_shutdown(struct pci_dev *pci) 
		return;

	chip = card->private_data;

	if (chip && chip->running)

		azx_shutdown_chip(chip);

		__azx_shutdown_chip(chip, true);

}



/* PCI IDs */