| Message ID | 20211123081541.648426-1-thomas.perrot@bootlin.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v2] bus: mhi: pci_generic: Introduce Sierra EM919X support | expand |
On Tue, Nov 23, 2021 at 09:15:41AM +0100, Thomas Perrot wrote: > 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. > > Tested-by: Aleksander Morgado <aleksander@aleksander.es> > Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Thanks, Mani > --- > 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 >
On Tue, Nov 23, 2021 at 09:15:41AM +0100, Thomas Perrot wrote: > 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. > > Tested-by: Aleksander Morgado <aleksander@aleksander.es> > Signed-off-by: Thomas Perrot <thomas.perrot@bootlin.com> Applied to mhi-next! Thanks, Mani > --- > 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 >
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),