From patchwork Mon Dec 18 09:18:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 849915 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="Ci4nCMcX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z0b9L055Hz9rxm for ; Mon, 18 Dec 2017 20:20:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933387AbdLRJUG (ORCPT ); Mon, 18 Dec 2017 04:20:06 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:45248 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932837AbdLRJSV (ORCPT ); Mon, 18 Dec 2017 04:18:21 -0500 Received: by mail-lf0-f67.google.com with SMTP id f13so16909210lff.12 for ; Mon, 18 Dec 2017 01:18:20 -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=Ci4nCMcXLzTsp9ZzHizkIlmxvOS9pljWCorbjEXCtU5e/cH0tmrmz3FcDchKa/COR5 2cxWqrI6YJ0ThPl887lR417asASQIWc9BtOUK/30TN0jeYv8R4WAM1oudJ3zKKCvOJjQ jY4CzkU0L9pJl045gcSGnzan8b79YbL8X555zPv3cFguN4Eum46BBk0iRUWvFfTq/G7M hk1ynz8kJTWGnp2wP6n2eoUa1eTAHV8XkYnkbsKxcTC72X9YXjRXoyYEXmQig1avS6ej zE/gijUa3ij5J3Ty8728BU3k8/ZSsp7YSFthvzPzl8Y1439+bGmeLolqEsWz2SuZtnOt Zm4A== 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=BlRwRVqK7TPL+RKlzUcR9KM/kyPpfPpLvRmJZhD0uxy25r91vl6VsMGWZh+ZmRspXf 2ItfN8dXVwOFK5xiFt0pZSMo+JOdYP+o3NfK6NbVMh42nqeZZ2uWmc8j5FzIECkn5DKk 5s/C8bAkK/bGAafHv6iSOXMznx4pzIeu+fi22n+4rZ/aNe4PT//gkst6hdEK9y7unue9 RFM1m1fFoM0PF1tOYgYSKXzvSncBTEXnnTuXsPv1F+p/4TaKABZ1C/lslqewP2F6rjAs 2DxDEv4AXNsbksW94fNg7JsfsM2vOWusZwN9Krz5lfNp0C7gSe0AOL+pbMH2dDc7c7BP QDZg== X-Gm-Message-State: AKGB3mLFn7Jh5XXY5fzA7jDjzskl/cbWbBogrkalcZwSfBjq8H6mkGcy A6CH8PSJtZEfKT0463qj54axeg== X-Google-Smtp-Source: ACJfBouFjAXc4cfPQdyiGoxDyHN4FWLYm53e0LBsF9jkIDi6YH7U9lBlN8OQ/EAFquMZcJflRIQ9TA== X-Received: by 10.25.215.167 with SMTP id q39mr10955423lfi.33.1513588699726; Mon, 18 Dec 2017 01:18:19 -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 r16sm2407186ljd.18.2017.12.18.01.18.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Dec 2017 01:18:19 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Cc: davem@davemloft.net, linux@arm.linux.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 5/8] net: mvpp2: simplify maintaining enabled ports' list Date: Mon, 18 Dec 2017 10:18:01 +0100 Message-Id: <1513588684-15647-6-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513588684-15647-1-git-send-email-mw@semihalf.com> References: <1513588684-15647-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