ipq806x: fix issue with missing 'smb208'

target/linux/ipq806x/patches-5.15/990-000-Add-required-entries-in-dts-files-for-NSS-support.patch

@@ -214,9 +214,9 @@
  
 --- a/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi
-@@ -198,10 +198,17 @@
+@@ -283,10 +283,17 @@
- 			0x00094 0x4e        /* PORT6_STATUS */
+ 			};
- 			>;
+ 		};
  	};
 +
 +	phy4: ethernet-phy@4 {
@@ -232,7 +232,7 @@
  
  	phy-mode = "rgmii";
  	qcom,id = <1>;
-@@ -217,6 +224,9 @@
+@@ -302,6 +309,9 @@
  
  &gmac2 {
  	status = "okay";
@@ -244,8 +244,8 @@
  	qcom,id = <2>;
 --- a/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
-@@ -111,18 +111,3 @@
+@@ -105,18 +105,3 @@
- 		reg = <4>;
+ 		reg = <0x5f80000 0x2080000>;
  	};
  };
 -
@@ -265,7 +265,7 @@
 -};
 --- a/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064-ad7200-c2600.dtsi
-@@ -357,6 +357,9 @@
+@@ -439,6 +439,9 @@
  
  &gmac1 {
  	status = "okay";
@@ -275,7 +275,7 @@
  	phy-mode = "rgmii";
  	qcom,id = <1>;
  
-@@ -375,6 +378,9 @@
+@@ -457,6 +460,9 @@
  
  &gmac2 {
  	status = "okay";
@@ -287,7 +287,7 @@
  
 --- a/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
-@@ -274,6 +274,9 @@
+@@ -356,6 +356,9 @@
  
  &gmac1 {
  	status = "okay";
@@ -297,7 +297,7 @@
  	phy-mode = "rgmii";
  	qcom,id = <1>;
  
-@@ -291,6 +294,9 @@
+@@ -373,6 +376,9 @@
  
  &gmac2 {
  	status = "okay";
@@ -309,7 +309,7 @@
  
 --- a/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
-@@ -357,6 +357,9 @@
+@@ -439,6 +439,9 @@
  
  &gmac1 {
  	status = "okay";
@@ -319,7 +319,7 @@
  	phy-mode = "rgmii";
  	qcom,id = <1>;
  
-@@ -374,6 +377,9 @@
+@@ -456,6 +459,9 @@
  
  &gmac2 {
  	status = "okay";
@@ -331,7 +331,7 @@
  
 --- a/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
-@@ -360,6 +360,9 @@
+@@ -442,6 +442,9 @@
  
  &gmac1 {
  	status = "okay";
@@ -341,7 +341,7 @@
  	phy-mode = "rgmii";
  	qcom,id = <1>;
  
-@@ -377,6 +380,9 @@
+@@ -459,6 +462,9 @@
  
  &gmac2 {
  	status = "okay";
@@ -416,9 +416,9 @@
  
  	pinctrl-0 = <&mdio0_pins>;
  	pinctrl-names = "default";
-@@ -170,10 +198,14 @@
+@@ -256,10 +284,14 @@
- 			0x00094 0x4e        /* PORT6_STATUS */
+ 			};
- 			>;
+ 		};
  	};
 +
  };
@@ -431,7 +431,7 @@
  
  	nand@0 {
  		reg = <0>;
-@@ -207,6 +239,7 @@
+@@ -293,6 +325,7 @@
  			qcom,ath10k-calibration-variant = "ASRock-G10";
  		};
  	};
@@ -459,7 +459,7 @@
 + };
 --- a/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8065-nighthawk.dtsi
-@@ -344,14 +344,23 @@
+@@ -404,14 +404,23 @@
  
  &gmac1 {
  	status = "okay";
@@ -484,7 +484,7 @@
  	qcom,irq = <255>;
  	mdiobus = <&mdio0>;
  
-@@ -369,14 +378,23 @@
+@@ -429,14 +438,23 @@
  
  &gmac2 {
  	status = "okay";
@@ -511,8 +511,8 @@
  
 --- a/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-ea7500-v1.dts
-@@ -89,3 +89,16 @@
+@@ -115,3 +115,16 @@
- 		reg = <0x6080000 0x1f80000>;
+ 		};
  	};
  };
 +
@@ -530,9 +530,9 @@
 +};
 --- a/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
