* [PATCH v2] bus: mhi: host: Add support for Cinterion MV32-WA/MV32-WB
@ 2022-04-21 9:21 Slark Xiao
2022-04-21 12:59 ` Loic Poulain
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Slark Xiao @ 2022-04-21 9:21 UTC (permalink / raw)
To: mani, hemantk
Cc: gregkh, loic.poulain, slark_xiao, bbhatt, christophe.jaillet,
thomas.ulrich, mhi, linux-arm-msm, linux-kernel
MV32-WA is designed based on Qualcomm SDX62, and
MV32-WB is designed based on QUalcomm SDX65. Both
products' enumeration would align with previous
product MV31-W.So we merge MV31 and MV32 to MV3X
for some common settings.
Fixes: 87693e092bd0 ("bus: mhi: pci_generic: Add Cinterion MV31-W PCIe to MHI")
Signed-off-by: Slark Xiao <slark_xiao@163.com>
---
drivers/bus/mhi/host/pci_generic.c | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c
index 9527b7d63840..ef8c16746b76 100644
--- a/drivers/bus/mhi/host/pci_generic.c
+++ b/drivers/bus/mhi/host/pci_generic.c
@@ -371,7 +371,7 @@ static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
.sideband_wake = false,
};
-static const struct mhi_channel_config mhi_mv31_channels[] = {
+static const struct mhi_channel_config mhi_mv3x_channels[] = {
MHI_CHANNEL_CONFIG_UL(0, "LOOPBACK", 64, 0),
MHI_CHANNEL_CONFIG_DL(1, "LOOPBACK", 64, 0),
/* MBIM Control Channel */
@@ -382,25 +382,33 @@ static const struct mhi_channel_config mhi_mv31_channels[] = {
MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 512, 3),
};
-static struct mhi_event_config mhi_mv31_events[] = {
+static struct mhi_event_config mhi_mv3x_events[] = {
MHI_EVENT_CONFIG_CTRL(0, 256),
MHI_EVENT_CONFIG_DATA(1, 256),
MHI_EVENT_CONFIG_HW_DATA(2, 1024, 100),
MHI_EVENT_CONFIG_HW_DATA(3, 1024, 101),
};
-static const struct mhi_controller_config modem_mv31_config = {
+static const struct mhi_controller_config modem_mv3x_config = {
.max_channels = 128,
.timeout_ms = 20000,
- .num_channels = ARRAY_SIZE(mhi_mv31_channels),
- .ch_cfg = mhi_mv31_channels,
- .num_events = ARRAY_SIZE(mhi_mv31_events),
- .event_cfg = mhi_mv31_events,
+ .num_channels = ARRAY_SIZE(mhi_mv3x_channels),
+ .ch_cfg = mhi_mv3x_channels,
+ .num_events = ARRAY_SIZE(mhi_mv3x_events),
+ .event_cfg = mhi_mv3x_events,
};
static const struct mhi_pci_dev_info mhi_mv31_info = {
.name = "cinterion-mv31",
- .config = &modem_mv31_config,
+ .config = &modem_mv3x_config,
+ .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
+ .dma_data_width = 32,
+ .mru_default = 32768,
+};
+
+static const struct mhi_pci_dev_info mhi_mv32_info = {
+ .name = "cinterion-mv32",
+ .config = &modem_mv3x_config,
.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
.dma_data_width = 32,
.mru_default = 32768,
@@ -475,6 +483,12 @@ static const struct pci_device_id mhi_pci_id_table[] = {
/* MV31-W (Cinterion) */
{ PCI_DEVICE(0x1269, 0x00b3),
.driver_data = (kernel_ulong_t) &mhi_mv31_info },
+ /* MV32-WA (Cinterion) */
+ { PCI_DEVICE(0x1269, 0x00ba),
+ .driver_data = (kernel_ulong_t) &mhi_mv32_info },
+ /* MV32-WB (Cinterion) */
+ { PCI_DEVICE(0x1269, 0x00bb),
+ .driver_data = (kernel_ulong_t) &mhi_mv32_info },
{ }
};
MODULE_DEVICE_TABLE(pci, mhi_pci_id_table);
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] bus: mhi: host: Add support for Cinterion MV32-WA/MV32-WB
2022-04-21 9:21 [PATCH v2] bus: mhi: host: Add support for Cinterion MV32-WA/MV32-WB Slark Xiao
@ 2022-04-21 12:59 ` Loic Poulain
2022-04-23 13:35 ` Manivannan Sadhasivam
2022-04-23 13:38 ` Manivannan Sadhasivam
2 siblings, 0 replies; 4+ messages in thread
From: Loic Poulain @ 2022-04-21 12:59 UTC (permalink / raw)
To: Slark Xiao
Cc: mani, hemantk, gregkh, bbhatt, christophe.jaillet, thomas.ulrich,
mhi, linux-arm-msm, linux-kernel
On Thu, 21 Apr 2022 at 11:22, Slark Xiao <slark_xiao@163.com> wrote:
>
> MV32-WA is designed based on Qualcomm SDX62, and
> MV32-WB is designed based on QUalcomm SDX65. Both
> products' enumeration would align with previous
> product MV31-W.So we merge MV31 and MV32 to MV3X
> for some common settings.
>
> Fixes: 87693e092bd0 ("bus: mhi: pci_generic: Add Cinterion MV31-W PCIe to MHI")
The patch does not fix a bug, but adds new hardware support.
> Signed-off-by: Slark Xiao <slark_xiao@163.com>
Without the 'fixes' tag:
Reviewed-by: Loic Poulain <loic.poulain@linaro.org>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] bus: mhi: host: Add support for Cinterion MV32-WA/MV32-WB
2022-04-21 9:21 [PATCH v2] bus: mhi: host: Add support for Cinterion MV32-WA/MV32-WB Slark Xiao
2022-04-21 12:59 ` Loic Poulain
@ 2022-04-23 13:35 ` Manivannan Sadhasivam
2022-04-23 13:38 ` Manivannan Sadhasivam
2 siblings, 0 replies; 4+ messages in thread
From: Manivannan Sadhasivam @ 2022-04-23 13:35 UTC (permalink / raw)
To: Slark Xiao
Cc: hemantk, gregkh, loic.poulain, bbhatt, christophe.jaillet,
thomas.ulrich, mhi, linux-arm-msm, linux-kernel
On Thu, Apr 21, 2022 at 05:21:41PM +0800, Slark Xiao wrote:
> MV32-WA is designed based on Qualcomm SDX62, and
> MV32-WB is designed based on QUalcomm SDX65. Both
> products' enumeration would align with previous
> product MV31-W.So we merge MV31 and MV32 to MV3X
> for some common settings.
>
> Fixes: 87693e092bd0 ("bus: mhi: pci_generic: Add Cinterion MV31-W PCIe to MHI")
As Loic noted, Fixes tag is not relevant here. I'll remove it while applying.
> Signed-off-by: Slark Xiao <slark_xiao@163.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Thanks,
Mani
> ---
> drivers/bus/mhi/host/pci_generic.c | 30 ++++++++++++++++++++++--------
> 1 file changed, 22 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c
> index 9527b7d63840..ef8c16746b76 100644
> --- a/drivers/bus/mhi/host/pci_generic.c
> +++ b/drivers/bus/mhi/host/pci_generic.c
> @@ -371,7 +371,7 @@ static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
> .sideband_wake = false,
> };
>
> -static const struct mhi_channel_config mhi_mv31_channels[] = {
> +static const struct mhi_channel_config mhi_mv3x_channels[] = {
> MHI_CHANNEL_CONFIG_UL(0, "LOOPBACK", 64, 0),
> MHI_CHANNEL_CONFIG_DL(1, "LOOPBACK", 64, 0),
> /* MBIM Control Channel */
> @@ -382,25 +382,33 @@ static const struct mhi_channel_config mhi_mv31_channels[] = {
> MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 512, 3),
> };
>
> -static struct mhi_event_config mhi_mv31_events[] = {
> +static struct mhi_event_config mhi_mv3x_events[] = {
> MHI_EVENT_CONFIG_CTRL(0, 256),
> MHI_EVENT_CONFIG_DATA(1, 256),
> MHI_EVENT_CONFIG_HW_DATA(2, 1024, 100),
> MHI_EVENT_CONFIG_HW_DATA(3, 1024, 101),
> };
>
> -static const struct mhi_controller_config modem_mv31_config = {
> +static const struct mhi_controller_config modem_mv3x_config = {
> .max_channels = 128,
> .timeout_ms = 20000,
> - .num_channels = ARRAY_SIZE(mhi_mv31_channels),
> - .ch_cfg = mhi_mv31_channels,
> - .num_events = ARRAY_SIZE(mhi_mv31_events),
> - .event_cfg = mhi_mv31_events,
> + .num_channels = ARRAY_SIZE(mhi_mv3x_channels),
> + .ch_cfg = mhi_mv3x_channels,
> + .num_events = ARRAY_SIZE(mhi_mv3x_events),
> + .event_cfg = mhi_mv3x_events,
> };
>
> static const struct mhi_pci_dev_info mhi_mv31_info = {
> .name = "cinterion-mv31",
> - .config = &modem_mv31_config,
> + .config = &modem_mv3x_config,
> + .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
> + .dma_data_width = 32,
> + .mru_default = 32768,
> +};
> +
> +static const struct mhi_pci_dev_info mhi_mv32_info = {
> + .name = "cinterion-mv32",
> + .config = &modem_mv3x_config,
> .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
> .dma_data_width = 32,
> .mru_default = 32768,
> @@ -475,6 +483,12 @@ static const struct pci_device_id mhi_pci_id_table[] = {
> /* MV31-W (Cinterion) */
> { PCI_DEVICE(0x1269, 0x00b3),
> .driver_data = (kernel_ulong_t) &mhi_mv31_info },
> + /* MV32-WA (Cinterion) */
> + { PCI_DEVICE(0x1269, 0x00ba),
> + .driver_data = (kernel_ulong_t) &mhi_mv32_info },
> + /* MV32-WB (Cinterion) */
> + { PCI_DEVICE(0x1269, 0x00bb),
> + .driver_data = (kernel_ulong_t) &mhi_mv32_info },
> { }
> };
> MODULE_DEVICE_TABLE(pci, mhi_pci_id_table);
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] bus: mhi: host: Add support for Cinterion MV32-WA/MV32-WB
2022-04-21 9:21 [PATCH v2] bus: mhi: host: Add support for Cinterion MV32-WA/MV32-WB Slark Xiao
2022-04-21 12:59 ` Loic Poulain
2022-04-23 13:35 ` Manivannan Sadhasivam
@ 2022-04-23 13:38 ` Manivannan Sadhasivam
2 siblings, 0 replies; 4+ messages in thread
From: Manivannan Sadhasivam @ 2022-04-23 13:38 UTC (permalink / raw)
To: Slark Xiao
Cc: hemantk, gregkh, loic.poulain, bbhatt, christophe.jaillet,
thomas.ulrich, mhi, linux-arm-msm, linux-kernel
On Thu, Apr 21, 2022 at 05:21:41PM +0800, Slark Xiao wrote:
> MV32-WA is designed based on Qualcomm SDX62, and
> MV32-WB is designed based on QUalcomm SDX65. Both
> products' enumeration would align with previous
> product MV31-W.So we merge MV31 and MV32 to MV3X
> for some common settings.
>
> Fixes: 87693e092bd0 ("bus: mhi: pci_generic: Add Cinterion MV31-W PCIe to MHI")
> Signed-off-by: Slark Xiao <slark_xiao@163.com>
Applied to mhi-next!
Thanks,
Mani
> ---
> drivers/bus/mhi/host/pci_generic.c | 30 ++++++++++++++++++++++--------
> 1 file changed, 22 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c
> index 9527b7d63840..ef8c16746b76 100644
> --- a/drivers/bus/mhi/host/pci_generic.c
> +++ b/drivers/bus/mhi/host/pci_generic.c
> @@ -371,7 +371,7 @@ static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
> .sideband_wake = false,
> };
>
> -static const struct mhi_channel_config mhi_mv31_channels[] = {
> +static const struct mhi_channel_config mhi_mv3x_channels[] = {
> MHI_CHANNEL_CONFIG_UL(0, "LOOPBACK", 64, 0),
> MHI_CHANNEL_CONFIG_DL(1, "LOOPBACK", 64, 0),
> /* MBIM Control Channel */
> @@ -382,25 +382,33 @@ static const struct mhi_channel_config mhi_mv31_channels[] = {
> MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 512, 3),
> };
>
> -static struct mhi_event_config mhi_mv31_events[] = {
> +static struct mhi_event_config mhi_mv3x_events[] = {
> MHI_EVENT_CONFIG_CTRL(0, 256),
> MHI_EVENT_CONFIG_DATA(1, 256),
> MHI_EVENT_CONFIG_HW_DATA(2, 1024, 100),
> MHI_EVENT_CONFIG_HW_DATA(3, 1024, 101),
> };
>
> -static const struct mhi_controller_config modem_mv31_config = {
> +static const struct mhi_controller_config modem_mv3x_config = {
> .max_channels = 128,
> .timeout_ms = 20000,
> - .num_channels = ARRAY_SIZE(mhi_mv31_channels),
> - .ch_cfg = mhi_mv31_channels,
> - .num_events = ARRAY_SIZE(mhi_mv31_events),
> - .event_cfg = mhi_mv31_events,
> + .num_channels = ARRAY_SIZE(mhi_mv3x_channels),
> + .ch_cfg = mhi_mv3x_channels,
> + .num_events = ARRAY_SIZE(mhi_mv3x_events),
> + .event_cfg = mhi_mv3x_events,
> };
>
> static const struct mhi_pci_dev_info mhi_mv31_info = {
> .name = "cinterion-mv31",
> - .config = &modem_mv31_config,
> + .config = &modem_mv3x_config,
> + .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
> + .dma_data_width = 32,
> + .mru_default = 32768,
> +};
> +
> +static const struct mhi_pci_dev_info mhi_mv32_info = {
> + .name = "cinterion-mv32",
> + .config = &modem_mv3x_config,
> .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
> .dma_data_width = 32,
> .mru_default = 32768,
> @@ -475,6 +483,12 @@ static const struct pci_device_id mhi_pci_id_table[] = {
> /* MV31-W (Cinterion) */
> { PCI_DEVICE(0x1269, 0x00b3),
> .driver_data = (kernel_ulong_t) &mhi_mv31_info },
> + /* MV32-WA (Cinterion) */
> + { PCI_DEVICE(0x1269, 0x00ba),
> + .driver_data = (kernel_ulong_t) &mhi_mv32_info },
> + /* MV32-WB (Cinterion) */
> + { PCI_DEVICE(0x1269, 0x00bb),
> + .driver_data = (kernel_ulong_t) &mhi_mv32_info },
> { }
> };
> MODULE_DEVICE_TABLE(pci, mhi_pci_id_table);
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-23 13:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-21 9:21 [PATCH v2] bus: mhi: host: Add support for Cinterion MV32-WA/MV32-WB Slark Xiao
2022-04-21 12:59 ` Loic Poulain
2022-04-23 13:35 ` Manivannan Sadhasivam
2022-04-23 13:38 ` Manivannan Sadhasivam
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.