From nobody Mon Apr 6 09:13:14 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1774871409; cv=none; d=zohomail.com; s=zohoarc; b=haJrYji+bzOZhMqSQZHosJ2qf3BYtDvpSDSYC4jQAM047phWIIic79P7/Mv/GRczXdJxMz0/Gzs74vF9Vx06WXay/aLk0LmS1Ahc9zz0gBSupbCF0mDY+lOsI0CHBwYcu0Z6MnNoX0n55ar2GBErrBWrNhNEXOpfMHEAUyzxZXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774871409; 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=KqY1BVTm6BQJn+AOMdZdl0mYqUF4UwJ578C3nCdZE5M=; b=OIks7BjoNHcMEIErhP2+f/PtiJNpgkZvCbs7zUOqe8/qSgfKIm5OOkAfsYer31eIPp5DQ/MTk4Q3eLHlTr/UzjQOXTWUui0AfLlETl01lVyzyCyObdMSJ6phRszDcnG6O1Ec83Y+4YCUKLXbjrWHAz5h3dTCuIQJ+6f0cKeUkBA= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177487140991274.81956369095997; Mon, 30 Mar 2026 04:50:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w7B7X-0002MI-UT; Mon, 30 Mar 2026 07:49:27 -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 1w7B7J-0002Ke-MR for qemu-devel@nongnu.org; Mon, 30 Mar 2026 07:49:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w7B7G-0005by-M6 for qemu-devel@nongnu.org; Mon, 30 Mar 2026 07:49:12 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-538-9JJoGNZbNd69j6G8-km4yQ-1; Mon, 30 Mar 2026 07:49:00 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 617961956094; Mon, 30 Mar 2026 11:48:59 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.47]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 62B4F1800351; Mon, 30 Mar 2026 11:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774871341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KqY1BVTm6BQJn+AOMdZdl0mYqUF4UwJ578C3nCdZE5M=; b=Ju6LjkAIH9YG8drqpe3ADnQlkFCzLZwt/laTVMHK8BVZB0OrCr7SG3+ikzXYckeXPbwHBx O3rZJRGLxr9gPF7SIHSbzzhZgOzxVo73K8GFaSIeG6Ui5zERCrWy1cWpKJND4ojMdCMl8L OU1nSGAeBfprnGe7nJGl29q0qZ6TAek= X-MC-Unique: 9JJoGNZbNd69j6G8-km4yQ-1 X-Mimecast-MFC-AGG-ID: 9JJoGNZbNd69j6G8-km4yQ_1774871339 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: GuoHan Zhao , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Jithu Joseph Subject: [PULL 1/2] hw/i2c/aspeed_i2c: reset and migrate pending_intr_sts Date: Mon, 30 Mar 2026 13:48:52 +0200 Message-ID: <20260330114853.638753-2-clg@redhat.com> In-Reply-To: <20260330114853.638753-1-clg@redhat.com> References: <20260330114853.638753-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=1, RCVD_IN_VALIDITY_RPBL_BLOCKED=1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1774871413227154100 From: GuoHan Zhao Commit 7e82393ed058 ("hw/i2c/aspeed: fix lost interrupts on back-to-back commands") introduced pending_intr_sts to preserve interrupt bits that collide with already pending status bits. That deferred interrupt state is consumed later when the guest clears INTR_STS, but it is not reset in aspeed_i2c_bus_reset() and it is not part of the bus migration state. A reset can therefore leave stale deferred bits behind, and migration can silently drop them. Clear pending_intr_sts on reset and include it in VMState while keeping compatibility with older migration streams. Fixes: 7e82393ed058 ("hw/i2c/aspeed: fix lost interrupts on back-to-back co= mmands") Signed-off-by: GuoHan Zhao Link: https://lore.kernel.org/qemu-devel/20260325085450.126595-1-zhaoguohan= @kylinos.cn Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Jithu Joseph Signed-off-by: C=C3=A9dric Le Goater --- hw/i2c/aspeed_i2c.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c index 5d18f8d49ea4..90f83a03fd4f 100644 --- a/hw/i2c/aspeed_i2c.c +++ b/hw/i2c/aspeed_i2c.c @@ -1134,10 +1134,11 @@ static const MemoryRegionOps aspeed_i2c_bus_pool_op= s =3D { =20 static const VMStateDescription aspeed_i2c_bus_vmstate =3D { .name =3D TYPE_ASPEED_I2C, - .version_id =3D 6, + .version_id =3D 7, .minimum_version_id =3D 6, .fields =3D (const VMStateField[]) { VMSTATE_UINT32_ARRAY(regs, AspeedI2CBus, ASPEED_I2C_NEW_NUM_REG), + VMSTATE_UINT32_V(pending_intr_sts, AspeedI2CBus, 7), VMSTATE_UINT8_ARRAY(pool, AspeedI2CBus, ASPEED_I2C_BUS_POOL_SIZE), VMSTATE_UINT64(dma_dram_offset, AspeedI2CBus), VMSTATE_END_OF_LIST() @@ -1510,6 +1511,7 @@ static void aspeed_i2c_bus_reset(DeviceState *dev) AspeedI2CBus *s =3D ASPEED_I2C_BUS(dev); =20 memset(s->regs, 0, sizeof(s->regs)); + s->pending_intr_sts =3D 0; i2c_end_transfer(s->bus); } =20 --=20 2.53.0 From nobody Mon Apr 6 09:13:14 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; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1774871409; cv=none; d=zohomail.com; s=zohoarc; b=FrgwEiUdaZNlSGciqKIMimhBU8qcfogutpE/n+cHNc66Ck2ShOaGJJ9/OYX1gZ/ui3qV72a9JPshtIJLG+juAOmAEjSIIhKv3YZ89nvD9XbErpX9Vm4l4YWZUyHCKS+bR8wxqKRMtBJiHvB/1GJOVweWNmJxH29Ev5IAv4XCJ9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774871409; 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=DAJj8ZslZgsOIkvnpDadAqH4+KJQwmg5EMAcBGW7ihY=; b=TGTiELFr4YN3AI6bi/E7AS9rWF6vmhcaq1/tyJ2OCUcjL6+NXzwLcB6YVFHL3r/TqfiWW3dYjSyl/psuc4grUCs1iuHNcWVfXMcqyAD2peo4GF3/O7XCoTFEBJrHo6LKks5ewrgvl+7SEtqWr/lri5TkWMB/vPXE0+IsdT7VQi4= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774871409933104.87336718005565; Mon, 30 Mar 2026 04:50:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w7B7Y-0002MM-0W; Mon, 30 Mar 2026 07:49:28 -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 1w7B7J-0002Kd-MY for qemu-devel@nongnu.org; Mon, 30 Mar 2026 07:49:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w7B7G-0005cN-Lu for qemu-devel@nongnu.org; Mon, 30 Mar 2026 07:49:12 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-K7dyrpZNN9WcygoxjbJ20Q-1; Mon, 30 Mar 2026 07:49:02 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7CC2819560A2; Mon, 30 Mar 2026 11:49:01 +0000 (UTC) Received: from corto.redhat.com (unknown [10.44.32.47]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D46911800351; Mon, 30 Mar 2026 11:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774871346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DAJj8ZslZgsOIkvnpDadAqH4+KJQwmg5EMAcBGW7ihY=; b=dew0pccTg2ERuzRlfCh2KLYtLspExlbRmb9trAepk4QFrrUkLnalEKVEt1Is9et33yASXi woXOzWDefgE3dq45y0Y9XEoc9U3ZJ5glIAbwvcdYFcutc9ZcBgOYxrW3fhfjaEa5NmOo+K rJtvlVJMLvcj4tHRAxUKN2VxHXp9kc8= X-MC-Unique: K7dyrpZNN9WcygoxjbJ20Q-1 X-Mimecast-MFC-AGG-ID: K7dyrpZNN9WcygoxjbJ20Q_1774871341 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: linhuang , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 2/2] net/ftgmac100: preserve full VLAN TCI in TX tag insertion Date: Mon, 30 Mar 2026 13:48:53 +0200 Message-ID: <20260330114853.638753-3-clg@redhat.com> In-Reply-To: <20260330114853.638753-1-clg@redhat.com> References: <20260330114853.638753-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.01, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=1, RCVD_IN_VALIDITY_RPBL_BLOCKED=1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1774871413167154100 From: linhuang The VLAN tag insertion helper took vlan_tci as an 8-bit value, while the=C2=A0descriptor provides a 16-bit VLAN TCI. This truncated egress tags and caused VLAN ID corruption (for example, 4088/0x0ff8 became 248/0x00f8 at the receiver). Change vlan_tci to uint16_t=C2=A0in the TX VLAN insertion path so the full 802.1Q TCI is preserved and transmitted correctly. Fixes: c2ab73fcbe79 ("ftgmac100: Fix integer overflow in ftgmac100_do_tx()") Signed-off-by: linhuang Link: https://lore.kernel.org/qemu-devel/1471e413d3589b6734819bda2b59b725b7= 4f273a.d551129b.99fc.47f6.86dc.0759227268a2@feishu.cn Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: C=C3=A9dric Le Goater --- hw/net/ftgmac100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 2f05bba11d01..b3da48c343c7 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -498,7 +498,7 @@ static int ftgmac100_write_bd(FTGMAC100Desc *bd, dma_ad= dr_t addr) } =20 static int ftgmac100_insert_vlan(FTGMAC100State *s, int frame_size, - uint8_t vlan_tci) + uint16_t vlan_tci) { uint8_t *vlan_hdr =3D s->frame + (ETH_ALEN * 2); uint8_t *payload =3D vlan_hdr + sizeof(struct vlan_header); --=20 2.53.0