From patchwork Thu Jan 18 12:31:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 862839 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="Sok5zZm1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zMjzZ1MfNz9s72 for ; Thu, 18 Jan 2018 23:33:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932462AbeARMc6 (ORCPT ); Thu, 18 Jan 2018 07:32:58 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:39368 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932257AbeARMcH (ORCPT ); Thu, 18 Jan 2018 07:32:07 -0500 Received: by mail-lf0-f68.google.com with SMTP id m8so26446491lfc.6 for ; Thu, 18 Jan 2018 04:32:06 -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=Sok5zZm1n9pY7p5ysaRzD3Q0GEG24/Mmo9CqU3yXUlQC2jxDfnyLHqVcnPHXNq+kb8 bAXVIvigoBcqulvPlR/A7BNNo8LfbqU20/dCNdxYxb8gciRKWewGY6djBBq7LQ9RQ90p 0JXOAraZUYbibs5IbGq0lIsk97uiiTNOTvqYKYLAKL3cZOCyHEYJHiGIaKmi7gceP8ZG C+mDzECIqJqmrLJb0UEV8UscFqGlJGaTwdBLYh75oU5nmNSlVe34eFgFH50XdLbtm74d iNGtMDoKcmc2bGPJr53bu5jFGvwYw6YTixG7DAO0R21+ub4q7RsuJ3PNmPaZTgme2elF kfjw== 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=KSCKwvJ7kUYbC54VcahHXL/Z3sFIFA8kJG+7yG4qim0iQeot//652Fng2b2UjYvkXj BYbs0xxVnfmUP89DFV1Y/p0RZ/G/UV3NqTnL6UhvNe1j60cK8gTm6n8h0lyoiPI9B5Fm Oo4CwOgUActNioW2r5GA9u4EJD6ZD9RZ6coYdLpAoDd5ZF9S6dn+6oJw8CwhxU+pSo0e rI3a8f4i9PajT0XQSrbcUq7reMSQCmv/vbtHNFHcWfWsmR98AOlv2v44wX3crzMwlrGr M8kDK3DlJn39fChjKGUF1ad9qk8Jfizwv/tjbyeieuAh9XOPYaV/LV8W2wcO6BiExRIQ W/Yg== X-Gm-Message-State: AKwxytcGMPHtGfDDxX+c5TSQoeiPIKYE06qauaZQvYWn1mcyEWy2UC8P dklh06RCm0c3ENuiSh6zLiuIsA== X-Google-Smtp-Source: ACJfBotEbT6enu4uJiSvYlAnVGs6gsm2dwwmiu39JkFMfO1+ssqyV5xIzEeol4Gb0+kKl4yq9Zr4Ug== X-Received: by 10.46.8.89 with SMTP id g25mr2726915ljd.47.1516278726013; Thu, 18 Jan 2018 04:32:06 -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 s23sm1303906ljs.1.2018.01.18.04.32.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jan 2018 04:32:04 -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, stefanc@marvell.com, nadavh@marvell.com, neta@marvell.com, ard.biesheuvel@linaro.org, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com Subject: [net-next: PATCH v4 5/7] net: mvpp2: simplify maintaining enabled ports' list Date: Thu, 18 Jan 2018 13:31:42 +0100 Message-Id: <1516278704-17141-6-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516278704-17141-1-git-send-email-mw@semihalf.com> References: <1516278704-17141-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