Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b1df88 authored by Dylan Reid's avatar Dylan Reid Committed by Takashi Iwai
Browse files

ALSA: hda - Move azx_interrupt to hda_controller 



This code will be reused by an hda_platform driver as it has no PCI
dependencies.  This allows update_rirb to be static as all users are
now in hda_controller.c.

Signed-off-by: default avatarDylan Reid <dgreid@chromium.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7ca954a8

sound/pci/hda/hda_controller.c

+67 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <linux/clocksource.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/slab.h>
@@ -1162,7 +1163,7 @@ static int azx_corb_send_cmd(struct hda_bus *bus, u32 val) 
#define ICH6_RIRB_EX_UNSOL_EV	(1<<4)



/* retrieve RIRB entry - called from interrupt handler */

void azx_update_rirb(struct azx *chip)

static void azx_update_rirb(struct azx *chip)

{

	unsigned int rp, wp;

	unsigned int addr;
@@ -1205,7 +1206,6 @@ void azx_update_rirb(struct azx *chip) 
		}

	}

}

EXPORT_SYMBOL_GPL(azx_update_rirb);



/* receive a response */

static unsigned int azx_rirb_get_response(struct hda_bus *bus,
@@ -1747,5 +1747,70 @@ void azx_stop_chip(struct azx *chip) 
	chip->initialized = 0;

}



/*

 * interrupt handler

 */

irqreturn_t azx_interrupt(int irq, void *dev_id)

{

	struct azx *chip = dev_id;

	struct azx_dev *azx_dev;

	u32 status;

	u8 sd_status;

	int i;



#ifdef CONFIG_PM_RUNTIME

	if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)

		if (chip->card->dev->power.runtime_status != RPM_ACTIVE)

			return IRQ_NONE;

#endif



	spin_lock(&chip->reg_lock);



	if (chip->disabled) {

		spin_unlock(&chip->reg_lock);

		return IRQ_NONE;

	}



	status = azx_readl(chip, INTSTS);

	if (status == 0 || status == 0xffffffff) {

		spin_unlock(&chip->reg_lock);

		return IRQ_NONE;

	}



	for (i = 0; i < chip->num_streams; i++) {

		azx_dev = &chip->azx_dev[i];

		if (status & azx_dev->sd_int_sta_mask) {

			sd_status = azx_sd_readb(chip, azx_dev, SD_STS);

			azx_sd_writeb(chip, azx_dev, SD_STS, SD_INT_MASK);

			if (!azx_dev->substream || !azx_dev->running ||

			    !(sd_status & SD_INT_COMPLETE))

				continue;

			/* check whether this IRQ is really acceptable */

			if (!chip->ops->position_check ||

			    chip->ops->position_check(chip, azx_dev)) {

				spin_unlock(&chip->reg_lock);

				snd_pcm_period_elapsed(azx_dev->substream);

				spin_lock(&chip->reg_lock);

			}

		}

	}



	/* clear rirb int */

	status = azx_readb(chip, RIRBSTS);

	if (status & RIRB_INT_MASK) {

		if (status & RIRB_INT_RESPONSE) {

			if (chip->driver_caps & AZX_DCAPS_RIRB_PRE_DELAY)

				udelay(80);

			azx_update_rirb(chip);

		}

		azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);

	}



	spin_unlock(&chip->reg_lock);



	return IRQ_HANDLED;

}

EXPORT_SYMBOL_GPL(azx_interrupt);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Common HDA driver funcitons");

sound/pci/hda/hda_controller.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ void azx_free_stream_pages(struct azx *chip); 
/*

 * CORB / RIRB interface

 */

void azx_update_rirb(struct azx *chip);

int azx_send_cmd(struct hda_bus *bus, unsigned int val);

unsigned int azx_get_response(struct hda_bus *bus,

			      unsigned int addr);
@@ -59,5 +58,6 @@ unsigned int azx_get_response(struct hda_bus *bus, 
void azx_init_chip(struct azx *chip, int full_reset);

void azx_stop_chip(struct azx *chip);

void azx_enter_link_reset(struct azx *chip);

irqreturn_t azx_interrupt(int irq, void *dev_id);



#endif /* __SOUND_HDA_CONTROLLER_H */

sound/pci/hda/hda_intel.c

+0 −65
Original line number Diff line number Diff line
@@ -413,7 +413,6 @@ static void azx_init_pci(struct azx *chip) 
        }

}





static int azx_position_ok(struct azx *chip, struct azx_dev *azx_dev);



/* called from IRQ */
@@ -433,70 +432,6 @@ static int azx_position_check(struct azx *chip, struct azx_dev *azx_dev) 
	return 0;

}



/*

 * interrupt handler

 */

static irqreturn_t azx_interrupt(int irq, void *dev_id)

{

	struct azx *chip = dev_id;

	struct azx_dev *azx_dev;

	u32 status;

	u8 sd_status;

	int i;



#ifdef CONFIG_PM_RUNTIME

	if (chip->driver_caps & AZX_DCAPS_PM_RUNTIME)

		if (chip->card->dev->power.runtime_status != RPM_ACTIVE)

			return IRQ_NONE;

#endif



	spin_lock(&chip->reg_lock);



	if (chip->disabled) {

		spin_unlock(&chip->reg_lock);

		return IRQ_NONE;

	}



	status = azx_readl(chip, INTSTS);

	if (status == 0 || status == 0xffffffff) {

		spin_unlock(&chip->reg_lock);

		return IRQ_NONE;

	}

	

	for (i = 0; i < chip->num_streams; i++) {

		azx_dev = &chip->azx_dev[i];

		if (status & azx_dev->sd_int_sta_mask) {

			sd_status = azx_sd_readb(chip, azx_dev, SD_STS);

			azx_sd_writeb(chip, azx_dev, SD_STS, SD_INT_MASK);

			if (!azx_dev->substream || !azx_dev->running ||

			    !(sd_status & SD_INT_COMPLETE))

				continue;

			/* check whether this IRQ is really acceptable */

			if (!chip->ops->position_check ||

			    chip->ops->position_check(chip, azx_dev)) {

				spin_unlock(&chip->reg_lock);

				snd_pcm_period_elapsed(azx_dev->substream);

				spin_lock(&chip->reg_lock);

			}

		}

	}



	/* clear rirb int */

	status = azx_readb(chip, RIRBSTS);

	if (status & RIRB_INT_MASK) {

		if (status & RIRB_INT_RESPONSE) {

			if (chip->driver_caps & AZX_DCAPS_RIRB_PRE_DELAY)

				udelay(80);

			azx_update_rirb(chip);

		}

		azx_writeb(chip, RIRBSTS, RIRB_INT_MASK);

	}



	spin_unlock(&chip->reg_lock);

	

	return IRQ_HANDLED;

}



/*

 * Probe the given codec address

 */