Commit 3cab69d9 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Takashi Iwai
Browse files

ALSA: hda: Move stream-register polling macros 



Polling stream registers doesn't really have anything to do with
extended HDA registers, so move it to basic HDA header. This will allow
for use in HDA framework.

Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20220818141517.109280-2-amadeuszx.slawinski@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f2bd1c5a

include/sound/hdaudio.h

+7 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/iopoll.h>

#include <linux/pm_runtime.h>

#include <linux/timecounter.h>

#include <sound/core.h>
@@ -589,6 +590,12 @@ int snd_hdac_get_stream_stripe_ctl(struct hdac_bus *bus, 
	snd_hdac_reg_readw((dev)->bus, (dev)->sd_addr + AZX_REG_ ## reg)

#define snd_hdac_stream_readb(dev, reg) \

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

#define snd_hdac_stream_readb_poll(dev, reg, val, cond, delay_us, timeout_us) \

	readb_poll_timeout((dev)->sd_addr + AZX_REG_ ## reg, val, cond, \

			   delay_us, timeout_us)

#define snd_hdac_stream_readl_poll(dev, reg, val, cond, delay_us, timeout_us) \

	readl_poll_timeout((dev)->sd_addr + AZX_REG_ ## reg, val, cond, \

			   delay_us, timeout_us)



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

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

include/sound/hdaudio_ext.h

+0 −6
Original line number Diff line number Diff line
@@ -185,12 +185,6 @@ void snd_hdac_ext_bus_link_power(struct hdac_device *codec, bool enable); 
#define snd_hdac_adsp_readq_poll(chip, reg, val, cond, delay_us, timeout_us) \

	readq_poll_timeout((chip)->dsp_ba + (reg), val, cond, \

			   delay_us, timeout_us)

#define snd_hdac_stream_readb_poll(strm, reg, val, cond, delay_us, timeout_us) \

	readb_poll_timeout((strm)->sd_addr + AZX_REG_ ## reg, val, cond, \

			   delay_us, timeout_us)

#define snd_hdac_stream_readl_poll(strm, reg, val, cond, delay_us, timeout_us) \

	readl_poll_timeout((strm)->sd_addr + AZX_REG_ ## reg, val, cond, \

			   delay_us, timeout_us)



struct hdac_ext_device;