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 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,URIBL_BLOCKED, 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 22D99C11F68 for ; Fri, 2 Jul 2021 09:25:14 +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 ADC79611C0 for ; Fri, 2 Jul 2021 09:25:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADC79611C0 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]:47120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzFQ8-0004qB-IU for qemu-devel@archiver.kernel.org; Fri, 02 Jul 2021 05:25:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzFP4-0003du-3B for qemu-devel@nongnu.org; Fri, 02 Jul 2021 05:24:06 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:35776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzFP2-00016O-EY for qemu-devel@nongnu.org; Fri, 02 Jul 2021 05:24:05 -0400 Received: by mail-ed1-x529.google.com with SMTP id df12so12345248edb.2 for ; Fri, 02 Jul 2021 02:24:02 -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=vpI9js6MYPsZuSC2fkN8vkkKWP16ac71a0cNSBA3IE4=; b=JMkzKe5ekOEStbgaLvcsD+201hvwi8U6vZBgf4QOjc6eviaGyy7KeYi6IapxZJo1jg 4jKsFdkhSVa7hg/UXqFM1ZD0XdMOolvGkFHYhYwjRse265L1RJGjTNqk2cgXuK1b8mgq +9SLvv7KQh3+IVHE0nSbqmbfI2WSMq4x/Noj4ZvPlK/NVsLvcPf3dggwR5m5WtssvEoY MbWDbw+dRMEIaLSMEzhXpgP6N8lWhuJ8nqSrfQPRxSJf5Pe6x6nsE7qUZvkccWg40eXp NGGU+tvlY/Yo3Eh91YFmgWGnwhbLDfLkjnFBHGTww0DdWoBmL1OXomi1l8eBRtqFZygO wc2g== 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=vpI9js6MYPsZuSC2fkN8vkkKWP16ac71a0cNSBA3IE4=; b=ZN8Lqy04j+GXyYDk1GqBS0NX+TAFHlZ3xp0jXVrOFktUDMOUllCJdAc7MUQgtmXmie S9oK/vp9j6DVrbAEzt0IsiWeZH5PfMk4Q4/uWKKsGlDWH46QdJNLi1UL6hs98GuJK2Mg BqxbWRAa5fQyTSPlCjZiTiLodkUNM4eWAdJgR1Zbb5x5RSXrK4HV+mIWKfQwUkwYqsx7 Qj9KPC1PAKr/seI+jQCtJFA6sLnXVK2B92FlZMY5Z+KxehHnDyMnBU7dFpihtzXAA4O3 glQlZ0qzmbAyoPh3fTcGmsfB03w6ojnPWZqg7lSh+iFhV69CPDJ7eyPVlNXlfOeOe4Mo sKxA== X-Gm-Message-State: AOAM532qLQGOXiUU0dQdShKhKgKR2kiaOLlOQLPJ4hihKt/YrC4AA5BN wzoz0kVoyFuhJwMjC7r75wM= X-Google-Smtp-Source: ABdhPJzBnJoLhNuOqJ3QxpGsK3jFfOjXLIOwO9wWfxk16utQBaNdrakrSSWXtHak3RClMbCDMYOs/w== X-Received: by 2002:a05:6402:1776:: with SMTP id da22mr5321421edb.133.1625217841052; Fri, 02 Jul 2021 02:24:01 -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 c18sm1035623edt.18.2021.07.02.02.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 02:24:00 -0700 (PDT) From: Bin Meng To: Jason Wang , qemu-devel@nongnu.org Subject: [PATCH v2 1/3] hw/net: e1000: Correct the initial value of VET register Date: Fri, 2 Jul 2021 17:24:25 +0800 Message-Id: <20210702092427.1323667-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::529; envelope-from=bmeng.cn@gmail.com; helo=mail-ed1-x529.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 --- (no changes since v1) hw/net/e1000.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 4f75b44cfc..20cbba6411 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" @@ -254,6 +255,7 @@ static const uint32_t mac_reg_init[] = { [MANC] = E1000_MANC_EN_MNG2HOST | E1000_MANC_RCV_TCO_EN | E1000_MANC_ARP_EN | E1000_MANC_0298_EN | E1000_MANC_RMCP_EN, + [VET] = ETH_P_VLAN, }; /* Helper function, *curr == 0 means the value is not set */ -- 2.25.1