atomisp: clean up the hmm init/cleanup indirections

We don't need any of these indirections as we only support one MMU type. Start
by getting rid of the init/clear/free ones. The init ordering check we already
pushed down in a previous patch.

The allocation side is more complicated so leave it for now.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
index 9bd186bad1bd8cc0c236eebb253f9983f8fb71ef..35414c97dd9d1b626f200c7ec2a474a8cd5b861a 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
@@ -1454,7 +1454,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
        }
 
        /* Init ISP memory management */
-       hrt_isp_css_mm_init();
+       hmm_init();
 
        err = devm_request_threaded_irq(&dev->dev, dev->irq,
                                        atomisp_isr, atomisp_isr_thread,
@@ -1486,7 +1486,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,
 css_init_fail:
        devm_free_irq(&dev->dev, dev->irq, isp);
 request_irq_fail:
-       hrt_isp_css_mm_clear();
+       hmm_cleanup();
        hmm_pool_unregister(HMM_POOL_TYPE_RESERVED);
 hmm_pool_fail:
        destroy_workqueue(isp->wdt_work_queue);
@@ -1538,7 +1538,7 @@ static void atomisp_pci_remove(struct pci_dev *dev)
        atomisp_acc_cleanup(isp);
 
        atomisp_css_unload_firmware(isp);
-       hrt_isp_css_mm_clear();
+       hmm_cleanup();
 
        pm_runtime_forbid(&dev->dev);
        pm_runtime_get_noresume(&dev->dev);

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c
index 1f6ae203cb12953d6e1596e85be7b8a4d97716b5..5b2bdfdfd6327147ac47c0e0569afe6bfec344df 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c
@@ -55,7 +55,7 @@ mmgr_calloc(const size_t N, const size_t size)
 void
 mmgr_free(hrt_vaddress vaddr)
 {
-       hrt_isp_css_mm_free(vaddr);
+       hmm_free(vaddr);
 }
 
 void

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c
index 14537ab3d04be448ae3a79d1448883b1b99cc25c..358872393646ecca357af393ae7b5038acb2e264 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c
@@ -272,6 +272,8 @@ void hmm_free(ia_css_ptr virt)
 {
        struct hmm_buffer_object *bo;
 
+       WARN_ON(!virt);
+
        bo = hmm_bo_device_search_start(&bo_device, (unsigned int)virt);
 
        if (!bo) {
@@ -284,9 +286,7 @@ void hmm_free(ia_css_ptr virt)
        hmm_mem_stat.tol_cnt -= bo->pgnr;
 
        hmm_bo_unbind(bo);
-
        hmm_bo_free_pages(bo);
-
        hmm_bo_unref(bo);
 }
 

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c b/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c
index 78b470983ec5c43bff2abb65d35d4671222302d1..63904bcc5e721253f4a1e3e8fa3836de554df2d7 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c
@@ -28,13 +28,6 @@
 
 #define __page_align(size)     (((size) + (PAGE_SIZE-1)) & (~(PAGE_SIZE-1)))
 
-static unsigned init_done;
-void hrt_isp_css_mm_init(void)
-{
-       hmm_init();
-       init_done = 1;
-}
-
 int hrt_isp_css_mm_set(ia_css_ptr virt_addr, int c, size_t bytes)
 {
        if (virt_addr)
@@ -57,20 +50,6 @@ int hrt_isp_css_mm_store(ia_css_ptr virt_addr, const void *data, size_t bytes)
        return -EFAULT;
 }
 
-void hrt_isp_css_mm_free(ia_css_ptr virt_addr)
-{
-       if (virt_addr)
-               hmm_free(virt_addr);
-}
-
-void hrt_isp_css_mm_clear(void)
-{
-       if (init_done) {
-               hmm_cleanup();
-               init_done = 0;
-       }
-}
-
 static void *my_userptr;
 static unsigned my_num_pages;
 static enum hrt_userptr_type my_usr_type;
@@ -89,8 +68,6 @@ static ia_css_ptr __hrt_isp_css_mm_alloc(size_t bytes, void *userptr,
                                    enum hrt_userptr_type type,
                                    bool cached)
 {
-       if (!init_done)
-               hrt_isp_css_mm_init();
 #ifdef CONFIG_ION
        if (type == HRT_USR_ION)
                return hmm_alloc(bytes, HMM_BO_ION, 0,
@@ -138,9 +115,6 @@ ia_css_ptr hrt_isp_css_mm_alloc_user_ptr(size_t bytes, void *userptr,
 
 ia_css_ptr hrt_isp_css_mm_alloc_cached(size_t bytes)
 {
-       if (!init_done)
-               hrt_isp_css_mm_init();
-
        if (my_userptr == NULL)
                return hmm_alloc(bytes, HMM_BO_PRIVATE, 0, 0,
                                                HMM_CACHED);

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h b/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h
index 47832068501b9b8147bbfd4c18b0a526bffa3388..3fe9247c78ac841bdd8119c5589e6d4864da9ba2 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h
@@ -41,7 +41,6 @@ struct hrt_userbuffer_attr {
        unsigned int            pgnr;
 };
 
-void hrt_isp_css_mm_init(void);
 void hrt_isp_css_mm_set_user_ptr(void *userptr,
                                unsigned int num_pages, enum hrt_userptr_type);
 
@@ -60,9 +59,6 @@ ia_css_ptr hrt_isp_css_mm_alloc_cached(size_t bytes);
 ia_css_ptr hrt_isp_css_mm_calloc(size_t bytes);
 ia_css_ptr hrt_isp_css_mm_calloc_cached(size_t bytes);
 
-/* Free memory, given a virtual address */
-void hrt_isp_css_mm_free(ia_css_ptr virt_addr);
-
 /* Store data to a virtual address */
 int hrt_isp_css_mm_load(ia_css_ptr virt_addr, void *data, size_t bytes);
 
@@ -81,5 +77,4 @@ int hrt_isp_css_mm_store_int(ia_css_ptr virt_addr, int data);
    the display driver on  the FPGA system */
 phys_addr_t hrt_isp_css_virt_to_phys(ia_css_ptr virt_addr);
 
-void hrt_isp_css_mm_clear(void);
 #endif /* _hive_isp_css_mm_hrt_h_ */

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c b/drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c
index 7694ee480cfcd2bdc855dc21470baa22489bbd31..9d3900f6b2c18632aed881f0f987cf3a4b77f15f 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c
@@ -47,9 +47,9 @@ ia_css_ptr mmgr_calloc(const size_t N, const size_t size)
 
 void mmgr_free(ia_css_ptr vaddr)
 {
-/* "free()" should accept NULL, "hrt_isp_css_mm_free()" may not */
+/* "free()" should accept NULL, "hmm_free()" may not */
        if (vaddr)
-               hrt_isp_css_mm_free(vaddr);
+               hmm_free(vaddr);
 }
 
 ia_css_ptr mmgr_alloc_attr(const size_t        size, const uint16_t attribute)