From patchwork Fri Sep 12 18:03:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 4897231 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 D20F29F430 for ; Fri, 12 Sep 2014 17:59:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2BEB20221 for ; Fri, 12 Sep 2014 18:04:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4399220266 for ; Fri, 12 Sep 2014 18:04:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752331AbaILSDj (ORCPT ); Fri, 12 Sep 2014 14:03:39 -0400 Received: from mail-ie0-f175.google.com ([209.85.223.175]:56683 "EHLO mail-ie0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752292AbaILSDg (ORCPT ); Fri, 12 Sep 2014 14:03:36 -0400 Received: by mail-ie0-f175.google.com with SMTP id at20so1403347iec.34 for ; Fri, 12 Sep 2014 11:03:36 -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=r4VTTi+6+Ixgg21iglqglHF4VH06qY7l3O6M6xUC/HM=; b=NP5Gcb2jKKH5XhvsOL9EYrSxIEerjiKgKdjH2XbvTdeAN+zcIENzD8OFSWc6wi14/J Cn2SBIwZW2gghbye4scyfO5CX3CjA5hcEA91rKOMEjuCDBSvGpxcLcN28ylV5bIR2oT5 naElwgQEFrd8NJHRVW6BIPdEouHJCxgKhaJC218nzvRBUpnOFxCDZgCigsnt0PSkIEcG smdTQ17FnZlFTrEKsTpvFeNDBAdqGSaeX8ZaCGOj7brStzQyphI2GK/IVAent+EaVwZ4 eSIWNnWPQYuybbAEQ506oCe7bhYTRplHVJNVwpODVDZAYBH8RmJmH3XAZlmMRtQ5WaHX IlTQ== 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=r4VTTi+6+Ixgg21iglqglHF4VH06qY7l3O6M6xUC/HM=; b=YURwnWBrYP+HBXZso9xegF2m8aSf2k3xgdHGAnF1OK+iBLqSUKJmp/0r9Wm+40/bmr vh1Wbb2rmb6293QtgOqA7HXCukIZtinN6kTiPfvDCDVCcUczXEn36AxjKXDnrV8eDu0T 36gSYXm7QbtQGXDIkZSJzoq5rokEES4Nlv/9git+/UJcESJIsRhw35yGzdWyLttDxnin rxAJfinY4HZKoPUIlnP9MlLKqsRUITU7J7DsuvnzVUSfMiVMmXLX6Yw6Dx6UJtlt5NXt Obeq1Ghzbo69cIrxH4Bs2VN/MLoEllHuYNHeImXvGEzoPWwbVavVSyVKgQfDdsZMhaf8 3xsA== X-Gm-Message-State: ALoCoQnzuZU2RItqA2td1YiPTOLV5J/BdW/SQYF3N8crV1Dq5Ztz/hGbkZatYaGWwksR/DYx4LoR X-Received: by 10.43.82.66 with SMTP id ab2mr11318905icc.56.1410545015979; Fri, 12 Sep 2014 11:03:35 -0700 (PDT) Received: from localhost ([172.16.49.108]) by mx.google.com with ESMTPSA id rq5sm2088273igb.12.2014.09.12.11.03.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Sep 2014 11:03:35 -0700 (PDT) Subject: [PATCH v1 07/13] ACPI / hotplug / PCI: Remove pci_configure_slot() usage To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Rajat Jain , Linus Torvalds , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Yinghai Lu Date: Fri, 12 Sep 2014 12:03:34 -0600 Message-ID: <20140912180334.1630.56528.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20140912180141.1630.17120.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20140912180141.1630.17120.stgit@bhelgaas-glaptop2.roam.corp.google.com> 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.0 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 We now configure each PCI device as it is enumerated, in pci_device_add(), so remove the configuration done in acpiphp. That configuration, in pci_configure_device(), does not include the MPS/MRRS configuration done by pcie_bus_configure_settings(), so keep that here. Signed-off-by: Bjorn Helgaas --- drivers/pci/hotplug/acpiphp_glue.c | 11 +---------- 1 file changed, 1 insertion(+), 10 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/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 70741c8c46a0..a6f8e0ba0bfe 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -61,7 +61,6 @@ static DEFINE_MUTEX(bridge_mutex); static int acpiphp_hotplug_notify(struct acpi_device *adev, u32 type); static void acpiphp_post_dock_fixup(struct acpi_device *adev); static void acpiphp_sanitize_bus(struct pci_bus *bus); -static void acpiphp_set_hpp_values(struct pci_bus *bus); static void hotplug_event(u32 type, struct acpiphp_context *context); static void free_bridge(struct kref *kref); @@ -510,7 +509,7 @@ static void enable_slot(struct acpiphp_slot *slot) __pci_bus_assign_resources(bus, &add_list, NULL); acpiphp_sanitize_bus(bus); - acpiphp_set_hpp_values(bus); + pcie_bus_configure_settings(bus); acpiphp_set_acpi_region(slot); list_for_each_entry(dev, &bus->devices, bus_list) { @@ -702,14 +701,6 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge) } } -static void acpiphp_set_hpp_values(struct pci_bus *bus) -{ - struct pci_dev *dev; - - list_for_each_entry(dev, &bus->devices, bus_list) - pci_configure_slot(dev); -} - /* * Remove devices for which we could not assign resources, call * arch specific code to fix-up the bus