From patchwork Tue May 22 11:16:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= X-Patchwork-Id: 918176 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="siWvOuRe"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40qtTd6NxHz9s5w for ; Tue, 22 May 2018 21:19:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752065AbeEVLTs (ORCPT ); Tue, 22 May 2018 07:19:48 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:54260 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751060AbeEVLRn (ORCPT ); Tue, 22 May 2018 07:17:43 -0400 Received: by mail-wm0-f68.google.com with SMTP id a67-v6so30665428wmf.3; Tue, 22 May 2018 04:17:42 -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 :mime-version:content-transfer-encoding; bh=z7xAB/DfjU4pQe5cFW5iIVvZFfLbgnMBxfPiQYtMiQc=; b=siWvOuRenw53P5NLfQnVpkaUmgxQ0rBty6SEE4+sj2gVgwqCtwu5YZF3DegheqUkr5 F9GutQ7CYkumeyKtRXQHeTwdYcc8lBHvV+r6gl/X7ZCc2p7y3IjT6X9v5YwSl1d3SuyL ybfM6/21SjZOvrBykkSHjLZR6iB1Ctf0rDw21tsPOPcyTlxVmSgHUgvzdfJvnHAPjs/3 xAp+yyUCgsaU7rqhWKkUswGrCNuGRfFaBrxTDt8lTxNy6xOYe9ZOqPJJzWgTtyVjJhK0 4A9I1h41cEPFwVeS0I87kUpMQVVO2rDHs9/nf0biK7S7OpMd/iCz1tBpKW9Q1tspWYOc 0ffQ== 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:mime-version:content-transfer-encoding; bh=z7xAB/DfjU4pQe5cFW5iIVvZFfLbgnMBxfPiQYtMiQc=; b=aCTdEpkwpNWdPGp7TotUiJ6qzGGRGVrvEK8GG1QmzLxDTD9VLHAUund7GvjFkaJo8V 1lFsILPpaZoUisKzT9+3ZYofboeCzQi+patJ7AesHh/Lih3/6tdLYaCB1Doz9SWF4shv 92PFPQRw69pwvsqAxQ+X5+mGwgVU+oK0+tIdn+wS6YwWcXskFWoaCNev9IMuRaxz5L38 ODK8y93Sl7gOEYzlK022Bh69YrbyA8tpNT/iv+dlCIqDPYOy1fOJh+lG/8KPBL3oNnvM Lm5BcCsl6ip0NstfeH5Z8oUcGxCmX7Jr4WEb8SX0BvQ9ElvWqZM2xNB6xyyqUUUG2Q+Z xiPA== X-Gm-Message-State: ALKqPwfNnQlGQnkkeSKKSiJXRaTXj/yPjd56Ap4nWCZr1I96ENsT4ALI l3GKjS5iJDw27Bqwme/pYw1yD5N4 X-Google-Smtp-Source: AB8JxZrs1okkpUO2osVQVuQ8h/OAoXLrrjXatDQMCgaQY9OyvqL0TmjAKWl57acQVN8ykl2LHeyaOA== X-Received: by 2002:a1c:904b:: with SMTP id s72-v6mr843104wmd.85.1526987862074; Tue, 22 May 2018 04:17:42 -0700 (PDT) Received: from iota-build.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id z2-v6sm15146747wmg.46.2018.05.22.04.17.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 04:17:41 -0700 (PDT) From: "=?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?=" X-Google-Original-From: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com, andrew@lunn.ch, mark.rutland@arm.com, robh+dt@kernel.org, davem@davemloft.net, michal.vokac@ysoft.com Subject: [PATCH net-next v2 1/7] net: dsa: qca8k: Add QCA8334 binding documentation Date: Tue, 22 May 2018 13:16:26 +0200 Message-Id: <1526987792-56861-2-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> References: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support for the four-port variant of the Qualcomm QCA833x switch. The CPU port default link settings can be reconfigured using a fixed-link sub-node. Signed-off-by: Michal Vokáč Reviewed-by: Rob Herring Reviewed-by: Andrew Lunn --- Changes in v2: - Add commit message and document fixed-link binding. .../devicetree/bindings/net/dsa/qca8k.txt | 23 +++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/net/dsa/qca8k.txt b/Documentation/devicetree/bindings/net/dsa/qca8k.txt index 9c67ee4..15b9057 100644 --- a/Documentation/devicetree/bindings/net/dsa/qca8k.txt +++ b/Documentation/devicetree/bindings/net/dsa/qca8k.txt @@ -2,7 +2,10 @@ Required properties: -- compatible: should be "qca,qca8337" +- compatible: should be one of: + "qca,qca8334" + "qca,qca8337" + - #size-cells: must be 0 - #address-cells: must be 1 @@ -14,6 +17,20 @@ port and PHY id, each subnode describing a port needs to have a valid phandle referencing the internal PHY connected to it. The CPU port of this switch is always port 0. +A CPU port node has the following optional property: + +- fixed-link : Fixed-link subnode describing a link to a non-MDIO + managed entity. See + Documentation/devicetree/bindings/net/fixed-link.txt + for details. + +For QCA8K the 'fixed-link' sub-node supports only the following properties: + +- 'speed' (integer, mandatory), to indicate the link speed. Accepted + values are 10, 100 and 1000 +- 'full-duplex' (boolean, optional), to indicate that full duplex is + used. When absent, half duplex is assumed. + Example: @@ -53,6 +70,10 @@ Example: label = "cpu"; ethernet = <&gmac1>; phy-mode = "rgmii"; + fixed-link { + speed = 1000; + full-duplex; + }; }; port@1 { From patchwork Tue May 22 11:16:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= X-Patchwork-Id: 918172 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ByZ0rOb/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40qtSS2tQ5z9s5w for ; Tue, 22 May 2018 21:18:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751479AbeEVLR6 (ORCPT ); Tue, 22 May 2018 07:17:58 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:55364 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751275AbeEVLRo (ORCPT ); Tue, 22 May 2018 07:17:44 -0400 Received: by mail-wm0-f66.google.com with SMTP id a8-v6so30793488wmg.5; Tue, 22 May 2018 04:17:44 -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 :mime-version:content-transfer-encoding; bh=+pxRVQL1Wh7KBncU1gkzdo9vIcsVP6sE3WgpO+XdsUQ=; b=ByZ0rOb/g42G2hgbsGlPgLrQtchueWezhdk7Shiplb1iOdRoaLgHxJXIi12j0IHnSL i+AYAcIC6EnejADG7DpjXQCLKzq4w/q64XVQaCl1rv2OBPqznXj26DMPAtpaBLTCc8UM ZMh4KwT0nZ6CDmGS77pV5kql1dtZ5K3Fq4TsPXxx0orkSs8OUZhsBEYoNSwN1+fATVVH TNkQyXn2ML0vaqjzIY9+9xrEbNAXTdIDlUQQuIbyFjw0DDJUpXIo2H6WXCM4IwBGM/Kk Azpnun9zONvX/ix/qliSk/bC+sDQqVEkboL8EQxwwYwWEmom6lpV4iSCSrPOPCsQsoz9 TJHg== 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:mime-version:content-transfer-encoding; bh=+pxRVQL1Wh7KBncU1gkzdo9vIcsVP6sE3WgpO+XdsUQ=; b=YFjh1EFRpfl6kC8InhadrpJmIMq1Ps7gIjbm2iZH4N6HMmGeMiMQk8AAHCEbOzi7Vk PS7GeSUMTIMWhdbGtzDpVmoOsjSygg4lGVYFnJqHYKH7jUEyLgC0406R0/vYU+kOwqtw yDYGVQ0F6JcFErNWz4u7MjyWN306JQUMxNtRGOhqrN3e7ukhSe+N3GpKo6HyRIelYOUB gLjP+mypO4DuvxxefY0a6PS8+K4mLjhWqaqYf782IDil+yakg2lQRtigE6HqG16W68kf 8Ul85E5iByZ9P3goknGJS8aRqabcjTUnJkoUwxwDq+2Qm9wgZBV+WSqeu50BlHgovME6 JT6w== X-Gm-Message-State: ALKqPwe1NnZ4WGc1L78iWr5icpvO7E+PoijycxGND4UPNg3xoTDtiA/h G5jsQG206b7ZkfmKl4yoATZA+E1h X-Google-Smtp-Source: AB8JxZoMaVDTfpzhLLJdVC5ZwNk5pmMNLPRDUUX8sYduRy5unhWEmqAPqWfF90tHEBy1pXaDS/xrVQ== X-Received: by 2002:a7b:c011:: with SMTP id c17-v6mr623743wmb.48.1526987863237; Tue, 22 May 2018 04:17:43 -0700 (PDT) Received: from iota-build.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id z2-v6sm15146747wmg.46.2018.05.22.04.17.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 04:17:42 -0700 (PDT) From: "=?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?=" X-Google-Original-From: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com, andrew@lunn.ch, mark.rutland@arm.com, robh+dt@kernel.org, davem@davemloft.net, michal.vokac@ysoft.com Subject: [PATCH net-next v2 2/7] net: dsa: qca8k: Add support for QCA8334 switch Date: Tue, 22 May 2018 13:16:27 +0200 Message-Id: <1526987792-56861-3-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> References: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support for the four-port variant of the Qualcomm QCA833x switch. Signed-off-by: Michal Vokáč Reviewed-by: Andrew Lunn --- Changes in v2: - Add commit message. drivers/net/dsa/qca8k.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 3684e56..6a3ffb2 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -1010,6 +1010,7 @@ static SIMPLE_DEV_PM_OPS(qca8k_pm_ops, qca8k_suspend, qca8k_resume); static const struct of_device_id qca8k_of_match[] = { + { .compatible = "qca,qca8334" }, { .compatible = "qca,qca8337" }, { /* sentinel */ }, }; From patchwork Tue May 22 11:16:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= X-Patchwork-Id: 918168 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dJcPgC0T"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40qtRd3Yt5z9s70 for ; Tue, 22 May 2018 21:18:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751544AbeEVLSD (ORCPT ); Tue, 22 May 2018 07:18:03 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35285 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733AbeEVLRq (ORCPT ); Tue, 22 May 2018 07:17:46 -0400 Received: by mail-wr0-f196.google.com with SMTP id i14-v6so19470427wre.2; Tue, 22 May 2018 04:17: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 :mime-version:content-transfer-encoding; bh=cSKMj9W6DJSc4fHv5T9AlYxLOMqiy/AAYBA0Vppbt2w=; b=dJcPgC0TrSeHntRtAQ0v2gFXh94xDoX+5+ja4KT/31sJlosYIEn+qswlq2uDxO+NJF HvKE4PCF5KMHS40tcvqsQVFTvWiZGUI2iHEaJgXgIrsG46761S8GRgZw8Umw6OJekNOC HR69n4q1VauiOfoZMQ0Je8yz4yf7MagaYsm9f3GoUnVdK6SwDl/Dtne/gJEHfMQM1kZl uS3Ws+VT1ZEcyzgzPyREJwmhjreM5NilRZgaEExUNVtXBR1pAPalrLYmBQ8HRfhKEkcZ XB6gPcc7sIcu4HiYB9BeNkSqD2Xd9/iF/RuPinxtkMGuYMA/VuYARoA5kH0EeSM/4+dv n/dA== 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:mime-version:content-transfer-encoding; bh=cSKMj9W6DJSc4fHv5T9AlYxLOMqiy/AAYBA0Vppbt2w=; b=KiCV8PhUFYXQyYgLOLsxuzea9Bj0FtX3n7KnSwoEYP4ZBwqFKzRjSgFzFn5o8Thwsc kEpJY3t+N33D7St99sGzGZ9VO/mUTQOZhQrgEv8waGlvvDX0Sf5Jl5RY2TltaY0YidRV xgvdUt7/+qk58Xs1bcA+HDfQtmwhavkeh3bIPw631Pb/2e8Ay5E3TSHOOsJMmpSMURqA 2pPJ8qLtf5xyaktDsQOkMQzbS7jyIt6WCIhhpVxpK1aI0uj6XUYHJ1466KWKgubCn6zw wVk6dHhwOKGpmQvVmGmEuiWVywDIg1fmCLPTLij7sMJhPD0cMczUJgnxllKSppTKF7WT S5zw== X-Gm-Message-State: ALKqPwdpufmRL01aBTBgHnnGflCqs2juxmTBMJph4/b2Mf4uhZxY9Kwk VBfr/in645pneQBNLIHAJ3yh7AmO X-Google-Smtp-Source: AB8JxZrqe8VjMbm+CM5qZZZLRaXdybnn0mW3fOa4riMPUTT/zF921XlUGbE2aDw6cc5F1zyHA98ryA== X-Received: by 2002:adf:c709:: with SMTP id k9-v6mr5071306wrg.65.1526987864470; Tue, 22 May 2018 04:17:44 -0700 (PDT) Received: from iota-build.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id z2-v6sm15146747wmg.46.2018.05.22.04.17.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 04:17:43 -0700 (PDT) From: "=?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?=" X-Google-Original-From: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com, andrew@lunn.ch, mark.rutland@arm.com, robh+dt@kernel.org, davem@davemloft.net, michal.vokac@ysoft.com Subject: [PATCH net-next v2 3/7] net: dsa: qca8k: Enable RXMAC when bringing up a port Date: Tue, 22 May 2018 13:16:28 +0200 Message-Id: <1526987792-56861-4-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> References: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When a port is brought up/down do not enable/disable only the TXMAC but the RXMAC as well. This is essential for the CPU port to work. Fixes: 6b93fb46480a ("net-next: dsa: add new driver for qca8xxx family") Signed-off-by: Michal Vokáč Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- Changes in v2: - Add "Fixes" tag as pointed out by Florian. - Add "Reviewed-by" tags from Andrew and Florian. drivers/net/dsa/qca8k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 6a3ffb2..0d224f3 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -516,7 +516,7 @@ qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode) static void qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable) { - u32 mask = QCA8K_PORT_STATUS_TXMAC; + u32 mask = QCA8K_PORT_STATUS_TXMAC | QCA8K_PORT_STATUS_RXMAC; pr_debug("qca: port %i set status %i\n", port, enable); From patchwork Tue May 22 11:16:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= X-Patchwork-Id: 918169 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fmjBl0Iy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40qtRj42wXz9s5w for ; Tue, 22 May 2018 21:18:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751587AbeEVLSG (ORCPT ); Tue, 22 May 2018 07:18:06 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35182 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751369AbeEVLRr (ORCPT ); Tue, 22 May 2018 07:17:47 -0400 Received: by mail-wm0-f66.google.com with SMTP id o78-v6so32541116wmg.0; Tue, 22 May 2018 04:17:46 -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 :mime-version:content-transfer-encoding; bh=TYdUZdzqRG3vSXBb6JqH862O21/KZNzl8iS109rELPU=; b=fmjBl0Iye2KbfIeprptIQi2M/fB+a+g4NWIdjgfatmH9a3zWeOEucs229BI4fliZIw EXZWSkIg00DekBQoqXZm+Y12tIylhM2ibzMnm9UknFmQpAv2ZLb3qworivMGQQrPt2ee rmmooj1jfCbFRTl3MY9/5z6INYoDh3tSrmjs/vgE7i0GmZOtOHYt8dl5p5MH+7n9rILD IfjOcvrjZY2IPaqfIeEst3VY5KRXX8cusTaqywZT4ZD3+SxENlqej8UdyI2L6taby52i FHZSk/22YbnVArT6KOg3udAxxJUcmq4TIr2VFoFhYHPQbnwAhkfoqqwajry+9QLPXN36 UMrg== 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:mime-version:content-transfer-encoding; bh=TYdUZdzqRG3vSXBb6JqH862O21/KZNzl8iS109rELPU=; b=DyqhZDeRfzAIWpGqOu0rbR7ncOzHIYzYSTYZHjoVEbZbXZTlIw79cKXq4OeoIosw9F O9d8QyH4RlbXs5ncOJSlzYnFxdD7yN1+Jk2du2N0LpHaqHR317Za/RUfXzpF3X7U6jeX rDjwNqLHRXP/73dIZQPBdXeuYbqF9B8YobUT9vRJzBj5Kip5/F8jSmvCu4+qRzefuWt8 fa9uQYTlf88ICA4hgoJ2QspFiAMNj9CMABhK946prPaiugtDdT/Id4W5V4kL1LQMrb5L m25PfCLH0mxLiwXRQkASAlnzEQPDpTN9VgRr8u0cZk7i3TJyXoP8Buo8ebfFnCrX0qg8 iXZg== X-Gm-Message-State: ALKqPwdeoQFc1LZXR5rddnoVv7ZEiBulhhZ+CfUIYMcqdDU1l/xVNKdA i/5ADK3hQiip4AeTbRePHl0wdgxa X-Google-Smtp-Source: AB8JxZrvMmjl72Jt6aoWz9VsAbdTO/0EZDf/rI9wdjq3m7BAxPM9OXi6cMcA5eCbRs7bziP00UIuzw== X-Received: by 2002:a1c:7309:: with SMTP id d9-v6mr904643wmb.60.1526987865646; Tue, 22 May 2018 04:17:45 -0700 (PDT) Received: from iota-build.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id z2-v6sm15146747wmg.46.2018.05.22.04.17.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 04:17:45 -0700 (PDT) From: "=?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?=" X-Google-Original-From: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com, andrew@lunn.ch, mark.rutland@arm.com, robh+dt@kernel.org, davem@davemloft.net, michal.vokac@ysoft.com Subject: [PATCH net-next v2 4/7] net: dsa: qca8k: Force CPU port to its highest bandwidth Date: Tue, 22 May 2018 13:16:29 +0200 Message-Id: <1526987792-56861-5-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> References: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org By default autonegotiation is enabled to configure MAC on all ports. For the CPU port autonegotiation can not be used so we need to set some sensible defaults manually. This patch forces the default setting of the CPU port to 1000Mbps/full duplex which is the chip maximum capability. Also correct size of the bit field used to configure link speed. Fixes: 6b93fb46480a ("net-next: dsa: add new driver for qca8xxx family") Signed-off-by: Michal Vokáč Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- Changes in v2: - Add "Fixes" tag as pointed out by Florian. - Add "Reviewed-by" tags from Andrew and Florian. drivers/net/dsa/qca8k.c | 6 +++++- drivers/net/dsa/qca8k.h | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 0d224f3..14a108b38 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -537,6 +537,7 @@ qca8k_setup(struct dsa_switch *ds) { struct qca8k_priv *priv = (struct qca8k_priv *)ds->priv; int ret, i, phy_mode = -1; + u32 mask; pr_debug("qca: setup\n"); @@ -564,7 +565,10 @@ qca8k_setup(struct dsa_switch *ds) if (ret < 0) return ret; - /* Enable CPU Port */ + /* Enable CPU Port, force it to maximum bandwidth and full-duplex */ + mask = QCA8K_PORT_STATUS_SPEED_1000 | QCA8K_PORT_STATUS_TXFLOW | + QCA8K_PORT_STATUS_RXFLOW | QCA8K_PORT_STATUS_DUPLEX; + qca8k_write(priv, QCA8K_REG_PORT_STATUS(QCA8K_CPU_PORT), mask); qca8k_reg_set(priv, QCA8K_REG_GLOBAL_FW_CTRL0, QCA8K_GLOBAL_FW_CTRL0_CPU_PORT_EN); qca8k_port_set_status(priv, QCA8K_CPU_PORT, 1); diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h index 1cf8a92..5bda165 100644 --- a/drivers/net/dsa/qca8k.h +++ b/drivers/net/dsa/qca8k.h @@ -51,8 +51,10 @@ #define QCA8K_GOL_MAC_ADDR0 0x60 #define QCA8K_GOL_MAC_ADDR1 0x64 #define QCA8K_REG_PORT_STATUS(_i) (0x07c + (_i) * 4) -#define QCA8K_PORT_STATUS_SPEED GENMASK(2, 0) -#define QCA8K_PORT_STATUS_SPEED_S 0 +#define QCA8K_PORT_STATUS_SPEED GENMASK(1, 0) +#define QCA8K_PORT_STATUS_SPEED_10 0 +#define QCA8K_PORT_STATUS_SPEED_100 0x1 +#define QCA8K_PORT_STATUS_SPEED_1000 0x2 #define QCA8K_PORT_STATUS_TXMAC BIT(2) #define QCA8K_PORT_STATUS_RXMAC BIT(3) #define QCA8K_PORT_STATUS_TXFLOW BIT(4) From patchwork Tue May 22 11:16:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= X-Patchwork-Id: 918174 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ofo2u+4c"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40qtTM49X9z9s5w for ; Tue, 22 May 2018 21:19:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751612AbeEVLTW (ORCPT ); Tue, 22 May 2018 07:19:22 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:53238 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751371AbeEVLRs (ORCPT ); Tue, 22 May 2018 07:17:48 -0400 Received: by mail-wm0-f68.google.com with SMTP id w194-v6so30689234wmf.2; Tue, 22 May 2018 04:17:47 -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 :mime-version:content-transfer-encoding; bh=SFG3SVttvE0WgumHrfH5E2YNq4EhZACLR8IXGBirM4g=; b=ofo2u+4cd9+fwdOtKT+4FRrEOrosHkaWyzghjXfE0aITkR69MaUIwGWCDoh++A6kxJ coHIu+smusFN+wt/oXCWQAvO7wukP49o6ygJR60BC+B7AChXv3KgHoDUt86LDF9d+ABZ GrgPoaxO5bN1ONoyGU+zwHUr22rpjH377PSE9mFO6JTnP0h7fKVtgFD8KBnrDEhwjmXv /MDFehLWB0YNbJmoXveoYxFHeh06T3wTtc2jPpbX1J93ce3j11I3/A5Ytb4ZiQl+QovU hdFJR74ZlsjTc9A6E/caPHd56e4Do0B+M8EdsLY3tunz78q5um7mgGKeYwd80bBZiPDM ycAA== 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:mime-version:content-transfer-encoding; bh=SFG3SVttvE0WgumHrfH5E2YNq4EhZACLR8IXGBirM4g=; b=E+iOrDE5Bit0D2cwFVVgeKDi3vrrlEsWx61pWHU22subocUhVz2QgFk/0ruQHIg9nk hAM2Y6e7MTR6d2qbouNtNhKC6K5Unmrc+52LM4RTq++98pCXAmx+NHQs4R/LQGQG5XSw 7yhfc3o+EMBEQcusu53/thFrbqawNFLSS1R60HLybuR4T3LwAYq/BVABymi5pLj+xCGC RD+LLE4wEHbLohX2ik6RXzRoMI1PfzJzjw2uuiW6V0N+MyTj2MDx+QySGfSrT/tZRuyd N7kWyMP/9Kl7lwju4vTOHCvW4VzEGL0Kznw/boPvYPskojS45baEqZY5kiZE05nOSBPj 4Pww== X-Gm-Message-State: ALKqPwcU1K5zMc6oVNPopDfRfC8jJdkGwzZF3JB8XS5CnuqQ8gatp50a Q0t+OkPAR0mc++FsE/nnOFlEGDbF X-Google-Smtp-Source: AB8JxZoZMkaGBOlIiUoFK8DvXwXFVidBb2Ggz44CvAfzDpf4S3o9otP9D9BimDVR8CIyaRyjaPQV4A== X-Received: by 2002:a1c:b943:: with SMTP id j64-v6mr815700wmf.30.1526987866857; Tue, 22 May 2018 04:17:46 -0700 (PDT) Received: from iota-build.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id z2-v6sm15146747wmg.46.2018.05.22.04.17.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 04:17:46 -0700 (PDT) From: "=?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?=" X-Google-Original-From: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com, andrew@lunn.ch, mark.rutland@arm.com, robh+dt@kernel.org, davem@davemloft.net, michal.vokac@ysoft.com Subject: [PATCH net-next v2 5/7] net: dsa: qca8k: Allow overwriting CPU port setting Date: Tue, 22 May 2018 13:16:30 +0200 Message-Id: <1526987792-56861-6-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> References: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Implement adjust_link function that allows to overwrite default CPU port setting using fixed-link device tree subnode. Signed-off-by: Michal Vokáč Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- Changes in v2: - Add "Reviewed-by" tags from Andrew and Florian. drivers/net/dsa/qca8k.c | 43 +++++++++++++++++++++++++++++++++++++++++++ drivers/net/dsa/qca8k.h | 1 + 2 files changed, 44 insertions(+) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 14a108b38..7eba987 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -636,6 +636,47 @@ qca8k_setup(struct dsa_switch *ds) return 0; } +static void +qca8k_adjust_link(struct dsa_switch *ds, int port, struct phy_device *phy) +{ + struct qca8k_priv *priv = ds->priv; + u32 reg; + + /* Force fixed-link setting for CPU port, skip others. */ + if (!phy_is_pseudo_fixed_link(phy)) + return; + + /* Set port speed */ + switch (phy->speed) { + case 10: + reg = QCA8K_PORT_STATUS_SPEED_10; + break; + case 100: + reg = QCA8K_PORT_STATUS_SPEED_100; + break; + case 1000: + reg = QCA8K_PORT_STATUS_SPEED_1000; + break; + default: + dev_dbg(priv->dev, "port%d link speed %dMbps not supported.\n", + port, phy->speed); + return; + } + + /* Set duplex mode */ + if (phy->duplex == DUPLEX_FULL) + reg |= QCA8K_PORT_STATUS_DUPLEX; + + /* Force flow control */ + if (dsa_is_cpu_port(ds, port)) + reg |= QCA8K_PORT_STATUS_RXFLOW | QCA8K_PORT_STATUS_TXFLOW; + + /* Force link down before changing MAC options */ + qca8k_port_set_status(priv, port, 0); + qca8k_write(priv, QCA8K_REG_PORT_STATUS(port), reg); + qca8k_port_set_status(priv, port, 1); +} + static int qca8k_phy_read(struct dsa_switch *ds, int phy, int regnum) { @@ -909,6 +950,7 @@ qca8k_get_tag_protocol(struct dsa_switch *ds, int port) static const struct dsa_switch_ops qca8k_switch_ops = { .get_tag_protocol = qca8k_get_tag_protocol, .setup = qca8k_setup, + .adjust_link = qca8k_adjust_link, .get_strings = qca8k_get_strings, .phy_read = qca8k_phy_read, .phy_write = qca8k_phy_write, @@ -942,6 +984,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev) return -ENOMEM; priv->bus = mdiodev->bus; + priv->dev = &mdiodev->dev; /* read the switches ID register */ id = qca8k_read(priv, QCA8K_REG_MASK_CTRL); diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h index 5bda165..613fe5c5 100644 --- a/drivers/net/dsa/qca8k.h +++ b/drivers/net/dsa/qca8k.h @@ -167,6 +167,7 @@ struct qca8k_priv { struct ar8xxx_port_status port_sts[QCA8K_NUM_PORTS]; struct dsa_switch *ds; struct mutex reg_mutex; + struct device *dev; }; struct qca8k_mib_desc { From patchwork Tue May 22 11:16:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= X-Patchwork-Id: 918173 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VgF35FJ/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40qtSt69J0z9s5w for ; Tue, 22 May 2018 21:19:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751778AbeEVLTA (ORCPT ); Tue, 22 May 2018 07:19:00 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:50766 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751401AbeEVLRt (ORCPT ); Tue, 22 May 2018 07:17:49 -0400 Received: by mail-wm0-f67.google.com with SMTP id t11-v6so30935456wmt.0; Tue, 22 May 2018 04:17:48 -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 :mime-version:content-transfer-encoding; bh=8C3tO9qcs5caQVrbk364SfjrWMCbYsHiWTeRwaApscM=; b=VgF35FJ/AlXzWc+yLyFxOSz0GZKyIzxsxj9iTKkB7yV6QsnYs8aF/Ro9VVxJ6ceNmZ 0B7hBy0UlbRrzR+NPfeu7XLUPQ6IRK1SqJ+wFQ9gBr83tnx0uC6Qa/Eajn1KtCeqU/Gc BamspkWvmyIrvvpzlwq4tfNTjtQeH8FepC0/o9+w7k4ooqZ69/2UWnp0PVDx96XqDFt8 TnGghLPsn7Od/dbOCdjby6+W1IW4Js+tDJp0xfCPI2PEM1tja7tsV5wvxEFh3aXi2FFI +02KD+2wmSuFHZ3mTKEy+xsIQ4HRzQ783wI1+Vn8bS1av83mTb+Y7OLbnNdAA3pgdRk6 SZXg== 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:mime-version:content-transfer-encoding; bh=8C3tO9qcs5caQVrbk364SfjrWMCbYsHiWTeRwaApscM=; b=QO37TuNaLVRKzbzw2HuKO8Iqn/B9GqedXDT41G4VNo2g+R93uHhf2HK3mwI2vW/1ql vrFPmwjJEykN/1M0xUMVwL8On9wAXrin6RUWfnlF3bC/iNrKAAJdyM+V0BMdncT3ht6m p+L7dJw7iGJEUOtjN0uczYh+PgLT/+E/UyKfcQj18QgeQVAH26AwcsIv+XY8tb6q9Dxy TnnjIv0sMju2Wx5oWVJuPVQaaG9qoHJJG+pVG0jFWZNuEJJzRH8lUcwRLOv7AfNAly5C JfJXKg6SoQ0dmZe/EzrdRQPPPjoByK8JWwcBpsKG2ZtekFWgmH50jji534WVcRbfrXvV 70CA== X-Gm-Message-State: ALKqPwd4GSwDPpJyf3z998pr8pYx93vuqKjnm4guTsDWYv90XRkV14j4 WUEUDYVQYABqQVDiWG4G27Z9z/Xq X-Google-Smtp-Source: AB8JxZpy4z9kqJ3UnZQF33HIo0JiiToK5FMGf9H2IdVrQVhBFo3+DwwTKe7LkVwI0k+XQXkKdoYoTw== X-Received: by 2002:a1c:5c11:: with SMTP id q17-v6mr945888wmb.24.1526987868036; Tue, 22 May 2018 04:17:48 -0700 (PDT) Received: from iota-build.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id z2-v6sm15146747wmg.46.2018.05.22.04.17.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 04:17:47 -0700 (PDT) From: "=?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?=" X-Google-Original-From: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com, andrew@lunn.ch, mark.rutland@arm.com, robh+dt@kernel.org, davem@davemloft.net, michal.vokac@ysoft.com Subject: [PATCH net-next v2 6/7] net: dsa: qca8k: Replace GPL boilerplate by SPDX Date: Tue, 22 May 2018 13:16:31 +0200 Message-Id: <1526987792-56861-7-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> References: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace the GPLv2 license boilerplate with the SPDX license identifier. Signed-off-by: Michal Vokáč Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- Changes in v2: - Add commit message. - Add "Reviewed-by" tags from Andrew and Florian. drivers/net/dsa/qca8k.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 7eba987..c834893 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -1,17 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (C) 2009 Felix Fietkau * Copyright (C) 2011-2012 Gabor Juhos * Copyright (c) 2015, The Linux Foundation. All rights reserved. * Copyright (c) 2016 John Crispin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #define DEBUG From patchwork Tue May 22 11:16:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= X-Patchwork-Id: 918170 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OnB1HJWk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40qtRz0YkDz9s6t for ; Tue, 22 May 2018 21:18:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751624AbeEVLSK (ORCPT ); Tue, 22 May 2018 07:18:10 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:54828 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751423AbeEVLRu (ORCPT ); Tue, 22 May 2018 07:17:50 -0400 Received: by mail-wm0-f67.google.com with SMTP id f6-v6so30829657wmc.4; Tue, 22 May 2018 04:17:50 -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 :mime-version:content-transfer-encoding; bh=vjDmKsxbJ5msgWrM8qhcaM11pPT1fFnLX2MTkLqwzVs=; b=OnB1HJWkr1f08DfcNsGM87lwNp1opgl9PS6wta5NF4dwH3/z6hRKtaTSvyMD4sfiQO M9eic2J7H4YSXLmSEV2u+6nV8AM9gGz6dayawrUoh4M/HgWzVYcZHKaC0xAHTR8UeV0N c7pCT/kA7XY5fZEx0uIQlsM9nGWGF4WkRHhK0rETxiBFZsj0XVxLPP8yUtEBwvkWggPq fhyX3WDW3DsaenFDnNsvd4eqIqkjdpLOCgjz2T5wqyAiBA9SybRBtxMG3kJoJnqZbMZy WvYlCuQY+UpF3+SGvsrA2oDK0v+/vnV5BVg7PDBn+LfSUyz4cnek8g+oCLAms4k6WZTg KEOg== 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:mime-version:content-transfer-encoding; bh=vjDmKsxbJ5msgWrM8qhcaM11pPT1fFnLX2MTkLqwzVs=; b=prp90KdisYKHfnTfMChHMM4z5OneNvhzSnIthcbLAuttnppUrUxB9fJdl9Sjqf4aE0 fbrz7CU/5bgQixY3UEkVYMBPkofZjlqr2j61GK6detWUH7Vw9/jfSc9Co30cKWKZQuf1 u+6vJWAaYxUJSeL3Kx1lcplhEe2NjDPHr1A/JQ2c9hHxRwtFK2nP6NYFG6ovJPiUYaVO 9Vrda9OCNDXs0ocmTL0ZHruREsLgGtufvTNHwjt8KXJAnn2Ow8AfbM6Tnz/c9VYWlxPG 2kL69ntOBWLCvL964LZgFskMIIVuztuRpbm2gCbORRSHgugKWPMLyLcl2m8PM7HSo52Z MTjg== X-Gm-Message-State: ALKqPwffb/ku8xymB4piCZM5NRNUQeG+34pdU6Rz35Ql9GwDSKLy8lPg aS485FQAk1zykpARjAg61vryFtD+ X-Google-Smtp-Source: AB8JxZqIVYPE5jZ/9pb3SN+nN0ojJZWlP6x/mlhXhrZollmB/L3silOm9PpNDrf3gUfU81q1TKzqdQ== X-Received: by 2002:a1c:9015:: with SMTP id s21-v6mr831561wmd.75.1526987869174; Tue, 22 May 2018 04:17:49 -0700 (PDT) Received: from iota-build.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id z2-v6sm15146747wmg.46.2018.05.22.04.17.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 04:17:48 -0700 (PDT) From: "=?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?=" X-Google-Original-From: =?utf-8?b?TWljaGFsIFZva8OhxI0=?= To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, f.fainelli@gmail.com, vivien.didelot@savoirfairelinux.com, andrew@lunn.ch, mark.rutland@arm.com, robh+dt@kernel.org, davem@davemloft.net, michal.vokac@ysoft.com Subject: [PATCH net-next v2 7/7] net: dsa: qca8k: Remove redundant parentheses Date: Tue, 22 May 2018 13:16:32 +0200 Message-Id: <1526987792-56861-8-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> References: <1526987792-56861-1-git-send-email-michal.vokac@ysoft.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix warning reported by checkpatch. Signed-off-by: Michal Vokáč Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- Changes in v2: - Fix typo in subject. - Add "Reviewed-by" tags from Andrew and Florian. drivers/net/dsa/qca8k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index c834893..c0da402 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -513,7 +513,7 @@ qca8k_port_set_status(struct qca8k_priv *priv, int port, int enable) pr_debug("qca: port %i set status %i\n", port, enable); /* Port 0 and 6 have no internal PHY */ - if ((port > 0) && (port < 6)) + if (port > 0 && port < 6) mask |= QCA8K_PORT_STATUS_LINK_AUTO; if (enable)