298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 5.10 to 5.10.84 (#8411)

Browse Source 
Signed-off-by: boos4721 <3.1415926535boos@gmail.com>
This commit is contained in:
Boos4721 2021-12-10 23:47:33 +08:00 committed by GitHub
parent 841b4bb650
commit 1e368cb085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 145 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif
LINUX_VERSION-5.4 = .162
LINUX_VERSION-5.10 = .83
LINUX_VERSION-5.10 = .84
LINUX_KERNEL_HASH-5.4.162 = c12d72ddaac78189305a5e98825295ecb02282970033b052276035e83189e25b
LINUX_KERNEL_HASH-5.10.83 = ef259a43f33ddb56001283f4f4e50af29b8a48fa066aed7371a90ebf38c29b70
LINUX_KERNEL_HASH-5.10.84 = 6e96271d72dd106c4bd83931ca16fda622413b34c5649e2916116c38c12e233d
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

2
target/linux/bcm27xx/patches-5.10/950-0690-drm-Pass-the-full-state-to-connectors-atomic-functio.patch
View File

@ -190,7 +190,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201118094758.506730-1-maxi
#include <drm/drm_atomic_helper.h>
#include <drm/drm_dp_mst_helper.h>
#include <drm/drm_dp_helper.h>
@@ -252,8 +253,10 @@ static int dm_dp_mst_get_modes(struct dr
@@ -264,8 +265,10 @@ static int dm_dp_mst_get_modes(struct dr
static struct drm_encoder *
dm_mst_atomic_best_encoder(struct drm_connector *connector,

2
target/linux/bcm27xx/patches-5.10/950-0733-usb-xhci-workaround-for-bogus-SET_DEQ_PENDING-endpoi.patch
View File

@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -4252,9 +4252,9 @@ void xhci_queue_new_dequeue_state(struct
@@ -4259,9 +4259,9 @@ void xhci_queue_new_dequeue_state(struct
}
ep = &xhci->devs[slot_id]->eps[ep_index];
if ((ep->ep_state & SET_DEQ_PENDING)) {

2
target/linux/generic/backport-5.10/103-v5.13-MIPS-select-CPU_MIPS64-for-remaining-MIPS64-CPUs.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2084,7 +2084,7 @@ config CPU_MIPS32
@@ -2082,7 +2082,7 @@ config CPU_MIPS32
config CPU_MIPS64
bool
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \

8
target/linux/generic/backport-5.10/600-v5.12-net-extract-napi-poll-functionality-to-__napi_poll.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6802,15 +6802,10 @@ void __netif_napi_del(struct napi_struct
@@ -6805,15 +6805,10 @@ void __netif_napi_del(struct napi_struct
}
EXPORT_SYMBOL(__netif_napi_del);
@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
weight = n->weight;
/* This NAPI_STATE_SCHED test is for avoiding a race
@@ -6830,7 +6825,7 @@ static int napi_poll(struct napi_struct
@@ -6833,7 +6828,7 @@ static int napi_poll(struct napi_struct
n->poll, work, weight);
if (likely(work < weight))
@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Drivers must not modify the NAPI state if they
* consume the entire weight. In such cases this code
@@ -6839,7 +6834,7 @@ static int napi_poll(struct napi_struct
@@ -6842,7 +6837,7 @@ static int napi_poll(struct napi_struct
*/
if (unlikely(napi_disable_pending(n))) {
napi_complete(n);
@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
if (n->gro_bitmask) {
@@ -6857,12 +6852,29 @@ static int napi_poll(struct napi_struct
@@ -6860,12 +6855,29 @@ static int napi_poll(struct napi_struct
if (unlikely(!list_empty(&n->poll_list))) {
pr_warn_once("%s: Budget exhausted after napi rescheduled\n",
n->dev ? n->dev->name : "backlog");

10
target/linux/generic/backport-5.10/601-v5.12-net-implement-threaded-able-napi-poll-loop-support.patch
View File

@ -131,7 +131,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int __dev_open(struct net_device *dev, struct netlink_ext_ack *extack)
{
const struct net_device_ops *ops = dev->netdev_ops;
@@ -4264,6 +4286,21 @@ int gro_normal_batch __read_mostly = 8;
@@ -4267,6 +4289,21 @@ int gro_normal_batch __read_mostly = 8;
static inline void ____napi_schedule(struct softnet_data *sd,
struct napi_struct *napi)
{
@ -153,7 +153,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
list_add_tail(&napi->poll_list, &sd->poll_list);
__raise_softirq_irqoff(NET_RX_SOFTIRQ);
}
@@ -6755,6 +6792,12 @@ void netif_napi_add(struct net_device *d
@@ -6758,6 +6795,12 @@ void netif_napi_add(struct net_device *d
set_bit(NAPI_STATE_NPSVC, &napi->state);
list_add_rcu(&napi->dev_list, &dev->napi_list);
napi_hash_add(napi);
@ -166,7 +166,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
EXPORT_SYMBOL(netif_napi_add);
@@ -6771,9 +6814,28 @@ void napi_disable(struct napi_struct *n)
@@ -6774,9 +6817,28 @@ void napi_disable(struct napi_struct *n)
hrtimer_cancel(&n->timer);
clear_bit(NAPI_STATE_DISABLE, &n->state);
@ -195,7 +195,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void flush_gro_hash(struct napi_struct *napi)
{
int i;
@@ -6799,6 +6861,11 @@ void __netif_napi_del(struct napi_struct
@@ -6802,6 +6864,11 @@ void __netif_napi_del(struct napi_struct
flush_gro_hash(napi);
napi->gro_bitmask = 0;
@ -207,7 +207,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
EXPORT_SYMBOL(__netif_napi_del);
@@ -6880,6 +6947,51 @@ static int napi_poll(struct napi_struct
@@ -6883,6 +6950,51 @@ static int napi_poll(struct napi_struct
return work;
}

4
target/linux/generic/backport-5.10/602-v5.12-net-add-sysfs-attribute-to-control-napi-threaded-mod.patch
View File

@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* @n: NAPI context
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4290,8 +4290,9 @@ static inline void ____napi_schedule(str
@@ -4293,8 +4293,9 @@ static inline void ____napi_schedule(str
if (test_bit(NAPI_STATE_THREADED, &napi->state)) {
/* Paired with smp_mb__before_atomic() in
@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* wake_up_process() when it's not NULL.
*/
thread = READ_ONCE(napi->thread);
@@ -6765,6 +6766,49 @@ static void init_gro_hash(struct napi_st
@@ -6768,6 +6769,49 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0;
}

6
target/linux/generic/backport-5.10/603-v5.12-net-fix-race-between-napi-kthread-mode-and-busy-poll.patch
View File

@ -45,7 +45,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
enum gro_result {
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4297,6 +4297,8 @@ static inline void ____napi_schedule(str
@@ -4300,6 +4300,8 @@ static inline void ____napi_schedule(str
*/
thread = READ_ONCE(napi->thread);
if (thread) {
@ -54,7 +54,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
wake_up_process(thread);
return;
}
@@ -6557,7 +6559,8 @@ bool napi_complete_done(struct napi_stru
@@ -6560,7 +6562,8 @@ bool napi_complete_done(struct napi_stru
WARN_ON_ONCE(!(val & NAPIF_STATE_SCHED));
@ -64,7 +64,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org>
/* If STATE_MISSED was set, leave STATE_SCHED set,
* because we will call napi->poll() one more time.
@@ -6993,16 +6996,25 @@ static int napi_poll(struct napi_struct
@@ -6996,16 +6999,25 @@ static int napi_poll(struct napi_struct
static int napi_thread_wait(struct napi_struct *napi)
{

4
target/linux/generic/backport-5.10/604-v5.12-net-fix-hangup-on-napi_disable-for-threaded-napi.patch
View File

@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7000,7 +7000,7 @@ static int napi_thread_wait(struct napi_
@@ -7003,7 +7003,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
@ -43,7 +43,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/* Testing SCHED_THREADED bit here to make sure the current
* kthread owns this napi and could poll on this napi.
* Testing SCHED bit is not enough because SCHED bit might be
@@ -7018,6 +7018,7 @@ static int napi_thread_wait(struct napi_
@@ -7021,6 +7021,7 @@ static int napi_thread_wait(struct napi_
set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);

6
target/linux/generic/backport-5.10/781-v5.13-net-dsa-mt7530-Add-support-for-EEE-features.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2371,6 +2371,17 @@ static void mt753x_phylink_mac_link_up(s
@@ -2261,6 +2261,17 @@ static void mt753x_phylink_mac_link_up(s
mcr |= PMCR_RX_FC_EN;
}
@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mt7530_set(priv, MT7530_PMCR_P(port), mcr);
}
@@ -2601,6 +2612,36 @@ mt753x_phy_write(struct dsa_switch *ds,
@@ -2491,6 +2502,36 @@ mt753x_phy_write(struct dsa_switch *ds,
return priv->info->phy_write(ds, port, regnum, val);
}
@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static const struct dsa_switch_ops mt7530_switch_ops = {
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt753x_setup,
@@ -2629,6 +2670,8 @@ static const struct dsa_switch_ops mt753
@@ -2519,6 +2560,8 @@ static const struct dsa_switch_ops mt753
.phylink_mac_an_restart = mt753x_phylink_mac_an_restart,
.phylink_mac_link_down = mt753x_phylink_mac_link_down,
.phylink_mac_link_up = mt753x_phylink_mac_link_up,

2
target/linux/generic/hack-5.10/220-gc_sections.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -113,6 +113,7 @@ config ARM
@@ -114,6 +114,7 @@ config ARM
select HAVE_UID16
select HAVE_VIRT_CPU_ACCOUNTING_GEN
select IRQ_FORCED_THREADING

2
target/linux/generic/hack-5.10/301-mips_image_cmdline_hack.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1170,6 +1170,10 @@ config MIPS_MSC
@@ -1168,6 +1168,10 @@ config MIPS_MSC
config SYNC_R4K
bool

2
target/linux/generic/hack-5.10/952-net-conntrack-events-support-multiple-registrant.patch
View File

@ -295,7 +295,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3788,9 +3795,15 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3786,9 +3793,15 @@ static int ctnetlink_stat_exp_cpu(struct
}
#ifdef CONFIG_NF_CONNTRACK_EVENTS

8
target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -80,7 +80,7 @@
struct net_bridge_port *p;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3641,8 +3641,17 @@ static int xmit_one(struct sk_buff *skb,
@@ -3643,8 +3643,17 @@ static int xmit_one(struct sk_buff *skb,
unsigned int len;
int rc;
@ -98,7 +98,7 @@
len = skb->len;
PRANDOM_ADD_NOISE(skb, dev, txq, len + jiffies);
@@ -5184,6 +5193,11 @@ void netdev_rx_handler_unregister(struct
@@ -5190,6 +5199,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
@ -110,7 +110,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5232,6 +5246,10 @@ static int __netif_receive_skb_core(stru
@@ -5238,6 +5252,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;
@ -121,7 +121,7 @@
net_timestamp_check(!netdev_tstamp_prequeue, skb);
trace_netif_receive_skb(skb);
@@ -5271,6 +5289,16 @@ another_round:
@@ -5277,6 +5295,16 @@ another_round:
goto out;
}

4
target/linux/generic/pending-5.10/300-mips_expose_boot_raw.patch
View File

@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1085,9 +1085,6 @@ config FW_ARC
@@ -1083,9 +1083,6 @@ config FW_ARC
config ARCH_MAY_HAVE_PC_FDC
bool
@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
@@ -3178,6 +3175,18 @@ choice
@@ -3176,6 +3173,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments"
endchoice

10
target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6059,6 +6059,9 @@ static enum gro_result dev_gro_receive(s
@@ -6062,6 +6062,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev))
goto normal;
@@ -8036,6 +8039,48 @@ static void __netdev_adjacent_dev_unlink
@@ -8039,6 +8042,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
@@ -8087,6 +8132,7 @@ static int __netdev_upper_dev_link(struc
@@ -8090,6 +8135,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;
@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -8183,6 +8229,7 @@ static void __netdev_upper_dev_unlink(st
@@ -8186,6 +8232,7 @@ static void __netdev_upper_dev_unlink(st
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
@@ -8969,6 +9016,7 @@ int dev_set_mac_address(struct net_devic
@@ -8972,6 +9019,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;

2
target/linux/ipq60xx/patches-5.10/011-v5.11-PCI-dwc-Move-MSI-interrupt-setup-into-DWC-common-cod.patch
View File

@ -273,7 +273,7 @@ Cc: linux-tegra@vger.kernel.org
ret = pm_runtime_get_sync(dev);
--- a/drivers/pci/controller/dwc/pcie-uniphier.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier.c
@@ -341,12 +341,6 @@ static int uniphier_add_pcie_port(struct
@@ -335,12 +335,6 @@ static int uniphier_add_pcie_port(struct
pp->ops = &uniphier_pcie_host_ops;

4
target/linux/ipq60xx/patches-5.10/013-v5.11-PCI-dwc-Move-link-handling-into-common-code.patch
View File

@ -581,7 +581,7 @@ Cc: linux-tegra@vger.kernel.org
}
static void uniphier_pcie_stop_link(struct dw_pcie *pci)
@@ -318,10 +315,6 @@ static int uniphier_pcie_host_init(struc
@@ -312,10 +309,6 @@ static int uniphier_pcie_host_init(struc
uniphier_pcie_irq_enable(priv);
dw_pcie_setup_rc(pp);
@ -592,7 +592,7 @@ Cc: linux-tegra@vger.kernel.org
dw_pcie_msi_init(pp);
return 0;
@@ -385,7 +378,7 @@ out_clk_disable:
@@ -379,7 +372,7 @@ out_clk_disable:
}
static const struct dw_pcie_ops dw_pcie_ops = {

2
target/linux/ipq60xx/patches-5.10/014-v5.11-PCI-dwc-Move-dw_pcie_msi_init-into-core.patch
View File

@ -262,7 +262,7 @@ Cc: linux-tegra@vger.kernel.org
val |= APPL_INTR_EN_L0_0_SYS_MSI_INTR_EN;
--- a/drivers/pci/controller/dwc/pcie-uniphier.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier.c
@@ -315,7 +315,6 @@ static int uniphier_pcie_host_init(struc
@@ -309,7 +309,6 @@ static int uniphier_pcie_host_init(struc
uniphier_pcie_irq_enable(priv);
dw_pcie_setup_rc(pp);

18
target/linux/ipq60xx/patches-5.10/600-qca-nss-ecm-support-CORE.patch
View File

@ -135,7 +135,7 @@
const struct dst_entry *dst = skb_dst(skb);
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -568,4 +568,15 @@ static inline void neigh_update_is_route
@@ -574,4 +574,15 @@ static inline void neigh_update_is_route
*notify = 1;
}
}
@ -477,7 +477,7 @@
+/* QCA NSS ECM support - End */
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1593,4 +1593,9 @@ void br_do_proxy_suppress_arp(struct sk_
@@ -1591,4 +1591,9 @@ void br_do_proxy_suppress_arp(struct sk_
void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,
u16 vid, struct net_bridge_port *p, struct nd_msg *msg);
struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *m);
@ -528,7 +528,7 @@
if (!(flags & NEIGH_UPDATE_F_ADMIN) &&
(old & (NUD_NOARP | NUD_PERMANENT)))
goto out;
@@ -1286,6 +1303,11 @@ static int __neigh_update(struct neighbo
@@ -1292,6 +1309,11 @@ static int __neigh_update(struct neighbo
- compare new & old
- if they are different, check override flag
*/
@ -540,7 +540,7 @@
if ((old & NUD_VALID) &&
!memcmp(lladdr, neigh->ha, dev->addr_len))
lladdr = neigh->ha;
@@ -1408,8 +1430,11 @@ out:
@@ -1414,8 +1436,11 @@ out:
if (((new ^ old) & NUD_PERMANENT) || ext_learn_change)
neigh_update_gc_list(neigh);
@ -620,7 +620,7 @@
#endif
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -7233,3 +7233,35 @@ void addrconf_cleanup(void)
@@ -7236,3 +7236,35 @@ void addrconf_cleanup(void)
destroy_workqueue(addrconf_wq);
}
@ -668,7 +668,7 @@
const struct in6_addr *daddr)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3748,6 +3748,9 @@ out_free:
@@ -3767,6 +3767,9 @@ out_free:
return ERR_PTR(err);
}
@ -678,7 +678,7 @@
int ip6_route_add(struct fib6_config *cfg, gfp_t gfp_flags,
struct netlink_ext_ack *extack)
{
@@ -3759,6 +3762,10 @@ int ip6_route_add(struct fib6_config *cf
@@ -3778,6 +3781,10 @@ int ip6_route_add(struct fib6_config *cf
return PTR_ERR(rt);
err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack);
@ -689,7 +689,7 @@
fib6_info_release(rt);
return err;
@@ -3780,6 +3787,9 @@ static int __ip6_del_rt(struct fib6_info
@@ -3799,6 +3806,9 @@ static int __ip6_del_rt(struct fib6_info
err = fib6_del(rt, info);
spin_unlock_bh(&table->tb6_lock);
@ -699,7 +699,7 @@
out:
fib6_info_release(rt);
return err;
@@ -6132,6 +6142,20 @@ static int ip6_route_dev_notify(struct n
@@ -6151,6 +6161,20 @@ static int ip6_route_dev_notify(struct n
return NOTIFY_OK;
}

6
target/linux/ipq60xx/patches-5.10/602-qca-add-pppoe-offload-support.patch
View File

@ -466,8 +466,8 @@
#endif /* !(__LINUX_IF_PPPOX_H) */
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1621,6 +1621,24 @@ enum netdev_priv_flags {
IFF_NO_IP_ALIGN = 1<<31,
@@ -1620,6 +1620,24 @@ enum netdev_priv_flags {
IFF_LIVE_RENAME_OK = 1<<30,
};
+
@ -491,7 +491,7 @@
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
#define IFF_EBRIDGE IFF_EBRIDGE
#define IFF_BONDING IFF_BONDING
@@ -2001,6 +2019,7 @@ struct net_device {
@@ -1994,6 +2012,7 @@ struct net_device {
unsigned int flags;
unsigned int priv_flags;

2
target/linux/ipq60xx/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch
View File

@ -31,7 +31,7 @@ Change-Id: Ib3cd341e5b2d4dcf552e02e38d3f34a4f00351cd
__u8 redirected:1;
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -750,6 +750,40 @@ static inline bool skb_skip_tc_classify(
@@ -754,6 +754,40 @@ static inline bool skb_skip_tc_classify(
return false;
}

2
target/linux/ipq60xx/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch
View File

@ -35,7 +35,7 @@ Change-Id: Iddb97d6ba0a443b830d1ac23728434a417bc8a92
__u8 redirected:1;
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -753,31 +753,31 @@ static inline bool skb_skip_tc_classify(
@@ -757,31 +757,31 @@ static inline bool skb_skip_tc_classify(
/*
* Set skb classify bit field.
*/

28
target/linux/ipq60xx/patches-5.10/703-arm64-dts-ipq6018-Fixdma-node-name.patch
View File

@ -6,27 +6,23 @@ Signed-off-by: Vinod Koul <vk...@kernel.org>
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
index a94dac76bf3f..1bdcebc809d1 100644
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -188,7 +188,7 @@ prng: qrng@e1000 {
clock-names = "core";
};
@@ -192,7 +192,7 @@
clock-names = "core";
};
- cryptobam: dma@704000 {
+ cryptobam: dma-controller@704000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x00704000 0x20000>;
interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
@@ -245,7 +245,7 @@ tcsr_q6: syscon@1945000 {
reg = <0x01945000 0xe000>;
};
compatible = "qcom,bam-v1.7.0";
reg = <0x0 0x00704000 0x0 0x20000>;
interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
@@ -252,7 +252,7 @@
reg = <0x0 0x01945000 0x0 0xe000>;
};
- blsp_dma: dma@7884000 {
+ blsp_dma: dma-controller@7884000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x07884000 0x2b000>;
interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
compatible = "qcom,bam-v1.7.0";
reg = <0x0 0x07884000 0x0 0x2b000>;
interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;

8
target/linux/ipq60xx/patches-5.10/711-qcom-socinfo-Add-IPQ6018-SoC-family-ID-s.patch
View File

@ -1,10 +1,8 @@
diff --git a/drivers/soc/qcom/socinfo.c b/drivers/soc/qcom/socinfo.c
index e0620416e574..2a7ceef338fb 100644
--- a/drivers/soc/qcom/socinfo.c
+++ b/drivers/soc/qcom/socinfo.c
@@ -227,7 +227,11 @@ static const struct soc_id soc_id[] = {
{ 341, "SDA845" },
{ 356, "SM8250" },
@@ -239,7 +239,11 @@ static const struct soc_id soc_id[] = {
{ 395, "IPQ8070A" },
{ 396, "IPQ8071A" },
{ 402, "IPQ6018" },
+ { 403, "IPQ6028" },
+ { 421, "IPQ6000" },

170
target/linux/ipq60xx/patches-5.10/994-ipq6018-mem-profile.patch
View File

@ -1,5 +1,3 @@
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 0e5a8765e..b92cd9775 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -149,6 +149,11 @@ textofs-$(CONFIG_SA1111) := 0x00208000
@ -14,8 +12,6 @@ index 0e5a8765e..b92cd9775 100644
textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
textofs-$(CONFIG_ARCH_MESON) := 0x00208000
textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 247ce9055..d353e0e02 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -269,7 +269,8 @@ not_angel:
@ -28,8 +24,6 @@ index 247ce9055..d353e0e02 100644
#else
ldr r4, =zreladdr
#endif
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 4af5c7679..826eae583 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -48,8 +48,9 @@
@ -53,8 +47,6 @@ index 4af5c7679..826eae583 100644
/*
* Clear the swapper page table
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index 1772eccb5..a235a3e3c 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -33,4 +33,34 @@ config ARCH_MDM9615
@ -92,8 +84,6 @@ index 1772eccb5..a235a3e3c 100644
+ know what do here, say N
+
endif
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 5e5cf3af6..b446ed175 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1831,6 +1831,16 @@ config STACKPROTECTOR_PER_TASK
@ -113,9 +103,6 @@ index 5e5cf3af6..b446ed175 100644
endmenu
menu "Boot options"
diff --git a/drivers/clk/qcom/apss-ipq6018.c b/drivers/clk/qcom/apss-ipq6018.c
index d78ff2f31..c39045a3b 100644
--- a/drivers/clk/qcom/apss-ipq6018.c
+++ b/drivers/clk/qcom/apss-ipq6018.c
@@ -1,6 +1,6 @@
@ -135,7 +122,7 @@ index d78ff2f31..c39045a3b 100644
enum {
P_XO,
@@ -33,16 +33,21 @@ static const struct parent_map parents_apcs_alias0_clk_src_map[] = {
@@ -33,16 +33,21 @@ static const struct parent_map parents_a
{ P_APSS_PLL_EARLY, 5 },
};
@ -162,7 +149,7 @@ index d78ff2f31..c39045a3b 100644
.flags = CLK_SET_RATE_PARENT,
},
};
@@ -87,8 +92,8 @@ static int apss_ipq6018_probe(struct platform_device *pdev)
@@ -87,8 +92,8 @@ static int apss_ipq6018_probe(struct pla
struct regmap *regmap;
regmap = dev_get_regmap(pdev->dev.parent, NULL);
@ -173,7 +160,7 @@ index d78ff2f31..c39045a3b 100644
return qcom_cc_really_probe(pdev, &apss_ipq6018_desc, regmap);
}
@@ -102,5 +107,6 @@ static struct platform_driver apss_ipq6018_driver = {
@@ -102,5 +107,6 @@ static struct platform_driver apss_ipq60
module_platform_driver(apss_ipq6018_driver);
@ -181,8 +168,6 @@ index d78ff2f31..c39045a3b 100644
+MODULE_DESCRIPTION("IPQ6018 APSS CLK Driver");
MODULE_LICENSE("GPL v2");
+
diff --git a/drivers/clk/qcom/gcc-ipq6018.c b/drivers/clk/qcom/gcc-ipq6018.c
index 3f9c2f61a..f112baca0 100644
--- a/drivers/clk/qcom/gcc-ipq6018.c
+++ b/drivers/clk/qcom/gcc-ipq6018.c
@@ -1,6 +1,6 @@
@ -193,7 +178,7 @@ index 3f9c2f61a..f112baca0 100644
*/
#include <linux/kernel.h>
@@ -62,6 +62,7 @@ static struct clk_alpha_pll gpll0_main = {
@@ -62,6 +62,7 @@ static struct clk_alpha_pll gpll0_main =
},
.num_parents = 1,
.ops = &clk_alpha_pll_ops,
@ -201,7 +186,7 @@ index 3f9c2f61a..f112baca0 100644
},
},
};
@@ -150,6 +151,7 @@ static struct clk_alpha_pll gpll6_main = {
@@ -150,6 +151,7 @@ static struct clk_alpha_pll gpll6_main =
},
.num_parents = 1,
.ops = &clk_alpha_pll_ops,
@ -209,7 +194,7 @@ index 3f9c2f61a..f112baca0 100644
},
},
};
@@ -181,6 +183,7 @@ static struct clk_alpha_pll gpll4_main = {
@@ -181,6 +183,7 @@ static struct clk_alpha_pll gpll4_main =
},
.num_parents = 1,
.ops = &clk_alpha_pll_ops,
@ -217,7 +202,7 @@ index 3f9c2f61a..f112baca0 100644
},
},
};
@@ -211,6 +214,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_src = {
@@ -211,6 +214,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
.freq_tbl = ftbl_pcnoc_bfdcd_clk_src,
.hid_width = 5,
.parent_map = gcc_xo_gpll0_gpll0_out_main_div2_map,
@ -225,7 +210,7 @@ index 3f9c2f61a..f112baca0 100644
.clkr.hw.init = &(struct clk_init_data){
.name = "pcnoc_bfdcd_clk_src",
.parent_data = gcc_xo_gpll0_gpll0_out_main_div2,
@@ -219,6 +223,19 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_src = {
@@ -219,6 +223,19 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
},
};
@ -245,7 +230,7 @@ index 3f9c2f61a..f112baca0 100644
static struct clk_alpha_pll gpll2_main = {
.offset = 0x4a000,
.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
@@ -232,6 +249,7 @@ static struct clk_alpha_pll gpll2_main = {
@@ -232,6 +249,7 @@ static struct clk_alpha_pll gpll2_main =
},
.num_parents = 1,
.ops = &clk_alpha_pll_ops,
@ -253,7 +238,7 @@ index 3f9c2f61a..f112baca0 100644
},
},
};
@@ -456,6 +474,7 @@ static struct clk_branch gcc_sleep_clk_src = {
@@ -456,6 +474,7 @@ static struct clk_branch gcc_sleep_clk_s
},
.num_parents = 1,
.ops = &clk_branch2_ops,
@ -261,7 +246,7 @@ index 3f9c2f61a..f112baca0 100644
},
},
};
@@ -499,6 +518,19 @@ static struct clk_rcg2 snoc_nssnoc_bfdcd_clk_src = {
@@ -499,6 +518,19 @@ static struct clk_rcg2 snoc_nssnoc_bfdcd
},
};
@ -281,7 +266,7 @@ index 3f9c2f61a..f112baca0 100644
static const struct freq_tbl ftbl_apss_ahb_clk_src[] = {
F(24000000, P_XO, 1, 0, 0),
F(25000000, P_GPLL0_DIV2, 16, 0, 0),
@@ -532,17 +564,6 @@ static const struct freq_tbl ftbl_nss_port5_rx_clk_src[] = {
@@ -532,17 +564,6 @@ static const struct freq_tbl ftbl_nss_po
{ }
};
@ -299,7 +284,7 @@ index 3f9c2f61a..f112baca0 100644
static const struct parent_map
gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias_map[] = {
{ P_XO, 0 },
@@ -554,6 +575,16 @@ gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias_map[] = {
@@ -554,6 +575,16 @@ gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32
{ P_BIAS_PLL, 6 },
};
@ -316,7 +301,7 @@ index 3f9c2f61a..f112baca0 100644
static struct clk_rcg2 nss_port5_rx_clk_src = {
.cmd_rcgr = 0x68060,
.freq_tbl = ftbl_nss_port5_rx_clk_src,
@@ -561,7 +592,7 @@ static struct clk_rcg2 nss_port5_rx_clk_src = {
@@ -561,7 +592,7 @@ static struct clk_rcg2 nss_port5_rx_clk_
.parent_map = gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port5_rx_clk_src",
@ -325,7 +310,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 7,
.ops = &clk_rcg2_ops,
},
@@ -579,15 +610,14 @@ static const struct freq_tbl ftbl_nss_port5_tx_clk_src[] = {
@@ -579,15 +610,14 @@ static const struct freq_tbl ftbl_nss_po
{ }
};
@ -349,7 +334,7 @@ index 3f9c2f61a..f112baca0 100644
};
static const struct parent_map
@@ -608,7 +638,7 @@ static struct clk_rcg2 nss_port5_tx_clk_src = {
@@ -608,7 +638,7 @@ static struct clk_rcg2 nss_port5_tx_clk_
.parent_map = gcc_xo_uniphy0_tx_rx_uniphy1_tx_rx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port5_tx_clk_src",
@ -358,7 +343,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 7,
.ops = &clk_rcg2_ops,
},
@@ -721,14 +751,15 @@ static const struct freq_tbl ftbl_nss_port1_rx_clk_src[] = {
@@ -721,14 +751,15 @@ static const struct freq_tbl ftbl_nss_po
{ }
};
@ -380,7 +365,7 @@ index 3f9c2f61a..f112baca0 100644
static const struct parent_map gcc_xo_uniphy0_rx_tx_ubi32_bias_map[] = {
{ P_XO, 0 },
{ P_UNIPHY0_RX, 1 },
@@ -744,7 +775,7 @@ static struct clk_rcg2 nss_port1_rx_clk_src = {
@@ -744,7 +775,7 @@ static struct clk_rcg2 nss_port1_rx_clk_
.parent_map = gcc_xo_uniphy0_rx_tx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port1_rx_clk_src",
@ -389,7 +374,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 5,
.ops = &clk_rcg2_ops,
},
@@ -757,12 +788,12 @@ static const struct freq_tbl ftbl_nss_port1_tx_clk_src[] = {
@@ -757,12 +788,12 @@ static const struct freq_tbl ftbl_nss_po
{ }
};
@ -408,7 +393,7 @@ index 3f9c2f61a..f112baca0 100644
};
static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = {
@@ -780,7 +811,7 @@ static struct clk_rcg2 nss_port1_tx_clk_src = {
@@ -780,7 +811,7 @@ static struct clk_rcg2 nss_port1_tx_clk_
.parent_map = gcc_xo_uniphy0_tx_rx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port1_tx_clk_src",
@ -417,7 +402,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 5,
.ops = &clk_rcg2_ops,
},
@@ -793,7 +824,7 @@ static struct clk_rcg2 nss_port2_rx_clk_src = {
@@ -793,7 +824,7 @@ static struct clk_rcg2 nss_port2_rx_clk_
.parent_map = gcc_xo_uniphy0_rx_tx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port2_rx_clk_src",
@ -426,7 +411,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 5,
.ops = &clk_rcg2_ops,
},
@@ -806,7 +837,7 @@ static struct clk_rcg2 nss_port2_tx_clk_src = {
@@ -806,7 +837,7 @@ static struct clk_rcg2 nss_port2_tx_clk_
.parent_map = gcc_xo_uniphy0_tx_rx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port2_tx_clk_src",
@ -435,7 +420,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 5,
.ops = &clk_rcg2_ops,
},
@@ -819,7 +850,7 @@ static struct clk_rcg2 nss_port3_rx_clk_src = {
@@ -819,7 +850,7 @@ static struct clk_rcg2 nss_port3_rx_clk_
.parent_map = gcc_xo_uniphy0_rx_tx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port3_rx_clk_src",
@ -444,7 +429,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 5,
.ops = &clk_rcg2_ops,
},
@@ -832,7 +863,7 @@ static struct clk_rcg2 nss_port3_tx_clk_src = {
@@ -832,7 +863,7 @@ static struct clk_rcg2 nss_port3_tx_clk_
.parent_map = gcc_xo_uniphy0_tx_rx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port3_tx_clk_src",
@ -453,7 +438,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 5,
.ops = &clk_rcg2_ops,
},
@@ -845,7 +876,7 @@ static struct clk_rcg2 nss_port4_rx_clk_src = {
@@ -845,7 +876,7 @@ static struct clk_rcg2 nss_port4_rx_clk_
.parent_map = gcc_xo_uniphy0_rx_tx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port4_rx_clk_src",
@ -462,7 +447,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 5,
.ops = &clk_rcg2_ops,
},
@@ -858,7 +889,7 @@ static struct clk_rcg2 nss_port4_tx_clk_src = {
@@ -858,7 +889,7 @@ static struct clk_rcg2 nss_port4_tx_clk_
.parent_map = gcc_xo_uniphy0_tx_rx_ubi32_bias_map,
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_port4_tx_clk_src",
@ -471,7 +456,7 @@ index 3f9c2f61a..f112baca0 100644
.num_parents = 5,
.ops = &clk_rcg2_ops,
},
@@ -960,6 +991,7 @@ static struct clk_rcg2 nss_crypto_clk_src = {
@@ -960,6 +991,7 @@ static struct clk_rcg2 nss_crypto_clk_sr
.mnd_width = 16,
.hid_width = 5,
.parent_map = gcc_xo_nss_crypto_pll_gpll0_map,
@ -479,7 +464,7 @@ index 3f9c2f61a..f112baca0 100644
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_crypto_clk_src",
.parent_data = gcc_xo_nss_crypto_pll_gpll0,
@@ -1131,6 +1163,7 @@ static struct clk_rcg2 nss_ubi0_clk_src = {
@@ -1131,6 +1163,7 @@ static struct clk_rcg2 nss_ubi0_clk_src
.freq_tbl = ftbl_nss_ubi_clk_src,
.hid_width = 5,
.parent_map = gcc_xo_ubi32_gpll0_gpll2_gpll4_gpll6_map,
@ -487,7 +472,7 @@ index 3f9c2f61a..f112baca0 100644
.clkr.hw.init = &(struct clk_init_data){
.name = "nss_ubi0_clk_src",
.parent_data = gcc_xo_ubi32_pll_gpll0_gpll2_gpll4_gpll6,
@@ -1869,7 +1902,7 @@ static struct clk_branch gcc_apss_ahb_clk = {
@@ -1869,7 +1902,7 @@ static struct clk_branch gcc_apss_ahb_cl
.parent_hws = (const struct clk_hw *[]){
&apss_ahb_postdiv_clk_src.clkr.hw },
.num_parents = 1,
@ -496,7 +481,7 @@ index 3f9c2f61a..f112baca0 100644
.ops = &clk_branch2_ops,
},
},
@@ -1891,11 +1924,26 @@ static struct clk_rcg2 system_noc_bfdcd_clk_src = {
@@ -1891,11 +1924,26 @@ static struct clk_rcg2 system_noc_bfdcd_
.freq_tbl = ftbl_system_noc_bfdcd_clk_src,
.hid_width = 5,
.parent_map = gcc_xo_gpll0_gpll6_gpll0_out_main_div2_map,
@ -523,7 +508,7 @@ index 3f9c2f61a..f112baca0 100644
},
};
@@ -1934,6 +1982,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfdcd_clk_src = {
@@ -1934,6 +1982,19 @@ static struct clk_rcg2 ubi32_mem_noc_bfd
},
};
@ -543,7 +528,7 @@ index 3f9c2f61a..f112baca0 100644
static struct clk_branch gcc_apss_axi_clk = {
.halt_reg = 0x46020,
.halt_check = BRANCH_HALT_VOTED,
@@ -1945,7 +2006,7 @@ static struct clk_branch gcc_apss_axi_clk = {
@@ -1945,7 +2006,7 @@ static struct clk_branch gcc_apss_axi_cl
.parent_hws = (const struct clk_hw *[]){
&apss_axi_clk_src.clkr.hw },
.num_parents = 1,
@ -552,7 +537,7 @@ index 3f9c2f61a..f112baca0 100644
.ops = &clk_branch2_ops,
},
},
@@ -2128,6 +2189,22 @@ static struct clk_branch gcc_blsp1_qup5_spi_apps_clk = {
@@ -2128,6 +2189,22 @@ static struct clk_branch gcc_blsp1_qup5_
},
};
@ -584,7 +569,7 @@ index 3f9c2f61a..f112baca0 100644
.ops = &clk_branch2_ops,
},
},
@@ -2671,6 +2748,454 @@ static struct clk_rcg2 lpass_q6_axim_clk_src = {
@@ -2671,6 +2748,454 @@ static struct clk_rcg2 lpass_q6_axim_clk
},
};
@ -1039,7 +1024,7 @@ index 3f9c2f61a..f112baca0 100644
static struct freq_tbl ftbl_rbcpr_wcss_clk_src[] = {
F(24000000, P_XO, 1, 0, 0),
F(50000000, P_GPLL0, 16, 0, 0),
@@ -2690,6 +3215,23 @@ static struct clk_rcg2 rbcpr_wcss_clk_src = {
@@ -2690,6 +3215,23 @@ static struct clk_rcg2 rbcpr_wcss_clk_sr
},
};
@ -1063,7 +1048,7 @@ index 3f9c2f61a..f112baca0 100644
static struct clk_branch gcc_lpass_core_axim_clk = {
.halt_reg = 0x1F028,
.clkr = {
@@ -3163,6 +3705,7 @@ static struct clk_branch gcc_nssnoc_ppe_cfg_clk = {
@@ -3163,6 +3705,7 @@ static struct clk_branch gcc_nssnoc_ppe_
.name = "gcc_nssnoc_ppe_cfg_clk",
.parent_hws = (const struct clk_hw *[]){
&nss_ppe_clk_src.clkr.hw },
@ -1071,7 +1056,7 @@ index 3f9c2f61a..f112baca0 100644
.flags = CLK_SET_RATE_PARENT,
.ops = &clk_branch2_ops,
},
@@ -3511,6 +4054,22 @@ static struct clk_branch gcc_prng_ahb_clk = {
@@ -3511,6 +4054,22 @@ static struct clk_branch gcc_prng_ahb_cl
},
};
@ -1094,7 +1079,7 @@ index 3f9c2f61a..f112baca0 100644
static struct clk_branch gcc_qdss_dap_clk = {
.halt_reg = 0x29084,
.clkr = {
@@ -3521,7 +4080,7 @@ static struct clk_branch gcc_qdss_dap_clk = {
@@ -3521,7 +4080,7 @@ static struct clk_branch gcc_qdss_dap_cl
.parent_hws = (const struct clk_hw *[]){
&qdss_dap_sync_clk_src.hw },
.num_parents = 1,
@ -1125,7 +1110,7 @@ index 3f9c2f61a..f112baca0 100644
};
static const struct alpha_pll_config nss_crypto_pll_config = {
@@ -4184,6 +4746,9 @@ static struct clk_hw *gcc_ipq6018_hws[] = {
@@ -4184,6 +4746,9 @@ static struct clk_hw *gcc_ipq6018_hws[]
&gpll6_out_main_div2.hw,
&qdss_dap_sync_clk_src.hw,
&qdss_tsctr_div2_clk_src.hw,
@ -1135,7 +1120,7 @@ index 3f9c2f61a..f112baca0 100644
};
static struct clk_regmap *gcc_ipq6018_clks[] = {
@@ -4281,6 +4846,7 @@ static struct clk_regmap *gcc_ipq6018_clks[] = {
@@ -4281,6 +4846,7 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_BLSP1_QUP4_SPI_APPS_CLK] = &gcc_blsp1_qup4_spi_apps_clk.clkr,
[GCC_BLSP1_QUP5_I2C_APPS_CLK] = &gcc_blsp1_qup5_i2c_apps_clk.clkr,
[GCC_BLSP1_QUP5_SPI_APPS_CLK] = &gcc_blsp1_qup5_spi_apps_clk.clkr,
@ -1143,7 +1128,7 @@ index 3f9c2f61a..f112baca0 100644
[GCC_BLSP1_QUP6_SPI_APPS_CLK] = &gcc_blsp1_qup6_spi_apps_clk.clkr,
[GCC_BLSP1_UART1_APPS_CLK] = &gcc_blsp1_uart1_apps_clk.clkr,
[GCC_BLSP1_UART2_APPS_CLK] = &gcc_blsp1_uart2_apps_clk.clkr,
@@ -4346,6 +4912,7 @@ static struct clk_regmap *gcc_ipq6018_clks[] = {
@@ -4346,6 +4912,7 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_SYS_NOC_PCIE0_AXI_CLK] = &gcc_sys_noc_pcie0_axi_clk.clkr,
[GCC_PCIE0_PIPE_CLK] = &gcc_pcie0_pipe_clk.clkr,
[GCC_PRNG_AHB_CLK] = &gcc_prng_ahb_clk.clkr,
@ -1151,7 +1136,7 @@ index 3f9c2f61a..f112baca0 100644
[GCC_QDSS_DAP_CLK] = &gcc_qdss_dap_clk.clkr,
[GCC_QPIC_AHB_CLK] = &gcc_qpic_ahb_clk.clkr,
[GCC_QPIC_CLK] = &gcc_qpic_clk.clkr,
@@ -4387,9 +4954,35 @@ static struct clk_regmap *gcc_ipq6018_clks[] = {
@@ -4387,9 +4954,35 @@ static struct clk_regmap *gcc_ipq6018_cl
[PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
[PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
@ -1187,7 +1172,7 @@ index 3f9c2f61a..f112baca0 100644
[GCC_LPASS_CORE_AXIM_CLK] = &gcc_lpass_core_axim_clk.clkr,
[LPASS_CORE_AXIM_CLK_SRC] = &lpass_core_axim_clk_src.clkr,
[GCC_LPASS_SNOC_CFG_CLK] = &gcc_lpass_snoc_cfg_clk.clkr,
@@ -4405,6 +4998,9 @@ static struct clk_regmap *gcc_ipq6018_clks[] = {
@@ -4405,6 +4998,9 @@ static struct clk_regmap *gcc_ipq6018_cl
[GCC_MEM_NOC_UBI32_CLK] = &gcc_mem_noc_ubi32_clk.clkr,
[GCC_MEM_NOC_LPASS_CLK] = &gcc_mem_noc_lpass_clk.clkr,
[GCC_SNOC_LPASS_CFG_CLK] = &gcc_snoc_lpass_cfg_clk.clkr,
@ -1197,7 +1182,7 @@ index 3f9c2f61a..f112baca0 100644
[QDSS_STM_CLK_SRC] = &qdss_stm_clk_src.clkr,
[QDSS_TRACECLKIN_CLK_SRC] = &qdss_traceclkin_clk_src.clkr,
};
@@ -4517,24 +5113,24 @@ static const struct qcom_reset_map gcc_ipq6018_resets[] = {
@@ -4517,24 +5113,24 @@ static const struct qcom_reset_map gcc_i
[GCC_PCIE0_AHB_ARES] = { 0x75040, 5 },
[GCC_PCIE0_AXI_MASTER_STICKY_ARES] = { 0x75040, 6 },
[GCC_PCIE0_AXI_SLAVE_STICKY_ARES] = { 0x75040, 7 },
@ -1238,7 +1223,7 @@ index 3f9c2f61a..f112baca0 100644
[GCC_LPASS_BCR] = {0x1F000, 0},
[GCC_UBI32_TBU_BCR] = {0x65000, 0},
[GCC_LPASS_TBU_BCR] = {0x6C000, 0},
@@ -4585,7 +5181,12 @@ static const struct qcom_cc_desc gcc_ipq6018_desc = {
@@ -4585,7 +5181,12 @@ static const struct qcom_cc_desc gcc_ipq
static int gcc_ipq6018_probe(struct platform_device *pdev)
{
@ -1251,7 +1236,7 @@ index 3f9c2f61a..f112baca0 100644
regmap = qcom_cc_map(pdev, &gcc_ipq6018_desc);
if (IS_ERR(regmap))
@@ -4608,13 +5209,24 @@ static int gcc_ipq6018_probe(struct platform_device *pdev)
@@ -4608,13 +5209,24 @@ static int gcc_ipq6018_probe(struct plat
clk_alpha_pll_configure(&nss_crypto_pll_main, regmap,
&nss_crypto_pll_config);
@ -1277,26 +1262,22 @@ index 3f9c2f61a..f112baca0 100644
.of_match_table = gcc_ipq6018_match_table,
},
};
diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index b99d2e9d1..231eb777a 100644
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -3062,6 +3062,10 @@ static const struct of_device_id qcom_nandc_of_match[] = {
.compatible = "qcom,ipq4019-nand",
@@ -3063,6 +3063,10 @@ static const struct of_device_id qcom_na
.data = &ipq4019_nandc_props,
},
+ {
{
+ .compatible = "qcom,ipq6018-nand",
+ .data = &ipq8074_nandc_props,
+ },
{
+ {
.compatible = "qcom,ipq8074-nand",
.data = &ipq8074_nandc_props,
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index b111dbc14..b5f7f4bfc 100644
},
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -299,6 +299,82 @@ static const struct qmp_phy_init_tbl ipq8074_usb3_pcs_tbl[] = {
@@ -299,6 +299,82 @@ static const struct qmp_phy_init_tbl ipq
QMP_PHY_INIT_CFG(QPHY_V3_PCS_TXDEEMPH_M3P5DB_V0, 0x0f),
};
@ -1379,7 +1360,7 @@ index b111dbc14..b5f7f4bfc 100644
static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = {
QMP_PHY_INIT_CFG(QSERDES_COM_BIAS_EN_CLKBUFLR_EN, 0x1c),
QMP_PHY_INIT_CFG(QSERDES_COM_CLK_ENABLE1, 0x10),
@@ -584,6 +660,113 @@ static const struct qmp_phy_init_tbl msm8996_usb3_rx_tbl[] = {
@@ -584,6 +660,113 @@ static const struct qmp_phy_init_tbl msm
QMP_PHY_INIT_CFG(QSERDES_RX_SIGDET_DEGLITCH_CNTRL, 0x16),
};
@ -1493,7 +1474,7 @@ index b111dbc14..b5f7f4bfc 100644
static const struct qmp_phy_init_tbl msm8996_usb3_pcs_tbl[] = {
/* FLL settings */
QMP_PHY_INIT_CFG_L(QPHY_FLL_CNTRL2, 0x03),
@@ -2196,6 +2379,30 @@ static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = {
@@ -2196,6 +2379,30 @@ static const struct qmp_phy_cfg ipq8074_
.pwrdn_ctrl = SW_PWRDN,
};
@ -1524,7 +1505,7 @@ index b111dbc14..b5f7f4bfc 100644
static const struct qmp_phy_cfg msm8996_pciephy_cfg = {
.type = PHY_TYPE_PCIE,
.nlanes = 3,
@@ -2344,6 +2551,36 @@ static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = {
@@ -2344,6 +2551,36 @@ static const struct qmp_phy_cfg ipq8074_
.pwrdn_delay_max = 1005, /* us */
};
@ -1561,7 +1542,7 @@ index b111dbc14..b5f7f4bfc 100644
static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = {
.type = PHY_TYPE_PCIE,
.nlanes = 1,
@@ -4002,6 +4239,9 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,
@@ -4002,6 +4239,9 @@ int qcom_qmp_phy_create(struct device *d
static const struct of_device_id qcom_qmp_phy_of_match_table[] = {
{
@ -1571,8 +1552,6 @@ index b111dbc14..b5f7f4bfc 100644
.compatible = "qcom,ipq8074-qmp-usb3-phy",
.data = &ipq8074_usb3phy_cfg,
}, {
diff --git a/drivers/phy/qualcomm/phy-qcom-qusb2.c b/drivers/phy/qualcomm/phy-qcom-qusb2.c
index f531043ec..be31880f9 100644
--- a/drivers/phy/qualcomm/phy-qcom-qusb2.c
+++ b/drivers/phy/qualcomm/phy-qcom-qusb2.c
@@ -22,6 +22,7 @@
@ -1583,7 +1562,7 @@ index f531043ec..be31880f9 100644
#define QUSB2PHY_PLL_TEST 0x04
#define CLK_REF_SEL BIT(7)
@@ -224,6 +225,22 @@ static const struct qusb2_phy_init_tbl qusb2_v2_init_tbl[] = {
@@ -224,6 +225,22 @@ static const struct qusb2_phy_init_tbl q
QUSB2_PHY_INIT_CFG(QUSB2PHY_CHG_CTRL2, 0x0),
};
@ -1606,7 +1585,7 @@ index f531043ec..be31880f9 100644
struct qusb2_phy_cfg {
const struct qusb2_phy_init_tbl *tbl;
/* number of entries in the table */
@@ -258,6 +275,17 @@ static const struct qusb2_phy_cfg msm8996_phy_cfg = {
@@ -258,6 +275,17 @@ static const struct qusb2_phy_cfg msm899
.autoresume_en = BIT(3),
};
@ -1624,7 +1603,7 @@ index f531043ec..be31880f9 100644
static const struct qusb2_phy_cfg msm8998_phy_cfg = {
.tbl = msm8998_init_tbl,
.tbl_num = ARRAY_SIZE(msm8998_init_tbl),
@@ -814,6 +842,9 @@ static const struct phy_ops qusb2_phy_gen_ops = {
@@ -814,6 +842,9 @@ static const struct phy_ops qusb2_phy_ge
static const struct of_device_id qusb2_phy_of_match_table[] = {
{
@ -1634,8 +1613,6 @@ index f531043ec..be31880f9 100644
.compatible = "qcom,ipq8074-qusb2-phy",
.data = &msm8996_phy_cfg,
}, {
diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index fff526124..538143371 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -91,7 +91,7 @@
@ -1647,7 +1624,7 @@ index fff526124..538143371 100644
WCSS_QCS404,
};
@@ -902,7 +902,7 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,
@@ -902,7 +902,7 @@ static int q6v5_wcss_init_mmio(struct q6
if (!wcss->reg_base)
return -ENOMEM;
@ -1656,7 +1633,7 @@ index fff526124..538143371 100644
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rmb");
wcss->rmb_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(wcss->rmb_base))
@@ -1188,6 +1188,21 @@ static const struct wcss_data wcss_ipq8074_res_init = {
@@ -1188,6 +1188,21 @@ static const struct wcss_data wcss_ipq80
.need_auto_boot = false,
};
@ -1678,7 +1655,7 @@ index fff526124..538143371 100644
static const struct wcss_data wcss_qcs404_res_init = {
.init_clock = qcs404_init_clock,
.init_regulator = qcs404_init_regulator,
@@ -1207,6 +1222,7 @@ static const struct wcss_data wcss_qcs404_res_init = {
@@ -1207,6 +1222,7 @@ static const struct wcss_data wcss_qcs40
static const struct of_device_id q6v5_wcss_of_match[] = {
{ .compatible = "qcom,ipq8074-wcss-pil", .data = &wcss_ipq8074_res_init },
@ -1686,11 +1663,9 @@ index fff526124..538143371 100644
{ .compatible = "qcom,qcs404-wcss-pil", .data = &wcss_qcs404_res_init },
{ },
};
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
index 2a29e2f68..faf7a816c 100644
--- a/drivers/usb/dwc3/dwc3-qcom.c
+++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -440,7 +440,7 @@ static int dwc3_qcom_get_irq(struct platform_device *pdev,
@@ -440,7 +440,7 @@ static int dwc3_qcom_get_irq(struct plat
struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
struct platform_device *pdev_irq = qcom->urs_usb ? qcom->urs_usb : pdev;
struct device_node *np = pdev->dev.of_node;
@ -1699,7 +1674,7 @@ index 2a29e2f68..faf7a816c 100644
if (np)
ret = platform_get_irq_byname(pdev_irq, name);
@@ -852,18 +852,19 @@ static int dwc3_qcom_remove(struct platform_device *pdev)
@@ -852,18 +852,19 @@ static int dwc3_qcom_remove(struct platf
of_platform_depopulate(dev);
@ -1725,8 +1700,6 @@ index 2a29e2f68..faf7a816c 100644
return 0;
}
diff --git a/include/dt-bindings/clock/qcom,gcc-ipq6018.h b/include/dt-bindings/clock/qcom,gcc-ipq6018.h
index 6f4be3aa0..f2a189e5a 100644
--- a/include/dt-bindings/clock/qcom,gcc-ipq6018.h
+++ b/include/dt-bindings/clock/qcom,gcc-ipq6018.h
@@ -1,6 +1,6 @@
@ -1737,8 +1710,6 @@ index 6f4be3aa0..f2a189e5a 100644
*/
#ifndef _DT_BINDINGS_CLOCK_IPQ_GCC_6018_H
diff --git a/include/dt-bindings/reset/qcom,gcc-ipq6018.h b/include/dt-bindings/reset/qcom,gcc-ipq6018.h
index 02a220ad0..5e9a0b492 100644
--- a/include/dt-bindings/reset/qcom,gcc-ipq6018.h
+++ b/include/dt-bindings/reset/qcom,gcc-ipq6018.h
@@ -1,6 +1,6 @@
@ -1749,24 +1720,19 @@ index 02a220ad0..5e9a0b492 100644
*/
#ifndef _DT_BINDINGS_RESET_IPQ_GCC_6018_H
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 1a8d25f2e..9860ffd2d 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -66,7 +66,8 @@ struct memblock_region {
struct memblock_type {
@@ -67,6 +67,7 @@ struct memblock_type {
unsigned long cnt;
unsigned long max;
phys_addr_t total_size;
phys_addr_t total_size;
+ phys_addr_t start_base; /* start of the region */
struct memblock_region *regions;
char *name;
};
diff --git a/mm/memblock.c b/mm/memblock.c
index c337df03b..b5ea98bfd 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1611,7 +1611,7 @@ phys_addr_t __init_memblock memblock_reserved_size(void)
@@ -1611,7 +1611,7 @@ phys_addr_t __init_memblock memblock_res
/* lowest address */
phys_addr_t __init_memblock memblock_start_of_DRAM(void)
{
@ -1775,11 +1741,9 @@ index c337df03b..b5ea98bfd 100644
}
phys_addr_t __init_memblock memblock_end_of_DRAM(void)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 8e8c7e527..0ecc7bfe7 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -216,6 +216,15 @@ dtc_cpp_flags = -Wp,-MMD,$(depfile).pre.tmp -nostdinc \
@@ -216,6 +216,15 @@ dtc_cpp_flags = -Wp,-MMD,$(depfile).pre
$(addprefix -I,$(DTC_INCLUDE)) \
-undef -D__DTS__

2
target/linux/ipq60xx/patches-5.10/995-ipq6018-mem-block.patch
View File

@ -2,7 +2,7 @@
index b5ea98bfd..b0fecc325 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -578,6 +578,7 @@ static int __init_memblock memblock_add_range(struct memblock_type *type,
@@ -578,6 +578,7 @@ static int __init_memblock memblock_add_
/* special case for empty array */
if (type->regions[0].size == 0) {
WARN_ON(type->cnt != 1 || type->total_size);

10
target/linux/ipq60xx/patches-5.10/996-clk-alpha-pll.patch
View File

@ -1,6 +1,5 @@
diff -uprN a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
--- a/drivers/clk/qcom/clk-alpha-pll.c 2021-12-04 02:53:12.090224000 -0800
+++ b/drivers/clk/qcom/clk-alpha-pll.c 2021-12-03 20:40:31.720683000 -0800
--- a/drivers/clk/qcom/clk-alpha-pll.c
+++ b/drivers/clk/qcom/clk-alpha-pll.c
@@ -127,7 +127,19 @@ const u8 clk_alpha_pll_regs[][PLL_OFF_MA
[PLL_OFF_TEST_CTL] = 0x30,
[PLL_OFF_TEST_CTL_U] = 0x34,
@ -201,9 +200,8 @@ diff -uprN a/drivers/clk/qcom/clk-alpha-pll.c b/drivers/clk/qcom/clk-alpha-pll.c
const struct clk_ops clk_alpha_pll_fixed_trion_ops = {
.enable = clk_trion_pll_enable,
.disable = clk_trion_pll_disable,
diff -uprN a/drivers/clk/qcom/clk-alpha-pll.h b/drivers/clk/qcom/clk-alpha-pll.h
--- a/drivers/clk/qcom/clk-alpha-pll.h 2021-12-04 02:53:12.090224000 -0800
+++ b/drivers/clk/qcom/clk-alpha-pll.h 2021-12-03 20:44:01.804838000 -0800
--- a/drivers/clk/qcom/clk-alpha-pll.h
+++ b/drivers/clk/qcom/clk-alpha-pll.h
@@ -16,6 +16,7 @@ enum {
CLK_ALPHA_PLL_TYPE_TRION,
CLK_ALPHA_PLL_TYPE_LUCID = CLK_ALPHA_PLL_TYPE_TRION,

5
target/linux/ipq60xx/patches-5.10/999-add-ipq6018-dts.patch
View File

@ -1,6 +1,5 @@
diff -uprN a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi 2021-11-26 01:39:22.000000000 -0800
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi 2021-12-04 06:22:54.404380737 -0800
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -9,6 +9,10 @@
#include <dt-bindings/clock/qcom,gcc-ipq6018.h>
#include <dt-bindings/reset/qcom,gcc-ipq6018.h>