From patchwork Fri Sep 6 17:14:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 273294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AAB7C2C0115 for ; Sat, 7 Sep 2013 03:15:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754803Ab3IFRPD (ORCPT ); Fri, 6 Sep 2013 13:15:03 -0400 Received: from mail-yh0-f50.google.com ([209.85.213.50]:53306 "EHLO mail-yh0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754594Ab3IFRPC (ORCPT ); Fri, 6 Sep 2013 13:15:02 -0400 Received: by mail-yh0-f50.google.com with SMTP id a41so1306917yho.23 for ; Fri, 06 Sep 2013 10:15:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=TGST/HpbF13CFeuNOMpX+1fviARUNzQ6pRF3cPpCnTw=; b=aZazX0u5SA9w36r3rP42vzdkC7+EIIcJkGE+LyirVG4acHkuMP9K2dgQdOxv5yjQkj MHDvet95zgzgdJL24rNrcbH52HT9PXZgDgHDUbJH2kp4LeczwgYsYDKMR2BRQPKFg3x/ gK9lIoRvUmj9LEsb2s/VWBk5ccfCF4kY0sKud4UAW/BITHYzSuDvMG5++73bfLPuxJ1E ssyrYni1iPFQcI8EDuvNr18m4Sr5deWGJxDNtC+wIK8Xin0qhYDajILXiAbMEOiH+BAC MOUvNqNINnFBMOsjXslfUwBgCv5WugzKxV0JOdrf8r5rOcWPmBnzFWzE9hQcJtwRcxMf y2dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=TGST/HpbF13CFeuNOMpX+1fviARUNzQ6pRF3cPpCnTw=; b=JOei5ErL5of86yWYrJW1Bn3p9VrJYsTQEtuLDQnIcl1sHDEhszpMLsraNMWD06S5Gb o010xiivjpyZObgURT9clj9DspzeOKIUCXiY0iW0oVjf1oVQS+QzjIkWK0dlSB7x+zB4 AsRVYZ4K/gUbMpptiSRotaeq/e4fuV2pDDBdbGf6EZhzQxqlHHv0cK79dabplhLLETHV rgID9L8I/K6RQeXjvHDERMTJVKJkHkLE8v2Fo5jN/drA3AanAGl+zQwOSF83Tv0J/6Lk KmkQkVMD9AXm76fwrV1/RlLdzLmuuaTKwKmLhDOZ3rvHWcBjaVdH5a33lpPBoIsl9hEt LkIQ== X-Gm-Message-State: ALoCoQnltJMBWfhVxlOjJhqd3J4cJZ/Mm4mCSpYEpty9PDBaDvt7RzQYz0XqWAOtnSTkZsMX29l78dtyp3z/BWQonmw61aapzSExXbsVWxkR+dpeM+y/5833//2/2q5P3bXeEvhlfSOqgSRwj6L13f3XlXMj+4CWmGhVoVQV4yPF4njwdT0IigwNf0swj/bOlayxTF3AE/G0yvcmo12C/ajBO47gdnKXk3QT38/HItSQv7zxK6BN2MA= X-Received: by 10.236.121.40 with SMTP id q28mr3244513yhh.40.1378487701653; Fri, 06 Sep 2013 10:15:01 -0700 (PDT) Received: from localhost ([172.16.53.165]) by mx.google.com with ESMTPSA id a21sm4039313yhc.23.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 06 Sep 2013 10:15:01 -0700 (PDT) Subject: [PATCH 12/14] PCI/ACPI: Separate out _OSC "PCIe port services disabled" path To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, Len Brown Date: Fri, 06 Sep 2013 11:14:59 -0600 Message-ID: <20130906171459.11482.67404.stgit@bhelgaas-glaptop> In-Reply-To: <20130906171010.11482.34235.stgit@bhelgaas-glaptop> References: <20130906171010.11482.34235.stgit@bhelgaas-glaptop> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Test "pcie_ports_disabled" separately so we can give a better message. Previously we said "Unable to request _OSC control..."; now we'll say "PCIe port services disabled; not requesting _OSC control". "pcie_ports_disabled" is true when CONFIG_PCIEPORTBUS=n or we boot with "pcie_ports=compat". Signed-off-by: Bjorn Helgaas --- drivers/acpi/pci_root.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 67cc43a..68e5a18 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -387,8 +387,12 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm, return; } - if (!pcie_ports_disabled - && (support & ACPI_PCIE_REQ_SUPPORT) == ACPI_PCIE_REQ_SUPPORT) { + if (pcie_ports_disabled) { + dev_info(&device->dev, "PCIe port services disabled; not requesting _OSC control\n"); + return; + } + + if ((support & ACPI_PCIE_REQ_SUPPORT) == ACPI_PCIE_REQ_SUPPORT) { control = OSC_PCI_EXPRESS_CAPABILITY_CONTROL | OSC_PCI_EXPRESS_NATIVE_HP_CONTROL | OSC_PCI_EXPRESS_PME_CONTROL;