Commit 8af42130 authored by Bard Liao's avatar Bard Liao Committed by Takashi Iwai
Browse files

ALSA: hda: move polling_mode flag to struct hdac_bus 



polling mode is a useful function in the get_response function. Move
polling_mode flag from struct azx to struct hdac_bus so people can
implement polling mode in their own get_response function without
adding a polling_mode flag in their local chip structure.

Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bd2956e4

include/sound/hdaudio.h

+3 −0
Original line number Diff line number Diff line
@@ -358,6 +358,9 @@ struct hdac_bus { 
	bool align_bdle_4k:1;		/* BDLE align 4K boundary */

	bool reverse_assign:1;		/* assign devices in reverse order */

	bool corbrp_self_clear:1;	/* CORBRP clears itself after reset */

	bool polling_mode:1;



	int poll_count;



	int bdl_pos_adj;		/* BDL position adjustment */

sound/pci/hda/hda_controller.c

+6 −6
Original line number Diff line number Diff line
@@ -806,11 +806,11 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr, 


	for (loopcounter = 0;; loopcounter++) {

		spin_lock_irq(&bus->reg_lock);

		if (chip->polling_mode || do_poll)

		if (bus->polling_mode || do_poll)

			snd_hdac_bus_update_rirb(bus);

		if (!bus->rirb.cmds[addr]) {

			if (!do_poll)

				chip->poll_count = 0;

				bus->poll_count = 0;

			if (res)

				*res = bus->rirb.res[addr]; /* the last value */

			spin_unlock_irq(&bus->reg_lock);
@@ -830,21 +830,21 @@ static int azx_rirb_get_response(struct hdac_bus *bus, unsigned int addr, 
	if (hbus->no_response_fallback)

		return -EIO;



	if (!chip->polling_mode && chip->poll_count < 2) {

	if (!bus->polling_mode && bus->poll_count < 2) {

		dev_dbg(chip->card->dev,

			"azx_get_response timeout, polling the codec once: last cmd=0x%08x\n",

			bus->last_cmd[addr]);

		do_poll = 1;

		chip->poll_count++;

		bus->poll_count++;

		goto again;

	}





	if (!chip->polling_mode) {

	if (!bus->polling_mode) {

		dev_warn(chip->card->dev,

			 "azx_get_response timeout, switching to polling mode: last cmd=0x%08x\n",

			 bus->last_cmd[addr]);

		chip->polling_mode = 1;

		bus->polling_mode = 1;

		goto again;

	}

sound/pci/hda/hda_controller.h

+0 −2
Original line number Diff line number Diff line
@@ -142,11 +142,9 @@ struct azx { 


	/* flags */

	int bdl_pos_adj;

	int poll_count;

	unsigned int running:1;

	unsigned int fallback_to_single_cmd:1;

	unsigned int single_cmd:1;

	unsigned int polling_mode:1;

	unsigned int msi:1;

	unsigned int probing:1; /* codec probing phase */

	unsigned int snoop:1;

sound/pci/hda/hda_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -1710,7 +1710,7 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci, 


	/* Workaround for a communication error on CFL (bko#199007) and CNL */

	if (IS_CFL(pci) || IS_CNL(pci))

		chip->polling_mode = 1;

		azx_bus(chip)->polling_mode = 1;



	if (chip->driver_type == AZX_DRIVER_NVIDIA) {

		dev_dbg(chip->card->dev, "Enable delay in RIRB handling\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE