mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
mmc_block: do not DMA to stack
In the write recovery routine, the data to get from the card is allocated from the stack. The DMA mapping documentation says explicitly stack memory is not mappable by any of the DMA calls. Change to using kmalloc() to allocate the memory for the result from the card and then free it once we've finished with the transaction. [ Changed to GFP_KERNEL allocation - Pierre Ossman ] Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Pierre Ossman <pierre@ossman.eu>
This commit is contained in:
parent
be3f4ae0c0
commit
051913dada
1 changed files with 13 additions and 5 deletions
|
@ -147,7 +147,8 @@ struct mmc_blk_request {
|
|||
static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
|
||||
{
|
||||
int err;
|
||||
__be32 blocks;
|
||||
u32 result;
|
||||
__be32 *blocks;
|
||||
|
||||
struct mmc_request mrq;
|
||||
struct mmc_command cmd;
|
||||
|
@ -199,14 +200,21 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card)
|
|||
mrq.cmd = &cmd;
|
||||
mrq.data = &data;
|
||||
|
||||
sg_init_one(&sg, &blocks, 4);
|
||||
blocks = kmalloc(4, GFP_KERNEL);
|
||||
if (!blocks)
|
||||
return (u32)-1;
|
||||
|
||||
sg_init_one(&sg, blocks, 4);
|
||||
|
||||
mmc_wait_for_req(card->host, &mrq);
|
||||
|
||||
if (cmd.error || data.error)
|
||||
return (u32)-1;
|
||||
result = ntohl(*blocks);
|
||||
kfree(blocks);
|
||||
|
||||
return ntohl(blocks);
|
||||
if (cmd.error || data.error)
|
||||
result = (u32)-1;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static u32 get_card_status(struct mmc_card *card, struct request *req)
|
||||
|
|
Loading…
Reference in a new issue