kernel: bump 5.4 to 5.4.145
Removed upstreamed: generic-backport/040-ARM-8918-2-only-build-return_address-if-needed.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							51c7e1d25f
						
					
				
				
					commit
					a88b32bf6e
				
			| @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL | |||||||
|   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) |   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) | ||||||
| endif | endif | ||||||
|  |  | ||||||
| LINUX_VERSION-5.4 = .144 | LINUX_VERSION-5.4 = .145 | ||||||
| LINUX_VERSION-5.10 = .64 | LINUX_VERSION-5.10 = .64 | ||||||
|  |  | ||||||
| LINUX_KERNEL_HASH-5.4.144 = bc43b98271ab3885a41c2413bed26b5a6d38795731b9c194f6e72dde45b85885 | LINUX_KERNEL_HASH-5.4.145 = 5cf7782ec2e91417edf0d5e6555da6d556962c8985e33ba9e7dadba5cbdc68f9 | ||||||
| LINUX_KERNEL_HASH-5.10.64 = 3eb84bd24a2de2b4749314e34597c02401c5d6831b055ed5224adb405c35e30a | LINUX_KERNEL_HASH-5.10.64 = 3eb84bd24a2de2b4749314e34597c02401c5d6831b055ed5224adb405c35e30a | ||||||
|  |  | ||||||
| remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) | remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) | ||||||
|   | |||||||
| @@ -43,7 +43,7 @@ produce a noisy warning. | |||||||
|  		hcd->msi_enabled = 1; |  		hcd->msi_enabled = 1; | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1884,6 +1884,7 @@ struct xhci_hcd { | @@ -1887,6 +1887,7 @@ struct xhci_hcd { | ||||||
|  	struct xhci_hub		usb2_rhub; |  	struct xhci_hub		usb2_rhub; | ||||||
|  	struct xhci_hub		usb3_rhub; |  	struct xhci_hub		usb3_rhub; | ||||||
|  	/* support xHCI 1.0 spec USB2 hardware LPM */ |  	/* support xHCI 1.0 spec USB2 hardware LPM */ | ||||||
|   | |||||||
| @@ -80,7 +80,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|  	/* |  	/* | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1874,6 +1874,7 @@ struct xhci_hcd { | @@ -1877,6 +1877,7 @@ struct xhci_hcd { | ||||||
|  #define XHCI_DEFAULT_PM_RUNTIME_ALLOW	BIT_ULL(33) |  #define XHCI_DEFAULT_PM_RUNTIME_ALLOW	BIT_ULL(33) | ||||||
|  #define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34) |  #define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34) | ||||||
|  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35) |  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35) | ||||||
|   | |||||||
| @@ -47,7 +47,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|  			val); |  			val); | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1650,8 +1650,8 @@ struct urb_priv { | @@ -1653,8 +1653,8 @@ struct urb_priv { | ||||||
|   * Each segment table entry is 4*32bits long.  1K seems like an ok size: |   * Each segment table entry is 4*32bits long.  1K seems like an ok size: | ||||||
|   * (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, |   * (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, | ||||||
|   * meaning 64 ring segments. |   * meaning 64 ring segments. | ||||||
|   | |||||||
| @@ -51,7 +51,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|   |   | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1877,6 +1877,7 @@ struct xhci_hcd { | @@ -1880,6 +1880,7 @@ struct xhci_hcd { | ||||||
|  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(36) |  #define XHCI_EP_CTX_BROKEN_DCS	BIT_ULL(36) | ||||||
|  #define XHCI_SKIP_PHY_INIT	BIT_ULL(37) |  #define XHCI_SKIP_PHY_INIT	BIT_ULL(37) | ||||||
|  #define XHCI_DISABLE_SPARSE	BIT_ULL(38) |  #define XHCI_DISABLE_SPARSE	BIT_ULL(38) | ||||||
|   | |||||||
| @@ -127,7 +127,7 @@ it on BCM4708 family. | |||||||
|  /* |  /* | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1874,6 +1874,7 @@ struct xhci_hcd { | @@ -1877,6 +1877,7 @@ struct xhci_hcd { | ||||||
|  #define XHCI_DEFAULT_PM_RUNTIME_ALLOW	BIT_ULL(33) |  #define XHCI_DEFAULT_PM_RUNTIME_ALLOW	BIT_ULL(33) | ||||||
|  #define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34) |  #define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34) | ||||||
|  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35) |  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35) | ||||||
|   | |||||||
| @@ -1,60 +0,0 @@ | |||||||
| From fb033c95c94ca1ee3d16e04ebdb85d65fb55fff8 Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Ben Dooks <ben-linux@fluff.org> |  | ||||||
| Date: Mon, 4 Nov 2019 18:15:15 +0100 |  | ||||||
| Subject: [PATCH] ARM: 8918/2: only build return_address() if needed |  | ||||||
|  |  | ||||||
| The system currently warns if the config conditions for |  | ||||||
| building return_address in arch/arm/kernel/return_address.c |  | ||||||
| are not met, leaving just an EXPORT_SYMBOL_GPL(return_address) |  | ||||||
| of a function defined to be 'static linline'. |  | ||||||
| This is a result of aeea3592a13b ("ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h"). |  | ||||||
|  |  | ||||||
| Since we're not going to build anything other than an exported |  | ||||||
| symbol for something that is already being defined to be an |  | ||||||
| inline-able return of NULL, just avoid building the code to |  | ||||||
| remove the following warning: |  | ||||||
|  |  | ||||||
| Fixes: aeea3592a13b ("ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h") |  | ||||||
| Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> |  | ||||||
| Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> |  | ||||||
| --- |  | ||||||
|  arch/arm/kernel/Makefile         | 6 +++++- |  | ||||||
|  arch/arm/kernel/return_address.c | 4 ---- |  | ||||||
|  2 files changed, 5 insertions(+), 5 deletions(-) |  | ||||||
|  |  | ||||||
| --- a/arch/arm/kernel/Makefile |  | ||||||
| +++ b/arch/arm/kernel/Makefile |  | ||||||
| @@ -17,10 +17,14 @@ CFLAGS_REMOVE_return_address.o = -pg |  | ||||||
|  # Object file lists. |  | ||||||
|   |  | ||||||
|  obj-y		:= elf.o entry-common.o irq.o opcodes.o \ |  | ||||||
| -		   process.o ptrace.o reboot.o return_address.o \ |  | ||||||
| +		   process.o ptrace.o reboot.o \ |  | ||||||
|  		   setup.o signal.o sigreturn_codes.o \ |  | ||||||
|  		   stacktrace.o sys_arm.o time.o traps.o |  | ||||||
|   |  | ||||||
| +ifneq ($(CONFIG_ARM_UNWIND),y) |  | ||||||
| +obj-$(CONFIG_FRAME_POINTER)	+= return_address.o |  | ||||||
| +endif |  | ||||||
| + |  | ||||||
|  obj-$(CONFIG_ATAGS)		+= atags_parse.o |  | ||||||
|  obj-$(CONFIG_ATAGS_PROC)	+= atags_proc.o |  | ||||||
|  obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o |  | ||||||
| --- a/arch/arm/kernel/return_address.c |  | ||||||
| +++ b/arch/arm/kernel/return_address.c |  | ||||||
| @@ -7,8 +7,6 @@ |  | ||||||
|   */ |  | ||||||
|  #include <linux/export.h> |  | ||||||
|  #include <linux/ftrace.h> |  | ||||||
| - |  | ||||||
| -#if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) |  | ||||||
|  #include <linux/sched.h> |  | ||||||
|   |  | ||||||
|  #include <asm/stacktrace.h> |  | ||||||
| @@ -53,6 +51,4 @@ void *return_address(unsigned int level) |  | ||||||
|  		return NULL; |  | ||||||
|  } |  | ||||||
|   |  | ||||||
| -#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */ |  | ||||||
| - |  | ||||||
|  EXPORT_SYMBOL_GPL(return_address); |  | ||||||
| @@ -1470,7 +1470,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	if (!is_valid_ether_addr(ndev->dev_addr)) |  	if (!is_valid_ether_addr(ndev->dev_addr)) | ||||||
|  		eth_hw_addr_random(ndev); |  		eth_hw_addr_random(ndev); | ||||||
|  	temac_do_set_mac_address(ndev); |  	temac_do_set_mac_address(ndev); | ||||||
| @@ -1298,7 +1298,7 @@ static int temac_probe(struct platform_d | @@ -1296,7 +1296,7 @@ static int temac_probe(struct platform_d | ||||||
|  	struct temac_local *lp; |  	struct temac_local *lp; | ||||||
|  	struct net_device *ndev; |  	struct net_device *ndev; | ||||||
|  	struct resource *res; |  	struct resource *res; | ||||||
| @@ -1479,7 +1479,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  	__be32 *p; |  	__be32 *p; | ||||||
|  	bool little_endian; |  	bool little_endian; | ||||||
|  	int rc = 0; |  	int rc = 0; | ||||||
| @@ -1494,8 +1494,8 @@ static int temac_probe(struct platform_d | @@ -1492,8 +1492,8 @@ static int temac_probe(struct platform_d | ||||||
|   |   | ||||||
|  	if (temac_np) { |  	if (temac_np) { | ||||||
|  		/* Retrieve the MAC address */ |  		/* Retrieve the MAC address */ | ||||||
|   | |||||||
| @@ -184,7 +184,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> | |||||||
|  void xhci_init_driver(struct hc_driver *drv, |  void xhci_init_driver(struct hc_driver *drv, | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -2151,6 +2151,16 @@ int xhci_find_raw_port_number(struct usb | @@ -2154,6 +2154,16 @@ int xhci_find_raw_port_number(struct usb | ||||||
|  struct xhci_hub *xhci_get_rhub(struct usb_hcd *hcd); |  struct xhci_hub *xhci_get_rhub(struct usb_hcd *hcd); | ||||||
|   |   | ||||||
|  void xhci_hc_died(struct xhci_hcd *xhci); |  void xhci_hc_died(struct xhci_hcd *xhci); | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> | |||||||
|  	ret = xhci_handshake(&xhci->op_regs->command, |  	ret = xhci_handshake(&xhci->op_regs->command, | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1874,6 +1874,7 @@ struct xhci_hcd { | @@ -1877,6 +1877,7 @@ struct xhci_hcd { | ||||||
|  #define XHCI_DEFAULT_PM_RUNTIME_ALLOW	BIT_ULL(33) |  #define XHCI_DEFAULT_PM_RUNTIME_ALLOW	BIT_ULL(33) | ||||||
|  #define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34) |  #define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34) | ||||||
|  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35) |  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35) | ||||||
|   | |||||||
| @@ -35,7 +35,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> | |||||||
|  EXPORT_SYMBOL_GPL(xhci_init_driver); |  EXPORT_SYMBOL_GPL(xhci_init_driver); | ||||||
| --- a/drivers/usb/host/xhci.h | --- a/drivers/usb/host/xhci.h | ||||||
| +++ b/drivers/usb/host/xhci.h | +++ b/drivers/usb/host/xhci.h | ||||||
| @@ -1917,6 +1917,7 @@ struct xhci_driver_overrides { | @@ -1920,6 +1920,7 @@ struct xhci_driver_overrides { | ||||||
|  	int (*start)(struct usb_hcd *hcd); |  	int (*start)(struct usb_hcd *hcd); | ||||||
|  	int (*check_bandwidth)(struct usb_hcd *, struct usb_device *); |  	int (*check_bandwidth)(struct usb_hcd *, struct usb_device *); | ||||||
|  	void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *); |  	void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user