From patchwork Tue Jul 7 21:16:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 235024 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1271821ilg; Tue, 7 Jul 2020 14:16:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxioDrW4+Wl+lbiea+rFGypz9JoMo8FGl9bO0LlK7ODHHGXBcEdfUDuImHFtV5JsM/zYUZs X-Received: by 2002:a05:6402:1ade:: with SMTP id ba30mr3707797edb.231.1594156589087; Tue, 07 Jul 2020 14:16:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594156589; cv=none; d=google.com; s=arc-20160816; b=tPoWXKq3hfq0cMelEngglK3Gnp2crHMgMSubDm19orXeQ6sWZHxDZWrtt3VqdmFWcf mY/wd2CogzBT006GdEwuOd9XDjcwLj8K1jTl5Mzi3JHeTtst+i7H/j12JNxoLD04GM9u 4QmdmOMbUCU7NqiewJAZtuvujsaU6/P0IYR7TToKj742kpH0U8GhJZhnw0necZJCRQ1g 8zpP672HxwPSAYoPWj9adYlmLlOP2/1lxabBpr+9kTWOahKB9LeVVMUrnHbQHwz8P97V nuDC7w7L0N4F/cUELcfBKQu2A9KWeDMjg2Kw7h+nvwiT5R3mTBoPrHY6mBxShhlQB8mJ OspA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oWLf8mA2zVq2KsL68W1eYCkCCoZOvVmx6e/XhqjhW2s=; b=WVqpPe9RIcYY20GYK+6WGKIMV+vcrQ/EdzZutKVtm7ptQHHxrC/JiAzlL4ApbK3w+P q8NXcexb9fSTXtymUa5x+5tu3DV96CyWG55otbvb1lZaPP83kfFd3DgkWZgy07nB837/ Gwilb1hBXmV5V//DGv5izwPkXYAVT6tVbps0BllncRTUnIqP8CGKZF6nJMUVbGMT7Lkc GyXQp6XcCMA+SoGOHAxcpGtKYhENp4ERCyoSgrhHzqMxlXPp+TsBJ6nSA7MFhTgtmskn zA9XuUl5sfTVRNAvbrS1OqqMWaT8VbiB2IMQFwhctWI6Fn+0Si/L4S+ZJuRPUTWMW2y1 2Oiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DrCz4GJO; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b12si13694128edj.296.2020.07.07.14.16.28; Tue, 07 Jul 2020 14:16:29 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DrCz4GJO; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729195AbgGGVQ1 (ORCPT + 9 others); Tue, 7 Jul 2020 17:16:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728184AbgGGVQZ (ORCPT ); Tue, 7 Jul 2020 17:16:25 -0400 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A511FC061755 for ; Tue, 7 Jul 2020 14:16:24 -0700 (PDT) Received: by mail-lj1-x244.google.com with SMTP id q4so15977649lji.2 for ; Tue, 07 Jul 2020 14:16:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oWLf8mA2zVq2KsL68W1eYCkCCoZOvVmx6e/XhqjhW2s=; b=DrCz4GJONbnM4IVTKuYwTya2u+OuN6nMFK+txwc17z7CiCy0dZH+/KTX19leAGASkP /tmKxjFOJ5z0IkFHJpQekGUNAUFznL/gjPJ3YWzNEOIy4QNFv76aQh/sby5J8gGnOnqE EQyfhJeaZUR1lKlCtoBWHMbhOL2gliynPyiY25/CxJjBRfsdcJ+DUB+aswSjxgXeo0d7 t9cpVbvP60NglSF99/T1OJh0wV3nN5rELXL6oeAP1BleYMfauAmGXLo2eD/DR1kOhL2v v5chYPVLT/eWi8QaiNCwZxCGabbjstOQsZk9ag8Rnd6qv9nOSdf+HJLtR3a8EjMrl5X2 0T+Q== 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=oWLf8mA2zVq2KsL68W1eYCkCCoZOvVmx6e/XhqjhW2s=; b=V+r737rq7S1OlZiydrkgB0jxFczevfSJkyCWgn1vC/rFPiP6JHKJNSYpS8G70mtkbG i5W2+aUTE+e3/RuFh1RZdR0x0kJFlisZEQX4wtF9keGvG7IbEqLPuT6uFk9kWHbK2Sun 97nBmhuYgtBh+TThMCBzyDf2d0+kiVdELnHn9NiGe50/i0SoZBfN+cROXCu+Xrbo83ll DfQTGgCbjXrsf8BCxLnBudJkAeL0GfOJkeWlqFWP9mpelNZLnFeF4lCjF9SMvRmEmjbG wOjZit0Ysgmg5cJWwIbE4bhL/Oxl/e/AtgJ/4U65at+RMX7laCHTU6THCUlff6nu3poK LA0Q== X-Gm-Message-State: AOAM5315Mp0mOCjgJfa/QckR4DVqhGZ2UnT0qQQNOpgkPHQo8VHzMDC1 yCjWGvqsffyl5gsSNOn+WDYBvA== X-Received: by 2002:a2e:95d6:: with SMTP id y22mr23581653ljh.316.1594156583093; Tue, 07 Jul 2020 14:16:23 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-92d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.146]) by smtp.gmail.com with ESMTPSA id u7sm12750493lfi.45.2020.07.07.14.16.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 14:16:22 -0700 (PDT) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , netdev@vger.kernel.org, "David S . Miller" Cc: Linus Walleij , DENG Qingfang , Mauri Sandberg Subject: [net-next PATCH 2/2 v5] net: dsa: rtl8366rb: Support the CPU DSA tag Date: Tue, 7 Jul 2020 23:16:14 +0200 Message-Id: <20200707211614.1217258-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200707211614.1217258-1-linus.walleij@linaro.org> References: <20200707211614.1217258-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This activates the support to use the CPU tag to properly direct ingress traffic to the right port. Bit 15 in register RTL8368RB_CPU_CTRL_REG can be set to 1 to disable the insertion of the CPU tag which is what the code currently does. The bit 15 define calls this setting RTL8368RB_CPU_INSTAG which is confusing since the inverse meaning is implied: programmers may think that setting this bit to 1 will *enable* inserting the tag rather than disabling it, so rename this setting in bit 15 to RTL8368RB_CPU_NO_TAG which is more to the point. After this e.g. ping works out-of-the-box with the RTL8366RB. Cc: DENG Qingfang Cc: Mauri Sandberg Reviewed-by: Andrew Lunn Signed-off-by: Linus Walleij --- ChangeLog v4->v5: - Split tagging support from the VLAN fix-ups. ChangeLog v3->v4: - Resend with the rest ChangeLog v2->v3: - Fix up the commit message. - Collect Andrew's review tag. ChangeLog v1->v2: - Update the commit message to explain why we are renaming bit 15 in RTL8368RB_CPU_CTRL_REG. --- drivers/net/dsa/Kconfig | 1 + drivers/net/dsa/rtl8366rb.c | 31 ++++++++----------------------- 2 files changed, 9 insertions(+), 23 deletions(-) -- 2.26.2 Reviewed-by: Florian Fainelli diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index d0024cb30a7b..468b3c4273c5 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -70,6 +70,7 @@ config NET_DSA_QCA8K config NET_DSA_REALTEK_SMI tristate "Realtek SMI Ethernet switch family support" depends on NET_DSA + select NET_DSA_TAG_RTL4_A select FIXED_PHY select IRQ_DOMAIN select REALTEK_PHY diff --git a/drivers/net/dsa/rtl8366rb.c b/drivers/net/dsa/rtl8366rb.c index fd1977590cb4..48f1ff746799 100644 --- a/drivers/net/dsa/rtl8366rb.c +++ b/drivers/net/dsa/rtl8366rb.c @@ -109,8 +109,8 @@ /* CPU port control reg */ #define RTL8368RB_CPU_CTRL_REG 0x0061 #define RTL8368RB_CPU_PORTS_MSK 0x00FF -/* Enables inserting custom tag length/type 0x8899 */ -#define RTL8368RB_CPU_INSTAG BIT(15) +/* Disables inserting custom tag length/type 0x8899 */ +#define RTL8368RB_CPU_NO_TAG BIT(15) #define RTL8366RB_SMAR0 0x0070 /* bits 0..15 */ #define RTL8366RB_SMAR1 0x0071 /* bits 16..31 */ @@ -844,16 +844,14 @@ static int rtl8366rb_setup(struct dsa_switch *ds) if (ret) return ret; - /* Enable CPU port and enable inserting CPU tag + /* Enable CPU port with custom DSA tag 8899. * - * Disabling RTL8368RB_CPU_INSTAG here will change the behaviour - * of the switch totally and it will start talking Realtek RRCP - * internally. It is probably possible to experiment with this, - * but then the kernel needs to understand and handle RRCP first. + * If you set RTL8368RB_CPU_NO_TAG (bit 15) in this registers + * the custom tag is turned off. */ ret = regmap_update_bits(smi->map, RTL8368RB_CPU_CTRL_REG, 0xFFFF, - RTL8368RB_CPU_INSTAG | BIT(smi->cpu_port)); + BIT(smi->cpu_port)); if (ret) return ret; @@ -967,21 +965,8 @@ static enum dsa_tag_protocol rtl8366_get_tag_protocol(struct dsa_switch *ds, int port, enum dsa_tag_protocol mp) { - /* For now, the RTL switches are handled without any custom tags. - * - * It is possible to turn on "custom tags" by removing the - * RTL8368RB_CPU_INSTAG flag when enabling the port but what it - * does is unfamiliar to DSA: ethernet frames of type 8899, the Realtek - * Remote Control Protocol (RRCP) start to appear on the CPU port of - * the device. So this is not the ordinary few extra bytes in the - * frame. Instead it appears that the switch starts to talk Realtek - * RRCP internally which means a pretty complex RRCP implementation - * decoding and responding the RRCP protocol is needed to exploit this. - * - * The OpenRRCP project (dormant since 2009) have reverse-egineered - * parts of the protocol. - */ - return DSA_TAG_PROTO_NONE; + /* This switch uses the 4 byte protocol A Realtek DSA tag */ + return DSA_TAG_PROTO_RTL4_A; } static void rtl8366rb_adjust_link(struct dsa_switch *ds, int port,