linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Takashi Iwai <tiwai@suse.de>, Sasha Levin <sashal@kernel.org>,
	alsa-devel@alsa-project.org
Subject: [PATCH AUTOSEL 4.4 29/35] ASoC: intel: atom: Revert PCM buffer address setup workaround again
Date: Thu,  9 Sep 2021 08:01:10 -0400	[thread overview]
Message-ID: <20210909120116.150912-29-sashal@kernel.org> (raw)
In-Reply-To: <20210909120116.150912-1-sashal@kernel.org>

From: Takashi Iwai <tiwai@suse.de>

[ Upstream commit e28ac04a705e946eddc5e7d2fc712dea3f20fe9e ]

We worked around the breakage of PCM buffer setup by the commit
65ca89c2b12c ("ASoC: intel: atom: Fix breakage for PCM buffer address
setup"), but this isn't necessary since the CONTINUOUS buffer type
also sets runtime->dma_addr since commit f84ba106a018 ("ALSA:
memalloc: Store snd_dma_buffer.addr for continuous pages, too").
Let's revert the change again.

Link: https://lore.kernel.org/r/20210822072127.9786-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index d0d338533eb6..64079423b298 100644
--- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -134,7 +134,7 @@ static void sst_fill_alloc_params(struct snd_pcm_substream *substream,
 	snd_pcm_uframes_t period_size;
 	ssize_t periodbytes;
 	ssize_t buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
-	u32 buffer_addr = virt_to_phys(substream->runtime->dma_area);
+	u32 buffer_addr = substream->runtime->dma_addr;
 
 	channels = substream->runtime->channels;
 	period_size = substream->runtime->period_size;
-- 
2.30.2


  parent reply	other threads:[~2021-09-09 13:30 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-09 12:00 [PATCH AUTOSEL 4.4 01/35] crypto: mxs-dcp - Use sg_mapping_iter to copy data Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 02/35] PCI: Use pci_update_current_state() in pci_enable_device_flags() Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 03/35] iio: dac: ad5624r: Fix incorrect handling of an optional regulator Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 04/35] video: fbdev: kyro: fix a DoS bug by restricting user input Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 05/35] netlink: Deal with ESRCH error in nlmsg_notify() Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 06/35] Smack: Fix wrong semantics in smk_access_entry() Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 07/35] usb: host: fotg210: fix the actual_length of an iso packet Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 08/35] usb: gadget: u_ether: fix a potential null pointer dereference Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 09/35] tty: serial: jsm: hold port lock when reporting modem line changes Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 10/35] bpf/tests: Fix copy-and-paste error in double word test Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 11/35] bpf/tests: Do not PASS tests without actually testing the result Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 12/35] video: fbdev: asiliantfb: Error out if 'pixclock' equals zero Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 13/35] video: fbdev: kyro: " Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 14/35] video: fbdev: riva: " Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 15/35] ipv4: ip_output.c: Fix out-of-bounds warning in ip_copy_addrs() Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 16/35] s390/jump_label: print real address in a case of a jump label bug Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 17/35] serial: 8250: Define RX trigger levels for OxSemi 950 devices Sasha Levin
2021-09-09 12:00 ` [PATCH AUTOSEL 4.4 18/35] xtensa: ISS: don't panic in rs_init Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 19/35] hvsi: don't panic on tty_register_driver failure Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 20/35] serial: 8250_pci: make setup_port() parameters explicitly unsigned Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 21/35] Bluetooth: skip invalid hci_sync_conn_complete_evt Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 22/35] gpu: drm: amd: amdgpu: amdgpu_i2c: fix possible uninitialized-variable access in amdgpu_i2c_router_select_ddc_port() Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 23/35] ARM: tegra: tamonten: Fix UART pad setting Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 24/35] ACPICA: iASL: Fix for WPBT table with no command-line arguments Sasha Levin
2021-09-10  7:45   ` Pavel Machek
2021-09-11 14:38     ` Sasha Levin
2021-09-13 12:20       ` Rafael J. Wysocki
2021-09-17 19:21     ` Moore, Robert
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 25/35] rpc: fix gss_svc_init cleanup on failure Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 26/35] gfs2: Don't call dlm after protocol is unmounted Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 27/35] btrfs: subpage: check if there are compressed extents inside one page Sasha Levin
2021-09-09 13:01   ` David Sterba
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 28/35] btrfs: subpage: fix race between prepare_pages() and btrfs_releasepage() Sasha Levin
2021-09-09 13:02   ` David Sterba
2021-09-09 12:01 ` Sasha Levin [this message]
2021-09-09 12:07   ` [PATCH AUTOSEL 4.4 29/35] ASoC: intel: atom: Revert PCM buffer address setup workaround again Takashi Iwai
2021-09-12 21:26     ` Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 30/35] mmc: rtsx_pci: Fix long reads when clock is prescaled Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 31/35] cifs: fix wrong release in sess_alloc_buffer() failed path Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 32/35] Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set" Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 33/35] parport: remove non-zero check on count Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 34/35] ath9k: fix OOB read ar9300_eeprom_restore_internal Sasha Levin
2021-09-09 12:01 ` [PATCH AUTOSEL 4.4 35/35] net: fix NULL pointer reference in cipso_v4_doi_free Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210909120116.150912-29-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).