From nobody Sat Apr 11 23:03:26 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=1772708125; cv=none; d=zohomail.com; s=zohoarc; b=Ua0LxuusLJazCtV6RwkS+kW8Pqn+ghSlTOrml9AI5uAbv3tMcT/Vx1t+yBdmCZndRKG8IQ3NJdzDZcZcjza0mX2swZTuOm2juHhIz9AMQ+2aqpcyppsZjOtwV/vp2Oft3DkqoKCHrZGtbs8vxVbgvDTb+WUdg+d0XHhhRi3vUkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772708125; 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=zAZJFrpGsQlM0iLUcP8iLeNuAW6YZBG8VQ54J4+M1aY=; b=O5pcnBVCFzeMhaJ5JTRrbpbr4A0RjFb6zX1SGrtRC+QkYuTbju3mxaB5O2XJITG15R6ICna3lv2EzbYeQM3UEfVkrgiEELyJZYA5ytAczEHxC9yxpzteC8GVh9TEkGB29T2agvVpf54DWkutJ6iKq6vxN13CWbroWWsT/TVfRxw= 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 1772708125834619.8165667088156; Thu, 5 Mar 2026 02:55:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vy6Ju-0001Hg-P4; Thu, 05 Mar 2026 05:52:42 -0500 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 1vy6Jt-0001Gv-3c for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:41 -0500 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 1vy6Jr-0005UK-KV for qemu-devel@nongnu.org; Thu, 05 Mar 2026 05:52:40 -0500 Received: from mx-prod-mc-01.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-594-woofIRlsPx-XqePEo5QDJg-1; Thu, 05 Mar 2026 05:52:35 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ED3D619560A3; Thu, 5 Mar 2026 10:52:34 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.75]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D5B173003E98; Thu, 5 Mar 2026 10:52:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772707959; 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=zAZJFrpGsQlM0iLUcP8iLeNuAW6YZBG8VQ54J4+M1aY=; b=gptywUVM4mH4ph/PLGmqY6kV8YR0Igt+mUGm0o7vNBBsmWJjZdRE5AaIav8OopUgu2Nkvw 78jNaf1bn+q3FmeupQSueyuaf8d98U8P6AY47IpeCn9SH9MS+QU4raOGPduf3uLlG1fVLs 5hoIgUvFwBmS6sg5hCVfpiBw6MNEdXw= X-MC-Unique: woofIRlsPx-XqePEo5QDJg-1 X-Mimecast-MFC-AGG-ID: woofIRlsPx-XqePEo5QDJg_1772707955 From: Thomas Huth To: Peter Maydell Cc: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov Subject: [PULL 05/28] hw/block/pflash: Remove PFlashCFI01::old_multiple_chip_handling field Date: Thu, 5 Mar 2026 11:51:52 +0100 Message-ID: <20260305105215.302571-6-thuth@redhat.com> In-Reply-To: <20260305105215.302571-1-thuth@redhat.com> References: <20260305105215.302571-1-thuth@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.4 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=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 33 X-Spam_score: 3.3 X-Spam_bar: +++ X-Spam_report: (3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.703, RCVD_IN_VALIDITY_SAFE_BLOCKED=1.386, 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: 1772708127355158500 From: Philippe Mathieu-Daud=C3=A9 The PFlashCFI01::old_multiple_chip_handling boolean was only set in the hw_compat_2_8[] array, via the 'old-multiple-chip-handling=3Don' property. We removed all machines using that array, let's remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250501210456.89071-7-philmd@linaro.org> Reviewed-by: Igor Mammedov Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth Message-ID: <20260225092024.794595-6-thuth@redhat.com> --- hw/block/pflash_cfi01.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index c0f5b9d8fad..5b9ddb20b18 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -84,7 +84,6 @@ struct PFlashCFI01 { char *name; void *storage; VMChangeStateEntry *vmstate; - bool old_multiple_chip_handling; =20 /* block update buffer */ unsigned char *blk_bytes; @@ -703,13 +702,8 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *p= fl) * in the cfi_table[]. */ num_devices =3D pfl->device_width ? (pfl->bank_width / pfl->device_wid= th) : 1; - if (pfl->old_multiple_chip_handling) { - blocks_per_device =3D pfl->nb_blocs / num_devices; - sector_len_per_device =3D pfl->sector_len; - } else { - blocks_per_device =3D pfl->nb_blocs; - sector_len_per_device =3D pfl->sector_len / num_devices; - } + blocks_per_device =3D pfl->nb_blocs; + sector_len_per_device =3D pfl->sector_len / num_devices; device_len =3D sector_len_per_device * blocks_per_device; =20 /* Hardcoded CFI table */ @@ -765,7 +759,7 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pf= l) pfl->cfi_table[0x2A] =3D 0x0B; } pfl->writeblock_size =3D 1 << pfl->cfi_table[0x2A]; - if (!pfl->old_multiple_chip_handling && num_devices > 1) { + if (num_devices > 1) { pfl->writeblock_size *=3D num_devices; } =20 @@ -930,8 +924,6 @@ static const Property pflash_cfi01_properties[] =3D { DEFINE_PROP_UINT16("id2", PFlashCFI01, ident2, 0), DEFINE_PROP_UINT16("id3", PFlashCFI01, ident3, 0), DEFINE_PROP_STRING("name", PFlashCFI01, name), - DEFINE_PROP_BOOL("old-multiple-chip-handling", PFlashCFI01, - old_multiple_chip_handling, false), }; =20 static void pflash_cfi01_class_init(ObjectClass *klass, const void *data) --=20 2.53.0