From 977ac5e6036613731a5d4ee211eb5e31195b1500 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 12 Aug 2023 15:41:34 +0800 Subject: [PATCH] rockchip: refresh kernel patches Signed-off-by: Tianling Shen --- ...wc3-add-optional-PHY-interface-clocks.patch | 6 +++--- ...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 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch b/target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch index a6e20a75e6..ec84942f06 100644 --- a/target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch +++ b/target/linux/rockchip/patches-6.1/113-01-usb-dwc3-add-optional-PHY-interface-clocks.patch @@ -45,7 +45,7 @@ Signed-off-by: Sebastian Reichel clk_disable_unprepare(dwc->susp_clk); clk_disable_unprepare(dwc->ref_clk); clk_disable_unprepare(dwc->bus_clk); -@@ -1854,6 +1868,18 @@ static int dwc3_probe(struct platform_de +@@ -1838,6 +1852,18 @@ static int dwc3_probe(struct platform_de goto put_usb_psy; } } @@ -66,7 +66,7 @@ Signed-off-by: Sebastian Reichel ret = reset_control_deassert(dwc->reset); --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -989,6 +989,8 @@ struct dwc3_scratchpad_array { +@@ -986,6 +986,8 @@ struct dwc3_scratchpad_array { * @bus_clk: clock for accessing the registers * @ref_clk: reference clock * @susp_clk: clock used when the SS phy is in low power (S3) state @@ -75,7 +75,7 @@ Signed-off-by: Sebastian Reichel * @reset: reset control * @regs: base address for our registers * @regs_size: address space size -@@ -1153,6 +1155,8 @@ struct dwc3 { +@@ -1150,6 +1152,8 @@ struct dwc3 { struct clk *bus_clk; struct clk *ref_clk; struct clk *susp_clk; diff --git a/target/linux/rockchip/patches-6.1/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch b/target/linux/rockchip/patches-6.1/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch index 8ba0c52704..e77b61e6fd 100644 --- a/target/linux/rockchip/patches-6.1/701-01-irqchip-gic-v3-its-add-GFP_DMA32-flag-for-memory-allocate.patch +++ b/target/linux/rockchip/patches-6.1/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 -@@ -2178,6 +2178,8 @@ static struct page *its_allocate_prop_ta +@@ -2203,6 +2203,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; -@@ -2301,6 +2303,7 @@ static int its_setup_baser(struct its_no +@@ -2326,6 +2328,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); -@@ -2312,7 +2315,10 @@ static int its_setup_baser(struct its_no +@@ -2337,7 +2340,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; -@@ -2941,6 +2947,8 @@ static struct page *its_allocate_pending +@@ -2966,6 +2972,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) -@@ -3283,7 +3291,11 @@ static bool its_alloc_table_entry(struct +@@ -3308,7 +3316,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; -@@ -3372,6 +3384,7 @@ static struct its_device *its_create_dev +@@ -3397,6 +3409,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; -@@ -3387,7 +3400,10 @@ static struct its_device *its_create_dev +@@ -3412,7 +3425,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) -@@ -5011,6 +5027,7 @@ static int __init its_probe_one(struct r +@@ -5028,6 +5044,7 @@ static int __init its_probe_one(struct r struct page *page; u32 ctlr; int err; @@ -91,7 +91,7 @@ Signed-off-by: XiaoDong Huang its_base = its_map_one(res, &err); if (!its_base) -@@ -5064,7 +5081,10 @@ static int __init its_probe_one(struct r +@@ -5081,7 +5098,10 @@ static int __init its_probe_one(struct r its->numa_node = numa_node; diff --git a/target/linux/rockchip/patches-6.1/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-6.1/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index 62159f6bea..daf6c85a6c 100644 --- a/target/linux/rockchip/patches-6.1/701-02-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-6.1/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 -@@ -2365,6 +2365,10 @@ retry_baser: +@@ -2390,6 +2390,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 -@@ -3104,6 +3108,10 @@ static void its_cpu_init_lpis(void) +@@ -3129,6 +3133,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)) { /* -@@ -3128,6 +3136,10 @@ static void its_cpu_init_lpis(void) +@@ -3153,6 +3161,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 -@@ -5115,6 +5127,10 @@ static int __init its_probe_one(struct r +@@ -5132,6 +5144,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-6.1/701-03-irqchip-gic-v3-its-flush-base-table-if-rk356x.patch b/target/linux/rockchip/patches-6.1/701-03-irqchip-gic-v3-its-flush-base-table-if-rk356x.patch index c413c0c147..51fde0df27 100644 --- a/target/linux/rockchip/patches-6.1/701-03-irqchip-gic-v3-its-flush-base-table-if-rk356x.patch +++ b/target/linux/rockchip/patches-6.1/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 -@@ -2366,8 +2366,12 @@ retry_baser: +@@ -2391,8 +2391,12 @@ retry_baser: tmp = baser->val; if (of_machine_is_compatible("rockchip,rk3568") || diff --git a/target/linux/rockchip/patches-6.1/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch b/target/linux/rockchip/patches-6.1/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch index 2ca1b5dc30..53d2511682 100644 --- a/target/linux/rockchip/patches-6.1/701-04-irqchip-gic-v3-its-force-to-config-its-tables-as.patch +++ b/target/linux/rockchip/patches-6.1/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 -@@ -2366,7 +2366,9 @@ retry_baser: +@@ -2391,7 +2391,9 @@ retry_baser: tmp = baser->val; if (of_machine_is_compatible("rockchip,rk3568") || @@ -23,7 +23,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc if (tmp & GITS_BASER_SHAREABILITY_MASK) tmp &= ~GITS_BASER_SHAREABILITY_MASK; else -@@ -3113,7 +3115,9 @@ static void its_cpu_init_lpis(void) +@@ -3138,7 +3140,9 @@ static void its_cpu_init_lpis(void) tmp = gicr_read_propbaser(rbase + GICR_PROPBASER); if (of_machine_is_compatible("rockchip,rk3568") || @@ -34,7 +34,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc tmp &= ~GICR_PROPBASER_SHAREABILITY_MASK; if ((tmp ^ val) & GICR_PROPBASER_SHAREABILITY_MASK) { -@@ -3141,7 +3145,9 @@ static void its_cpu_init_lpis(void) +@@ -3166,7 +3170,9 @@ static void its_cpu_init_lpis(void) tmp = gicr_read_pendbaser(rbase + GICR_PENDBASER); if (of_machine_is_compatible("rockchip,rk3568") || @@ -45,7 +45,7 @@ Change-Id: I7275cbf011061f11968505a7570230d2d789e9fc tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK; if (!(tmp & GICR_PENDBASER_SHAREABILITY_MASK)) { -@@ -5132,7 +5138,9 @@ static int __init its_probe_one(struct r +@@ -5149,7 +5155,9 @@ static int __init its_probe_one(struct r tmp = gits_read_cbaser(its->base + GITS_CBASER); if (of_machine_is_compatible("rockchip,rk3568") ||