Straightforward conversion to sg_map helper. A couple paths will
WARN if the memory does not end up being mappable.

Signed-off-by: Logan Gunthorpe <log...@deltatee.com>
---
 drivers/mmc/host/tmio_mmc.h     | 12 ++++++++++--
 drivers/mmc/host/tmio_mmc_dma.c |  5 +++++
 drivers/mmc/host/tmio_mmc_pio.c | 24 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index 2b349d4..ba68c9fed 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -198,17 +198,25 @@ void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, 
u32 i);
 void tmio_mmc_disable_mmc_irqs(struct tmio_mmc_host *host, u32 i);
 irqreturn_t tmio_mmc_irq(int irq, void *devid);
 
+/* Note: this function may return PTR_ERR and must be checked! */
 static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg,
                                         unsigned long *flags)
 {
+       void *ret;
+
        local_irq_save(*flags);
-       return kmap_atomic(sg_page(sg)) + sg->offset;
+       ret = sg_map(sg, SG_KMAP_ATOMIC);
+
+       if (IS_ERR(ret))
+               local_irq_restore(*flags);
+
+       return ret;
 }
 
 static inline void tmio_mmc_kunmap_atomic(struct scatterlist *sg,
                                          unsigned long *flags, void *virt)
 {
-       kunmap_atomic(virt - sg->offset);
+       sg_unmap(sg, virt, SG_KMAP_ATOMIC);
        local_irq_restore(*flags);
 }
 
diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c
index fa8a936..07531f7 100644
--- a/drivers/mmc/host/tmio_mmc_dma.c
+++ b/drivers/mmc/host/tmio_mmc_dma.c
@@ -149,6 +149,11 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host 
*host)
        if (!aligned) {
                unsigned long flags;
                void *sg_vaddr = tmio_mmc_kmap_atomic(sg, &flags);
+               if (IS_ERR(sg_vaddr)) {
+                       ret = PTR_ERR(sg_vaddr);
+                       goto pio;
+               }
+
                sg_init_one(&host->bounce_sg, host->bounce_buf, sg->length);
                memcpy(host->bounce_buf, sg_vaddr, host->bounce_sg.length);
                tmio_mmc_kunmap_atomic(sg, &flags, sg_vaddr);
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
index 6b789a7..d6fdbf6 100644
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
@@ -479,6 +479,18 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
        }
 
        sg_virt = tmio_mmc_kmap_atomic(host->sg_ptr, &flags);
+       if (IS_ERR(sg_virt)) {
+               /*
+                * This should really never happen unless
+                * the code is changed to use memory that is
+                * not mappable in the sg. Seeing there doesn't
+                * seem to be any error path out of here,
+                * we can only WARN.
+                */
+               WARN(1, "Non-mappable memory used in sg!");
+               return;
+       }
+
        buf = (unsigned short *)(sg_virt + host->sg_off);
 
        count = host->sg_ptr->length - host->sg_off;
@@ -506,6 +518,18 @@ static void tmio_mmc_check_bounce_buffer(struct 
tmio_mmc_host *host)
        if (host->sg_ptr == &host->bounce_sg) {
                unsigned long flags;
                void *sg_vaddr = tmio_mmc_kmap_atomic(host->sg_orig, &flags);
+               if (IS_ERR(sg_vaddr)) {
+                       /*
+                        * This should really never happen unless
+                        * the code is changed to use memory that is
+                        * not mappable in the sg. Seeing there doesn't
+                        * seem to be any error path out of here,
+                        * we can only WARN.
+                        */
+                       WARN(1, "Non-mappable memory used in sg!");
+                       return;
+               }
+
                memcpy(sg_vaddr, host->bounce_buf, host->bounce_sg.length);
                tmio_mmc_kunmap_atomic(host->sg_orig, &flags, sg_vaddr);
        }
-- 
2.1.4

Reply via email to