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: 2854595 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E366D9F494 for ; Fri, 6 Sep 2013 17:15:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C5FC4202C0 for ; Fri, 6 Sep 2013 17:15:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3732202CF for ; Fri, 6 Sep 2013 17:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754706Ab3IFRPD (ORCPT ); Fri, 6 Sep 2013 13:15:03 -0400 Received: from mail-ye0-f175.google.com ([209.85.213.175]:61031 "EHLO mail-ye0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753304Ab3IFRPC (ORCPT ); Fri, 6 Sep 2013 13:15:02 -0400 Received: by mail-ye0-f175.google.com with SMTP id q8so1093045yen.6 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=G9MvU+jI18x6mJ1X91qmqCG8x4GI50xE8Tv++ntV7J2uSl1pLMr2KiVXMcT5FUlI8Q 7E9wWflAtWShbd1pRZQ9vH/mVJQ8mcWB/IorGBwGAdvzFdCJOnSdNzcLx6czBaNlYcSV kPEMvGCtF6F1wQVLMMpQFSyZEHnRpjQ0iYhB6BXEn77PCP+oxcB1pyg5zEAjetiDXEQ6 3si44LzkkuUtI+ntDJTdNomRy+/w66HaNOFwLRY9WLyu4IHviypYM6WbZGhJCxb6Vy5w 8lZIwWFZFnDmlnKKcJQdloDgUI/GFuBj6MNrhWVlZ1KHiIhHBaW7UC4cZo/LX/cy0YVo PaFw== X-Gm-Message-State: ALoCoQnz8psvRq+SE87Y9EieniXXS+nPZ5nmP/zqlhn22hG6iAmv46Tyu213rlntaZiqp9aQzl94l5aAxpkHx699QuYKUNPNyr5E6c8TxStKV8FOOlAYINf11+Pdy1ZvdhjZHu4eDoa0pfVCXHxsA4dGWGJzpESkSI1v+Uss/mSriZLWAZQmcMF6PQUvUtKqMwBb/NVian+j3Unpn1NAcZO5GUxlAJJkcw== 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-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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-acpi" 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;