Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42581C07E9B for ; Wed, 21 Jul 2021 04:16:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C9A8A61019 for ; Wed, 21 Jul 2021 04:16:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9A8A61019 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m63eV-0003b8-P0 for qemu-devel@archiver.kernel.org; Wed, 21 Jul 2021 00:16:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m63cv-0001gK-7a for qemu-devel@nongnu.org; Wed, 21 Jul 2021 00:14:33 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:35654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m63cr-0008Pe-O0 for qemu-devel@nongnu.org; Wed, 21 Jul 2021 00:14:32 -0400 Received: by mail-ej1-x62e.google.com with SMTP id oz7so1215268ejc.2 for ; Tue, 20 Jul 2021 21:14:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jQFY2RowP6Ps7P4XIb9a5wmoJxzg6/tnnzovcN/59aU=; b=B8+Hwz6K/VGlkfrFDP/H/soYgFmkrA+TFN10kdbQ8pzH369sqQPpt9OxTpW8Lr8h9q Yo495G9lzNmz+IVUDCRh2dboDrIKYYhR5HO1+ip1HWYzILICbpAxFPaIGcyAAIGHKT+v 85gwj/rIB4HD42AglFCGtuNoR5D6I7E/QvD8Iy/ZLp5a6eKxG8YU61oaCUsrsD+40deN GzAX/dLOnKwq25Tb5uor794e8LZhBKYIh5NKw46pMdLUxo/MDj/V0NfSSsQXtpIMO91g E/R3Jj2Il3IB+G5kLqkjXMvx3mWTC7tSdo1TXtN2pcfdb8CvGxVx9duyn0JBtVqxULMv XyZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jQFY2RowP6Ps7P4XIb9a5wmoJxzg6/tnnzovcN/59aU=; b=BkM/5lAiVcyDYOq4NUq6Thip8keaS0u7zHRn2NxcBRzaUfpx8zbhO7Lnm6N2+m9RyO JDQO2tc0Y0I4wUCpcWhs+9t31qqF4w/6ROdcPbjWrSUnNJidOvcHC1bRhZvcYZvpRUuJ X6N6yzAB4ZKf3gtnW2iaUb1ekcACDRyKiSJWRqympi485a0V5JRBj8dp5z9BUQl9m2d+ XdwXS5OO93CM7RDphIATmSRhsmIvFNiqORzRqSyItauM/dRND4s/XHtHlplFo6zzV4vN nCSbUA17iFZGoZFpwGyYZHQUx5JKQgb2HWKG7TkYYN7TGywDaeLO5nHIYsRJItuKB+Np sPyQ== X-Gm-Message-State: AOAM530y1YcdD+kDZ9ZnRZAHRgxCt8JTWndc0In5gQMGoFBEEYY4mK68 s606oLeFTsmQ8fzXF/OTONA= X-Google-Smtp-Source: ABdhPJwkVtL8E5KcmnaFqCbtUuZkOgk0WLvcg/MoLPQdbZSzH5mXKdXU20YzTzBmTZBbISf7q2dQGQ== X-Received: by 2002:a17:906:4e85:: with SMTP id v5mr36518636eju.67.1626840867915; Tue, 20 Jul 2021 21:14:27 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id r27sm9444720edb.66.2021.07.20.21.14.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 21:14:27 -0700 (PDT) From: Bin Meng To: Jason Wang , qemu-devel@nongnu.org Subject: [PATCH v3 1/3] hw/net: e1000: Correct the initial value of VET register Date: Wed, 21 Jul 2021 12:15:02 +0800 Message-Id: <20210721041504.464403-1-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=bmeng.cn@gmail.com; helo=mail-ej1-x62e.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bin Meng , Christina Wang , Markus Carlstedt Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Christina Wang The initial value of VLAN Ether Type (VET) register is 0x8100, as per the manual and real hardware. While Linux e1000 driver always writes VET register to 0x8100, it is not always the case for everyone. Drivers relying on the reset value of VET won't be able to transmit and receive VLAN frames in QEMU. Reported-by: Markus Carlstedt Signed-off-by: Christina Wang Signed-off-by: Bin Meng --- Changes in v3: - add a "init-vet" property for versioned machines hw/core/machine.c | 27 +++++++++++++++++++++++++-- hw/net/e1000.c | 26 ++++++++++++++++++-------- 2 files changed, 43 insertions(+), 10 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 775add0795..29982c1ef1 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -41,6 +41,7 @@ GlobalProperty hw_compat_6_0[] = { { "gpex-pcihost", "allow-unmapped-accesses", "false" }, { "i8042", "extended-state", "false"}, { "nvme-ns", "eui64-default", "off"}, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_6_0_len = G_N_ELEMENTS(hw_compat_6_0); @@ -49,6 +50,7 @@ GlobalProperty hw_compat_5_2[] = { { "PIIX4_PM", "smm-compat", "on"}, { "virtio-blk-device", "report-discard-granularity", "off" }, { "virtio-net-pci", "vectors", "3"}, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_5_2_len = G_N_ELEMENTS(hw_compat_5_2); @@ -62,6 +64,7 @@ GlobalProperty hw_compat_5_1[] = { { "pvpanic", "events", "1"}, /* PVPANIC_PANICKED */ { "pl011", "migrate-clk", "off" }, { "virtio-pci", "x-ats-page-aligned", "off"}, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1); @@ -73,6 +76,7 @@ GlobalProperty hw_compat_5_0[] = { { "vmport", "x-report-vmx-type", "off" }, { "vmport", "x-cmds-v2", "off" }, { "virtio-device", "x-disable-legacy-check", "true" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0); @@ -89,11 +93,13 @@ GlobalProperty hw_compat_4_2[] = { { "qxl-vga", "revision", "4" }, { "fw_cfg", "acpi-mr-restore", "false" }, { "virtio-device", "use-disabled-flag", "false" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2); GlobalProperty hw_compat_4_1[] = { { "virtio-pci", "x-pcie-flr-init", "off" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1); @@ -106,6 +112,7 @@ GlobalProperty hw_compat_4_0[] = { { "virtio-device", "use-started", "false" }, { "virtio-balloon-device", "qemu-4-0-config-size", "true" }, { "pl031", "migrate-tick-offset", "false" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0); @@ -123,10 +130,13 @@ GlobalProperty hw_compat_3_1[] = { { "virtio-blk-device", "write-zeroes", "false" }, { "virtio-balloon-device", "qemu-4-0-config-size", "false" }, { "pcie-root-port-base", "disable-acs", "true" }, /* Added in 4.1 */ + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_3_1_len = G_N_ELEMENTS(hw_compat_3_1); -GlobalProperty hw_compat_3_0[] = {}; +GlobalProperty hw_compat_3_0[] = { + { "e1000", "init-vet", "off" }, +}; const size_t hw_compat_3_0_len = G_N_ELEMENTS(hw_compat_3_0); GlobalProperty hw_compat_2_12[] = { @@ -136,6 +146,7 @@ GlobalProperty hw_compat_2_12[] = { { "VGA", "global-vmstate", "true" }, { "vmware-svga", "global-vmstate", "true" }, { "qxl-vga", "global-vmstate", "true" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_12_len = G_N_ELEMENTS(hw_compat_2_12); @@ -144,12 +155,14 @@ GlobalProperty hw_compat_2_11[] = { { "virtio-blk-pci", "vectors", "2" }, { "vhost-user-blk-pci", "vectors", "2" }, { "e1000", "migrate_tso_props", "off" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_11_len = G_N_ELEMENTS(hw_compat_2_11); GlobalProperty hw_compat_2_10[] = { { "virtio-mouse-device", "wheel-axis", "false" }, { "virtio-tablet-device", "wheel-axis", "false" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_10_len = G_N_ELEMENTS(hw_compat_2_10); @@ -158,6 +171,7 @@ GlobalProperty hw_compat_2_9[] = { { "intel-iommu", "pt", "off" }, { "virtio-net-device", "x-mtu-bypass-backend", "off" }, { "pcie-root-port", "x-migrate-msix", "false" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_9_len = G_N_ELEMENTS(hw_compat_2_9); @@ -172,6 +186,7 @@ GlobalProperty hw_compat_2_8[] = { { "virtio-pci", "x-pcie-pm-init", "off" }, { "cirrus-vga", "vgamem_mb", "8" }, { "isa-cirrus-vga", "vgamem_mb", "8" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_8_len = G_N_ELEMENTS(hw_compat_2_8); @@ -181,6 +196,7 @@ GlobalProperty hw_compat_2_7[] = { { "ioapic", "version", "0x11" }, { "intel-iommu", "x-buggy-eim", "true" }, { "virtio-pci", "x-ignore-backend-features", "on" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_7_len = G_N_ELEMENTS(hw_compat_2_7); @@ -189,6 +205,7 @@ GlobalProperty hw_compat_2_6[] = { /* Optional because not all virtio-pci devices support legacy mode */ { "virtio-pci", "disable-modern", "on", .optional = true }, { "virtio-pci", "disable-legacy", "off", .optional = true }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_6_len = G_N_ELEMENTS(hw_compat_2_6); @@ -198,6 +215,7 @@ GlobalProperty hw_compat_2_5[] = { { "pvscsi", "x-disable-pcie", "on" }, { "vmxnet3", "x-old-msi-offsets", "on" }, { "vmxnet3", "x-disable-pcie", "on" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); @@ -205,6 +223,7 @@ GlobalProperty hw_compat_2_4[] = { /* Optional because the 'scsi' property is Linux-only */ { "virtio-blk-device", "scsi", "true", .optional = true }, { "e1000", "extra_mac_registers", "off" }, + { "e1000", "init-vet", "off" }, { "virtio-pci", "x-disable-pcie", "on" }, { "virtio-pci", "migrate-extra", "off" }, { "fw_cfg_mem", "dma_enabled", "off" }, @@ -222,10 +241,13 @@ GlobalProperty hw_compat_2_3[] = { { "migration", "send-configuration", "off" }, { "migration", "send-section-footer", "off" }, { "migration", "store-global-state", "off" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_3_len = G_N_ELEMENTS(hw_compat_2_3); -GlobalProperty hw_compat_2_2[] = {}; +GlobalProperty hw_compat_2_2[] = { + { "e1000", "init-vet", "off" }, +}; const size_t hw_compat_2_2_len = G_N_ELEMENTS(hw_compat_2_2); GlobalProperty hw_compat_2_1[] = { @@ -236,6 +258,7 @@ GlobalProperty hw_compat_2_1[] = { { "usb-mouse", "usb_version", "1" }, { "usb-kbd", "usb_version", "1" }, { "virtio-pci", "virtio-pci-bus-master-bug-migration", "on" }, + { "e1000", "init-vet", "off" }, }; const size_t hw_compat_2_1_len = G_N_ELEMENTS(hw_compat_2_1); diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 4f75b44cfc..543c4fbb02 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -29,6 +29,7 @@ #include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" +#include "net/eth.h" #include "net/net.h" #include "net/checksum.h" #include "sysemu/sysemu.h" @@ -130,10 +131,13 @@ struct E1000State_st { #define E1000_FLAG_MIT_BIT 1 #define E1000_FLAG_MAC_BIT 2 #define E1000_FLAG_TSO_BIT 3 +#define E1000_FLAG_VET_BIT 4 #define E1000_FLAG_AUTONEG (1 << E1000_FLAG_AUTONEG_BIT) #define E1000_FLAG_MIT (1 << E1000_FLAG_MIT_BIT) #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) + uint32_t compat_flags; bool received_tx_tso; bool use_tso_for_migration; @@ -141,7 +145,7 @@ struct E1000State_st { }; typedef struct E1000State_st E1000State; -#define chkflag(x) (s->compat_flags & E1000_FLAG_##x) +#define chkflag(s, x) (s->compat_flags & E1000_FLAG_##x) struct E1000BaseClass { PCIDeviceClass parent_class; @@ -176,7 +180,7 @@ e1000_autoneg_done(E1000State *s) static bool have_autoneg(E1000State *s) { - return chkflag(AUTONEG) && (s->phy_reg[PHY_CTRL] & MII_CR_AUTO_NEG_EN); + return chkflag(s, AUTONEG) && (s->phy_reg[PHY_CTRL] & MII_CR_AUTO_NEG_EN); } static void @@ -298,7 +302,7 @@ set_interrupt_cause(E1000State *s, int index, uint32_t val) if (s->mit_timer_on) { return; } - if (chkflag(MIT)) { + if (chkflag(s, MIT)) { /* Compute the next mitigation delay according to pending * interrupts and the current values of RADV (provided * RDTR!=0), TADV and ITR. @@ -386,6 +390,10 @@ static void e1000_reset(void *opaque) } e1000x_reset_mac_addr(d->nic, d->mac_reg, macaddr); + + if (chkflag(d, VET)) { + d->mac_reg[VET] = ETH_P_VLAN; + } } static void @@ -1397,7 +1405,7 @@ static int e1000_pre_save(void *opaque) } /* Decide which set of props to migrate in the main structure */ - if (chkflag(TSO) || !s->use_tso_for_migration) { + if (chkflag(s, TSO) || !s->use_tso_for_migration) { /* Either we're migrating with the extra subsection, in which * case the mig_props is always 'props' OR * we've not got the subsection, but 'props' was the last @@ -1418,7 +1426,7 @@ static int e1000_post_load(void *opaque, int version_id) E1000State *s = opaque; NetClientState *nc = qemu_get_queue(s->nic); - if (!chkflag(MIT)) { + if (!chkflag(s, MIT)) { s->mac_reg[ITR] = s->mac_reg[RDTR] = s->mac_reg[RADV] = s->mac_reg[TADV] = 0; s->mit_irq_level = false; @@ -1461,21 +1469,21 @@ static bool e1000_mit_state_needed(void *opaque) { E1000State *s = opaque; - return chkflag(MIT); + return chkflag(s, MIT); } static bool e1000_full_mac_needed(void *opaque) { E1000State *s = opaque; - return chkflag(MAC); + return chkflag(s, MAC); } static bool e1000_tso_state_needed(void *opaque) { E1000State *s = opaque; - return chkflag(TSO); + return chkflag(s, TSO); } static const VMStateDescription vmstate_e1000_mit_state = { @@ -1737,6 +1745,8 @@ static Property e1000_properties[] = { 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, + compat_flags, E1000_FLAG_VET_BIT, true), DEFINE_PROP_END_OF_LIST(), }; -- 2.25.1