Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp521151pxb; Thu, 9 Sep 2021 06:21:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyAnns3QVRTZDVWoHMbbaxE+zCNrqpn9xdeW246qTeY6kUsy1vufru96P1wDKA822/q5T56 X-Received: by 2002:aa7:c80a:: with SMTP id a10mr1301269edt.174.1631193670151; Thu, 09 Sep 2021 06:21:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631193670; cv=none; d=google.com; s=arc-20160816; b=r0NPc8E94Zuzzpys9O4oXYH7tiKp/l0hJ/YrzOKov7Q03vGiM765DmbmV4jZAIYneb 6PkbeR9pREYOoZ4PE0smGrxD53m+t5wTAv4lp2Rg+IpJnj8B4gchR/7scJlZ2mm9VvLq H0EOSBL+xQxdrMZjLI5LGlGouoHG0ku/O8QNQ2Ho+dsMD1usDz9RQRaAleMDvpe5CaI7 YWHu5B6dRuxUMJhkYnA/SAzP1Cwek7GDF3sc2/L9OSUbJL5Y6WzZAXnBcAnoo8DA8W8s QSGNVVqypo1zPm2I/gQuCpPEmYTRzZHbcFoRDyqJVbKvkMQtuEMWPl7mzBbCG75m/Wkq yJrQ== 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=XZqYQaayVSncnHwx8rd/6q5TderfvpW8Rm1h0xqxWJs=; b=IPpUiHqC4vjdkk2t7VmYwk1HPZDEOf2dpf4cPxFkQ+yfqmVFO4MDdd3HyJs5Abn1FH J7hHe+b0w+npw7Qu+1TLT+KOIrs2vy0DG/BLkWaWGaBqyoKfd6mlODD4mkRdqUEoUvLC r7uKjs1J1lA1MRUZHM35YI9yLjAtUY/Fq1UZ1IQsYBWiT16aYBfZGzyGdFxLM2UKIe4z 1B1ZheTVEL4jWQeyY3AVBAJHghXw54Z89ohuO72lE2sy7PznPelO/b6Ct2e3Nx5N3Lng eOXdudrC5Mhp+Sum2H4aDPpRTD9lFbIfrVlTYUCKaXJ0ls12Yp8VlT1tOpoQWrBdMU0T PNDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SMfofQ71; 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 i10si2127026ejd.99.2021.09.09.06.20.44; Thu, 09 Sep 2021 06:21:10 -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=SMfofQ71; 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 S1356697AbhIINOn (ORCPT + 99 others); Thu, 9 Sep 2021 09:14:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:43554 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355703AbhIINDl (ORCPT ); Thu, 9 Sep 2021 09:03:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 27DBF6329E; Thu, 9 Sep 2021 11:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188795; bh=oYJiCx/R2zj8tB3GBLoUG1YKz8/b0mUWrrn503eqvUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SMfofQ71zZcZNDSQoo0RN4tDLKEJ6+W5MoWTiPLVySBGne7dYXL4KwMaJC9e4Pbbt a8Keug8eMicTuxvyAyvoXNJzx5+0fJtTA8GRjt7JEAyoHc8LMYsrZURTh6KILN516F wzMyLkqNGwUiXbHH6jEG5uVOuRGKcMgUYqi4vAhL0vwuGeXvXvZvTvJYPdwrJoY+m3 BYN+y0dMdc/V9Ceh1ARY7PaiAZBMPRVY1fYNGvYmCPDU1xXLgbw1B0cxipXMSO7wGw MwuvEZrGXEJICHXyOlFbnmYwUD+hi94sEExpA9cTE0rePiSggQ17wcKiVtdG5rW319 lvL+pTR23J9sA== 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 4.14 44/59] ASoC: intel: atom: Revert PCM buffer address setup workaround again Date: Thu, 9 Sep 2021 07:58:45 -0400 Message-Id: <20210909115900.149795-44-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115900.149795-1-sashal@kernel.org> References: <20210909115900.149795-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 96f7facd0fa0..c877326cb0a6 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -135,7 +135,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