From patchwork Mon Aug 14 01:29:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 801067 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="ZyF9FpWi"; dkim=pass (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="EJ9XbxdK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xVykK2RTFz9sPt for ; Mon, 14 Aug 2017 11:31:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752342AbdHNBaz (ORCPT ); Sun, 13 Aug 2017 21:30:55 -0400 Received: from new2-smtp.messagingengine.com ([66.111.4.224]:42185 "EHLO new2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752245AbdHNBad (ORCPT ); Sun, 13 Aug 2017 21:30:33 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id C90A92E3E; Sun, 13 Aug 2017 21:30:32 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute2.internal (MEProxy); Sun, 13 Aug 2017 21:30:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=hdE5PM7QBp1MLw5ohR2v7nakMGVbl29QPM1LdsLct KY=; b=ZyF9FpWiek1rqZfOwT8O+VCzhmfrd068kEgugQ7d4UzV0A4XhAe60ukpF eubxJ79WvWia1fsG8MWlDnb5HodCiE6zqzAurnoq7bHO7p1iE0u2OpfjxwvIjhAT 7+KLeAUlf/WAatIritpAjHwX+178RBgpUweWjZOj65nQUMkJz2nd4uAXhINT2+rh 8mH0hfJ7xxwHfcJR/xCYis+eCLll5i6uL6X8W2WVtfB7YYRMh+JP1VD3P402Sxcs 5KUtV/gy9cm/RDmx+PUAVttr1/Q+A80qeNWEWG07tu92J70uNmz1AaMLjAfZGbam z2reFujOvkbMpZ0QO+0rq4QULeRjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=hdE5PM7QBp1MLw5ohR2v7nakMGVbl29QPM1LdsLct KY=; b=EJ9XbxdK0oQ3uLeha8brlZlnCmHjbywiqkf2JtJJAetQB3ylPqmwiSFzu 4o++ChNmxLc79ba4w6Kegdta1hagwsPCF71nb99u7ZpkPU9W/CgsRfJkjWnrMtM3 sEPD2lXX5Hw3CqdBAhYoSe8FTerkFAM0ogsOIPzudc484tRIxi33c9z7k7vGHTtC btznQ1J2fjTP58aoDbfaP5lxWUC7pNbzP0TGtEgnwerQhWXiybiYmWL4po/Vm+ml ElKS8M5VQVnY3gFw7biiYEVAmARI+LEBVZtivpj+roLESkhHGwE+qLvyWyAf9/7+ X+QbEJy87khlh/vGjpdqEdgy5Ezdw== X-ME-Sender: X-Sasl-enc: UDjQssIMD2kOv4cna8DQ5n2Wt2mB/KOscFSkhJ0Mf5lH 1502674231 Received: from v4.ozlabs.ibm.com (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id D71637FA67; Sun, 13 Aug 2017 21:30:29 -0400 (EDT) From: Samuel Mendoza-Jonas To: "David S . Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, OpenBMC Maillist Cc: Samuel Mendoza-Jonas , Joel Stanley , Benjamin Herrenschmidt , Gavin Shan , ratagupt@in.ibm.com Subject: [PATCH net-next v2 3/3] ftgmac100: Support NCSI VLAN filtering when available Date: Mon, 14 Aug 2017 11:29:52 +1000 Message-Id: <20170814012952.13740-4-sam@mendozajonas.com> X-Mailer: git-send-email 2.14.0 In-Reply-To: <20170814012952.13740-1-sam@mendozajonas.com> References: <20170814012952.13740-1-sam@mendozajonas.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Register the ndo_vlan_rx_{add,kill}_vid callbacks and set the NETIF_F_HW_VLAN_CTAG_FILTER if NCSI is available. This allows the VLAN core to notify the NCSI driver when changes occur so that the remote NCSI channel can be properly configured to filter on the set VLAN tags. Signed-off-by: Samuel Mendoza-Jonas Reviewed-by: Joel Stanley --- v2: Moved ftgmac100 change into same patch and reordered drivers/net/ethernet/faraday/ftgmac100.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 34dae51effd4..05fe7123d5ae 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1623,6 +1623,8 @@ static const struct net_device_ops ftgmac100_netdev_ops = { #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = ftgmac100_poll_controller, #endif + .ndo_vlan_rx_add_vid = ncsi_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = ncsi_vlan_rx_kill_vid, }; static int ftgmac100_setup_mdio(struct net_device *netdev) @@ -1837,6 +1839,9 @@ static int ftgmac100_probe(struct platform_device *pdev) NETIF_F_GRO | NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX; + if (priv->use_ncsi) + netdev->hw_features |= NETIF_F_HW_VLAN_CTAG_FILTER; + /* AST2400 doesn't have working HW checksum generation */ if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac"))) netdev->hw_features &= ~NETIF_F_HW_CSUM;