mmc: sunxi: avoid invalid pointer calculation
Subsystems (2)
PATCH 1/1 mmc: sunxi: avoid invalid pointer calculation
The sunxi mmc driver tries to calculate a dma address by using pointer arithmetic, which causes a warning when dma_addr_t is wider than a pointer:
drivers/mmc/host/sunxi-mmc.c: In function 'sunxi_mmc_init_idma_des':drivers/mmc/host/sunxi-mmc.c:296:35: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
struct sunxi_idma_des *pdes_pa = (struct sunxi_idma_des *)host->sg_dma;
^To avoid this warning and to simplify the logic, this changes the code to avoid the cast and calculate the correct address manually. The behavior should be unchanged.
drivers/mmc/host/sunxi-mmc.c +3 -2
@@ -293,7 +293,7 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host, struct mmc_data *data) {struct sunxi_idma_des *pdes = (struct sunxi_idma_des *)host->sg_cpu; -struct sunxi_idma_des *pdes_pa = (struct sunxi_idma_des *)host->sg_dma; +dma_addr_t next_desc = host->sg_dma;int i, max_len = (1 << host->idma_des_size_bits);for (i =0 ; i < data->sg_len; i++) {
@@ -305,8 +305,9 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host,else pdes[i].buf_size = data->sg[i].length; + next_desc +=sizeof (struct sunxi_idma_des ); pdes[i].buf_addr_ptr1 =sg_dma_address (&data->sg[i]); - pdes[i].buf_addr_ptr2 = (u32)&pdes_pa[i +1 ]; + pdes[i].buf_addr_ptr2 = (u32 )next_desc; } pdes[0 ].config |=SDXC_IDMAC_DES0_FD ;
PATCH 1/1 mmc: sunxi: avoid invalid pointer calculation
Am Dienstag, 24. Februar 2015, 10.47:27 schrieb Arnd Bergmann:
Quoted 38 lines
The sunxi mmc driver tries to calculate a dma address by using pointer arithmetic, which causes a warning when
dma_addr_tis wider than a pointer:
drivers/mmc/host/sunxi-mmc.c: In function 'sunxi_mmc_init_idma_des':drivers/mmc/host/sunxi-mmc.c:296:35: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] structsunxi_idma_des*pdes_pa= (structsunxi_idma_des*)host->sg_dma; ^To avoid this warning and to simplify the logic, this changes the code to avoid the cast and calculate the correct address manually. The behavior should be unchanged.
Signed-off-by Arnd Bergmann <[email protected]>drivers/mmc/host/sunxi-mmc.c +1
-1@@ -293,7 +293,7 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host, struct mmc_data *data) { struct sunxi_idma_des *pdes = (struct sunxi_idma_des *)host->sg_cpu; -struct sunxi_idma_des *pdes_pa = (struct sunxi_idma_des *)host->sg_dma; +dma_addr_t next_desc = host->sg_dma;int i, max_len = (1 << host->idma_des_size_bits);for (i =0 ; i < data->sg_len; i++) {@@ -305,8 +305,9 @@ static void sunxi_mmc_init_idma_des(struct
sunxi_mmc_host*host, elsedrivers/mmc/host/sunxi-mmc.c +2
-1pdes[i].buf_size = data->sg[i].length; + next_desc +=sizeof (struct sunxi_idma_des ); pdes[i].buf_addr_ptr1 =sg_dma_address (&data->sg[i]); - pdes[i].buf_addr_ptr2 = (u32)&pdes_pa[i +1 ]; + pdes[i].buf_addr_ptr2 = (u32 )next_desc; } pdes[0 ].config |=SDXC_IDMAC_DES0_FD ;
Signature · 11 lines
David Lanzend?rfer OpenSourceSupport GmbH System engineer and supporter http://www.o2s.ch/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: This is a digitally signed message part. URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150224/f5d895ea/attachment.sig>
Ulf Hansson
AppliedPATCH 1/1 mmc: sunxi: avoid invalid pointer calculation
In reply to Arnd BergmannQuoted 5 lines · Arnd Bergmann
The sunxi mmc driver tries to calculate a dma address by using pointer arithmetic, which causes a warning when
dma_addr_tis wider than a pointer:
drivers/mmc/host/sunxi-mmc.c: In function 'sunxi_mmc_init_idma_des':drivers/mmc/host/sunxi-mmc.c:296:35: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
Quoted 8 lines
struct sunxi_idma_des *pdes_pa = (struct sunxi_idma_des *)host->sg_dma; ^To avoid this warning and to simplify the logic, this changes the code to avoid the cast and calculate the correct address manually. The behavior should be unchanged.
Signed-off-by Arnd Bergmann <[email protected]>
Applied, thanks!
Kind regards
Uffe
Quoted 26 lines
drivers/mmc/host/sunxi-mmc.c +3
-2@@ -293,7 +293,7 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host, struct mmc_data *data) {struct sunxi_idma_des *pdes = (struct sunxi_idma_des *)host->sg_cpu; -struct sunxi_idma_des *pdes_pa = (struct sunxi_idma_des *)host->sg_dma; +dma_addr_t next_desc = host->sg_dma;int i, max_len = (1 << host->idma_des_size_bits);for (i =0 ; i < data->sg_len; i++) {@@ -305,8 +305,9 @@ static void sunxi_mmc_init_idma_des(struct sunxi_mmc_host *host,else pdes[i].buf_size = data->sg[i].length; + next_desc +=sizeof (struct sunxi_idma_des ); pdes[i].buf_addr_ptr1 =sg_dma_address (&data->sg[i]); - pdes[i].buf_addr_ptr2 = (u32)&pdes_pa[i +1 ]; + pdes[i].buf_addr_ptr2 = (u32 )next_desc; } pdes[0 ].config |=SDXC_IDMAC_DES0_FD ;