From patchwork Wed Oct 17 19:53:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 985497 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="e3cckO8t"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42b2tJ5gzTz9sBN for ; Thu, 18 Oct 2018 06:53:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727678AbeJRDu4 (ORCPT ); Wed, 17 Oct 2018 23:50:56 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:40067 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727108AbeJRDuz (ORCPT ); Wed, 17 Oct 2018 23:50:55 -0400 Received: by mail-ed1-f68.google.com with SMTP id r1-v6so26069738edd.7 for ; Wed, 17 Oct 2018 12:53:39 -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:mime-version :content-transfer-encoding; bh=IAd1KiwmgK87vNqhxjrV+ov3zMJPJ3ZosBQyZxAPf5k=; b=e3cckO8tLU/IawABcXQq0oR3K+GVyC85XtX7YymYRg1o8XcjSK+AyxUpiSEiuTDs5b lbKheln48LD5ePF8rcwDd9UzSJCk5r9esnYz+5OVqUJRuqAPYps5YDMaX4KngYnKgEH7 fPnX/rUJx/RRoDyhMbGCL4sCGUZSaMpdL2UesnLR2gcmjj96bia6y4piI+Le/xiNhA7A 7rhQ6h8ZuW2iGC4+s2STWLIuNno03JJ+TSkpnc1Qn+o+qrhBGHK67/AtVqB9DW/bkbuW 0PeI6BpLstY010WeKRyESArTwD2UJahYMK9gWTg9or+iTTQS/+/xRdyLuWkk7qv8Fq0l AAOg== 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:mime-version :content-transfer-encoding; bh=IAd1KiwmgK87vNqhxjrV+ov3zMJPJ3ZosBQyZxAPf5k=; b=A8b1C2PTHaxHYnhkz7wY5Mv/ZgQRdNgSXDFcu2YYo2e1pXz9kGcE/Gn4skMpb79b08 Poz5N9QfXZHebhLO9pQN3seP+95/rQfv3bq54h0/zuiRyrUcRj97NLOwAtHRLZTX05VM 9dfPFfERmI0W0Zs6XURLefDH6wy8wCUcfw9vlcnOb3t3gLmjMiIXOcx4R7UVw7f2jVN3 4kvsv+WH/E2GMCbp3QmXZ9lse05LBz79bq4+8++ZmR3OdAgyr4f3+PIlWRaxv51L4mOZ 9j21hlrWY+9wII5ALAcLSxcNTr54jAEgTyDuI4/z2Keq32DZIM+YIIJ8SkEt88awdnAF 1jug== X-Gm-Message-State: ABuFfogWQlbZ2bTgjcNXP+o4GpMkeS0PhRf+qzi4lvPWsY3isrqojupm cVxMmaam0wMdb317OR5rt5XZYZ93uhM= X-Google-Smtp-Source: ACcGV616axFAARDwLiytKzrSmhdM9/6KZl5SFrcpDByyMOWWkBZYsNQ1O1ItwYlnKT8jflMYjADQ1w== X-Received: by 2002:a17:906:76d1:: with SMTP id q17-v6mr27836984ejn.150.1539806017787; Wed, 17 Oct 2018 12:53:37 -0700 (PDT) Received: from debian64.daheim (p200300D5FBC22EFCD63D7EFFFEBDE96E.dip0.t-ipconnect.de. [2003:d5:fbc2:2efc:d63d:7eff:febd:e96e]) by smtp.gmail.com with ESMTPSA id j22-v6sm7488706edr.96.2018.10.17.12.53.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Oct 2018 12:53:37 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.91) (envelope-from ) id 1gCrsu-0007Ky-96; Wed, 17 Oct 2018 21:53:36 +0200 From: Christian Lamparter To: netdev@vger.kernel.org Cc: "David S . Miller" Subject: [PATCH 1/2] net: emac: implement 802.1Q VLAN TX tagging support Date: Wed, 17 Oct 2018 21:53:35 +0200 Message-Id: X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As per' APM82181 Embedded Processor User Manual 26.1 EMAC Features: VLAN: - Support for VLAN tag ID in compliance with IEEE 802.3ac. - VLAN tag insertion or replacement for transmit packets This patch completes the missing code for the VLAN tx tagging support, as the the EMAC_MR1_VLE was already enabled. Signed-off-by: Christian Lamparter --- drivers/net/ethernet/ibm/emac/core.c | 32 ++++++++++++++++++++++++---- drivers/net/ethernet/ibm/emac/core.h | 6 +++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index 760b2ad8e295..be560f9031f4 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -674,7 +675,7 @@ static int emac_configure(struct emac_instance *dev) ndev->dev_addr[5]); /* VLAN Tag Protocol ID */ - out_be32(&p->vtpid, 0x8100); + out_be32(&p->vtpid, ETH_P_8021Q); /* Receive mode register */ r = emac_iff2rmr(ndev); @@ -1435,6 +1436,22 @@ static inline netdev_tx_t emac_xmit_finish(struct emac_instance *dev, int len) return NETDEV_TX_OK; } +static inline u16 emac_tx_vlan(struct emac_instance *dev, struct sk_buff *skb) +{ + /* Handle VLAN TPID and TCI insert if this is a VLAN skb */ + if (emac_has_feature(dev, EMAC_FTR_HAS_VLAN_CTAG_TX) && + skb_vlan_tag_present(skb)) { + struct emac_regs __iomem *p = dev->emacp; + + /* update the VLAN TCI */ + out_be32(&p->vtci, (u32)skb_vlan_tag_get(skb)); + + /* Insert VLAN tag */ + return EMAC_TX_CTRL_IVT; + } + return 0; +} + /* Tx lock BH */ static netdev_tx_t emac_start_xmit(struct sk_buff *skb, struct net_device *ndev) { @@ -1443,7 +1460,7 @@ static netdev_tx_t emac_start_xmit(struct sk_buff *skb, struct net_device *ndev) int slot; u16 ctrl = EMAC_TX_CTRL_GFCS | EMAC_TX_CTRL_GP | MAL_TX_CTRL_READY | - MAL_TX_CTRL_LAST | emac_tx_csum(dev, skb); + MAL_TX_CTRL_LAST | emac_tx_csum(dev, skb) | emac_tx_vlan(dev, skb); slot = dev->tx_slot++; if (dev->tx_slot == NUM_TX_BUFF) { @@ -1518,7 +1535,7 @@ emac_start_xmit_sg(struct sk_buff *skb, struct net_device *ndev) goto stop_queue; ctrl = EMAC_TX_CTRL_GFCS | EMAC_TX_CTRL_GP | MAL_TX_CTRL_READY | - emac_tx_csum(dev, skb); + emac_tx_csum(dev, skb) | emac_tx_vlan(dev, skb); slot = dev->tx_slot; /* skb data */ @@ -2891,7 +2908,8 @@ static int emac_init_config(struct emac_instance *dev) if (of_device_is_compatible(np, "ibm,emac-apm821xx")) { dev->features |= (EMAC_APM821XX_REQ_JUMBO_FRAME_SIZE | EMAC_FTR_APM821XX_NO_HALF_DUPLEX | - EMAC_FTR_460EX_PHY_CLK_FIX); + EMAC_FTR_460EX_PHY_CLK_FIX | + EMAC_FTR_HAS_VLAN_CTAG_TX); } } else if (of_device_is_compatible(np, "ibm,emac4")) { dev->features |= EMAC_FTR_EMAC4; @@ -3148,6 +3166,12 @@ static int emac_probe(struct platform_device *ofdev) if (dev->tah_dev) { ndev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG; + + if (emac_has_feature(dev, EMAC_FTR_HAS_VLAN_CTAG_TX)) { + ndev->vlan_features |= ndev->hw_features; + ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX; + } + ndev->features |= ndev->hw_features | NETIF_F_RXCSUM; } ndev->watchdog_timeo = 5 * HZ; diff --git a/drivers/net/ethernet/ibm/emac/core.h b/drivers/net/ethernet/ibm/emac/core.h index 84caa4a3fc52..8d84d439168c 100644 --- a/drivers/net/ethernet/ibm/emac/core.h +++ b/drivers/net/ethernet/ibm/emac/core.h @@ -334,6 +334,8 @@ struct emac_instance { * APM821xx does not support Half Duplex mode */ #define EMAC_FTR_APM821XX_NO_HALF_DUPLEX 0x00001000 +/* EMAC can insert 802.1Q tag */ +#define EMAC_FTR_HAS_VLAN_CTAG_TX 0x00002000 /* Right now, we don't quite handle the always/possible masks on the * most optimal way as we don't have a way to say something like @@ -363,7 +365,9 @@ enum { EMAC_FTR_460EX_PHY_CLK_FIX | EMAC_FTR_440EP_PHY_CLK_FIX | EMAC_APM821XX_REQ_JUMBO_FRAME_SIZE | - EMAC_FTR_APM821XX_NO_HALF_DUPLEX, + EMAC_FTR_APM821XX_NO_HALF_DUPLEX | + EMAC_FTR_HAS_VLAN_CTAG_TX | + 0, }; static inline int emac_has_feature(struct emac_instance *dev,