Skip to content

adaptive: Stop mapping SwOem conditions to ODVP variables #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RevySR wants to merge 1 commit into from
Closed

adaptive: Stop mapping SwOem conditions to ODVP variables #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions src/thd_gddv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,8 +1358,8 @@ int cthd_gddv::verify_condition(const struct condition& condition) {

if (condition.condition >= Oem0 && condition.condition <= Oem5)
return 0;
if (condition.condition >= adaptive_condition(0x1000)
&& condition.condition < adaptive_condition(0x10000))
if (condition.condition >= adaptive_condition(OEM_CONDITION_BASE_ID)
&& condition.condition < adaptive_condition(SW_OEM_CONDITION_BASE_ID))
return 0;
if (condition.condition == Default)
return 0;
Expand All @@ -1383,6 +1383,26 @@ int cthd_gddv::verify_condition(const struct condition& condition) {
if (condition.condition == OS_type)
return 0;

/*
* Software-OEM conditions are set at runtime by OEM software through
* the DPTF/ESIF interface, which has no equivalent on Linux, so they
* can never be satisfied here. Don't fail verify_conditions() for
* them: that would change engine startup behavior (unsupported
* condition fallback). They are simply excluded from the ODVP
* mapping, so evaluation fails quietly and the containing condition
* set never matches - the same outcome as when they were misread as
* ODVP variables, without the per-poll odvpN read errors.
*/
if (condition.condition >= adaptive_condition(SW_OEM_CONDITION_BASE_ID)
&& condition.condition < adaptive_condition(PARTICIPANT_CONDITION_BASE_ID)) {
thd_log_info(
"Software-OEM condition %" PRIu64
" (SwOem%" PRIu64 ") is set by OEM software via DPTF, not available on Linux; the condition set using it will never match\n",
condition.condition,
condition.condition - SW_OEM_CONDITION_BASE_ID);
return 0;
}
Comment on lines +1396 to +1404
Comment on lines +1396 to +1404

if ( condition.condition >= ARRAY_SIZE(condition_names))
cond_name = "UNKNOWN";
else
Expand Down Expand Up @@ -1500,9 +1520,9 @@ int cthd_gddv::evaluate_oem_condition(const struct condition& condition) {

if (condition.condition >= Oem0 && condition.condition <= Oem5)
oem_condition = (int) condition.condition - Oem0;
else if (condition.condition >= (adaptive_condition) 0x1000
&& condition.condition < (adaptive_condition) 0x10000)
oem_condition = (int) condition.condition - 0x1000 + 6;
else if (condition.condition >= (adaptive_condition) OEM_CONDITION_BASE_ID
&& condition.condition < (adaptive_condition) SW_OEM_CONDITION_BASE_ID)
oem_condition = (int) condition.condition - OEM_CONDITION_BASE_ID + 6;

if (oem_condition != -1) {
std::string filename = "odvp" + std::to_string(oem_condition);
Expand Down Expand Up @@ -1673,8 +1693,8 @@ int cthd_gddv::evaluate_condition(struct condition& condition) {
}

if ((condition.condition >= Oem0 && condition.condition <= Oem5)
|| (condition.condition >= (adaptive_condition) 0x1000
&& condition.condition < (adaptive_condition) 0x10000))
|| (condition.condition >= (adaptive_condition) OEM_CONDITION_BASE_ID
&& condition.condition < (adaptive_condition) SW_OEM_CONDITION_BASE_ID))
ret = evaluate_oem_condition(condition);

if (condition.condition == Temperature
Expand Down
15 changes: 15 additions & 0 deletions src/thd_gddv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,21 @@ enum adaptive_condition : uint32_t { // NOLINT(performance-enum-size)
OS_type = 86
};

/*
* Adaptive condition ID ranges, matching Intel DPTF's ConditionType
* (OemConditionBaseId / SwOemConditionBaseId / ParticipantConditionBaseId).
*
* [OEM_CONDITION_BASE_ID, SW_OEM_CONDITION_BASE_ID)
* OEM variables exported by the firmware as odvpN sysfs entries.
* [SW_OEM_CONDITION_BASE_ID, PARTICIPANT_CONDITION_BASE_ID)
* Software-OEM conditions set at runtime by OEM software through the
* DPTF/ESIF interface. These have no equivalent on Linux, so thermald
* never matches them instead of misreading them as ODVP variables.
*/
#define OEM_CONDITION_BASE_ID 0x1000
#define SW_OEM_CONDITION_BASE_ID 0x2000
#define PARTICIPANT_CONDITION_BASE_ID 0x10000
Comment on lines +114 to +116

enum adaptive_comparison : uint8_t {
ADAPTIVE_EQUAL = 0x01, ADAPTIVE_LESSER_OR_EQUAL, ADAPTIVE_GREATER_OR_EQUAL, ADAPTIVE_NOT_EQUAL,
};
Expand Down
Loading