From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E96EBC33C9E for ; Sat, 11 Jan 2020 10:30:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDE3220882 for ; Sat, 11 Jan 2020 10:30:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738630; bh=Jm/fxkVXZhp2+e1gY20IrbKWMrHBxXM5ki08Yx+++is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YUk49bMUpXIF7Qepxa3Y2iZCRRgjnPsaHURmv1JgvlIf0c1MDYu+GXPCi6yYpjQzv 80FfcxcgnSEV243T8LufZkah1huw5jNMJbOYQrH67dgzVDw7no0ETTVlT1pTAcvTDY 570g/lR1b1xRZJywb2I3ipNrs7ITNeQ3OmfSU1L8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731048AbgAKKaa (ORCPT ); Sat, 11 Jan 2020 05:30:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:40952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729471AbgAKKa3 (ORCPT ); Sat, 11 Jan 2020 05:30:29 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EA27420842; Sat, 11 Jan 2020 10:30:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738629; bh=Jm/fxkVXZhp2+e1gY20IrbKWMrHBxXM5ki08Yx+++is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JxIiGedMPlIbjcxwceaoRVxQDGmcspzfgfs8NKdLyph73TdapaTNHDk7mm5F+/mS7 rHPvhuJ/Y+y5eoVQLnMwH9MxzgC8BKb7x7M6l1N07gEBT90nKKMfEAX1yT+3pBP2SS wIGkdt/hWdGiR8svZZ9rfgZ3krI0LZW0tMmdqO4I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jose Abreu , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 110/165] net: stmmac: selftests: Needs to check the number of Multicast regs Date: Sat, 11 Jan 2020 10:50:29 +0100 Message-Id: <20200111094931.339956443@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094921.347491861@linuxfoundation.org> References: <20200111094921.347491861@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jose Abreu [ Upstream commit 08c965430869ed423921bd9058ae59f75207feb6 ] When running the MC and UC filter tests we setup a multicast address that its expected to be blocked. If the number of available multicast registers is zero, driver will always pass the multicast packets which will fail the test. Check if available multicast addresses is enough before running the tests. Fixes: 091810dbded9 ("net: stmmac: Introduce selftests support") Signed-off-by: Jose Abreu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c index ac3f658105c0..a0513deab1a0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c @@ -624,6 +624,8 @@ static int stmmac_test_mcfilt(struct stmmac_priv *priv) return -EOPNOTSUPP; if (netdev_uc_count(priv->dev) >= priv->hw->unicast_filter_entries) return -EOPNOTSUPP; + if (netdev_mc_count(priv->dev) >= priv->hw->multicast_filter_bins) + return -EOPNOTSUPP; while (--tries) { /* We only need to check the mc_addr for collisions */ @@ -666,6 +668,8 @@ static int stmmac_test_ucfilt(struct stmmac_priv *priv) if (stmmac_filter_check(priv)) return -EOPNOTSUPP; + if (netdev_uc_count(priv->dev) >= priv->hw->unicast_filter_entries) + return -EOPNOTSUPP; if (netdev_mc_count(priv->dev) >= priv->hw->multicast_filter_bins) return -EOPNOTSUPP; -- 2.20.1