From nobody Tue Feb 10 19:00:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1684810172; cv=none; d=zohomail.com; s=zohoarc; b=DXH0PQ2LMgQt3f6/oog5DF/EhFs35V0AnvQ9I/PrzJV/p/IwjfVNa5g7Q9Bj7D7aNavRfH3I3UA1/JsMluAbIvL8/y0LE6DO0KY0m6NVEul8pFH8wG1mzokQzV+1ynrFIERIfWEE1JYkCKUKzaAm12ZrkKPvxzb+RufsFGXdcOc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684810172; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=BTv1GiIRLakqBfFZ6OFSfrHXGDO4IV2XgJKbVH0oaK0=; b=IKKZyaX0EHxi6HpejdnA1T+gnxH8VygZ3uXb/3yEiUcgPcYUEkIF4R4K0biNBccsa0fiJUI/eTP20R/UU1djYURVlfBlG6PcFxfnovZ4nauvehszMAQgnRAzR2F1DjBsOMseKJNqJKdEH2Fr3mfiC/4FfjkBBFrfnftlVwl7PX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684810172727270.59218099666737; Mon, 22 May 2023 19:49:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1I27-0007HJ-6B; Mon, 22 May 2023 22:45:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1I1j-0005w0-CC for qemu-devel@nongnu.org; Mon, 22 May 2023 22:45:33 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1I1V-0004Qk-9B for qemu-devel@nongnu.org; Mon, 22 May 2023 22:45:31 -0400 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-25394160fd3so2445210a91.3 for ; Mon, 22 May 2023 19:45:15 -0700 (PDT) Received: from alarm.. ([157.82.204.253]) by smtp.gmail.com with ESMTPSA id o10-20020a17090aac0a00b002467717fa60sm4769847pjq.16.2023.05.22.19.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 19:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1684809914; x=1687401914; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BTv1GiIRLakqBfFZ6OFSfrHXGDO4IV2XgJKbVH0oaK0=; b=yAVITpfH50qoER8TR9fULhnQWQXDeg+LaNzAHHckyXghylpHDLQsxS4Wlf+7yWkm+f EASApK6WG+d7Mw+gdkausGjIJoiFWI+OP/ew7kAVbnMBrYrNhwFkXDJmxpQWW7EGGQqG Ka3hpziUF1m2fvXAtg7WFe940RFKgk9anhQTnbhb5Dn2QZ8ggrEueqDRMBCtLG6mZ4C8 /V1ciJa7sZMhrhc4tEBs13i5lS0y03jcmhCAq5sKnRkMl77O8XTKa8r14kMVWNMBug8T ifVPci7qD8INt1NXkUkf2z03oFKLzkdo03WERxDWbsyjVL/4Hd7M+xQshTCXAYvwg6mi NSPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684809914; x=1687401914; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BTv1GiIRLakqBfFZ6OFSfrHXGDO4IV2XgJKbVH0oaK0=; b=HuNuVGoVGYzRQnClL5bgpF0Q9E/Rhxqe7mN4ejq7zlvzMAp1ZqcnlBpTXCBTqD3njt kJzdckFySQfrmZpNzIYfBagydjmQvU0fSc+9givYZCWdBkl4sOz08nqrsZ0AcJYfH6AH 1KJB13kGS8lifYWmwCNiLrpL8d0v9/z0oPkjly1QpCUrFzLkROF0MAtOJMfPEQwga7+f LqS5pfx+M0ygkLPMsUhalHJY1oRhM3cVzqSAzsHBoQp4bJfeBwQO3W+N4kqHCPoF4h9t bjREWJKFlMdScCh3ACKSyyASkw3uZvPa/KH8eCCyWTPeblmNM16rYv4o7va1xTfxmkxg lgmQ== X-Gm-Message-State: AC+VfDxS2TlPoS50PaRjchulw2O9kKDQNKvCijVTRWoeMj89E4+a5agk HW1c80rQ9PwArOsQXzk3mHzxvA== X-Google-Smtp-Source: ACHHUZ5eJfB5ATOy5PEJ7V/o03vS5F0AfY+Hj5T/Qfy/vEkSkoXx4ejJpTdl9YxXuR2vsh8U2wsOAQ== X-Received: by 2002:a17:90b:124e:b0:24d:ebf8:b228 with SMTP id gx14-20020a17090b124e00b0024debf8b228mr12221979pjb.19.1684809914734; Mon, 22 May 2023 19:45:14 -0700 (PDT) From: Akihiko Odaki To: Cc: Sriram Yagnaraman , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Laurent Vivier , Paolo Bonzini , qemu-devel@nongnu.org, Tomasz Dzieciol , Akihiko Odaki Subject: [PATCH v5 24/48] igb: Add more definitions for Tx descriptor Date: Tue, 23 May 2023 11:43:15 +0900 Message-Id: <20230523024339.50875-25-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230523024339.50875-1-akihiko.odaki@daynix.com> References: <20230523024339.50875-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::102d; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20221208.gappssmtp.com) X-ZM-MESSAGEID: 1684810173333100013 Content-Type: text/plain; charset="utf-8" Signed-off-by: Akihiko Odaki Reviewed-by: Sriram Yagnaraman --- hw/net/igb_regs.h | 32 +++++++++++++++++++++++++++----- hw/net/igb_core.c | 4 ++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/hw/net/igb_regs.h b/hw/net/igb_regs.h index 21ee9a3b2d..eb995d8b2e 100644 --- a/hw/net/igb_regs.h +++ b/hw/net/igb_regs.h @@ -42,11 +42,6 @@ union e1000_adv_tx_desc { } wb; }; =20 -#define E1000_ADVTXD_DTYP_CTXT 0x00200000 /* Advanced Context Descriptor = */ -#define E1000_ADVTXD_DTYP_DATA 0x00300000 /* Advanced Data Descriptor */ -#define E1000_ADVTXD_DCMD_DEXT 0x20000000 /* Descriptor Extension (1=3DAd= v) */ -#define E1000_ADVTXD_DCMD_TSE 0x80000000 /* TCP/UDP Segmentation Enable = */ - #define E1000_ADVTXD_POTS_IXSM 0x00000100 /* Insert TCP/UDP Checksum */ #define E1000_ADVTXD_POTS_TXSM 0x00000200 /* Insert TCP/UDP Checksum */ =20 @@ -151,6 +146,10 @@ union e1000_adv_rx_desc { #define IGB_82576_VF_DEV_ID 0x10CA #define IGB_I350_VF_DEV_ID 0x1520 =20 +/* VLAN info */ +#define IGB_TX_FLAGS_VLAN_MASK 0xffff0000 +#define IGB_TX_FLAGS_VLAN_SHIFT 16 + /* from igb/e1000_82575.h */ =20 #define E1000_MRQC_ENABLE_RSS_MQ 0x00000002 @@ -160,6 +159,29 @@ union e1000_adv_rx_desc { #define E1000_MRQC_RSS_FIELD_IPV6_UDP 0x00800000 #define E1000_MRQC_RSS_FIELD_IPV6_UDP_EX 0x01000000 =20 +/* Adv Transmit Descriptor Config Masks */ +#define E1000_ADVTXD_MAC_TSTAMP 0x00080000 /* IEEE1588 Timestamp packet = */ +#define E1000_ADVTXD_DTYP_CTXT 0x00200000 /* Advanced Context Descripto= r */ +#define E1000_ADVTXD_DTYP_DATA 0x00300000 /* Advanced Data Descriptor */ +#define E1000_ADVTXD_DCMD_EOP 0x01000000 /* End of Packet */ +#define E1000_ADVTXD_DCMD_IFCS 0x02000000 /* Insert FCS (Ethernet CRC) = */ +#define E1000_ADVTXD_DCMD_RS 0x08000000 /* Report Status */ +#define E1000_ADVTXD_DCMD_DEXT 0x20000000 /* Descriptor extension (1=3D= Adv) */ +#define E1000_ADVTXD_DCMD_VLE 0x40000000 /* VLAN pkt enable */ +#define E1000_ADVTXD_DCMD_TSE 0x80000000 /* TCP Seg enable */ +#define E1000_ADVTXD_PAYLEN_SHIFT 14 /* Adv desc PAYLEN shift */ + +#define E1000_ADVTXD_MACLEN_SHIFT 9 /* Adv ctxt desc mac len shift */ +#define E1000_ADVTXD_TUCMD_L4T_UDP 0x00000000 /* L4 Packet TYPE of UDP */ +#define E1000_ADVTXD_TUCMD_IPV4 0x00000400 /* IP Packet Type: 1=3DIPv4= */ +#define E1000_ADVTXD_TUCMD_L4T_TCP 0x00000800 /* L4 Packet TYPE of TCP */ +#define E1000_ADVTXD_TUCMD_L4T_SCTP 0x00001000 /* L4 packet TYPE of SCTP */ +/* IPSec Encrypt Enable for ESP */ +#define E1000_ADVTXD_L4LEN_SHIFT 8 /* Adv ctxt L4LEN shift */ +#define E1000_ADVTXD_MSS_SHIFT 16 /* Adv ctxt MSS shift */ +/* Adv ctxt IPSec SA IDX mask */ +/* Adv ctxt IPSec ESP len mask */ + /* Additional Transmit Descriptor Control definitions */ #define E1000_TXDCTL_QUEUE_ENABLE 0x02000000 /* Enable specific Tx Queue = */ =20 diff --git a/hw/net/igb_core.c b/hw/net/igb_core.c index 162ef26789..56a53872cf 100644 --- a/hw/net/igb_core.c +++ b/hw/net/igb_core.c @@ -418,7 +418,7 @@ igb_setup_tx_offloads(IGBCore *core, struct igb_tx *tx) { if (tx->first_cmd_type_len & E1000_ADVTXD_DCMD_TSE) { uint32_t idx =3D (tx->first_olinfo_status >> 4) & 1; - uint32_t mss =3D tx->ctx[idx].mss_l4len_idx >> 16; + uint32_t mss =3D tx->ctx[idx].mss_l4len_idx >> E1000_ADVTXD_MSS_SH= IFT; if (!net_tx_pkt_build_vheader(tx->tx_pkt, true, true, mss)) { return false; } @@ -612,7 +612,7 @@ igb_process_tx_desc(IGBCore *core, if (!tx->skip_cp && net_tx_pkt_parse(tx->tx_pkt)) { idx =3D (tx->first_olinfo_status >> 4) & 1; igb_tx_insert_vlan(core, queue_index, tx, - tx->ctx[idx].vlan_macip_lens >> 16, + tx->ctx[idx].vlan_macip_lens >> IGB_TX_FLAGS_VLAN_SHIFT, !!(tx->first_cmd_type_len & E1000_TXD_CMD_VLE)); =20 if (igb_tx_pkt_send(core, tx, queue_index)) { --=20 2.40.1