rockchip: 6.6: fixes rk3568 pcie msi issue

target/linux/rockchip/patches-6.6/035-v6.12-clk-rockchip-fix-finding-of-maximum-clock-ID.patch

@@ -0,0 +1,29 @@
+From ad1081a0da2744141d12e94ff816ac91feb871ca Mon Sep 17 00:00:00 2001
+From: Yao Zi <[email protected]>
+Date: Thu, 12 Sep 2024 13:32:05 +0000
+Subject: [PATCH] clk: rockchip: fix finding of maximum clock ID
+
+If an ID of a branch's child is greater than current maximum, we should
+set new maximum to the child's ID, instead of its parent's.
+
+Fixes: 2dc66a5ab2c6 ("clk: rockchip: rk3588: fix CLK_NR_CLKS usage")
+Signed-off-by: Yao Zi <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Reviewed-by: Sebastian Reichel <[email protected]>
+Reviewed-by: Heiko Stuebner <[email protected]>
+Signed-off-by: Stephen Boyd <[email protected]>
+---
+ drivers/clk/rockchip/clk.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/clk/rockchip/clk.c
++++ b/drivers/clk/rockchip/clk.c
+@@ -439,7 +439,7 @@ unsigned long rockchip_clk_find_max_clk_
+ 		if (list->id > max)
+ 			max = list->id;
+ 		if (list->child && list->child->id > max)
+-			max = list->id;
++			max = list->child->id;
+ 	}
+
+ 	return max;

target/linux/rockchip/patches-6.6/111-irqchip-gic-v3-add-hackaround-for-rk3568-its.patch

