Commit 306f5df8 authored by Hector Martin's avatar Hector Martin Committed by Vinod Koul
Browse files

dmaengine: apple-admac: Keep upper bits of REG_BUS_WIDTH 



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: default avatarHector Martin <marcan@marcan.st>
Reviewed-by: default avatarMartin Povišer <povik+lin@cutebit.org>
Signed-off-by: default avatarMartin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/20231029170704.82238-1-povik+lin@cutebit.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 375ff42c

drivers/dma/apple-admac.c

+4 −1
Original line number Diff line number Diff line
@@ -57,6 +57,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
@@ -740,7 +742,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: