Commit 3a76a41f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda-bus-ops-cleanup' into for-next 



Pull HD-audio bus ops cleanups.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 118b2806 d4ff1b39

include/sound/hdaudio.h

+31 −38
Original line number Diff line number Diff line
@@ -253,24 +253,6 @@ struct hdac_ext_bus_ops { 
	int (*hdev_detach)(struct hdac_device *hdev);

};



/*

 * Lowlevel I/O operators

 */

struct hdac_io_ops {

	/* mapped register accesses */

	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);

	/* Allocation ops */

	int (*dma_alloc_pages)(struct hdac_bus *bus, int type, size_t size,

			       struct snd_dma_buffer *buf);

	void (*dma_free_pages)(struct hdac_bus *bus,

			       struct snd_dma_buffer *buf);

};



#define HDA_UNSOL_QUEUE_SIZE	64

#define HDA_MAX_CODECS		8	/* limit by controller side */
@@ -304,7 +286,6 @@ struct hdac_rb { 
struct hdac_bus {

	struct device *dev;

	const struct hdac_bus_ops *ops;

	const struct hdac_io_ops *io_ops;

	const struct hdac_ext_bus_ops *ext_ops;



	/* h/w resources */
@@ -344,6 +325,7 @@ struct hdac_bus { 
	/* CORB/RIRB and position buffers */

	struct snd_dma_buffer rb;

	struct snd_dma_buffer posbuf;

	int dma_type;			/* SNDRV_DMA_TYPE_XXX for CORB/RIRB */



	/* hdac_stream linked list */

	struct list_head stream_list;
@@ -384,8 +366,7 @@ struct hdac_bus { 
};



int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,

		      const struct hdac_bus_ops *ops,

		      const struct hdac_io_ops *io_ops);

		      const struct hdac_bus_ops *ops);

void snd_hdac_bus_exit(struct hdac_bus *bus);

int snd_hdac_bus_exec_verb(struct hdac_bus *bus, unsigned int addr,

			   unsigned int cmd, unsigned int *res);
@@ -429,21 +410,38 @@ int snd_hdac_bus_handle_stream_irq(struct hdac_bus *bus, unsigned int status, 
int snd_hdac_bus_alloc_stream_pages(struct hdac_bus *bus);

void snd_hdac_bus_free_stream_pages(struct hdac_bus *bus);



#ifdef CONFIG_SND_HDA_ALIGNED_MMIO

unsigned int snd_hdac_aligned_read(void __iomem *addr, unsigned int mask);

void snd_hdac_aligned_write(unsigned int val, void __iomem *addr,

			    unsigned int mask);

#define snd_hdac_reg_writeb(v, addr)	snd_hdac_aligned_write(v, addr, 0xff)

#define snd_hdac_reg_writew(v, addr)	snd_hdac_aligned_write(v, addr, 0xffff)

#define snd_hdac_reg_readb(addr)	snd_hdac_aligned_read(addr, 0xff)

#define snd_hdac_reg_readw(addr)	snd_hdac_aligned_read(addr, 0xffff)

#else /* CONFIG_SND_HDA_ALIGNED_MMIO */

#define snd_hdac_reg_writeb(val, addr)	writeb(val, addr)

#define snd_hdac_reg_writew(val, addr)	writew(val, addr)

#define snd_hdac_reg_readb(addr)	readb(addr)

#define snd_hdac_reg_readw(addr)	readw(addr)

#endif /* CONFIG_SND_HDA_ALIGNED_MMIO */

#define snd_hdac_reg_writel(val, addr)	writel(val, addr)

#define snd_hdac_reg_readl(addr)	readl(addr)



/*

 * macros for easy use

 */

#define _snd_hdac_chip_writeb(chip, reg, value) \

	((chip)->io_ops->reg_writeb(value, (chip)->remap_addr + (reg)))

	snd_hdac_reg_writeb(value, (chip)->remap_addr + (reg))

#define _snd_hdac_chip_readb(chip, reg) \

	((chip)->io_ops->reg_readb((chip)->remap_addr + (reg)))

	snd_hdac_reg_readb((chip)->remap_addr + (reg))

#define _snd_hdac_chip_writew(chip, reg, value) \

	((chip)->io_ops->reg_writew(value, (chip)->remap_addr + (reg)))

	snd_hdac_reg_writew(value, (chip)->remap_addr + (reg))

#define _snd_hdac_chip_readw(chip, reg) \

	((chip)->io_ops->reg_readw((chip)->remap_addr + (reg)))

	snd_hdac_reg_readw((chip)->remap_addr + (reg))

#define _snd_hdac_chip_writel(chip, reg, value) \

	((chip)->io_ops->reg_writel(value, (chip)->remap_addr + (reg)))

	snd_hdac_reg_writel(value, (chip)->remap_addr + (reg))

#define _snd_hdac_chip_readl(chip, reg) \

	((chip)->io_ops->reg_readl((chip)->remap_addr + (reg)))

	snd_hdac_reg_readl((chip)->remap_addr + (reg))



/* read/write a register, pass without AZX_REG_ prefix */

#define snd_hdac_chip_writel(chip, reg, value) \
@@ -548,24 +546,19 @@ int snd_hdac_get_stream_stripe_ctl(struct hdac_bus *bus, 
/*

 * macros for easy use

 */

#define _snd_hdac_stream_write(type, dev, reg, value)			\

	((dev)->bus->io_ops->reg_write ## type(value, (dev)->sd_addr + (reg)))

#define _snd_hdac_stream_read(type, dev, reg)				\

	((dev)->bus->io_ops->reg_read ## type((dev)->sd_addr + (reg)))



/* read/write a register, pass without AZX_REG_ prefix */

#define snd_hdac_stream_writel(dev, reg, value) \

	_snd_hdac_stream_write(l, dev, AZX_REG_ ## reg, value)

	snd_hdac_reg_writel(value, (dev)->sd_addr + AZX_REG_ ## reg)

#define snd_hdac_stream_writew(dev, reg, value) \

	_snd_hdac_stream_write(w, dev, AZX_REG_ ## reg, value)

	snd_hdac_reg_writew(value, (dev)->sd_addr + AZX_REG_ ## reg)

#define snd_hdac_stream_writeb(dev, reg, value) \

	_snd_hdac_stream_write(b, dev, AZX_REG_ ## reg, value)

	snd_hdac_reg_writeb(value, (dev)->sd_addr + AZX_REG_ ## reg)

#define snd_hdac_stream_readl(dev, reg) \

	_snd_hdac_stream_read(l, dev, AZX_REG_ ## reg)

	snd_hdac_reg_readl((dev)->sd_addr + AZX_REG_ ## reg)

#define snd_hdac_stream_readw(dev, reg) \

	_snd_hdac_stream_read(w, dev, AZX_REG_ ## reg)

	snd_hdac_reg_readw((dev)->sd_addr + AZX_REG_ ## reg)

#define snd_hdac_stream_readb(dev, reg) \

	_snd_hdac_stream_read(b, dev, AZX_REG_ ## reg)

	snd_hdac_reg_readb((dev)->sd_addr + AZX_REG_ ## reg)



/* update a register, pass without AZX_REG_ prefix */

#define snd_hdac_stream_updatel(dev, reg, mask, val) \

include/sound/hdaudio_ext.h

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 


int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,

		      const struct hdac_bus_ops *ops,

		      const struct hdac_io_ops *io_ops,

		      const struct hdac_ext_bus_ops *ext_ops);



void snd_hdac_ext_bus_exit(struct hdac_bus *bus);

sound/hda/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ config SND_HDA_CORE 
config SND_HDA_DSP_LOADER

	bool



config SND_HDA_ALIGNED_MMIO

	bool



config SND_HDA_COMPONENT

	bool

sound/hda/ext/hdac_ext_bus.c

+1 −59
Original line number Diff line number Diff line
@@ -17,80 +17,22 @@ 
MODULE_DESCRIPTION("HDA extended core");

MODULE_LICENSE("GPL v2");



static void hdac_ext_writel(u32 value, u32 __iomem *addr)

{

	writel(value, addr);

}



static u32 hdac_ext_readl(u32 __iomem *addr)

{

	return readl(addr);

}



static void hdac_ext_writew(u16 value, u16 __iomem *addr)

{

	writew(value, addr);

}



static u16 hdac_ext_readw(u16 __iomem *addr)

{

	return readw(addr);

}



static void hdac_ext_writeb(u8 value, u8 __iomem *addr)

{

	writeb(value, addr);

}



static u8 hdac_ext_readb(u8 __iomem *addr)

{

	return readb(addr);

}



static int hdac_ext_dma_alloc_pages(struct hdac_bus *bus, int type,

			   size_t size, struct snd_dma_buffer *buf)

{

	return snd_dma_alloc_pages(type, bus->dev, size, buf);

}



static void hdac_ext_dma_free_pages(struct hdac_bus *bus, struct snd_dma_buffer *buf)

{

	snd_dma_free_pages(buf);

}



static const struct hdac_io_ops hdac_ext_default_io = {

	.reg_writel = hdac_ext_writel,

	.reg_readl = hdac_ext_readl,

	.reg_writew = hdac_ext_writew,

	.reg_readw = hdac_ext_readw,

	.reg_writeb = hdac_ext_writeb,

	.reg_readb = hdac_ext_readb,

	.dma_alloc_pages = hdac_ext_dma_alloc_pages,

	.dma_free_pages = hdac_ext_dma_free_pages,

};



/**

 * snd_hdac_ext_bus_init - initialize a HD-audio extended bus

 * @ebus: the pointer to extended bus object

 * @dev: device pointer

 * @ops: bus verb operators

 * @io_ops: lowlevel I/O operators, can be NULL. If NULL core will use

 * default ops

 *

 * Returns 0 if successful, or a negative error code.

 */

int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev,

			const struct hdac_bus_ops *ops,

			const struct hdac_io_ops *io_ops,

			const struct hdac_ext_bus_ops *ext_ops)

{

	int ret;



	/* check if io ops are provided, if not load the defaults */

	if (io_ops == NULL)

		io_ops = &hdac_ext_default_io;



	ret = snd_hdac_bus_init(bus, dev, ops, io_ops);

	ret = snd_hdac_bus_init(bus, dev, ops);

	if (ret < 0)

		return ret;

sound/hda/hdac_bus.c

+32 −4
Original line number Diff line number Diff line
@@ -19,13 +19,11 @@ static const struct hdac_bus_ops default_ops = { 
 * snd_hdac_bus_init - initialize a HD-audio bas bus

 * @bus: the pointer to bus object

 * @ops: bus verb operators

 * @io_ops: lowlevel I/O operators

 *

 * Returns 0 if successful, or a negative error code.

 */

int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev,

		      const struct hdac_bus_ops *ops,

		      const struct hdac_io_ops *io_ops)

		      const struct hdac_bus_ops *ops)

{

	memset(bus, 0, sizeof(*bus));

	bus->dev = dev;
@@ -33,7 +31,7 @@ int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev, 
		bus->ops = ops;

	else

		bus->ops = &default_ops;

	bus->io_ops = io_ops;

	bus->dma_type = SNDRV_DMA_TYPE_DEV;

	INIT_LIST_HEAD(&bus->stream_list);

	INIT_LIST_HEAD(&bus->codec_list);

	INIT_WORK(&bus->unsol_work, snd_hdac_bus_process_unsol_events);
@@ -217,3 +215,33 @@ void snd_hdac_bus_remove_device(struct hdac_bus *bus, 
	flush_work(&bus->unsol_work);

}

EXPORT_SYMBOL_GPL(snd_hdac_bus_remove_device);



#ifdef CONFIG_SND_HDA_ALIGNED_MMIO

/* Helpers for aligned read/write of mmio space, for Tegra */

unsigned int snd_hdac_aligned_read(void __iomem *addr, unsigned int mask)

{

	void __iomem *aligned_addr =

		(void __iomem *)((unsigned long)(addr) & ~0x3);

	unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;

	unsigned int v;



	v = readl(aligned_addr);

	return (v >> shift) & mask;

}

EXPORT_SYMBOL_GPL(snd_hdac_aligned_read);



void snd_hdac_aligned_write(unsigned int val, void __iomem *addr,

			    unsigned int mask)

{

	void __iomem *aligned_addr =

		(void __iomem *)((unsigned long)(addr) & ~0x3);

	unsigned int shift = ((unsigned long)(addr) & 0x3) << 3;

	unsigned int v;



	v = readl(aligned_addr);

	v &= ~(mask << shift);

	v |= val << shift;

	writel(v, aligned_addr);

}

EXPORT_SYMBOL_GPL(snd_hdac_aligned_write);

#endif /* CONFIG_SND_HDA_ALIGNED_MMIO */