From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5407215DBBE; Mon, 29 Jan 2024 18:36:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706553362; cv=none; b=PC1OvhwN+FSbyU0xTuQbbVSZ+WahEEGHV26fwo5I8M+V7Dz84iK2UabVyMTW3fnuJ1yPiHnN/F5SrK9xycjW14VNuocMVMTo+yEGg93XmzCfcGsLsMrxBGDeFCDrUm3YrfQgFTrZIS1lPhnTKLZ05fE0j5qwDXhlkiWxNwxoNzA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706553362; c=relaxed/simple; bh=TmHzqRdk/0Z19JkTcZYGsBTA7oxVAWrK/jTNv7xJCIw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=r1s0NFJvkOyuRS0jgjjEb/Jkz3lSF2fQINXAPZsoI6qoVH4Xw6k2ZEISf8tslDJXzi9FT2eWcvzmfDjtccIX2dtGWmj++gO2HyS4iH6LTTDtGNSllMLXCHU3vgUO0fixNEDDOhpVCQQhb1xTCBIo53MuSKrB8w6Yx/3u1u1OQqg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pkFF/wWx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pkFF/wWx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16FA1C433F1; Mon, 29 Jan 2024 18:36:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706553362; bh=TmHzqRdk/0Z19JkTcZYGsBTA7oxVAWrK/jTNv7xJCIw=; h=From:To:Cc:Subject:Date:From; b=pkFF/wWxIF1lWmMUplTX6lOEe6A5ec4s3UPhOprspq+Vb+zOZnu/PwnEWpLe3aDNM OmkQQ73bBSjX4HW71Zcet54r3pBq1wa1vpqHdDLxaRxigmPJ6KzDBB0v/qMRqJxDHz rtcOaJXNnuLIzrQQHaGpnH683YPdxaUdspQqj156JaT1k4d/2rSpXmsGhwTETDBBgc aY4wsgfouIOCyBOli5AjJFzb0K24biGeV+tP4o02Lk8KdJLJatS4CpvdF6VfJTxY4r PbUQYvdsDlRRLu/MTmQXT/nBhO62WT1/lxQ1qChZdrZN07CmqoS4J+cZ2HprzYJvPi mdqj7HprL1ZYA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hector Martin , =?UTF-8?q?Martin=20Povi=C5=A1er?= , Vinod Koul , Sasha Levin , sven@svenpeter.dev, asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 1/5] dmaengine: apple-admac: Keep upper bits of REG_BUS_WIDTH Date: Mon, 29 Jan 2024 13:35:53 -0500 Message-ID: <20240129183559.464502-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.75 Content-Transfer-Encoding: 8bit From: Hector Martin [ Upstream commit 306f5df81fcc89b462fbeb9dbe26d9a8ad7c7582 ] For RX channels, REG_BUS_WIDTH seems to default to a value of 0xf00, and macOS preserves the upper bits when setting the configuration in the lower ones. If we reset the upper bits to 0, this causes framing errors on suspend/resume (the data stream "tears" and channels get swapped around). Keeping the upper bits untouched, like the macOS driver does, fixes this issue. Signed-off-by: Hector Martin Reviewed-by: Martin Povišer Signed-off-by: Martin Povišer Link: https://lore.kernel.org/r/20231029170704.82238-1-povik+lin@cutebit.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/apple-admac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c index 4cf8da77bdd9..cac4532fe23a 100644 --- a/drivers/dma/apple-admac.c +++ b/drivers/dma/apple-admac.c @@ -56,6 +56,8 @@ #define REG_BUS_WIDTH(ch) (0x8040 + (ch) * 0x200) +#define BUS_WIDTH_WORD_SIZE GENMASK(3, 0) +#define BUS_WIDTH_FRAME_SIZE GENMASK(7, 4) #define BUS_WIDTH_8BIT 0x00 #define BUS_WIDTH_16BIT 0x01 #define BUS_WIDTH_32BIT 0x02 @@ -739,7 +741,8 @@ static int admac_device_config(struct dma_chan *chan, struct admac_data *ad = adchan->host; bool is_tx = admac_chan_direction(adchan->no) == DMA_MEM_TO_DEV; int wordsize = 0; - u32 bus_width = 0; + u32 bus_width = readl_relaxed(ad->base + REG_BUS_WIDTH(adchan->no)) & + ~(BUS_WIDTH_WORD_SIZE | BUS_WIDTH_FRAME_SIZE); switch (is_tx ? config->dst_addr_width : config->src_addr_width) { case DMA_SLAVE_BUSWIDTH_1_BYTE: -- 2.43.0