From patchwork Mon May 20 23:19:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 2595281 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5EF46DF2A2 for ; Mon, 20 May 2013 23:19:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754481Ab3ETXTM (ORCPT ); Mon, 20 May 2013 19:19:12 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:44992 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755774Ab3ETXTL (ORCPT ); Mon, 20 May 2013 19:19:11 -0400 Received: by mail-ie0-f180.google.com with SMTP id ar20so14887852iec.39 for ; Mon, 20 May 2013 16:19:11 -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:user-agent:mime-version :content-type:content-transfer-encoding; bh=nhzsA0mvn5vFCyVxuOc95/BS+e0EX2C9R9HzZpBjLWI=; b=KCfwvjGhlthiOnkZIsG6grmk913F3p4ZYtc44rZ31/1KwMZYIFQZNVgSqzeiEjs1K/ D6b7FznbysmCPq2+bjBTE76Ug0v6w0jg+fyHlR4wD3WhHuHCM44j0ZiGxZZaEXOP5w6u cefaLIzgN95WyD/xMahrJWenguZc90BVkDSfi4yqRwrqaDxRA1+aKo3Z3+69L1kjAiQO jK8FwAZiYTtBzqUvmJUiKTcTuctHudezC/erzACcb6Ei19pKpOk2q+MbpKG7/d1MAl0B r7zJ9JCSU7fjj99go2xYbHaCZgXHvIBXuJb9gVryPJ41THsmME0rvZmPSX4QaZde+9Ho fiNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding:x-gm-message-state; bh=nhzsA0mvn5vFCyVxuOc95/BS+e0EX2C9R9HzZpBjLWI=; b=dABFBN/q8tRtAlyJfsMAedOOTBEizg8yYqYF+iA58mSr1Q2YN4EAS/KaB8/ZsOcu7T mPtzLmZ+0AyYhlOhTdNVxAXVa97pNRVTHR3jAawdCqY7IPN6zf0LIxNglBlFJ8I4Tug7 l+No3G7IvguNNupjUTeTji1/2+jGJLAFhqb8NbQFm6+4jfFZmZZotajKbyYxOHrG7nsi hk77YdTUyoArSwKWdwfUrUbk823UutKmPhWzpazD7L8JZk3JYzYZsmvOCuAd/kBBURbP MGvuHBxkko3Xw3cftWhIOCqtFkycpoLbOAlef5Fl+B10DIRL3NF7XKtZ1KlkK8UAjOk2 7A4g== X-Received: by 10.50.106.72 with SMTP id gs8mr6514383igb.80.1369091951002; Mon, 20 May 2013 16:19:11 -0700 (PDT) Received: from localhost ([172.29.122.152]) by mx.google.com with ESMTPSA id n5sm13942061igx.1.2013.05.20.16.19.09 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 20 May 2013 16:19:10 -0700 (PDT) Subject: [PATCH 1/2] powerpc/PCI: Use PCI_UNKNOWN for unknown power state To: Benjamin Herrenschmidt , Paul Mackerras , "David S. Miller" From: Bjorn Helgaas Cc: sparclinux@vger.kernel.org, "Rafael J. Wysocki" , linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org Date: Mon, 20 May 2013 17:19:09 -0600 Message-ID: <20130520231909.32416.81752.stgit@bhelgaas-glaptop> User-Agent: StGit/0.16 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQldGDtKWucQU9CJLNGYjCTH41FuLVrBELgrFaOWVkAoUxFZy/kTm6/kU/4bzCdxS0pGcRPxX2P/LaXAm4GEGJoFUKZ+5aYmvi/Fhi/MYeFJYRLwvQTuhkXAwqVT/FpFwM69CPXIF2qhRtF2csElplONJgObF0EvXVjhbkUEehd9pebqRGcDSLUAasUyX4d2ODOKpNbyZctvnu6sJVtymcuYQULoVQ== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Previously we initialized dev->current_state to 4 (PCI_D3cold), but I think we wanted PCI_UNKNOWN (5) here based on the comment and the fact that the generic version of this code, pci_setup_device(), uses PCI_UNKNOWN. Signed-off-by: Bjorn Helgaas --- arch/powerpc/kernel/pci_of_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index 2a67e9b..d2d407d 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c @@ -165,7 +165,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, pr_debug(" class: 0x%x\n", dev->class); pr_debug(" revision: 0x%x\n", dev->revision); - dev->current_state = 4; /* unknown power state */ + dev->current_state = PCI_UNKNOWN; /* unknown power state */ dev->error_state = pci_channel_io_normal; dev->dma_mask = 0xffffffff;