Dne nedelja, 24. april 2022 ob 19:27:57 CEST je Samuel Holland napisal(a):
> Recent Allwinner SoCs support >4 GiB of DRAM, so those variants of the
> DMA engine support >32 bit physical addresses. This is accomplished by
> placing the high bits in the "para" word in the DMA descriptor.
>
> DMA descriptors themselves can be located at >32 bit addresses by
> putting the high bits in the LSBs of the descriptor address register,
> taking advantage of the required DMA descriptor alignment. However,
> support for this is not really necessary, so we can avoid the
> complication by allocating them from the DMA_32 zone.
>
> Signed-off-by: Samuel Holland <samuel@xxxxxxxxxxxx>
Acked-by: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>
Best regards,
Jernej Skrabec
> ---
>
> Changes in v3:
> - Fix shift warnings for 32-bit dma_addr_t and 32-bit phys_addr_t
> - Make explicit that v_lli->src/dst only hold the low 32 bits
>
> Changes in v2:
> - Fix `checkpatch.pl --strict` style issues (missing spaces)
>
> drivers/dma/sun6i-dma.c | 53 +++++++++++++++++++++++++++++------------
> 1 file changed, 38 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c
> index 4436fbd70445..1eb3bafa7324 100644
> --- a/drivers/dma/sun6i-dma.c
> +++ b/drivers/dma/sun6i-dma.c
> @@ -90,6 +90,14 @@
>
> #define DMA_CHAN_CUR_PARA 0x1c
>
> +/*
> + * LLI address mangling
> + *
> + * The LLI link physical address is also mangled, but we avoid dealing
> + * with that by allocating LLIs from the DMA32 zone.
> + */
> +#define SRC_HIGH_ADDR(x) (((x) & 0x3U) << 16)
> +#define DST_HIGH_ADDR(x) (((x) & 0x3U) << 18)
>
> /*
> * Various hardware related defines
> @@ -132,6 +140,7 @@ struct sun6i_dma_config {
> u32 dst_burst_lengths;
> u32 src_addr_widths;
> u32 dst_addr_widths;
> + bool has_high_addr;
> bool has_mbus_clk;
> };
>
> @@ -623,6 +632,18 @@ static int set_config(struct sun6i_dma_dev *sdev,
> return 0;
> }
>
> +static inline void sun6i_dma_set_addr(struct sun6i_dma_dev *sdev,
> + struct sun6i_dma_lli *v_lli,
> + dma_addr_t src, dma_addr_t
dst)
> +{
> + v_lli->src = lower_32_bits(src);
> + v_lli->dst = lower_32_bits(dst);
> +
> + if (sdev->cfg->has_high_addr)
> + v_lli->para |= SRC_HIGH_ADDR(upper_32_bits(src)) |
> + DST_HIGH_ADDR(upper_32_bits(dst));
> +}
> +
> static struct dma_async_tx_descriptor *sun6i_dma_prep_dma_memcpy(
> struct dma_chan *chan, dma_addr_t dest, dma_addr_t src,
> size_t len, unsigned long flags)
> @@ -645,16 +666,15 @@ static struct dma_async_tx_descriptor
*sun6i_dma_prep_dma_memcpy(
> if (!txd)
> return NULL;
>
> - v_lli = dma_pool_alloc(sdev->pool, GFP_NOWAIT, &p_lli);
> + v_lli = dma_pool_alloc(sdev->pool, GFP_DMA32 | GFP_NOWAIT, &p_lli);
> if (!v_lli) {
> dev_err(sdev->slave.dev, "Failed to alloc lli
memory\n");
> goto err_txd_free;
> }
>
> - v_lli->src = src;
> - v_lli->dst = dest;
> v_lli->len = len;
> v_lli->para = NORMAL_WAIT;
> + sun6i_dma_set_addr(sdev, v_lli, src, dest);
>
> burst = convert_burst(8);
> width = convert_buswidth(DMA_SLAVE_BUSWIDTH_4_BYTES);
> @@ -705,7 +725,7 @@ static struct dma_async_tx_descriptor
*sun6i_dma_prep_slave_sg(
> return NULL;
>
> for_each_sg(sgl, sg, sg_len, i) {
> - v_lli = dma_pool_alloc(sdev->pool, GFP_NOWAIT, &p_lli);
> + v_lli = dma_pool_alloc(sdev->pool, GFP_DMA32 |
GFP_NOWAIT, &p_lli);
> if (!v_lli)
> goto err_lli_free;
>
> @@ -713,8 +733,9 @@ static struct dma_async_tx_descriptor
*sun6i_dma_prep_slave_sg(
> v_lli->para = NORMAL_WAIT;
>
> if (dir == DMA_MEM_TO_DEV) {
> - v_lli->src = sg_dma_address(sg);
> - v_lli->dst = sconfig->dst_addr;
> + sun6i_dma_set_addr(sdev, v_lli,
> + sg_dma_address(sg),
> + sconfig->dst_addr);
> v_lli->cfg = lli_cfg;
> sdev->cfg->set_drq(&v_lli->cfg, DRQ_SDRAM,
vchan->port);
> sdev->cfg->set_mode(&v_lli->cfg,
LINEAR_MODE, IO_MODE);
> @@ -726,8 +747,9 @@ static struct dma_async_tx_descriptor
*sun6i_dma_prep_slave_sg(
> sg_dma_len(sg), flags);
>
> } else {
> - v_lli->src = sconfig->src_addr;
> - v_lli->dst = sg_dma_address(sg);
> + sun6i_dma_set_addr(sdev, v_lli,
> + sconfig->src_addr,
> + sg_dma_address(sg));
> v_lli->cfg = lli_cfg;
> sdev->cfg->set_drq(&v_lli->cfg, vchan->port,
DRQ_SDRAM);
> sdev->cfg->set_mode(&v_lli->cfg, IO_MODE,
LINEAR_MODE);
> @@ -786,7 +808,7 @@ static struct dma_async_tx_descriptor
*sun6i_dma_prep_dma_cyclic(
> return NULL;
>
> for (i = 0; i < periods; i++) {
> - v_lli = dma_pool_alloc(sdev->pool, GFP_NOWAIT, &p_lli);
> + v_lli = dma_pool_alloc(sdev->pool, GFP_DMA32 |
GFP_NOWAIT, &p_lli);
> if (!v_lli) {
> dev_err(sdev->slave.dev, "Failed to alloc
lli memory\n");
> goto err_lli_free;
> @@ -796,14 +818,16 @@ static struct dma_async_tx_descriptor
*sun6i_dma_prep_dma_cyclic(
> v_lli->para = NORMAL_WAIT;
>
> if (dir == DMA_MEM_TO_DEV) {
> - v_lli->src = buf_addr + period_len * i;
> - v_lli->dst = sconfig->dst_addr;
> + sun6i_dma_set_addr(sdev, v_lli,
> + buf_addr +
period_len * i,
> + sconfig->dst_addr);
> v_lli->cfg = lli_cfg;
> sdev->cfg->set_drq(&v_lli->cfg, DRQ_SDRAM,
vchan->port);
> sdev->cfg->set_mode(&v_lli->cfg,
LINEAR_MODE, IO_MODE);
> } else {
> - v_lli->src = sconfig->src_addr;
> - v_lli->dst = buf_addr + period_len * i;
> + sun6i_dma_set_addr(sdev, v_lli,
> + sconfig->src_addr,
> + buf_addr +
period_len * i);
> v_lli->cfg = lli_cfg;
> sdev->cfg->set_drq(&v_lli->cfg, vchan->port,
DRQ_SDRAM);
> sdev->cfg->set_mode(&v_lli->cfg, IO_MODE,
LINEAR_MODE);
> @@ -1174,8 +1198,6 @@ static struct sun6i_dma_config sun50i_a64_dma_cfg = {
> };
>
> /*
> - * TODO: Add support for more than 4g physical addressing.
> - *
> * The A100 binding uses the number of dma channels from the
> * device tree node.
> */
> @@ -1194,6 +1216,7 @@ static struct sun6i_dma_config sun50i_a100_dma_cfg = {
> BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) |
> BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) |
> BIT(DMA_SLAVE_BUSWIDTH_8_BYTES),
> + .has_high_addr = true,
> .has_mbus_clk = true,
> };
>
> --
> 2.35.1
>
>
