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: 245138 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 670642C0230 for ; Tue, 21 May 2013 09:19:45 +1000 (EST) Received: from mail-ie0-x232.google.com (mail-ie0-x232.google.com [IPv6:2607:f8b0:4001:c03::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 1F05F2C00E8 for ; Tue, 21 May 2013 09:19:14 +1000 (EST) Received: by mail-ie0-f178.google.com with SMTP id b11so14618870iee.23 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=UmdIUu82oD+KmV1ADVygU+vCU8rmWomc1NjQlGFrYq+euXytdCL/oEBEdgHP8SFGrr a8EoPA/kq7GjhgB+3Y7MUrK6H5EgrM+h1Ii4PviLfSX6WeKppYYg40kj8CqPNqUJAuC2 xlRJxip6xSbnlh6wlnKmBZMKVteTsBHlbwLWjKcrFZFYqoWiZGX39HPx4jX2vL1amR7O FRzGl2+/mbmhpNPUDBmBHgOUcqdBEiFNsWkaWwrIQ6bhXVM8XmT+Cd8zRUr1pPODVtZC rPfVMI0Cz2+1u9r5M3QL3KOcU6BoVWlUwSF19HHbtzn8kFJ/1Piyd0gkpA/S/ekzpKSM d0WQ== 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 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: ALoCoQlIk+H+jMFIkjXWOw+hnUI1jvoWQe5TebfToXmABInwT8I6MsR373+m6ZHQYJS06vnMiRDA9stHbonUe2a04BJWiOxwqyIq9IolwA3EBD/t2bIUEhxxmoOUwLlxtH3supjLpQcKn4n+aBLX/XbKicBL4XzgltZST9Jr+yar45+t6rzpGa1B3psxfsbci5WiXb5WMZ0eaqbmK9jT+bxXn/K7EucA+w== Cc: sparclinux@vger.kernel.org, "Rafael J. Wysocki" , linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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(-) 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;