On Tue, Aug 24, 2021 at 2:21 PM Joerg Roedel <joro@xxxxxxxxxx> wrote:
>
> From: Joerg Roedel <jroedel@xxxxxxx>
>
> Move the checks about whether the _OSC controls are requested from the
> firmware to a separate function.
>
> Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
Reviewed-by: Rafael J. Wysocki <rafael@xxxxxxxxxx>
> ---
> drivers/acpi/pci_root.c | 28 +++++++++++++++++++---------
> 1 file changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
> index ed4e6b55e9bc..f12e512bcddc 100644
> --- a/drivers/acpi/pci_root.c
> +++ b/drivers/acpi/pci_root.c
> @@ -449,6 +449,24 @@ static u32 calculate_control(void)
> return control;
> }
>
> +static bool os_control_query_checks(struct acpi_pci_root *root, u32 support)
> +{
> + struct acpi_device *device = root->device;
> +
> + if (pcie_ports_disabled) {
> + dev_info(&device->dev, "PCIe port services disabled; not requesting _OSC control\n");
> + return false;
> + }
> +
> + if ((support & ACPI_PCIE_REQ_SUPPORT) != ACPI_PCIE_REQ_SUPPORT) {
> + decode_osc_support(root, "not requesting OS control; OS requires",
> + ACPI_PCIE_REQ_SUPPORT);
> + return false;
> + }
> +
> + return true;
> +}
> +
> static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm,
> bool is_pcie)
> {
> @@ -485,16 +503,8 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm,
> return;
> }
>
> - if (pcie_ports_disabled) {
> - dev_info(&device->dev, "PCIe port services disabled; not requesting _OSC control\n");
> + if (!os_control_query_checks(root, support))
> return;
> - }
> -
> - if ((support & ACPI_PCIE_REQ_SUPPORT) != ACPI_PCIE_REQ_SUPPORT) {
> - decode_osc_support(root, "not requesting OS control; OS requires",
> - ACPI_PCIE_REQ_SUPPORT);
> - return;
> - }
>
> requested = control = calculate_control();
>
> --
> 2.32.0
>
