[PATCH] bus: mhi: pci_generic: Introduce Sierra EM919X support

[PATCH] bus: mhi: pci_generic: Introduce Sierra EM919X support

[Thomas Perrot]

Add support for EM919X modems, this modem series is based on SDX55
qcom chip.

Tested-by: Aleksander Morgado <aleksander@aleksander.es>
Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
---
 drivers/bus/mhi/pci_generic.c | 43 +++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c
index 59a4896a8030..076a951fd587 100644
--- a/drivers/bus/mhi/pci_generic.c
+++ b/drivers/bus/mhi/pci_generic.c
@@ -403,7 +403,50 @@ static const struct mhi_pci_dev_info mhi_mv31_info = {
 	.dma_data_width = 32,
 };
 
+static const struct mhi_channel_config mhi_sierra_em919x_channels[] = {
+	MHI_CHANNEL_CONFIG_UL_SBL(2, "SAHARA", 32, 0),
+	MHI_CHANNEL_CONFIG_DL_SBL(3, "SAHARA", 256, 0),
+	MHI_CHANNEL_CONFIG_UL(4, "DIAG", 32, 0),
+	MHI_CHANNEL_CONFIG_DL(5, "DIAG", 32, 0),
+	MHI_CHANNEL_CONFIG_UL(12, "MBIM", 128, 0),
+	MHI_CHANNEL_CONFIG_DL(13, "MBIM", 128, 0),
+	MHI_CHANNEL_CONFIG_UL(14, "QMI", 32, 0),
+	MHI_CHANNEL_CONFIG_DL(15, "QMI", 32, 0),
+	MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0),
+	MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0),
+	MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0", 512, 1),
+	MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0", 512, 2),
+};
+
+static struct mhi_event_config modem_sierra_em919x_mhi_events[] = {
+	/* first ring is control+data and DIAG ring */
+	MHI_EVENT_CONFIG_CTRL(0, 2048),
+	/* Hardware channels request dedicated hardware event rings */
+	MHI_EVENT_CONFIG_HW_DATA(1, 2048, 100),
+	MHI_EVENT_CONFIG_HW_DATA(2, 2048, 101)
+};
+
+static const struct mhi_controller_config modem_sierra_em919x_config = {
+	.max_channels = 128,
+	.timeout_ms = 24000,
+	.num_channels = ARRAY_SIZE(mhi_sierra_em919x_channels),
+	.ch_cfg = mhi_sierra_em919x_channels,
+	.num_events = ARRAY_SIZE(modem_sierra_em919x_mhi_events),
+	.event_cfg = modem_sierra_em919x_mhi_events,
+};
+
+static const struct mhi_pci_dev_info mhi_sierra_em919x_info = {
+	.name = "sierra-em919x",
+	.config = &modem_sierra_em919x_config,
+	.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
+	.dma_data_width = 32,
+	.sideband_wake = false,
+};
+
 static const struct pci_device_id mhi_pci_id_table[] = {
+	/* EM919x (sdx55), use the same vid:pid as qcom-sdx55m */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x0306, 0x18d7, 0x0200),
+		.driver_data = (kernel_ulong_t) &mhi_sierra_em919x_info },
 	{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0306),
 		.driver_data = (kernel_ulong_t) &mhi_qcom_sdx55_info },
 	{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0304),
-- 
2.31.1

Re: [PATCH] bus: mhi: pci_generic: Introduce Sierra EM919X support

[Manivannan Sadhasivam]

