From 59079b0ffee1350063a332660423d809d110d683 Mon Sep 17 00:00:00 2001 From: Loic Poulain Date: Thu, 18 Feb 2021 15:46:11 +0100 Subject: [TENTATIVE-FIX] mhi: pci_generic: various changes Signed-off-by: Loic Poulain --- drivers/bus/mhi/pci_generic.c | 28 ++++++++++++++-------------- drivers/net/mhi_net.c | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c index 87abd7cd1583..f1eb3f89da15 100644 --- a/drivers/bus/mhi/pci_generic.c +++ b/drivers/bus/mhi/pci_generic.c @@ -144,26 +144,26 @@ struct mhi_pci_dev_info { } 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), - MHI_CHANNEL_CONFIG_UL(12, "MBIM", 4, 0), - MHI_CHANNEL_CONFIG_DL(13, "MBIM", 4, 0), - MHI_CHANNEL_CONFIG_UL(14, "QMI", 16, 0), - MHI_CHANNEL_CONFIG_DL(15, "QMI", 16, 0), - MHI_CHANNEL_CONFIG_UL(20, "IPCR", 16, 0), - MHI_CHANNEL_CONFIG_DL(21, "IPCR", 16, 0), - MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0", 128, 2), - MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0", 128, 3), + MHI_CHANNEL_CONFIG_UL(4, "DIAG", 32, 0), + MHI_CHANNEL_CONFIG_DL(5, "DIAG", 32, 0), + MHI_CHANNEL_CONFIG_UL(12, "MBIM", 32, 0), + MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0), + MHI_CHANNEL_CONFIG_UL(14, "QMI", 32, 0), + MHI_CHANNEL_CONFIG_DL(15, "QMI", 32, 0), + MHI_CHANNEL_CONFIG_UL(20, "IPCR", 32, 0), + MHI_CHANNEL_CONFIG_DL(21, "IPCR", 32, 0), + MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0", 128, 1), + MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0", 128, 2), + MHI_CHANNEL_CONFIG_HW_DL(102, "ADPL", 128, 3), }; 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 */ - MHI_EVENT_CONFIG_DATA(1), /* Hardware channels request dedicated hardware event rings */ - MHI_EVENT_CONFIG_HW_DATA(2, 100), - MHI_EVENT_CONFIG_HW_DATA(3, 101) + MHI_EVENT_CONFIG_HW_DATA(1, 100), + MHI_EVENT_CONFIG_HW_DATA(2, 101), + MHI_EVENT_CONFIG_HW_DATA(3, 102), }; static struct mhi_controller_config modem_qcom_v1_mhiv_config = { diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c index ea3f704dda0e..d6264e803198 100644 --- a/drivers/net/mhi_net.c +++ b/drivers/net/mhi_net.c @@ -349,7 +349,7 @@ static int mhi_net_probe(struct mhi_device *mhi_dev, goto out_err; /* Number of transfer descriptors determines size of the queue */ - mhi_netdev->rx_queue_sz = mhi_get_free_desc_count(mhi_dev, DMA_FROM_DEVICE); + mhi_netdev->rx_queue_sz = 96; err = register_netdev(ndev); if (err) -- cgit v1.2.3