Skip to contentSkip to conversation

soc: fsl: qbman: Ensure device cleanup is run for kexec

PATCH New Roy Pledge 1 participant 1 message Nov 3, 2020 Freescale SoC drivers

lore
Share & tools
lore

Roy Pledge

author
#0 lore raw

PATCH 1/1 soc: fsl: qbman: Ensure device cleanup is run for kexec

Make sure that the QBMan device cleanup routines are executed when the device was previously initialized. This is needed for kexec since the device will keep it's state from the previous kernel that was executing.

---
 drivers/soc/fsl/qbman/bman_portal.c | 3 ++-
 drivers/soc/fsl/qbman/qman_portal.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/soc/fsl/qbman/bman_portal.c +2 -1
index 923c440..acda8a5 100644
@@ -160,7 +160,7 @@ static int bman_portal_probe(struct platform_device *pdev)
 		__bman_portals_probed = 1;
 		/* unassigned portal, skip init */
 		spin_unlock(&bman_lock);
-		return 0;
+		goto check_cleanup;
 	}
 
 	cpumask_set_cpu(cpu, &portal_cpus);
@@ -176,6 +176,7 @@ static int bman_portal_probe(struct platform_device *pdev)
 	if (!cpu_online(cpu))
 		bman_offline_cpu(cpu);
 
+check_cleanup:
 	if (__bman_portals_probed == 1 && bman_requires_cleanup()) {
 		/*
 		 * BMan wasn't reset prior to boot (Kexec for example)
drivers/soc/fsl/qbman/qman_portal.c +2 -1
index 5685b67..4274bd1b 100644
@@ -302,7 +302,7 @@ static int qman_portal_probe(struct platform_device *pdev)
 		__qman_portals_probed = 1;
 		/* unassigned portal, skip init */
 		spin_unlock(&qman_lock);
-		return 0;
+		goto check_cleanup;
 	}
 
 	cpumask_set_cpu(cpu, &portal_cpus);
@@ -323,6 +323,7 @@ static int qman_portal_probe(struct platform_device *pdev)
 	if (!cpu_online(cpu))
 		qman_offline_cpu(cpu);
 
+check_cleanup:
 	if (__qman_portals_probed == 1 && qman_requires_cleanup()) {
 		/*
 		 * QMan wasn't reset prior to boot (Kexec for example)
Signature · 7 lines
2.7.4


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel