him411/nss-packages-qosmio
1
0
Fork 0
mirror of https://github.com/qosmio/nss-packages.git synced 2025-12-17 16:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

qca-nss-dp: update to QSDK 12.0

Browse Source 
Update qca-nss-dp to QSDK 12.0

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
This commit is contained in:
Ansuel Smith 2022-05-07 19:58:24 +02:00 committed by Robert Marko
parent 275fe3a0b0
commit 27071d79d8
7 changed files with 66 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qca/qca-nss-dp/Makefile
View File

@ -5,9 +5,9 @@ PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-dp.git PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/nss-dp.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-03-26 PKG_SOURCE_DATE:=2022-04-30
PKG_SOURCE_VERSION:=e0c89348d5ad99559ce2fbe15d37b3b5bc66aa03 PKG_SOURCE_VERSION:=72e9ec4187414461cbcf6ccff100e8b5ebe5f40b
PKG_MIRROR_HASH:=f369f0c3b33b5f4ad6d0a6ad6ac5495f63c9ecaf94e4e7fa345169f3e44fcf45 PKG_MIRROR_HASH:=805f16e59c75511132922f97740ebf6bf953845b0bbfd2089c4615456893bb37
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
@ -38,22 +38,16 @@ EXTRA_CFLAGS+= \
NSS_DP_HAL_DIR:=$(PKG_BUILD_DIR)/hal NSS_DP_HAL_DIR:=$(PKG_BUILD_DIR)/hal
define Build/Configure define Build/Configure
$(LN) $(NSS_DP_HAL_DIR)/arch/$(CONFIG_TARGET_BOARD)/nss_$(CONFIG_TARGET_BOARD).h \ $(LN) $(NSS_DP_HAL_DIR)/soc_ops/$(CONFIG_TARGET_BOARD)/nss_$(CONFIG_TARGET_BOARD).h \
$(PKG_BUILD_DIR)/exports/nss_dp_arch.h $(PKG_BUILD_DIR)/exports/nss_dp_arch.h
endef endef
ifeq ($(CONFIG_TARGET_BOARD), "ipq807x")
SOC="ipq807x_64"
else ifeq ($(CONFIG_TARGET_BOARD), "ipq60xx")
SOC="ipq60xx_64"
endif
define Build/Compile define Build/Compile
+$(MAKE) -C "$(LINUX_DIR)" \ +$(MAKE) -C "$(LINUX_DIR)" \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
M="$(PKG_BUILD_DIR)" \ M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" SoC="$(SOC)" \ EXTRA_CFLAGS="$(EXTRA_CFLAGS)" SoC="$(CONFIG_TARGET_BOARD)" \
$(KERNEL_MAKE_FLAGS) \ $(KERNEL_MAKE_FLAGS) \
$(PKG_JOBS) \ $(PKG_JOBS) \
modules modules

24
qca/qca-nss-dp/patches/0001-edma_tx_rx-support-newer-kernels-time-stamping-API.patch
View File

