ALSA: hda - Pass bus io_ops directly from the top-level driver (a43ff5ba) · Commits · e / devices / android_kernel_oneplus_sm8150

sound/pci/hda/hda_codec.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -516,6 +516,7 @@ static int snd_hda_bus_dev_disconnect(struct snd_device *device)
	*/		*/
	int snd_hda_bus_new(struct snd_card *card,		int snd_hda_bus_new(struct snd_card *card,
	const struct hdac_bus_ops *ops,		const struct hdac_bus_ops *ops,
			const struct hdac_io_ops *io_ops,
	struct hda_bus **busp)		struct hda_bus **busp)
	{		{
	struct hda_bus *bus;		struct hda_bus *bus;
	@@ -532,7 +533,7 @@ int snd_hda_bus_new(struct snd_card *card,
	if (!bus)		if (!bus)
	return -ENOMEM;		return -ENOMEM;

	err = snd_hdac_bus_init(&bus->core, card->dev, ops, NULL);		err = snd_hdac_bus_init(&bus->core, card->dev, ops, io_ops);
	if (err < 0) {		if (err < 0) {
	kfree(bus);		kfree(bus);
	return err;		return err;

sound/pci/hda/hda_codec.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -328,6 +328,7 @@ struct hda_codec {
	*/		*/
	int snd_hda_bus_new(struct snd_card *card,		int snd_hda_bus_new(struct snd_card *card,
	const struct hdac_bus_ops *ops,		const struct hdac_bus_ops *ops,
			const struct hdac_io_ops *io_ops,
	struct hda_bus **busp);		struct hda_bus **busp);
	int snd_hda_codec_new(struct hda_bus bus, struct snd_card card,		int snd_hda_codec_new(struct hda_bus bus, struct snd_card card,
	unsigned int codec_addr, struct hda_codec **codecp);		unsigned int codec_addr, struct hda_codec **codecp);

sound/pci/hda/hda_controller.c

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -985,7 +985,7 @@ static int azx_attach_pcm_stream(struct hda_bus bus, struct hda_codec codec,
	static int azx_alloc_cmd_io(struct azx *chip)		static int azx_alloc_cmd_io(struct azx *chip)
	{		{
	/* single page (at least 4096 bytes) must suffice for both ringbuffes */		/* single page (at least 4096 bytes) must suffice for both ringbuffes */
	return chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,		return chip->io_ops->dma_alloc_pages(azx_bus(chip), SNDRV_DMA_TYPE_DEV,
	PAGE_SIZE, &chip->rb);		PAGE_SIZE, &chip->rb);
	}		}

	@@ -1396,7 +1396,7 @@ static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format,
	azx_dev->locked = 1;		azx_dev->locked = 1;
	spin_unlock_irq(&chip->reg_lock);		spin_unlock_irq(&chip->reg_lock);

	err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV_SG,		err = chip->io_ops->dma_alloc_pages(&bus->core, SNDRV_DMA_TYPE_DEV_SG,
	byte_size, bufp);		byte_size, bufp);
	if (err < 0)		if (err < 0)
	goto err_alloc;		goto err_alloc;
	@@ -1422,7 +1422,7 @@ static int azx_load_dsp_prepare(struct hda_bus *bus, unsigned int format,
	return azx_dev->stream_tag;		return azx_dev->stream_tag;

	error:		error:
	chip->ops->dma_free_pages(chip, bufp);		chip->io_ops->dma_free_pages(&bus->core, bufp);
	err_alloc:		err_alloc:
	spin_lock_irq(&chip->reg_lock);		spin_lock_irq(&chip->reg_lock);
	if (azx_dev->opened)		if (azx_dev->opened)
	@@ -1464,7 +1464,7 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus,
	azx_dev->period_bytes = 0;		azx_dev->period_bytes = 0;
	azx_dev->format_val = 0;		azx_dev->format_val = 0;

	chip->ops->dma_free_pages(chip, dmab);		chip->io_ops->dma_free_pages(&bus->core, dmab);
	dmab->area = NULL;		dmab->area = NULL;

	spin_lock_irq(&chip->reg_lock);		spin_lock_irq(&chip->reg_lock);
	@@ -1483,14 +1483,14 @@ int azx_alloc_stream_pages(struct azx *chip)
	for (i = 0; i < chip->num_streams; i++) {		for (i = 0; i < chip->num_streams; i++) {
	dsp_lock_init(&chip->azx_dev[i]);		dsp_lock_init(&chip->azx_dev[i]);
	/* allocate memory for the BDL for each stream */		/* allocate memory for the BDL for each stream */
	err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,		err = chip->io_ops->dma_alloc_pages(azx_bus(chip), SNDRV_DMA_TYPE_DEV,
	BDL_SIZE,		BDL_SIZE,
	&chip->azx_dev[i].bdl);		&chip->azx_dev[i].bdl);
	if (err < 0)		if (err < 0)
	return -ENOMEM;		return -ENOMEM;
	}		}
	/* allocate memory for the position buffer */		/* allocate memory for the position buffer */
	err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,		err = chip->io_ops->dma_alloc_pages(azx_bus(chip), SNDRV_DMA_TYPE_DEV,
	chip->num_streams * 8, &chip->posbuf);		chip->num_streams * 8, &chip->posbuf);
	if (err < 0)		if (err < 0)
	return -ENOMEM;		return -ENOMEM;
	@@ -1509,13 +1509,13 @@ void azx_free_stream_pages(struct azx *chip)
	if (chip->azx_dev) {		if (chip->azx_dev) {
	for (i = 0; i < chip->num_streams; i++)		for (i = 0; i < chip->num_streams; i++)
	if (chip->azx_dev[i].bdl.area)		if (chip->azx_dev[i].bdl.area)
	chip->ops->dma_free_pages(		chip->io_ops->dma_free_pages(azx_bus(chip),
	chip, &chip->azx_dev[i].bdl);		&chip->azx_dev[i].bdl);
	}		}
	if (chip->rb.area)		if (chip->rb.area)
	chip->ops->dma_free_pages(chip, &chip->rb);		chip->io_ops->dma_free_pages(azx_bus(chip), &chip->rb);
	if (chip->posbuf.area)		if (chip->posbuf.area)
	chip->ops->dma_free_pages(chip, &chip->posbuf);		chip->io_ops->dma_free_pages(azx_bus(chip), &chip->posbuf);
	}		}
	EXPORT_SYMBOL_GPL(azx_free_stream_pages);		EXPORT_SYMBOL_GPL(azx_free_stream_pages);

	@@ -1834,7 +1834,7 @@ int azx_bus_create(struct azx chip, const char model)
	struct hda_bus *bus;		struct hda_bus *bus;
	int err;		int err;

	err = snd_hda_bus_new(chip->card, &bus_core_ops, &bus);		err = snd_hda_bus_new(chip->card, &bus_core_ops, chip->io_ops, &bus);
	if (err < 0)		if (err < 0)
	return err;		return err;

sound/pci/hda/hda_controller.h

+15 −25

Original line number	Original line	Diff line number	Diff line
	@@ -125,21 +125,8 @@ struct azx;

	/* Functions to read/write to hda registers. */		/* Functions to read/write to hda registers. */
	struct hda_controller_ops {		struct hda_controller_ops {
	/* Register Access */
	void (reg_writel)(u32 value, u32 __iomem addr);
	u32 (reg_readl)(u32 __iomem addr);
	void (reg_writew)(u16 value, u16 __iomem addr);
	u16 (reg_readw)(u16 __iomem addr);
	void (reg_writeb)(u8 value, u8 __iomem addr);
	u8 (reg_readb)(u8 __iomem addr);
	/* Disable msi if supported, PCI only */		/* Disable msi if supported, PCI only */
	int (disable_msi_reset_irq)(struct azx );		int (disable_msi_reset_irq)(struct azx );
	/* Allocation ops */
	int (dma_alloc_pages)(struct azx chip,
	int type,
	size_t size,
	struct snd_dma_buffer *buf);
	void (dma_free_pages)(struct azx chip, struct snd_dma_buffer *buf);
	int (substream_alloc_pages)(struct azx chip,		int (substream_alloc_pages)(struct azx chip,
	struct snd_pcm_substream *substream,		struct snd_pcm_substream *substream,
	size_t size);		size_t size);
	@@ -179,6 +166,7 @@ struct azx {

	/* Register interaction. */		/* Register interaction. */
	const struct hda_controller_ops *ops;		const struct hda_controller_ops *ops;
			const struct hdac_io_ops *io_ops;

	/* position adjustment callbacks */		/* position adjustment callbacks */
	azx_get_pos_callback_t get_position[2];		azx_get_pos_callback_t get_position[2];
	@@ -239,6 +227,8 @@ struct azx {
	#endif		#endif
	};		};

			#define azx_bus(chip) (&(chip)->bus->core)

	#ifdef CONFIG_X86		#ifdef CONFIG_X86
	#define azx_snoop(chip) ((chip)->snoop)		#define azx_snoop(chip) ((chip)->snoop)
	#else		#else
	@@ -250,30 +240,30 @@ struct azx {
	*/		*/

	#define azx_writel(chip, reg, value) \		#define azx_writel(chip, reg, value) \
	((chip)->ops->reg_writel(value, (chip)->remap_addr + AZX_REG_##reg))		((chip)->io_ops->reg_writel(value, (chip)->remap_addr + AZX_REG_##reg))
	#define azx_readl(chip, reg) \		#define azx_readl(chip, reg) \
	((chip)->ops->reg_readl((chip)->remap_addr + AZX_REG_##reg))		((chip)->io_ops->reg_readl((chip)->remap_addr + AZX_REG_##reg))
	#define azx_writew(chip, reg, value) \		#define azx_writew(chip, reg, value) \
	((chip)->ops->reg_writew(value, (chip)->remap_addr + AZX_REG_##reg))		((chip)->io_ops->reg_writew(value, (chip)->remap_addr + AZX_REG_##reg))
	#define azx_readw(chip, reg) \		#define azx_readw(chip, reg) \
	((chip)->ops->reg_readw((chip)->remap_addr + AZX_REG_##reg))		((chip)->io_ops->reg_readw((chip)->remap_addr + AZX_REG_##reg))
	#define azx_writeb(chip, reg, value) \		#define azx_writeb(chip, reg, value) \
	((chip)->ops->reg_writeb(value, (chip)->remap_addr + AZX_REG_##reg))		((chip)->io_ops->reg_writeb(value, (chip)->remap_addr + AZX_REG_##reg))
	#define azx_readb(chip, reg) \		#define azx_readb(chip, reg) \
	((chip)->ops->reg_readb((chip)->remap_addr + AZX_REG_##reg))		((chip)->io_ops->reg_readb((chip)->remap_addr + AZX_REG_##reg))

	#define azx_sd_writel(chip, dev, reg, value) \		#define azx_sd_writel(chip, dev, reg, value) \
	((chip)->ops->reg_writel(value, (dev)->sd_addr + AZX_REG_##reg))		((chip)->io_ops->reg_writel(value, (dev)->sd_addr + AZX_REG_##reg))
	#define azx_sd_readl(chip, dev, reg) \		#define azx_sd_readl(chip, dev, reg) \
	((chip)->ops->reg_readl((dev)->sd_addr + AZX_REG_##reg))		((chip)->io_ops->reg_readl((dev)->sd_addr + AZX_REG_##reg))
	#define azx_sd_writew(chip, dev, reg, value) \		#define azx_sd_writew(chip, dev, reg, value) \
	((chip)->ops->reg_writew(value, (dev)->sd_addr + AZX_REG_##reg))		((chip)->io_ops->reg_writew(value, (dev)->sd_addr + AZX_REG_##reg))
	#define azx_sd_readw(chip, dev, reg) \		#define azx_sd_readw(chip, dev, reg) \
	((chip)->ops->reg_readw((dev)->sd_addr + AZX_REG_##reg))		((chip)->io_ops->reg_readw((dev)->sd_addr + AZX_REG_##reg))
	#define azx_sd_writeb(chip, dev, reg, value) \		#define azx_sd_writeb(chip, dev, reg, value) \
	((chip)->ops->reg_writeb(value, (dev)->sd_addr + AZX_REG_##reg))		((chip)->io_ops->reg_writeb(value, (dev)->sd_addr + AZX_REG_##reg))
	#define azx_sd_readb(chip, dev, reg) \		#define azx_sd_readb(chip, dev, reg) \
	((chip)->ops->reg_readb((dev)->sd_addr + AZX_REG_##reg))		((chip)->io_ops->reg_readb((dev)->sd_addr + AZX_REG_##reg))

	#define azx_has_pm_runtime(chip) \		#define azx_has_pm_runtime(chip) \
	(!AZX_DCAPS_PM_RUNTIME \|\| ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME))		(!AZX_DCAPS_PM_RUNTIME \|\| ((chip)->driver_caps & AZX_DCAPS_PM_RUNTIME))

sound/pci/hda/hda_intel.c

+21 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1365,9 +1365,11 @@ static void azx_probe_work(struct work_struct *work)
	/*		/*
	* constructor		* constructor
	*/		*/
			static const struct hdac_io_ops pci_hda_io_ops;
			static const struct hda_controller_ops pci_hda_ops;

	static int azx_create(struct snd_card card, struct pci_dev pci,		static int azx_create(struct snd_card card, struct pci_dev pci,
	int dev, unsigned int driver_caps,		int dev, unsigned int driver_caps,
	const struct hda_controller_ops *hda_ops,
	struct azx **rchip)		struct azx **rchip)
	{		{
	static struct snd_device_ops ops = {		static struct snd_device_ops ops = {
	@@ -1394,7 +1396,8 @@ static int azx_create(struct snd_card card, struct pci_dev pci,
	mutex_init(&chip->open_mutex);		mutex_init(&chip->open_mutex);
	chip->card = card;		chip->card = card;
	chip->pci = pci;		chip->pci = pci;
	chip->ops = hda_ops;		chip->ops = &pci_hda_ops;
			chip->io_ops = &pci_hda_io_ops;
	chip->irq = -1;		chip->irq = -1;
	chip->driver_caps = driver_caps;		chip->driver_caps = driver_caps;
	chip->driver_type = driver_caps & 0xff;		chip->driver_type = driver_caps & 0xff;
	@@ -1681,15 +1684,16 @@ static int disable_msi_reset_irq(struct azx *chip)
	}		}

	/* DMA page allocation helpers. */		/* DMA page allocation helpers. */
	static int dma_alloc_pages(struct azx *chip,		static int dma_alloc_pages(struct hdac_bus *bus,
	int type,		int type,
	size_t size,		size_t size,
	struct snd_dma_buffer *buf)		struct snd_dma_buffer *buf)
	{		{
			struct azx *chip = to_hda_bus(bus)->private_data;
	int err;		int err;

	err = snd_dma_alloc_pages(type,		err = snd_dma_alloc_pages(type,
	chip->card->dev,		bus->dev,
	size, buf);		size, buf);
	if (err < 0)		if (err < 0)
	return err;		return err;
	@@ -1697,8 +1701,10 @@ static int dma_alloc_pages(struct azx *chip,
	return 0;		return 0;
	}		}

	static void dma_free_pages(struct azx chip, struct snd_dma_buffer buf)		static void dma_free_pages(struct hdac_bus bus, struct snd_dma_buffer buf)
	{		{
			struct azx *chip = to_hda_bus(bus)->private_data;

	mark_pages_wc(chip, buf, false);		mark_pages_wc(chip, buf, false);
	snd_dma_free_pages(buf);		snd_dma_free_pages(buf);
	}		}
	@@ -1740,16 +1746,19 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream,
	#endif		#endif
	}		}

	static const struct hda_controller_ops pci_hda_ops = {		static const struct hdac_io_ops pci_hda_io_ops = {
	.reg_writel = pci_azx_writel,		.reg_writel = pci_azx_writel,
	.reg_readl = pci_azx_readl,		.reg_readl = pci_azx_readl,
	.reg_writew = pci_azx_writew,		.reg_writew = pci_azx_writew,
	.reg_readw = pci_azx_readw,		.reg_readw = pci_azx_readw,
	.reg_writeb = pci_azx_writeb,		.reg_writeb = pci_azx_writeb,
	.reg_readb = pci_azx_readb,		.reg_readb = pci_azx_readb,
	.disable_msi_reset_irq = disable_msi_reset_irq,
	.dma_alloc_pages = dma_alloc_pages,		.dma_alloc_pages = dma_alloc_pages,
	.dma_free_pages = dma_free_pages,		.dma_free_pages = dma_free_pages,
			};

			static const struct hda_controller_ops pci_hda_ops = {
			.disable_msi_reset_irq = disable_msi_reset_irq,
	.substream_alloc_pages = substream_alloc_pages,		.substream_alloc_pages = substream_alloc_pages,
	.substream_free_pages = substream_free_pages,		.substream_free_pages = substream_free_pages,
	.pcm_mmap_prepare = pcm_mmap_prepare,		.pcm_mmap_prepare = pcm_mmap_prepare,
	@@ -1780,8 +1789,7 @@ static int azx_probe(struct pci_dev *pci,
	return err;		return err;
	}		}

	err = azx_create(card, pci, dev, pci_id->driver_data,		err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
	&pci_hda_ops, &chip);
	if (err < 0)		if (err < 0)
	goto out_free;		goto out_free;
	card->private_data = chip;		card->private_data = chip;
	@@ -1862,6 +1870,10 @@ static int azx_probe_continue(struct azx *chip)
	#endif		#endif
	}		}

			err = azx_bus_create(chip, model[dev]);
			if (err < 0)
			goto out_free;

	err = azx_first_init(chip);		err = azx_first_init(chip);
	if (err < 0)		if (err < 0)
	goto out_free;		goto out_free;
	@@ -1871,10 +1883,6 @@ static int azx_probe_continue(struct azx *chip)
	#endif		#endif

	/* create codec instances */		/* create codec instances */
	err = azx_bus_create(chip, model[dev]);
	if (err < 0)
	goto out_free;

	err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]);		err = azx_probe_codecs(chip, azx_max_codecs[chip->driver_type]);
	if (err < 0)		if (err < 0)
	goto out_free;		goto out_free;