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

ALSA: hda - Pull pages allocation to hda_controller 



Pull allocation from first_init to a new function in hda_controller.c.
Short term this will allow the dsp loader to be moved as well.  In
later commits it will allow the same allocation to be used by the
platform hda driver.

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

sound/pci/hda/hda_controller.c

+43 −0
Original line number Diff line number Diff line
@@ -1014,5 +1014,48 @@ int azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec, 
}

EXPORT_SYMBOL_GPL(azx_attach_pcm_stream);



int azx_alloc_stream_pages(struct azx *chip)

{

	int i, err;

	struct snd_card *card = chip->card;



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

		dsp_lock_init(&chip->azx_dev[i]);

		/* allocate memory for the BDL for each stream */

		err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,

						 BDL_SIZE,

						 &chip->azx_dev[i].bdl);

		if (err < 0) {

			dev_err(card->dev, "cannot allocate BDL\n");

			return -ENOMEM;

		}

	}

	/* allocate memory for the position buffer */

	err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,

					 chip->num_streams * 8, &chip->posbuf);

	if (err < 0) {

		dev_err(card->dev, "cannot allocate posbuf\n");

		return -ENOMEM;

	}

	return 0;

}

EXPORT_SYMBOL_GPL(azx_alloc_stream_pages);



void azx_free_stream_pages(struct azx *chip)

{

	int i;

	if (chip->azx_dev) {

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

			if (chip->azx_dev[i].bdl.area)

				chip->ops->dma_free_pages(

					chip, &chip->azx_dev[i].bdl);

	}

	if (chip->rb.area)

		chip->ops->dma_free_pages(chip, &chip->rb);

	if (chip->posbuf.area)

		chip->ops->dma_free_pages(chip, &chip->posbuf);

}

EXPORT_SYMBOL_GPL(azx_free_stream_pages);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Common HDA driver funcitons");

sound/pci/hda/hda_controller.h

+4 −0
Original line number Diff line number Diff line
@@ -54,4 +54,8 @@ int setup_bdle(struct azx *chip, 
#define dsp_is_locked(dev)	0

#endif



/* Allocation functions. */

int azx_alloc_stream_pages(struct azx *chip);

void azx_free_stream_pages(struct azx *chip);



#endif /* __SOUND_HDA_CONTROLLER_H */

sound/pci/hda/hda_intel.c

+5 −29
Original line number Diff line number Diff line
@@ -1864,16 +1864,7 @@ static int azx_free(struct azx *chip) 
	if (chip->remap_addr)

		iounmap(chip->remap_addr);



	if (chip->azx_dev) {

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

			if (chip->azx_dev[i].bdl.area)

				chip->ops->dma_free_pages(

					chip, &chip->azx_dev[i].bdl);

	}

	if (chip->rb.area)

		chip->ops->dma_free_pages(chip, &chip->rb);

	if (chip->posbuf.area)

		chip->ops->dma_free_pages(chip, &chip->posbuf);

	azx_free_stream_pages(chip);

	if (chip->region_requested)

		pci_release_regions(chip->pci);

	pci_disable_device(chip->pci);
@@ -2210,7 +2201,7 @@ static int azx_first_init(struct azx *chip) 
	int dev = chip->dev_index;

	struct pci_dev *pci = chip->pci;

	struct snd_card *card = chip->card;

	int i, err;

	int err;

	unsigned short gcap;



#if BITS_PER_LONG != 64
@@ -2322,24 +2313,9 @@ static int azx_first_init(struct azx *chip) 
		return -ENOMEM;

	}



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

		dsp_lock_init(&chip->azx_dev[i]);

		/* allocate memory for the BDL for each stream */

		err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,

						 BDL_SIZE,

						 &chip->azx_dev[i].bdl);

		if (err < 0) {

			dev_err(card->dev, "cannot allocate BDL\n");

			return -ENOMEM;

		}

	}

	/* allocate memory for the position buffer */

	err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,

					 chip->num_streams * 8, &chip->posbuf);

	if (err < 0) {

		dev_err(card->dev, "cannot allocate posbuf\n");

		return -ENOMEM;

	}

	err = azx_alloc_stream_pages(chip);

	if (err < 0)

		return err;

	/* allocate CORB/RIRB */

	err = azx_alloc_cmd_io(chip);

	if (err < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE