update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/soc/rockchip/fiq_debugger/fiq_debugger.c
..
..
@@ -50,6 +50,7 @@
50
50
 #endif
51
51
 
52
52
 #include <linux/uaccess.h>
53
+#include <linux/cpuhotplug.h>
53
54
 
54
55
 #include "fiq_debugger.h"
55
56
 #include "fiq_debugger_priv.h"
..
..
@@ -148,10 +149,7 @@
148
149
 static bool initial_console_enable;
149
150
 #endif
150
151
 
151
-#ifdef CONFIG_FIQ_DEBUGGER_TRUST_ZONE
152
-static struct fiq_debugger_state *state_tf;
153
-#endif
154
-
152
+static struct fiq_debugger_state *g_state;
155
153
 static bool fiq_kgdb_enable;
156
154
 static bool fiq_debugger_disable;
157
155
 
..
..
@@ -1077,7 +1075,7 @@
1077
1075
 #ifdef CONFIG_FIQ_DEBUGGER_TRUST_ZONE
1078
1076
 void fiq_debugger_fiq(void *regs, u32 cpu)
1079
1077
 {
1080
-	struct fiq_debugger_state *state = state_tf;
1078
+	struct fiq_debugger_state *state = g_state;
1081
1079
 	bool need_irq;
1082
1080
 
1083
1081
 	if (!state)
..
..
@@ -1444,6 +1442,18 @@
1444
1442
 	return 0;
1445
1443
 }
1446
1444
 
1445
+static int fiq_debugger_cpu_offine_migrate_irq(unsigned int cpu)
1446
+{
1447
+	if (g_state && cpu == g_state->current_cpu) {
1448
+		unsigned int new_cpu = cpumask_any_but(cpu_online_mask, cpu);
1449
+
1450
+		if (new_cpu < nr_cpu_ids)
1451
+			g_state->current_cpu = new_cpu;
1452
+	}
1453
+
1454
+	return 0;
1455
+}
1456
+
1447
1457
 static int fiq_debugger_probe(struct platform_device *pdev)
1448
1458
 {
1449
1459
 	int ret;
..
..
@@ -1451,6 +1461,7 @@
1451
1461
 	struct fiq_debugger_state *state;
1452
1462
 	int fiq;
1453
1463
 	int uart_irq;
1464
+	enum cpuhp_state cs = -1;
1454
1465
 
1455
1466
 	if (pdev->id >= MAX_FIQ_DEBUGGER_PORTS)
1456
1467
 		return -EINVAL;
..
..
@@ -1556,7 +1567,7 @@
1556
1567
 			pr_err("%s: could not install nmi irq handler\n", __func__);
1557
1568
 			irq_clear_status_flags(state->uart_irq, IRQ_NOAUTOEN);
1558
1569
 			ret = request_irq(state->uart_irq, fiq_debugger_uart_irq,
1559
-					  IRQF_NO_SUSPEND, "debug", state);
1570
+					  IRQF_NO_SUSPEND | IRQF_NOBALANCING, "debug", state);
1560
1571
 		} else {
1561
1572
 			enable_nmi(state->uart_irq);
1562
1573
 		}
..
..
@@ -1570,6 +1581,15 @@
1570
1581
 		 * can.
1571
1582
 		 */
1572
1583
 		enable_irq_wake(state->uart_irq);
1584
+
1585
+		ret = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
1586
+						"soc/fiq_debugger",
1587
+						NULL,
1588
+						fiq_debugger_cpu_offine_migrate_irq);
1589
+		if (ret < 0)
1590
+			pr_err("%s: could not setup cpu offine handler\n", __func__);
1591
+		else
1592
+			cs = ret;
1573
1593
 	}
1574
1594
 
1575
1595
 	if (state->signal_irq >= 0) {
..
..
@@ -1600,10 +1620,6 @@
1600
1620
 	if (state->no_sleep)
1601
1621
 		fiq_debugger_handle_wakeup(state);
1602
1622
 
1603
-#ifdef CONFIG_FIQ_DEBUGGER_TRUST_ZONE
1604
-	state_tf = state;
1605
-#endif
1606
-
1607
1623
 	if (pdata->uart_init) {
1608
1624
 		ret = pdata->uart_init(pdev);
1609
1625
 		if (ret)
..
..
@@ -1630,7 +1646,7 @@
1630
1646
 
1631
1647
 	/* switch to cpu0 default */
1632
1648
 	fiq_debugger_switch_cpu(state, 0);
1633
-
1649
+	g_state = state;
1634
1650
 	return 0;
1635
1651
 
1636
1652
 err_register_irq:
..
..
@@ -1641,6 +1657,8 @@
1641
1657
 		clk_disable(state->clk);
1642
1658
 	if (state->clk)
1643
1659
 		clk_put(state->clk);
1660
+	if (cs >= 0)
1661
+		cpuhp_remove_state_nocalls(cs);
1644
1662
 	wakeup_source_remove(&state->debugger_wake_src);
1645
1663
 	__pm_relax(&state->debugger_wake_src);
1646
1664
 	platform_set_drvdata(pdev, NULL);