From patchwork Thu May 3 19:43:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10379045 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 18A58603B4 for ; Thu, 3 May 2018 19:43:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F2FF2925D for ; Thu, 3 May 2018 19:43:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0375329265; Thu, 3 May 2018 19:43:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9034C29253 for ; Thu, 3 May 2018 19:43:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751272AbeECTnR (ORCPT ); Thu, 3 May 2018 15:43:17 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:44687 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751234AbeECTnQ (ORCPT ); Thu, 3 May 2018 15:43:16 -0400 Received: by mail-lf0-f67.google.com with SMTP id h197-v6so27655026lfg.11 for ; Thu, 03 May 2018 12:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:references:organization:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=tpLdPMxhXZZ5VSM5KK9W0rnPzjCv24t7Kb7BTVZM794=; b=gIY7cgiMoNiC5RXx3z/i8D3mSzFEqPRrSHIPVqWweUtvI8NjXj3HWAzki2Zm865OKk XtyelFUD8MpM8PopQ1kJdOltS3oKbmu1gOrilOn+W/sXuB/Cc1HetUwfjTafW+OObypv SpNE4yQpOFP9RSwVLyjIur35Y21231scr7SGQewb/MoKgD0+qY45lrxu2T5ktw4Tobp7 ZNFC/yLzdmualnyXN+TRQnG4sBWrEIGKnnZU00cu5j5vtg++CmVQit3FbX3Uqz2bZuv8 YKD/5IxLvrmBsGM6gbqD8wnPUeNIALgPLD+Z1D15iLWaxjQzxOnEit81rOiiQzht3Nsu jTdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=tpLdPMxhXZZ5VSM5KK9W0rnPzjCv24t7Kb7BTVZM794=; b=S+EadDR9eZVmhcDbEs0upbPF9Kw87En9dthL2YaMpg0FRJ3uAxSmoNftXxfyhw3Xqr 9jJThyW+6ijELQWxXj8jqx8ic5fc+H65lUxlm/hPsIdlAt1q3u9yjoBzNgg6DFFaojh9 vUupq5KhDHh9jBTj8obL9SqBlS/aBHiSlIyVVUEfUFADpvv04bUZ8KqXSQ/AUJk/5ZST pBY4H58gHHnX5LPIpcAuC5Y8O5/5Ny48ZUL47WOmm68N6wvOCTRjbUCBvETYOKnVW35N 3LwaXqq+S6p1btD2OwNe5BwPgNCFGzQRUIOwNg32DvQgiC0/IUht+/EvZvI9pWpDW/mA 2kkQ== X-Gm-Message-State: ALQs6tBsUnapKSvBqTzhlHfm+M7NrpeXB1H4TdmKOSyXAeAPVTqwQBNW l78fb9gvECQZCkBy2FIrdyn5kg== X-Google-Smtp-Source: AB8JxZqSu8i0lCRj4QkTiQOQY/3mKeagk2+AQRSqlekXndNNq3EC74m6mYGYPR/+m7RbrGJ+6YTYng== X-Received: by 2002:a19:a401:: with SMTP id q1-v6mr3399961lfc.55.1525376594929; Thu, 03 May 2018 12:43:14 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.85.138]) by smtp.gmail.com with ESMTPSA id p133-v6sm2952373lfd.44.2018.05.03.12.43.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 12:43:13 -0700 (PDT) Subject: [PATCH v3 4/5] pcie-rcar: factor out rcar_pcie_hw_init() call From: Sergei Shtylyov To: horms@verge.net.au, bhelgaas@google.com, linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Lorenzo Pieralisi References: Organization: Cogent Embedded Message-ID: <8cd69bd4-b244-766e-9c3e-d4cd5999c1b0@cogentembedded.com> Date: Thu, 3 May 2018 22:43:13 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-MW Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We now have rcar_pcie_hw_init_{h1|gen2|gen3}() differing only in the PCIe PHY init code and all ending with a call to rcar_pcie_hw_init(), thus it makes sense to move that call into the driver's probe() method and then rename those functions to rcar_pcie_phy_init_{h1|gen2|gen3}() -- doing this saves 48 bytes of object code (AArch64 gcc 4.8.5)... Signed-off-by: Sergei Shtylyov Reviewed-by: Simon Horman --- Changes in version 3: - added Simon's tag; - refreshed atop of the recent driver patches. drivers/pci/host/pcie-rcar.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) Index: pci/drivers/pci/host/pcie-rcar.c =================================================================== --- pci.orig/drivers/pci/host/pcie-rcar.c +++ pci/drivers/pci/host/pcie-rcar.c @@ -626,7 +626,7 @@ static int rcar_pcie_hw_init(struct rcar return 0; } -static int rcar_pcie_hw_init_h1(struct rcar_pcie *pcie) +static int rcar_pcie_phy_init_h1(struct rcar_pcie *pcie) { /* Initialize the phy */ phy_write_reg(pcie, 0, 0x42, 0x1, 0x0EC34191); @@ -646,10 +646,10 @@ static int rcar_pcie_hw_init_h1(struct r phy_write_reg(pcie, 0, 0x64, 0x1, 0x3F0F1F0F); phy_write_reg(pcie, 0, 0x66, 0x1, 0x00008000); - return rcar_pcie_hw_init(pcie); + return 0; } -static int rcar_pcie_hw_init_gen2(struct rcar_pcie *pcie) +static int rcar_pcie_phy_init_gen2(struct rcar_pcie *pcie) { /* * These settings come from the R-Car Series, 2nd Generation User's @@ -666,10 +666,10 @@ static int rcar_pcie_hw_init_gen2(struct rcar_pci_write_reg(pcie, 0x00000001, GEN2_PCIEPHYCTRL); rcar_pci_write_reg(pcie, 0x00000006, GEN2_PCIEPHYCTRL); - return rcar_pcie_hw_init(pcie); + return 0; } -static int rcar_pcie_hw_init_gen3(struct rcar_pcie *pcie) +static int rcar_pcie_phy_init_gen3(struct rcar_pcie *pcie) { int err; @@ -677,11 +677,7 @@ static int rcar_pcie_hw_init_gen3(struct if (err) return err; - err = phy_power_on(pcie->phy); - if (err) - return err; - - return rcar_pcie_hw_init(pcie); + return phy_power_on(pcie->phy); } static int rcar_msi_alloc(struct rcar_msi *chip) @@ -1070,17 +1066,18 @@ static int rcar_pcie_parse_map_dma_range } static const struct of_device_id rcar_pcie_of_match[] = { - { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 }, + { .compatible = "renesas,pcie-r8a7779", + .data = rcar_pcie_phy_init_h1 }, { .compatible = "renesas,pcie-r8a7790", - .data = rcar_pcie_hw_init_gen2 }, + .data = rcar_pcie_phy_init_gen2 }, { .compatible = "renesas,pcie-r8a7791", - .data = rcar_pcie_hw_init_gen2 }, + .data = rcar_pcie_phy_init_gen2 }, { .compatible = "renesas,pcie-rcar-gen2", - .data = rcar_pcie_hw_init_gen2 }, + .data = rcar_pcie_phy_init_gen2 }, { .compatible = "renesas,pcie-r8a7795", - .data = rcar_pcie_hw_init_gen3 }, + .data = rcar_pcie_phy_init_gen3 }, { .compatible = "renesas,pcie-rcar-gen3", - .data = rcar_pcie_hw_init_gen3 }, + .data = rcar_pcie_phy_init_gen3 }, {}, }; @@ -1128,7 +1125,7 @@ static int rcar_pcie_probe(struct platfo struct rcar_pcie *pcie; unsigned int data; int err; - int (*hw_init_fn)(struct rcar_pcie *); + int (*phy_init_fn)(struct rcar_pcie *); struct pci_host_bridge *bridge; bridge = pci_alloc_host_bridge(sizeof(*pcie)); @@ -1162,10 +1159,15 @@ static int rcar_pcie_probe(struct platfo if (err) goto err_pm_put; - /* Failure to get a link might just be that no cards are inserted */ - hw_init_fn = of_device_get_match_data(dev); - err = hw_init_fn(pcie); + phy_init_fn = of_device_get_match_data(dev); + err = phy_init_fn(pcie); if (err) { + dev_err(dev, "failed to init PCIe PHY\n"); + goto err_pm_put; + } + + /* Failure to get a link might just be that no cards are inserted */ + if (rcar_pcie_hw_init(pcie)) { dev_info(dev, "PCIe link down\n"); err = -ENODEV; goto err_pm_put;