@@ -1,31 +1,161 @@
+From 536378a084c6a4148141e132efee2fa9a464e007 Mon Sep 17 00:00:00 2001
+From: Peter Geis <[email protected]>
+Date: Thu, 3 Jun 2021 11:36:35 -0400
+Subject: [PATCH] irqchip: gic-v3: add hackaround for rk3568 its
+
+---
+ drivers/irqchip/irq-gic-v3-its.c | 70 +++++++++++++++++++++++++++++---
+ 1 file changed, 65 insertions(+), 5 deletions(-)
+
+--- a/drivers/irqchip/irq-gic-common.h
++++ b/drivers/irqchip/irq-gic-common.h
+@@ -32,5 +32,6 @@ void gic_enable_of_quirks(const struct d
+ #define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING    (1 << 0)
+ #define RDIST_FLAGS_RD_TABLES_PREALLOCATED     (1 << 1)
+ #define RDIST_FLAGS_FORCE_NON_SHAREABLE        (1 << 2)
++#define RDIST_FLAGS_FORCE_NO_LOCAL_CACHE       (1 << 3)
+
+ #endif /* _IRQ_GIC_COMMON_H */
 --- a/drivers/irqchip/irq-gic-v3-its.c
 +++ b/drivers/irqchip/irq-gic-v3-its.c
-@@ -4730,11 +4730,13 @@ static bool __maybe_unused its_enable_qu
+@@ -2186,6 +2186,11 @@ static struct page *its_allocate_prop_ta
+ {
+ 	struct page *prop_page;
+
++	if (gic_rdists->flags & RDIST_FLAGS_FORCE_NO_LOCAL_CACHE) {
++		pr_debug("ITS ALLOCATE PROP WORKAROUND\n");
++		gfp_flags |= GFP_DMA;
++	}
++
+ 	prop_page = alloc_pages(gfp_flags, get_order(LPI_PROPBASE_SZ));
+ 	if (!prop_page)
+ 		return NULL;
+@@ -2308,6 +2313,7 @@ static int its_setup_baser(struct its_no
+ 	u64 baser_phys, tmp;
+ 	u32 alloc_pages, psz;
+ 	struct page *page;
++	gfp_t gfp_flags;
+ 	void *base;
+
+ 	psz = baser->psz;
+@@ -2320,7 +2326,10 @@ static int its_setup_baser(struct its_no
+ 		order = get_order(GITS_BASER_PAGES_MAX * psz);
+ 	}
+
+-	page = alloc_pages_node(its->numa_node, GFP_KERNEL | __GFP_ZERO, order);
++	gfp_flags = GFP_KERNEL | __GFP_ZERO;
++	if (gic_rdists->flags & RDIST_FLAGS_FORCE_NO_LOCAL_CACHE)
++		gfp_flags |= GFP_DMA;
++	page = alloc_pages_node(its->numa_node, gfp_flags, order);
+ 	if (!page)
+ 		return -ENOMEM;
+
+@@ -2960,6 +2969,10 @@ static struct page *its_allocate_pending
+ {
+ 	struct page *pend_page;
+
++	if (gic_rdists->flags & RDIST_FLAGS_FORCE_NO_LOCAL_CACHE) {
++		gfp_flags |= GFP_DMA;
++	}
++
+ 	pend_page = alloc_pages(gfp_flags | __GFP_ZERO,
+ 				get_order(LPI_PENDBASE_SZ));
+ 	if (!pend_page)
+@@ -3308,7 +3321,12 @@ static bool its_alloc_table_entry(struct
+
+ 	/* Allocate memory for 2nd level table */
+ 	if (!table[idx]) {
+-		page = alloc_pages_node(its->numa_node, GFP_KERNEL | __GFP_ZERO,
++		gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO;
++		if (gic_rdists->flags & RDIST_FLAGS_FORCE_NO_LOCAL_CACHE) {
++			gfp_flags |= GFP_DMA;
++		}
++
++		page = alloc_pages_node(its->numa_node, gfp_flags,
+ 					get_order(baser->psz));
+ 		if (!page)
+ 			return false;
+@@ -3392,6 +3410,7 @@ static struct its_device *its_create_dev
+ 	unsigned long *lpi_map = NULL;
+ 	unsigned long flags;
+ 	u16 *col_map = NULL;
++	gfp_t gfp_flags;
+ 	void *itt;
+ 	int lpi_base;
+ 	int nr_lpis;
+@@ -3404,7 +3423,11 @@ static struct its_device *its_create_dev
+ 	if (WARN_ON(!is_power_of_2(nvecs)))
+ 		nvecs = roundup_pow_of_two(nvecs);
+
+-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
++	gfp_flags = GFP_KERNEL;
++	if (gic_rdists->flags & RDIST_FLAGS_FORCE_NO_LOCAL_CACHE)
++		gfp_flags |= GFP_DMA;
++
++	dev = kzalloc(sizeof(*dev), gfp_flags);
+ 	/*
+ 	 * Even if the device wants a single LPI, the ITT must be
+ 	 * sized as a power of two (and you need at least one bit...).
+@@ -3412,7 +3435,7 @@ 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;
+-	itt = kzalloc_node(sz, GFP_KERNEL, its->numa_node);
++	itt = kzalloc_node(sz, gfp_flags, its->numa_node);
+ 	if (alloc_lpis) {
+ 		lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
+ 		if (lpi_map)
+@@ -4730,6 +4753,21 @@ static bool __maybe_unused its_enable_qu
  	return true;
  }
 
--static bool __maybe_unused its_enable_rk3588001(void *data)
-+static bool __maybe_unused its_enable_rk35xx(void *data)
++static bool __maybe_unused its_enable_rk3568001(void *data)
++{
++	struct its_node *its = data;
++
++	if (!of_machine_is_compatible("rockchip,rk3566") &&
++	    !of_machine_is_compatible("rockchip,rk3568"))
++		return false;
++
++	its->flags |= ITS_FLAGS_FORCE_NON_SHAREABLE;
++	gic_rdists->flags |= RDIST_FLAGS_FORCE_NON_SHAREABLE |
++			     RDIST_FLAGS_FORCE_NO_LOCAL_CACHE;
++
++	return true;
++}
++
+ static bool __maybe_unused its_enable_rk3588001(void *data)
  {
  	struct its_node *its = data;
-
--	if (!of_machine_is_compatible("rockchip,rk3588") &&
-+	if (!of_machine_is_compatible("rockchip,rk3566") &&
-+	    !of_machine_is_compatible("rockchip,rk3568") &&
-+	    !of_machine_is_compatible("rockchip,rk3588") &&
- 	    !of_machine_is_compatible("rockchip,rk3588s"))
- 		return false;
-
-@@ -4800,10 +4802,10 @@ static const struct gic_quirk its_quirks
+@@ -4800,6 +4838,12 @@ static const struct gic_quirk its_quirks
  #endif
  #ifdef CONFIG_ROCKCHIP_ERRATUM_3588001
  	{
--		.desc   = "ITS: Rockchip erratum RK3588001",
-+		.desc   = "ITS: Rockchip erratum RK35XX",
++		.desc   = "ITS: Rockchip erratum RK3568001",
++		.iidr   = 0x0201743b,
++		.mask   = 0xffffffff,
++		.init   = its_enable_rk3568001,
++	},
++	{
+ 		.desc   = "ITS: Rockchip erratum RK3588001",
  		.iidr   = 0x0201743b,
  		.mask   = 0xffffffff,
--		.init   = its_enable_rk3588001,
-+		.init   = its_enable_rk35xx,
- 	},
- #endif
- 	{
+@@ -5065,6 +5109,7 @@ static int __init its_probe_one(struct i
+ {
+ 	u64 baser, tmp;
+ 	struct page *page;
++	gfp_t gfp_flags;
+ 	u32 ctlr;
+ 	int err;
+
+@@ -5100,7 +5145,9 @@ static int __init its_probe_one(struct i
+ 		}
+ 	}
+
+-	page = alloc_pages_node(its->numa_node, GFP_KERNEL | __GFP_ZERO,
++	gfp_flags = GFP_KERNEL | __GFP_ZERO | GFP_DMA;
++
++	page = alloc_pages_node(its->numa_node, gfp_flags,
+ 				get_order(ITS_CMD_QUEUE_SZ));
+ 	if (!page) {
+ 		err = -ENOMEM;