Message ID | 20241205065422.2515086-2-quic_msarkar@quicinc.com |
---|---|
State | Accepted |
Commit | cba6bdfd79291b82422b6e6b4036ebc076d5625f |
Headers | show |
Series | [v1,1/2] bus: mhi: host: pci_generic: Add supoprt for SA8775P target | expand |
On Thu, Dec 05, 2024 at 12:24:19PM +0530, Mrinmay Sarkar wrote: > Add generic info for SA8775P target. SA8775P supports IP_SW > usecase only. Hence use separate configuration to enable IP_SW > channel. > > Signed-off-by: Mrinmay Sarkar <quic_msarkar@quicinc.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> One comment below. But I'll fix it up while applying. > --- > drivers/bus/mhi/host/pci_generic.c | 34 ++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index 56ba4192c89c..b62a05e854e9 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -245,6 +245,19 @@ struct mhi_pci_dev_info { > .channel = ch_num, \ > } > > +static const struct mhi_channel_config modem_qcom_v2_mhi_channels[] = { I wouldn't call sa8775p as 'modem'. - Mani
On Thu, Dec 05, 2024 at 12:24:19PM +0530, Mrinmay Sarkar wrote: > Add generic info for SA8775P target. SA8775P supports IP_SW > usecase only. Hence use separate configuration to enable IP_SW > channel. > > Signed-off-by: Mrinmay Sarkar <quic_msarkar@quicinc.com> Applied to mhi-next! - Mani > --- > drivers/bus/mhi/host/pci_generic.c | 34 ++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c > index 56ba4192c89c..b62a05e854e9 100644 > --- a/drivers/bus/mhi/host/pci_generic.c > +++ b/drivers/bus/mhi/host/pci_generic.c > @@ -245,6 +245,19 @@ struct mhi_pci_dev_info { > .channel = ch_num, \ > } > > +static const struct mhi_channel_config modem_qcom_v2_mhi_channels[] = { > + MHI_CHANNEL_CONFIG_UL(46, "IP_SW0", 2048, 1), > + MHI_CHANNEL_CONFIG_DL(47, "IP_SW0", 2048, 2), > +}; > + > +static struct mhi_event_config modem_qcom_v2_mhi_events[] = { > + /* first ring is control+data ring */ > + MHI_EVENT_CONFIG_CTRL(0, 64), > + /* Software channels dedicated event ring */ > + MHI_EVENT_CONFIG_SW_DATA(1, 64), > + MHI_EVENT_CONFIG_SW_DATA(2, 64), > +}; > + > static const struct mhi_channel_config modem_qcom_v1_mhi_channels[] = { > MHI_CHANNEL_CONFIG_UL(4, "DIAG", 16, 1), > MHI_CHANNEL_CONFIG_DL(5, "DIAG", 16, 1), > @@ -275,6 +288,15 @@ static struct mhi_event_config modem_qcom_v1_mhi_events[] = { > MHI_EVENT_CONFIG_HW_DATA(5, 2048, 101) > }; > > +static const struct mhi_controller_config modem_qcom_v3_mhiv_config = { > + .max_channels = 128, > + .timeout_ms = 8000, > + .num_channels = ARRAY_SIZE(modem_qcom_v2_mhi_channels), > + .ch_cfg = modem_qcom_v2_mhi_channels, > + .num_events = ARRAY_SIZE(modem_qcom_v2_mhi_events), > + .event_cfg = modem_qcom_v2_mhi_events, > +}; > + > static const struct mhi_controller_config modem_qcom_v2_mhiv_config = { > .max_channels = 128, > .timeout_ms = 8000, > @@ -294,6 +316,16 @@ static const struct mhi_controller_config modem_qcom_v1_mhiv_config = { > .event_cfg = modem_qcom_v1_mhi_events, > }; > > +static const struct mhi_pci_dev_info mhi_qcom_sa8775p_info = { > + .name = "qcom-sa8775p", > + .edl_trigger = false, > + .config = &modem_qcom_v3_mhiv_config, > + .bar_num = MHI_PCI_DEFAULT_BAR_NUM, > + .dma_data_width = 32, > + .mru_default = 32768, > + .sideband_wake = false, > +}; > + > static const struct mhi_pci_dev_info mhi_qcom_sdx75_info = { > .name = "qcom-sdx75m", > .fw = "qcom/sdx75m/xbl.elf", > @@ -720,6 +752,8 @@ static const struct mhi_pci_dev_info mhi_netprisma_fcun69_info = { > > /* Keep the list sorted based on the PID. New VID should be added as the last entry */ > static const struct pci_device_id mhi_pci_id_table[] = { > + {PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0116), > + .driver_data = (kernel_ulong_t) &mhi_qcom_sa8775p_info }, > { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0304), > .driver_data = (kernel_ulong_t) &mhi_qcom_sdx24_info }, > { PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x0306, PCI_VENDOR_ID_QCOM, 0x010c), > -- > 2.25.1 >
diff --git a/drivers/bus/mhi/host/pci_generic.c b/drivers/bus/mhi/host/pci_generic.c index 56ba4192c89c..b62a05e854e9 100644 --- a/drivers/bus/mhi/host/pci_generic.c +++ b/drivers/bus/mhi/host/pci_generic.c @@ -245,6 +245,19 @@ struct mhi_pci_dev_info { .channel = ch_num, \ } +static const struct mhi_channel_config modem_qcom_v2_mhi_channels[] = { + MHI_CHANNEL_CONFIG_UL(46, "IP_SW0", 2048, 1), + MHI_CHANNEL_CONFIG_DL(47, "IP_SW0", 2048, 2), +}; + +static struct mhi_event_config modem_qcom_v2_mhi_events[] = { + /* first ring is control+data ring */ + MHI_EVENT_CONFIG_CTRL(0, 64), + /* Software channels dedicated event ring */ + MHI_EVENT_CONFIG_SW_DATA(1, 64), + MHI_EVENT_CONFIG_SW_DATA(2, 64), +}; + static const struct mhi_channel_config modem_qcom_v1_mhi_channels[] = { MHI_CHANNEL_CONFIG_UL(4, "DIAG", 16, 1), MHI_CHANNEL_CONFIG_DL(5, "DIAG", 16, 1), @@ -275,6 +288,15 @@ static struct mhi_event_config modem_qcom_v1_mhi_events[] = { MHI_EVENT_CONFIG_HW_DATA(5, 2048, 101) }; +static const struct mhi_controller_config modem_qcom_v3_mhiv_config = { + .max_channels = 128, + .timeout_ms = 8000, + .num_channels = ARRAY_SIZE(modem_qcom_v2_mhi_channels), + .ch_cfg = modem_qcom_v2_mhi_channels, + .num_events = ARRAY_SIZE(modem_qcom_v2_mhi_events), + .event_cfg = modem_qcom_v2_mhi_events, +}; + static const struct mhi_controller_config modem_qcom_v2_mhiv_config = { .max_channels = 128, .timeout_ms = 8000, @@ -294,6 +316,16 @@ static const struct mhi_controller_config modem_qcom_v1_mhiv_config = { .event_cfg = modem_qcom_v1_mhi_events, }; +static const struct mhi_pci_dev_info mhi_qcom_sa8775p_info = { + .name = "qcom-sa8775p", + .edl_trigger = false, + .config = &modem_qcom_v3_mhiv_config, + .bar_num = MHI_PCI_DEFAULT_BAR_NUM, + .dma_data_width = 32, + .mru_default = 32768, + .sideband_wake = false, +}; + static const struct mhi_pci_dev_info mhi_qcom_sdx75_info = { .name = "qcom-sdx75m", .fw = "qcom/sdx75m/xbl.elf", @@ -720,6 +752,8 @@ static const struct mhi_pci_dev_info mhi_netprisma_fcun69_info = { /* Keep the list sorted based on the PID. New VID should be added as the last entry */ static const struct pci_device_id mhi_pci_id_table[] = { + {PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0116), + .driver_data = (kernel_ulong_t) &mhi_qcom_sa8775p_info }, { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0304), .driver_data = (kernel_ulong_t) &mhi_qcom_sdx24_info }, { PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x0306, PCI_VENDOR_ID_QCOM, 0x010c),
Add generic info for SA8775P target. SA8775P supports IP_SW usecase only. Hence use separate configuration to enable IP_SW channel. Signed-off-by: Mrinmay Sarkar <quic_msarkar@quicinc.com> --- drivers/bus/mhi/host/pci_generic.c | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)