From patchwork Wed May 23 06:20:18 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: 918751 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="mlz3uCiS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rMrz2lRSz9s16 for ; Wed, 23 May 2018 16:23:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754069AbeEWGVR (ORCPT ); Wed, 23 May 2018 02:21:17 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:46611 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751085AbeEWGVO (ORCPT ); Wed, 23 May 2018 02:21:14 -0400 Received: by mail-wr0-f196.google.com with SMTP id x9-v6so21342782wrl.13; Tue, 22 May 2018 23:21:13 -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=EH/XC0aDQUqXaxB57P+nVPH8Wo1s0uvzcmv0dD4gPzQ=; b=mlz3uCiSHwIwftQytw7ey5CmF4OQi/254H/shnNZCFNSWCafNrGCdfmsQ8KCeIVbt4 jJ54dTCMF6dKxUBxtpnhyUpR1+9ACWShWqfee+HHHo+kc2MqvAXaA7GAFxGXqqoY9HNd 7QmrD/xllsS8edungxtAble/IGzgfFjrXySt5nWjylPiXWZs6tNQLsJMCKJDyqaS5jKy 2adSGpiWgKWhX04RNucrchJ1V63PQIAE7DFLxD+//2ZtlYAYFJurJmOqHnmKAet0kDpN 3nKhIce5Vt+BZcTTX6L/AKdqv5fuIA+b+ag19uvjWPmcAwHxi2WJs6iidG+4208EZJqA UEEg== 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=EH/XC0aDQUqXaxB57P+nVPH8Wo1s0uvzcmv0dD4gPzQ=; b=ZI5+n2ZngNfS/cmBc7qAwcNI0TYdEBsBnlhqvGPAyfggEHk/CLCt/JzEKjf1dFe56t GqrbPCHMHdA4pMWFOkCZPmJ5o1D1v8GYTjh6IctavLZIGoWvBY/o+GY0/1qM61TFCZEO uVonCrC6D+Wfje1cRKVfuhVs7Q9RgPZ2z9tz2Ike0WVqV1gMn935Qk1fSOK0pVvECsve 9d2eXA6cQEh0T6rPxNiKi/jr03QyxVK6HiZriBMke+Lr+VCLPA2naosyuibKHhckln1I EznJRfjRoYh/UkxSv+bBsJnyXXJzvOZuD7zOQIDybJ8M5s9oDKKjf5jIZ6q+RNO2YbHk 16RQ== X-Gm-Message-State: ALKqPwd/Dqzg1AeaVFi3Y8YUv1NhSLmuaxd4dSIlj7xZR/Len8SsZUC2 o7FrjBWwc5I6wrD/lp/S7dptK524 X-Google-Smtp-Source: AB8JxZq5qhDboAG0/ujVSpWKja7CuxnW5KYdFPfgf4rJImSfUz+TuV5yt8BLnZbdJL3ub61hv606CQ== X-Received: by 2002:adf:f78d:: with SMTP id q13-v6mr1268213wrp.60.1527056472692; Tue, 22 May 2018 23:21:12 -0700 (PDT) Received: from vokac-latitude.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id 38-v6sm43012912wry.61.2018.05.22.23.21.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 23:21:11 -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 v3 1/7] net: dsa: qca8k: Add QCA8334 binding documentation Date: Wed, 23 May 2018 08:20:18 +0200 Message-Id: <1527056424-14528-2-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527056424-14528-1-git-send-email-michal.vokac@ysoft.com> References: <1527056424-14528-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 Reviewed-by: Florian Fainelli --- Changes in v3: - Correct fixed-link node documentation term: s/property/node. - Add "Reviewed-by" tag from Rob and Andrew. 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..bbcb255 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 node: + +- 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 Wed May 23 06:20:19 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: 918754 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="XYDxC0LS"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rMsd18tFz9s15 for ; Wed, 23 May 2018 16:23:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754145AbeEWGXi (ORCPT ); Wed, 23 May 2018 02:23:38 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:32797 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754042AbeEWGVP (ORCPT ); Wed, 23 May 2018 02:21:15 -0400 Received: by mail-wr0-f196.google.com with SMTP id a15-v6so16924557wrm.0; Tue, 22 May 2018 23:21:14 -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=27EWvkkMQ3M6UnTTQqxC0n0+QaBh4uRpjmzIZgCA3eA=; b=XYDxC0LSn+Fn/YGKpViBM0fcNk+7d2JIcIyJTqb3DfjcrsTuLi6v9x6jydRp8rwz3u UO4IMhZZRBcU5J8j28LPhKsXkuO07mxK/S/c7ip0e1NhEJ20NUk1njDZALQ4jvfMIfD5 NTA5k8QQbA3DENXXxlUh/QtI/Zf8HrpyTw5Q2+gPBc+DDoF4mTCaIRyJOmLQzaqobNdn D6J14P2KslHYDqQQ0s6ko6kSZZhYnBVspfc25yeIk9ChInJWQL4Z6dIvM7q2lAClHFk6 Xv7cReylDvV/uBbFE4bo1SWV/BdmcYfW1BjtQ4zumBS2H5iGt8d40RbqwX3EClIWCuT6 q4JQ== 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=27EWvkkMQ3M6UnTTQqxC0n0+QaBh4uRpjmzIZgCA3eA=; b=dF1NiEeSt2sCrg7Su18Ctn+0BF/7RIT2LhA00lW9W7jO1nFKE6K7hA5wUV/5+8gp+S uGOaixBBkzmDdal0+GIMU6Q1sPWCmyDhc0TROquhdBfZAfx3OiMcJsq8egeuYly8/zsp Jdz3nFLHWZWZNUeEKjcUDedmcEqQX7HQS4HMz6yUZiv7xO3h9EaUQjeoRygBLa6hs4oC fxKAgSgsBJFXOlGpXNHYcizrDBHReJlizcMjgcobtudBYrDJN01Se3cn7PV1RhtWVxeC SHKsrfg+R5TfgR3x1zbg8Qp3HmDqW05Aik5kJBtYTvPzU1+TzfP1V8eI+e8LjEF8kyc0 6nsw== X-Gm-Message-State: ALKqPwd4mfmEl7YmMNf1BnUlAjasCscQywVwMLYrxTjIN9I2FulGGkI/ GHvpmk0+njRrOKbSWMGhAq5zF2sE X-Google-Smtp-Source: AB8JxZqdHysLGsVL0UZ2CvZK6zKDoxlr0sZofmSRPta+d7N8tuGT0+9EBvl42kNXFhonLVk2C81qyg== X-Received: by 2002:adf:df07:: with SMTP id y7-v6mr1012269wrl.279.1527056474055; Tue, 22 May 2018 23:21:14 -0700 (PDT) Received: from vokac-latitude.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id 38-v6sm43012912wry.61.2018.05.22.23.21.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 23:21:13 -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 v3 2/7] net: dsa: qca8k: Add support for QCA8334 switch Date: Wed, 23 May 2018 08:20:19 +0200 Message-Id: <1527056424-14528-3-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527056424-14528-1-git-send-email-michal.vokac@ysoft.com> References: <1527056424-14528-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 Reviewed-by: Florian Fainelli --- Changes in v3: - Add "Reviewed-by" tag from Andrew 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 Wed May 23 06:20:20 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: 918749 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="O52cwJ8h"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rMrX1zx3z9s16 for ; Wed, 23 May 2018 16:22:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754179AbeEWGWk (ORCPT ); Wed, 23 May 2018 02:22:40 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:32805 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754060AbeEWGVR (ORCPT ); Wed, 23 May 2018 02:21:17 -0400 Received: by mail-wr0-f195.google.com with SMTP id a15-v6so16924707wrm.0; Tue, 22 May 2018 23:21:16 -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=MEcZ/VJ2r7pWGBNqV5OjfBm4LhiNVW2G/qTbXx9vawc=; b=O52cwJ8hilhQsJ09ynNHx2NKzl1LhEZv3WirsxPbuj4kmhbOXqRKPAIEQ3t25BPB7U L1qwKRe3QtvRNvEH0eMcoWaObnyq4DmCkHR+jmzQDLDtRKmzUF5n3jFqcactwPfgfn9Y PA2FoVIx223+7P2GIM7dEtUshT3LMICXTFC3Uug/cLELn2MpyZ0pklCyGU5aPqPRCpc+ gV2eYCzE5e0H4YIm/uAig1AZqTfQQ8Nrb+rk1wYvk03GLEl4EnTmlR6kpGBepeUdLfO+ qjM6p9oJkbAk5x/OUcTiAox1d91s/nfIVF1huJuuQDO2EeVovildTlf5OnkmnSpftWPZ RYPA== 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=MEcZ/VJ2r7pWGBNqV5OjfBm4LhiNVW2G/qTbXx9vawc=; b=baj93QTDiEWwGQRsiXnrztwDwr+iEfIpeSsf94Vjq2UcxBarxUnOZWg1AIIs9k91BB eIUQElm21sRZTsQYbKZJfYGjua2GgrdpnvDXmyFUH3ifkcMCjeNaxwC8Skty2Ebr5zW+ TL/tRBPQzXi0anPff5uHYOZo3Deaav6PRjFdW/ogGraXl/NipmVbOv4fy3tNaFOxNUPz t8kZFQIH+oMYNSnfSEauim93Hb2x/jUJDc/xfyeyul3c8v75SLHW1Y52a+s3u6D0yvWt WAGL5JOtWVJawcxnoDTJ0Wo0tOJY2IuM14yQv3UNFBAOCSOykiZP5BfcHZ9o2sbCMc3t pQVw== X-Gm-Message-State: ALKqPwe1M/EI53q99TvRniZQuztmEEMq9acZNxMmUh1LSK/ga2uBTG2H kJnRN05bL1vZnoW4t3hB/QdmALm4 X-Google-Smtp-Source: AB8JxZogUrYAacgv1Mi1V2R+ddctemrirNYWUd6F9vHfbHnOSKEfz+8MAPV44eIslSK1QLhn+cmZ1A== X-Received: by 2002:adf:e2d2:: with SMTP id d18-v6mr973463wrj.54.1527056475304; Tue, 22 May 2018 23:21:15 -0700 (PDT) Received: from vokac-latitude.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id 38-v6sm43012912wry.61.2018.05.22.23.21.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 23:21:14 -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 v3 3/7] net: dsa: qca8k: Enable RXMAC when bringing up a port Date: Wed, 23 May 2018 08:20:20 +0200 Message-Id: <1527056424-14528-4-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527056424-14528-1-git-send-email-michal.vokac@ysoft.com> References: <1527056424-14528-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 v3: - none 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 Wed May 23 06:20:21 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: 918746 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="LTMx/vz2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rMpr030vz9s1b for ; Wed, 23 May 2018 16:21:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754095AbeEWGVV (ORCPT ); Wed, 23 May 2018 02:21:21 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:36376 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754072AbeEWGVS (ORCPT ); Wed, 23 May 2018 02:21:18 -0400 Received: by mail-wr0-f193.google.com with SMTP id k5-v6so12108908wrn.3; Tue, 22 May 2018 23:21:17 -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=m9hqKck/Im/zowdJc65WSmlbaIasQyWsk5Cf1BTovHc=; b=LTMx/vz2VeSv7foFSr1qVFfe2wFnSaEbW2mpec3SK7UiIBakfweakEqEkmV1vu3OC5 A2UBuY/qtHSccLZWafOC1W5IwfqYH5BdPt348e49eU6ULVNFBlggvHkoGEp9NG7W1/MZ WT4cxfRzhotwkymCYDrP67UvSaCfbYbGAttihCInSd57J39VoiHMg7oxoQn+9M95hHYz Xv0frZGUiFj8r3sU3kS4RWX27WuKVfQaNzM0S39VXQW7qP1WghOzNSpyrIwqQ8VSswhk FRdvOperoa6OwqJp/semhnEOjIYHUkE/hpbN/5LVE7Igz2AFExOwYRo1Zap8mfWlDDpK fYFg== 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=m9hqKck/Im/zowdJc65WSmlbaIasQyWsk5Cf1BTovHc=; b=dBWDYh6cIzv8SAWrcvZ2halU5iN88P53YBuk5IptdrtNq3zF9f+rzYajb7eD0SvxOJ qeQ1zjzcvxo2qLUx7WW54vzpPrxL3SXGY4uzm3iIbYDIgLDgBrBH8KT/9Kr6crzQXBFG MWHnYvXaO6/TsdtJ3HZ0e8N3ubZ7OiLOmS54NNqVFdtukNzaV/UCHxU7+QxaXXSF7TIL IRzYUCdCdHPcXzhfpp+EaNnwlRje8kY+YqYAJKxzy8RErrMDEb2Qa1j5AiYpK22opham A2Om/z44n2X/cZPA0e9fXJ50rK9wmC6OD8MWq+569QZXXTyseJO/ruTSyin4c7T2YtTz SbJA== X-Gm-Message-State: ALKqPwdqy/yHEmdKDxw08yqfjhIeS4rI4a++BmJ7Em5/PPxXdJsXkpuq 9kgHQeUD/TVAv4vR1tyoaQFd/jIs X-Google-Smtp-Source: AB8JxZpoRKzoR1NDze3AfFCFQR2pim/gKyX1/LLCxmahNtlZ0EhGwfMVwjq9ZEJozIiUffoWog5UfQ== X-Received: by 2002:adf:9441:: with SMTP id 59-v6mr1085634wrq.194.1527056476630; Tue, 22 May 2018 23:21:16 -0700 (PDT) Received: from vokac-latitude.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id 38-v6sm43012912wry.61.2018.05.22.23.21.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 23:21:15 -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 v3 4/7] net: dsa: qca8k: Force CPU port to its highest bandwidth Date: Wed, 23 May 2018 08:20:21 +0200 Message-Id: <1527056424-14528-5-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527056424-14528-1-git-send-email-michal.vokac@ysoft.com> References: <1527056424-14528-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 v3: - none 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 Wed May 23 06:20:22 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: 918750 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="PiSQyitI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rMrp69tJz9s1b for ; Wed, 23 May 2018 16:23:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754162AbeEWGWe (ORCPT ); Wed, 23 May 2018 02:22:34 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:40478 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754031AbeEWGVT (ORCPT ); Wed, 23 May 2018 02:21:19 -0400 Received: by mail-wm0-f65.google.com with SMTP id j5-v6so5769046wme.5; Tue, 22 May 2018 23:21:18 -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=5m06R3NzmOlBgO7YBw8cPs4EBjTdBSGlSP09U8/hm8M=; b=PiSQyitIaFWda8d1CUlO8gshAU5v6/jEefThWgFnpBlfDfgzkVWPSbLRGp7MdisPFi lTfEnEhfkf94zfoyflUYPd2GmzPNlpMDvlaDGrMvHi8bhN8Bop6jS1Ck6dM2sUT0hhLz KZPSinxCBLEdHD/+N7EpcFzolP+Wbz3imVwFlsUB7B5XG0cQRkZDbpKHGUu9PeoMjbja nyz4GMhB3zfSvQzvMd+1bN3+tl/gS/qfO6Yl4lcohcebYlit18PW/7Iw0rSw/QHnz2Kx izwkeby5PqzTomhod7kLQdalHGxqHAYYgHO5hoE3pZ5qL6bRtfzKxIHUtI3t9e7V6ar2 Qfzw== 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=5m06R3NzmOlBgO7YBw8cPs4EBjTdBSGlSP09U8/hm8M=; b=r+P1hgnDG4MwqhQ9ZyiMEZ0C1aZKztsLh2vvGCKmEWtfVioH5Sz7GSfcpdCglnvcK+ bwppE0HfXVeNYm+HGJpq9xAzSyuCyvqlYuhrrw89BYvbfhKmqVjJRVpwx0Dm1UmD792g EVkSixhw3FyVpT41dKujSCom7YGB69jytURwjugd5LTC4L3ecxHDyloG6lWBGTTGZmlm Q3MX1DmTO0SVTLfnbdkiVUDPwXt7ndWyc+glchFSzdoAihA+S74x6IiZUdjUCC32sNf0 +w2dWr7/s+VN9FBHAmKXOD50pKGydEHQ2Jn8+GQi1Fci8vdTDbWM/utPmZfRlLH3iQ3y CQ6w== X-Gm-Message-State: ALKqPwc69ugMhXHPIegKkr3HmbPBKaghSRjJODMQtOWg9luJKVID9NpA vFf546FHVTzxOM9GpUBGav57YYiI X-Google-Smtp-Source: AB8JxZqsX/gh6816Z/i7x7khQO0lUtzAbRzgTJ/SSnGHW79tZh/weRUMSOdK9BeL61gkhvxnT4TG2Q== X-Received: by 2002:a1c:e006:: with SMTP id x6-v6mr2917066wmg.80.1527056477933; Tue, 22 May 2018 23:21:17 -0700 (PDT) Received: from vokac-latitude.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id 38-v6sm43012912wry.61.2018.05.22.23.21.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 23:21:17 -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 v3 5/7] net: dsa: qca8k: Allow overwriting CPU port setting Date: Wed, 23 May 2018 08:20:22 +0200 Message-Id: <1527056424-14528-6-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527056424-14528-1-git-send-email-michal.vokac@ysoft.com> References: <1527056424-14528-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 v3: - none 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 Wed May 23 06:20:23 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: 918748 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="kGusNqTO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rMqy0R9hz9s16 for ; Wed, 23 May 2018 16:22:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754156AbeEWGWM (ORCPT ); Wed, 23 May 2018 02:22:12 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36098 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754081AbeEWGVU (ORCPT ); Wed, 23 May 2018 02:21:20 -0400 Received: by mail-wm0-f67.google.com with SMTP id n10-v6so5833151wmc.1; Tue, 22 May 2018 23:21:19 -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=gHMG3xZDm8xqOJDqQxkfJkZ2V+DC1QR+TgByZvTcG6g=; b=kGusNqTOc1Sy2j6w/DU02dMME2FNO70qu6wrwhT+tCYfcivEMNCJClomfb5QZ8Cwjo mihGV9V09L9un0cHxLvp/tXGu8cL5vRVJcX2FejvfaiXDIRazRDBd+jbJOdKSVz0+B0J /KUaRNuE+bNADpCh1xRpf1rGkH1AasTHid91gt5ORtbwi2h6uJJu3Sr0TqqdzVqeNwC7 hqSTC+2Upg5nW/I1KGs3XGLuVWUhei3DVT8Om6wC7KrZjbFc4kuPG/swiWkandS1FR4O Qj9Tv+JTYUTYUkaD90ZogBJRmtNo24p4oZXcY9O1RzTJDw0O82CrxJ0JdqQMBsO7A2X7 veMQ== 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=gHMG3xZDm8xqOJDqQxkfJkZ2V+DC1QR+TgByZvTcG6g=; b=oQpZzA8J5y8Pe/K0WIfsD332GksXvEIT6WoE9rhIAOBe1qB+yGCOJO8OqXazxmxRqS EXEEly+I1MtaRNLwP7Hug/I9cR3lCLfgSxMyzM4R4Rbm8cuIZUd6S39+BJWh4AqXbK+H un5gWFvw4AG5HOIgYkeGurNu2F+axoihi9I9+Yy1UzzyhJwho7cNCUona16jX8pbkPeI /PRjk3LkaCPnf2ebACFedZYsLl7WvIEzQ35rVuyU1/93ENAV52cfubGmiSMeSczB0ByE XmOYStq4QAFl3hZzOko7zMiqwWnXIHT7EnRFu8cIj90acCV3pvcyNS1m1dMzp4FY+2gB qeBg== X-Gm-Message-State: ALKqPwei/qHpLD8q+zM/F/2r7Ryn/v5hT5Ll92ussJ7lsCcVeyJXpmqR 04R2z5ZlojlWj2NxSKWkulJMtPdq X-Google-Smtp-Source: AB8JxZreyoerh0h1XYngq31RD9Y2tpwLUOe5f3+aTGxeqr+XLltgDFDVXfOVfiUi7UPJW6Q+oIbyHw== X-Received: by 2002:a1c:9c2:: with SMTP id 185-v6mr3225281wmj.53.1527056479089; Tue, 22 May 2018 23:21:19 -0700 (PDT) Received: from vokac-latitude.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id 38-v6sm43012912wry.61.2018.05.22.23.21.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 23:21:18 -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 v3 6/7] net: dsa: qca8k: Replace GPL boilerplate by SPDX Date: Wed, 23 May 2018 08:20:23 +0200 Message-Id: <1527056424-14528-7-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527056424-14528-1-git-send-email-michal.vokac@ysoft.com> References: <1527056424-14528-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 v3: - none 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 Wed May 23 06:20:24 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: 918747 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="WYQ/UFMD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40rMqB2Q5vz9s16 for ; Wed, 23 May 2018 16:21:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754138AbeEWGVb (ORCPT ); Wed, 23 May 2018 02:21:31 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:55706 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754091AbeEWGVW (ORCPT ); Wed, 23 May 2018 02:21:22 -0400 Received: by mail-wm0-f66.google.com with SMTP id a8-v6so5629750wmg.5; Tue, 22 May 2018 23:21:21 -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=f5XEhG4TK+Krg6L40dTAUtxC0dEnSSfq2IVLB4anX84=; b=WYQ/UFMDLMEtKG4p0Qo8CBZJD288zEZLiIig5R57JtpVo4oY0OvDCTc+QBm2z4lCwt QNyw9CfvQN7zoffTOhupjkjiMJKjtxunItD6kMSposCHLXkQRlPJdmYBLeie0QXuv+S6 jQfqkU2lfK5e/JMjKb/iqTauZzcUycMJkQbIE9yxxCwQbIuVcsNfXvg0ZaE025ZpCz6M qkvCRI4EbWCJuz7T9v9n/Lnp+s6yTsBUvitrx056IfH+25Z47KrEzn3cMLEVMEcDvcDr QXHzn589uCj+u0Ye62jSFhg9mVUK9Y18g2+e7T7LkPctPKccXCfRYvB8GkknhHE1bqIW uZBA== 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=f5XEhG4TK+Krg6L40dTAUtxC0dEnSSfq2IVLB4anX84=; b=fnF7TxHGXpjNvPJbnvnf0B/Kb9RNGGwD40SHi//N4SZQjItTSpWMuKjOLsluT7HhqH f7gnrBEFWmo91GXFDXIV82N5yDlCxZkaGO8YhzLymfl/o+YEB/W7+shLQK/uIvn59tMW U/dvVuT5YKAFLTXNc4Qta7XuQtm4lU3MDnxwkrRAn4aTUsORdcgnWAPuSWOUogqk/1xu d8Z1qL+bMNx01x7tKQxQXL/B91c5SNhIw2k4LzIh6h9CXzKsyiXyI1GwYr/LHB3yTxnr zZ/uk5sxAVljgYRpEoDw6hVSlNqM0TSbsnqy3MYcEi8PBSNAuIR/kX4pOl/ijV97y/dR 9I+Q== X-Gm-Message-State: ALKqPwcnHFz2KpjwaC6mhx2nyrF61RhoK+bnGVoPM6Mvfv1WEy2il/Z5 zJ7otMOu25aI2+7EE6vs1M+MD67u X-Google-Smtp-Source: AB8JxZrrUpb/ykkIBMZyoPU6IdnE3E2h6WjBfhsKv7ofo5iXzQVXiBIm8ywQXyqxFJCSX85fMZLrZg== X-Received: by 2002:a1c:36cc:: with SMTP id y73-v6mr3227658wmh.28.1527056480205; Tue, 22 May 2018 23:21:20 -0700 (PDT) Received: from vokac-latitude.ysoft.local ([89.24.100.190]) by smtp.gmail.com with ESMTPSA id 38-v6sm43012912wry.61.2018.05.22.23.21.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 May 2018 23:21:19 -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 v3 7/7] net: dsa: qca8k: Remove redundant parentheses Date: Wed, 23 May 2018 08:20:24 +0200 Message-Id: <1527056424-14528-8-git-send-email-michal.vokac@ysoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527056424-14528-1-git-send-email-michal.vokac@ysoft.com> References: <1527056424-14528-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 v3: - none 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)