projects / openwrt / staging / nbd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed69356)
kernel: qca-ssdk: update 12.5 to 2024-06-13
authorKristian Skramstad <kristian+github@83.no>
Fri, 21 Jun 2024 22:00:15 +0000 (00:00 +0200)
committerRobert Marko <robimarko@gmail.com>
Sun, 23 Jun 2024 15:42:17 +0000 (17:42 +0200)
There are some new commits, so refresh and update patches.
Some build warnings have been fixed upstream too.

Add backport target/linux/generic/backport-6.6/722-v6.10-dt-bindings-arm-qcom-ids-Add-SoC-ID-for-IPQ5321.patch.

Removed upstream:
[-] qca-ssdk/patches/101-hsl_phy-add-support-for-detection-PSGMII-PHY-mode.patch
[-] qca-ssdk/patches/201-fix-compile-warnings.patch

List of changes:
2024-04-16  -c451136b-  qca-ssdk: strip MRPPE code
2024-06-05  -f455a820-  [qca-ssdk]: fix enum-int-mismatch warnings
2024-05-31  -bbfc0fa9-  Merge "[qca-ssdk]: update eee status of phydev"
2024-05-31  -adbe9dc5-  Merge "[qca-ssdk]: support psgmii and uqsxgmii mode of kernel"
2024-05-31  -d06ca777-  Merge "[qca-ssdk]: fix 5G issue with the AQR FW that use 5gbaser for 5G speed"
2024-05-31  -c6f539a5-  Merge "qca-ssdk: support mrppe pktedit padding functions"
2024-04-29  -c321e2a9-  qca-ssdk: support mrppe pktedit padding functions
2024-05-24  -ee6e201e-  qca-ssdk: Fix the big endian compile error
2024-05-15  -8c116bb9-  [qca-ssdk]: update eee status of phydev
2024-05-20  -f0341a2c-  Merge "qca-ssdk: Enable igmp for PPE MINI profile"
2024-05-16  -44a0ce93-  qca-ssdk: Enable igmp for PPE MINI profile
2024-05-15  -8b91bbf6-  [qca-ssdk]: support psgmii and uqsxgmii mode of kernel
2024-05-14  -7eec1658-  [qca-ssdk]: fix 5G issue with the AQR FW that use 5gbaser for 5G speed
2024-05-12  -b9f5ea0e-  [qca-ssdk]: ethtool support, do not change wake-up timer when the requested timer is 0
2024-05-09  -5e2c15ed-  Merge "[qca-ssdk]: remove check when mht clock enable"
2024-05-09  -a1563b90-  Merge "[qca-ssdk] support new sku IPQ5321"
2024-04-23  -f04b7680-  [qca-ssdk]: show unknown status when link down
2024-03-22  -33b91b30-  [qca-ssdk]: remove check when mht clock enable
2024-04-29  -b6362f2b-  Merge "qca-ssdk:fix bug in marina nptv6 iid cal"
2024-04-29  -097033ae-  Merge "[qca-ssdk] support cypress uniphy0 connecting MHT switch port0"
2024-04-24  -d45560fd-  qca-ssdk:fix bug in marina nptv6 iid cal
2024-04-24  -7d7a42af-  qca-ssdk: enable policer counter on low memory profile
2024-04-18  -e36cf6ea-  Merge "[qca-ssdk]: change portvlan egress mode initial value as untouched"
2024-04-18  -27817881-  Merge "[qca-ssdk]: update the aqr phy supported ability"
2024-04-18  -5a3a693c-  Merge "qca-ssdk:support marina nptv6"
2024-04-16  -129fe9b3-  Merge "qca-ssdk: support tunnel fields and innner fields inverse"
2024-01-09  -fc8f6abd-  qca-ssdk:support marina nptv6

