Skip to content

Commit

Permalink
mmc: mxcmmc: handle highmem pages
Browse files Browse the repository at this point in the history
Use kmap_atomic to map the scatterlist entry before using it.

Signed-off-by: Christoph Hellwig <[email protected]>
Signed-off-by: Ulf Hansson <[email protected]>
  • Loading branch information
Christoph Hellwig authored and storulf committed May 21, 2018
1 parent 5b42778 commit b189e75
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions drivers/mmc/host/mxcmmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,10 @@ static void mxcmci_swap_buffers(struct mmc_data *data)
struct scatterlist *sg;
int i;

for_each_sg(data->sg, sg, data->sg_len, i)
buffer_swap32(sg_virt(sg), sg->length);
for_each_sg(data->sg, sg, data->sg_len, i) {
void *buf = kmap_atomic(sg_page(sg) + sg->offset;
buffer_swap32(buf, sg->length);
kunmap_atomic(buf);
}
#else
static inline void mxcmci_swap_buffers(struct mmc_data *data) {}
Expand Down Expand Up @@ -609,21 +611,26 @@ static int mxcmci_transfer_data(struct mxcmci_host *host)
{
struct mmc_data *data = host->req->data;
struct scatterlist *sg;
void *buf;
int stat, i;

host->data = data;
host->datasize = 0;

if (data->flags & MMC_DATA_READ) {
for_each_sg(data->sg, sg, data->sg_len, i) {
stat = mxcmci_pull(host, sg_virt(sg), sg->length);
buf = kmap_atomic(sg_page(sg) + sg->offset);
stat = mxcmci_pull(host, buf, sg->length);
kunmap(buf);
if (stat)
return stat;
host->datasize += sg->length;
}
} else {
for_each_sg(data->sg, sg, data->sg_len, i) {
stat = mxcmci_push(host, sg_virt(sg), sg->length);
buf = kmap_atomic(sg_page(sg) + sg->offset);
stat = mxcmci_push(host, buf, sg->length);
kunmap(buf);
if (stat)
return stat;
host->datasize += sg->length;
Expand Down

0 comments on commit b189e75

Please sign in to comment.