ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 06:08:08 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

kernel: bump 5.4 to 5.4.161

Browse Source 
Removed upstreamed:
    ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1]

Manually rebased:
    layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
    octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch

All other patches automatically rebased.

1. Private email exchange with patch author, Hauke Mehrtens

Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
John Audia 2021-11-27 14:56:33 -05:00 committed by Hauke Mehrtens
parent 26a7a385bb
commit bbdc13b15b
31 changed files with 66 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif endif
LINUX_VERSION-5.4 = .159 LINUX_VERSION-5.4 = .161
LINUX_VERSION-5.10 = .82 LINUX_VERSION-5.10 = .82
LINUX_KERNEL_HASH-5.4.159 = d718325f4eab325dce4f82b88418f68ba130864118229539541331e0a4478643 LINUX_KERNEL_HASH-5.4.161 = 3149c6b52a3079218a60bd369a80d18275b574d84908ffee32a0a8f9ddf939a7
LINUX_KERNEL_HASH-5.10.82 = d66f7c7eed02f84ae550b3c91a26c70eea13682a6d672432f07bce66ff8ce350 LINUX_KERNEL_HASH-5.10.82 = d66f7c7eed02f84ae550b3c91a26c70eea13682a6d672432f07bce66ff8ce350
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

10
target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
View File

