From nobody Sat Nov 15 23:36:28 2025 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1745935867; cv=none; d=zohomail.com; s=zohoarc; b=iZU3IFdXaDwQM+Qe5uvn2Zvca1A0g0rqCdDcozYIJVgqDUNLnfAhIVCN3SPpN8voNzAccP+Q/XFzG1MeGhfT+Bo2s0H5Zy7xbhB+nili+y5Rw24bjQ9xM/mHAdqwEyPWFUuSrda4aTuzThIswBWDQbQYIEoNVFKVcMNc12uDkUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745935867; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=gBjP3V5GEqT5ODtEKsnwnA57nPfIjJqPWFncRmSmb1b/7KNfAdpWK+foD0NM1/7JdvKPVO9Rmz0YABgnyXO5QME7elrgB1W4Vy+pnn4hX6ixijZgyWfOUew/NKS7KUX2EBUnnfKbjUcudkFWQhsxGE2S5dhtxWYEr1xWdCY4DgQ= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745935867853372.6899356678895; Tue, 29 Apr 2025 07:11:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9ldu-00018V-Vv; Tue, 29 Apr 2025 10:09:03 -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 1u9ldt-00011g-Kw for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:01 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9ldr-0006JU-9r for qemu-devel@nongnu.org; Tue, 29 Apr 2025 10:09:01 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cfe574976so42268365e9.1 for ; Tue, 29 Apr 2025 07:08:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4409d2ac26dsm191298615e9.21.2025.04.29.07.08.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 07:08:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745935737; x=1746540537; darn=nongnu.org; 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=KykhTJl4Xws9JBBG3bXZJk1mi0PGCMGBmyA/uNraDXH+B5TLulq+XEWv1W43Usr5V7 q1eCfPhTZqFeykIi1jtpNP/bNNBJi6q2/bWFL9Q60v6GPfR2rTlgSq7VnoMaWi87pw6R Epe9sRDPS6h4qAEvFYXmLToolL3IoAYd4kTSdKM26AObU7syEaLAwjrEm4vrDepYvuSn 749kNRhU/9U/JY1WivZiTo4WBNIxCct/TZTSv/Dq0mR6ixYXxhB2O0dIidHhmAuo6oaX tTYrrtb89sk7+YMk6m2gNCF3mpPaqkjMHBHkLKQAj3WCl1cA8jm5P/nKECYKTE+5B9u8 Yhdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745935737; x=1746540537; 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=D7M6Tutx3exMAOrtlWY2rOEtIIwc+eHcrkvSbvRNBy0=; b=WUDP1ZhnC1edzWAEhm5faCSndLUsV65jW5HCifBSoWWtbsHLAUPPqoEYAHkmM+DX5s 2cuPFVw2yb+BcFPF6FG3WR8UF6J/N1Ke/4f7jYWZdBBfcIlhqwq9m0UjtXFW8FPxItre dthYFdeHOqHJFdWu2KEoIbNk1nsyklt8u5Nf2mNRRy8MzN305i08Ei5tzam2ogaCpnv4 S9yj0IiZM2bdSIZacgFQzz3rGqDxVGMFOz5nRm90GPuycyBu7Nhk9igP1ZfKk9hxLEB+ wNHwqlZ2jMBkI6oKGr+++HEjb3FAyDa00Wohb/gY10FlL0xUJNyr4w6mlH3F+Rd4PPs8 L9/w== X-Gm-Message-State: AOJu0Yy+nV0+TfB+DOI5APQwdaYoOLEOImEDZPSWp3j/498cg711q6Dg nkxMuNi24w3pQtGK5qWCn5WIc0eJDL0tw6s8deJ1gbWaIP12x4WcnZAWb6TjeNRsK1bxRCiBxOs R X-Gm-Gg: ASbGncsYsZmqP+GV7RiJBqEBVLpZrl5cAvlRi8ePd0ujFXBfa2dYNFYhXTBC9vPMzez FkzR1k2ysqrQi36fdcdc6x4tCfSpg810Dcki4Rmv/t2f7VFuZoFgDLskVaUKAt9Zea8T6dMT8A1 1ZAkrqJiuZ0AwZs6z0dcj5C3l6Idrfs0+sqEti67uiQqyu8PdJhKG6JKMPXq8YbGOD7fwvLKm1j lXwfbDC+YVczSBaJMMIgXtNubZJxZtGXfTCAyWEouU+sqa9rvtB3C0U31+jqYajjnBhJ/AGOb6i Cjd+bAEpkvu5JA48ALT16Ki3kqPdXUE43ASjtIu+HABU2Gbdd7/uLOsY32qqe3kMQLXOYeisDFP lEkNzYxkfDnXEK7jKv8Cw X-Google-Smtp-Source: AGHT+IFBdvLXaSfzgUODTJlwELKJq3jC658a3PXh4+8SDRkVU7raGgrxMfB7xaEKlZLs4jYTsI4TQw== X-Received: by 2002:a05:600c:3ca5:b0:43b:c0fa:f9dd with SMTP id 5b1f17b1804b1-441ac918133mr25754115e9.25.1745935737168; Tue, 29 Apr 2025 07:08:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Hanna Reitz , Fam Zheng , Paolo Bonzini , Gerd Hoffmann , qemu-block@nongnu.org, John Snow , "Michael S. Tsirkin" , Zhao Liu , Eduardo Habkost , Jason Wang , Kevin Wolf , Yanan Wang , Marcel Apfelbaum , Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 06/19] hw/net/e1000: Remove unused E1000_FLAG_MAC flag Date: Tue, 29 Apr 2025 16:08:12 +0200 Message-ID: <20250429140825.25964-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429140825.25964-1-philmd@linaro.org> References: <20250429140825.25964-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @linaro.org) X-ZM-MESSAGEID: 1745935868802019000 E1000_FLAG_MAC was only used by the hw_compat_2_4[] array, via the 'extra_mac_registers=3Doff' property. We removed all machines using that array, lets remove all the code around E1000_FLAG_MAC, including the MAC_ACCESS_FLAG_NEEDED enum, similarly to commit fa4ec9ffda7 ("e1000: remove old compatibility code"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/net/e1000.c | 72 ++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index cba4999e6d0..e0310aef872 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -127,10 +127,8 @@ struct E1000State_st { QEMUTimer *flush_queue_timer; =20 /* Compatibility flags for migration to/from qemu 1.3.0 and older */ -#define E1000_FLAG_MAC_BIT 2 #define E1000_FLAG_TSO_BIT 3 #define E1000_FLAG_VET_BIT 4 -#define E1000_FLAG_MAC (1 << E1000_FLAG_MAC_BIT) #define E1000_FLAG_TSO (1 << E1000_FLAG_TSO_BIT) #define E1000_FLAG_VET (1 << E1000_FLAG_VET_BIT) =20 @@ -1210,54 +1208,24 @@ static const writeops macreg_writeops[] =3D { =20 enum { NWRITEOPS =3D ARRAY_SIZE(macreg_writeops) }; =20 -enum { MAC_ACCESS_PARTIAL =3D 1, MAC_ACCESS_FLAG_NEEDED =3D 2 }; +enum { MAC_ACCESS_PARTIAL =3D 1 }; =20 -#define markflag(x) ((E1000_FLAG_##x << 2) | MAC_ACCESS_FLAG_NEEDED) /* In the array below the meaning of the bits is: [f|f|f|f|f|f|n|p] * f - flag bits (up to 6 possible flags) * n - flag needed * p - partially implenented */ static const uint8_t mac_reg_access[0x8000] =3D { - [IPAV] =3D markflag(MAC), [WUC] =3D markflag(MAC), - [IP6AT] =3D markflag(MAC), [IP4AT] =3D markflag(MAC), - [FFVT] =3D markflag(MAC), [WUPM] =3D markflag(MAC), - [ECOL] =3D markflag(MAC), [MCC] =3D markflag(MAC), - [DC] =3D markflag(MAC), [TNCRS] =3D markflag(MAC), - [RLEC] =3D markflag(MAC), [XONRXC] =3D markflag(MAC), - [XOFFTXC] =3D markflag(MAC), [RFC] =3D markflag(MAC), - [TSCTFC] =3D markflag(MAC), [MGTPRC] =3D markflag(MAC), - [WUS] =3D markflag(MAC), [AIT] =3D markflag(MAC), - [FFLT] =3D markflag(MAC), [FFMT] =3D markflag(MAC), - [SCC] =3D markflag(MAC), [FCRUC] =3D markflag(MAC), - [LATECOL] =3D markflag(MAC), [COLC] =3D markflag(MAC), - [SEQEC] =3D markflag(MAC), [CEXTERR] =3D markflag(MAC), - [XONTXC] =3D markflag(MAC), [XOFFRXC] =3D markflag(MAC), - [RJC] =3D markflag(MAC), [RNBC] =3D markflag(MAC), - [MGTPDC] =3D markflag(MAC), [MGTPTC] =3D markflag(MAC), - [RUC] =3D markflag(MAC), [ROC] =3D markflag(MAC), - [GORCL] =3D markflag(MAC), [GORCH] =3D markflag(MAC), - [GOTCL] =3D markflag(MAC), [GOTCH] =3D markflag(MAC), - [BPRC] =3D markflag(MAC), [MPRC] =3D markflag(MAC), - [TSCTC] =3D markflag(MAC), [PRC64] =3D markflag(MAC), - [PRC127] =3D markflag(MAC), [PRC255] =3D markflag(MAC), - [PRC511] =3D markflag(MAC), [PRC1023] =3D markflag(MAC), - [PRC1522] =3D markflag(MAC), [PTC64] =3D markflag(MAC), - [PTC127] =3D markflag(MAC), [PTC255] =3D markflag(MAC), - [PTC511] =3D markflag(MAC), [PTC1023] =3D markflag(MAC), - [PTC1522] =3D markflag(MAC), [MPTC] =3D markflag(MAC), - [BPTC] =3D markflag(MAC), - - [TDFH] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFT] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFHS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFTS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [TDFPC] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFH] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFT] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFHS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFTS] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [RDFPC] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, - [PBM] =3D markflag(MAC) | MAC_ACCESS_PARTIAL, + [TDFH] =3D MAC_ACCESS_PARTIAL, + [TDFT] =3D MAC_ACCESS_PARTIAL, + [TDFHS] =3D MAC_ACCESS_PARTIAL, + [TDFTS] =3D MAC_ACCESS_PARTIAL, + [TDFPC] =3D MAC_ACCESS_PARTIAL, + [RDFH] =3D MAC_ACCESS_PARTIAL, + [RDFT] =3D MAC_ACCESS_PARTIAL, + [RDFHS] =3D MAC_ACCESS_PARTIAL, + [RDFTS] =3D MAC_ACCESS_PARTIAL, + [RDFPC] =3D MAC_ACCESS_PARTIAL, + [PBM] =3D MAC_ACCESS_PARTIAL, }; =20 static void @@ -1268,8 +1236,7 @@ e1000_mmio_write(void *opaque, hwaddr addr, uint64_t = val, unsigned int index =3D (addr & 0x1ffff) >> 2; =20 if (index < NWRITEOPS && macreg_writeops[index]) { - if (!(mac_reg_access[index] & MAC_ACCESS_FLAG_NEEDED) - || (s->compat_flags & (mac_reg_access[index] >> 2))) { + if (s->compat_flags & (mac_reg_access[index] >> 2)) { if (mac_reg_access[index] & MAC_ACCESS_PARTIAL) { DBGOUT(GENERAL, "Writing to register at offset: 0x%08x. " "It is not fully implemented.\n", index<<2); @@ -1295,8 +1262,7 @@ e1000_mmio_read(void *opaque, hwaddr addr, unsigned s= ize) unsigned int index =3D (addr & 0x1ffff) >> 2; =20 if (index < NREADOPS && macreg_readops[index]) { - if (!(mac_reg_access[index] & MAC_ACCESS_FLAG_NEEDED) - || (s->compat_flags & (mac_reg_access[index] >> 2))) { + if (s->compat_flags & (mac_reg_access[index] >> 2)) { if (mac_reg_access[index] & MAC_ACCESS_PARTIAL) { DBGOUT(GENERAL, "Reading register at offset: 0x%08x. " "It is not fully implemented.\n", index<<2); @@ -1419,13 +1385,6 @@ static int e1000_tx_tso_post_load(void *opaque, int = version_id) return 0; } =20 -static bool e1000_full_mac_needed(void *opaque) -{ - E1000State *s =3D opaque; - - return chkflag(MAC); -} - static bool e1000_tso_state_needed(void *opaque) { E1000State *s =3D opaque; @@ -1451,7 +1410,6 @@ static const VMStateDescription vmstate_e1000_full_ma= c_state =3D { .name =3D "e1000/full_mac_state", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D e1000_full_mac_needed, .fields =3D (const VMStateField[]) { VMSTATE_UINT32_ARRAY(mac_reg, E1000State, 0x8000), VMSTATE_END_OF_LIST() @@ -1679,8 +1637,6 @@ static void pci_e1000_realize(PCIDevice *pci_dev, Err= or **errp) =20 static const Property e1000_properties[] =3D { DEFINE_NIC_PROPERTIES(E1000State, conf), - DEFINE_PROP_BIT("extra_mac_registers", E1000State, - compat_flags, E1000_FLAG_MAC_BIT, true), DEFINE_PROP_BIT("migrate_tso_props", E1000State, compat_flags, E1000_FLAG_TSO_BIT, true), DEFINE_PROP_BIT("init-vet", E1000State, --=20 2.47.1