From 2df1fe9ca32bb227b9158c67f5c00b54c20b10fd Mon Sep 17 00:00:00 2001 From: randyf Date: Sat, 20 Oct 2007 16:00:42 -0700 Subject: PSARC/2005/469 X86 Energy Star compliance PSARC/2006/632 PSMI extension for state save and restore 6330209 nge needs to support DDI_SUSPEND/DDI_RESUME 6381827 Suspend to RAM on x86 6393154 audio810 needs to support DDI_SUSPEND/DDI_RESUME 6397047 fd, fdc needs to support Suspend/Resume 6401974 cannot enter S3 with ohci PME enable set on Tyan 2865 with Sun or Tyan 2.01 BIOS 6422613 memscrubber doesn't re-acquire lock before CALLB_CPR_EXIT 6455736 ata/dadk/cmdk should support DDI_SUSPEND/DDI_RESUME 6511370 CPR on SPARC regression 6586018 TODOP Macros in i86pc/sys/machclock.h not in sun4u/sun4v equivilent (Sparc only) 6610124 It takes more than 3 minutes after printing "pci_pre_resume nv_sata:0" 6617143 powerd/pmconfig emits a different default message for an existing on or off action. --HG-- rename : usr/src/cmd/power/power.conf => usr/src/cmd/power/power.conf.sparc --- usr/src/uts/common/io/usb/hcd/ehci/ehci.c | 7 ++++++- usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c | 3 ++- usr/src/uts/common/io/usb/hcd/openhci/ohci.c | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'usr/src/uts/common/io/usb/hcd') diff --git a/usr/src/uts/common/io/usb/hcd/ehci/ehci.c b/usr/src/uts/common/io/usb/hcd/ehci/ehci.c index 3b986e1723..93b7815a7d 100644 --- a/usr/src/uts/common/io/usb/hcd/ehci/ehci.c +++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -65,6 +65,11 @@ uint_t ehci_errmask = (uint_t)PRINT_MASK_ALL; uint_t ehci_errlevel = USB_LOG_L2; uint_t ehci_instance_debug = (uint_t)-1; +/* + * Tunable to ensure host controller goes off even if a keyboard is attached. + */ +int force_ehci_off = 1; + /* Enable all workarounds for VIA VT62x2 */ uint_t ehci_vt62x2_workaround = EHCI_VIA_WORKAROUNDS; diff --git a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c index bc760adfc8..44e6688a4b 100644 --- a/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c +++ b/usr/src/uts/common/io/usb/hcd/ehci/ehci_util.c @@ -54,6 +54,7 @@ extern void *ehci_statep; extern void ehci_handle_endpoint_reclaimation(ehci_state_t *); extern uint_t ehci_vt62x2_workaround; +extern int force_ehci_off; /* Adjustable variables for the size of the pools */ int ehci_qh_pool_size = EHCI_QH_POOL_SIZE; @@ -2006,7 +2007,7 @@ ehci_cpr_suspend(ehci_state_t *ehcip) * Stop the ehci host controller * if usb keyboard is not connected. */ - if (ehcip->ehci_polled_kbd_count == 0) { + if (ehcip->ehci_polled_kbd_count == 0 || force_ehci_off != 0) { Set_OpReg(ehci_command, Get_OpReg(ehci_command) & ~EHCI_CMD_HOST_CTRL_RUN); } diff --git a/usr/src/uts/common/io/usb/hcd/openhci/ohci.c b/usr/src/uts/common/io/usb/hcd/openhci/ohci.c index 2cb62f57ee..bbfef3dff2 100644 --- a/usr/src/uts/common/io/usb/hcd/openhci/ohci.c +++ b/usr/src/uts/common/io/usb/hcd/openhci/ohci.c @@ -47,6 +47,8 @@ /* Pointer to the state structure */ static void *ohci_statep; +int force_ohci_off = 1; + /* Number of instances */ #define OHCI_INSTS 1 @@ -2353,7 +2355,7 @@ ohci_cpr_suspend(ohci_state_t *ohcip) * Suspend the ohci host controller * if usb keyboard is not connected. */ - if (ohcip->ohci_polled_kbd_count == 0) { + if (ohcip->ohci_polled_kbd_count == 0 || force_ohci_off != 0) { Set_OpReg(hcr_control, HCR_CONTROL_SUSPD); } -- cgit v1.2.3