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 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51036C00140 for ; Wed, 10 Aug 2022 14:22:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D2E3B408E0; Wed, 10 Aug 2022 14:22:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D2E3B408E0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1660141331; bh=WIvKydkZRkixMeEnRcGZIASLKVvklK2UNeBfmgrTT60=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=DylJpltNRG64cE1J/0XHUI5VtKBzPt6QySPmvFj2baJglLNGrQZTW8aoCwZZrjhhH 7CYxQMg6Hs8Z4n5QkOsNapCB3Em+CgF0OtX/4CwpC9qowMhmLsrj+FrYkV0/dm/xKJ pw6VFr0ZX8DWR/Zh/9MwcfUANLsAo6MhjcWamhVCDP9mCDy1lHGGnNncPfZQP/1do4 nkkJXTLC0bm4hRW4J4aU+3NmhfRaYkTwZSQaBe7vHLq2l1AqRkBkQNa8TE3Y5XYFN+ rjuMOXbHvEeDnIaBxSuqCwWp7Hj1ukwkcAmsDndAOIOAkHER4+sIRFp/W20jP+c415 J0GuMMklQc4Jg== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J7IP62kjLuA6; Wed, 10 Aug 2022 14:22:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 962E3409F2; Wed, 10 Aug 2022 14:22:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 962E3409F2 Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 88CF01BF488 for ; Wed, 10 Aug 2022 14:22:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 6418740C13 for ; Wed, 10 Aug 2022 14:22:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 6418740C13 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mOhO24ebtQDm for ; Wed, 10 Aug 2022 14:22:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 91B6F40C0D Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by smtp2.osuosl.org (Postfix) with ESMTPS id 91B6F40C0D for ; Wed, 10 Aug 2022 14:22:04 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6400,9594,10435"; a="291882959" X-IronPort-AV: E=Sophos;i="5.93,227,1654585200"; d="scan'208";a="291882959" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2022 07:22:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,227,1654585200"; d="scan'208";a="638121309" Received: from gsiwik.igk.intel.com ([10.102.18.50]) by orsmga001.jf.intel.com with ESMTP; 10 Aug 2022 07:22:03 -0700 From: Grzegorz Siwik To: intel-wired-lan@lists.osuosl.org Date: Wed, 10 Aug 2022 16:21:52 +0200 Message-Id: <1660141315-216111-2-git-send-email-grzegorz.siwik@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1660141315-216111-1-git-send-email-grzegorz.siwik@intel.com> References: <1660141315-216111-1-git-send-email-grzegorz.siwik@intel.com> X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660141324; x=1691677324; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=M1hiGQnnNcMWVtdGQJXyDu5WROqrzySjL6LMV9/AcYw=; b=E7fUyQKGa5VC9Y6hk+mB2XSP3hQwbEYlGPS2WotkbMUKASr1SZGf5ivr aLnWOywvcuxzeiLM4SnjJ45LuRl0QE2ZGwwK/7w63r2bBkdJD6Edh0a+m kExcoE0xE6MrEfOi3f/QB7nleYPq/n3vCMXduJOG9TAGMCHwiAs44BS8Y Y2gFsSsWbylQ8sB4511SDfJ+KyqUtStdKczNB1gfBFJUf/wyaVnv9oO2Y vb/tv01D2/UXwIt1vU2ETEMjOFS0GmQPYhz8i7YkhDtS1dt788O3NnbZA OsBH3ijQIbSg2q2Vh2VLKf2G1zWSBB2hIUhkTcPEVm9HXkOJfOwrL1zKO w==; X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=E7fUyQKG Subject: [Intel-wired-lan] [PATCH net v3 1/4] ice: Fix double VLAN error when entering promisc mode X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Grzegorz Siwik MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Avoid enabling or disabling vlan 0 when trying to set promiscuous vlan mode if double vlan mode is enabled. This fix is needed because the driver tries to add the vlan 0 filter twice (once for inner and once for outer) when double VLAN mode is enabled. The filter program is rejected by the firmware when double vlan is enabled, because the promiscuous filter only needs to be set once. This issue was missed in the initial implementation of double vlan mode. Fixes: 5eda8afd6bcc ("ice: Add support for PF/VF promiscuous mode") Signed-off-by: Grzegorz Siwik Link: https://lore.kernel.org/all/CAK8fFZ7m-KR57M_rYX6xZN39K89O=LGooYkKsu6HKt0Bs+x6xQ@mail.gmail.com/ --- v2: Fixed error message when setting same promiscuous mode --- v3: Fixed style issues, changed to return directly. --- drivers/net/ethernet/intel/ice/ice_switch.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c index 8d8f3ee..8a60052 100644 --- a/drivers/net/ethernet/intel/ice/ice_switch.c +++ b/drivers/net/ethernet/intel/ice/ice_switch.c @@ -4414,6 +4414,13 @@ static u8 ice_determine_promisc_mask(struct ice_fltr_info *fi) goto free_fltr_list; list_for_each_entry(list_itr, &vsi_list_head, list_entry) { + /* Avoid enabling or disabling vlan zero twice when in double + * vlan mode + */ + if (ice_is_dvm_ena(hw) && + list_itr->fltr_info.l_data.vlan.tpid == 0) + continue; + vlan_id = list_itr->fltr_info.l_data.vlan.vlan_id; if (rm_vlan_promisc) status = ice_clear_vsi_promisc(hw, vsi_handle, -- 1.8.3.1 _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan