From patchwork Mon May 15 06:03:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zulkifli, Muhammad Husaini" X-Patchwork-Id: 1781101 X-Patchwork-Delegate: anthony.l.nguyen@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=osuosl.org header.i=@osuosl.org header.a=rsa-sha256 header.s=default header.b=gJHiq28n; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QKTP96D6Mz20db for ; Mon, 15 May 2023 16:05:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2E8F38208E; Mon, 15 May 2023 06:05:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2E8F38208E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1684130713; bh=+vloiAHWmgiwGnV4JvvqbZDV4crpX354sTwprWTBBLA=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Cc:From; b=gJHiq28nwUGr8jOJB86spk4ycIYy4xLctKJoqWdBfx9xSBo1ffQnJfJAHewDJ8oKY mYUP9NMzhKaAtnGB+TZgbyp+CAx4U2z7empXnEWp95Uf4Tw4TttuXetkB4hyy4GO74 FpkyQqxkZcRhCtxyQbFecLAriksVmUPQtKQBRuc9SCitjXigojyDBHQ+yJ810MqtZ2 ui4aqGfhhumGv9DQQP8euXQcIk4u+ONBbiQ5PcuIJwHW7CqWpm79Bk8UmZq5MvnVzq DCP9xyGig+TSDzjO50a41OGnGsutexDfE/V5UXK3dKn6bqNdwFKXlyTkY2orTaDMmy nMMgZtz/D2Fjg== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 22xVS33FR32C; Mon, 15 May 2023 06:05:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 373EC8209C; Mon, 15 May 2023 06:05:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 373EC8209C X-Original-To: intel-wired-lan@osuosl.org Delivered-To: intel-wired-lan@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C8AF71BF599 for ; Mon, 15 May 2023 06:05:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 98EE58209C for ; Mon, 15 May 2023 06:05:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 98EE58209C X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8-WgwGB1QUPn for ; Mon, 15 May 2023 06:05:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 30FFF8208E Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by smtp1.osuosl.org (Postfix) with ESMTPS id 30FFF8208E for ; Mon, 15 May 2023 06:05:09 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6600,9927,10710"; a="351152964" X-IronPort-AV: E=Sophos;i="5.99,275,1677571200"; d="scan'208";a="351152964" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2023 23:05:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10710"; a="812817440" X-IronPort-AV: E=Sophos;i="5.99,275,1677571200"; d="scan'208";a="812817440" Received: from zulkifl3-ilbpg0.png.intel.com ([10.88.229.82]) by fmsmga002.fm.intel.com with ESMTP; 14 May 2023 23:05:06 -0700 From: Muhammad Husaini Zulkifli To: intel-wired-lan@osuosl.org Date: Mon, 15 May 2023 14:03:36 +0800 Message-Id: <20230515060336.16272-1-muhammad.husaini.zulkifli@intel.com> X-Mailer: git-send-email 2.17.1 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=1684130709; x=1715666709; h=from:to:cc:subject:date:message-id; bh=kRpNXhgQL4xzhwajVHTjdOwoxcbHOH3CV4Y0g7my0GA=; b=QBHUkdSMRf/ZVKWwtgfZMcm/61eR0VlVRwMmKCDVh9Sl9teHigRbtNnF A09yCIHxa3wUwPiDn0Vv8up1zBaSpYtxCGhsrEvXaq+aMW+9aZRgyZ5gM MeK55l0BjUP+VWSoL4azLHj4siPbB9Zku78eO9xWS47SqyasdS31mJVAL LUZsNLUqksH7Z5NXMNKe74K0UvcSVfrXwW2D8P4BRRgyYZT3WhFxnWisx 4jxMIzjFgc919KcTawt+J1hMYV5FzmwY7twLKfwaPaZ/UZ1DoRyU6AEa8 nyrVal7NWkKNZtKEclJeQBJfkO7cWuRlGfkKkL5NvhmF/ocqz61y6cJ/7 w==; X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=QBHUkdSM Subject: [Intel-wired-lan] [PATCH iwl-net v1] igc: Add condition for qbv_config_change_errors counter 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: anthony.l.nguyen@intel.com MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Add condition to increase the qbv counter during taprio qbv configuration only. There might be a case when TC already been setup then user configure the ETF/CBS qdisc and this counter will increase if no condition above. Fixes: ae4fe4698300 ("igc: Add qbv_config_change_errors counter") Signed-off-by: Muhammad Husaini Zulkifli Tested-by: Naama Meir --- drivers/net/ethernet/intel/igc/igc.h | 1 + drivers/net/ethernet/intel/igc/igc_main.c | 2 ++ drivers/net/ethernet/intel/igc/igc_tsn.c | 1 + 3 files changed, 4 insertions(+) diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h index be1a1e67c39b7..0bbd108f28939 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -183,6 +183,7 @@ struct igc_adapter { u32 max_frame_size; u32 min_frame_size; + int tc_setup_type; ktime_t base_time; ktime_t cycle_time; bool qbv_enable; diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 8e5b75b446fd6..d1e8a5eee811b 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -6278,6 +6278,8 @@ static int igc_setup_tc(struct net_device *dev, enum tc_setup_type type, { struct igc_adapter *adapter = netdev_priv(dev); + adapter->tc_setup_type = type; + switch (type) { case TC_QUERY_CAPS: return igc_tc_query_caps(adapter, type_data); diff --git a/drivers/net/ethernet/intel/igc/igc_tsn.c b/drivers/net/ethernet/intel/igc/igc_tsn.c index 94a2b0dfb54d4..6b299b83e7ef2 100644 --- a/drivers/net/ethernet/intel/igc/igc_tsn.c +++ b/drivers/net/ethernet/intel/igc/igc_tsn.c @@ -249,6 +249,7 @@ static int igc_tsn_enable_offload(struct igc_adapter *adapter) * Gate Control List (GCL) is running. */ if ((rd32(IGC_BASET_H) || rd32(IGC_BASET_L)) && + (adapter->tc_setup_type == TC_SETUP_QDISC_TAPRIO) && tsn_mode_reconfig) adapter->qbv_config_change_errors++; } else {