From: ulf.hansson@linaro.org (Ulf Hansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] mmc: sunxi: avoid invalid pointer calculation
Date: Thu, 5 Mar 2015 14:51:02 +0100 [thread overview]
Message-ID: <CAPDyKFq-V4egasTCgu3O7am_ur2Z8taq4VJHgqaMjAYOR7upLQ@mail.gmail.com> (raw)
In-Reply-To: <27509084.spYfayGTeo@wuerfel>
On 24 February 2015 at 10:47, Arnd Bergmann <arnd@arndb.de> wrote:
> 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.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied, thanks!
Kind regards
Uffe
>
> diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
> index e8a4218b5726..c326ac965806 100644
> --- a/drivers/mmc/host/sunxi-mmc.c
> +++ b/drivers/mmc/host/sunxi-mmc.c
> @@ -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;
>
prev parent reply other threads:[~2015-03-05 13:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 9:47 [PATCH] mmc: sunxi: avoid invalid pointer calculation Arnd Bergmann
2015-02-24 9:50 ` David Lanzendörfer
2015-03-05 13:51 ` Ulf Hansson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPDyKFq-V4egasTCgu3O7am_ur2Z8taq4VJHgqaMjAYOR7upLQ@mail.gmail.com \
--to=ulf.hansson@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).