From nobody Tue May 7 03:19:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1599225247; cv=none; d=zohomail.com; s=zohoarc; b=dragPbPCNP9MHGMO4keDaBbbCWfEsSjSVvkpA3cRxg/ih7D/cgvFCvOK0F2MNO7nPeidvOYk4G+uBEaqVjJEKZ0cKJt5dR9FWpudsdauc/nqNberVB51pVEPKpe2jUba6AG8TP4wYO0U6jnwmfL3MyeBgJ0VuQZVK9Vq3tOQ3cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599225247; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pUn9OQfvIDUS2owgm25WBMJmc8HrxsJALivDp1WyLus=; b=Jo1fi7Z1sGgSVxNrrbsdHjE0QPMkGRzWIEmoRQy961tIp3nin9WkcaC+RWglgRj5iPIF21cawigkW//ZEm1ykDYctDo1BSjZeZ8XXK6mQC2pxjzQsauQ8QXIm7tob0cAUX+iqLYkoAlLP7J2yHR439SUYhuKdvcauG0GKAsdndY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 15992252476161013.4638802118961; Fri, 4 Sep 2020 06:14:07 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id m6so6754191wrn.0 for ; Fri, 04 Sep 2020 06:14:07 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id b1sm11923559wru.54.2020.09.04.06.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 06:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pUn9OQfvIDUS2owgm25WBMJmc8HrxsJALivDp1WyLus=; b=t0S8DNfyCrw+6326yuho28EHfZtwxIw2KXDtB7c1/BmmgEjUjwLdfMBa9DLaUUclF4 Z6R9aL1+T2Tb8asyj5NGO+fpTKy4XP4BBFzflUfWLhMdkVLnmdIGR0MVOTG6AioxT94B nluhSIlNlK75VjoMOuqyIUpDfgfLIkDiUL7Tjk9ka2OtaRrkq+Rr3dAt+ENeRhY3uoBQ CR1uoW0RLH2OaYm+guWvS6uLqosEIneYPtvRV8X+FlEJdbxtFlVpnDVBTfFAkU84IUJA 5PMkp7uSblXCLsMPz1smHQax/gsJeRpbxCBEpUhNmIOrVQLBlHYMt17dut3/LdxJUMcl CIkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pUn9OQfvIDUS2owgm25WBMJmc8HrxsJALivDp1WyLus=; b=CvrgFtXMwPAMUYJgwMhYFTyG9HuA4WhXs34K4sqYPHs7L8AYXBx6u8FsxWxbtN4DeJ s2lGgiXzeD5PHMZhbrSNLXyMY8CvJYuvlLliOU7nUvJzQAGk6P+0grhFLcrf1aY1AJwc 9joTCsRI0EnRz2DU+V61AfZTLA4eRABXkhl4A+CI72Ci/7cVYQC3rh6SHWHCvErmaIoo YVFr6P7dySJjJ1hEoh6nqfFafcGmYYbQhe4N9iA4tu9tZYFDAagjlka5YGucP80VOmUn LsiySf/rBxS6n/ayaW6+h5SGIgZyEJtvMidiaTNcX58G06tXesb2iGYhkCYUIX3gwtfe Hnmw== X-Gm-Message-State: AOAM531TrQRXhC1Kwn5hC+zil8SIQaKnWPhXRNKAS5JXPqWa6I/vS32i VPD/aeVba1oGJ6z8QIn16L8= X-Google-Smtp-Source: ABdhPJzLV6g4Dgv0eESpOeTF74h/1V0KaOo6HQFhbeKOhVGKSk2d5pysLascdKoRlEYpoWXXWoC/uw== X-Received: by 2002:a5d:45c9:: with SMTP id b9mr7477835wrs.283.1599225246129; Fri, 04 Sep 2020 06:14:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jason Wang , qemu-trivial@nongnu.org, Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] hw/net/e1000e: Remove overwritten read handler for STATUS register Date: Fri, 4 Sep 2020 15:14:01 +0200 Message-Id: <20200904131402.590055-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200904131402.590055-1-f4bug@amsat.org> References: <20200904131402.590055-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The STATUS register readop handler is initialized first with the generic e1000e_mac_readreg() handler: 2861 #define e1000e_getreg(x) [x] =3D e1000e_mac_readreg 2862 typedef uint32_t (*readops)(E1000ECore *, int); 2863 static const readops e1000e_macreg_readops[] =3D { .... 2919 e1000e_getreg(STATUS), Then overwritten with the specific e1000e_get_status handler: 3018 [STATUS] =3D e1000e_get_status, To avoid confusion, remove the overwritten initialization. 6f3fbe4ed0 ("net: Introduce e1000e device emulation") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Li Qiang --- hw/net/e1000e_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index bcd186cac52..5170e6a4563 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -2916,7 +2916,6 @@ static const readops e1000e_macreg_readops[] =3D { e1000e_getreg(TSYNCRXCTL), e1000e_getreg(TDH), e1000e_getreg(LEDCTL), - e1000e_getreg(STATUS), e1000e_getreg(TCTL), e1000e_getreg(TDBAL), e1000e_getreg(TDLEN), --=20 2.26.2 From nobody Tue May 7 03:19:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599225249; cv=none; d=zohomail.com; s=zohoarc; b=ASebfAbf8DziL4af9hV6vg5C/q/yX8i6vN8oWMI1+dP27uCXQSlOtKgqr8OOkxk9KNOzmaIgQmX+xLeyD8gO1Yqw4didjksOGBUEAJow/uJWyYnaQXPonSQTmp2cUNBArokMUp8veZmKIebyjqsAwGA4vqw4HWeRqWxG0wCfvNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599225249; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U5Nf/dsZpglT/fNEe0BRVA0EwoDYwFpAKvTQELhkWw4=; b=MkXXnD+xCDuNEYcerXdgQ5L6rffk2kP/TQdqrOa+LaiFNxJxHjPC1KF2riS0g2vxEOHVX7bXg7MI3Mb0pwg+6pMFoqWZrq48EscGIqsgEqW4gp3hTsYJGpy0pqR6HiXvBVyp1+WVExnixGPte/vq+rPxqDpPcbvj4sjBBUNMN3k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 1599225249139787.6855359301869; Fri, 4 Sep 2020 06:14:09 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id z9so6073223wmk.1 for ; Fri, 04 Sep 2020 06:14:08 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id b1sm11923559wru.54.2020.09.04.06.14.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 06:14:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U5Nf/dsZpglT/fNEe0BRVA0EwoDYwFpAKvTQELhkWw4=; b=KAMmVWiH0poKB9PnqGwd+tjUHSvmueCm+6am8OJxcwedZtKRAsfzUZMnQbLSoDMD45 VhsfaSjOzSyf1MbjQgBOnDxMipDNNdxKtoPFwI3moFBR+fMNsIFLtUJbCIRWnTZzisuc qx1Awuik+C7kIOFJ7ufhCexGCUHwbVi7thw4xvZREmpCRcuNP2oaZHZoEPVkQWmX7Ui5 HlORwErw9oiGE6QIv1dymPd+MSu3ptXulCdjB22RD4SdtdGp+3i95t9LZvKHBeRlPzJy AHnYKftmfEnvL/WRz6jDp2AOaPJNKr7k2BrSeuoxaR/Kh875oOxm5r+xX01buk88gQHM tRQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=U5Nf/dsZpglT/fNEe0BRVA0EwoDYwFpAKvTQELhkWw4=; b=tf7pOl1/6ZtoQlkgE6GyoeGi9+y2bT5f9CB1ZKCbFXcXXd8tDPQs444gxNgZ49k9pY 2qfmS4WKJEvzAHZJ7xcpHuRQDeKRnpQ+CKA85IbIf4y+B+RCDgC/MLgHY57NoNqqtqL7 ezQFd+dv/GvZHQMvUSS9aD3/YafgHaB4HWruf7GdWZSAQWJRwhdYGDbk3XigrJMhzCmz Lt+m5VgSY5/vS0q9AjAQwaIhATMuSPIm3edTfI2tuTKxG4stdIrqCyFw5fAHT9qPeYZg wEcNK/YnIp3Ar6dRV8h2XU+gs9KOV69Ox9jnxjLv+f6s7POeMgS/xHm/+neP53n4un/R zmfw== X-Gm-Message-State: AOAM531Al8IeoRWfNA8VkhnWKDW3+8JRL3EwcoFNycfn5gVs67DU1AK1 jH0pmCoYa6yGppKZ4W2sbjE= X-Google-Smtp-Source: ABdhPJz/7kZSdD5rrx50dbwD7r+e+fFO+u6K2DTvGPgX0raKlN4ET7nL7jY044irKs3XMBfD1DrSkg== X-Received: by 2002:a1c:b703:: with SMTP id h3mr7474239wmf.131.1599225247743; Fri, 04 Sep 2020 06:14:07 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jason Wang , qemu-trivial@nongnu.org, Dmitry Fleytman , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/net/e1000e: Remove duplicated write handler for FLSWDATA register Date: Fri, 4 Sep 2020 15:14:02 +0200 Message-Id: <20200904131402.590055-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200904131402.590055-1-f4bug@amsat.org> References: <20200904131402.590055-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The FLSWDATA register writeop handler is initialized twice: 3067 #define e1000e_putreg(x) [x] =3D e1000e_mac_writereg 3068 typedef void (*writeops)(E1000ECore *, int, uint32_t); 3069 static const writeops e1000e_macreg_writeops[] =3D { .... 3102 e1000e_putreg(FLSWDATA), .... 3145 e1000e_putreg(FLSWDATA), To avoid confusion, remove the duplicated initialization. Fixes: 6f3fbe4ed0 ("net: Introduce e1000e device emulation") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Li Qiang --- Noticed after looking for other cases of the previous patch. --- hw/net/e1000e_core.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 5170e6a4563..bcfd46696ff 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -3141,7 +3141,6 @@ static const writeops e1000e_macreg_writeops[] =3D { e1000e_putreg(RXCFGL), e1000e_putreg(TSYNCRXCTL), e1000e_putreg(TSYNCTXCTL), - e1000e_putreg(FLSWDATA), e1000e_putreg(EXTCNF_SIZE), e1000e_putreg(EEMNGCTL), e1000e_putreg(RA), --=20 2.26.2