From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17080C433E2 for ; Thu, 10 Sep 2020 20:20:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BA15F20829 for ; Thu, 10 Sep 2020 20:20:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599769219; bh=BFqDyP5nEW82WHz5zECSjV0Z4J+2DigOXprkJRT9vk4=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=mugSscju194xbCpIjfunRYP7bAVTuh5w07a59UzYzHHHslrtGC3dZyPmEmMiVRRHS pO1QFqr3kzlVpGKrMeIpvAisMEMfDdrd/libcm0euU7/CqF6Oq6s22GxLsazdEkZuV Kw37i8m86yTZHuRWjeXk7MCcfcjbjw/Gs0b0eshY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726603AbgIJUUQ (ORCPT ); Thu, 10 Sep 2020 16:20:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:49998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726535AbgIJUO3 (ORCPT ); Thu, 10 Sep 2020 16:14:29 -0400 Received: from localhost (52.sub-72-107-123.myvzw.com [72.107.123.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EA09F20731; Thu, 10 Sep 2020 20:14:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599768868; bh=BFqDyP5nEW82WHz5zECSjV0Z4J+2DigOXprkJRT9vk4=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=pzWGWYQD7+aTbR6VTE1ehwR4qDS9+8aB/jMzZJb/1j03gwWGbX9rAo5/0t+e1jMUH BcHOpAGXiOU0in/3V84CImrOViaL5VfKeeD/EBW1h5iIa41b4gy0aPiUyIMFCsYEHw bXcTma9xyLdfjf6YnuhtjooGH8kVDS9nm6g7YrLo= Date: Thu, 10 Sep 2020 15:14:26 -0500 From: Bjorn Helgaas To: sathyanarayanan.kuppuswamy@linux.intel.com Cc: bhelgaas@google.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, ashok.raj@intel.com Subject: Re: [PATCH v8 2/5] ACPI/PCI: Ignore _OSC negotiation result if pcie_ports_native is set. Message-ID: <20200910201426.GA809535@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jul 24, 2020 at 08:58:53PM -0700, sathyanarayanan.kuppuswamy@linux.intel.com wrote: > From: Kuppuswamy Sathyanarayanan > > 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. > > Also, since struct pci_host_bridge ->native_* members caches the > ownership status of various PCIe capabilities, use them instead > of distributed checks for pcie_ports_native. > > Signed-off-by: Kuppuswamy Sathyanarayanan > --- > drivers/acpi/pci_root.c | 61 ++++++++++++++++++++++++++----- > drivers/pci/hotplug/pciehp_core.c | 2 +- > drivers/pci/pci-acpi.c | 3 -- > drivers/pci/pcie/aer.c | 2 +- > drivers/pci/pcie/portdrv_core.c | 9 ++--- > 5 files changed, 56 insertions(+), 21 deletions(-) > > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index f90e841c59f5..f8981d4e044d 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -145,6 +145,17 @@ static struct pci_osc_bit_struct pci_osc_control_bit[] = { > { OSC_PCI_EXPRESS_DPC_CONTROL, "DPC" }, > }; > > +static char *get_osc_desc(u32 bit) > +{ > + int i = 0; > + > + for (i = 0; i < ARRAY_SIZE(pci_osc_control_bit); i++) > + if (bit == pci_osc_control_bit[i].bit) > + return pci_osc_control_bit[i].desc; > + > + return NULL; > +} > + > static void decode_osc_bits(struct acpi_pci_root *root, char *msg, u32 word, > struct pci_osc_bit_struct *table, int size) > { > @@ -914,18 +925,48 @@ 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_EXPRESS_NATIVE_HP_CONTROL)) { > + if (!pcie_ports_native) > + host_bridge->native_pcie_hotplug = 0; > + else > + dev_warn(&bus->dev, "OS overrides %s firmware control", > + get_osc_desc(OSC_PCI_EXPRESS_NATIVE_HP_CONTROL)); There's got to be a way to write this more concisely. Maybe something like this? #define OSC_OWNER(ctrl, bit, flag) \ if (!(ctrl & bit)) \ flag = 0; if (pcie_ports_native) decode_osc_control(root, "OS forcibly taking over", ~0); else { ctrl = root->osc_control_set; OSC_OWNER(ctrl, OSC_PCI_EXPRESS_AER_CONTROL, host_bridge->native_aer); OSC_OWNER(ctrl, OSC_PCI_EXPRESS_PME_CONTROL, host_bridge->native_pme); ... } > + } > + > 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 (!(root->osc_control_set & OSC_PCI_EXPRESS_AER_CONTROL)) { > + if (!pcie_ports_native) > + host_bridge->native_aer = 0; > + else > + dev_warn(&bus->dev, "OS overrides %s firmware control", > + get_osc_desc(OSC_PCI_EXPRESS_AER_CONTROL)); > + } > + > + if (!(root->osc_control_set & OSC_PCI_EXPRESS_PME_CONTROL)) { > + if (!pcie_ports_native) > + host_bridge->native_pme = 0; > + else > + dev_warn(&bus->dev, "OS overrides %s firmware control", > + get_osc_desc(OSC_PCI_EXPRESS_PME_CONTROL)); > + } > + > + if (!(root->osc_control_set & OSC_PCI_EXPRESS_LTR_CONTROL)) { > + if (!pcie_ports_native) > + host_bridge->native_ltr = 0; > + else > + dev_warn(&bus->dev, "OS overrides %s firmware control", > + get_osc_desc(OSC_PCI_EXPRESS_LTR_CONTROL)); > + } > + > + if (!(root->osc_control_set & OSC_PCI_EXPRESS_DPC_CONTROL)) { > + if (!pcie_ports_native) > + host_bridge->native_dpc = 0; > + else > + dev_warn(&bus->dev, "OS overrides %s firmware control", > + get_osc_desc(OSC_PCI_EXPRESS_DPC_CONTROL)); > + } > > /* > * Evaluate the "PCI Boot Configuration" _DSM Function. If it > diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c > index bf779f291f15..5fc999bf6f1b 100644 > --- a/drivers/pci/hotplug/pciehp_core.c > +++ b/drivers/pci/hotplug/pciehp_core.c > @@ -255,7 +255,7 @@ static bool pme_is_native(struct pcie_device *dev) > const struct pci_host_bridge *host; > > host = pci_find_host_bridge(dev->port->bus); > - return pcie_ports_native || host->native_pme; > + return host->native_pme; I love this part! > } > > static void pciehp_disable_interrupt(struct pcie_device *dev) > diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c > index 7224b1e5f2a8..e09589571a9d 100644 > --- a/drivers/pci/pci-acpi.c > +++ b/drivers/pci/pci-acpi.c > @@ -800,9 +800,6 @@ bool pciehp_is_native(struct pci_dev *bridge) > if (!(slot_cap & PCI_EXP_SLTCAP_HPC)) > return false; > > - if (pcie_ports_native) > - return true; > - > host = pci_find_host_bridge(bridge->bus); > return host->native_pcie_hotplug; > } > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > index 3acf56683915..d663bd9c7257 100644 > --- a/drivers/pci/pcie/aer.c > +++ b/drivers/pci/pcie/aer.c > @@ -219,7 +219,7 @@ int pcie_aer_is_native(struct pci_dev *dev) > if (!dev->aer_cap) > return 0; > > - return pcie_ports_native || host->native_aer; > + return host->native_aer; > } > > int pci_enable_pcie_error_reporting(struct pci_dev *dev) > diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c > index 50a9522ab07d..ccd5e0ce5605 100644 > --- a/drivers/pci/pcie/portdrv_core.c > +++ b/drivers/pci/pcie/portdrv_core.c > @@ -208,8 +208,7 @@ static int get_port_device_capability(struct pci_dev *dev) > struct pci_host_bridge *host = pci_find_host_bridge(dev->bus); > int services = 0; > > - if (dev->is_hotplug_bridge && > - (pcie_ports_native || host->native_pcie_hotplug)) { > + if (dev->is_hotplug_bridge && host->native_pcie_hotplug) { > services |= PCIE_PORT_SERVICE_HP; > > /* > @@ -221,8 +220,7 @@ static int get_port_device_capability(struct pci_dev *dev) > } > > #ifdef CONFIG_PCIEAER > - if (dev->aer_cap && pci_aer_available() && > - (pcie_ports_native || host->native_aer)) { > + if (dev->aer_cap && pci_aer_available() && host->native_aer) { > services |= PCIE_PORT_SERVICE_AER; > > /* > @@ -238,8 +236,7 @@ static int get_port_device_capability(struct pci_dev *dev) > * Event Collectors can also generate PMEs, but we don't handle > * those yet. > */ > - if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT && > - (pcie_ports_native || host->native_pme)) { > + if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT && host->native_pme) { > services |= PCIE_PORT_SERVICE_PME; > > /* > -- > 2.17.1 >