From 23d5aaaf3fb092d605ad40beea3585aac63250ee Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Fri, 9 Aug 2024 01:42:04 -0400 Subject: [PATCH] nss-drv: cleanup and refresh patches Signed-off-by: Sean Khan --- .../patches-11.4/0018-nss-drv-more-uniform-kernel-msg.patch | 2 +- .../patches-11.4/0022-nss-drv-display-fw-version.patch | 6 +++--- qca-nss-drv/patches/0022-nss-drv-limit-fw-12.2.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qca-nss-drv/patches-11.4/0018-nss-drv-more-uniform-kernel-msg.patch b/qca-nss-drv/patches-11.4/0018-nss-drv-more-uniform-kernel-msg.patch index fa42da5..7dbc046 100644 --- a/qca-nss-drv/patches-11.4/0018-nss-drv-more-uniform-kernel-msg.patch +++ b/qca-nss-drv/patches-11.4/0018-nss-drv-more-uniform-kernel-msg.patch @@ -82,7 +82,7 @@ } - nss_info("nss_driver - fw of size %d bytes copied to load addr: %x, nss_id : %d\n", (int)nss_fw->size, npd->load_addr, nss_dev->id); -+ dev_info(&nss_dev->dev, "fw of size %d bytes copied to addr: %x, nss_id: %d\n", (int)nss_fw->size, npd->load_addr, nss_ctx->id); ++ dev_info(&nss_dev->dev, "fw of size %d bytes copied to addr: %x, nss_id: %d", (int)nss_fw->size, npd->load_addr, nss_ctx->id); memcpy_toio(load_mem, nss_fw->data, nss_fw->size); release_firmware(nss_fw); iounmap(load_mem); diff --git a/qca-nss-drv/patches-11.4/0022-nss-drv-display-fw-version.patch b/qca-nss-drv/patches-11.4/0022-nss-drv-display-fw-version.patch index 1b4e4f4..8ad2326 100644 --- a/qca-nss-drv/patches-11.4/0022-nss-drv-display-fw-version.patch +++ b/qca-nss-drv/patches-11.4/0022-nss-drv-display-fw-version.patch @@ -49,13 +49,13 @@ + } + version[i] = '\0'; + -+ dev_info(&nss_dev->dev, "NSS FW Version: %s\n", version); ++ dev_info(&nss_dev->dev, "NSS FW Version: %s", version); + found = true; + } + } + + if (!found) { -+ dev_err(&nss_dev->dev, "Unable to get NSS FW version\n"); ++ dev_err(&nss_dev->dev, "Unable to get NSS FW version"); + return -EINVAL; + } + @@ -73,6 +73,6 @@ + nss_hal_firmware_info(nss_dev, nss_fw); + } + - dev_info(&nss_dev->dev, "fw of size %d bytes copied to addr: %x, nss_id: %d\n", (int)nss_fw->size, npd->load_addr, nss_ctx->id); + dev_info(&nss_dev->dev, "fw of size %d bytes copied to addr: %x, nss_id: %d", (int)nss_fw->size, npd->load_addr, nss_ctx->id); memcpy_toio(load_mem, nss_fw->data, nss_fw->size); release_firmware(nss_fw); diff --git a/qca-nss-drv/patches/0022-nss-drv-limit-fw-12.2.patch b/qca-nss-drv/patches/0022-nss-drv-limit-fw-12.2.patch index 8aff8b4..a624689 100644 --- a/qca-nss-drv/patches/0022-nss-drv-limit-fw-12.2.patch +++ b/qca-nss-drv/patches/0022-nss-drv-limit-fw-12.2.patch @@ -95,7 +95,7 @@ --- a/exports/nss_wifili_if.h +++ b/exports/nss_wifili_if.h -@@ -1496,8 +1496,10 @@ struct nss_wifili_rx_ctrl_stats { +@@ -1444,8 +1444,10 @@ struct nss_wifili_rx_ctrl_stats { uint32_t bcast_rcv_bytes; /**< Total number of broadcast bytes received. */ uint32_t defrag_mcast_drop; /**< Total number of defrag multicast dropped packets. */ uint32_t mcast_3addr_drop; /**< Total number of 3 address multicast dropped packets. */ @@ -106,7 +106,7 @@ }; /** -@@ -1509,8 +1511,10 @@ struct nss_wifili_retry_ctrl_stats { +@@ -1457,8 +1459,10 @@ struct nss_wifili_retry_ctrl_stats { uint32_t tx_retry_count; /**< Transmit retry count. */ uint32_t tx_multiple_retry_count; /**< Transmit multiple retry count. */ uint32_t rx_retry_count; /**< Receive retry count. */