Signed-off-by: Kristian Skramstad <kristian+github@83.no>
Link: https://github.com/openwrt/openwrt/pull/15771
Signed-off-by: Robert Marko <robimarko@gmail.com>
package/kernel/qca-ssdk/Makefile patch | blob | history
package/kernel/qca-ssdk/patches/101-hsl_phy-add-support-for-detection-PSGMII-PHY-mode.patch [deleted file] patch | blob | history
package/kernel/qca-ssdk/patches/200-allow-parallel-build.patch patch | blob | history
package/kernel/qca-ssdk/patches/201-fix-compile-warnings.patch [deleted file] patch | blob | history
target/linux/generic/backport-6.6/722-v6.10-dt-bindings-arm-qcom-ids-Add-SoC-ID-for-IPQ5321.patch [new file with mode: 0644] patch | blob

diff --git a/package/kernel/qca-ssdk/Makefile b/package/kernel/qca-ssdk/Makefile
index de262e6578a5ff264debe94903ec7c6ad59d5663..9c5d4925b88e08f3a1eb28ac434f1715dadca59d 100644 (file)
--- a/package/kernel/qca-ssdk/Makefile
+++ b/package/kernel/qca-ssdk/Makefile
@@ -1,13 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qca-ssdk
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=https://git.codelinaro.org/clo/qsdk/oss/lklm/qca-ssdk.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2024-04-17
-PKG_SOURCE_VERSION:=3d060f7ad70d087f6b0452abe79ab6d042e8cd53
-PKG_MIRROR_HASH:=6f5e390b294e699491584094f5d7eb941de6237ad8c5320191e9e306fbcd8eb5
+PKG_SOURCE_DATE:=2024-06-13
+PKG_SOURCE_VERSION:=c451136ba69d51d60f770365b6d6d60ff2801998
+PKG_MIRROR_HASH:=4c54f2d77b5abeb96bddceb4a9eb58aa2c8fb12b58d5d666196224a35ac107dc
 
 PKG_FLAGS:=nonshared
 PKG_BUILD_PARALLEL:=1
diff --git a/package/kernel/qca-ssdk/patches/101-hsl_phy-add-support-for-detection-PSGMII-PHY-mode.patch b/package/kernel/qca-ssdk/patches/101-hsl_phy-add-support-for-detection-PSGMII-PHY-mode.patch
deleted file mode 100644 (file)
index 9d02899..0000000
--- a/package/kernel/qca-ssdk/patches/101-hsl_phy-add-support-for-detection-PSGMII-PHY-mode.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e3763fd77e41b2f2495672c6a5898d69892fbf9f Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth@gmail.com>
-Date: Wed, 15 Nov 2023 00:57:41 +0100
-Subject: [PATCH] hsl_phy: add support for detection PSGMII PHY mode
-
-Add support for detection of PSGMII PHY mode to correctly detect qca807x
-PHY upstream driver.
-
-Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
----
- src/hsl/phy/hsl_phy.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/src/hsl/phy/hsl_phy.c
-+++ b/src/hsl/phy/hsl_phy.c
-@@ -1322,6 +1322,9 @@ hsl_port_phydev_interface_mode_status_ge
-               case PHY_INTERFACE_MODE_10GKR:
-                       *interface_mode_status = PORT_10GBASE_R;
-                       break;
-+              case PHY_INTERFACE_MODE_PSGMII:
-+                      *interface_mode_status = PHY_PSGMII_BASET;
-+                      break;
-               case PHY_INTERFACE_MODE_QSGMII:
-                       *interface_mode_status = PORT_QSGMII;
-                       break;
diff --git a/package/kernel/qca-ssdk/patches/200-allow-parallel-build.patch b/package/kernel/qca-ssdk/patches/200-allow-parallel-build.patch
index 6c28e0ff2ebd6849e548a56875e41ecc638616b6..2a3735a7361f4f4c3bad8400e80c81be6e4e80b2 100644 (file)
--- a/package/kernel/qca-ssdk/patches/200-allow-parallel-build.patch
+++ b/package/kernel/qca-ssdk/patches/200-allow-parallel-build.patch
@@ -40,7 +40,7 @@
  kslib_c:
 --- a/make/linux_opt.mk
 +++ b/make/linux_opt.mk
