From patchwork Sun Jan 21 13:52:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 864066 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=gmail.com header.i=@gmail.com header.b="jE5UYzWM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zPbc86y4zz9t3h for ; Mon, 22 Jan 2018 00:52:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751301AbeAUNws (ORCPT ); Sun, 21 Jan 2018 08:52:48 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:38244 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751264AbeAUNwp (ORCPT ); Sun, 21 Jan 2018 08:52:45 -0500 Received: by mail-wm0-f68.google.com with SMTP id 141so11832429wme.3 for ; Sun, 21 Jan 2018 05:52:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=h4GldpIK40PA7YQfL4tN55W3PM7BFMP9yIpaVnLYv4o=; b=jE5UYzWM+8yMWJuxK4Ncu8pVp4o9M+g+na5Ie9igErMt0e/79usi+IgrO3AGaJ1KJf LnFwIwYt24jrIrwNPGi8dz5m7/wnOZcKN/lbRcRKbcF7DfS/sBLeiTcnX0/FZIpTKTx5 04Qob9j0HT+BA6eipqeV6CPRoJgMO6unhiEJEAdclE/8WdUO2NLML8Ef/YUbEG8tj5x5 aUq0jU6BEoNKTJ+NVNUbLBo50o+ZsYo5T1Qy7c0TMTO9vTSDMvstPf/eIx3t8cvqk25b ucXVl7Fawm6yamMEoMJO3wha0Glqvxg1lZmMUxpuYG+1QgQ0Rp06VVy0K7br0B8uosWL 0xUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=h4GldpIK40PA7YQfL4tN55W3PM7BFMP9yIpaVnLYv4o=; b=QW/wT/AwLyKOWmCqAN4XA3FcYfV/LpTx/AqLTY8NYsTY0CbN/SvpyLd96+C8Tk7aWT CFjrxl5/c/ZQPodmB1lly3Lrkc86qrjPz30BOf50QvO4ZGkACUPsdon+xbNzaz8s2Omn m8yTf0EgHnqYhpCCxkM+BNsy0zdI8jdsHoVuF3PnYKQ64eFzCpOZTKwWZgho/HdhifK1 B+Hwe20PIRGQrYR/cWCyKerWBipghT3Qe+sMMXldq5jXHIO+cKFqqX5wXLUsdociTTvw mFWhHjAumuI2madplqkmqC0+VzXyX6HwF485xZnyXyPKiIz2SB2p5oz6YGdxuSqvhbEv Zqog== X-Gm-Message-State: AKwxytdc1XuhvnfreMbhs1FVhYlBELM7/aAo4hcMW1rIR+BdjSaymKRr aDrRoub+x0+NIJ/rAjc6S4Il2g== X-Google-Smtp-Source: AH8x224vNSBe/9qas+vCZ/x4pfzS3gfhrQNF03ITmWpNOL92XB1e5s9+3BckZq4rchF4tLhYPgsycw== X-Received: by 10.28.132.203 with SMTP id g194mr3287194wmd.69.1516542764130; Sun, 21 Jan 2018 05:52:44 -0800 (PST) Received: from ?IPv6:2003:ea:8bcb:5a00:e062:fc24:54e9:735? (p200300EA8BCB5A00E062FC2454E90735.dip0.t-ipconnect.de. [2003:ea:8bcb:5a00:e062:fc24:54e9:735]) by smtp.googlemail.com with ESMTPSA id 188sm7722812wmg.29.2018.01.21.05.52.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Jan 2018 05:52:43 -0800 (PST) To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" From: Heiner Kallweit Subject: [PATCH] r8169: improve multicast hash filter handling Message-ID: Date: Sun, 21 Jan 2018 14:52:37 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The multicast hash filter is a 64 bit value and the code can be simplified by using a u64 variable. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 272c5962e..9afe7cd4d 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -5572,7 +5572,7 @@ static void rtl_set_rx_mode(struct net_device *dev) { struct rtl8169_private *tp = netdev_priv(dev); void __iomem *ioaddr = tp->mmio_addr; - u32 mc_filter[2]; /* Multicast hash filter */ + u64 mc_filter; /* Multicast hash filter */ int rx_mode; u32 tmp = 0; @@ -5582,20 +5582,20 @@ static void rtl_set_rx_mode(struct net_device *dev) rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys | AcceptAllPhys; - mc_filter[1] = mc_filter[0] = 0xffffffff; + mc_filter = ~0ULL; } else if ((netdev_mc_count(dev) > multicast_filter_limit) || (dev->flags & IFF_ALLMULTI)) { /* Too many to filter perfectly -- accept all multicasts. */ rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; - mc_filter[1] = mc_filter[0] = 0xffffffff; + mc_filter = ~0ULL; } else { struct netdev_hw_addr *ha; rx_mode = AcceptBroadcast | AcceptMyPhys; - mc_filter[1] = mc_filter[0] = 0; + mc_filter = 0ULL; netdev_for_each_mc_addr(ha, dev) { int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; - mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); + mc_filter |= BIT_ULL(bit_nr); rx_mode |= AcceptMulticast; } } @@ -5605,18 +5605,14 @@ static void rtl_set_rx_mode(struct net_device *dev) tmp = (RTL_R32(RxConfig) & ~RX_CONFIG_ACCEPT_MASK) | rx_mode; - if (tp->mac_version > RTL_GIGA_MAC_VER_06) { - u32 data = mc_filter[0]; - - mc_filter[0] = swab32(mc_filter[1]); - mc_filter[1] = swab32(data); - } + if (tp->mac_version > RTL_GIGA_MAC_VER_06) + swab64s(&mc_filter); if (tp->mac_version == RTL_GIGA_MAC_VER_35) - mc_filter[1] = mc_filter[0] = 0xffffffff; + mc_filter = ~0ULL; - RTL_W32(MAR0 + 4, mc_filter[1]); - RTL_W32(MAR0 + 0, mc_filter[0]); + RTL_W32(MAR0 + 4, mc_filter >> 32); + RTL_W32(MAR0 + 0, mc_filter & GENMASK_ULL(31, 0)); RTL_W32(RxConfig, tmp); }