@ -1,15 +1,15 @@
From 40979666b4371012405715ffa61ab5760fcdc6b3 Mon Sep 17 00:00:00 2001 From 40979666b4371012405715ffa61ab5760fcdc6b3 Mon Sep 17 00:00:00 2001
Message-Id: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il> Message-Id: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
From: Baruch Siach <baruch@tkos.co.il> From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 3 May 2021 20:07:36 +0300 Date: Mon, 3 May 2021 20:07:36 +0300
Subject: [PATCH 1/3] edma_tx_rx: support newer kernels time stamping API Subject: [PATCH 1/3] edma_tx_rx: support newer kernels time stamping API
--- ---
hal/edma/edma_tx_rx.c | 11 +++++++++++ hal/dp_ops/edma_dp/edma_v1/edma_tx_rx.c | 11 +++++++++++
1 file changed, 11 insertions(+) 1 file changed, 11 insertions(+)
--- a/hal/edma/edma_tx_rx.c --- a/hal/dp_ops/edma_dp/edma_v1/edma_tx_rx.c
+++ b/hal/edma/edma_tx_rx.c +++ b/hal/dp_ops/edma_dp/edma_v1/edma_tx_rx.c
@@ -226,10 +226,16 @@ void nss_phy_tstamp_rx_buf(__attribute__ @@ -226,10 +226,16 @@ void nss_phy_tstamp_rx_buf(__attribute__
* set to the correct PTP class value by calling ptp_classify_raw * set to the correct PTP class value by calling ptp_classify_raw
* in drv->rxtstamp function. * in drv->rxtstamp function.

32
qca/qca-nss-dp/patches/0002-nss_dp_main-make-phy-mode-code-compatible-with-newer.patch
View File

@ -1,28 +1,28 @@
From cef7873a2d77df13ee702d902ed4e06b2248904b Mon Sep 17 00:00:00 2001 From cef7873a2d77df13ee702d902ed4e06b2248904b Mon Sep 17 00:00:00 2001
Message-Id: <cef7873a2d77df13ee702d902ed4e06b2248904b.1620066716.git.baruch@tkos.co.il> Message-Id: <cef7873a2d77df13ee702d902ed4e06b2248904b.1620066716.git.baruch@tkos.co.il>
In-Reply-To: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il> In-Reply-To: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
References: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il> References: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
From: Baruch Siach <baruch@tkos.co.il> From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 3 May 2021 20:17:22 +0300 Date: Mon, 3 May 2021 20:17:22 +0300
Subject: [PATCH 2/3] nss_dp_main: make phy mode code compatible with newer Subject: [PATCH 2/3] nss_dp_main: make phy mode code compatible with newer
kernels kernels
--- ---
include/nss_dp_dev.h | 4 ++-- include/nss_dp_dev.h | 4 ++--
nss_dp_main.c | 4 ++++ nss_dp_main.c | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-) 2 files changed, 6 insertions(+), 2 deletions(-)
--- a/include/nss_dp_dev.h --- a/include/nss_dp_dev.h
+++ b/include/nss_dp_dev.h +++ b/include/nss_dp_dev.h
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
#include <linux/etherdevice.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/if_vlan.h>
-#include <linux/switch.h> -#include <linux/switch.h>
+#include <linux/phy.h> +#include <linux/phy.h>
#include <linux/version.h>
#include "nss_dp_api_if.h" #include "nss_dp_api_if.h"
#include "nss_dp_hal_if.h"
@@ -46,7 +46,7 @@ struct nss_dp_dev { @@ -46,7 +46,7 @@ struct nss_dp_dev {
/* Phy related stuff */ /* Phy related stuff */
struct phy_device *phydev; /* Phy device */ struct phy_device *phydev; /* Phy device */

42
qca/qca-nss-dp/patches/0003-Drop-_nocache-variants-of-ioremap.patch
View File

@ -1,20 +1,20 @@
From c8c52512ff48bee578901c381a42f027e79eadf9 Mon Sep 17 00:00:00 2001 From c8c52512ff48bee578901c381a42f027e79eadf9 Mon Sep 17 00:00:00 2001
Message-Id: <c8c52512ff48bee578901c381a42f027e79eadf9.1620066716.git.baruch@tkos.co.il> Message-Id: <c8c52512ff48bee578901c381a42f027e79eadf9.1620066716.git.baruch@tkos.co.il>
In-Reply-To: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il> In-Reply-To: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
References: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il> References: <40979666b4371012405715ffa61ab5760fcdc6b3.1620066716.git.baruch@tkos.co.il>
From: Baruch Siach <baruch@tkos.co.il> From: Baruch Siach <baruch@tkos.co.il>
Date: Mon, 3 May 2021 20:20:29 +0300 Date: Mon, 3 May 2021 20:20:29 +0300
Subject: [PATCH 3/3] Drop _nocache variants of ioremap() Subject: [PATCH 3/3] Drop _nocache variants of ioremap()
Recent kernels removed them. Recent kernels removed them.
--- ---
hal/edma/edma_data_plane.c | 2 +- hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c | 2 +-
hal/gmac_hal_ops/qcom/qcom_if.c | 2 +- hal/gmac_ops/qcom/qcom_if.c | 2 +-
hal/gmac_hal_ops/syn/xgmac/syn_if.c | 2 +- hal/gmac_ops/syn/xgmac/syn_if.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-) 3 files changed, 3 insertions(+), 3 deletions(-)
--- a/hal/edma/edma_data_plane.c --- a/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
+++ b/hal/edma/edma_data_plane.c +++ b/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
@@ -797,7 +797,7 @@ int edma_init(void) @@ -797,7 +797,7 @@ int edma_init(void)
/* /*
* Remap register resource * Remap register resource
@ -24,8 +24,8 @@ Recent kernels removed them.
resource_size(edma_hw.reg_resource)); resource_size(edma_hw.reg_resource));
if (!edma_hw.reg_base) { if (!edma_hw.reg_base) {
pr_warn("Unable to remap EDMA register memory.\n"); pr_warn("Unable to remap EDMA register memory.\n");
--- a/hal/gmac_hal_ops/qcom/qcom_if.c --- a/hal/gmac_ops/qcom/qcom_if.c
+++ b/hal/gmac_hal_ops/qcom/qcom_if.c +++ b/hal/gmac_ops/qcom/qcom_if.c
@@ -400,7 +400,7 @@ static void *qcom_init(struct gmac_hal_p @@ -400,7 +400,7 @@ static void *qcom_init(struct gmac_hal_p
qhd->nghd.mac_id = gmacpdata->macid; qhd->nghd.mac_id = gmacpdata->macid;
@ -35,8 +35,8 @@ Recent kernels removed them.
res->start, resource_size(res)); res->start, resource_size(res));
if (!qhd->nghd.mac_base) { if (!qhd->nghd.mac_base) {
netdev_dbg(ndev, "ioremap fail.\n"); netdev_dbg(ndev, "ioremap fail.\n");
--- a/hal/gmac_hal_ops/syn/xgmac/syn_if.c --- a/hal/gmac_ops/syn/xgmac/syn_if.c
+++ b/hal/gmac_hal_ops/syn/xgmac/syn_if.c +++ b/hal/gmac_ops/syn/xgmac/syn_if.c
@@ -422,7 +422,7 @@ static void *syn_init(struct gmac_hal_pl @@ -422,7 +422,7 @@ static void *syn_init(struct gmac_hal_pl
/* Populate the mac base addresses */ /* Populate the mac base addresses */

6
qca/qca-nss-dp/patches/0004-EDMA-Fix-NAPI-packet-counting.patch
View File

@ -9,11 +9,11 @@ cause NAPI over budget warnings.
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com>
--- ---
hal/edma/edma_tx_rx.c | 4 ++-- hal/dp_ops/edma_dp/edma_v1/edma_tx_rx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/hal/edma/edma_tx_rx.c --- a/hal/dp_ops/edma_dp/edma_v1/edma_tx_rx.c
+++ b/hal/edma/edma_tx_rx.c +++ b/hal/dp_ops/edma_dp/edma_v1/edma_tx_rx.c
@@ -458,12 +458,12 @@ int edma_napi(struct napi_struct *napi, @@ -458,12 +458,12 @@ int edma_napi(struct napi_struct *napi,
for (i = 0; i < ehw->txcmpl_rings; i++) { for (i = 0; i < ehw->txcmpl_rings; i++) {

14
qca/qca-nss-dp/patches/0005-EDMA-Use-NAPI_POLL_WEIGHT-as-NAPI-weight.patch
View File

@ -14,12 +14,12 @@ So use NAPI_POLL_WEIGHT as the weight.
Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com>
--- ---
hal/edma/edma_data_plane.c | 2 +- hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c | 2 +-
hal/edma/edma_data_plane.h | 1 - hal/dp_ops/edma_dp/edma_v1/edma_data_plane.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-) 2 files changed, 1 insertion(+), 2 deletions(-)
--- a/hal/edma/edma_data_plane.c --- a/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
+++ b/hal/edma/edma_data_plane.c +++ b/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
@@ -582,7 +582,7 @@ static int edma_register_netdevice(struc @@ -582,7 +582,7 @@ static int edma_register_netdevice(struc
*/ */
if (!edma_hw.napi_added) { if (!edma_hw.napi_added) {
@ -29,13 +29,13 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
/* /*
* Register the interrupt handlers and enable interrupts * Register the interrupt handlers and enable interrupts
*/ */
--- a/hal/edma/edma_data_plane.h --- a/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.h
+++ b/hal/edma/edma_data_plane.h +++ b/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.h
@@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
#define EDMA_RX_PREHDR_SIZE (sizeof(struct edma_rx_preheader)) #define EDMA_RX_PREHDR_SIZE (sizeof(struct edma_rx_preheader))
#define EDMA_TX_PREHDR_SIZE (sizeof(struct edma_tx_preheader)) #define EDMA_TX_PREHDR_SIZE (sizeof(struct edma_tx_preheader))
#define EDMA_RING_SIZE 128 #define EDMA_RING_SIZE 128
-#define EDMA_NAPI_WORK 100 -#define EDMA_NAPI_WORK 100
#define EDMA_START_GMACS NSS_DP_START_IFNUM #define EDMA_START_GMACS NSS_DP_HAL_START_IFNUM
#define EDMA_MAX_GMACS NSS_DP_HAL_MAX_PORTS #define EDMA_MAX_GMACS NSS_DP_HAL_MAX_PORTS
#define EDMA_TX_PKT_MIN_SIZE 33 /* IPQ807x EDMA needs a minimum packet size of 33 bytes */ #define EDMA_TX_PKT_MIN_SIZE 33 /* IPQ807x EDMA needs a minimum packet size of 33 bytes */

4
qca/qca-nss-dp/patches/0009-switchdev-use-new-switchdev-flags.patch
View File

@ -18,8 +18,8 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
+++ b/include/nss_dp_dev.h +++ b/include/nss_dp_dev.h
@@ -26,6 +26,9 @@ @@ -26,6 +26,9 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/if_vlan.h> #include <linux/switch.h>
#include <linux/phy.h> #include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0))
+#include <net/switchdev.h> +#include <net/switchdev.h>
+#endif +#endif