-@@ -311,10 +311,28 @@
+@@ -491,10 +491,28 @@
- 			0x00054 0xc832c832  /* LED_CTRL_1 */
+ 			};
- 			>;
+ 		};
  	};
 +
 +	phy4: ethernet-phy@4 {
@@ -559,7 +559,7 @@
  	phy-mode = "rgmii";
  	qcom,id = <0>;
  
-@@ -332,6 +350,16 @@
+@@ -512,6 +530,16 @@
  
  &gmac1 {
  	status = "okay";
@@ -578,7 +578,7 @@
  
 --- a/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
-@@ -284,13 +284,23 @@
+@@ -347,13 +347,23 @@
  
  &gmac1 {
  	status = "okay";
@@ -602,7 +602,7 @@
  	qcom,irq = <255>;
  	mdiobus = <&mdio0>;
  
-@@ -305,13 +315,23 @@
+@@ -368,13 +378,23 @@
  
  &gmac2 {
  	status = "okay";

target/linux/ipq806x/patches-5.15/990-001-Fix-missing-smb208-v1.0-nss-regulator.patch

@@ -77,3 +77,13 @@
 +
 +	};
 +};
+--- a/arch/arm/boot/dts/qcom-ipq8068-ap3935.dts
++++ b/arch/arm/boot/dts/qcom-ipq8068-ap3935.dts
+@@ -1,6 +1,6 @@
+ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+ 
+-#include "qcom-ipq8064-v2.0.dtsi"
++#include "qcom-ipq8064-v2.0-smb208.dtsi"
+ 
+ #include <dt-bindings/input/input.h>
+ #include <dt-bindings/soc/qcom,tcsr.h>

target/linux/ipq806x/patches-5.15/999-005-add-wg2600hp-nss-support.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
 +++ b/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
-@@ -161,9 +161,25 @@
+@@ -244,9 +244,25 @@ switch@10 {
  &gmac1 {
  	status = "okay";
  
@@ -26,7 +26,7 @@
  	pinctrl-0 = <&rgmii2_pins>;
  	pinctrl-names = "default";
  
-@@ -179,9 +195,25 @@
+@@ -262,9 +278,25 @@ switch@10 {
  &gmac2 {
  	status = "okay";
  

target/linux/ipq806x/patches-5.15/999-100-qca-nss-ecm-support-CORE.patch

@@ -68,7 +68,7 @@
  		     __be16 vlan_proto, u16 vlan_id)
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1726,6 +1726,27 @@ enum netdev_ml_priv_type {
+@@ -1724,6 +1724,27 @@ enum netdev_ml_priv_type {
  	ML_PRIV_CAN,
  };
  
@@ -96,7 +96,7 @@
  /**
   *	struct net_device - The DEVICE structure.
   *
-@@ -2861,6 +2882,10 @@ enum netdev_cmd {
+@@ -2855,6 +2876,10 @@ enum netdev_cmd {
  	NETDEV_CVLAN_FILTER_DROP_INFO,
  	NETDEV_SVLAN_FILTER_PUSH_INFO,
  	NETDEV_SVLAN_FILTER_DROP_INFO,
@@ -123,7 +123,7 @@
  	const struct dst_entry *dst = skb_dst(skb);
 --- a/include/net/neighbour.h
 +++ b/include/net/neighbour.h
-@@ -574,4 +574,15 @@ static inline void neigh_update_is_route
+@@ -567,4 +567,15 @@ static inline void neigh_update_is_route
  		*notify = 1;
  	}
  }
@@ -356,7 +356,7 @@
  /*
   * Determine initial path cost based on speed.
   * using recommendations from 802.1d standard
-@@ -706,6 +713,8 @@ int br_add_if(struct net_bridge *br, str
+@@ -707,6 +714,8 @@ int br_add_if(struct net_bridge *br, str
  
  	kobject_uevent(&p->kobj, KOBJ_ADD);
  
@@ -365,7 +365,7 @@
  	return 0;
  
  err6:
-@@ -741,6 +750,8 @@ int br_del_if(struct net_bridge *br, str
+@@ -742,6 +751,8 @@ int br_del_if(struct net_bridge *br, str
  	if (!p || p->br != br)
  		return -EINVAL;
  
@@ -374,7 +374,7 @@
  	/* Since more than one interface can be attached to a bridge,
  	 * there still maybe an alternate path for netconsole to use;
  	 * therefore there is no reason for a NETDEV_RELEASE event.
-@@ -784,3 +795,75 @@ bool br_port_flag_is_set(const struct ne
+@@ -785,3 +796,75 @@ bool br_port_flag_is_set(const struct ne
  	return p->flags & flag;
  }
  EXPORT_SYMBOL_GPL(br_port_flag_is_set);
@@ -464,7 +464,7 @@
  #endif
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -1685,7 +1685,7 @@ const char *netdev_cmd_to_name(enum netd
+@@ -1690,7 +1690,7 @@ const char *netdev_cmd_to_name(enum netd
  	N(UDP_TUNNEL_DROP_INFO) N(CHANGE_TX_QUEUE_LEN)
  	N(CVLAN_FILTER_PUSH_INFO) N(CVLAN_FILTER_DROP_INFO)
  	N(SVLAN_FILTER_PUSH_INFO) N(SVLAN_FILTER_DROP_INFO)
@@ -475,7 +475,7 @@
  	return "UNKNOWN_NETDEV_EVENT";
 --- a/net/core/neighbour.c
 +++ b/net/core/neighbour.c
-@@ -1231,7 +1231,21 @@ static void neigh_update_hhs(struct neig
+@@ -1204,7 +1204,21 @@ static void neigh_update_hhs(struct neig
  	}
  }
  
@@ -497,7 +497,7 @@
  
  /* Generic update routine.
     -- lladdr is new lladdr or NULL, if it is not supplied.
-@@ -1262,6 +1276,7 @@ static int __neigh_update(struct neighbo
+@@ -1235,6 +1249,7 @@ static int __neigh_update(struct neighbo
  	int notify = 0;
  	struct net_device *dev;
  	int update_isrouter = 0;
@@ -505,7 +505,7 @@
  
  	trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid);
  
-@@ -1276,6 +1291,8 @@ static int __neigh_update(struct neighbo
+@@ -1249,6 +1264,8 @@ static int __neigh_update(struct neighbo
  		new = old;
  		goto out;
  	}
@@ -514,7 +514,7 @@
  	if (!(flags & NEIGH_UPDATE_F_ADMIN) &&
  	    (old & (NUD_NOARP | NUD_PERMANENT)))
  		goto out;
-@@ -1313,6 +1330,11 @@ static int __neigh_update(struct neighbo
+@@ -1286,6 +1303,11 @@ static int __neigh_update(struct neighbo
  		   - compare new & old
  		   - if they are different, check override flag
  		 */
@@ -526,7 +526,7 @@
  		if ((old & NUD_VALID) &&
  		    !memcmp(lladdr, neigh->ha, dev->addr_len))
  			lladdr = neigh->ha;
-@@ -1435,8 +1457,11 @@ out:
+@@ -1408,8 +1430,11 @@ out:
  	if (((new ^ old) & NUD_PERMANENT) || ext_learn_change)
  		neigh_update_gc_list(neigh);
  
@@ -561,7 +561,7 @@
  	return 0;
  
  out_remove_new_fa:
-@@ -1768,6 +1774,9 @@ int fib_table_delete(struct net *net, st
+@@ -1769,6 +1775,9 @@ int fib_table_delete(struct net *net, st
  	if (fa_to_delete->fa_state & FA_S_ACCESSED)
  		rt_cache_flush(cfg->fc_nlinfo.nl_net);
  
@@ -571,7 +571,7 @@
  	fib_release_info(fa_to_delete->fa_info);
  	alias_free_mem_rcu(fa_to_delete);
  	return 0;
-@@ -2396,6 +2405,20 @@ void __init fib_trie_init(void)
+@@ -2401,6 +2410,20 @@ void __init fib_trie_init(void)
  					   0, SLAB_PANIC | SLAB_ACCOUNT, NULL);
  }
  
@@ -594,7 +594,7 @@
  	struct fib_table *tb;
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -987,6 +987,7 @@ void inet6_ifa_finish_destroy(struct ine
+@@ -988,6 +988,7 @@ void inet6_ifa_finish_destroy(struct ine
  
  	kfree_rcu(ifp, rcu);
  }
@@ -602,7 +602,7 @@
  
  static void
  ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp)
-@@ -2048,6 +2049,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
+@@ -2049,6 +2050,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str
  
  	return result;
  }
@@ -612,7 +612,7 @@
  
 --- a/net/ipv6/ndisc.c
 +++ b/net/ipv6/ndisc.c
-@@ -649,6 +649,7 @@ void ndisc_send_ns(struct net_device *de
+@@ -650,6 +650,7 @@ void ndisc_send_ns(struct net_device *de
  
  	ndisc_send_skb(skb, daddr, saddr);
  }
@@ -676,7 +676,7 @@
   */
 --- a/net/ipv6/ip6_gre.c
 +++ b/net/ipv6/ip6_gre.c
-@@ -1939,6 +1939,7 @@ static void ip6gre_tap_setup(struct net_
+@@ -1940,6 +1940,7 @@ static void ip6gre_tap_setup(struct net_
  
  	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
  	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;

target/linux/ipq806x/patches-5.15/999-102-qca-nss-ecm-add-pppoe-offload.patch

@@ -480,7 +480,7 @@ Subject: [PATCH] Update 602-qca-add-pppoe-offload-support.patch for kernel
  #endif /* !(__LINUX_IF_PPPOX_H) */
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -2042,6 +2042,7 @@ struct net_device {
+@@ -2039,6 +2039,7 @@ struct net_device {
  	unsigned int		flags;
  	unsigned int		priv_flags;
  	unsigned int		extra_priv_flags;

target/linux/ipq806x/patches-5.15/999-104-qca-nss-ecm-add-bonding.patch

@@ -10,7 +10,7 @@
  static struct flow_dissector flow_keys_bonding __read_mostly;
  
  /*-------------------------- Forward declarations ---------------------------*/
-@@ -4104,6 +4107,23 @@ static int bond_get_lowest_level_rcu(str
+@@ -4109,6 +4112,23 @@ static int bond_get_lowest_level_rcu(str
  }
  #endif
  
@@ -34,7 +34,7 @@
  static void bond_get_stats(struct net_device *bond_dev,
  			   struct rtnl_link_stats64 *stats)
  {
-@@ -5436,6 +5456,10 @@ static void bond_destructor(struct net_d
+@@ -5441,6 +5461,10 @@ static void bond_destructor(struct net_d
  
  	if (bond->rr_tx_counter)
  		free_percpu(bond->rr_tx_counter);
@@ -45,7 +45,7 @@
  }
  
  void bond_setup(struct net_device *bond_dev)
-@@ -6007,7 +6031,14 @@ int bond_create(struct net *net, const c
+@@ -6014,7 +6038,14 @@ int bond_create(struct net *net, const c
  
  	bond_work_init_all(bond);
  

target/linux/ipq806x/patches-5.15/999-201-qca-nss-clients-qdisc-support.patch

@@ -52,7 +52,7 @@
  	dev->needs_free_netdev = true;
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -4763,6 +4763,15 @@ void dev_uc_flush(struct net_device *dev
+@@ -4758,6 +4758,15 @@ void dev_uc_flush(struct net_device *dev
  void dev_uc_init(struct net_device *dev);
  
  /**
@@ -68,7 +68,7 @@
   *  __dev_uc_sync - Synchonize device's unicast list
   *  @dev:  device to sync
   *  @sync: function to call if address should be added
-@@ -5312,6 +5321,11 @@ static inline bool netif_is_failover_sla
+@@ -5316,6 +5325,11 @@ static inline bool netif_is_failover_sla
  	return dev->priv_flags & IFF_FAILOVER_SLAVE;
  }
  
@@ -333,7 +333,7 @@
  #endif
 --- a/net/sched/sch_api.c
 +++ b/net/sched/sch_api.c
-@@ -2324,4 +2324,26 @@ static int __init pktsched_init(void)
+@@ -2351,4 +2351,26 @@ static int __init pktsched_init(void)
  	return 0;
  }
  

target/linux/ipq806x/patches-5.15/999-204-qca-nss-clients-iptunnel-support.patch

@@ -10,7 +10,7 @@
  	__u32 flags;		/* tunnel flags */
 --- a/include/net/ip_tunnels.h
 +++ b/include/net/ip_tunnels.h
-@@ -531,4 +531,9 @@ static inline void ip_tunnel_info_opts_s
+@@ -534,4 +534,9 @@ static inline void ip_tunnel_info_opts_s
  
  #endif /* CONFIG_INET */
  

target/linux/ipq806x/patches-5.15/999-205-qca-nss-clients-vxlan-support.patch

@@ -1,5 +1,5 @@
---- a/drivers/net/vxlan.c
+--- a/drivers/net/vxlan/vxlan_core.c
-+++ b/drivers/net/vxlan.c
++++ b/drivers/net/vxlan/vxlan_core.c
 @@ -90,6 +90,20 @@ struct vxlan_fdb {
  /* salt for hash table */
  static u32 vxlan_salt __read_mostly;
@@ -59,7 +59,7 @@
  /* caller should hold vxlan->hash_lock */
  static struct vxlan_rdst *vxlan_fdb_find_rdst(struct vxlan_fdb *f,
  					      union vxlan_addr *ip, __be16 port,
-@@ -2744,6 +2775,9 @@ static void vxlan_xmit_one(struct sk_buf
+@@ -2742,6 +2773,9 @@ static void vxlan_xmit_one(struct sk_buf
  			goto out_unlock;
  		}
  
@@ -69,7 +69,7 @@
  		tos = ip_tunnel_ecn_encap(tos, old_iph, skb);
  		ttl = ttl ? : ip4_dst_hoplimit(&rt->dst);
  		err = vxlan_build_skb(skb, ndst, sizeof(struct iphdr),
-@@ -2814,6 +2848,9 @@ static void vxlan_xmit_one(struct sk_buf
+@@ -2813,6 +2847,9 @@ static void vxlan_xmit_one(struct sk_buf
  		if (err < 0)
  			goto tx_error;
  
@@ -101,7 +101,7 @@
  struct net_device *vxlan_dev_create(struct net *net, const char *name,
  				    u8 name_assign_type, struct vxlan_config *conf);
  
-@@ -376,6 +389,15 @@ static inline __be32 vxlan_compute_rco(u
+@@ -381,6 +394,15 @@ static inline __be32 vxlan_compute_rco(u
  	return vni_field;
  }
  

target/linux/ipq806x/patches-5.15/999-500-qca-nss-cfi-support.patch

@@ -45,7 +45,7 @@
  	esp.tfclen = 0;
  	if (x->tfcpad) {
  		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
-@@ -895,6 +901,7 @@ static int esp_input(struct xfrm_state *
+@@ -897,6 +903,7 @@ static int esp_input(struct xfrm_state *
  	u8 *iv;
  	struct scatterlist *sg;
  	int err = -EINVAL;
@@ -53,7 +53,7 @@
  
  	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen))
  		goto out;
-@@ -902,6 +909,12 @@ static int esp_input(struct xfrm_state *
+@@ -904,6 +911,12 @@ static int esp_input(struct xfrm_state *
  	if (elen <= 0)
  		goto out;
  
@@ -88,7 +88,7 @@
  	esp.tfclen = 0;
  	if (x->tfcpad) {
  		struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb);
-@@ -938,6 +944,7 @@ static int esp6_input(struct xfrm_state
+@@ -940,6 +946,7 @@ static int esp6_input(struct xfrm_state
  	__be32 *seqhi;
  	u8 *iv;
  	struct scatterlist *sg;
@@ -96,7 +96,7 @@
  
  	if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen)) {
  		ret = -EINVAL;
-@@ -949,6 +956,12 @@ static int esp6_input(struct xfrm_state
+@@ -951,6 +958,12 @@ static int esp6_input(struct xfrm_state
  		goto out;
  	}