From patchwork Wed Jan 17 16:55:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 862394 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="o+ODlGiz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zMCzm3cJ2z9ryr for ; Thu, 18 Jan 2018 04:01:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754323AbeAQRB2 (ORCPT ); Wed, 17 Jan 2018 12:01:28 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:46432 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932124AbeAQQ4I (ORCPT ); Wed, 17 Jan 2018 11:56:08 -0500 Received: by mail-lf0-f66.google.com with SMTP id q194so11382834lfe.13 for ; Wed, 17 Jan 2018 08:56:07 -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=o+ODlGizZRkhynp+KSUze1biLUXzpvQnvhjxGWQQnU9y1ujLZV7ppnu/iz7tmF3rTO 62DOkj8CBvAGAE7aGlePwKnosY2AhJ2rBpQV8fMGMT2utlA6GA2bRtll9X2MxpeO+ODx 9KZvh9H4HqNvsSPUHKvabbfBOQwf80ewaft/IGHOr+N6jG3xvz+SGzmu3QZR+NpvsEea rQNgEpGaYJmZYu2b+ycRLIH1KeSDn00tIOY/y1Zul4oDa3FxGYQ8UUDSN2hEviovPdIe NMDY5ZKLs+Hyv3mg1s//cBU5E9ZqccyraD8VnN6+ZZEUBHz0T/AXYvjHOd1XGscJGr91 +Mtg== 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=iCT/KHARTcWWkif+nUBNsFyFJ4TFEcKJUmupkTRSva6cd6+Jdvd63cIRWfk9CkGzLK iHwX7Unyt794O9lTMNYzWh4zKfcD/v5vzxS5HAFqPWVyiJuOTWC86Y1d797BOB/PIpEJ TkDAX5Ks6ZPUmm2hNvO9eda6QBVNOAfTD8BRK/Z2kZ/ORlERgUui4yO0z/Qk9MlKzUrh GZzdS914Th9HD+Y3YAOPu3MUogPotY0t2f0Zo8aIDDUupXIzaKaBmmxL5f9/2OkE1cBX sy9QlYnTLea3iIeg9RZVIiMKvmYJtNir8jRpWpq9B9R0nK15nGkdxMi+XNT6JzMEC359 5F2Q== X-Gm-Message-State: AKwxytfY0myyjePmZUqd1TK7N7qVa2d0nWTBL9nTfM9MXT4lLerBr3p/ VgbUhNUQXx7RVZkseXsywFfm4Q== X-Google-Smtp-Source: ACJfBougJbQjrvSiHgZM26TrO0STA0UhTDBP/bsqf7U851frPUfsX9cHaQ8206NfLGRUqpg94FdeVQ== X-Received: by 10.25.167.85 with SMTP id q82mr5748449lfe.112.1516208166233; Wed, 17 Jan 2018 08:56: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 t81sm868347lff.47.2018.01.17.08.56.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jan 2018 08:56:05 -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 v3 5/7] net: mvpp2: simplify maintaining enabled ports' list Date: Wed, 17 Jan 2018 17:55:44 +0100 Message-Id: <1516208146-4144-6-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516208146-4144-1-git-send-email-mw@semihalf.com> References: <1516208146-4144-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