| Message ID | 1609865076-13890-2-git-send-email-loic.poulain@linaro.org |
|---|---|
| State | Accepted |
| Commit | b91c3b30e2267265cd7e67cb3d0c99c48c02b001 |
| Headers | show |
| Series | [v2,1/2] mhi: unconstify mhi_event_config | expand |
On 1/5/21 8:44 AM, 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> > Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- Reviewed-by: Hemant Kumar<hemantk@codeaurora.org> -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
On Tue, Jan 05, 2021 at 05:44:36PM +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> > Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Applied to mhi-next! Thanks, Mani > --- > v2: reword MSI warning > > drivers/bus/mhi/pci_generic.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c > index 86ff0c3..5b3a23a4 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), > @@ -295,8 +295,12 @@ 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); > + dev_warn(&pdev->dev, "using shared MSI\n"); > + > + /* 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 >
diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c index 86ff0c3..5b3a23a4 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), @@ -295,8 +295,12 @@ 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); + dev_warn(&pdev->dev, "using shared MSI\n"); + + /* 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);