Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp459934pxb; Thu, 9 Sep 2021 05:05:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypD0ycS0BcZKhhZDYLU1XkIiQpPpAeidRlW3Zd/O44IKCPR6SJNJjNuhxylv/qo7RA0pCp X-Received: by 2002:a92:902:: with SMTP id y2mr1974945ilg.304.1631189155668; Thu, 09 Sep 2021 05:05:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631189155; cv=none; d=google.com; s=arc-20160816; b=03/Ik51Lr4JiOPcRWFh88+Q4ulYA86HEN+N/8BanwgKZ1JKwLFLAFgdeLJuOmAZXma kEA2xqx6JymuTGT3A1EPNoRwIsi4njSzMHU6HmtjBm5fcu20osXl2/HH80Brco3h9qPV wcJTvrotb1sCz2Go8xsJri3ZU/+r5jg65HyxVu7oSl/3B3+zy0p+//RqOJy9trrMHs9p 6nLx91sZPe7QnQ3c9du2kolBShOuElGDct1fLvg5sjmy4Mb++u4C3NWEzlgyMRwEHxPS OmQsYWJGcjYsqDmhyLiH5Eq+qBw4j5/BwObh7MQWcHXYNrWgZfhRgZCxR7JqXpb/UXJa Lmaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cCvCCd4AIfJq5HXeaBWK4oaEDVModIu+CjuPq0xuBfM=; b=Lg45koGZtjCJD10UK9PU49eWrj9jlQq3Ftyot8DF9MxDV6SNDtHN1UXJzcMN11o+fT MLRV/gi1qUm+DGuMWdpbdtCwBnrKNv3qUbu3YpLee13svs5OydSxzB/9hYM9GEw6YiMd 2Ik+gBMS0LdxFn/jzvRyMSNniKcPyTZDsdXKKNN1ccS++usxMkOgjvVWadfLFU+YT3Ds OoTKUhHblnYD/OOe7vlgHVTLiPuz+IusablyR0sp8dCSA0kCtA0mq0kOFcYtKrjyOj/B ondg+4q9Vb/IcUtTdMGbIcNUE8a70J90SgjvN9dL2voKjHG6x8+DhRmyp3PuguW7PTD+ raVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=M0spWyzs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g7si1972075iov.41.2021.09.09.05.05.32; Thu, 09 Sep 2021 05:05:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=M0spWyzs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243808AbhIIMDk (ORCPT + 99 others); Thu, 9 Sep 2021 08:03:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:34544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245104AbhIIL4k (ORCPT ); Thu, 9 Sep 2021 07:56:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1D7A6611BD; Thu, 9 Sep 2021 11:45:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631187924; bh=sQYVfnoL0J/WnRQewf8hj4OQQlqQpZwChqsObkIN0ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M0spWyzsnzlqE6CwfdgvHpD6JxM7AFilaZ0f47Td+Z8UvLXAkFlXG6scTDgrz/I1/ TvynlwE//HDlX12k4tAIqhuX/isgo2nn7dlO7ap0CpF0fmfqyCOJPSamh8x7lr3+kP tq60uBt9L1RdAn3Pb8VgH+RL64Zgpp9bEZpodZvrN6vhkapqh1MT3Oj0IgDr3Q9NiW QvGevLb0xjjHqVB0A1hwvIP/A/3oSfC0JTjpotMN3VlVRxtYgvQT1/O2Fy3eCV4QWA GPni86uWuCLq4gNuFcXpvZlMKYbvXPzFyUuEtyzRhQUhMEnvQzwhDBTHko/3+441qu 6AljE/XKjokqg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 5.14 198/252] ASoC: intel: atom: Revert PCM buffer address setup workaround again Date: Thu, 9 Sep 2021 07:40:12 -0400 Message-Id: <20210909114106.141462-198-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909114106.141462-1-sashal@kernel.org> References: <20210909114106.141462-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai [ 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 Signed-off-by: Sasha Levin --- 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 905c7965f653..5db2f4865bbb 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -127,7 +127,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