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 smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 52765C7EE2D for ; Mon, 5 Jun 2023 02:30:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0EA5F60BC3; Mon, 5 Jun 2023 02:30:04 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0EA5F60BC3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1685932204; bh=pgRfyvDAepOLs4I0GkqtD5IEdqyVKp8yy2a9wcm+kW4=; h=From:To:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=EYQxlPM0M96uu9PQQmsUovuJE0kAmjgEq7umcPFHwwfqsmOObRexAvx3JHv8vSJMl tGpj4iDBf0IaLPu0qse+dpavYZCqQCeZCBqj5VS4XqHWwlwVnmgQAB4b38z7toIL5I ZSpOu7v88mlE8ejm0bxf+7ZYb+ft9aF+PGg9q0CsdOyzBFI7a1MOaYY2kz1ArUv1Ru oqUelaPR9odH4Ki9mZ5dx8unhIZUPqa1wcEmlYaZlzt5X0ZewRvlU1wNnKHZwyIp1R QfO+30YMJpM73gz15skzQAf+3a7V3yaqGHv66A7rdAHCDAS6Z9HMjmaVxX7zVo8ivB J0wQn+4tpBV6g== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xKW1s0uO0dQY; Mon, 5 Jun 2023 02:30:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 9385B60BC6; Mon, 5 Jun 2023 02:30:02 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9385B60BC6 Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 61D981BF336 for ; Mon, 5 Jun 2023 02:29:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 45F7560BC3 for ; Mon, 5 Jun 2023 02:29:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 45F7560BC3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A2uYedMMqn4U for ; Mon, 5 Jun 2023 02:29:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5F0A360BEA Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by smtp3.osuosl.org (Postfix) with ESMTPS id 5F0A360BEA for ; Mon, 5 Jun 2023 02:29:40 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="358710415" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="358710415" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jun 2023 19:29:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10731"; a="1038604731" X-IronPort-AV: E=Sophos;i="6.00,217,1681196400"; d="scan'208";a="1038604731" Received: from dpdk-jf-ntb-v2.sh.intel.com ([10.67.119.16]) by fmsmga005.fm.intel.com with ESMTP; 04 Jun 2023 19:29:38 -0700 From: Junfeng Guo To: intel-wired-lan@lists.osuosl.org Date: Mon, 5 Jun 2023 10:29:11 +0800 Message-Id: <20230605022920.2361266-7-junfeng.guo@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230605022920.2361266-1-junfeng.guo@intel.com> References: <20230605022920.2361266-1-junfeng.guo@intel.com> MIME-Version: 1.0 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=1685932180; x=1717468180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1EsGo0iEuI3z9e5SaQAN0Pc46Yc8KinzAumTH1J3zBQ=; b=kmBRilHykr9XTEGMYx/eeV3UhC8wgsG74/fgAL0jwfKCshRYIRnMbp2x EXtyLieqQz+91+fUCiWFc8et6h+0eWFNeKxToUP0hfrdMsTe0pfDapztJ oqqh6KdSo9bmmhudR1Ak5HZsS8YGrF0zHF8sioz8S1ZdxLcv7e6SyABL9 XMW/lLuT9gmLBIMjM879liKg3Tk4453fcj58Rgphnz3IZ/jbBIOaTiH43 vMbcYhJZNlQ/rYVqjEQ7v9Fz2x2yiBGi3gGi5nfL/VzkC6/FAg+2nG38T 82hJyCz5er2Vuu2XZxYHqMUQDHh4LMPfaW4poBGoiJzh/b4iS0heqWdTz w==; X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=kmBRilHy Subject: [Intel-wired-lan] [PATCH iwl-next 06/15] ice: init ptype marker tcam table for parser 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: qi.z.zhang@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Parse DDP section ICE_SID_RXPARSER_MARKER_PTYPE into an array of ice_ptype_mk_tcam_item. Signed-off-by: Junfeng Guo --- drivers/net/ethernet/intel/ice/ice_parser.c | 11 ++++ drivers/net/ethernet/intel/ice/ice_parser.h | 3 ++ drivers/net/ethernet/intel/ice/ice_ptype_mk.c | 53 +++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_ptype_mk.h | 17 ++++++ 4 files changed, 84 insertions(+) create mode 100644 drivers/net/ethernet/intel/ice/ice_ptype_mk.c create mode 100644 drivers/net/ethernet/intel/ice/ice_ptype_mk.h diff --git a/drivers/net/ethernet/intel/ice/ice_parser.c b/drivers/net/ethernet/intel/ice/ice_parser.c index 6b457397bcfd..fabe51fa4ce6 100644 --- a/drivers/net/ethernet/intel/ice/ice_parser.c +++ b/drivers/net/ethernet/intel/ice/ice_parser.c @@ -12,6 +12,7 @@ #define ICE_SID_RXPARSER_NOMATCH_CAM_ENTRY_SIZE 12 #define ICE_SID_RXPARSER_NOMATCH_SPILL_ENTRY_SIZE 13 #define ICE_SID_RXPARSER_BOOST_TCAM_ENTRY_SIZE 88 +#define ICE_SID_RXPARSER_MARKER_TYPE_ENTRY_SIZE 24 #define ICE_SEC_LBL_DATA_OFFSET 2 #define ICE_SID_LBL_ENTRY_SIZE 66 @@ -71,6 +72,9 @@ void *ice_parser_sect_item_get(u32 sect_type, void *section, data_off = ICE_SEC_LBL_DATA_OFFSET; size = ICE_SID_LBL_ENTRY_SIZE; break; + case ICE_SID_RXPARSER_MARKER_PTYPE: + size = ICE_SID_RXPARSER_MARKER_TYPE_ENTRY_SIZE; + break; default: return NULL; } @@ -204,6 +208,12 @@ int ice_parser_create(struct ice_hw *hw, struct ice_parser **psr) goto err; } + p->ptype_mk_tcam_table = ice_ptype_mk_tcam_table_get(hw); + if (!p->ptype_mk_tcam_table) { + status = -EINVAL; + goto err; + } + *psr = p; return 0; err: @@ -225,6 +235,7 @@ void ice_parser_destroy(struct ice_parser *psr) devm_kfree(ice_hw_to_dev(psr->hw), psr->pg_nm_sp_cam_table); devm_kfree(ice_hw_to_dev(psr->hw), psr->bst_tcam_table); devm_kfree(ice_hw_to_dev(psr->hw), psr->bst_lbl_table); + devm_kfree(ice_hw_to_dev(psr->hw), psr->ptype_mk_tcam_table); devm_kfree(ice_hw_to_dev(psr->hw), psr); } diff --git a/drivers/net/ethernet/intel/ice/ice_parser.h b/drivers/net/ethernet/intel/ice/ice_parser.h index af73b19d09c1..1474a2337ad3 100644 --- a/drivers/net/ethernet/intel/ice/ice_parser.h +++ b/drivers/net/ethernet/intel/ice/ice_parser.h @@ -8,6 +8,7 @@ #include "ice_imem.h" #include "ice_pg_cam.h" #include "ice_bst_tcam.h" +#include "ice_ptype_mk.h" struct ice_parser { struct ice_hw *hw; /* pointer to the hardware structure */ @@ -28,6 +29,8 @@ struct ice_parser { struct ice_bst_tcam_item *bst_tcam_table; /* load data from section ICE_SID_LBL_RXPARSER_TMEM */ struct ice_lbl_item *bst_lbl_table; + /* load data from section ICE_SID_RXPARSER_MARKER_PTYPE */ + struct ice_ptype_mk_tcam_item *ptype_mk_tcam_table; }; int ice_parser_create(struct ice_hw *hw, struct ice_parser **psr); diff --git a/drivers/net/ethernet/intel/ice/ice_ptype_mk.c b/drivers/net/ethernet/intel/ice/ice_ptype_mk.c new file mode 100644 index 000000000000..36877f47a074 --- /dev/null +++ b/drivers/net/ethernet/intel/ice/ice_ptype_mk.c @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2018-2023 Intel Corporation */ + +#include "ice_common.h" +#include "ice_parser_util.h" + +#define ICE_PTYPE_MK_TCAM_TABLE_SIZE 1024 + +/** + * ice_ptype_mk_tcam_dump - dump an ptype marker tcam info_ + * @hw: pointer to the hardware structure + * @item: ptype marker tcam to dump + */ +void ice_ptype_mk_tcam_dump(struct ice_hw *hw, + struct ice_ptype_mk_tcam_item *item) +{ + int i; + + dev_info(ice_hw_to_dev(hw), "address = %d\n", item->address); + dev_info(ice_hw_to_dev(hw), "ptype = %d\n", item->ptype); + dev_info(ice_hw_to_dev(hw), "key :"); + for (i = 0; i < 10; i++) + dev_info(ice_hw_to_dev(hw), "%02x ", item->key[i]); + dev_info(ice_hw_to_dev(hw), "\n"); + dev_info(ice_hw_to_dev(hw), "key_inv:"); + for (i = 0; i < 10; i++) + dev_info(ice_hw_to_dev(hw), "%02x ", item->key_inv[i]); + dev_info(ice_hw_to_dev(hw), "\n"); +} + +static void _parse_ptype_mk_tcam_item(struct ice_hw *hw, u16 idx, void *item, + void *data, int size) +{ + ice_parse_item_dflt(hw, idx, item, data, size); + + if (hw->debug_mask & ICE_DBG_PARSER) + ice_ptype_mk_tcam_dump(hw, + (struct ice_ptype_mk_tcam_item *)item); +} + +/** + * ice_ptype_mk_tcam_table_get - create a ptype marker tcam table + * @hw: pointer to the hardware structure + */ +struct ice_ptype_mk_tcam_item *ice_ptype_mk_tcam_table_get(struct ice_hw *hw) +{ + return (struct ice_ptype_mk_tcam_item *) + ice_parser_create_table(hw, ICE_SID_RXPARSER_MARKER_PTYPE, + sizeof(struct ice_ptype_mk_tcam_item), + ICE_PTYPE_MK_TCAM_TABLE_SIZE, + ice_parser_sect_item_get, + _parse_ptype_mk_tcam_item, true); +} diff --git a/drivers/net/ethernet/intel/ice/ice_ptype_mk.h b/drivers/net/ethernet/intel/ice/ice_ptype_mk.h new file mode 100644 index 000000000000..b0a64a602641 --- /dev/null +++ b/drivers/net/ethernet/intel/ice/ice_ptype_mk.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2018-2023 Intel Corporation */ + +#ifndef _ICE_PTYPE_MK_H_ +#define _ICE_PTYPE_MK_H_ + +struct ice_ptype_mk_tcam_item { + u16 address; + u16 ptype; + u8 key[10]; + u8 key_inv[10]; +}; + +void ice_ptype_mk_tcam_dump(struct ice_hw *hw, + struct ice_ptype_mk_tcam_item *item); +struct ice_ptype_mk_tcam_item *ice_ptype_mk_tcam_table_get(struct ice_hw *hw); +#endif /* _ICE_PTYPE_MK_H_ */ -- 2.25.1 _______________________________________________ Intel-wired-lan mailing list Intel-wired-lan@osuosl.org https://lists.osuosl.org/mailman/listinfo/intel-wired-lan