[PATCH] powerpc/eeh: Add conditional check on notify_resume

From: "Juan J. Alvarez" <redacted>

EEH structure is not populated with function
notify resume when running on systems that do not support
it, i.e: BMC. Hence adding a conditional check for NULL for
systems that don't add function notify_resume.

Signed-off-by: Juan J. Alvarez <redacted>
Reviewed-by: Bryant G. Ly <redacted>
Tested-by: Carol L. Soto <redacted>
---
 arch/powerpc/kernel/eeh_driver.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index beea218..0c0b66f 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c

@@ -384,7 +384,8 @@ static void *eeh_report_resume(void *data, void *userdata)
 	eeh_pcid_put(dev);
 	pci_uevent_ers(dev, PCI_ERS_RESULT_RECOVERED);
 #ifdef CONFIG_PCI_IOV
-	eeh_ops->notify_resume(eeh_dev_to_pdn(edev));
+	if (eeh_ops->notify_resume && eeh_dev_to_pdn(edev))
+		eeh_ops->notify_resume(eeh_dev_to_pdn(edev));
 #endif
 	return NULL;
 }

-- 
2.7.2

On 16/02/18 05:49, Bryant G. Ly wrote:

From: "Juan J. Alvarez" <redacted>

EEH structure is not populated with function
notify resume when running on systems that do not support
it, i.e: BMC. Hence adding a conditional check for NULL for

Seems to me that by "BMC" you really mean "powernv platform"?

systems that don't add function notify_resume.

Signed-off-by: Juan J. Alvarez <redacted>
Reviewed-by: Bryant G. Ly <redacted>
Tested-by: Carol L. Soto <redacted>

Reviewed-by: Andrew Donnellan <redacted>

-- 
Andrew Donnellan              OzLabs, ADL Canberra
andrew.donnellan@au1.ibm.com  IBM Australia Limited

On Thu, Feb 15, 2018 at 12:49:51PM -0600, Bryant G. Ly wrote:

From: "Juan J. Alvarez" <redacted>

EEH structure is not populated with function
notify resume when running on systems that do not support
it, i.e: BMC. Hence adding a conditional check for NULL for
systems that don't add function notify_resume.

Signed-off-by: Juan J. Alvarez <redacted>
Reviewed-by: Bryant G. Ly <redacted>
Tested-by: Carol L. Soto <redacted>

Tested-by: Mauro S. M. Rodrigues <redacted>

Thanks! I was debugging it and I'm glad you proposed a fix already.

On Thu, 2018-02-15 at 12:49 -0600, Bryant G. Ly wrote:

From: "Juan J. Alvarez" <redacted>
=20
EEH structure is not populated with function
notify resume when running on systems that do not support
it, i.e: BMC. Hence adding a conditional check for NULL for
systems that don't add function notify_resume.
=20
Signed-off-by: Juan J. Alvarez <redacted>
Reviewed-by: Bryant G. Ly <redacted>
Tested-by: Carol L. Soto <redacted>

Acked-by: Michael Neuling <redacted>

data)

 	eeh_pcid_put(dev);
 	pci_uevent_ers(dev, PCI_ERS_RESULT_RECOVERED);
 #ifdef CONFIG_PCI_IOV
-	eeh_ops->notify_resume(eeh_dev_to_pdn(edev));
+	if (eeh_ops->notify_resume && eeh_dev_to_pdn(edev))
+		eeh_ops->notify_resume(eeh_dev_to_pdn(edev));
 #endif
 	return NULL;
 }

On Thu, 2018-02-15 at 18:49:51 UTC, "Bryant G. Ly" wrote:

From: "Juan J. Alvarez" <redacted>

EEH structure is not populated with function
notify resume when running on systems that do not support
it, i.e: BMC. Hence adding a conditional check for NULL for
systems that don't add function notify_resume.

Signed-off-by: Juan J. Alvarez <redacted>
Reviewed-by: Bryant G. Ly <redacted>
Tested-by: Carol L. Soto <redacted>
Reviewed-by: Andrew Donnellan <redacted>
Tested-by: Mauro S. M. Rodrigues <redacted>
Acked-by: Michael Neuling <redacted>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/521ca5a9859a870e354d1a6b84a6ff

cheers