From patchwork Wed Dec 4 16:33:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 3283621 Return-Path: X-Original-To: patchwork-linux-sh@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 5CA289F37A for ; Wed, 4 Dec 2013 16:33:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 361C0204EA for ; Wed, 4 Dec 2013 16:33:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E600F20457 for ; Wed, 4 Dec 2013 16:33:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754074Ab3LDQdm (ORCPT ); Wed, 4 Dec 2013 11:33:42 -0500 Received: from mail-la0-f54.google.com ([209.85.215.54]:35470 "EHLO mail-la0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932448Ab3LDQdj (ORCPT ); Wed, 4 Dec 2013 11:33:39 -0500 Received: by mail-la0-f54.google.com with SMTP id b8so3778283lan.13 for ; Wed, 04 Dec 2013 08:33:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MjRGdHlNKR7Byl6eqrrQwuw96WvoMjYS9235S7MR4q0=; b=UcZH/iL/6C8L8RyjPbJ8DA0erixj8TMYV/dIkrd8idNrPDFSED/4gZmJ9eplhXtle5 QfQQixxKRlVYpZ9J2SnV7sosImSMGmiE8nriAsDVu8R3KXpc5SFwpxmXAeMysnxxPM1D JkkjHO12mtuVkiXkjQurwpV+uphDzg+WXyHsiCEd7VtMqQzL22GVAcNKLG3f556jRJyt hMASbeLdUl6oWCcvnahNVjr98Z/tTzOWJzVZ4x1N4ywxRk8Ux6a3nbnkwdFCaV7eHE8l htoDmxPaQnWAObdZYDir4umrbdtB1sQ2/nC30hqVvGem5pp07Yra7letZ6GzYYvuMq6u T86Q== X-Gm-Message-State: ALoCoQloX6AIJWwcHWx6Pktrdg6QtVJrO6SfzImLloGdaY+VgkcrixkJ8KFBJPZHZ3bNgEuqihay X-Received: by 10.112.168.66 with SMTP id zu2mr45034lbb.60.1386174818227; Wed, 04 Dec 2013 08:33:38 -0800 (PST) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPSA id c15sm33116219lbq.11.2013.12.04.08.33.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Dec 2013 08:33:37 -0800 (PST) From: Valentine Barshak To: linux-pci@vger.kernel.org, linux-sh@vger.kernel.org Cc: Bjorn Helgaas Subject: [PATCH] pci: pci-rcar-gen2: Add runtime PM support Date: Wed, 4 Dec 2013 20:33:35 +0400 Message-Id: <1386174815-4647-1-git-send-email-valentine.barshak@cogentembedded.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 If runtime PM is enabled in the kernel config, the PCI clocks are not forced on at start-up, and thus, are never enabled. Use pm_runtime_get_sync to enable the clocks. While at it, use dev_info instead of pr_info since now we have the device pointer available in the PCI setup callback. Signed-off-by: Valentine Barshak --- drivers/pci/host/pci-rcar-gen2.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index cbaa5c4..f74228f 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -17,6 +17,7 @@ #include #include #include +#include #include /* AHB-PCI Bridge PCI communication registers */ @@ -77,6 +78,7 @@ #define RCAR_PCI_NR_CONTROLLERS 3 struct rcar_pci_priv { + struct device *dev; void __iomem *reg; struct resource io_res; struct resource mem_res; @@ -169,8 +171,11 @@ static int __init rcar_pci_setup(int nr, struct pci_sys_data *sys) void __iomem *reg = priv->reg; u32 val; + pm_runtime_enable(priv->dev); + pm_runtime_get_sync(priv->dev); + val = ioread32(reg + RCAR_PCI_UNIT_REV_REG); - pr_info("PCI: bus%u revision %x\n", sys->busnr, val); + dev_info(priv->dev, "PCI: bus%u revision %x\n", sys->busnr, val); /* Disable Direct Power Down State and assert reset */ val = ioread32(reg + RCAR_USBCTR_REG) & ~RCAR_USBCTR_DIRPD; @@ -301,6 +306,7 @@ static int __init rcar_pci_probe(struct platform_device *pdev) priv->irq = platform_get_irq(pdev, 0); priv->reg = reg; + priv->dev = &pdev->dev; return rcar_pci_add_controller(priv); }