summaryrefslogtreecommitdiffstats
path: root/patch-5.13.0-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.13.0-redhat.patch')
-rw-r--r--patch-5.13.0-redhat.patch123
1 files changed, 11 insertions, 112 deletions
diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch
index e43812adc..2ac0140b9 100644
--- a/patch-5.13.0-redhat.patch
+++ b/patch-5.13.0-redhat.patch
@@ -7,9 +7,6 @@
arch/arm64/Kconfig | 3 +-
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +-
arch/arm64/kernel/acpi.c | 4 +
- arch/powerpc/Kconfig | 1 -
- arch/powerpc/include/asm/jump_label.h | 21 +-
- arch/powerpc/kernel/jump_label.c | 4 +-
arch/s390/include/asm/ipl.h | 1 +
arch/s390/kernel/ipl.c | 5 +
arch/s390/kernel/setup.c | 4 +
@@ -38,7 +35,7 @@
drivers/nvme/host/multipath.c | 19 +-
drivers/nvme/host/nvme.h | 4 +
drivers/pci/controller/pcie-rockchip-host.c | 12 +-
- drivers/pci/of.c | 17 +-
+ drivers/pci/of.c | 5 -
drivers/pci/pci-driver.c | 29 ++
drivers/pci/quirks.c | 24 +
drivers/scsi/aacraid/linit.c | 2 +
@@ -96,7 +93,7 @@
tools/testing/selftests/bpf/progs/linked_vars2.c | 55 ---
.../selftests/bpf/progs/test_static_linked1.c | 30 --
.../selftests/bpf/progs/test_static_linked2.c | 31 --
- 98 files changed, 1251 insertions(+), 2283 deletions(-)
+ 95 files changed, 1222 insertions(+), 2274 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@@ -174,7 +171,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 2d7a8df84e2b..8faff67e93d3 100644
+index 3e8dbe68eac8..cd1ac021e6b2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -277,85 +274,6 @@ index cada0b816c8a..77b30bf451aa 100644
static bool param_acpi_force __initdata;
static int __init parse_acpi(char *arg)
-diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
-index 088dd2afcfe4..59e0d55ee01d 100644
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -189,7 +189,6 @@ config PPC
- select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP
- select HAVE_ARCH_HUGE_VMAP if PPC_BOOK3S_64 && PPC_RADIX_MMU
- select HAVE_ARCH_JUMP_LABEL
-- select HAVE_ARCH_JUMP_LABEL_RELATIVE
- select HAVE_ARCH_KASAN if PPC32 && PPC_PAGE_SHIFT <= 14
- select HAVE_ARCH_KASAN_VMALLOC if PPC32 && PPC_PAGE_SHIFT <= 14
- select HAVE_ARCH_KFENCE if PPC32
-diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h
-index 2d5c6bec2b4f..09297ec9fa52 100644
---- a/arch/powerpc/include/asm/jump_label.h
-+++ b/arch/powerpc/include/asm/jump_label.h
-@@ -20,8 +20,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran
- asm_volatile_goto("1:\n\t"
- "nop # arch_static_branch\n\t"
- ".pushsection __jump_table, \"aw\"\n\t"
-- ".long 1b - ., %l[l_yes] - .\n\t"
-- JUMP_ENTRY_TYPE "%c0 - .\n\t"
-+ JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"
- ".popsection \n\t"
- : : "i" (&((char *)key)[branch]) : : l_yes);
-
-@@ -35,8 +34,7 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
- asm_volatile_goto("1:\n\t"
- "b %l[l_yes] # arch_static_branch_jump\n\t"
- ".pushsection __jump_table, \"aw\"\n\t"
-- ".long 1b - ., %l[l_yes] - .\n\t"
-- JUMP_ENTRY_TYPE "%c0 - .\n\t"
-+ JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t"
- ".popsection \n\t"
- : : "i" (&((char *)key)[branch]) : : l_yes);
-
-@@ -45,12 +43,23 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool
- return true;
- }
-
-+#ifdef CONFIG_PPC64
-+typedef u64 jump_label_t;
-+#else
-+typedef u32 jump_label_t;
-+#endif
-+
-+struct jump_entry {
-+ jump_label_t code;
-+ jump_label_t target;
-+ jump_label_t key;
-+};
-+
- #else
- #define ARCH_STATIC_BRANCH(LABEL, KEY) \
- 1098: nop; \
- .pushsection __jump_table, "aw"; \
-- .long 1098b - ., LABEL - .; \
-- FTR_ENTRY_LONG KEY; \
-+ FTR_ENTRY_LONG 1098b, LABEL, KEY; \
- .popsection
- #endif
-
-diff --git a/arch/powerpc/kernel/jump_label.c b/arch/powerpc/kernel/jump_label.c
-index ce87dc5ea23c..144858027fa3 100644
---- a/arch/powerpc/kernel/jump_label.c
-+++ b/arch/powerpc/kernel/jump_label.c
-@@ -11,10 +11,10 @@
- void arch_jump_label_transform(struct jump_entry *entry,
- enum jump_label_type type)
- {
-- struct ppc_inst *addr = (struct ppc_inst *)jump_entry_code(entry);
-+ struct ppc_inst *addr = (struct ppc_inst *)(unsigned long)entry->code;
-
- if (type == JUMP_LABEL_JMP)
-- patch_branch(addr, jump_entry_target(entry), 0);
-+ patch_branch(addr, entry->target, 0);
- else
- patch_instruction(addr, ppc_inst(PPC_INST_NOP));
- }
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
index a9e2c7295b35..6ff11f3a2d47 100644
--- a/arch/s390/include/asm/ipl.h
@@ -1370,10 +1288,10 @@ index af0ce5611e4a..1c226920c12d 100644
out_mptspi_probe:
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index 4ee85a217c6f..494f392a8d56 100644
+index 0eb2307325d3..568b04a7cea8 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -4838,6 +4838,7 @@ static int __init ice_module_init(void)
+@@ -4852,6 +4852,7 @@ static int __init ice_module_init(void)
pr_info("%s\n", ice_driver_string);
pr_info("%s\n", ice_copyright);
@@ -1600,29 +1518,10 @@ index f1d08a1b1591..78d04ac29cd5 100644
if (err < 0)
goto err_remove_irq_domain;
diff --git a/drivers/pci/of.c b/drivers/pci/of.c
-index 85dcb7097da4..0580c654127e 100644
+index a143b02b2dcd..ba18b43cc7f5 100644
--- a/drivers/pci/of.c
+++ b/drivers/pci/of.c
-@@ -353,6 +353,18 @@ static int devm_of_pci_get_host_bridge_resources(struct device *dev,
- dev_warn(dev, "More than one I/O resource converted for %pOF. CPU base address for old range lost!\n",
- dev_node);
- *io_base = range.cpu_addr;
-+ } else if (resource_type(res) == IORESOURCE_MEM) {
-+ if (!(res->flags & IORESOURCE_PREFETCH)) {
-+ if (res->flags & IORESOURCE_MEM_64) {
-+ if (!upper_32_bits(range.pci_addr + range.size - 1)) {
-+ dev_warn(dev, "Clearing 64-bit flag for non-prefetchable memory below 4GB\n");
-+ res->flags &= ~IORESOURCE_MEM_64;
-+ }
-+ } else {
-+ if (upper_32_bits(resource_size(res)))
-+ dev_warn(dev, "Memory resource size exceeds max for 32 bits\n");
-+ }
-+ }
- }
-
- pci_add_resource_offset(resources, res, res->start - range.pci_addr);
-@@ -571,11 +583,6 @@ static int pci_parse_request_of_pci_ranges(struct device *dev,
+@@ -573,11 +573,6 @@ static int pci_parse_request_of_pci_ranges(struct device *dev,
break;
case IORESOURCE_MEM:
res_valid |= !(res->flags & IORESOURCE_PREFETCH);
@@ -1682,10 +1581,10 @@ index ec44a79e951a..5025827ef396 100644
struct pci_driver *drv;
struct pci_dev *dev;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index dcb229de1acb..eb2f6394b286 100644
+index 22b2bb1109c9..2131ee5ab7fd 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -4132,6 +4132,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
+@@ -4219,6 +4219,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084,
quirk_bridge_cavm_thrx2_pcie_root);
@@ -1999,10 +1898,10 @@ index 5db16509b6e1..5b8b5e3edd39 100644
PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
PCI_VENDOR_ID_DELL, 0x1fe0)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index fc7d6cdacf16..33fea509ff86 100644
+index df8e69e60aaf..fb851c5130e1 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5585,6 +5585,13 @@ static void hub_event(struct work_struct *work)
+@@ -5587,6 +5587,13 @@ static void hub_event(struct work_struct *work)
(u16) hub->change_bits[0],
(u16) hub->event_bits[0]);
generated by cgit (git 2.34.1) at 2024-05-01 00:51:11 +0000