* [PATCH 1/2] mhi: unconstify mhi_event_config @ 2021-01-05 8:56 Loic Poulain 2021-01-05 8:56 ` [PATCH 2/2] mhi: pci_generic: Fix shared MSI vector support Loic Poulain 2021-01-05 15:26 ` [PATCH 1/2] mhi: unconstify mhi_event_config Manivannan Sadhasivam 0 siblings, 2 replies; 5+ messages in thread From: Loic Poulain @ 2021-01-05 8:56 UTC (permalink / raw) To: manivannan.sadhasivam, hemantk; +Cc: linux-arm-msm, Loic Poulain Some parameters may have to be determined at runtime. It is the case for the event ring MSI vector. Signed-off-by: Loic Poulain <loic.poulain@linaro.org> --- include/linux/mhi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/mhi.h b/include/linux/mhi.h index 62da830..48b1b2a 100644 --- a/include/linux/mhi.h +++ b/include/linux/mhi.h @@ -290,7 +290,7 @@ struct mhi_controller_config { u32 num_channels; const struct mhi_channel_config *ch_cfg; u32 num_events; - const struct mhi_event_config *event_cfg; + struct mhi_event_config *event_cfg; bool use_bounce_buf; bool m2_no_db; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] mhi: pci_generic: Fix shared MSI vector support 2021-01-05 8:56 [PATCH 1/2] mhi: unconstify mhi_event_config Loic Poulain @ 2021-01-05 8:56 ` Loic Poulain 2021-01-05 15:29 ` Manivannan Sadhasivam 2021-01-05 15:26 ` [PATCH 1/2] mhi: unconstify mhi_event_config Manivannan Sadhasivam 1 sibling, 1 reply; 5+ messages in thread From: Loic Poulain @ 2021-01-05 8:56 UTC (permalink / raw) To: manivannan.sadhasivam, hemantk; +Cc: linux-arm-msm, Loic Poulain When a shared MSI vector must be used (e.g. when VTd is disabled on x86_64), each event MSI vector must be set to the shared vector idx. Signed-off-by: Loic Poulain <loic.poulain@linaro.org> --- drivers/bus/mhi/pci_generic.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c index 86ff0c3..23ef585 100644 --- a/drivers/bus/mhi/pci_generic.c +++ b/drivers/bus/mhi/pci_generic.c @@ -154,7 +154,7 @@ static const struct mhi_channel_config modem_qcom_v1_mhi_channels[] = { MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0", 128, 3), }; -static const struct mhi_event_config modem_qcom_v1_mhi_events[] = { +static struct mhi_event_config modem_qcom_v1_mhi_events[] = { /* first ring is control+data ring */ MHI_EVENT_CONFIG_CTRL(0), /* DIAG dedicated event ring */ @@ -164,7 +164,7 @@ static const struct mhi_event_config modem_qcom_v1_mhi_events[] = { MHI_EVENT_CONFIG_HW_DATA(3, 101) }; -static const struct mhi_controller_config modem_qcom_v1_mhiv_config = { +static struct mhi_controller_config modem_qcom_v1_mhiv_config = { .max_channels = 128, .timeout_ms = 8000, .num_channels = ARRAY_SIZE(modem_qcom_v1_mhi_channels), @@ -297,6 +297,11 @@ static int mhi_pci_get_irqs(struct mhi_controller *mhi_cntrl, if (nr_vectors < mhi_cntrl->nr_irqs) { dev_warn(&pdev->dev, "Not enough MSI vectors (%d/%d), use shared MSI\n", nr_vectors, mhi_cntrl_config->num_events); + + /* Patch msi vectors, use only one (shared) */ + for (i = 0; i < mhi_cntrl_config->num_events; i++) + mhi_cntrl_config->event_cfg[i].irq = 0; + mhi_cntrl->nr_irqs = 1; } irq = devm_kcalloc(&pdev->dev, mhi_cntrl->nr_irqs, sizeof(int), GFP_KERNEL); -- 2.7.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] mhi: pci_generic: Fix shared MSI vector support 2021-01-05 8:56 ` [PATCH 2/2] mhi: pci_generic: Fix shared MSI vector support Loic Poulain @ 2021-01-05 15:29 ` Manivannan Sadhasivam 0 siblings, 0 replies; 5+ messages in thread From: Manivannan Sadhasivam @ 2021-01-05 15:29 UTC (permalink / raw) To: Loic Poulain; +Cc: hemantk, linux-arm-msm On Tue, Jan 05, 2021 at 09:56:15AM +0100, Loic Poulain wrote: > When a shared MSI vector must be used (e.g. when VTd is disabled on > x86_64), each event MSI vector must be set to the shared vector idx. > > Signed-off-by: Loic Poulain <loic.poulain@linaro.org> > --- > drivers/bus/mhi/pci_generic.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c > index 86ff0c3..23ef585 100644 > --- a/drivers/bus/mhi/pci_generic.c > +++ b/drivers/bus/mhi/pci_generic.c > @@ -154,7 +154,7 @@ static const struct mhi_channel_config modem_qcom_v1_mhi_channels[] = { > MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0", 128, 3), > }; > > -static const struct mhi_event_config modem_qcom_v1_mhi_events[] = { > +static struct mhi_event_config modem_qcom_v1_mhi_events[] = { > /* first ring is control+data ring */ > MHI_EVENT_CONFIG_CTRL(0), > /* DIAG dedicated event ring */ > @@ -164,7 +164,7 @@ static const struct mhi_event_config modem_qcom_v1_mhi_events[] = { > MHI_EVENT_CONFIG_HW_DATA(3, 101) > }; > > -static const struct mhi_controller_config modem_qcom_v1_mhiv_config = { > +static struct mhi_controller_config modem_qcom_v1_mhiv_config = { > .max_channels = 128, > .timeout_ms = 8000, > .num_channels = ARRAY_SIZE(modem_qcom_v1_mhi_channels), > @@ -297,6 +297,11 @@ static int mhi_pci_get_irqs(struct mhi_controller *mhi_cntrl, > if (nr_vectors < mhi_cntrl->nr_irqs) { > dev_warn(&pdev->dev, "Not enough MSI vectors (%d/%d), use shared MSI\n", So now the log should say, "using shared MSI"! with that, Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Thanks, Mani > nr_vectors, mhi_cntrl_config->num_events); > + > + /* Patch msi vectors, use only one (shared) */ > + for (i = 0; i < mhi_cntrl_config->num_events; i++) > + mhi_cntrl_config->event_cfg[i].irq = 0; > + mhi_cntrl->nr_irqs = 1; > } > > irq = devm_kcalloc(&pdev->dev, mhi_cntrl->nr_irqs, sizeof(int), GFP_KERNEL); > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] mhi: unconstify mhi_event_config 2021-01-05 8:56 [PATCH 1/2] mhi: unconstify mhi_event_config Loic Poulain 2021-01-05 8:56 ` [PATCH 2/2] mhi: pci_generic: Fix shared MSI vector support Loic Poulain @ 2021-01-05 15:26 ` Manivannan Sadhasivam 2021-01-06 2:25 ` Hemant Kumar 1 sibling, 1 reply; 5+ messages in thread From: Manivannan Sadhasivam @ 2021-01-05 15:26 UTC (permalink / raw) To: Loic Poulain; +Cc: hemantk, linux-arm-msm On Tue, Jan 05, 2021 at 09:56:14AM +0100, Loic Poulain wrote: > Some parameters may have to be determined at runtime. > It is the case for the event ring MSI vector. > > Signed-off-by: Loic Poulain <loic.poulain@linaro.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Thanks, Mani > --- > include/linux/mhi.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/mhi.h b/include/linux/mhi.h > index 62da830..48b1b2a 100644 > --- a/include/linux/mhi.h > +++ b/include/linux/mhi.h > @@ -290,7 +290,7 @@ struct mhi_controller_config { > u32 num_channels; > const struct mhi_channel_config *ch_cfg; > u32 num_events; > - const struct mhi_event_config *event_cfg; > + struct mhi_event_config *event_cfg; > bool use_bounce_buf; > bool m2_no_db; > }; > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] mhi: unconstify mhi_event_config 2021-01-05 15:26 ` [PATCH 1/2] mhi: unconstify mhi_event_config Manivannan Sadhasivam @ 2021-01-06 2:25 ` Hemant Kumar 0 siblings, 0 replies; 5+ messages in thread From: Hemant Kumar @ 2021-01-06 2:25 UTC (permalink / raw) To: Manivannan Sadhasivam, Loic Poulain; +Cc: linux-arm-msm Hi Loic, On 1/5/21 7:26 AM, Manivannan Sadhasivam wrote: > On Tue, Jan 05, 2021 at 09:56:14AM +0100, Loic Poulain wrote: >> Some parameters may have to be determined at runtime. >> It is the case for the event ring MSI vector. >> >> Signed-off-by: Loic Poulain <loic.poulain@linaro.org> > > Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > Thanks, > Mani > >> --- >> include/linux/mhi.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/include/linux/mhi.h b/include/linux/mhi.h >> index 62da830..48b1b2a 100644 >> --- a/include/linux/mhi.h >> +++ b/include/linux/mhi.h >> @@ -290,7 +290,7 @@ struct mhi_controller_config { >> u32 num_channels; >> const struct mhi_channel_config *ch_cfg; >> u32 num_events; >> - const struct mhi_event_config *event_cfg; >> + struct mhi_event_config *event_cfg; Do we need to update mhi controller driver like ath11k and generic pci driver to avoid compiler warnings? >> bool use_bounce_buf; >> bool m2_no_db; >> }; >> -- >> 2.7.4 >> -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-06 2:26 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-01-05 8:56 [PATCH 1/2] mhi: unconstify mhi_event_config Loic Poulain 2021-01-05 8:56 ` [PATCH 2/2] mhi: pci_generic: Fix shared MSI vector support Loic Poulain 2021-01-05 15:29 ` Manivannan Sadhasivam 2021-01-05 15:26 ` [PATCH 1/2] mhi: unconstify mhi_event_config Manivannan Sadhasivam 2021-01-06 2:25 ` Hemant Kumar
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox