qualcommax: qca_ppe: gate switch-fabric TX-MAC across carrier flaps

target/linux/generic/pending-6.12/770-04-net-pcs-implement-Firmware-node-support-for-PCS-driv.patch

@@ -56,7 +56,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  menu "PCS device drivers"
 
 +config FWNODE_PCS
-+	bool "PCS Firmware Node"
++	tristate
 +	depends on (ACPI || OF)
 +	depends on PHYLINK
 +	help

target/linux/generic/pending-6.18/737-04-net-pcs-implement-Firmware-node-support-for-PCS-driv.patch

@@ -56,7 +56,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
  menu "PCS device drivers"
 
 +config FWNODE_PCS
-+	bool "PCS Firmware Node"
++	tristate
 +	depends on (ACPI || OF)
 +	depends on PHYLINK
 +	help

target/linux/qualcommax/Makefile

@@ -14,7 +14,7 @@ include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += \
 	kmod-usb3 kmod-usb-dwc3 kmod-usb-dwc3-qcom \
 	kmod-leds-gpio kmod-gpio-button-hotplug \
-	kmod-qca-nss-dp kmod-ath11k-ahb \
+	kmod-ath11k-ahb \
 	wpad-basic-mbedtls uboot-envtools \
 	e2fsprogs kmod-fs-ext4 losetup
 

target/linux/qualcommax/config-6.12

@@ -153,6 +153,7 @@ CONFIG_FS_IOMAP=y
 CONFIG_FUNCTION_ALIGNMENT=4
 CONFIG_FUNCTION_ALIGNMENT_4B=y
 CONFIG_FWNODE_MDIO=y
+CONFIG_FWNODE_PCS=y
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_FW_LOADER_SYSFS=y
 CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y
@@ -191,6 +192,7 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_WATCHDOG=y
 # CONFIG_GPIO_WATCHDOG_ARCH_INITCALL is not set
+CONFIG_GRO_CELLS=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
@@ -281,6 +283,9 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NET_DEVLINK=y
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_TAG_OOB=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NET_INGRESS=y
@@ -327,10 +332,12 @@ CONFIG_PCIE_QCOM_COMMON=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_MSI=y
+CONFIG_PCS_QCA_UNIPHY=y
 CONFIG_PER_VMA_LOCK=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYLIB=y
 CONFIG_PHYLIB_LEDS=y
+CONFIG_PHYLINK=y
 CONFIG_PHYS_ADDR_T_64BIT=y
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 # CONFIG_PHY_QCOM_EDP is not set
@@ -402,6 +409,7 @@ CONFIG_QCA807X_PHY=y
 CONFIG_QCA808X_PHY=y
 # CONFIG_QCM_DISPCC_2290 is not set
 # CONFIG_QCM_GCC_2290 is not set
+# CONFIG_QCOM_80211AX_PPE is not set
 # CONFIG_QCOM_A53PLL is not set
 # CONFIG_QCOM_AOSS_QMP is not set
 CONFIG_QCOM_APCS_IPC=y
@@ -414,6 +422,7 @@ CONFIG_QCOM_BAM_DMA=y
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_CPUCP_MBOX is not set
 # CONFIG_QCOM_EBI2 is not set
+# CONFIG_QCOM_EDMA is not set
 # CONFIG_QCOM_FASTRPC is not set
 # CONFIG_QCOM_GENI_SE is not set
 # CONFIG_QCOM_GSBI is not set
@@ -533,6 +542,7 @@ CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SGL_ALLOC=y
 CONFIG_SG_POOL=y
+CONFIG_SKB_EXTENSIONS=y
 CONFIG_SMP=y
 # CONFIG_SM_CAMCC_4450 is not set
 # CONFIG_SM_CAMCC_6350 is not set

target/linux/qualcommax/dts/ipq5018-ax6000.dts

@@ -12,7 +12,7 @@
 	compatible = "xiaomi,ax6000", "qcom,ipq5018";
 
 	aliases {
-		label-mac-device = &dp1;
+		label-mac-device = &gmac0;
 		led-boot = &led_system_blue;
 		led-failsafe = &led_system_yellow;
 		led-running = &led_system_blue;
@@ -225,11 +225,11 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
-					mac_addr_dp1: macaddr@0 {
+					mac_addr_gmac0: macaddr@0 {
 						reg = <0x0 0x6>;
 					};
 
-					mac_addr_dp2: macaddr@6 {
+					mac_addr_gmac1: macaddr@6 {
 						reg = <0x6 0x6>;
 					};
 
@@ -292,45 +292,31 @@
 * =================================================================
 */
 
-&switch {
+&uniphy0 {
 	status = "okay";
 
-	switch_mac_mode = <MAC_MODE_SGMII_CHANNEL0>;
-
-	qcom,port_phyinfo {
-		// MAC0 -> GE Phy --- MDI --- QCA8337 Switch
-		port@1 {
-			port_id = <1>;
-			mdiobus = <&mdio0>;
-			phy_address = <7>;
-			phy_dac = <0x10 0x10>;
-		};
-
-		// MAC1 -> Uniphy --- SGMII --- QCA8081
-		port@2 {
-			port_id = <2>;
-			mdiobus = <&mdio1>;
-			phy_address = <8>;
-			port_mac_sel = "QGMAC_PORT";
-		};
-	};
+	assigned-clocks = <&uniphy0 UNIPHY_CLK_REF>;
+	assigned-clock-rates = <UNIPHY_REFCLK_50MHZ>;
 };
 
 // MAC0 -> GE Phy
-&dp1 {
+&gmac0 {
 	status = "okay";
 
-	nvmem-cells = <&mac_addr_dp1 0>;
+	nvmem-cells = <&mac_addr_gmac0 0>;
 	nvmem-cell-names = "mac-address";
 };
 
-// MAC1 ---SGMII---> QCA8081
-&dp2 {
+// MAC1 --- SGMII+ ---> QCA8081
+&gmac1 {
 	status = "okay";
 
-	label = "wan";
 	phy-handle = <&qca8081>;
-	nvmem-cells = <&mac_addr_dp2 0>;
+	phy-mode = "2500base-x";
+
+	label = "wan";
+
+	nvmem-cells = <&mac_addr_gmac1 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -455,7 +441,7 @@
 				reg = <4>;
 				phy-handle = <&qca8337_3>;
 				phy-mode = "gmii";
-				ethernet = <&dp1>;
+				ethernet = <&gmac0>;
 			};
 		};
 	};