From a101cedac13cd15c9891a098ecc31d06e5df5a20 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 9 Dec 2019 18:35:36 +0100 Subject: [PATCH] drop 4.19 patches that are broken --- ...tting-subprog-addr-from-aux-for-call.patch | 105 ------------------ ..._dma-fix-64-bit-simple-cdma-transfer.patch | 42 ------- ...pfc-r8a7792-fix-vin-versioned-groups.patch | 46 -------- ...pfc-r8a7795-fix-vin-versioned-groups.patch | 65 ----------- queue-4.19/series | 4 - 5 files changed, 262 deletions(-) delete mode 100644 queue-4.19/bpf-arm64-fix-getting-subprog-addr-from-aux-for-call.patch delete mode 100644 queue-4.19/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch delete mode 100644 queue-4.19/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch delete mode 100644 queue-4.19/pinctrl-sh-pfc-r8a7795-fix-vin-versioned-groups.patch diff --git a/queue-4.19/bpf-arm64-fix-getting-subprog-addr-from-aux-for-call.patch b/queue-4.19/bpf-arm64-fix-getting-subprog-addr-from-aux-for-call.patch deleted file mode 100644 index c060eaac9c5..00000000000 --- a/queue-4.19/bpf-arm64-fix-getting-subprog-addr-from-aux-for-call.patch +++ /dev/null @@ -1,105 +0,0 @@ -From b768ee87c27bcc6de62befc5c8caea67ddcae0b1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 26 Nov 2018 14:05:39 +0100 -Subject: bpf, arm64: fix getting subprog addr from aux for calls - -From: Daniel Borkmann - -[ Upstream commit 8c11ea5ce13da0252fc92f91e90b0cb0c8fe5619 ] - -The arm64 JIT has the same issue as ppc64 JIT in that the relative BPF -to BPF call offset can be too far away from core kernel in that relative -encoding into imm is not sufficient and could potentially be truncated, -see also fd045f6cd98e ("arm64: add support for module PLTs") which adds -spill-over space for module_alloc() and therefore bpf_jit_binary_alloc(). -Therefore, use the recently added bpf_jit_get_func_addr() helper for -properly fetching the address through prog->aux->func[off]->bpf_func -instead. This also has the benefit to optimize normal helper calls since -their address can use the optimized emission. Tested on Cavium ThunderX -CN8890. - -Fixes: db496944fdaa ("bpf: arm64: add JIT support for multi-function programs") -Signed-off-by: Daniel Borkmann -Signed-off-by: Alexei Starovoitov -Signed-off-by: Sasha Levin ---- - arch/arm64/net/bpf_jit_comp.c | 26 +++++++++++++++++--------- - 1 file changed, 17 insertions(+), 9 deletions(-) - -diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c -index 7f0258ed1f5fe..722b7cdb5892b 100644 ---- a/arch/arm64/net/bpf_jit_comp.c -+++ b/arch/arm64/net/bpf_jit_comp.c -@@ -351,7 +351,8 @@ static void build_epilogue(struct jit_ctx *ctx) - * >0 - successfully JITed a 16-byte eBPF instruction. - * <0 - failed to JIT. - */ --static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) -+static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, -+ bool extra_pass) - { - const u8 code = insn->code; - const u8 dst = bpf2a64[insn->dst_reg]; -@@ -625,12 +626,19 @@ emit_cond_jmp: - case BPF_JMP | BPF_CALL: - { - const u8 r0 = bpf2a64[BPF_REG_0]; -- const u64 func = (u64)__bpf_call_base + imm; -+ bool func_addr_fixed; -+ u64 func_addr; -+ int ret; - -- if (ctx->prog->is_func) -- emit_addr_mov_i64(tmp, func, ctx); -+ ret = bpf_jit_get_func_addr(ctx->prog, insn, extra_pass, -+ &func_addr, &func_addr_fixed); -+ if (ret < 0) -+ return ret; -+ if (func_addr_fixed) -+ /* We can use optimized emission here. */ -+ emit_a64_mov_i64(tmp, func_addr, ctx); - else -- emit_a64_mov_i64(tmp, func, ctx); -+ emit_addr_mov_i64(tmp, func_addr, ctx); - emit(A64_BLR(tmp), ctx); - emit(A64_MOV(1, r0, A64_R(0)), ctx); - break; -@@ -762,7 +770,7 @@ emit_cond_jmp: - return 0; - } - --static int build_body(struct jit_ctx *ctx) -+static int build_body(struct jit_ctx *ctx, bool extra_pass) - { - const struct bpf_prog *prog = ctx->prog; - int i; -@@ -771,7 +779,7 @@ static int build_body(struct jit_ctx *ctx) - const struct bpf_insn *insn = &prog->insnsi[i]; - int ret; - -- ret = build_insn(insn, ctx); -+ ret = build_insn(insn, ctx, extra_pass); - if (ret > 0) { - i++; - if (ctx->image == NULL) -@@ -867,7 +875,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) - /* 1. Initial fake pass to compute ctx->idx. */ - - /* Fake pass to fill in ctx->offset. */ -- if (build_body(&ctx)) { -+ if (build_body(&ctx, extra_pass)) { - prog = orig_prog; - goto out_off; - } -@@ -897,7 +905,7 @@ skip_init_ctx: - - build_prologue(&ctx, was_classic); - -- if (build_body(&ctx)) { -+ if (build_body(&ctx, extra_pass)) { - bpf_jit_binary_free(header); - prog = orig_prog; - goto out_off; --- -2.20.1 - diff --git a/queue-4.19/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch b/queue-4.19/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch deleted file mode 100644 index e0ea362b251..00000000000 --- a/queue-4.19/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 782417e1346195bed4e9ac3d73eef1d4e99e7ce0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 29 Sep 2018 11:18:00 -0600 -Subject: dmaengine: xilinx_dma: Fix 64-bit simple CDMA transfer - -From: Radhey Shyam Pandey - -[ Upstream commit 0e03aca2659ef7a85eaff1a1ca9b0b498002ede8 ] - -In AXI CDMA simple mode also pass MSB bits of source and destination -address to xilinx_write function. This fixes simple CDMA operation -mode using 64-bit addressing. - -Signed-off-by: Radhey Shyam Pandey -Signed-off-by: Michal Simek -Reviewed-by: Appana Durga Kedareswara Rao -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/dma/xilinx/xilinx_dma.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c -index 8aec137b4fcaa..0ef4388bbeaa9 100644 ---- a/drivers/dma/xilinx/xilinx_dma.c -+++ b/drivers/dma/xilinx/xilinx_dma.c -@@ -1248,8 +1248,10 @@ static void xilinx_cdma_start_transfer(struct xilinx_dma_chan *chan) - - hw = &segment->hw; - -- xilinx_write(chan, XILINX_CDMA_REG_SRCADDR, hw->src_addr); -- xilinx_write(chan, XILINX_CDMA_REG_DSTADDR, hw->dest_addr); -+ xilinx_write(chan, XILINX_CDMA_REG_SRCADDR, -+ xilinx_prep_dma_addr_t(hw->src_addr)); -+ xilinx_write(chan, XILINX_CDMA_REG_DSTADDR, -+ xilinx_prep_dma_addr_t(hw->dest_addr)); - - /* Start the transfer */ - dma_ctrl_write(chan, XILINX_DMA_REG_BTT, --- -2.20.1 - diff --git a/queue-4.19/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch b/queue-4.19/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch deleted file mode 100644 index 4e2a40ac9bd..00000000000 --- a/queue-4.19/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2baff95354561ef666795650ddb5668b83c8be3c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 8 Nov 2018 17:07:25 +0100 -Subject: pinctrl: sh-pfc: r8a7792: Fix VIN versioned groups - -From: Jacopo Mondi - -[ Upstream commit 11c8f8df85e77329d5a3cacc08682722cb80b95b ] - -Versioned VIN groups can appear on different sets of pins. Using the -VIN_DATA_PIN_GROUP macro now supports proper naming of said groups -through an optional 'version' argument. - -Use the 'version' argument for said macro to fix naming of versioned -groups for the R-Car V2H R8A7792 SoC. - -Fixes: 7dd74bb1f058 ("pinctrl: sh-pfc: r8a7792: Add VIN pin groups") -Signed-off-by: Jacopo Mondi -Reviewed-by: Simon Horman -Signed-off-by: Geert Uytterhoeven -Signed-off-by: Sasha Levin ---- - drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7792.c b/drivers/pinctrl/sh-pfc/pfc-r8a7792.c -index cc3597f66605a..b3814ca009b02 100644 ---- a/drivers/pinctrl/sh-pfc/pfc-r8a7792.c -+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7792.c -@@ -1747,10 +1747,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { - VIN_DATA_PIN_GROUP(vin1_data, 12), - VIN_DATA_PIN_GROUP(vin1_data, 10), - VIN_DATA_PIN_GROUP(vin1_data, 8), -- VIN_DATA_PIN_GROUP(vin1_data_b, 24), -- VIN_DATA_PIN_GROUP(vin1_data_b, 20), -+ VIN_DATA_PIN_GROUP(vin1_data, 24, _b), -+ VIN_DATA_PIN_GROUP(vin1_data, 20, _b), - SH_PFC_PIN_GROUP(vin1_data18_b), -- VIN_DATA_PIN_GROUP(vin1_data_b, 16), -+ VIN_DATA_PIN_GROUP(vin1_data, 16, _b), - SH_PFC_PIN_GROUP(vin1_sync), - SH_PFC_PIN_GROUP(vin1_field), - SH_PFC_PIN_GROUP(vin1_clkenb), --- -2.20.1 - diff --git a/queue-4.19/pinctrl-sh-pfc-r8a7795-fix-vin-versioned-groups.patch b/queue-4.19/pinctrl-sh-pfc-r8a7795-fix-vin-versioned-groups.patch deleted file mode 100644 index 4c7e8c54e95..00000000000 --- a/queue-4.19/pinctrl-sh-pfc-r8a7795-fix-vin-versioned-groups.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7050fc57818e96eab2e6a7f0d456e2c53542616c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 8 Nov 2018 17:07:26 +0100 -Subject: pinctrl: sh-pfc: r8a7795: Fix VIN versioned groups - -From: Jacopo Mondi - -[ Upstream commit 184844ccda4138402846bf4b42c28ac5f16a458a ] - -Versioned VIN groups can appear on different sets of pins. Using the -VIN_DATA_PIN_GROUP macro now supports proper naming of said groups -through an optional 'version' argument. - -Use the 'version' argument for said macro to fix naming of versioned -groups for the R-Car H3 R8A7795 SoC. - -Fixes: 9942a5b52990 ("pinctrl: sh-pfc: r8a7795: Deduplicate VIN4 pin definitions") -Signed-off-by: Jacopo Mondi -Reviewed-by: Simon Horman -Signed-off-by: Geert Uytterhoeven -Signed-off-by: Sasha Levin ---- - drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c -index 4f55b1562ad48..2893e3b05ff38 100644 ---- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c -+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c -@@ -4477,20 +4477,20 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { - SH_PFC_PIN_GROUP(usb2), - SH_PFC_PIN_GROUP(usb2_ch3), - SH_PFC_PIN_GROUP(usb30), -- VIN_DATA_PIN_GROUP(vin4_data_a, 8), -- VIN_DATA_PIN_GROUP(vin4_data_a, 10), -- VIN_DATA_PIN_GROUP(vin4_data_a, 12), -- VIN_DATA_PIN_GROUP(vin4_data_a, 16), -+ VIN_DATA_PIN_GROUP(vin4_data, 8, _a), -+ VIN_DATA_PIN_GROUP(vin4_data, 10, _a), -+ VIN_DATA_PIN_GROUP(vin4_data, 12, _a), -+ VIN_DATA_PIN_GROUP(vin4_data, 16, _a), - SH_PFC_PIN_GROUP(vin4_data18_a), -- VIN_DATA_PIN_GROUP(vin4_data_a, 20), -- VIN_DATA_PIN_GROUP(vin4_data_a, 24), -- VIN_DATA_PIN_GROUP(vin4_data_b, 8), -- VIN_DATA_PIN_GROUP(vin4_data_b, 10), -- VIN_DATA_PIN_GROUP(vin4_data_b, 12), -- VIN_DATA_PIN_GROUP(vin4_data_b, 16), -+ VIN_DATA_PIN_GROUP(vin4_data, 20, _a), -+ VIN_DATA_PIN_GROUP(vin4_data, 24, _a), -+ VIN_DATA_PIN_GROUP(vin4_data, 8, _b), -+ VIN_DATA_PIN_GROUP(vin4_data, 10, _b), -+ VIN_DATA_PIN_GROUP(vin4_data, 12, _b), -+ VIN_DATA_PIN_GROUP(vin4_data, 16, _b), - SH_PFC_PIN_GROUP(vin4_data18_b), -- VIN_DATA_PIN_GROUP(vin4_data_b, 20), -- VIN_DATA_PIN_GROUP(vin4_data_b, 24), -+ VIN_DATA_PIN_GROUP(vin4_data, 20, _b), -+ VIN_DATA_PIN_GROUP(vin4_data, 24, _b), - SH_PFC_PIN_GROUP(vin4_sync), - SH_PFC_PIN_GROUP(vin4_field), - SH_PFC_PIN_GROUP(vin4_clkenb), --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index eb703637e93..84ec01c5eff 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -29,14 +29,11 @@ cxgb4vf-fix-memleak-in-mac_hlist-initialization.patch iwlwifi-mvm-synchronize-tid-queue-removal.patch iwlwifi-trans-clear-persistence-bit-when-starting-th.patch iwlwifi-mvm-send-non-offchannel-traffic-via-ap-sta.patch -dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch arm-8813-1-make-aligned-2-byte-getuser-putuser-atomi.patch audit-embed-key-into-chunk.patch netfilter-nf_tables-don-t-use-position-attribute-on-.patch arc-ioc-panic-if-kernel-was-started-with-previously-.patch net-mlx5-release-resource-on-error-flow.patch -pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch -pinctrl-sh-pfc-r8a7795-fix-vin-versioned-groups.patch clk-sunxi-ng-a64-fix-gate-bit-of-dsi-dphy.patch ice-fix-nvm-mask-defines.patch dlm-fix-possible-call-to-kfree-for-non-initialized-p.patch @@ -109,7 +106,6 @@ f2fs-change-segment-to-section-in-f2fs_ioc_gc_range.patch arm-dts-rockchip-fix-the-pmu-interrupt-number-for-rv.patch arm-dts-rockchip-assign-the-proper-gpio-clocks-for-r.patch f2fs-fix-to-allow-node-segment-for-gc-by-ioctl-path.patch -bpf-arm64-fix-getting-subprog-addr-from-aux-for-call.patch sparc-fix-jit-fused-branch-convergance.patch sparc-correct-ctx-saw_frame_pointer-logic.patch nvme-free-ctrl-device-name-on-init-failure.patch -- 2.47.3