From: Mario Limonciello <mario.limonciello@amd.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Bjorn Helgaas <helgaas@kernel.org>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Andy Shevchenko" <andriy.shevchenko@linux.intel.com>,
<linux-acpi@vger.kernel.org>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
"Iain Lane" <iain@orangesquash.org.uk>,
Shyam-sundar S-k <Shyam-sundar.S-k@amd.com>,
Mario Limonciello <mario.limonciello@amd.com>
Subject: [PATCH v10 5/7] ACPI: x86: s2idle: Store if constraint is enabled
Date: Fri, 4 Aug 2023 16:01:27 -0500 [thread overview]
Message-ID: <20230804210129.5356-6-mario.limonciello@amd.com> (raw)
In-Reply-To: <20230804210129.5356-1-mario.limonciello@amd.com>
Constraints are currently only stored when enabled. To enable
the ability to check if constraints are present they need to be
stored even if disabled.
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v9->v10:
* split from other patches
---
drivers/acpi/x86/s2idle.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
index 91cd6f8b8ade0..0c8101acc92ef 100644
--- a/drivers/acpi/x86/s2idle.c
+++ b/drivers/acpi/x86/s2idle.c
@@ -78,6 +78,7 @@ struct lpi_device_constraint {
struct lpi_constraints {
acpi_handle handle;
int min_dstate;
+ bool enabled;
};
/* AMD Constraint package structure */
@@ -151,8 +152,7 @@ static void lpi_device_get_constraints_amd(void)
}
}
- if (!dev_info.enabled || !dev_info.name ||
- !dev_info.min_dstate)
+ if (!dev_info.name)
continue;
status = acpi_get_handle(NULL, dev_info.name, &list->handle);
@@ -173,6 +173,7 @@ static void lpi_device_get_constraints_amd(void)
"Incomplete constraint defined\n");
continue;
}
+ list->enabled = dev_info.enabled;
lpi_constraints_table_size++;
}
}
@@ -235,7 +236,7 @@ static void lpi_device_get_constraints(void)
}
}
- if (!info.enabled || !info.package || !info.name)
+ if (!info.package || !info.name)
continue;
constraint = &lpi_constraints_table[lpi_constraints_table_size];
@@ -247,7 +248,7 @@ static void lpi_device_get_constraints(void)
acpi_handle_debug(lps0_device_handle,
"index:%d Name:%s\n", i, info.name);
- constraint->min_dstate = -1;
+ constraint->min_dstate = -EINVAL;
for (j = 0; j < package_count; ++j) {
union acpi_object *info_obj = &info.package[j];
@@ -284,7 +285,7 @@ static void lpi_device_get_constraints(void)
"Incomplete constraint defined\n");
continue;
}
-
+ constraint->enabled = info.enabled;
lpi_constraints_table_size++;
}
--
2.34.1
next prev parent reply other threads:[~2023-08-04 21:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 21:01 [PATCH v10 0/7] Fix wakeup problems on some AMD platforms Mario Limonciello
2023-08-04 21:01 ` [PATCH v10 1/7] ACPI: Add comments to clarify some #ifdef statements Mario Limonciello
2023-08-04 21:01 ` [PATCH v10 2/7] ACPI: Adjust #ifdef for *_lps0_dev use Mario Limonciello
2023-08-04 21:01 ` [PATCH v10 3/7] ACPI: x86: s2idle: Fix a logic error parsing AMD constraints table Mario Limonciello
2023-08-04 21:01 ` [PATCH v10 4/7] ACPI: x86: s2idle: Add more debugging for AMD constraints parsing Mario Limonciello
2023-08-04 21:01 ` Mario Limonciello [this message]
2023-08-04 21:01 ` [PATCH v10 6/7] ACPI: x86: s2idle: Add a function to get constraints for a device Mario Limonciello
2023-08-04 21:01 ` [PATCH v10 7/7] PCI: Use device constraints to decide PCI target state fallback policy Mario Limonciello
2023-08-05 5:22 ` kernel test robot
2023-08-05 10:27 ` kernel test robot
2023-08-05 10:27 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230804210129.5356-6-mario.limonciello@amd.com \
--to=mario.limonciello@amd.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=helgaas@kernel.org \
--cc=iain@orangesquash.org.uk \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®