lkml.org 
[lkml]   [2020]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 3/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set.
    Date
    From: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

    pcie_ports_native is set only if user requests native handling
    of PCIe capabilities via pcie_port_setup command line option.
    User input takes precedence over _OSC based control negotiation
    result. So consider the _OSC negotiated result only if
    pcie_ports_native is unset.

    Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
    ---
    drivers/acpi/pci_root.c | 26 ++++++++++++++------------
    1 file changed, 14 insertions(+), 12 deletions(-)

    diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
    index 9e235c1a75ff..e0039ad3480a 100644
    --- a/drivers/acpi/pci_root.c
    +++ b/drivers/acpi/pci_root.c
    @@ -914,18 +914,20 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
    goto out_release_info;

    host_bridge = to_pci_host_bridge(bus->bridge);
    - if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
    - host_bridge->native_pcie_hotplug = 0;
    - if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
    - host_bridge->native_shpc_hotplug = 0;
    - if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
    - host_bridge->native_aer = 0;
    - if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
    - host_bridge->native_pme = 0;
    - if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
    - host_bridge->native_ltr = 0;
    - if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
    - host_bridge->native_dpc = 0;
    + if (!pcie_ports_native) {
    + if (!(root->osc_control_set & OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
    + host_bridge->native_pcie_hotplug = 0;
    + if (!(root->osc_control_set & OSC_PCI_SHPC_NATIVE_HP_CONTROL))
    + host_bridge->native_shpc_hotplug = 0;
    + if (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL))
    + host_bridge->native_aer = 0;
    + if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL))
    + host_bridge->native_pme = 0;
    + if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL))
    + host_bridge->native_ltr = 0;
    + if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL))
    + host_bridge->native_dpc = 0;
    + }

    /*
    * Evaluate the "PCI Boot Configuration" _DSM Function. If it
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-05-27 01:19    [W:2.770 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site