Skip to content

Commit f08d4bd

Browse files
Mani-SadhasivamMani-Sadhasivam
committed
bus: mhi: host: pci_generic: Use unique 'mhi_pci_dev_info' for product families
Currently, a single 'mhi_pci_dev_info' is shared across different product families. Even though it makes the device functional, it misleads the users by sharing the common product name. For instance, below message will be printed for Foxconn SDX62 modem during boot: "MHI PCI device found: foxconn-sdx65" But this is quite misleading to the users since the actual modem plugged in could be 'T99W373' which is based on SDX62. So fix this issue by using a unique 'mhi_pci_dev_info' for product families. This allows us to specify a unique product name for each product family. Also, once this name is exposed to client drivers, they may use this name to identify the modems and use any modem specific configuration. Modems of unknown product families are not impacted by this change. CC: Slark Xiao <slark_xiao@163.com> Reviewed-by: Slark Xiao <slark_xiao@163.com> Link: https://lore.kernel.org/r/20240626053237.4227-1-manivannan.sadhasivam@linaro.org Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
1 parent c7d0b2d commit f08d4bd

1 file changed

Lines changed: 59 additions & 19 deletions

File tree

‎drivers/bus/mhi/host/pci_generic.c‎

Lines changed: 59 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -419,17 +419,19 @@ static const struct mhi_controller_config modem_foxconn_sdx55_config = {
419419
.event_cfg = mhi_foxconn_sdx55_events,
420420
};
421421

422-
static const struct mhi_pci_dev_info mhi_foxconn_sdx24_info = {
423-
.name = "foxconn-sdx24",
422+
static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
423+
.name = "foxconn-sdx55",
424+
.fw = "qcom/sdx55m/sbl1.mbn",
425+
.edl = "qcom/sdx55m/edl.mbn",
424426
.config = &modem_foxconn_sdx55_config,
425427
.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
426428
.dma_data_width = 32,
427429
.mru_default = 32768,
428430
.sideband_wake = false,
429431
};
430432

431-
static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
432-
.name = "foxconn-sdx55",
433+
static const struct mhi_pci_dev_info mhi_foxconn_t99w175_info = {
434+
.name = "foxconn-t99w175",
433435
.fw = "qcom/sdx55m/sbl1.mbn",
434436
.edl = "qcom/sdx55m/edl.mbn",
435437
.config = &modem_foxconn_sdx55_config,
@@ -439,8 +441,46 @@ static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
439441
.sideband_wake = false,
440442
};
441443

442-
static const struct mhi_pci_dev_info mhi_foxconn_sdx65_info = {
443-
.name = "foxconn-sdx65",
444+
static const struct mhi_pci_dev_info mhi_foxconn_dw5930e_info = {
445+
.name = "foxconn-dw5930e",
446+
.fw = "qcom/sdx55m/sbl1.mbn",
447+
.edl = "qcom/sdx55m/edl.mbn",
448+
.config = &modem_foxconn_sdx55_config,
449+
.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
450+
.dma_data_width = 32,
451+
.mru_default = 32768,
452+
.sideband_wake = false,
453+
};
454+
455+
static const struct mhi_pci_dev_info mhi_foxconn_t99w368_info = {
456+
.name = "foxconn-t99w368",
457+
.config = &modem_foxconn_sdx55_config,
458+
.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
459+
.dma_data_width = 32,
460+
.mru_default = 32768,
461+
.sideband_wake = false,
462+
};
463+
464+
static const struct mhi_pci_dev_info mhi_foxconn_t99w373_info = {
465+
.name = "foxconn-t99w373",
466+
.config = &modem_foxconn_sdx55_config,
467+
.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
468+
.dma_data_width = 32,
469+
.mru_default = 32768,
470+
.sideband_wake = false,
471+
};
472+
473+
static const struct mhi_pci_dev_info mhi_foxconn_t99w510_info = {
474+
.name = "foxconn-t99w510",
475+
.config = &modem_foxconn_sdx55_config,
476+
.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
477+
.dma_data_width = 32,
478+
.mru_default = 32768,
479+
.sideband_wake = false,
480+
};
481+
482+
static const struct mhi_pci_dev_info mhi_foxconn_dw5932e_info = {
483+
.name = "foxconn-dw5932e",
444484
.config = &modem_foxconn_sdx55_config,
445485
.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
446486
.dma_data_width = 32,
@@ -646,40 +686,40 @@ static const struct pci_device_id mhi_pci_id_table[] = {
646686
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
647687
/* T99W175 (sdx55), Both for eSIM and Non-eSIM */
648688
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab),
649-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx55_info },
689+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w175_info },
650690
/* DW5930e (sdx55), With eSIM, It's also T99W175 */
651691
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0b0),
652-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx55_info },
692+
.driver_data = (kernel_ulong_t) &mhi_foxconn_dw5930e_info },
653693
/* DW5930e (sdx55), Non-eSIM, It's also T99W175 */
654694
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0b1),
655-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx55_info },
695+
.driver_data = (kernel_ulong_t) &mhi_foxconn_dw5930e_info },
656696
/* T99W175 (sdx55), Based on Qualcomm new baseline */
657697
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0bf),
658-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx55_info },
698+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w175_info },
659699
/* T99W175 (sdx55) */
660700
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0c3),
661-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx55_info },
701+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w175_info },
662702
/* T99W368 (sdx65) */
663703
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d8),
664-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
704+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w368_info },
665705
/* T99W373 (sdx62) */
666706
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9),
667-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
707+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w373_info },
668708
/* T99W510 (sdx24), variant 1 */
669709
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0f0),
670-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx24_info },
710+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w510_info },
671711
/* T99W510 (sdx24), variant 2 */
672712
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0f1),
673-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx24_info },
713+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w510_info },
674714
/* T99W510 (sdx24), variant 3 */
675715
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0f2),
676-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx24_info },
716+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w510_info },
677717
/* DW5932e-eSIM (sdx62), With eSIM */
678718
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0f5),
679-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
719+
.driver_data = (kernel_ulong_t) &mhi_foxconn_dw5932e_info },
680720
/* DW5932e (sdx62), Non-eSIM */
681721
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0f9),
682-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
722+
.driver_data = (kernel_ulong_t) &mhi_foxconn_dw5932e_info },
683723
/* MV31-W (Cinterion) */
684724
{ PCI_DEVICE(PCI_VENDOR_ID_THALES, 0x00b3),
685725
.driver_data = (kernel_ulong_t) &mhi_mv31_info },
@@ -694,7 +734,7 @@ static const struct pci_device_id mhi_pci_id_table[] = {
694734
.driver_data = (kernel_ulong_t) &mhi_mv32_info },
695735
/* T99W175 (sdx55), HP variant */
696736
{ PCI_DEVICE(0x03f0, 0x0a6c),
697-
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx55_info },
737+
.driver_data = (kernel_ulong_t) &mhi_foxconn_t99w175_info },
698738
{ }
699739
};
700740
MODULE_DEVICE_TABLE(pci, mhi_pci_id_table);

0 commit comments

Comments
 (0)