From patchwork Thu May 1 21:04:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886372 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp514217wrq; Thu, 1 May 2025 14:07:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXzuLjymc9RJ8B4y4q5c5TfV+hyBGJdETjDLzMWBUmCvq/kkYeCK0NYzOS0KyjGjppdQ/24Lg==@linaro.org X-Google-Smtp-Source: AGHT+IFzaNFvvRt8RSogMpXHRXGJ2favy+t90NqX9DGew0YPQBJghIDwAxHuyu+NxuLKiHSJFr2d X-Received: by 2002:a05:6214:492:b0:6ed:19d1:212f with SMTP id 6a1803df08f44-6f5152542demr12455536d6.5.1746133623157; Thu, 01 May 2025 14:07:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746133623; cv=none; d=google.com; s=arc-20240605; b=E6Mo9WkjFOYGCd00M4LUxGTFMvhWEGF7AF+paWGShUcoFWVxwktqQJoDrt8tzMLnFk dPQrmXts87HCqPzd048R1KKXEi8vACwWuvyQ0dsWBzhDn5BCyGqmC71lIxP8aPUZI6Xp JNrSBGb+Zys8UIhWePtSJeb9S7Gu56orl5IMg9y/uW5h6rnP0JFnyM0y0Azp3vHFbx0q zkA+vVzAtu100KvHlwoWtqnsf83keg5RZGy9UdzFRfJDhx+hdEyYj7Tt3GIHE/uJs9aj NYBvTWUxPslzVVt5pr4FuL1airmEY56gxJMejs7npb1hw4aJD5PoPF8OtO1G+0Z8Txlk t4eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=S1tUkE2fqrTbr3cXQ8k1xcGcvFxNEjegGfUTV61cZkA=; fh=uloqeIiLIhsqAWHY8zIEmzfMIcw7bGWZuINspytDykk=; b=Ne34LtwPzPylzRqiaRZ44SwK5koP0WslNjAmu1yOFU9b9YcqtkpDsz1/lMY71IU3H9 YHugvAxPzddk0Apoq1CJ27UT1dD3757R6gKN2b2DYRRLnNMXAqYk8Q63kI287mVq06AC zr1jb5ppNfMCqjfCHHHWSFw25xAMwR/OzrAamcXk/aP4WfM4nIYdC07EQXm02c3f3L13 cMJgInDTSjibMFD3xmH0OCtgDj2oGykcSxtJjQzSXBn/G0Xxp80rLEVGiyHuhYSwyHjO rz27XyH5vhTlwuYH7hL5mkxWR9l3IyrWt6dYMTZHIwp/sN9aktFuxQJhGnUGi17yGWQN l7og==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EbXFJ30A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f50f47a816si15928046d6.248.2025.05.01.14.07.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 14:07:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EbXFJ30A; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAb6U-0001Ke-V4; Thu, 01 May 2025 17:05:58 -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 1uAb6T-0001KH-Qw for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:57 -0400 Received: from mail-il1-x12d.google.com ([2607:f8b0:4864:20::12d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAb6R-0006am-LP for qemu-devel@nongnu.org; Thu, 01 May 2025 17:05:57 -0400 Received: by mail-il1-x12d.google.com with SMTP id e9e14a558f8ab-3d9189e9a06so5153255ab.2 for ; Thu, 01 May 2025 14:05:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746133554; x=1746738354; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S1tUkE2fqrTbr3cXQ8k1xcGcvFxNEjegGfUTV61cZkA=; b=EbXFJ30A946jsPQLWn2SXFovj1q8wmST0y8Ek3Q7sGPSD43hiO+wAXDb3jajsbpLE7 Qhzmt7AsDqZaR0y4iK2zHr4PdfaGt2h3Ha7QnA/LLpqCbenXLYqC/9RGR2j7FMWbrnx0 GjgyjH5uIYXIVSEJUZ2uvdppdCaXnWV55VrFCL1Jm6fcwZYyDfEHwwOCXblG9F4tWGN/ sjZANgV0tfT4oEKymupqxNGVPSWxe76yYxdqvPZpCok4NfJmYt36slkWe4IfsL0yvcZq YeqvsBuiqk+DXVFd4PM2U74vTcqddMWVAqGqg2MKGzERI2jFytJ4ev5uoxOEULuv7a5D feJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746133554; x=1746738354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S1tUkE2fqrTbr3cXQ8k1xcGcvFxNEjegGfUTV61cZkA=; b=HVEO4JcwznmkNHp/da5pM5Fl8DnrPAi/BrZK1myyDLVYLsRz6uN76M4TVCQ/gQNOdX 1adhDkVoYJY49IrlXjGrT6r2F/Yb6aR4+2ZI+GbyS+7e12peJDyNg4xXgfNe/qifS0lf JpEmO97KHxlSq67eXHVE1xGDiLQ9oRTbeW9IUh0bHqB5Q8fYGZEfJnysy34bI+XOsfQS PJ2X1NsQlUnRQJXWIHq+7J0YsFWlVICm9nxZNaq3sw7y+i9sXL+Qr/8GjZLKRR+2lUaI KUIT4lVLWVRGPei3IBA1Ndk14vz0qAYbRfVtZwZ8x+4VLdC7nWlQJOLqGM8KJEh7O+iV QONw== X-Gm-Message-State: AOJu0YxNBF99eBpDmHsQPBf33z8G8dZe+NT462rZstQyLBaROArcjNhA 807AY6XxV4KIIP20sI+jZxyCLp2gFRtN3v666iePIibaAk4eYb4uqs3cUwQNLPmMA3f8DABJzXm u X-Gm-Gg: ASbGncuaa6cakNFUoYEyoTNHSEbKdVZmSrh3SwojL/N+rHiCdn+1xZi7L1t+4LZXc9J sMmZFOPcpruRTqDQHheaOUg8WreRzInQQPrXZT41rVnFfpgH05EH3gwPz9L+7baiiX5Z4VZ3YGD nS86abW4X+N10MC9AjShFZOyKqEp9Gh6Z479kOkT5NFle0V+tV28W8kh/rvEqg6kXt6JNcSE7fM zxzQTchGad2k1pyWPfhC8PUIYk6/SsS5mJF/hIR1PCHAAOHbe4BPesvW+lWHEDsZOPW/HfdXEJ3 g+5z6zZRfwyyg6vBYKI+8+ru0qQHqiuRmNkh3H7V+85118fKQkOZd7U1MZCx76nESaMXj0SKXzC W8s8JKpvjN2PN3Zc= X-Received: by 2002:a05:6e02:1a8f:b0:3d8:1ed0:e167 with SMTP id e9e14a558f8ab-3d97c239b27mr4578815ab.14.1746133554154; Thu, 01 May 2025 14:05:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975f58be3sm3253625ab.58.2025.05.01.14.05.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 14:05:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , Hanna Reitz , Igor Mammedov , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , qemu-block@nongnu.org, Jason Wang , Richard Henderson , Yanan Wang , Ani Sinha , "Michael S. Tsirkin" , Thomas Huth , Gerd Hoffmann , Kevin Wolf , Yi Liu Subject: [PATCH 06/18] hw/block/pflash: Remove PFlashCFI01::old_multiple_chip_handling field Date: Thu, 1 May 2025 23:04:44 +0200 Message-ID: <20250501210456.89071-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501210456.89071-1-philmd@linaro.org> References: <20250501210456.89071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12d; envelope-from=philmd@linaro.org; helo=mail-il1-x12d.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The PFlashCFI01::old_multiple_chip_handling boolean was only set in the hw_compat_2_8[] array, via the 'old-multiple-chip-handling=on' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé --- 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 168101d8dfe..bba099a0c9e 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; /* block update buffer */ unsigned char *blk_bytes; @@ -703,13 +702,8 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pfl) * in the cfi_table[]. */ num_devices = pfl->device_width ? (pfl->bank_width / pfl->device_width) : 1; - if (pfl->old_multiple_chip_handling) { - blocks_per_device = pfl->nb_blocs / num_devices; - sector_len_per_device = pfl->sector_len; - } else { - blocks_per_device = pfl->nb_blocs; - sector_len_per_device = pfl->sector_len / num_devices; - } + blocks_per_device = pfl->nb_blocs; + sector_len_per_device = pfl->sector_len / num_devices; device_len = sector_len_per_device * blocks_per_device; /* Hardcoded CFI table */ @@ -765,7 +759,7 @@ static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pfl) pfl->cfi_table[0x2A] = 0x0B; } pfl->writeblock_size = 1 << pfl->cfi_table[0x2A]; - if (!pfl->old_multiple_chip_handling && num_devices > 1) { + if (num_devices > 1) { pfl->writeblock_size *= num_devices; } @@ -930,8 +924,6 @@ static const Property pflash_cfi01_properties[] = { 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), }; static void pflash_cfi01_class_init(ObjectClass *klass, const void *data)