Skip to contentSkip to conversation

firmware: arm_sdei: Drop check for /firmware/ node and always register driver

PATCH Applied Sudeep Holla 3 participants 3 messages Apr 22, 2020 – May 4, 2020 Software delegated exception interface (sdei)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware: arm_sdei: Drop check for /firmware/ node and always register driver

As with most of the drivers, let us register this driver unconditionally by dropping the checks for presence of firmware nodes(DT) or entries(ACPI).

Further, as mentioned in the commit acafce48b07b ("firmware: arm_sdei:
Fix DT platform device creation"), the core takes care of creation of platform device when the appropriate device node is found and probe is called accordingly.

Let us check only for the presence of ACPI firmware entry before creating the platform device and flag warning if we fail.

---
 drivers/firmware/arm_sdei.c | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)
drivers/firmware/arm_sdei.c +12 -25
index 334c8be0c11f..5afd7409e6fa 100644
@@ -1079,26 +1079,9 @@ static struct platform_driver sdei_driver = {
 	.probe		= sdei_probe,
 };
 
-static bool __init sdei_present_dt(void)
-{
-	struct device_node *np, *fw_np;
-
-	fw_np = of_find_node_by_name(NULL, "firmware");
-	if (!fw_np)
-		return false;
-
-	np = of_find_matching_node(fw_np, sdei_of_match);
-	if (!np)
-		return false;
-	of_node_put(np);
-
-	return true;
-}
-
 static bool __init sdei_present_acpi(void)
 {
 	acpi_status status;
-	struct platform_device *pdev;
 	struct acpi_table_header *sdei_table_header;
 
 	if (acpi_disabled)
@@ -1113,20 +1096,24 @@ static bool __init sdei_present_acpi(void)
 	if (ACPI_FAILURE(status))
 		return false;
 
-	pdev = platform_device_register_simple(sdei_driver.driver.name, 0, NULL,
-					       0);
-	if (IS_ERR(pdev))
-		return false;
-
 	return true;
 }
 
 static int __init sdei_init(void)
 {
-	if (sdei_present_dt() || sdei_present_acpi())
-		platform_driver_register(&sdei_driver);
+	int ret = platform_driver_register(&sdei_driver);
 
-	return 0;
+	if (!ret && sdei_present_acpi()) {
+		struct platform_device *pdev;
+
+		pdev = platform_device_register_simple(sdei_driver.driver.name,
+						       0, NULL, 0);
+		if (IS_ERR(pdev))
+			pr_info("Failed to register ACPI:SDEI platform device %ld\n",
+				PTR_ERR(pdev));
+	}
+
+	return ret;
 }
 
 /*
Signature · 1 line
2.17.1
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi Sudeep,

(CC: +Will and +Catalin)

Quoted 10 lines · Sudeep Holla

As with most of the drivers, let us register this driver unconditionally by dropping the checks for presence of firmware nodes(DT) or entries(ACPI).

Further, as mentioned in the commit acafce48b07b ("firmware: arm_sdei:
Fix DT platform device creation"), the core takes care of creation of platform device when the appropriate device node is found and probe is called accordingly.

Let us check only for the presence of ACPI firmware entry before creating the platform device and flag warning if we fail.

Will/Catalin, any chance you could pick this up for v5.8?

Original message:
https://lore.kernel.org/linux-arm-kernel/[email protected]/

Thanks!

James

Applied
#2 lore raw
In reply to Sudeep Holla
Quoted 9 lines · Sudeep Holla

As with most of the drivers, let us register this driver unconditionally by dropping the checks for presence of firmware nodes(DT) or entries(ACPI).

Further, as mentioned in the commit acafce48b07b ("firmware: arm_sdei:
Fix DT platform device creation"), the core takes care of creation of platform device when the appropriate device node is found and probe is called accordingly.

[...]

Applied to arm64 (for-next/sdei), thanks!

[1/1] firmware: arm_sdei: Drop check for /firmware/ node and always register driver

      https://git.kernel.org/arm64/c/caf2cd610dbb

Cheers,

Signature · 4 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev