diff options
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/pci.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/pcivar.h | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 4629165f34b2..9e43a4c1909f 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -81,9 +81,6 @@ #include <dev/iommu/iommu.h> -#include <contrib/dev/acpica/include/acpi.h> -#include <dev/acpica/acpivar.h> - #include "pcib_if.h" #include "pci_if.h" @@ -2900,7 +2897,8 @@ pci_set_powerstate_method(device_t dev, device_t child, int state) if (bootverbose) pci_printf(cfg, "Transition from %s to %s\n", - acpi_d_state_to_str(oldstate), acpi_d_state_to_str(state)); + pci_powerstate_to_str(oldstate), + pci_powerstate_to_str(state)); PCI_WRITE_CONFIG(dev, child, cfg->pp.pp_location + PCIR_POWER_STATUS, status, 2); diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 832305b9adee..4abb5e977346 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -516,8 +516,20 @@ pci_is_vga_memory_range(rman_res_t start, rman_res_t end) #define PCI_POWERSTATE_D3_HOT 3 #define PCI_POWERSTATE_D3_COLD 4 #define PCI_POWERSTATE_D3 PCI_POWERSTATE_D3_COLD +#define PCI_POWERSTATE_MAX PCI_POWERSTATE_D3_COLD +#define PCI_POWERSTATE_COUNT 5 #define PCI_POWERSTATE_UNKNOWN -1 +static __inline const char * +pci_powerstate_to_str(int state) +{ + const char *strs[PCI_POWERSTATE_COUNT] = {"D0", "D1", "D2", "D3hot", + "D3cold"}; + + MPASS(state >= PCI_POWERSTATE_D0 && state <= PCI_POWERSTATE_MAX); + return (strs[state]); +} + static __inline int pci_set_powerstate(device_t dev, int state) { |