On Mon, Nov 22, 2021 at 12:11:35PM +0100, Thomas Perrot wrote:
> Add support for EM919X modems, this modem series is based on SDX55
> qcom chip.
> 
> Tested-by: Aleksander Morgado <aleksander@aleksander.es>
> Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
> ---
>  drivers/bus/mhi/pci_generic.c | 43 +++++++++++++++++++++++++++++++++++
>  1 file changed, 43 insertions(+)
> 
> diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c
> index 59a4896a8030..076a951fd587 100644
> --- a/drivers/bus/mhi/pci_generic.c
> +++ b/drivers/bus/mhi/pci_generic.c
> @@ -403,7 +403,50 @@ static const struct mhi_pci_dev_info mhi_mv31_info = {
>  	.dma_data_width = 32,
>  };
>  
> +static const struct mhi_channel_config mhi_sierra_em919x_channels[] = {
> +	MHI_CHANNEL_CONFIG_UL_SBL(2, "SAHARA", 32, 0),
> +	MHI_CHANNEL_CONFIG_DL_SBL(3, "SAHARA", 256, 0),
> +	MHI_CHANNEL_CONFIG_UL(4, "DIAG", 32, 0),
> +	MHI_CHANNEL_CONFIG_DL(5, "DIAG", 32, 0),

DIAG generally uses a dedicated event ring.

> +	MHI_CHANNEL_CONFIG_UL(12, "MBIM", 128, 0),
> +	MHI_CHANNEL_CONFIG_DL(13, "MBIM", 128, 0),
> +	MHI_CHANNEL_CONFIG_UL(14, "QMI", 32, 0),
> +	MHI_CHANNEL_CONFIG_DL(15, "QMI", 32, 0),
> +	MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0),
> +	MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0),
> +	MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0", 512, 1),
> +	MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0", 512, 2),
> +};
> +
> +static struct mhi_event_config modem_sierra_em919x_mhi_events[] = {
> +	/* first ring is control+data and DIAG ring */
> +	MHI_EVENT_CONFIG_CTRL(0, 2048),

I think you can just split control+data and diag events as like other modems.
If there is a requirement, please mention in commit description.

Rest LGTM.

Thanks,
Mani

Re: [PATCH] bus: mhi: pci_generic: Introduce Sierra EM919X support

[Thomas Perrot]

[-- Attachment #1: Type: text/plain, Size: 2385 bytes --]

Hi Mani,

On Mon, 2021-11-22 at 21:09 +0530, Manivannan Sadhasivam wrote:
> On Mon, Nov 22, 2021 at 12:11:35PM +0100, Thomas Perrot wrote:
> > Add support for EM919X modems, this modem series is based on SDX55
> > qcom chip.
> > 
> > Tested-by: Aleksander Morgado <aleksander@aleksander.es>
> > Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
> > ---
> >  drivers/bus/mhi/pci_generic.c | 43
> > +++++++++++++++++++++++++++++++++++
> >  1 file changed, 43 insertions(+)
> > 
> > diff --git a/drivers/bus/mhi/pci_generic.c
> > b/drivers/bus/mhi/pci_generic.c
> > index 59a4896a8030..076a951fd587 100644
> > --- a/drivers/bus/mhi/pci_generic.c
> > +++ b/drivers/bus/mhi/pci_generic.c
> > @@ -403,7 +403,50 @@ static const struct mhi_pci_dev_info
> > mhi_mv31_info = {
> >         .dma_data_width = 32,
> >  };
> >  
> > +static const struct mhi_channel_config
> > mhi_sierra_em919x_channels[] = {
> > +       MHI_CHANNEL_CONFIG_UL_SBL(2, "SAHARA", 32, 0),
> > +       MHI_CHANNEL_CONFIG_DL_SBL(3, "SAHARA", 256, 0),
> > +       MHI_CHANNEL_CONFIG_UL(4, "DIAG", 32, 0),
> > +       MHI_CHANNEL_CONFIG_DL(5, "DIAG", 32, 0),
> 
> DIAG generally uses a dedicated event ring.
> 
> > +       MHI_CHANNEL_CONFIG_UL(12, "MBIM", 128, 0),
> > +       MHI_CHANNEL_CONFIG_DL(13, "MBIM", 128, 0),
> > +       MHI_CHANNEL_CONFIG_UL(14, "QMI", 32, 0),
> > +       MHI_CHANNEL_CONFIG_DL(15, "QMI", 32, 0),
> > +       MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0),
> > +       MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0),
> > +       MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0", 512, 1),
> > +       MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0", 512, 2),
> > +};
> > +
> > +static struct mhi_event_config modem_sierra_em919x_mhi_events[] =
> > {
> > +       /* first ring is control+data and DIAG ring */
> > +       MHI_EVENT_CONFIG_CTRL(0, 2048),
> 
> I think you can just split control+data and diag events as like other
> modems.
> If there is a requirement, please mention in commit description.
> 

Thank you, I will submit a v2 that notify, in commit description, that
is a requirement.

Best regards,
Thomas

> Rest LGTM.
> 
> Thanks,
> Mani

-- 
Thomas Perrot, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH] bus: mhi: pci_generic: Introduce Sierra EM919X support

[Greg Kroah-Hartman]

On Tue, Aug 09, 2022 at 10:40:58AM +0200, Koen Vandeputte wrote:
> From: Thomas Perrot <thomas.perrot@bootlin.com>
> 
> Add support for EM919X modems, this modem series is based on SDX55
> qcom chip.
> 
> It is mandatory to use the same ring for control+data and diag events.
> 
> Link: https://lore.kernel.org/r/20211123081541.648426-1-thomas.perrot@bootlin.com
> Tested-by: Aleksander Morgado <aleksander@aleksander.es>
> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
> Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Link: https://lore.kernel.org/r/20211216081227.237749-11-manivannan.sadhasivam@linaro.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> 
> Backported/refreshed version for 5.15 LTS based on 5.15.59
> This LTS contains all required bits and other modems have been backported already.
> 

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read:
    https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>

