linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ipmi:ssif: Fix double probe from tryacpi and trydmi
@ 2018-03-07  5:49 Jiandi An
  2018-03-07 13:34 ` Corey Minyard
  0 siblings, 1 reply; 6+ messages in thread
From: Jiandi An @ 2018-03-07  5:49 UTC (permalink / raw)
  To: minyard, arnd, gregkh, anjiandi; +Cc: openipmi-developer, linux-kernel

IPMI SSIF driver's parameter tryacpi and trydmi both
are set to true.  The addition of IPMI DMI driver to
create platform device for each IPMI device causes
SSIF probe to be done twice on the same SMB I2C address
for BMC.  Fix is to not call trydmi if tryacpi is able
to find I2C address for BMC from SPMI ACPI table and
probe successfully.

Signed-off-by: Jiandi An <anjiandi@codeaurora.org>
---
 drivers/char/ipmi/ipmi_ssif.c | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index 9d3b0fa..5c57363 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -1981,29 +1981,41 @@ static int try_init_spmi(struct SPMITable *spmi)
 	return new_ssif_client(myaddr, NULL, 0, 0, SI_SPMI, NULL);
 }
 
-static void spmi_find_bmc(void)
+static int spmi_find_bmc(void)
 {
 	acpi_status      status;
 	struct SPMITable *spmi;
 	int              i;
+	int              rc = 0;
 
 	if (acpi_disabled)
-		return;
+		return -EPERM;
 
 	if (acpi_failure)
-		return;
+		return -ENODEV;
 
 	for (i = 0; ; i++) {
 		status = acpi_get_table(ACPI_SIG_SPMI, i+1,
 					(struct acpi_table_header **)&spmi);
-		if (status != AE_OK)
-			return;
+		if (status != AE_OK) {
+			if (i == 0)
+				return -ENODEV;
+			else
+				return 0;
+		}
 
-		try_init_spmi(spmi);
+		rc = try_init_spmi(spmi);
+		if (rc)
+			return rc;
 	}
+
+	return 0;
 }
 #else
-static void spmi_find_bmc(void) { }
+static int spmi_find_bmc(void)
+{
+	return -ENODEV;
+}
 #endif
 
 #ifdef CONFIG_DMI
@@ -2104,12 +2116,13 @@ static int init_ipmi_ssif(void)
 			       addr[i]);
 	}
 
-	if (ssif_tryacpi)
+	if (ssif_tryacpi) {
 		ssif_i2c_driver.driver.acpi_match_table	=
 			ACPI_PTR(ssif_acpi_match);
-
-	if (ssif_tryacpi)
-		spmi_find_bmc();
+		rv = spmi_find_bmc();
+		if (!rv)
+			ssif_trydmi = false;
+	}
 
 	if (ssif_trydmi) {
 		rv = platform_driver_register(&ipmi_driver);
-- 
Jiandi An
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-03-08 20:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-07  5:49 [PATCH] ipmi:ssif: Fix double probe from tryacpi and trydmi Jiandi An
2018-03-07 13:34 ` Corey Minyard
2018-03-07 23:59   ` Jiandi An
2018-03-08 14:10     ` Corey Minyard
2018-03-08 18:18       ` Jiandi An
2018-03-08 20:40         ` Corey Minyard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).