kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/irqchip/irq-gic-v3-its.c
..
..
@@ -2168,7 +2168,9 @@
2168
2168
 {
2169
2169
 	struct page *prop_page;
2170
2170
 
2171
-	if (of_machine_is_compatible("rockchip,rk3568") || of_machine_is_compatible("rockchip,rk3566"))
2171
+	if (of_machine_is_compatible("rockchip,rk3568") ||
2172
+	    of_machine_is_compatible("rockchip,rk3567") ||
2173
+	    of_machine_is_compatible("rockchip,rk3566"))
2172
2174
 		gfp_flags |= GFP_DMA32;
2173
2175
 	prop_page = alloc_pages(gfp_flags, get_order(LPI_PROPBASE_SZ));
2174
2176
 	if (!prop_page)
..
..
@@ -2306,7 +2308,9 @@
2306
2308
 	}
2307
2309
 
2308
2310
 	gfp_flags = GFP_KERNEL | __GFP_ZERO;
2309
-	if (of_machine_is_compatible("rockchip,rk3568") || of_machine_is_compatible("rockchip,rk3566"))
2311
+	if (of_machine_is_compatible("rockchip,rk3568") ||
2312
+	    of_machine_is_compatible("rockchip,rk3567") ||
2313
+	    of_machine_is_compatible("rockchip,rk3566"))
2310
2314
 		gfp_flags |= GFP_DMA32;
2311
2315
 	page = alloc_pages_node(its->numa_node, gfp_flags, order);
2312
2316
 	if (!page)
..
..
@@ -2357,6 +2361,7 @@
2357
2361
 
