The Sahara driver currently selects firmware image tables using
scattered, device specific conditionals in the probe path, making the
logic harder to follow and extend.
Refactor firmware image table selection into a single, explicit probe-time
mechanism by introducing a variant table that captures device matching,
firmware image tables, firmware folder names, and streaming behavior in
one place.
This centralizes device specific decisions, simplifies the probe logic,
and avoids ad-hoc conditionals while preserving the existing behavior for
all supported AIC devices.
Signed-off-by: Kishore Batta <kishore.batta@oss.qualcomm.com>
---
drivers/bus/mhi/sahara/sahara.c | 66 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 58 insertions(+), 8 deletions(-)
diff --git a/drivers/bus/mhi/sahara/sahara.c b/drivers/bus/mhi/sahara/sahara.c
index e3499977e7c6b53bc624a8eb00d0636f2ea63307..8f1c0d72066c0cf80c09d78bfc51df2e482133b9 100644
--- a/drivers/bus/mhi/sahara/sahara.c
+++ b/drivers/bus/mhi/sahara/sahara.c
@@ -180,6 +180,16 @@ struct sahara_context {
u32 read_data_length;
bool is_mem_dump_mode;
bool non_streaming;
+ const char *fw_folder;
+};
+
+struct sahara_variant {
+ const char *match;
+ bool match_is_chan;
+ const char * const *image_table;
+ size_t table_size;
+ const char *fw_folder;
+ bool non_streaming;
};
static const char * const aic100_image_table[] = {
@@ -224,11 +234,50 @@ static const char * const aic200_image_table[] = {
[78] = "qcom/aic200/pvs.bin",
};
+static const struct sahara_variant sahara_variants[] = {
+ {
+ .match = "AIC100",
+ .match_is_chan = false,
+ .image_table = aic100_image_table,
+ .table_size = ARRAY_SIZE(aic100_image_table),
+ .fw_folder = "aic100",
+ .non_streaming = true,
+ },
+ {
+ .match = "AIC200",
+ .match_is_chan = false,
+ .image_table = aic200_image_table,
+ .table_size = ARRAY_SIZE(aic200_image_table),
+ .fw_folder = "aic200",
+ .non_streaming = false,
+ }
+};
+
static bool is_streaming(struct sahara_context *context)
{
return !context->non_streaming;
}
+static const struct sahara_variant *sahara_select_variant(struct mhi_device *mhi_dev,
+ const struct mhi_device_id *id)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(sahara_variants); i++) {
+ const struct sahara_variant *v = &sahara_variants[i];
+
+ if (v->match_is_chan) {
+ if (id && id->chan && !strcmp(id->chan, v->match))
+ return v;
+ } else {
+ if (mhi_dev->mhi_cntrl && mhi_dev->mhi_cntrl->name &&
+ !strcmp(mhi_dev->mhi_cntrl->name, v->match))
+ return v;
+ }
+ }
+ return NULL;
+}
+
static int sahara_find_image(struct sahara_context *context, u32 image_id)
{
int ret;
@@ -797,6 +846,7 @@ static void sahara_read_data_processing(struct work_struct *work)
static int sahara_mhi_probe(struct mhi_device *mhi_dev, const struct mhi_device_id *id)
{
+ const struct sahara_variant *variant;
struct sahara_context *context;
int ret;
int i;
@@ -809,14 +859,14 @@ static int sahara_mhi_probe(struct mhi_device *mhi_dev, const struct mhi_device_
if (!context->rx)
return -ENOMEM;
- if (!strcmp(mhi_dev->mhi_cntrl->name, "AIC200")) {
- context->image_table = aic200_image_table;
- context->table_size = ARRAY_SIZE(aic200_image_table);
- } else {
- context->image_table = aic100_image_table;
- context->table_size = ARRAY_SIZE(aic100_image_table);
- context->non_streaming = true;
- }
+ variant = sahara_select_variant(mhi_dev, id);
+ if (!variant)
+ return -ENODEV;
+
+ context->image_table = variant->image_table;
+ context->table_size = variant->table_size;
+ context->non_streaming = variant->non_streaming;
+ context->fw_folder = variant->fw_folder;
/*
* There are two firmware implementations for READ_DATA handling.
--
2.34.1Hi Kishore,
kernel test robot noticed the following build warnings:
[auto build test WARNING on a0ae2a256046c0c5d3778d1a194ff2e171f16e5f]
url: https://github.com/intel-lab-lkp/linux/commits/Kishore-Batta/Add-documentation-for-Sahara-protocol/20260307-194417
base: a0ae2a256046c0c5d3778d1a194ff2e171f16e5f
patch link: https://lore.kernel.org/r/20260307-sahara_protocol_new_v2-v2-4-29dc748b5e9c%40oss.qualcomm.com
patch subject: [PATCH v2 4/9] bus: mhi: Centralize firmware image table selection at probe time
config: i386-buildonly-randconfig-003-20260308 (https://download.01.org/0day-ci/archive/20260308/202603081717.xp3UQU2K-lkp@intel.com/config)
compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260308/202603081717.xp3UQU2K-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202603081717.xp3UQU2K-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/bus/mhi/sahara/sahara.c:270:18: warning: address of array 'id->chan' will always evaluate to 'true' [-Wpointer-bool-conversion]
270 | if (id && id->chan && !strcmp(id->chan, v->match))
| ~~ ~~~~^~~~
1 warning generated.
vim +270 drivers/bus/mhi/sahara/sahara.c
260
261 static const struct sahara_variant *sahara_select_variant(struct mhi_device *mhi_dev,
262 const struct mhi_device_id *id)
263 {
264 int i;
265
266 for (i = 0; i < ARRAY_SIZE(sahara_variants); i++) {
267 const struct sahara_variant *v = &sahara_variants[i];
268
269 if (v->match_is_chan) {
> 270 if (id && id->chan && !strcmp(id->chan, v->match))
271 return v;
272 } else {
273 if (mhi_dev->mhi_cntrl && mhi_dev->mhi_cntrl->name &&
274 !strcmp(mhi_dev->mhi_cntrl->name, v->match))
275 return v;
276 }
277 }
278 return NULL;
279 }
280
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Kishore,
kernel test robot noticed the following build warnings:
[auto build test WARNING on a0ae2a256046c0c5d3778d1a194ff2e171f16e5f]
url: https://github.com/intel-lab-lkp/linux/commits/Kishore-Batta/Add-documentation-for-Sahara-protocol/20260307-194417
base: a0ae2a256046c0c5d3778d1a194ff2e171f16e5f
patch link: https://lore.kernel.org/r/20260307-sahara_protocol_new_v2-v2-4-29dc748b5e9c%40oss.qualcomm.com
patch subject: [PATCH v2 4/9] bus: mhi: Centralize firmware image table selection at probe time
config: arc-allyesconfig (https://download.01.org/0day-ci/archive/20260308/202603081641.KSZC3Jla-lkp@intel.com/config)
compiler: arc-linux-gcc (GCC) 15.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260308/202603081641.KSZC3Jla-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202603081641.KSZC3Jla-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/bus/mhi/sahara/sahara.c: In function 'sahara_select_variant':
>> drivers/bus/mhi/sahara/sahara.c:270:32: warning: the comparison will always evaluate as 'true' for the address of 'chan' will never be NULL [-Waddress]
270 | if (id && id->chan && !strcmp(id->chan, v->match))
| ^~
In file included from drivers/bus/mhi/sahara/sahara.c:12:
include/linux/mod_devicetable.h:867:20: note: 'chan' declared here
867 | const char chan[MHI_NAME_SIZE];
| ^~~~
vim +270 drivers/bus/mhi/sahara/sahara.c
260
261 static const struct sahara_variant *sahara_select_variant(struct mhi_device *mhi_dev,
262 const struct mhi_device_id *id)
263 {
264 int i;
265
266 for (i = 0; i < ARRAY_SIZE(sahara_variants); i++) {
267 const struct sahara_variant *v = &sahara_variants[i];
268
269 if (v->match_is_chan) {
> 270 if (id && id->chan && !strcmp(id->chan, v->match))
271 return v;
272 } else {
273 if (mhi_dev->mhi_cntrl && mhi_dev->mhi_cntrl->name &&
274 !strcmp(mhi_dev->mhi_cntrl->name, v->match))
275 return v;
276 }
277 }
278 return NULL;
279 }
280
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2026 Red Hat, Inc.