Skip to contentSkip to conversation

Fix uninitialized variable usage in Tegra GPCDMA

PATCH Applied Akhil R 2 participants 4 messages Apr 26, 2022 – May 19, 2022

Subsystems (3)
lore
Share & tools
lore

Akhil R

author
#0 lore raw

v2 cover Fix uninitialized variable usage in Tegra GPCDMA

Initialize uninitialized variable and remove unused switch case in tegra186-gpcdma driver.

v1->v2: Split the patches to separate 'fixes'.

Akhil R (2):
dmaengine: tegra: Fix uninitialized variable usage
dmaengine: tegra: Remove unused switch case

 drivers/dma/tegra186-gpc-dma.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 1/2 dmaengine: tegra: Fix uninitialized variable usage

Initialize slave_bw in dma_prep*() functions as the parameter is not set for DMA_MEM_TO_MEM case in get_transfer_param(). Though the case may never occur, initializing it avoids warning from certain static checkers

Fixes ee17028009d4 ("dmaengine: tegra: Add tegra gpcdma driver")
---
 drivers/dma/tegra186-gpc-dma.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/dma/tegra186-gpc-dma.c +4 -4
index f12327732041..a0dbafa07ec9 100644
@@ -985,8 +985,8 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,
 {
 	struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
 	unsigned int max_dma_count = tdc->tdma->chip_data->max_dma_count;
+	enum dma_slave_buswidth slave_bw = DMA_SLAVE_BUSWIDTH_UNDEFINED;
 	u32 csr, mc_seq, apb_ptr = 0, mmio_seq = 0;
-	enum dma_slave_buswidth slave_bw;
 	struct tegra_dma_sg_req *sg_req;
 	struct tegra_dma_desc *dma_desc;
 	struct scatterlist *sg;
@@ -1103,12 +1103,12 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l
 			  size_t period_len, enum dma_transfer_direction direction,
 			  unsigned long flags)
 {
+	enum dma_slave_buswidth slave_bw = DMA_SLAVE_BUSWIDTH_UNDEFINED;
+	u32 csr, mc_seq, apb_ptr = 0, mmio_seq = 0, burst_size;
+	unsigned int max_dma_count, len, period_count, i;
 	struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
 	struct tegra_dma_desc *dma_desc;
 	struct tegra_dma_sg_req *sg_req;
-	enum dma_slave_buswidth slave_bw;
-	u32 csr, mc_seq, apb_ptr = 0, mmio_seq = 0, burst_size;
-	unsigned int max_dma_count, len, period_count, i;
 	dma_addr_t mem = buf_addr;
 	int ret;
 
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v2 2/2 dmaengine: tegra: Remove unused switch case

In reply to Akhil R

Remove unused switch case in get_transfer_param() function. The function is not called for MEM_TO_MEM transfers.

---
 drivers/dma/tegra186-gpc-dma.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/dma/tegra186-gpc-dma.c +0 -4
index a0dbafa07ec9..6b8d34165176 100644
@@ -830,10 +830,6 @@ static int get_transfer_param(struct tegra_dma_channel *tdc,
 		*slave_bw = tdc->dma_sconfig.src_addr_width;
 		*csr = TEGRA_GPCDMA_CSR_DMA_IO2MEM_FC;
 		return 0;
-	case DMA_MEM_TO_MEM:
-		*burst_size = tdc->dma_sconfig.src_addr_width;
-		*csr = TEGRA_GPCDMA_CSR_DMA_MEM2MEM;
-		return 0;
 	default:
 		dev_err(tdc2dev(tdc), "DMA direction is not supported\n");
 	}
Signature · 1 line
2.17.1
maintainer Applied
#3 lore raw
In reply to Akhil R
Quoted 2 lines · Akhil R

Initialize uninitialized variable and remove unused switch case in tegra186-gpcdma driver.

Applied, thanks

Signature · 1 line
~Vinod