@ -48,7 +48,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
#include "xhci.h" #include "xhci.h"
#include "xhci-trace.h" #include "xhci-trace.h"
@@ -65,6 +67,44 @@ @@ -72,6 +74,44 @@
#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142 #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142
#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242 #define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242
@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
static const char hcd_name[] = "xhci_hcd"; static const char hcd_name[] = "xhci_hcd";
static struct hc_driver __read_mostly xhci_pci_hc_driver; static struct hc_driver __read_mostly xhci_pci_hc_driver;
@@ -311,6 +351,873 @@ static void xhci_pme_acpi_rtd3_enable(st @@ -327,6 +367,873 @@ static void xhci_pme_acpi_rtd3_enable(st
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
/* called during probe() after chip reset completes */ /* called during probe() after chip reset completes */
static int xhci_pci_setup(struct usb_hcd *hcd) static int xhci_pci_setup(struct usb_hcd *hcd)
{ {
@@ -352,6 +1259,27 @@ static int xhci_pci_probe(struct pci_dev @@ -368,6 +1275,27 @@ static int xhci_pci_probe(struct pci_dev
struct hc_driver *driver; struct hc_driver *driver;
struct usb_hcd *hcd; struct usb_hcd *hcd;
@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
driver = (struct hc_driver *)id->driver_data; driver = (struct hc_driver *)id->driver_data;
/* Prevent runtime suspending between USB-2 and USB-3 initialization */ /* Prevent runtime suspending between USB-2 and USB-3 initialization */
@@ -413,6 +1341,16 @@ static void xhci_pci_remove(struct pci_d @@ -429,6 +1357,16 @@ static void xhci_pci_remove(struct pci_d
{ {
struct xhci_hcd *xhci; struct xhci_hcd *xhci;
@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
xhci = hcd_to_xhci(pci_get_drvdata(dev)); xhci = hcd_to_xhci(pci_get_drvdata(dev));
xhci->xhc_state |= XHCI_STATE_REMOVING; xhci->xhc_state |= XHCI_STATE_REMOVING;
@@ -552,6 +1490,11 @@ static int xhci_pci_resume(struct usb_hc @@ -568,6 +1506,11 @@ static int xhci_pci_resume(struct usb_hc
if (pdev->vendor == PCI_VENDOR_ID_INTEL) if (pdev->vendor == PCI_VENDOR_ID_INTEL)
usb_enable_intel_xhci_ports(pdev); usb_enable_intel_xhci_ports(pdev);

2
target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch
View File

@ -13,7 +13,7 @@ produce a noisy warning.
--- a/drivers/usb/host/xhci-pci.c --- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c
@@ -290,6 +290,7 @@ static void xhci_pci_quirks(struct devic @@ -297,6 +297,7 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x0015) { pdev->device == 0x0015) {
xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_RESET_ON_RESUME;
xhci->quirks |= XHCI_ZERO_64B_REGS; xhci->quirks |= XHCI_ZERO_64B_REGS;

2
target/linux/ath79/patches-5.4/910-unaligned_access_hacks.patch
View File

@ -754,7 +754,7 @@
ptr = ip6hoff + sizeof(struct ipv6hdr); ptr = ip6hoff + sizeof(struct ipv6hdr);
--- a/include/net/neighbour.h --- a/include/net/neighbour.h
+++ b/include/net/neighbour.h +++ b/include/net/neighbour.h
@@ -274,8 +274,10 @@ static inline bool neigh_key_eq128(const @@ -275,8 +275,10 @@ static inline bool neigh_key_eq128(const
const u32 *n32 = (const u32 *)n->primary_key; const u32 *n32 = (const u32 *)n->primary_key;
const u32 *p32 = pkey; const u32 *p32 = pkey;

54
target/linux/ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch
View File

@ -1,54 +0,0 @@
From 4d3c17975c7814884a721fe693b3adf5c426d759 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 10 Nov 2015 22:18:39 +0100
Subject: [RFC] serial: core: add support for boot console with arbitrary
baud rates
The Arduino Yun uses a baud rate of 250000 by default. The serial is
going over the Atmel ATmega and is used to connect to this chip.
Without this patch Linux wants to switch the console to 9600 Baud.
With this patch Linux will use the configured baud rate and not a
default one specified in uart_register_driver().
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
[rebased to 4.14, slightly reworded commit message]
Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---
drivers/tty/serial/serial_core.c | 6 +++++-
include/linux/console.h | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -220,6 +220,8 @@ static int uart_port_startup(struct tty_
if (retval == 0) {
if (uart_console(uport) && uport->cons->cflag) {
tty->termios.c_cflag = uport->cons->cflag;
+ tty->termios.c_ospeed = uport->cons->baud;
+ tty->termios.c_ispeed = uport->cons->baud;
uport->cons->cflag = 0;
}
/*
@@ -2110,8 +2112,10 @@ uart_set_options(struct uart_port *port,
* Allow the setting of the UART parameters with a NULL console
* too:
*/
- if (co)
+ if (co) {
co->cflag = termios.c_cflag;
+ co->baud = baud;
+ }
return 0;
}
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -153,6 +153,7 @@ struct console {
short flags;
short index;
int cflag;
+ int baud;
void *data;
struct console *next;
};

2
target/linux/generic/backport-5.4/700-v5.5-net-core-allow-fast-GRO-for-skbs-with-Ethernet-heade.patch
View File

@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/net/core/dev.c --- a/net/core/dev.c
+++ b/net/core/dev.c +++ b/net/core/dev.c
@@ -5429,8 +5429,7 @@ static inline void skb_gro_reset_offset( @@ -5432,8 +5432,7 @@ static inline void skb_gro_reset_offset(
NAPI_GRO_CB(skb)->frag0 = NULL; NAPI_GRO_CB(skb)->frag0 = NULL;
NAPI_GRO_CB(skb)->frag0_len = 0; NAPI_GRO_CB(skb)->frag0_len = 0;

4
target/linux/generic/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View File

@ -1385,7 +1385,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (ret) if (ret)
--- a/drivers/net/ethernet/ti/davinci_emac.c --- a/drivers/net/ethernet/ti/davinci_emac.c
+++ b/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c
@@ -1685,7 +1685,6 @@ davinci_emac_of_get_pdata(struct platfor @@ -1697,7 +1697,6 @@ davinci_emac_of_get_pdata(struct platfor
const struct of_device_id *match; const struct of_device_id *match;
const struct emac_platform_data *auxdata; const struct emac_platform_data *auxdata;
struct emac_platform_data *pdata = NULL; struct emac_platform_data *pdata = NULL;
@ -1393,7 +1393,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (!IS_ENABLED(CONFIG_OF) || !pdev->dev.of_node) if (!IS_ENABLED(CONFIG_OF) || !pdev->dev.of_node)
return dev_get_platdata(&pdev->dev); return dev_get_platdata(&pdev->dev);
@@ -1697,11 +1696,8 @@ davinci_emac_of_get_pdata(struct platfor @@ -1709,11 +1708,8 @@ davinci_emac_of_get_pdata(struct platfor
np = pdev->dev.of_node; np = pdev->dev.of_node;
pdata->version = EMAC_VERSION_2; pdata->version = EMAC_VERSION_2;

2
target/linux/generic/hack-5.4/661-use_fq_codel_by_default.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/net/sch_generic.h --- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h +++ b/include/net/sch_generic.h
@@ -615,12 +615,13 @@ extern struct Qdisc_ops noop_qdisc_ops; @@ -617,12 +617,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
extern struct Qdisc_ops pfifo_fast_ops; extern struct Qdisc_ops pfifo_fast_ops;
extern struct Qdisc_ops mq_qdisc_ops; extern struct Qdisc_ops mq_qdisc_ops;
extern struct Qdisc_ops noqueue_qdisc_ops; extern struct Qdisc_ops noqueue_qdisc_ops;

2
target/linux/generic/hack-5.4/721-phy_packets.patch
View File

@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
help help
--- a/net/core/dev.c --- a/net/core/dev.c
+++ b/net/core/dev.c +++ b/net/core/dev.c
@@ -3198,10 +3198,20 @@ static int xmit_one(struct sk_buff *skb, @@ -3200,10 +3200,20 @@ static int xmit_one(struct sk_buff *skb,
if (dev_nit_active(dev)) if (dev_nit_active(dev))
dev_queue_xmit_nit(skb, dev); dev_queue_xmit_nit(skb, dev);

2
target/linux/generic/hack-5.4/904-debloat_dma_buf.patch
View File

@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
selftest.o \ selftest.o \
--- a/drivers/dma-buf/dma-buf.c --- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c
@@ -1313,4 +1313,5 @@ static void __exit dma_buf_deinit(void) @@ -1314,4 +1314,5 @@ static void __exit dma_buf_deinit(void)
dma_buf_uninit_debugfs(); dma_buf_uninit_debugfs();
kern_unmount(dma_buf_mnt); kern_unmount(dma_buf_mnt);
} }

2
target/linux/generic/pending-5.4/103-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 --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -2039,7 +2039,8 @@ config CPU_MIPS32 @@ -2040,7 +2040,8 @@ config CPU_MIPS32
config CPU_MIPS64 config CPU_MIPS64
bool bool

2
target/linux/generic/pending-5.4/300-mips_expose_boot_raw.patch
View File

@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480 config CEVT_BCM1480
bool bool
@@ -3046,6 +3043,18 @@ choice @@ -3047,6 +3044,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments" bool "Extend builtin kernel arguments with bootloader arguments"
endchoice endchoice

10
target/linux/generic/pending-5.4/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 */ __u16 tc_index; /* traffic control index */
--- a/net/core/dev.c --- a/net/core/dev.c
+++ b/net/core/dev.c +++ b/net/core/dev.c
@@ -5495,6 +5495,9 @@ static enum gro_result dev_gro_receive(s @@ -5498,6 +5498,9 @@ static enum gro_result dev_gro_receive(s
int same_flow; int same_flow;
int grow; int grow;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev)) if (netif_elide_gro(skb->dev))
goto normal; goto normal;
@@ -7297,6 +7300,48 @@ static void __netdev_adjacent_dev_unlink @@ -7300,6 +7303,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower); &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, static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master, struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info, void *upper_priv, void *upper_info,
@@ -7347,6 +7392,7 @@ static int __netdev_upper_dev_link(struc @@ -7350,6 +7395,7 @@ static int __netdev_upper_dev_link(struc
if (ret) if (ret)
return ret; return ret;
@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info); &changeupper_info.info);
ret = notifier_to_errno(ret); ret = notifier_to_errno(ret);
@@ -7440,6 +7486,7 @@ void netdev_upper_dev_unlink(struct net_ @@ -7443,6 +7489,7 @@ void netdev_upper_dev_unlink(struct net_
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); __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, call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info); &changeupper_info.info);
@@ -8170,6 +8217,7 @@ int dev_set_mac_address(struct net_devic @@ -8173,6 +8220,7 @@ int dev_set_mac_address(struct net_devic
if (err) if (err)
return err; return err;
dev->addr_assign_type = NET_ADDR_SET; dev->addr_assign_type = NET_ADDR_SET;

18
target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
View File

@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int netif_rx_internal(struct sk_buff *skb); static int netif_rx_internal(struct sk_buff *skb);
static int call_netdevice_notifiers_info(unsigned long val, static int call_netdevice_notifiers_info(unsigned long val,
@@ -5937,6 +5938,11 @@ void __napi_schedule(struct napi_struct @@ -5940,6 +5941,11 @@ void __napi_schedule(struct napi_struct
{ {
unsigned long flags; unsigned long flags;
@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
local_irq_save(flags); local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n); ____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags); local_irq_restore(flags);
@@ -5988,6 +5994,10 @@ EXPORT_SYMBOL(napi_schedule_prep); @@ -5991,6 +5997,10 @@ EXPORT_SYMBOL(napi_schedule_prep);
*/ */
void __napi_schedule_irqoff(struct napi_struct *n) void __napi_schedule_irqoff(struct napi_struct *n)
{ {
@ -118,7 +118,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!IS_ENABLED(CONFIG_PREEMPT_RT)) if (!IS_ENABLED(CONFIG_PREEMPT_RT))
____napi_schedule(this_cpu_ptr(&softnet_data), n); ____napi_schedule(this_cpu_ptr(&softnet_data), n);
else else
@@ -6252,9 +6262,89 @@ static void init_gro_hash(struct napi_st @@ -6255,9 +6265,89 @@ static void init_gro_hash(struct napi_st
napi->gro_bitmask = 0; napi->gro_bitmask = 0;
} }
@ -208,7 +208,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
INIT_LIST_HEAD(&napi->poll_list); INIT_LIST_HEAD(&napi->poll_list);
hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED); hrtimer_init(&napi->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_PINNED);
napi->timer.function = napi_watchdog; napi->timer.function = napi_watchdog;
@@ -6271,6 +6361,7 @@ void netif_napi_add(struct net_device *d @@ -6274,6 +6364,7 @@ void netif_napi_add(struct net_device *d
#ifdef CONFIG_NETPOLL #ifdef CONFIG_NETPOLL
napi->poll_owner = -1; napi->poll_owner = -1;
#endif #endif
@ -216,7 +216,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
set_bit(NAPI_STATE_SCHED, &napi->state); set_bit(NAPI_STATE_SCHED, &napi->state);
set_bit(NAPI_STATE_NPSVC, &napi->state); set_bit(NAPI_STATE_NPSVC, &napi->state);
list_add_rcu(&napi->dev_list, &dev->napi_list); list_add_rcu(&napi->dev_list, &dev->napi_list);
@@ -6311,6 +6402,7 @@ static void flush_gro_hash(struct napi_s @@ -6314,6 +6405,7 @@ static void flush_gro_hash(struct napi_s
void netif_napi_del(struct napi_struct *napi) void netif_napi_del(struct napi_struct *napi)
{ {
might_sleep(); might_sleep();
@ -224,7 +224,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (napi_hash_del(napi)) if (napi_hash_del(napi))
synchronize_net(); synchronize_net();
list_del_init(&napi->dev_list); list_del_init(&napi->dev_list);
@@ -6323,50 +6415,18 @@ EXPORT_SYMBOL(netif_napi_del); @@ -6326,50 +6418,18 @@ EXPORT_SYMBOL(netif_napi_del);
static int napi_poll(struct napi_struct *n, struct list_head *repoll) static int napi_poll(struct napi_struct *n, struct list_head *repoll)
{ {
@ -279,7 +279,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Some drivers may have called napi_schedule /* Some drivers may have called napi_schedule
* prior to exhausting their budget. * prior to exhausting their budget.
@@ -10346,6 +10406,10 @@ static int __init net_dev_init(void) @@ -10349,6 +10409,10 @@ static int __init net_dev_init(void)
sd->backlog.weight = weight_p; sd->backlog.weight = weight_p;
} }
@ -292,7 +292,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* The loopback device is special if any other network devices /* The loopback device is special if any other network devices
--- a/net/core/net-sysfs.c --- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c
@@ -442,6 +442,52 @@ static ssize_t proto_down_store(struct d @@ -470,6 +470,52 @@ static ssize_t proto_down_store(struct d
} }
NETDEVICE_SHOW_RW(proto_down, fmt_dec); NETDEVICE_SHOW_RW(proto_down, fmt_dec);
@ -345,7 +345,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static ssize_t phys_port_id_show(struct device *dev, static ssize_t phys_port_id_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
@@ -532,6 +578,7 @@ static struct attribute *net_class_attrs @@ -581,6 +627,7 @@ static struct attribute *net_class_attrs
&dev_attr_flags.attr, &dev_attr_flags.attr,
&dev_attr_tx_queue_len.attr, &dev_attr_tx_queue_len.attr,
&dev_attr_gro_flush_timeout.attr, &dev_attr_gro_flush_timeout.attr,

2
target/linux/layerscape/patches-5.4/301-arch-0002-arm64-add-support-to-remap-kernel-cacheable-memory-t.patch
View File

@ -13,7 +13,7 @@ Reviewed-by: Stuart Yoder <stuart.yoder@freescale.com>
--- a/arch/arm64/include/asm/pgtable.h --- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h
@@ -422,6 +422,9 @@ static inline pmd_t pmd_mkdevmap(pmd_t p @@ -428,6 +428,9 @@ static inline pmd_t pmd_mkdevmap(pmd_t p
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN) __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN)
#define pgprot_writecombine(prot) \ #define pgprot_writecombine(prot) \
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN) __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)

2
target/linux/layerscape/patches-5.4/301-arch-0003-arm64-pgtable-add-support-to-map-cacheable-and-non-s.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Haiying Wang <Haiying.wang@freescale.com>
--- a/arch/arm64/include/asm/pgtable.h --- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h
@@ -425,6 +425,8 @@ static inline pmd_t pmd_mkdevmap(pmd_t p @@ -431,6 +431,8 @@ static inline pmd_t pmd_mkdevmap(pmd_t p
#define pgprot_cached(prot) \ #define pgprot_cached(prot) \
__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL) | \ __pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL) | \
PTE_PXN | PTE_UXN) PTE_PXN | PTE_UXN)

4
target/linux/layerscape/patches-5.4/303-core-0003-cgroup-let-a-symlink-too-be-created-with-a-cftype-fi.patch
View File

@ -87,7 +87,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
} }
/** /**
@@ -3873,6 +3889,7 @@ static int cgroup_add_file(struct cgroup @@ -3896,6 +3912,7 @@ static int cgroup_add_file(struct cgroup
{ {
char name[CGROUP_FILE_NAME_MAX]; char name[CGROUP_FILE_NAME_MAX];
struct kernfs_node *kn; struct kernfs_node *kn;
@ -95,7 +95,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
struct lock_class_key *key = NULL; struct lock_class_key *key = NULL;
int ret; int ret;
@@ -3903,6 +3920,14 @@ static int cgroup_add_file(struct cgroup @@ -3926,6 +3943,14 @@ static int cgroup_add_file(struct cgroup
spin_unlock_irq(&cgroup_file_kn_lock); spin_unlock_irq(&cgroup_file_kn_lock);
} }

4
target/linux/layerscape/patches-5.4/303-core-0004-cgroup-bfq-revert-bfq.weight-symlink-change.patch
View File

@ -89,7 +89,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
} }
/** /**
@@ -3889,7 +3873,6 @@ static int cgroup_add_file(struct cgroup @@ -3912,7 +3896,6 @@ static int cgroup_add_file(struct cgroup
{ {
char name[CGROUP_FILE_NAME_MAX]; char name[CGROUP_FILE_NAME_MAX];
struct kernfs_node *kn; struct kernfs_node *kn;
@ -97,7 +97,7 @@ Signed-off-by: Li Yang <leoyang.li@nxp.com>
struct lock_class_key *key = NULL; struct lock_class_key *key = NULL;
int ret; int ret;
@@ -3920,14 +3903,6 @@ static int cgroup_add_file(struct cgroup @@ -3943,14 +3926,6 @@ static int cgroup_add_file(struct cgroup
spin_unlock_irq(&cgroup_file_kn_lock); spin_unlock_irq(&cgroup_file_kn_lock);
} }

2
target/linux/layerscape/patches-5.4/804-crypto-0012-MLK-19053-crypto-caam-RNG4-TRNG-errata.patch
View File

@ -51,7 +51,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
static int caam_get_era_from_hw(struct caam_ctrl __iomem *ctrl) static int caam_get_era_from_hw(struct caam_ctrl __iomem *ctrl)
--- a/drivers/crypto/caam/regs.h --- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h
@@ -492,7 +492,8 @@ struct rngtst { @@ -495,7 +495,8 @@ struct rngtst {
/* RNG4 TRNG test registers */ /* RNG4 TRNG test registers */
struct rng4tst { struct rng4tst {

12
target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
View File

@ -103,16 +103,16 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
@@ -1099,10 +1099,10 @@ int caam_pkc_init(struct device *ctrldev @@ -1099,10 +1099,10 @@ int caam_pkc_init(struct device *ctrldev
/* Determine public key hardware accelerator presence. */ /* Determine public key hardware accelerator presence. */
if (priv->era < 10) if (priv->era < 10) {
- pk_inst = (rd_reg32(&priv->ctrl->perfmon.cha_num_ls) & - pk_inst = (rd_reg32(&priv->ctrl->perfmon.cha_num_ls) &
+ pk_inst = (rd_reg32(&priv->jr[0]->perfmon.cha_num_ls) & + pk_inst = (rd_reg32(&priv->jr[0]->perfmon.cha_num_ls) &
CHA_ID_LS_PK_MASK) >> CHA_ID_LS_PK_SHIFT; CHA_ID_LS_PK_MASK) >> CHA_ID_LS_PK_SHIFT;
else } else {
- pk_inst = rd_reg32(&priv->ctrl->vreg.pkha) & CHA_VER_NUM_MASK; - pkha = rd_reg32(&priv->ctrl->vreg.pkha);
+ pk_inst = rd_reg32(&priv->jr[0]->vreg.pkha) & CHA_VER_NUM_MASK; + pkha = rd_reg32(&priv->jr[0]->vreg.pkha);
pk_inst = pkha & CHA_VER_NUM_MASK;
/* Do not register algorithms if PKHA is not present. */ /*
if (!pk_inst)
--- a/drivers/crypto/caam/caamrng.c --- a/drivers/crypto/caam/caamrng.c
+++ b/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c
@@ -363,10 +363,10 @@ int caam_rng_init(struct device *ctrldev @@ -363,10 +363,10 @@ int caam_rng_init(struct device *ctrldev

10
target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch
View File

@ -261,7 +261,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/regs.h --- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h
@@ -382,6 +382,12 @@ struct version_regs { @@ -385,6 +385,12 @@ struct version_regs {
#define CHA_VER_VID_MD_LP512 0x1ull #define CHA_VER_VID_MD_LP512 0x1ull
#define CHA_VER_VID_MD_HP 0x2ull #define CHA_VER_VID_MD_HP 0x2ull
@ -274,7 +274,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
struct sec_vid { struct sec_vid {
u16 ip_id; u16 ip_id;
u8 maj_rev; u8 maj_rev;
@@ -412,17 +418,22 @@ struct caam_perfmon { @@ -415,17 +421,22 @@ struct caam_perfmon {
#define CTPR_MS_PG_SZ_SHIFT 4 #define CTPR_MS_PG_SZ_SHIFT 4
u32 comp_parms_ms; /* CTPR - Compile Parameters Register */ u32 comp_parms_ms; /* CTPR - Compile Parameters Register */
u32 comp_parms_ls; /* CTPR - Compile Parameters Register */ u32 comp_parms_ls; /* CTPR - Compile Parameters Register */
@ -300,7 +300,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/* Component Instantiation Parameters fe0-fff */ /* Component Instantiation Parameters fe0-fff */
u32 rtic_id; /* RVID - RTIC Version ID */ u32 rtic_id; /* RVID - RTIC Version ID */
@@ -441,6 +452,62 @@ struct caam_perfmon { @@ -444,6 +455,62 @@ struct caam_perfmon {
u32 caam_id_ls; /* CAAMVID - CAAM Version ID LS */ u32 caam_id_ls; /* CAAMVID - CAAM Version ID LS */
}; };
@ -363,7 +363,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/* LIODN programming for DMA configuration */ /* LIODN programming for DMA configuration */
#define MSTRID_LOCK_LIODN 0x80000000 #define MSTRID_LOCK_LIODN 0x80000000
#define MSTRID_LOCK_MAKETRUSTED 0x00010000 /* only for JR masterid */ #define MSTRID_LOCK_MAKETRUSTED 0x00010000 /* only for JR masterid */
@@ -645,6 +712,35 @@ struct caam_ctrl { @@ -648,6 +715,35 @@ struct caam_ctrl {
#define JRSTART_JR2_START 0x00000004 /* Start Job ring 2 */ #define JRSTART_JR2_START 0x00000004 /* Start Job ring 2 */
#define JRSTART_JR3_START 0x00000008 /* Start Job ring 3 */ #define JRSTART_JR3_START 0x00000008 /* Start Job ring 3 */
@ -399,7 +399,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/* /*
* caam_job_ring - direct job ring setup * caam_job_ring - direct job ring setup
* 1-4 possible per instantiation, base + 1000/2000/3000/4000 * 1-4 possible per instantiation, base + 1000/2000/3000/4000
@@ -815,6 +911,62 @@ struct caam_job_ring { @@ -818,6 +914,62 @@ struct caam_job_ring {
#define JRCR_RESET 0x01 #define JRCR_RESET 0x01

4
target/linux/layerscape/patches-5.4/804-crypto-0024-MLK-19449-crypto-caam-Change-structure-type-represen.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
--- a/drivers/crypto/caam/regs.h --- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h
@@ -518,12 +518,6 @@ struct masterid { @@ -521,12 +521,6 @@ struct masterid {
u32 liodn_ls; /* LIODN for non-sequence and seq access */ u32 liodn_ls; /* LIODN for non-sequence and seq access */
}; };
@ -34,7 +34,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
/* RNGB test mode (replicated twice in some configurations) */ /* RNGB test mode (replicated twice in some configurations) */
/* Padded out to 0x100 */ /* Padded out to 0x100 */
struct rngtst { struct rngtst {
@@ -637,7 +631,7 @@ struct caam_ctrl { @@ -640,7 +634,7 @@ struct caam_ctrl {
u32 deco_rsr; /* DECORSR - Deco Request Source */ u32 deco_rsr; /* DECORSR - Deco Request Source */
u32 rsvd11; u32 rsvd11;
u32 deco_rq; /* DECORR - DECO Request */ u32 deco_rq; /* DECORR - DECO Request */

2
target/linux/layerscape/patches-5.4/804-crypto-0041-LF-292-2-crypto-caam-add-power-management.patch
View File

@ -558,7 +558,7 @@ Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
}, },
--- a/drivers/crypto/caam/regs.h --- a/drivers/crypto/caam/regs.h
+++ b/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h
@@ -631,8 +631,7 @@ struct caam_ctrl { @@ -634,8 +634,7 @@ struct caam_ctrl {
u32 deco_rsr; /* DECORSR - Deco Request Source */ u32 deco_rsr; /* DECORSR - Deco Request Source */
u32 rsvd11; u32 rsvd11;
u32 deco_rq; /* DECORR - DECO Request */ u32 deco_rq; /* DECORR - DECO Request */

2
target/linux/layerscape/patches-5.4/812-pcie-0004-pci-add-support-aer-pme-interrupts-with-none-MSI-MSI.patch
View File

@ -229,7 +229,7 @@ Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
* fall back to INTx or other interrupts, e.g., a system shared * fall back to INTx or other interrupts, e.g., a system shared
--- a/include/linux/pci.h --- a/include/linux/pci.h
+++ b/include/linux/pci.h +++ b/include/linux/pci.h
@@ -2022,6 +2022,7 @@ static inline void pcibios_penalize_isa_ @@ -2024,6 +2024,7 @@ static inline void pcibios_penalize_isa_
int pcibios_alloc_irq(struct pci_dev *dev); int pcibios_alloc_irq(struct pci_dev *dev);
void pcibios_free_irq(struct pci_dev *dev); void pcibios_free_irq(struct pci_dev *dev);
resource_size_t pcibios_default_alignment(void); resource_size_t pcibios_default_alignment(void);

2
target/linux/layerscape/patches-5.4/820-usb-0015-MLK-17380-4-usb-host-xhci-add-EH-SINGLE_STEP_SET_FEA.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
--- a/drivers/usb/host/xhci-hub.c --- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c
@@ -1420,6 +1420,15 @@ int xhci_hub_control(struct usb_hcd *hcd @@ -1421,6 +1421,15 @@ int xhci_hub_control(struct usb_hcd *hcd
/* 4.19.6 Port Test Modes (USB2 Test Mode) */ /* 4.19.6 Port Test Modes (USB2 Test Mode) */
if (hcd->speed != HCD_USB2) if (hcd->speed != HCD_USB2)
goto error; goto error;

2
target/linux/layerscape/patches-5.4/820-usb-0021-MLK-22099-usb-host-xhci-do-warm-reset-for-link-state.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Li Jun <jun.li@nxp.com>
--- a/drivers/usb/host/xhci-hub.c --- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c
@@ -1738,7 +1738,8 @@ static bool xhci_port_missing_cas_quirk( @@ -1739,7 +1739,8 @@ static bool xhci_port_missing_cas_quirk(
return false; return false;
if (((portsc & PORT_PLS_MASK) != XDEV_POLLING) && if (((portsc & PORT_PLS_MASK) != XDEV_POLLING) &&

6
target/linux/octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
View File

@ -22,10 +22,10 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
#include <linux/platform_data/x86/apple.h> #include <linux/platform_data/x86/apple.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/suspend.h> #include <linux/suspend.h>
@@ -5783,3 +5784,34 @@ static void apex_pci_fixup_class(struct @@ -5790,3 +5791,34 @@ static void nvidia_ion_ahci_fixup(struct
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
} }
DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a, DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
+ +
+#ifdef CONFIG_PCI_HOST_THUNDER_PEM +#ifdef CONFIG_PCI_HOST_THUNDER_PEM
+/* +/*

6
target/linux/ramips/patches-5.4/0031-uvc-add-iPassion-iP2970-support.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/media/usb/uvc/uvc_driver.c --- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -2911,6 +2911,18 @@ static const struct usb_device_id uvc_id @@ -2916,6 +2916,18 @@ static const struct usb_device_id uvc_id
.bInterfaceSubClass = 1, .bInterfaceSubClass = 1,
.bInterfaceProtocol = 0, .bInterfaceProtocol = 0,
.driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) }, .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) },
@ -64,7 +64,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
@@ -1183,9 +1188,149 @@ static void uvc_video_decode_data(struct @@ -1188,9 +1193,149 @@ static void uvc_video_decode_data(struct
uvc_urb->async_operations++; uvc_urb->async_operations++;
} }
@ -214,7 +214,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/* Mark the buffer as done if the EOF marker is set. */ /* Mark the buffer as done if the EOF marker is set. */
if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) { if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n"); uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
@@ -1742,6 +1887,8 @@ static int uvc_init_video_isoc(struct uv @@ -1747,6 +1892,8 @@ static int uvc_init_video_isoc(struct uv
if (npackets == 0) if (npackets == 0)
return -ENOMEM; return -ENOMEM;

2
target/linux/ramips/patches-5.4/0051-serial-add-ugly-custom-baud-rate-hack.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/tty/serial/serial_core.c --- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c
@@ -416,6 +416,9 @@ uart_get_baud_rate(struct uart_port *por @@ -423,6 +423,9 @@ uart_get_baud_rate(struct uart_port *por
break; break;
} }

4
target/linux/ramips/patches-5.4/0098-disable_cm.patch
View File

@ -1,6 +1,6 @@
--- a/arch/mips/kernel/mips-cm.c --- a/arch/mips/kernel/mips-cm.c
+++ b/arch/mips/kernel/mips-cm.c +++ b/arch/mips/kernel/mips-cm.c
@@ -233,6 +233,7 @@ int mips_cm_probe(void) @@ -232,6 +232,7 @@ int mips_cm_probe(void)
/* disable CM regions */ /* disable CM regions */
write_gcr_reg0_base(CM_GCR_REGn_BASE_BASEADDR); write_gcr_reg0_base(CM_GCR_REGn_BASE_BASEADDR);
@ -8,7 +8,7 @@
write_gcr_reg0_mask(CM_GCR_REGn_MASK_ADDRMASK); write_gcr_reg0_mask(CM_GCR_REGn_MASK_ADDRMASK);
write_gcr_reg1_base(CM_GCR_REGn_BASE_BASEADDR); write_gcr_reg1_base(CM_GCR_REGn_BASE_BASEADDR);
write_gcr_reg1_mask(CM_GCR_REGn_MASK_ADDRMASK); write_gcr_reg1_mask(CM_GCR_REGn_MASK_ADDRMASK);
@@ -240,7 +241,7 @@ int mips_cm_probe(void) @@ -239,7 +240,7 @@ int mips_cm_probe(void)
write_gcr_reg2_mask(CM_GCR_REGn_MASK_ADDRMASK); write_gcr_reg2_mask(CM_GCR_REGn_MASK_ADDRMASK);
write_gcr_reg3_base(CM_GCR_REGn_BASE_BASEADDR); write_gcr_reg3_base(CM_GCR_REGn_BASE_BASEADDR);
write_gcr_reg3_mask(CM_GCR_REGn_MASK_ADDRMASK); write_gcr_reg3_mask(CM_GCR_REGn_MASK_ADDRMASK);

4
target/linux/realtek/patches-5.4/302-clocksource-add-rtl9300-driver.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/clocksource/Kconfig --- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig
@@ -127,6 +127,15 @@ config RDA_TIMER @@ -128,6 +128,15 @@ config RDA_TIMER
help help
Enables the support for the RDA Micro timer driver. Enables the support for the RDA Micro timer driver.
@ -16,7 +16,7 @@
config SUN4I_TIMER config SUN4I_TIMER
bool "Sun4i timer driver" if COMPILE_TEST bool "Sun4i timer driver" if COMPILE_TEST
depends on HAS_IOMEM depends on HAS_IOMEM
@@ -696,5 +705,4 @@ config INGENIC_TIMER @@ -697,5 +706,4 @@ config INGENIC_TIMER
select IRQ_DOMAIN select IRQ_DOMAIN
help help
Support for the timer/counter unit of the Ingenic JZ SoCs. Support for the timer/counter unit of the Ingenic JZ SoCs.