[PATCH] bus: mhi: pci_generic: Introduce Sierra EM919X support

[Koen Vandeputte]

From: Thomas Perrot <thomas.perrot@bootlin.com>

Add support for EM919X modems, this modem series is based on SDX55
qcom chip.

It is mandatory to use the same ring for control+data and diag events.

Link: https://lore.kernel.org/r/20211123081541.648426-1-thomas.perrot@bootlin.com
Tested-by: Aleksander Morgado <aleksander@aleksander.es>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20211216081227.237749-11-manivannan.sadhasivam@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Backported/refreshed version for 5.15 LTS based on 5.15.59
This LTS contains all required bits and other modems have been backported already.


 drivers/bus/mhi/pci_generic.c | 43 +++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c
index b780990faf80..336dba72e552 100644
--- a/drivers/bus/mhi/pci_generic.c
+++ b/drivers/bus/mhi/pci_generic.c
@@ -406,6 +406,46 @@ static const struct mhi_pci_dev_info mhi_mv31_info = {
 	.mru_default = 32768,
 };
 
+static const struct mhi_channel_config mhi_sierra_em919x_channels[] = {
+	MHI_CHANNEL_CONFIG_UL_SBL(2, "SAHARA", 32, 0),
+	MHI_CHANNEL_CONFIG_DL_SBL(3, "SAHARA", 256, 0),
+	MHI_CHANNEL_CONFIG_UL(4, "DIAG", 32, 0),
+	MHI_CHANNEL_CONFIG_DL(5, "DIAG", 32, 0),
+	MHI_CHANNEL_CONFIG_UL(12, "MBIM", 128, 0),
+	MHI_CHANNEL_CONFIG_DL(13, "MBIM", 128, 0),
+	MHI_CHANNEL_CONFIG_UL(14, "QMI", 32, 0),
+	MHI_CHANNEL_CONFIG_DL(15, "QMI", 32, 0),
+	MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0),
+	MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0),
+	MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0", 512, 1),
+	MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0", 512, 2),
+};
+
+static struct mhi_event_config modem_sierra_em919x_mhi_events[] = {
+	/* first ring is control+data and DIAG ring */
+	MHI_EVENT_CONFIG_CTRL(0, 2048),
+	/* Hardware channels request dedicated hardware event rings */
+	MHI_EVENT_CONFIG_HW_DATA(1, 2048, 100),
+	MHI_EVENT_CONFIG_HW_DATA(2, 2048, 101)
+};
+
+static const struct mhi_controller_config modem_sierra_em919x_config = {
+	.max_channels = 128,
+	.timeout_ms = 24000,
+	.num_channels = ARRAY_SIZE(mhi_sierra_em919x_channels),
+	.ch_cfg = mhi_sierra_em919x_channels,
+	.num_events = ARRAY_SIZE(modem_sierra_em919x_mhi_events),
+	.event_cfg = modem_sierra_em919x_mhi_events,
+};
+
+static const struct mhi_pci_dev_info mhi_sierra_em919x_info = {
+	.name = "sierra-em919x",
+	.config = &modem_sierra_em919x_config,
+	.bar_num = MHI_PCI_DEFAULT_BAR_NUM,
+	.dma_data_width = 32,
+	.sideband_wake = false,
+};
+
 static const struct mhi_channel_config mhi_telit_fn980_hw_v1_channels[] = {
 	MHI_CHANNEL_CONFIG_UL(14, "QMI", 32, 0),
 	MHI_CHANNEL_CONFIG_DL(15, "QMI", 32, 0),
@@ -480,6 +520,9 @@ static const struct mhi_pci_dev_info mhi_telit_fn990_info = {
 };
 
 static const struct pci_device_id mhi_pci_id_table[] = {
+	/* EM919x (sdx55), use the same vid:pid as qcom-sdx55m */
+	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x0306, 0x18d7, 0x0200),
+		.driver_data = (kernel_ulong_t) &mhi_sierra_em919x_info },
 	/* Telit FN980 hardware revision v1 */
 	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x0306, 0x1C5D, 0x2000),
 		.driver_data = (kernel_ulong_t) &mhi_telit_fn980_hw_v1_info },
-- 
2.25.1