Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f8e9400 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ice1712: Fix boundary checks in PCM pointer ops 



PCM pointer callbacks in ice1712 driver check the buffer size boundary
wrongly between bytes and frames.  This leads to PCM core warnings
like:
   snd_pcm_update_hw_ptr0: 105 callbacks suppressed
   ALSA pcm_lib.c:352 BUG: pcmC3D0c:0, pos = 5461, buffer size = 5461, period size = 2730

This patch fixes these checks to be placed after the proper unit
conversions.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent dcb32ecd

sound/pci/ice1712/ice1712.c

+10 −5
Original line number Diff line number Diff line
@@ -685,9 +685,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_pointer(struct snd_pcm_substream * 
	if (!(snd_ice1712_read(ice, ICE1712_IREG_PBK_CTRL) & 1))

		return 0;

	ptr = runtime->buffer_size - inw(ice->ddma_port + 4);

	ptr = bytes_to_frames(substream->runtime, ptr);

	if (ptr == runtime->buffer_size)

		ptr = 0;

	return bytes_to_frames(substream->runtime, ptr);

	return ptr;

}



static snd_pcm_uframes_t snd_ice1712_playback_ds_pointer(struct snd_pcm_substream *substream)
@@ -704,9 +705,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_ds_pointer(struct snd_pcm_substrea 
		addr = ICE1712_DSC_ADDR0;

	ptr = snd_ice1712_ds_read(ice, substream->number * 2, addr) -

		ice->playback_con_virt_addr[substream->number];

	ptr = bytes_to_frames(substream->runtime, ptr);

	if (ptr == substream->runtime->buffer_size)

		ptr = 0;

	return bytes_to_frames(substream->runtime, ptr);

	return ptr;

}



static snd_pcm_uframes_t snd_ice1712_capture_pointer(struct snd_pcm_substream *substream)
@@ -717,9 +719,10 @@ static snd_pcm_uframes_t snd_ice1712_capture_pointer(struct snd_pcm_substream *s 
	if (!(snd_ice1712_read(ice, ICE1712_IREG_CAP_CTRL) & 1))

		return 0;

	ptr = inl(ICEREG(ice, CONCAP_ADDR)) - ice->capture_con_virt_addr;

	ptr = bytes_to_frames(substream->runtime, ptr);

	if (ptr == substream->runtime->buffer_size)

		ptr = 0;

	return bytes_to_frames(substream->runtime, ptr);

	return ptr;

}



static const struct snd_pcm_hardware snd_ice1712_playback = {
@@ -1116,9 +1119,10 @@ static snd_pcm_uframes_t snd_ice1712_playback_pro_pointer(struct snd_pcm_substre 
	if (!(inl(ICEMT(ice, PLAYBACK_CONTROL)) & ICE1712_PLAYBACK_START))

		return 0;

	ptr = ice->playback_pro_size - (inw(ICEMT(ice, PLAYBACK_SIZE)) << 2);

	ptr = bytes_to_frames(substream->runtime, ptr);

	if (ptr == substream->runtime->buffer_size)

		ptr = 0;

	return bytes_to_frames(substream->runtime, ptr);

	return ptr;

}



static snd_pcm_uframes_t snd_ice1712_capture_pro_pointer(struct snd_pcm_substream *substream)
@@ -1129,9 +1133,10 @@ static snd_pcm_uframes_t snd_ice1712_capture_pro_pointer(struct snd_pcm_substrea 
	if (!(inl(ICEMT(ice, PLAYBACK_CONTROL)) & ICE1712_CAPTURE_START_SHADOW))

		return 0;

	ptr = ice->capture_pro_size - (inw(ICEMT(ice, CAPTURE_SIZE)) << 2);

	ptr = bytes_to_frames(substream->runtime, ptr);

	if (ptr == substream->runtime->buffer_size)

		ptr = 0;

	return bytes_to_frames(substream->runtime, ptr);

	return ptr;

}



static const struct snd_pcm_hardware snd_ice1712_playback_pro = {