2358
2362
 	if (IS_ENABLED(CONFIG_NO_GKI) &&
2359
2363
 	    (of_machine_is_compatible("rockchip,rk3568") ||
2364
+	     of_machine_is_compatible("rockchip,rk3567") ||
2360
2365
 	     of_machine_is_compatible("rockchip,rk3566") ||
2361
2366
 	     of_machine_is_compatible("rockchip,rk3588"))) {
2362
2367
 		if (tmp & GITS_BASER_SHAREABILITY_MASK)
..
..
@@ -2947,7 +2952,9 @@
2947
2952
 {
2948
2953
 	struct page *pend_page;
2949
2954
 
2950
-	if (of_machine_is_compatible("rockchip,rk3568") || of_machine_is_compatible("rockchip,rk3566"))
2955
+	if (of_machine_is_compatible("rockchip,rk3568") ||
2956
+	    of_machine_is_compatible("rockchip,rk3567") ||
2957
+	    of_machine_is_compatible("rockchip,rk3566"))
2951
2958
 		gfp_flags |= GFP_DMA32;
2952
2959
 	pend_page = alloc_pages(gfp_flags | __GFP_ZERO,
2953
2960
 				get_order(LPI_PENDBASE_SZ));
..
..
@@ -3108,6 +3115,7 @@
3108
3115
 
3109
3116
 	if (IS_ENABLED(CONFIG_NO_GKI) &&
3110
3117
 	    (of_machine_is_compatible("rockchip,rk3568") ||
3118
+	     of_machine_is_compatible("rockchip,rk3567") ||
3111
3119
 	     of_machine_is_compatible("rockchip,rk3566") ||
3112
3120
 	     of_machine_is_compatible("rockchip,rk3588")))
3113
3121
 		tmp &= ~GICR_PROPBASER_SHAREABILITY_MASK;
..
..
@@ -3138,6 +3146,7 @@
3138
3146
 
3139
3147
 	if (IS_ENABLED(CONFIG_NO_GKI) &&
3140
3148
 	    (of_machine_is_compatible("rockchip,rk3568") ||
3149
+	     of_machine_is_compatible("rockchip,rk3567") ||
3141
3150
 	     of_machine_is_compatible("rockchip,rk3566") ||
3142
3151
 	     of_machine_is_compatible("rockchip,rk3588")))
3143
3152
 		tmp &= ~GICR_PENDBASER_SHAREABILITY_MASK;
..
..
@@ -3306,7 +3315,9 @@
3306
3315
 	if (!table[idx]) {
3307
3316
 		gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO;
3308
3317
 
3309
-		if (of_machine_is_compatible("rockchip,rk3568") || of_machine_is_compatible("rockchip,rk3566"))
3318
+		if (of_machine_is_compatible("rockchip,rk3568") ||
3319
+		    of_machine_is_compatible("rockchip,rk3567") ||
3320
+		    of_machine_is_compatible("rockchip,rk3566"))
3310
3321
 			gfp_flags |= GFP_DMA32;
3311
3322
 		page = alloc_pages_node(its->numa_node, gfp_flags,
3312
3323
 					get_order(baser->psz));
..
..
@@ -3414,7 +3425,9 @@
3414
3425
 	sz = nr_ites * (FIELD_GET(GITS_TYPER_ITT_ENTRY_SIZE, its->typer) + 1);
3415
3426
 	sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1;
3416
3427
 	gfp_flags = GFP_KERNEL;
3417
-	if (of_machine_is_compatible("rockchip,rk3568") || of_machine_is_compatible("rockchip,rk3566")) {
3428
+	if (of_machine_is_compatible("rockchip,rk3568") ||
3429
+	    of_machine_is_compatible("rockchip,rk3567") ||
3430
+	    of_machine_is_compatible("rockchip,rk3566")) {
3418
3431
 		gfp_flags |= GFP_DMA32;
3419
3432
 		itt = (void *)__get_free_pages(gfp_flags, get_order(sz));
3420
3433
 	} else {
..
..
@@ -3436,6 +3449,7 @@
3436
3449
 		kfree(dev);
3437
3450
 
3438
3451
 		if (of_machine_is_compatible("rockchip,rk3568") ||
3452
+		    of_machine_is_compatible("rockchip,rk3567") ||
3439
3453
 		    of_machine_is_compatible("rockchip,rk3566"))
3440
3454
 			free_pages((unsigned long)itt, get_order(sz));
3441
3455
 		else
..
..
@@ -3480,6 +3494,7 @@
3480
3494
 	kfree(its_dev->event_map.col_map);
3481
3495
 
3482
3496
 	if (of_machine_is_compatible("rockchip,rk3568") ||
3497
+	    of_machine_is_compatible("rockchip,rk3567") ||
3483
3498
 	    of_machine_is_compatible("rockchip,rk3566"))
3484
3499
 		free_pages((unsigned long)its_dev->itt, get_order(its_dev->itt_sz));
3485
3500
 	else
..
..
@@ -5085,7 +5100,9 @@
5085
5100
 	its->numa_node = numa_node;
5086
5101
 
5087
5102
 	gfp_flags = GFP_KERNEL | __GFP_ZERO;
5088
-	if (of_machine_is_compatible("rockchip,rk3568") || of_machine_is_compatible("rockchip,rk3566"))
5103
+	if (of_machine_is_compatible("rockchip,rk3568") ||
5104
+	    of_machine_is_compatible("rockchip,rk3567") ||
5105
+	    of_machine_is_compatible("rockchip,rk3566"))
5089
5106
 		gfp_flags |= GFP_DMA32;
5090
5107
 	page = alloc_pages_node(its->numa_node, gfp_flags,
5091
5108
 				get_order(ITS_CMD_QUEUE_SZ));
..
..
@@ -5120,6 +5137,7 @@
5120
5137
 
5121
5138
 	if (IS_ENABLED(CONFIG_NO_GKI) &&
5122
5139
 	    (of_machine_is_compatible("rockchip,rk3568") ||
5140
+	     of_machine_is_compatible("rockchip,rk3567") ||
5123
5141
 	     of_machine_is_compatible("rockchip,rk3566") ||
5124
5142
 	     of_machine_is_compatible("rockchip,rk3588")))
5125
5143
 		tmp &= ~GITS_CBASER_SHAREABILITY_MASK;