From patchwork Sun Dec 31 11:58:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 854215 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b="VAkoICC9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z8f5b0YzBz9s84 for ; Sun, 31 Dec 2017 23:00:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751319AbdLaL7u (ORCPT ); Sun, 31 Dec 2017 06:59:50 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:42554 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751211AbdLaL65 (ORCPT ); Sun, 31 Dec 2017 06:58:57 -0500 Received: by mail-lf0-f65.google.com with SMTP id e27so17000660lfb.9 for ; Sun, 31 Dec 2017 03:58:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oj0JajkqNds/vxCnFWY1cB89VnOimwCruDlOqJl844E=; b=VAkoICC90FJF9qQGyglNRrmGJrBPLe7DQGEIa5kjRt2H7h7OK5w6Oavs0Y+II9JzOA N6YpOegY3udbDVfeyHZCdq3/hEZQDWLLzxOjfujlAfeAVbUAtJAx5aPIjtW17jAmvtMy PBowIAWSNIwmNE98bh0tpNt1VOjRtVY82kNprFOPJSnPctPwd2agd50MnAu77hyi6/LW p4DsGRIsemPiY9P21sqTG7KDtY04CKWn0exRwUbbMbdg7ucObs7HJ5JVdytqx6dljGES xaFs/Y5kPrf0rDYz1JeJvQo0q35ciSSUrX4Bjt33SQl/w49Le0/kUs0JYzHvKfCFvrhk xxzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oj0JajkqNds/vxCnFWY1cB89VnOimwCruDlOqJl844E=; b=IX2SST1rg9iJcPrz7AnUecbYe3cU6BxMv/QRshnqLu0NzHSK8L4Q5XGlE1Skwi97xE iB9CZiZINH5sa5W3Ir/qKM7J8EvnEbYEqJNNejtmpFz0/w8z4CfRW0I5aurPifoOwY/d XVlMQOgOolfCvvyqiIVD22UeXNrPPomyST1VGEfhxNZXM0V0ddC3EqsVpL88x6K7O5gg ThQ3kLCyPOyX7poiu7w/CzTvufZ9OQ7zK5lQql5YyP9HNpyBtTAfMoNLzwEGKfbinf6E AIfD8oBgxDTKjCc3ejhoRlA2hCDvdurGnNAHS6KdTm8HOmdnvxzJbzjw2HZtcP4NESIx edPw== X-Gm-Message-State: AKGB3mLWJExnKKC1GAsX5ErKVMiLIHxpbyEl4fseLQ7d0z9xSYZ89ppV HVjI1XtahY0lyANdp77cKFJZNA== X-Google-Smtp-Source: ACJfBouN5s5A5VwUFxumBWQbquurB+WyQ+7nIEA0qBZA1ptQoDwxrAn4/E25EnMFxbd6+FXAd6Ekgw== X-Received: by 10.46.14.9 with SMTP id 9mr25023108ljo.148.1514721535770; Sun, 31 Dec 2017 03:58:55 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id f10sm8646298lff.56.2017.12.31.03.58.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 31 Dec 2017 03:58:55 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-acpi@vger.kernel.org Cc: graeme.gregory@linaro.org, davem@davemloft.net, linux@armlinux.org.uk, rafael.j.wysocki@intel.com, andrew@lunn.ch, f.fainelli@gmail.com, antoine.tenart@free-electrons.com, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, ezequiel.garcia@free-electrons.com, nadavh@marvell.com, neta@marvell.com, ard.biesheuvel@linaro.org, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com Subject: [net-next: PATCH v2 3/5] net: mvpp2: simplify maintaining enabled ports' list Date: Sun, 31 Dec 2017 12:58:38 +0100 Message-Id: <1514721520-18964-4-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514721520-18964-1-git-send-email-mw@semihalf.com> References: <1514721520-18964-1-git-send-email-mw@semihalf.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 'port_count' field of the mvpp2 structure holds an overall amount of available ports, based on DT nodes status. In order to be prepared to support other HW description, obtain the value by incrementing it upon each successful port initialization. This allowed for simplifying port indexing in the controller's private array, whose size is now not dynamically allocated, but fixed to MVPP2_MAX_PORTS. This patch simplifies creating and filling list of enabled ports and is a part of the preparation for adding ACPI support in the mvpp2 driver. Signed-off-by: Marcin Wojtas --- drivers/net/ethernet/marvell/mvpp2.c | 32 +++++++------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index a197607..7f42d90 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -865,7 +865,7 @@ struct mvpp2 { /* List of pointers to port structures */ int port_count; - struct mvpp2_port **port_list; + struct mvpp2_port *port_list[MVPP2_MAX_PORTS]; /* Aggregated TXQs */ struct mvpp2_tx_queue *aggr_txqs; @@ -7741,7 +7741,7 @@ static void mvpp2_port_copy_mac_addr(struct net_device *dev, struct mvpp2 *priv, /* Ports initialization */ static int mvpp2_port_probe(struct platform_device *pdev, struct device_node *port_node, - struct mvpp2 *priv, int index) + struct mvpp2 *priv) { struct device_node *phy_node; struct phy *comphy; @@ -7934,7 +7934,8 @@ static int mvpp2_port_probe(struct platform_device *pdev, } netdev_info(dev, "Using %s mac address %pM\n", mac_from, dev->dev_addr); - priv->port_list[index] = port; + priv->port_list[priv->port_count++] = port; + return 0; err_free_port_pcpu: @@ -8313,28 +8314,17 @@ static int mvpp2_probe(struct platform_device *pdev) goto err_mg_clk; } - priv->port_count = of_get_available_child_count(dn); - if (priv->port_count == 0) { - dev_err(&pdev->dev, "no ports enabled\n"); - err = -ENODEV; - goto err_mg_clk; - } - - priv->port_list = devm_kcalloc(&pdev->dev, priv->port_count, - sizeof(*priv->port_list), - GFP_KERNEL); - if (!priv->port_list) { - err = -ENOMEM; - goto err_mg_clk; - } - /* Initialize ports */ - i = 0; for_each_available_child_of_node(dn, port_node) { - err = mvpp2_port_probe(pdev, port_node, priv, i); + err = mvpp2_port_probe(pdev, port_node, priv); if (err < 0) goto err_port_probe; - i++; + } + + if (priv->port_count == 0) { + dev_err(&pdev->dev, "no ports enabled\n"); + err = -ENODEV; + goto err_mg_clk; } /* Statistics must be gathered regularly because some of them (like