* [PATCH v1 1/1] PCI: ACPI: Switch to use acpi_evaluate_dsm_typed()
@ 2023-10-02 13:53 Andy Shevchenko
2023-10-03 13:49 ` Rafael J. Wysocki
2023-10-03 17:04 ` Bjorn Helgaas
0 siblings, 2 replies; 3+ messages in thread
From: Andy Shevchenko @ 2023-10-02 13:53 UTC (permalink / raw)
To: Bjorn Helgaas, linux-acpi, linux-pci, linux-kernel
Cc: Rafael J. Wysocki, Len Brown, Andy Shevchenko
The acpi_evaluate_dsm_typed() provides a way to check the type of the
object evaluated by _DSM call. Use it instead of open coded variant.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/pci/pci-acpi.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index a05350a4e49c..cf108259aef6 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -1215,12 +1215,12 @@ void acpi_pci_add_bus(struct pci_bus *bus)
if (!pci_is_root_bus(bus))
return;
- obj = acpi_evaluate_dsm(ACPI_HANDLE(bus->bridge), &pci_acpi_dsm_guid, 3,
- DSM_PCI_POWER_ON_RESET_DELAY, NULL);
+ obj = acpi_evaluate_dsm_typed(ACPI_HANDLE(bus->bridge), &pci_acpi_dsm_guid, 3,
+ DSM_PCI_POWER_ON_RESET_DELAY, NULL, ACPI_TYPE_INTEGER);
if (!obj)
return;
- if (obj->type == ACPI_TYPE_INTEGER && obj->integer.value == 1) {
+ if (obj->integer.value == 1) {
bridge = pci_find_host_bridge(bus);
bridge->ignore_reset_delay = 1;
}
@@ -1376,12 +1376,13 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,
if (bridge->ignore_reset_delay)
pdev->d3cold_delay = 0;
- obj = acpi_evaluate_dsm(handle, &pci_acpi_dsm_guid, 3,
- DSM_PCI_DEVICE_READINESS_DURATIONS, NULL);
+ obj = acpi_evaluate_dsm_typed(handle, &pci_acpi_dsm_guid, 3,
+ DSM_PCI_DEVICE_READINESS_DURATIONS, NULL,
+ ACPI_TYPE_PACKAGE);
if (!obj)
return;
- if (obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 5) {
+ if (obj->package.count == 5) {
elements = obj->package.elements;
if (elements[0].type == ACPI_TYPE_INTEGER) {
value = (int)elements[0].integer.value / 1000;
--
2.40.0.1.gaa8946217a0b
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/1] PCI: ACPI: Switch to use acpi_evaluate_dsm_typed()
2023-10-02 13:53 [PATCH v1 1/1] PCI: ACPI: Switch to use acpi_evaluate_dsm_typed() Andy Shevchenko
@ 2023-10-03 13:49 ` Rafael J. Wysocki
2023-10-03 17:04 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2023-10-03 13:49 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Bjorn Helgaas, linux-acpi, linux-pci, linux-kernel,
Rafael J. Wysocki, Len Brown
On Mon, Oct 2, 2023 at 3:54 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> The acpi_evaluate_dsm_typed() provides a way to check the type of the
> object evaluated by _DSM call. Use it instead of open coded variant.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Rafael J. Wysocki <rafael@kernel.org>
> ---
> drivers/pci/pci-acpi.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
> index a05350a4e49c..cf108259aef6 100644
> --- a/drivers/pci/pci-acpi.c
> +++ b/drivers/pci/pci-acpi.c
> @@ -1215,12 +1215,12 @@ void acpi_pci_add_bus(struct pci_bus *bus)
> if (!pci_is_root_bus(bus))
> return;
>
> - obj = acpi_evaluate_dsm(ACPI_HANDLE(bus->bridge), &pci_acpi_dsm_guid, 3,
> - DSM_PCI_POWER_ON_RESET_DELAY, NULL);
> + obj = acpi_evaluate_dsm_typed(ACPI_HANDLE(bus->bridge), &pci_acpi_dsm_guid, 3,
> + DSM_PCI_POWER_ON_RESET_DELAY, NULL, ACPI_TYPE_INTEGER);
> if (!obj)
> return;
>
> - if (obj->type == ACPI_TYPE_INTEGER && obj->integer.value == 1) {
> + if (obj->integer.value == 1) {
> bridge = pci_find_host_bridge(bus);
> bridge->ignore_reset_delay = 1;
> }
> @@ -1376,12 +1376,13 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,
> if (bridge->ignore_reset_delay)
> pdev->d3cold_delay = 0;
>
> - obj = acpi_evaluate_dsm(handle, &pci_acpi_dsm_guid, 3,
> - DSM_PCI_DEVICE_READINESS_DURATIONS, NULL);
> + obj = acpi_evaluate_dsm_typed(handle, &pci_acpi_dsm_guid, 3,
> + DSM_PCI_DEVICE_READINESS_DURATIONS, NULL,
> + ACPI_TYPE_PACKAGE);
> if (!obj)
> return;
>
> - if (obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 5) {
> + if (obj->package.count == 5) {
> elements = obj->package.elements;
> if (elements[0].type == ACPI_TYPE_INTEGER) {
> value = (int)elements[0].integer.value / 1000;
> --
> 2.40.0.1.gaa8946217a0b
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/1] PCI: ACPI: Switch to use acpi_evaluate_dsm_typed()
2023-10-02 13:53 [PATCH v1 1/1] PCI: ACPI: Switch to use acpi_evaluate_dsm_typed() Andy Shevchenko
2023-10-03 13:49 ` Rafael J. Wysocki
@ 2023-10-03 17:04 ` Bjorn Helgaas
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2023-10-03 17:04 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Bjorn Helgaas, linux-acpi, linux-pci, linux-kernel,
Rafael J. Wysocki, Len Brown
On Mon, Oct 02, 2023 at 04:53:52PM +0300, Andy Shevchenko wrote:
> The acpi_evaluate_dsm_typed() provides a way to check the type of the
> object evaluated by _DSM call. Use it instead of open coded variant.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied with Rafael's ack to pci/enumeration for v6.7, thanks!
> ---
> drivers/pci/pci-acpi.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
> index a05350a4e49c..cf108259aef6 100644
> --- a/drivers/pci/pci-acpi.c
> +++ b/drivers/pci/pci-acpi.c
> @@ -1215,12 +1215,12 @@ void acpi_pci_add_bus(struct pci_bus *bus)
> if (!pci_is_root_bus(bus))
> return;
>
> - obj = acpi_evaluate_dsm(ACPI_HANDLE(bus->bridge), &pci_acpi_dsm_guid, 3,
> - DSM_PCI_POWER_ON_RESET_DELAY, NULL);
> + obj = acpi_evaluate_dsm_typed(ACPI_HANDLE(bus->bridge), &pci_acpi_dsm_guid, 3,
> + DSM_PCI_POWER_ON_RESET_DELAY, NULL, ACPI_TYPE_INTEGER);
> if (!obj)
> return;
>
> - if (obj->type == ACPI_TYPE_INTEGER && obj->integer.value == 1) {
> + if (obj->integer.value == 1) {
> bridge = pci_find_host_bridge(bus);
> bridge->ignore_reset_delay = 1;
> }
> @@ -1376,12 +1376,13 @@ static void pci_acpi_optimize_delay(struct pci_dev *pdev,
> if (bridge->ignore_reset_delay)
> pdev->d3cold_delay = 0;
>
> - obj = acpi_evaluate_dsm(handle, &pci_acpi_dsm_guid, 3,
> - DSM_PCI_DEVICE_READINESS_DURATIONS, NULL);
> + obj = acpi_evaluate_dsm_typed(handle, &pci_acpi_dsm_guid, 3,
> + DSM_PCI_DEVICE_READINESS_DURATIONS, NULL,
> + ACPI_TYPE_PACKAGE);
> if (!obj)
> return;
>
> - if (obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 5) {
> + if (obj->package.count == 5) {
> elements = obj->package.elements;
> if (elements[0].type == ACPI_TYPE_INTEGER) {
> value = (int)elements[0].integer.value / 1000;
> --
> 2.40.0.1.gaa8946217a0b
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-03 17:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-02 13:53 [PATCH v1 1/1] PCI: ACPI: Switch to use acpi_evaluate_dsm_typed() Andy Shevchenko
2023-10-03 13:49 ` Rafael J. Wysocki
2023-10-03 17:04 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).