From patchwork Mon Oct 31 16:45:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, M Chetan" X-Patchwork-Id: 13026118 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A69D1FA3741 for ; Mon, 31 Oct 2022 16:46:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231381AbiJaQqB (ORCPT ); Mon, 31 Oct 2022 12:46:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231419AbiJaQqA (ORCPT ); Mon, 31 Oct 2022 12:46:00 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D45BE12627 for ; Mon, 31 Oct 2022 09:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667234759; x=1698770759; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6bC4kh1lmby4YdGGRv2xpkD8AhDbBOird6TACXnsh1Y=; b=RZQfNssv/PncOZWdlFbEb4LILhvf67DbChy+YaGRGwKsC2uKNUN9yqKj h7mmcU9yS/NOquNP0byB+tXiF4Be1bBHgZcO+SR4yN0eANPbNKwWrq2oz VcHKYd/j1LQq3G46B+RbNztcIhw8NgxsnrbSB8pbpXwBfDWuTQXWYQ3YO 4xQLMjY/Xm6deigtfmHuuGzvqdxVBkz8FK0YBfDOo0GGp1eqxMomcEcv2 E/E02YTcAV9emNxgkyjBSLosOlrVkQfxB5WNdDI/csP8+Tu8bJJkPfDDB vI06GmpXt8hLTsDMAwhUxSWKbI3JstlLr8QRj1ZojVT3QZN18MBsH79Xz A==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="335607978" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="335607978" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 09:45:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="739018634" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="739018634" Received: from bswcg005.iind.intel.com ([10.224.174.25]) by fmsmga002.fm.intel.com with ESMTP; 31 Oct 2022 09:45:56 -0700 From: m.chetan.kumar@linux.intel.com To: netdev@vger.kernel.org Cc: kuba@kernel.org, davem@davemloft.net, johannes@sipsolutions.net, ryazanov.s.a@gmail.com, loic.poulain@linaro.org, linuxwwan@intel.com, M Chetan Kumar Subject: [PATCH net 1/3] net: wwan: iosm: fix memory leak in ipc_pcie_read_bios_cfg Date: Mon, 31 Oct 2022 22:15:19 +0530 Message-Id: <20221031164519.1886836-1-m.chetan.kumar@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: M Chetan Kumar ipc_pcie_read_bios_cfg() is using the acpi_evaluate_dsm() to obtain the wwan power state configuration from BIOS but is not freeing the acpi_object. The acpi_evaluate_dsm() returned acpi_object to be freed. Free the acpi_object after use. Fixes: 7e98d785ae61 ("net: iosm: entry point") Signed-off-by: M Chetan Kumar --- drivers/net/wwan/iosm/iosm_ipc_pcie.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/wwan/iosm/iosm_ipc_pcie.c b/drivers/net/wwan/iosm/iosm_ipc_pcie.c index 31f57b986df2..97cb6846c6ae 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_pcie.c +++ b/drivers/net/wwan/iosm/iosm_ipc_pcie.c @@ -232,6 +232,7 @@ static void ipc_pcie_config_init(struct iosm_pcie *ipc_pcie) */ static enum ipc_pcie_sleep_state ipc_pcie_read_bios_cfg(struct device *dev) { + enum ipc_pcie_sleep_state sleep_state = IPC_PCIE_D0L12; union acpi_object *object; acpi_handle handle_acpi; @@ -242,12 +243,16 @@ static enum ipc_pcie_sleep_state ipc_pcie_read_bios_cfg(struct device *dev) } object = acpi_evaluate_dsm(handle_acpi, &wwan_acpi_guid, 0, 3, NULL); + if (!object) + goto default_ret; + + if (object->integer.value == 3) + sleep_state = IPC_PCIE_D3L2; - if (object && object->integer.value == 3) - return IPC_PCIE_D3L2; + kfree(object); default_ret: - return IPC_PCIE_D0L12; + return sleep_state; } static int ipc_pcie_probe(struct pci_dev *pci, From patchwork Mon Oct 31 16:45:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, M Chetan" X-Patchwork-Id: 13026119 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E508FA3741 for ; Mon, 31 Oct 2022 16:46:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231536AbiJaQqR (ORCPT ); Mon, 31 Oct 2022 12:46:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231502AbiJaQqO (ORCPT ); Mon, 31 Oct 2022 12:46:14 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EA55DFFD for ; Mon, 31 Oct 2022 09:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667234773; x=1698770773; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=nhSouzbrR031lTI8PtEdLzUltFGdhGxt77jzZWnbAWU=; b=ZLN347b8Mvhmp1tJLkg5jolOvxFKV+PxgpstLTxikxG5dFr5MmmEv2pQ VwzY2shs65HPQxctnpAC3iVPZfrkPXcligDx8J28/RsPYzgSz3WwwBAjJ yy6+SJwC8j/Hs7djFcAoMBiv3vCsx061Atn+eKHffyKXcrqZWLe/nOqPR +zB3eliDWVtVfXK6qZpvfy/0/olKxY/Bg0yPDa90QIPdAQyyE90guVJtQ IOPZeYJj2fJE77egGoYFY3nEiOLSbYka/HvpWUxZ35CzHpnusVwHjautf 6kJBy5oOdNnzUP5jY57Zuv+qlUrYez/+T1PGY8BZ/os8SQ1jWt16fBqHF A==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="292241361" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="292241361" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 09:46:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="702583336" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="702583336" Received: from bswcg005.iind.intel.com ([10.224.174.25]) by fmsmga004.fm.intel.com with ESMTP; 31 Oct 2022 09:46:10 -0700 From: m.chetan.kumar@linux.intel.com To: netdev@vger.kernel.org Cc: kuba@kernel.org, davem@davemloft.net, johannes@sipsolutions.net, ryazanov.s.a@gmail.com, loic.poulain@linaro.org, linuxwwan@intel.com, M Chetan Kumar Subject: [PATCH net 2/3] net: wwan: iosm: fix driver not working with INTEL_IOMMU disabled Date: Mon, 31 Oct 2022 22:15:47 +0530 Message-Id: <20221031164547.1886851-1-m.chetan.kumar@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: M Chetan Kumar With INTEL_IOMMU disable config or by forcing intel_iommu=off from grub some of the features of IOSM driver like browsing, flashing & coredump collection is not working. When driver calls DMA API - dma_map_single() for tx transfers. It is resulting in dma mapping error. Set the device DMA addressing capabilities using dma_set_mask() and remove the INTEL_IOMMU dependency in kconfig so that driver follows the platform config either INTEL_IOMMU enable or disable. Fixes: f7af616c632e ("net: iosm: infrastructure") Signed-off-by: M Chetan Kumar --- drivers/net/wwan/Kconfig | 1 - drivers/net/wwan/iosm/iosm_ipc_pcie.c | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/wwan/Kconfig b/drivers/net/wwan/Kconfig index 3486ffe94ac4..58e1eb4cf45c 100644 --- a/drivers/net/wwan/Kconfig +++ b/drivers/net/wwan/Kconfig @@ -94,7 +94,6 @@ config RPMSG_WWAN_CTRL config IOSM tristate "IOSM Driver for Intel M.2 WWAN Device" - depends on INTEL_IOMMU select NET_DEVLINK select RELAY if WWAN_DEBUGFS help diff --git a/drivers/net/wwan/iosm/iosm_ipc_pcie.c b/drivers/net/wwan/iosm/iosm_ipc_pcie.c index 97cb6846c6ae..d3d34d1c4704 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_pcie.c +++ b/drivers/net/wwan/iosm/iosm_ipc_pcie.c @@ -259,6 +259,7 @@ static int ipc_pcie_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) { struct iosm_pcie *ipc_pcie = kzalloc(sizeof(*ipc_pcie), GFP_KERNEL); + int ret; pr_debug("Probing device 0x%X from the vendor 0x%X", pci_id->device, pci_id->vendor); @@ -291,6 +292,12 @@ static int ipc_pcie_probe(struct pci_dev *pci, goto pci_enable_fail; } + ret = dma_set_mask(ipc_pcie->dev, DMA_BIT_MASK(64)); + if (ret) { + dev_err(ipc_pcie->dev, "Could not set PCI DMA mask: %d", ret); + return ret; + } + ipc_pcie_config_aspm(ipc_pcie); dev_dbg(ipc_pcie->dev, "PCIe device enabled."); From patchwork Mon Oct 31 16:46:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kumar, M Chetan" X-Patchwork-Id: 13026120 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32432FA3741 for ; Mon, 31 Oct 2022 16:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231487AbiJaQq1 (ORCPT ); Mon, 31 Oct 2022 12:46:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231558AbiJaQqZ (ORCPT ); Mon, 31 Oct 2022 12:46:25 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45426E00C for ; Mon, 31 Oct 2022 09:46:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667234784; x=1698770784; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=x/mWy1AVoeDYgDyRuNiLaXX6h6GN2w8sNbiq6fwRA4c=; b=gOokDu1OXNdAmUa6L/eIWl8Hk+lTxd+7JZnRTaD5NPMMNapSHL+BwZ4j xw3WNd09/wszTdxUPy+aAigMKl4gHuHthHZh88XiQiYe8SLw5e/McfRgL a+1Dmg9gg96vrC5Pzw9SZh1LQCiFgUgku5A81IAyk845X96bH5YaIr8ZV uSjc9kSk/RleMUndFb9erztCyAi2C08I9k7oCmsFNqfcKnCbOWEG4a0qv F31ZyN/Kw/zthOUo7gdyVRJsgvU7SdTlvOZQjf3avQNPguFbORdigwXd5 uLIs09Pjx1PNEbuADf861pSuiEUAOz9g2OHLGFexpCl9JzA9RMQb4Uvw1 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="289337201" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="289337201" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 09:46:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="702583376" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="702583376" Received: from bswcg005.iind.intel.com ([10.224.174.25]) by fmsmga004.fm.intel.com with ESMTP; 31 Oct 2022 09:46:21 -0700 From: m.chetan.kumar@linux.intel.com To: netdev@vger.kernel.org Cc: kuba@kernel.org, davem@davemloft.net, johannes@sipsolutions.net, ryazanov.s.a@gmail.com, loic.poulain@linaro.org, linuxwwan@intel.com, M Chetan Kumar Subject: [PATCH net 3/3] net: wwan: iosm: fix invalid mux header type Date: Mon, 31 Oct 2022 22:16:00 +0530 Message-Id: <20221031164600.1886866-1-m.chetan.kumar@linux.intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: M Chetan Kumar Data stall seen during peak DL throughput test & packets are dropped by mux layer due to invalid header type in datagram. During initlization Mux aggregration protocol is set to default UL/DL size and TD count of Mux lite protocol. This configuration mismatch between device and driver is resulting in data stall/packet drops. Override the UL/DL size and TD count for Mux aggregation protocol. Fixes: 1f52d7b62285 ("net: wwan: iosm: Enable M.2 7360 WWAN card support") Signed-off-by: M Chetan Kumar --- drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 8 ++++++++ drivers/net/wwan/iosm/iosm_ipc_mux.h | 1 + 2 files changed, 9 insertions(+) diff --git a/drivers/net/wwan/iosm/iosm_ipc_imem_ops.c b/drivers/net/wwan/iosm/iosm_ipc_imem_ops.c index b7f9237dedf7..66b90cc4c346 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_imem_ops.c +++ b/drivers/net/wwan/iosm/iosm_ipc_imem_ops.c @@ -91,6 +91,14 @@ void ipc_imem_wwan_channel_init(struct iosm_imem *ipc_imem, } ipc_chnl_cfg_get(&chnl_cfg, ipc_imem->nr_of_channels); + + if (ipc_imem->mmio->mux_protocol == MUX_AGGREGATION && + ipc_imem->nr_of_channels == IPC_MEM_IP_CHL_ID_0) { + chnl_cfg.ul_nr_of_entries = IPC_MEM_MAX_TDS_MUX_AGGR_UL; + chnl_cfg.dl_nr_of_entries = IPC_MEM_MAX_TDS_MUX_AGGR_DL; + chnl_cfg.dl_buf_size = IPC_MEM_MAX_ADB_BUF_SIZE; + } + ipc_imem_channel_init(ipc_imem, IPC_CTYPE_WWAN, chnl_cfg, IRQ_MOD_OFF); diff --git a/drivers/net/wwan/iosm/iosm_ipc_mux.h b/drivers/net/wwan/iosm/iosm_ipc_mux.h index cd9d74cc097f..9968bb885c1f 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_mux.h +++ b/drivers/net/wwan/iosm/iosm_ipc_mux.h @@ -10,6 +10,7 @@ #define IPC_MEM_MAX_UL_DG_ENTRIES 100 #define IPC_MEM_MAX_TDS_MUX_AGGR_UL 60 +#define IPC_MEM_MAX_TDS_MUX_AGGR_DL 60 #define IPC_MEM_MAX_ADB_BUF_SIZE (16 * 1024) #define IPC_MEM_MAX_UL_ADB_BUF_SIZE IPC_MEM_MAX_ADB_BUF_SIZE