From patchwork Sun Apr 8 18:07:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 10328469 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 470AC60385 for ; Sun, 8 Apr 2018 18:08:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3788628AAF for ; Sun, 8 Apr 2018 18:08:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C46728AB1; Sun, 8 Apr 2018 18:08:06 +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 93B5F28AB0 for ; Sun, 8 Apr 2018 18:08:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751788AbeDHSID (ORCPT ); Sun, 8 Apr 2018 14:08:03 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38884 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752208AbeDHSID (ORCPT ); Sun, 8 Apr 2018 14:08:03 -0400 Received: by mail-wr0-f193.google.com with SMTP id m13so6374555wrj.5 for ; Sun, 08 Apr 2018 11:08:02 -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=lJ+ncMBAuPx0GR99dDso5RfJ91KKxZsz2hQYZFsjtXk=; b=u8jndn4h+xU0gt7HU2NMvqIPhSzw19+YPARzfukwozqpN3dG1U3MWCHx2nXJVvDrn/ V1cVcL5WQhK4XqiKoyld/Nq/WgOWPxNDFtUB6erjQNJUwEGFFJ3PNmAQMEGIBR3crpdj TGPOqG5oTmQoILDHcsrrvaHbH3kB6UEttOg5EXpnKfI7lsgwrgU7ZL0aANTqhUCHWybN Qwy12/L2ELWNyD7xKdvuPThBOd6doxZqE2wIiC7XwOOeeHvpKrkLKi6BBJrKZbFDjcuY cyfMRpKMeACSZbVCppGlfxng9NH0PqcLseW6/6KFLgKDgdx4puz8kDkTq+wluyAqLZHX pYPw== 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=lJ+ncMBAuPx0GR99dDso5RfJ91KKxZsz2hQYZFsjtXk=; b=VNFzVcC788Fw5LcMShVgCzLB2odxLxOZZ09hyJ+OatDl7qDLE/xojtzLCicosJzGWj UT683e6ttKBGHX/N/7RK5yQxQTadVmzeu+0Nxq/GspeHrf+w+CBRTRf1LpqZS2dPOk1t xzp+AG6SPK9UVO/vOilHDs8S/wK+2bb2OHUoLGyWHLHislW7WbJ5qHDNekyOqIc8S81j eBmonpcDFtbj33mCvhYdCdHi72eZGbUqlevfF4jCWRiceDTlLuN9EjdS1sZDBNz3a67K OT7CiAVYX9nWQZhJZul0HrHRTWR7zdWTGgxs2SXjXxLc0dFn/IenKQsu8u1waAv+8eTP 8R0w== X-Gm-Message-State: ALQs6tB04H592tJFpgnaJy0prHCknwVz6yUeN7FjtoZXt4uvENyyfJu/ +xiIJkqZhwfwNOuYmvJArFBt4g== X-Google-Smtp-Source: AIpwx48dejNeJQXbK5P1kL6Qvi1Tso53KprzrlbICv+Iyqj6y5NHEph3HWZHS9jAkbdBtD8R61Mi1Q== X-Received: by 2002:a19:ca5b:: with SMTP id h27-v6mr4600206lfj.31.1523210881741; Sun, 08 Apr 2018 11:08:01 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.81.34]) by smtp.gmail.com with ESMTPSA id i62-v6sm3062388lfa.45.2018.04.08.11.08.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Apr 2018 11:08:00 -0700 (PDT) Subject: [PATCH v2 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: <26e803ca-06b6-28c5-b87c-fc639b322d6f@cogentembedded.com> Organization: Cogent Embedded Message-ID: Date: Sun, 8 Apr 2018 21:07:59 +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: <26e803ca-06b6-28c5-b87c-fc639b322d6f@cogentembedded.com> 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 --- 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) @@ -1082,17 +1078,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 }, {}, }; @@ -1140,7 +1137,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)); @@ -1174,10 +1171,15 @@ static int rcar_pcie_probe(struct platfo goto err_pm_disable; } - /* 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;