* [PATCH v2 2/2] staging: media: atomisp: unify HMM initialization tracking
2025-07-08 16:44 [PATCH v2 1/2] staging: media: atomisp: return early on hmm_bo_device_init() failure Abdelrahman Fekry
@ 2025-07-08 16:44 ` Abdelrahman Fekry
0 siblings, 0 replies; 2+ messages in thread
From: Abdelrahman Fekry @ 2025-07-08 16:44 UTC (permalink / raw)
To: hansg, mchehab, sakari.ailus, andy, gregkh
Cc: linux-media, linux-kernel, linux-staging, linux-kernel-mentees,
skhan, dan.carpenter, Abdelrahman Fekry
The HMM subsystem previously used two separate mechanisms to track
initialization state:
1. A global boolean `hmm_initialized` in hmm.c
2. A device-specific `flag` in struct hmm_bo_device with magic values
This dual approach was redundant and error-prone. Additionally, a
redundant hmm_init() call existed in the allocation path.
This patch:
- Replaces the device-specific `flag` with a boolean `initialized` field
- Removes the global `hmm_initialized` variable
- Eliminates the hmm_bo_device_inited() helper function since we can
now simply check the boolean
- Removes the redundant hmm_init() call from __hmm_alloc() since its
always called after hmm_init()
Tested by:
- Building the Driver.
- Applying to media-committers [1] tree.
Link: https://gitlab.freedesktop.org/linux-media/media-committers.git [1]
Suggested-by: Hans de Goede <hansg@kernel.org>
Signed-off-by: Abdelrahman Fekry <abdelrahmanfekry375@gmail.com>
---
v2:
- replaces the init state enum used in v1 with boolean
- moves setting the flag uninited to hmm_bo_device_exit()
v1: https://lore.kernel.org/all/20250707140923.58935-3-abdelrahmanfekry375@gmail.com/
.../staging/media/atomisp/include/hmm/hmm_bo.h | 11 +++--------
drivers/staging/media/atomisp/pci/hmm/hmm.c | 11 -----------
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 17 ++++++-----------
3 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h
index e09ac29ac43d..ac556c1d71bb 100644
--- a/drivers/staging/media/atomisp/include/hmm/hmm_bo.h
+++ b/drivers/staging/media/atomisp/include/hmm/hmm_bo.h
@@ -58,8 +58,6 @@
#define ISP_VM_SIZE (0x7FFFFFFF) /* 2G address space */
#define ISP_PTR_NULL NULL
-#define HMM_BO_DEVICE_INITED 0x1
-
enum hmm_bo_type {
HMM_BO_PRIVATE,
HMM_BO_VMALLOC,
@@ -86,7 +84,9 @@ struct hmm_bo_device {
/* list lock is used to protect the entire_bo_list */
spinlock_t list_lock;
- int flag;
+
+ /* boolean to indicate whether the bo device is inited or not*/
+ bool initialized;
/* linked list for entire buffer object */
struct list_head entire_bo_list;
@@ -142,11 +142,6 @@ int hmm_bo_device_init(struct hmm_bo_device *bdev,
*/
void hmm_bo_device_exit(struct hmm_bo_device *bdev);
-/*
- * whether the bo device is inited or not.
- */
-int hmm_bo_device_inited(struct hmm_bo_device *bdev);
-
/*
* increase buffer object reference.
*/
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm.c b/drivers/staging/media/atomisp/pci/hmm/hmm.c
index 97c7ce970aef..8d64e5fd812c 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm.c
@@ -26,7 +26,6 @@
struct hmm_bo_device bo_device;
static ia_css_ptr dummy_ptr = mmgr_EXCEPTION;
-static bool hmm_initialized;
int hmm_init(void)
{
@@ -39,8 +38,6 @@ int hmm_init(void)
return ret;
}
- hmm_initialized = true;
-
/*
* As hmm use NULL to indicate invalid ISP virtual address,
* and ISP_VM_START is defined to 0 too, so we allocate
@@ -63,7 +60,6 @@ void hmm_cleanup(void)
dummy_ptr = 0;
hmm_bo_device_exit(&bo_device);
- hmm_initialized = false;
}
static ia_css_ptr __hmm_alloc(size_t bytes, enum hmm_bo_type type,
@@ -73,13 +69,6 @@ static ia_css_ptr __hmm_alloc(size_t bytes, enum hmm_bo_type type,
struct hmm_buffer_object *bo;
int ret;
- /*
- * Check if we are initialized. In the ideal world we wouldn't need
- * this but we can tackle it once the driver is a lot cleaner
- */
-
- if (!hmm_initialized)
- hmm_init();
/* Get page number from size */
pgnr = size_to_pgnr_ceil(bytes);
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
index 5d0cd5260d3a..aabb2a126caa 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
@@ -373,7 +373,7 @@ int hmm_bo_device_init(struct hmm_bo_device *bdev,
__bo_insert_to_free_rbtree(&bdev->free_rbtree, bo);
- bdev->flag = HMM_BO_DEVICE_INITED;
+ bdev->initialized = true;
return 0;
}
@@ -385,9 +385,10 @@ struct hmm_buffer_object *hmm_bo_alloc(struct hmm_bo_device *bdev,
struct rb_root *root = &bdev->free_rbtree;
check_bodev_null_return(bdev, NULL);
- var_equal_return(hmm_bo_device_inited(bdev), 0, NULL,
- "hmm_bo_device not inited yet.\n");
-
+ if (!bdev->initialized) {
+ dev_err(atomisp_dev, "hmm_bo_device is not initialized!\n");
+ return NULL;
+ }
if (pgnr == 0) {
dev_err(atomisp_dev, "0 size buffer is not allowed.\n");
return NULL;
@@ -522,13 +523,7 @@ void hmm_bo_device_exit(struct hmm_bo_device *bdev)
kmem_cache_destroy(bdev->bo_cache);
isp_mmu_exit(&bdev->mmu);
-}
-
-int hmm_bo_device_inited(struct hmm_bo_device *bdev)
-{
- check_bodev_null_return(bdev, -EINVAL);
-
- return bdev->flag == HMM_BO_DEVICE_INITED;
+ bdev->initialized = false;
}
int hmm_bo_allocated(struct hmm_buffer_object *bo)
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread