Commit 02f2e785 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus

parents 84ab9408 56e696c0

Documentation/sound/kernel-api/writing-an-alsa-driver.rst

+8 −13
Original line number Diff line number Diff line
@@ -3565,13 +3565,17 @@ given size. 
The second argument (type) and the third argument (device pointer) are

dependent on the bus. For normal devices, pass the device pointer

(typically identical as ``card->dev``) to the third argument with

``SNDRV_DMA_TYPE_DEV`` type. For the continuous buffer unrelated to the

``SNDRV_DMA_TYPE_DEV`` type.



For the continuous buffer unrelated to the

bus can be pre-allocated with ``SNDRV_DMA_TYPE_CONTINUOUS`` type.

You can pass NULL to the device pointer in that case, which is the

default mode implying to allocate with ``GFP_KERNEL`` flag.

If you need a different GFP flag, you can pass it by encoding the flag

into the device pointer via a special macro

:c:func:`snd_dma_continuous_data()`.

If you need a restricted (lower) address, set up the coherent DMA mask

bits for the device, and pass the device pointer, like the normal

device memory allocations.  For this type, it's still allowed to pass

NULL to the device pointer, too, if no address restriction is needed.



For the scatter-gather buffers, use ``SNDRV_DMA_TYPE_DEV_SG`` with the

device pointer (see the `Non-Contiguous Buffers`_ section).
@@ -3811,15 +3815,6 @@ arguments here. Since each vmalloc call should succeed at any time, 
we don't need to pre-allocate the buffers like other continuous

pages.



If you need the 32bit DMA allocation, pass the device pointer encoded

by :c:func:`snd_dma_continuous_data()` with ``GFP_KERNEL|__GFP_DMA32``

argument.



::



  snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_VMALLOC,

          snd_dma_continuous_data(GFP_KERNEL | __GFP_DMA32), 0, 0);



Proc Interface

==============

drivers/usb/gadget/function/u_uac1_legacy.c

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ size_t u_audio_playback(struct gaudio *card, void *buf, size_t count) 
	snd_pcm_sframes_t frames;



try_again:

	if (runtime->status->state == SNDRV_PCM_STATE_XRUN ||

		runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {

	if (runtime->state == SNDRV_PCM_STATE_XRUN ||

		runtime->state == SNDRV_PCM_STATE_SUSPENDED) {

		result = snd_pcm_kernel_ioctl(substream,

				SNDRV_PCM_IOCTL_PREPARE, NULL);

		if (result < 0) {

include/sound/hda_codec.h

+0 −3
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ struct hda_codec { 
	unsigned int link_down_at_suspend:1; /* link down at runtime suspend */

	unsigned int relaxed_resume:1;	/* don't resume forcibly for jack */

	unsigned int forced_resume:1; /* forced resume for jack */

	unsigned int mst_no_extra_pcms:1; /* no backup PCMs for DP-MST */



#ifdef CONFIG_PM

	unsigned long power_on_acct;
@@ -293,8 +292,6 @@ struct hda_codec { 
#define dev_to_hda_codec(_dev)	container_of(_dev, struct hda_codec, core.dev)

#define hda_codec_dev(_dev)	(&(_dev)->core.dev)



#define hdac_to_hda_priv(_hdac) \

			container_of(_hdac, struct hdac_hda_priv, codec.core)

#define hdac_to_hda_codec(_hdac) container_of(_hdac, struct hda_codec, core)



#define list_for_each_codec(c, bus) \

include/sound/hda_register.h

+11 −9
Original line number Diff line number Diff line
@@ -260,7 +260,18 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; 


#define AZX_REG_ML_LCAP			0x00

#define AZX_REG_ML_LCTL			0x04



#define AZX_ML_LCTL_CPA			BIT(23)

#define AZX_ML_LCTL_CPA_SHIFT		23

#define AZX_ML_LCTL_SPA			BIT(16)

#define AZX_ML_LCTL_SPA_SHIFT		16

#define AZX_ML_LCTL_SCF			GENMASK(3, 0)



#define AZX_REG_ML_LOSIDV		0x08



/* bit0 is reserved, with BIT(1) mapping to stream1 */

#define AZX_ML_LOSIDV_STREAM_MASK	0xFFFE



#define AZX_REG_ML_LSDIID		0x0C

#define AZX_REG_ML_LPSOO		0x10

#define AZX_REG_ML_LPSIO		0x12
@@ -268,15 +279,6 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; 
#define AZX_REG_ML_LOUTPAY		0x20

#define AZX_REG_ML_LINPAY		0x30



/* bit0 is reserved, with BIT(1) mapping to stream1 */

#define ML_LOSIDV_STREAM_MASK		0xFFFE



#define ML_LCTL_SCF_MASK			0xF

#define AZX_MLCTL_SPA				(0x1 << 16)

#define AZX_MLCTL_CPA				(0x1 << 23)

#define AZX_MLCTL_SPA_SHIFT			16

#define AZX_MLCTL_CPA_SHIFT			23



/* registers for DMA Resume Capability Structure */

#define AZX_DRSM_CAP_ID			0x5

#define AZX_REG_DRSM_CTL		0x4

include/sound/hdaudio.h

+9 −1
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>
@@ -550,6 +551,7 @@ void snd_hdac_stream_init(struct hdac_bus *bus, struct hdac_stream *azx_dev, 
			  int idx, int direction, int tag);

struct hdac_stream *snd_hdac_stream_assign(struct hdac_bus *bus,

					   struct snd_pcm_substream *substream);

void snd_hdac_stream_release_locked(struct hdac_stream *azx_dev);

void snd_hdac_stream_release(struct hdac_stream *azx_dev);

struct hdac_stream *snd_hdac_get_stream(struct hdac_bus *bus,

					int dir, int stream_tag);
@@ -560,8 +562,8 @@ int snd_hdac_stream_setup_periods(struct hdac_stream *azx_dev); 
int snd_hdac_stream_set_params(struct hdac_stream *azx_dev,

				unsigned int format_val);

void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start);

void snd_hdac_stream_clear(struct hdac_stream *azx_dev);

void snd_hdac_stream_stop(struct hdac_stream *azx_dev);

void snd_hdac_stop_streams(struct hdac_bus *bus);

void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus);

void snd_hdac_stream_reset(struct hdac_stream *azx_dev);

void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set,
@@ -589,6 +591,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) \