From patchwork Mon Sep 18 21:41:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 815182 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=gmail.com header.i=@gmail.com header.b="Ndzh1GQV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xwzws19cFz9ryv for ; Tue, 19 Sep 2017 07:41:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751497AbdIRVlr (ORCPT ); Mon, 18 Sep 2017 17:41:47 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35726 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751057AbdIRVlq (ORCPT ); Mon, 18 Sep 2017 17:41:46 -0400 Received: by mail-wr0-f196.google.com with SMTP id n64so1141650wrb.2 for ; Mon, 18 Sep 2017 14:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i+cf+nOKttQ4IQa4MEVfKAYPU7XBFNiI0Spyajf4HUI=; b=Ndzh1GQVJdi5Ct/Rgyu0ikqr1UgE8a2sLnNgX/mgb14qja9WIyQfni9crIloNQAfQl wRlik/5O2Wcbg1kgDz6qYLQpOHty5+ztre3JphFnuv9SkDyrliFC14nuqxFkDg9ccMz8 Mleo+ilraxbozIo2qLL2MLHHZGZGz4adlZEcWg0IXAwwZJYypXPppSvX89+G/L+pKRBy bMx8foFPI6sb62Tg2x76cuzWhRHagNaWH7ejkGDjjh1LvSo0lNlrKqYl2ShZEGXoKZ2d dIqJx3UIdw5or0mIEYi4EFObV9JaP7mmEXvQKc77Ry/NOOxG54wMDselSk47nAKm5N8L 2LyA== 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=i+cf+nOKttQ4IQa4MEVfKAYPU7XBFNiI0Spyajf4HUI=; b=hXg/9xKLaY+2zLAq6yXw1t1SFGz0drVJ0KjVv81AzG4SKuNY98gpGWFkaXjNSH4U0M ++x53kkClSqWH9FycdsTLKOj9bCFUUNjRFgXiyT0NpqodPh1uLpVrwEZXbne0d2tLT3b 5KYa+JG015QHJFUhgl4WXj1UHGehVLHzTTtMCT05UN6TgPD0j7NgJrDaq1jDYyydqikr Zn3l6tuxKRgKXRCAaEuAgJnhAzCw6DCntndM2aT0NTw3/hUz99TcnK2gsfaaQ8Uq/qCg oI7hBnJ/7kUwpH0bup08PKxckUGxs3SFcaRiXUwY3iIDQ1VbdO5rWF/wdI1CNzZ0wAa8 bIAg== X-Gm-Message-State: AHPjjUjPoJ8ovD9vqaZiwKbb4rA/7E6uiQW15Zr1k/LtzWplLN+ZBENY 4JAvg5hIf7qKZegd25o= X-Google-Smtp-Source: AOwi7QAJMigjRgvZPZJnex7xDL+ps0jenK9Am9CYdYtKTqjPRfXxUH5FG4+wBgJQ/umL0Q7p8DTPzg== X-Received: by 10.223.178.193 with SMTP id g59mr18244204wrd.0.1505770904761; Mon, 18 Sep 2017 14:41:44 -0700 (PDT) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id e34sm9242761wre.15.2017.09.18.14.41.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Sep 2017 14:41:43 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, Florian Fainelli Subject: [PATCH net-next 03/12] net: dsa: b53: Defer port enabling to calling port_enable Date: Mon, 18 Sep 2017 14:41:19 -0700 Message-Id: <20170918214128.27896-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170918214128.27896-1-f.fainelli@gmail.com> References: <20170918214128.27896-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no need to configure the enabled ports once in b53_setup() and then a second time around when dsa_switch_ops::port_enable is called, just do it when port_enable is called which is better in terms of power consumption and correctness. Signed-off-by: Florian Fainelli Reviewed-by: Vivien Didelot --- drivers/net/dsa/b53/b53_common.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index d8bc54cfcfbe..3297af6aab8a 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -815,12 +815,13 @@ static int b53_setup(struct dsa_switch *ds) if (ret) dev_err(ds->dev, "failed to apply configuration\n"); + /* Configure IMP/CPU port, disable unused ports. Enabled + * ports will be configured with .port_enable + */ for (port = 0; port < dev->num_ports; port++) { - if (BIT(port) & ds->enabled_port_mask) - b53_enable_port(ds, port, NULL); - else if (dsa_is_cpu_port(ds, port)) + if (dsa_is_cpu_port(ds, port)) b53_enable_cpu_port(dev, port); - else + else if (!(BIT(port) & ds->enabled_port_mask)) b53_disable_port(ds, port, NULL); }