From 61cfcc61dfbebd506def24717023f10c7a1a83f6 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 23 Aug 2023 12:57:56 +0800 Subject: [PATCH] rockchip: refresh patches Signed-off-by: Tianling Shen --- ...low-loading-modules-with-BTF-mismatch.patch | 2 +- ...t-use-3.0-clock-when-operating-in-2.0.patch | 2 +- ...ockchip-Refactor-IOMMU-initialisation.patch | 2 +- ...dd-GFP_DMA32-flag-for-memory-allocate.patch | 18 +++++++++--------- ...-v3-its-force-to-config-its-tables-as.patch | 8 ++++---- ...gic-v3-its-flush-base-table-if-rk356x.patch | 2 +- ...-v3-its-force-to-config-its-tables-as.patch | 8 ++++---- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch b/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch index 00ef880bf2..c26330d91b 100644 --- a/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch +++ b/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch @@ -28,7 +28,7 @@ Link: https://lore.kernel.org/bpf/20220223012814.1898677-1-connoro@google.com --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c -@@ -6076,7 +6076,8 @@ static int btf_module_notify(struct noti +@@ -6072,7 +6072,8 @@ static int btf_module_notify(struct noti pr_warn("failed to validate module [%s] BTF: %ld\n", mod->name, PTR_ERR(btf)); kfree(btf_mod); diff --git a/target/linux/rockchip/patches-5.15/008-0017-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch b/target/linux/rockchip/patches-5.15/008-0017-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch index 20205ad53e..66b9a33e14 100644 --- a/target/linux/rockchip/patches-5.15/008-0017-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch +++ b/target/linux/rockchip/patches-5.15/008-0017-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -258,6 +258,7 @@ +@@ -255,6 +255,7 @@ /* Global User Control 1 Register */ #define DWC3_GUCTL1_DEV_DECOUPLE_L1L2_EVT BIT(31) #define DWC3_GUCTL1_TX_IPGAP_LINECHECK_DIS BIT(28) diff --git a/target/linux/rockchip/patches-5.15/008-0027-v5.19-drm-rockchip-Refactor-IOMMU-initialisation.patch b/target/linux/rockchip/patches-5.15/008-0027-v5.19-drm-rockchip-Refactor-IOMMU-initialisation.patch index a200928867..daa8a54c4c 100644 --- a/target/linux/rockchip/patches-5.15/008-0027-v5.19-drm-rockchip-Refactor-IOMMU-initialisation.patch +++ b/target/linux/rockchip/patches-5.15/008-0027-v5.19-drm-rockchip-Refactor-IOMMU-initialisation.patch @@ -192,7 +192,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/94eee7ab434fe11eb0787f691e9f int rockchip_drm_endpoint_is_subdriver(struct device_node *ep); --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -@@ -2176,6 +2176,8 @@ static int vop_bind(struct device *dev, +@@ -2177,6 +2177,8 @@ static int vop_bind(struct device *dev, } } diff --git a/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch b/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch index be8c52bdbd..b2352b8713 100644 --- a/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch +++ b/target/linux/rockchip/patches-5.15/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch @@ -12,7 +12,7 @@ Signed-off-by: XiaoDong Huang --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -2172,6 +2172,8 @@ static struct page *its_allocate_prop_ta +@@ -2197,6 +2197,8 @@ static struct page *its_allocate_prop_ta { struct page *prop_page; @@ -21,7 +21,7 @@ Signed-off-by: XiaoDong Huang prop_page = alloc_pages(gfp_flags, get_order(LPI_PROPBASE_SZ)); if (!prop_page) return NULL; -@@ -2295,6 +2297,7 @@ static int its_setup_baser(struct its_no +@@ -2320,6 +2322,7 @@ static int its_setup_baser(struct its_no u32 alloc_pages, psz; struct page *page; void *base; @@ -29,7 +29,7 @@ Signed-off-by: XiaoDong Huang psz = baser->psz; alloc_pages = (PAGE_ORDER_TO_SIZE(order) / psz); -@@ -2306,7 +2309,10 @@ static int its_setup_baser(struct its_no +@@ -2331,7 +2334,10 @@ static int its_setup_baser(struct its_no order = get_order(GITS_BASER_PAGES_MAX * psz); } @@ -41,7 +41,7 @@ Signed-off-by: XiaoDong Huang if (!page) return -ENOMEM; -@@ -2935,6 +2941,8 @@ static struct page *its_allocate_pending +@@ -2960,6 +2966,8 @@ static struct page *its_allocate_pending { struct page *pend_page; @@ -50,7 +50,7 @@ Signed-off-by: XiaoDong Huang pend_page = alloc_pages(gfp_flags | __GFP_ZERO, get_order(LPI_PENDBASE_SZ)); if (!pend_page) -@@ -3278,7 +3286,11 @@ static bool its_alloc_table_entry(struct +@@ -3303,7 +3311,11 @@ static bool its_alloc_table_entry(struct /* Allocate memory for 2nd level table */ if (!table[idx]) { @@ -63,7 +63,7 @@ Signed-off-by: XiaoDong Huang get_order(baser->psz)); if (!page) return false; -@@ -3367,6 +3379,7 @@ static struct its_device *its_create_dev +@@ -3392,6 +3404,7 @@ static struct its_device *its_create_dev int nr_lpis; int nr_ites; int sz; @@ -71,7 +71,7 @@ Signed-off-by: XiaoDong Huang if (!its_alloc_device_table(its, dev_id)) return NULL; -@@ -3382,7 +3395,10 @@ static struct its_device *its_create_dev +@@ -3407,7 +3420,10 @@ static struct its_device *its_create_dev nr_ites = max(2, nvecs); sz = nr_ites * (FIELD_GET(GITS_TYPER_ITT_ENTRY_SIZE, its->typer) + 1); sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1; @@ -83,7 +83,7 @@ Signed-off-by: XiaoDong Huang if (alloc_lpis) { lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis); if (lpi_map) -@@ -4974,6 +4990,7 @@ static int __init its_probe_one(struct r +@@ -4991,6 +5007,7 @@ static int __init its_probe_one(struct r u64 baser, tmp, typer; struct page *page; int err; @@ -91,7 +91,7 @@ Signed-off-by: XiaoDong Huang its_base = ioremap(res->start, SZ_64K); if (!its_base) { -@@ -5042,7 +5059,10 @@ static int __init its_probe_one(struct r +@@ -5059,7 +5076,10 @@ static int __init its_probe_one(struct r its->numa_node = numa_node; diff --git a/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index 466b4b3066..367aa8674b 100644 --- a/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-5.15/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch @@ -12,7 +12,7 @@ Signed-off-by: XiaoDong Huang --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -2359,6 +2359,10 @@ retry_baser: +@@ -2384,6 +2384,10 @@ retry_baser: its_write_baser(its, baser, val); tmp = baser->val; @@ -23,7 +23,7 @@ Signed-off-by: XiaoDong Huang if ((val ^ tmp) & GITS_BASER_SHAREABILITY_MASK) { /* * Shareability didn't stick. Just use -@@ -3100,6 +3104,10 @@ static void its_cpu_init_lpis(void) +@@ -3125,6 +3129,10 @@ static void its_cpu_init_lpis(void) gicr_write_propbaser(val, rbase + GICR_PROPBASER); tmp = gicr_read_propbaser(rbase + GICR_PROPBASER); @@ -34,7 +34,7 @@ Signed-off-by: XiaoDong Huang if ((tmp ^ val) & GICR_PROPBASER_SHAREABILITY_MASK) { if (!(tmp & GICR_PROPBASER_SHAREABILITY_MASK)) { /* -@@ -3124,6 +3132,10 @@ static void its_cpu_init_lpis(void) +@@ -3149,6 +3157,10 @@ static void its_cpu_init_lpis(void) gicr_write_pendbaser(val, rbase + GICR_PENDBASER); tmp = gicr_read_pendbaser(rbase + GICR_PENDBASER); @@ -45,7 +45,7 @@ Signed-off-by: XiaoDong Huang if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { /* * The HW reports non-shareable, we must remove the -@@ -5093,6 +5105,10 @@ static int __init its_probe_one(struct r +@@ -5110,6 +5122,10 @@ static int __init its_probe_one(struct r gits_write_cbaser(baser, its->base + GITS_CBASER); tmp = gits_read_cbaser(its->base + GITS_CBASER); diff --git a/target/linux/rockchip/patches-5.15/701-03-irqchip-gic-v3-its-flush-base-table-if-rk356x.patch b/target/linux/rockchip/patches-5.15/701-03-irqchip-gic-v3-its-flush-base-table-if-rk356x.patch index f5905a2ed3..fb1c296396 100644 --- a/target/linux/rockchip/patches-5.15/701-03-irqchip-gic-v3-its-flush-base-table-if-rk356x.patch +++ b/target/linux/rockchip/patches-5.15/701-03-irqchip-gic-v3-its-flush-base-table-if-rk356x.patch @@ -11,7 +11,7 @@ Signed-off-by: XiaoDong Huang --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -2360,8 +2360,12 @@ retry_baser: +@@ -2385,8 +2385,12 @@ retry_baser: tmp = baser->val; if (of_machine_is_compatible("rockchip,rk3568") || diff --git a/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index 4e1d6518f3..7bb71471f8 100644 --- a/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-5.15/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch @@ -12,7 +12,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c -@@ -2360,7 +2360,8 @@ retry_baser: +@@ -2385,7 +2385,8 @@ retry_baser: tmp = baser->val; if (of_machine_is_compatible("rockchip,rk3568") || @@ -22,7 +22,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc if (tmp & GITS_BASER_SHAREABILITY_MASK) tmp &= ~GITS_BASER_SHAREABILITY_MASK; else -@@ -3109,7 +3110,8 @@ static void its_cpu_init_lpis(void) +@@ -3134,7 +3135,8 @@ static void its_cpu_init_lpis(void) tmp = gicr_read_propbaser(rbase + GICR_PROPBASER); if (of_machine_is_compatible("rockchip,rk3568") || @@ -32,7 +32,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc tmp &= ~GICR_PROPBASER_SHAREABILITY_MASK; if ((tmp ^ val) & GICR_PROPBASER_SHAREABILITY_MASK) { -@@ -3137,7 +3139,8 @@ static void its_cpu_init_lpis(void) +@@ -3162,7 +3164,8 @@ static void its_cpu_init_lpis(void) tmp = gicr_read_pendbaser(rbase + GICR_PENDBASER); if (of_machine_is_compatible("rockchip,rk3568") || @@ -42,7 +42,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK; if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { -@@ -5110,7 +5113,8 @@ static int __init its_probe_one(struct r +@@ -5127,7 +5130,8 @@ static int __init its_probe_one(struct r tmp = gits_read_cbaser(its->base + GITS_CBASER); if (of_machine_is_compatible("rockchip,rk3568") ||