-@@ -778,6 +778,6 @@ LOCAL_CFLAGS += $(CPU_CFLAG) -D"KBUILD_M
+@@ -782,6 +782,6 @@ LOCAL_CFLAGS += $(CPU_CFLAG) -D"KBUILD_M
  ####################################################################
  #                     cflags for LNX Modules-Style Makefile
  ####################################################################
diff --git a/package/kernel/qca-ssdk/patches/201-fix-compile-warnings.patch b/package/kernel/qca-ssdk/patches/201-fix-compile-warnings.patch
deleted file mode 100644 (file)
index 5b57f41..0000000
--- a/package/kernel/qca-ssdk/patches/201-fix-compile-warnings.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/fal/fal_port_ctrl.c
-+++ b/src/fal/fal_port_ctrl.c
-@@ -2089,7 +2089,7 @@ fal_port_hibernate_get (a_uint32_t dev_i
-  */
- sw_error_t
- fal_port_cdt (a_uint32_t dev_id, fal_port_t port_id, a_uint32_t mdi_pair,
--            a_uint32_t * cable_status, a_uint32_t * cable_len)
-+            fal_cable_status_t * cable_status, a_uint32_t * cable_len)
- {
-   sw_error_t rv;
- 
---- a/src/fal/fal_portvlan.c
-+++ b/src/fal/fal_portvlan.c
-@@ -2173,7 +2173,7 @@ fal_netisolate_get(a_uint32_t dev_id, a_
-  * @return SW_OK or error code
-  */
- sw_error_t
--fal_eg_trans_filter_bypass_en_set(a_uint32_t dev_id, a_bool_t enable)
-+fal_eg_trans_filter_bypass_en_set(a_uint32_t dev_id, a_uint32_t enable)
- {
-     sw_error_t rv;
- 
-@@ -2190,7 +2190,7 @@ fal_eg_trans_filter_bypass_en_set(a_uint
-  * @return SW_OK or error code
-  */
- sw_error_t
--fal_eg_trans_filter_bypass_en_get(a_uint32_t dev_id, a_bool_t* enable)
-+fal_eg_trans_filter_bypass_en_get(a_uint32_t dev_id, a_uint32_t* enable)
- {
-     sw_error_t rv;
- 
diff --git a/target/linux/generic/backport-6.6/722-v6.10-dt-bindings-arm-qcom-ids-Add-SoC-ID-for-IPQ5321.patch b/target/linux/generic/backport-6.6/722-v6.10-dt-bindings-arm-qcom-ids-Add-SoC-ID-for-IPQ5321.patch
new file mode 100644 (file)
index 0000000..b05648a
--- /dev/null
+++ b/target/linux/generic/backport-6.6/722-v6.10-dt-bindings-arm-qcom-ids-Add-SoC-ID-for-IPQ5321.patch
@@ -0,0 +1,28 @@
+From 27c42e925323b975a64429e313b0cf5c0c02a411 Mon Sep 17 00:00:00 2001
+From: Kathiravan Thirumoorthy <quic_kathirav@quicinc.com>
+Date: Mon, 25 Mar 2024 21:19:48 +0530
+Subject: dt-bindings: arm: qcom,ids: Add SoC ID for IPQ5321
+
+Add the ID for the Qualcomm IPQ5321 SoC.
+
+Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
+Signed-off-by: Kathiravan Thirumoorthy <quic_kathirav@quicinc.com>
+Link: https://lore.kernel.org/r/20240325-ipq5321-sku-support-v2-1-f30ce244732f@quicinc.com
+Signed-off-by: Bjorn Andersson <andersson@kernel.org>
+---
+ include/dt-bindings/arm/qcom,ids.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+(limited to 'include/dt-bindings/arm/qcom,ids.h')
+
+--- a/include/dt-bindings/arm/qcom,ids.h
++++ b/include/dt-bindings/arm/qcom,ids.h
+@@ -260,6 +260,7 @@
+ #define QCOM_ID_IPQ5312                       594
+ #define QCOM_ID_IPQ5302                       595
+ #define QCOM_ID_IPQ5300                       624
++#define QCOM_ID_IPQ5321                       650
+ 
+ /*
+  * The board type and revision information, used by Qualcomm bootloaders and
Felix Fietkaus staging tree