From: Abdelrahman Fekry <abdelrahmanfekry375@gmail.com>
To: hansg@kernel.org, mchehab@kernel.org,
sakari.ailus@linux.intel.com, andy@kernel.org,
gregkh@linuxfoundation.org
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-staging@lists.linux.dev,
linux-kernel-mentees@lists.linux.dev, skhan@linuxfoundation.org,
dan.carpenter@linaro.org,
Abdelrahman Fekry <abdelrahmanfekry375@gmail.com>
Subject: [PATCH 3/3] staging: media: atomisp: move hmm_get_mmu_base_addr()
Date: Sat, 12 Jul 2025 22:13:25 +0300 [thread overview]
Message-ID: <20250712191325.132666-4-abdelrahmanfekry375@gmail.com> (raw)
In-Reply-To: <20250712191325.132666-1-abdelrahmanfekry375@gmail.com>
The function hmm_get_mmu_base_addr() is related to the functionality
of hmm so its better to be declared and defined in this scope.
- Move hmm_get_mmu_base_addr() to hmm.c.
- Change hmm_bo_device struct to be static.
Signed-off-by: Abdelrahman Fekry <abdelrahmanfekry375@gmail.com>
---
drivers/staging/media/atomisp/include/hmm/hmm.h | 4 +---
.../media/atomisp/pci/atomisp_compat_css20.c | 12 ------------
drivers/staging/media/atomisp/pci/hmm/hmm.c | 14 +++++++++++++-
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/media/atomisp/include/hmm/hmm.h b/drivers/staging/media/atomisp/include/hmm/hmm.h
index a7aef27f54de..da85d835ec10 100644
--- a/drivers/staging/media/atomisp/include/hmm/hmm.h
+++ b/drivers/staging/media/atomisp/include/hmm/hmm.h
@@ -33,7 +33,7 @@ int hmm_load(ia_css_ptr virt, void *data, unsigned int bytes);
int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes);
int hmm_set(ia_css_ptr virt, int c, unsigned int bytes);
int hmm_flush(ia_css_ptr virt, unsigned int bytes);
-
+int hmm_get_mmu_base_addr(struct device *dev, unsigned int *mmu_base_addr);
/*
* get kernel memory physical address from ISP virtual address.
*/
@@ -65,6 +65,4 @@ void hmm_flush_vmap(ia_css_ptr virt);
*/
int hmm_mmap(struct vm_area_struct *vma, ia_css_ptr virt);
-extern struct hmm_bo_device bo_device;
-
#endif
diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index be5f37f4a6fd..b4913cb32a64 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -157,18 +157,6 @@ void atomisp_load_uint32(hrt_address addr, uint32_t *data)
*data = atomisp_css2_hw_load_32(addr);
}
-static int hmm_get_mmu_base_addr(struct device *dev, unsigned int *mmu_base_addr)
-{
- if (!sh_mmu_mrfld.get_pd_base) {
- dev_err(dev, "get mmu base address failed.\n");
- return -EINVAL;
- }
-
- *mmu_base_addr = sh_mmu_mrfld.get_pd_base(&bo_device.mmu,
- bo_device.mmu.base_address);
- return 0;
-}
-
static void __dump_pipe_config(struct atomisp_sub_device *asd,
struct atomisp_stream_env *stream_env,
unsigned int pipe_id)
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm.c b/drivers/staging/media/atomisp/pci/hmm/hmm.c
index 8d64e5fd812c..321166e58bb5 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm.c
@@ -24,7 +24,7 @@
#include "mmu/isp_mmu.h"
#include "mmu/sh_mmu_mrfld.h"
-struct hmm_bo_device bo_device;
+static struct hmm_bo_device bo_device;
static ia_css_ptr dummy_ptr = mmgr_EXCEPTION;
int hmm_init(void)
@@ -488,3 +488,15 @@ void hmm_vunmap(ia_css_ptr virt)
hmm_bo_vunmap(bo);
}
+
+int hmm_get_mmu_base_addr(struct device *dev, unsigned int *mmu_base_addr)
+{
+ if (!sh_mmu_mrfld.get_pd_base) {
+ dev_err(dev, "get mmu base address failed.\n");
+ return -EINVAL;
+ }
+
+ *mmu_base_addr = sh_mmu_mrfld.get_pd_base(&bo_device.mmu,
+ bo_device.mmu.base_address);
+ return 0;
+}
--
2.25.1
next prev parent reply other threads:[~2025-07-12 19:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-12 19:13 [PATCH 0/3] staging: media: atomisp: More Cleanup on driver AtomIsp Abdelrahman Fekry
2025-07-12 19:13 ` [PATCH 1/3] staging: media: atomisp: return early on hmm_bo_device_init() failure Abdelrahman Fekry
2025-07-12 19:13 ` [PATCH 2/3] staging: media: atomisp: unify HMM initialization tracking Abdelrahman Fekry
2025-07-12 19:13 ` Abdelrahman Fekry [this message]
2025-07-16 18:21 ` [PATCH 0/3] staging: media: atomisp: More Cleanup on driver AtomIsp Dan Carpenter
2025-07-17 1:35 ` Abdelrahman Fekry
2025-07-31 3:24 ` Abdelrahman Fekry
2025-07-31 4:35 ` Greg KH
2025-07-31 5:59 ` Abdelrahman Fekry
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=20250712191325.132666-4-abdelrahmanfekry375@gmail.com \
--to=abdelrahmanfekry375@gmail.com \
--cc=andy@kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=hansg@kernel.org \
--cc=linux-kernel-mentees@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=skhan@linuxfoundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.