Page MenuHomeFreeBSD
Files F157438606

D56880.id177762.diff
No OneTemporary
Actions

D56880.id177762.diff
View Options

diff --git a/sys/dev/acpica/acpi_spmc.c b/sys/dev/acpica/acpi_spmc.c
--- a/sys/dev/acpica/acpi_spmc.c
+++ b/sys/dev/acpica/acpi_spmc.c
@@ -211,6 +211,11 @@
CTLFLAG_RW, &force_call_expected_functions, 0,
"Call all expected functions on a present DSM, even those not enumerated.");
+/* Per DSM probed information. */
+struct dsm_info {
+ uint64_t supported_functions;
+};
+
struct acpi_spmc_constraint {
bool enabled;
char *name;
@@ -228,7 +233,7 @@
struct acpi_spmc_softc {
device_t dev;
ACPI_HANDLE handle;
- uint64_t supported_functions[nitems(dsms)];
+ struct dsm_info dsms_info[nitems(dsms)];
struct eventhandler_entry *eh_suspend;
struct eventhandler_entry *eh_resume;
@@ -252,9 +257,9 @@
supports_function(const struct acpi_spmc_softc *const sc, const int dsm_index,
const int function_index)
{
- MPASS(0 <= dsm_index && dsm_index < nitems(sc->supported_functions));
+ MPASS(0 <= dsm_index && dsm_index < nitems(dsms));
- return ((sc->supported_functions[dsm_index] &
+ return ((sc->dsms_info[dsm_index].supported_functions &
IDX_TO_BIT(function_index)) != 0);
}
@@ -451,7 +456,7 @@
* report as unknown.
*/
const uint64_t supported_functions = ~IDX_TO_BIT(DSM_ENUM_FUNCTIONS) &
- sc->supported_functions[dsm->index];
+ sc->dsms_info[dsm->index].supported_functions;
const uint64_t missing = dsm->expected_functions & ~supported_functions;
const uint64_t unknown = supported_functions &
~(dsm->expected_functions | dsm->extra_functions);
@@ -491,7 +496,7 @@
*/
if ((supported_functions & IDX_TO_BIT(DSM_ENUM_FUNCTIONS)) == 0)
return;
- sc->supported_functions[dsm->index] = supported_functions;
+ sc->dsms_info[dsm->index].supported_functions = supported_functions;
}
static void

File Metadata

Mime Type
text/plain
Expires
Fri, May 22, 11:48 AM (2 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33015687
Default Alt Text
D56880.id177762.diff (1 KB)

Event Timeline