[src/trunk]: src/sys/dev/pci Always allow hdaudio(4) to suspend

[khorben <khorben%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/aa44f966b9e2
branches:  trunk
changeset: 821272:aa44f966b9e2
user:      khorben <khorben%NetBSD.org@localhost>
date:      Tue Jan 31 00:58:15 2017 +0000

description:
Always allow hdaudio(4) to suspend

Sometimes hdaudio(4) can fail to attach, but the device remains in the
tree. Even though the PMF registration is performed, it is explicitly
de-registered in the code path for errors - therefore preventing suspending
later. This patch makes sure PMF registration is performed accordingly upon
errors as well.

No objection on tech-kern@.

Tested on a Lenovo ThinkPad T440s (amd64).

XXX pull-up to netbsd-7

diffstat:

 sys/dev/pci/hdaudio_pci.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r b4da6928efc6 -r aa44f966b9e2 sys/dev/pci/hdaudio_pci.c
--- a/sys/dev/pci/hdaudio_pci.c Mon Jan 30 21:42:08 2017 +0000
+++ b/sys/dev/pci/hdaudio_pci.c Tue Jan 31 00:58:15 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio_pci.c,v 1.5 2016/12/16 11:34:52 nonaka Exp $ */
+/* $NetBSD: hdaudio_pci.c,v 1.6 2017/01/31 00:58:15 khorben Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support%precedence.co.uk@localhost>
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.5 2016/12/16 11:34:52 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.6 2017/01/31 00:58:15 khorben Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -157,9 +157,6 @@
        }
        aprint_normal_dev(self, "interrupting at %s\n", intrstr);
 
-       if (!pmf_device_register(self, NULL, hdaudio_pci_resume))
-               aprint_error_dev(self, "couldn't establish power handler\n");
-
        hdaudio_pci_reinit(sc);
 
        /* Attach bus-independent HD audio layer */
@@ -176,8 +173,12 @@
                csr &= ~(PCI_COMMAND_MASTER_ENABLE | PCI_COMMAND_BACKTOBACK_ENABLE);
                pci_conf_write(sc->sc_pc, sc->sc_tag,
                    PCI_COMMAND_STATUS_REG, csr);
-               pmf_device_deregister(self);
+
+               if (!pmf_device_register(self, NULL, NULL))
+                       aprint_error_dev(self, "couldn't establish power handler\n");
        }
+       else if (!pmf_device_register(self, NULL, hdaudio_pci_resume))
+               aprint_error_dev(self, "couldn't establish power handler\n");
 }
 
 static int