Skip to content

Commit

Permalink
kernel: bump 5.15 to 5.15.117
Browse files Browse the repository at this point in the history
Manually rebased:
	generic/backport-5.15/346-v5.18-01-Revert-ata-ahci-mvebu-Make-SATA-PHY-optional-for-Arm.patch

Removed upstreamed:
	generic/backport-5.15/830-v6.2-ata-ahci-fix-enum-constants-for-gcc-13.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3

Signed-off-by: John Audia <[email protected]>
(cherry picked from commit 0e89ba8)
  • Loading branch information
graysky2 authored and hauke committed Jun 17, 2023
1 parent 1de5f74 commit 1b6f2af
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 384 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .116
LINUX_KERNEL_HASH-5.15.116 = f617c9d1bb5326cc93495938f43eb8cb9aea9d2f451e5a99bce2893f296e179a
LINUX_VERSION-5.15 = .117
LINUX_KERNEL_HASH-5.15.117 = a9a8331f3c0e004b40a41f30d688b53bf85405597ac41c2c89be7f4fbcf7239f
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ SVN-Revision: 35130
case IPV6_2292HOPOPTS:
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -1009,7 +1009,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
@@ -1002,7 +1002,7 @@ static bool ipv6_hop_jumbo(struct sk_buf
goto drop;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ Signed-off-by: Vinod Koul <[email protected]>

--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -240,8 +240,6 @@ enum {
as default lpm_policy */
AHCI_HFLAG_SUSPEND_PHYS = (1 << 26), /* handle PHYs during
suspend/resume */
- AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = (1 << 27), /* ignore -EOPNOTSUPP
- from phy_power_on() */
AHCI_HFLAG_NO_SXS = (1 << 28), /* SXS not supported */
@@ -241,8 +241,6 @@ enum {
as default lpm_policy */
AHCI_HFLAG_SUSPEND_PHYS = BIT(26), /* handle PHYs during
suspend/resume */
- AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = BIT(27), /* ignore -EOPNOTSUPP
- from phy_power_on() */
AHCI_HFLAG_NO_SXS = BIT(28), /* SXS not supported */

/* ap->flags bits */
--- a/drivers/ata/ahci_mvebu.c
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
static inline void
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -872,6 +872,7 @@ enum net_device_path_type {
@@ -875,6 +875,7 @@ enum net_device_path_type {
DEV_PATH_BRIDGE,
DEV_PATH_PPPOE,
DEV_PATH_DSA,
+ DEV_PATH_MTK_WDMA,
};

struct net_device_path {
@@ -897,6 +898,12 @@ struct net_device_path {
@@ -900,6 +901,12 @@ struct net_device_path {
int port;
u16 proto;
} dsa;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra <[email protected]>

--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -2735,7 +2735,7 @@ int nf_conntrack_init_start(void)
@@ -2738,7 +2738,7 @@ int nf_conntrack_init_start(void)

if (!nf_conntrack_htable_size) {
nf_conntrack_htable_size
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1679,6 +1679,10 @@ enum netdev_priv_flags {
@@ -1682,6 +1682,10 @@ enum netdev_priv_flags {
IFF_TX_SKB_NO_LINEAR = BIT_ULL(31),
};

Expand All @@ -30,23 +30,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
#define IFF_EBRIDGE IFF_EBRIDGE
#define IFF_BONDING IFF_BONDING
@@ -1711,6 +1715,7 @@ enum netdev_priv_flags {
@@ -1714,6 +1718,7 @@ enum netdev_priv_flags {
#define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER
#define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK
#define IFF_TX_SKB_NO_LINEAR IFF_TX_SKB_NO_LINEAR
+#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN

/* Specifies the type of the struct net_device::ml_priv pointer */
enum netdev_ml_priv_type {
@@ -2012,6 +2017,7 @@ struct net_device {
@@ -2015,6 +2020,7 @@ struct net_device {
/* Read-mostly cache-line for fast-path access */
unsigned int flags;
unsigned int priv_flags;
+ unsigned int extra_priv_flags;
const struct net_device_ops *netdev_ops;
int ifindex;
unsigned short gflags;
@@ -2072,6 +2078,11 @@ struct net_device {
@@ -2075,6 +2081,11 @@ struct net_device {
const struct tlsdev_ops *tlsdev_ops;
#endif

Expand All @@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
const struct header_ops *header_ops;

unsigned char operstate;
@@ -2146,6 +2157,10 @@ struct net_device {
@@ -2149,6 +2160,10 @@ struct net_device {
struct mctp_dev __rcu *mctp_ptr;
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2098,6 +2098,8 @@ struct net_device {
@@ -2101,6 +2101,8 @@ struct net_device {
struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs;

Expand All @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
__u8 inner_protocol_type:1;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6067,6 +6067,9 @@ static enum gro_result dev_gro_receive(s
@@ -6069,6 +6069,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;

Expand All @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (netif_elide_gro(skb->dev))
goto normal;

@@ -8081,6 +8084,48 @@ static void __netdev_adjacent_dev_unlink
@@ -8083,6 +8086,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}

Expand Down Expand Up @@ -91,23 +91,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
@@ -8132,6 +8177,7 @@ static int __netdev_upper_dev_link(struc
@@ -8134,6 +8179,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;

+ netdev_update_addr_mask(dev);
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -8228,6 +8274,7 @@ static void __netdev_upper_dev_unlink(st
@@ -8230,6 +8276,7 @@ static void __netdev_upper_dev_unlink(st

__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);

+ netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);

@@ -9047,6 +9094,7 @@ int dev_set_mac_address(struct net_devic
@@ -9049,6 +9096,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

/**
* napi_disable - prevent NAPI from scheduling
@@ -3365,6 +3366,7 @@ struct softnet_data {
@@ -3368,6 +3369,7 @@ struct softnet_data {
unsigned int processed;
unsigned int time_squeeze;
unsigned int received_rps;
Expand All @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#endif
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4576,7 +4576,7 @@ static int rps_ipi_queued(struct softnet
@@ -4578,7 +4578,7 @@ static int rps_ipi_queued(struct softnet
#ifdef CONFIG_RPS
struct softnet_data *mysd = this_cpu_ptr(&softnet_data);

Expand All @@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
sd->rps_ipi_next = mysd->rps_ipi_list;
mysd->rps_ipi_list = sd;

@@ -5757,6 +5757,8 @@ static DEFINE_PER_CPU(struct work_struct
@@ -5759,6 +5759,8 @@ static DEFINE_PER_CPU(struct work_struct
/* Network device is going away, flush any packets still pending */
static void flush_backlog(struct work_struct *work)
{
Expand All @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
struct sk_buff *skb, *tmp;
struct softnet_data *sd;

@@ -5772,9 +5774,18 @@ static void flush_backlog(struct work_st
@@ -5774,9 +5776,18 @@ static void flush_backlog(struct work_st
input_queue_head_incr(sd);
}
}
Expand All @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
if (skb->dev->reg_state == NETREG_UNREGISTERING) {
__skb_unlink(skb, &sd->process_queue);
@@ -5782,7 +5793,18 @@ static void flush_backlog(struct work_st
@@ -5784,7 +5795,18 @@ static void flush_backlog(struct work_st
input_queue_head_incr(sd);
}
}
Expand All @@ -86,15 +86,15 @@ Signed-off-by: Felix Fietkau <[email protected]>
}

static bool flush_required(int cpu)
@@ -6465,6 +6487,7 @@ static int process_backlog(struct napi_s
@@ -6467,6 +6489,7 @@ static int process_backlog(struct napi_s

local_irq_disable();
rps_lock(sd);
+ sd->process_queue_empty++;
if (skb_queue_empty(&sd->input_pkt_queue)) {
/*
* Inline a custom version of __napi_complete().
@@ -6474,7 +6497,8 @@ static int process_backlog(struct napi_s
@@ -6476,7 +6499,8 @@ static int process_backlog(struct napi_s
* We can use a plain write instead of clear_bit(),
* and we dont need an smp_mb() memory barrier.
*/
Expand All @@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
again = false;
} else {
skb_queue_splice_tail_init(&sd->input_pkt_queue,
@@ -6891,6 +6915,57 @@ int dev_set_threaded(struct net_device *
@@ -6893,6 +6917,57 @@ int dev_set_threaded(struct net_device *
}
EXPORT_SYMBOL(dev_set_threaded);

Expand Down Expand Up @@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
int (*poll)(struct napi_struct *, int), int weight)
{
@@ -11369,6 +11444,9 @@ static int dev_cpu_dead(unsigned int old
@@ -11371,6 +11446,9 @@ static int dev_cpu_dead(unsigned int old
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable();

Expand All @@ -172,7 +172,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#ifdef CONFIG_RPS
remsd = oldsd->rps_ipi_list;
oldsd->rps_ipi_list = NULL;
@@ -11708,6 +11786,7 @@ static int __init net_dev_init(void)
@@ -11710,6 +11788,7 @@ static int __init net_dev_init(void)
sd->cpu = i;
#endif

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ Signed-off-by: Wolfram Sang <[email protected]>

--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -989,7 +989,7 @@ mv64xxx_i2c_probe(struct platform_device
@@ -1000,7 +1000,7 @@ mv64xxx_i2c_probe(struct platform_device
if (IS_ERR(drv_data->reg_base))
return PTR_ERR(drv_data->reg_base);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: David Abdurachmanov <[email protected]>

--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -565,6 +565,14 @@ config BUILTIN_DTB
@@ -566,6 +566,14 @@ config BUILTIN_DTB
depends on OF
default y if XIP_KERNEL

Expand Down

0 comments on commit 1b6f2af

Please sign in to comment.