From nobody Sun Apr 28 12:07:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 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=1616674171; cv=none; d=zohomail.com; s=zohoarc; b=VRIfarblQKkIQMlFNLOGmVzGd5LX5fnkO4XzKnzMxHHBio5nAraLbD4rpb/aqm4n/sW/HAkDbRFuAgYhYj2lqpootJe9RQzVFUI18cPUseVWPWjvzKTODBsybo8GNAB6LklmGWb9OXUBXvXIVy/MhYiDJ0gen4azQC15VvNKvm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616674171; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+WxJT/LZbxF9lKkeuQCTE0WCh2OqIbI/yLxA+fPtTMk=; b=U3ijeyrUGFppyazhEnOiQ9FIGBPIChyL7MlFQCNLnwM7DK6TFxhJpW1Y17nFdkbJo01fa7otMbPuMDVEyGV8BK6mqsv9Z4AptkSw2HkhkVJlcxsd+UGTGP2jkNTvaVEStFuIKexastCRyNS2egKgk8odfQdrmXqXRpWY5XopE4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1616674171607532.3732657403015; Thu, 25 Mar 2021 05:09:31 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id b9so2019716wrt.8 for ; Thu, 25 Mar 2021 05:09:29 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id n9sm6660439wrx.46.2021.03.25.05.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 05:09:27 -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=+WxJT/LZbxF9lKkeuQCTE0WCh2OqIbI/yLxA+fPtTMk=; b=UNRxPEQYGO8KJPvrtNVTturRBVENBL7f6V77+PNUSKaGOyDqSMxOEjpp5E16I2Peus nsaCnG9ST5C3nbUpSoHAAEaM7v+5AFARHb0KaVccCFD7gVj/DjMdGzMErBKaixYMuU1b p8xeq7yhAK4VgCBSHPjGDGxneu9Tky8wsPNzmek2JD5jsRTg4d4txwfraoIxA1mAk5H6 S7hOYycZAMS/uYF9iFCbggkxpNz4WpUxuFG5yuwM4SFwhubNR2LG32Utg7OlIVFC1lUr lxQsmSNvuJuUkLsOuZHyak6GtBY2yfYnWzIHRCa4M+10sr2V6eg9n1LZuT/vnw6Fbq1e 9Ykw== 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=+WxJT/LZbxF9lKkeuQCTE0WCh2OqIbI/yLxA+fPtTMk=; b=hf2nqBYcC7ht1hIMlMtgZyuEFi20aaYkjXbynYclvbIbTs83inqwODDRRwFWOyTOBP shtfhLAzl4w89itbp0bcs2TIlO3cghCed4cAWYssG48LbSsCXkMd/mPzaZ+JbJZ+g1HN zePRmZEHQCL/QB9L05mvJ1N5irIQROqoV3ATZWUNw0fmWDQE5sdOoxyRiw5xMxIGCreo UIp0yQC4G4Aj4fTPQaDbdJvziv4Wukoi7zYsWwQXd7PGtEUPtA9pkApqqbcT6PtAqgF1 AouGaKd3FaQriQBIz4oWyWuxQu7pQVuUJQ4q7sbfWgpis80ZRIJ4+qQywFIaHgfeRZm1 oKdg== X-Gm-Message-State: AOAM530CeZjly3xVFC2HEpCbK1GBgArJi5nP3npgmad6MQ6FCByeC97D bcKZeeahJ9tCMf/xMnLLMSk= X-Google-Smtp-Source: ABdhPJzeo1F0fm6nuMTV55uPL6KcQeQzqyCqCPL/o88ymzRJjZhnS08kZWM9XAVfPc0YdaSt/grscQ== X-Received: by 2002:adf:dc4e:: with SMTP id m14mr8933717wrj.248.1616674167906; Thu, 25 Mar 2021 05:09:27 -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: Kevin Wolf , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.1 1/2] hw/block/pflash_cfi02: Set romd mode in pflash_cfi02_realize() Date: Thu, 25 Mar 2021 13:09:20 +0100 Message-Id: <20210325120921.858993-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210325120921.858993-1-f4bug@amsat.org> References: <20210325120921.858993-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The ROMD mode isn't related to mapping setup. Ideally we'd set this mode when the state machine resets, but for now simply move it to pflash_cfi02_realize() to not introduce logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/block/pflash_cfi02.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 25c053693ce..35e30bb812c 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -173,7 +173,6 @@ static void pflash_setup_mappings(PFlashCFI02 *pfl) "pflash-alias", &pfl->orig_mem, 0, size); memory_region_add_subregion(&pfl->mem, i * size, &pfl->mem_mapping= s[i]); } - pfl->rom_mode =3D true; } =20 static void pflash_reset_state_machine(PFlashCFI02 *pfl) @@ -917,6 +916,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) /* Allocate memory for a bitmap for sectors being erased. */ pfl->sector_erase_map =3D bitmap_new(pfl->total_sectors); =20 + pfl->rom_mode =3D true; pflash_setup_mappings(pfl); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); =20 --=20 2.26.2 From nobody Sun Apr 28 12:07:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616674174; cv=none; d=zohomail.com; s=zohoarc; b=nXozPySOUdu0dvDrvR0ihaX8mn0YYHRsShJbknWYrQFKJG6wTnppO9gYunbCuCIBLVvpSy6/qfDw8LzxZ40yTjMGG56A1jFaKYXfroXqUlRFTjj/Qk12/NfS9VFUikjA7rUxWBiPUER/XE3ZkgaGPhcvFSwRjq5hmH7FbBcLzLY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616674174; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zthFndrHM90uXxVlKArqDHUMBufeNV9n6j9hp9i1NSI=; b=Z0odw/fhjcZDi0vqyQULjAGlCGyyFVDeQFQ2DPEy6P3aFp7fuq5nPDcLWS+V5QslRkZo8f0WFH0565vs5phvsJgnjfYqnbCxf6kUC1mmuuXP0m8VgGSqau/kqlr+kqjAuEmfhc6TT1NRIGT9JuZdjjhhcxjBVBfcaui071UDozI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1616674174599317.19525714981023; Thu, 25 Mar 2021 05:09:34 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id n11-20020a05600c4f8bb029010e5cf86347so4232020wmq.1 for ; Thu, 25 Mar 2021 05:09:33 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id w22sm6129608wmi.22.2021.03.25.05.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 05:09:32 -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=zthFndrHM90uXxVlKArqDHUMBufeNV9n6j9hp9i1NSI=; b=Cgch3h0vxvrnROici56adJ/Pq1JHh5d00EwPRiE9Iis0KkLZ7dd/gcAyyTq9So8DLO C8HKwCwVHFLywpNT/QYAl7QSc74i93zehlycyfdrlwWFfPoZWeo8lYPtYpI9PixGeZpD IOp45kKJSpaOKmHJyrnkCTiItgOvoNq7cvz5N+EJujMvOuv1c6qFL1BEW2C+uTGVBSbQ fqKxdby1ywC74UCGwYIt4cwddTE+TSPFosJJwF8nNem9OOezgcBAZyAEAtwASvyTBw9F A0IBk1bsGaB8fElVD4EI17/cAGfOb8SohiIwtNmhquRfVC7eom+ZElWu1osq/sHAkUCK POKg== 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=zthFndrHM90uXxVlKArqDHUMBufeNV9n6j9hp9i1NSI=; b=QyjnIcvqMrHoyAjOhuCFV+CpWncM82z4NfWX+yg78MeRb8jAP1rXfJinE9PPjqaHNV JrObzvskUkVJQzVmv7k7vRi92Pj3q6wuisqzck41O9jMBD106M/6sRaBlKr8YftX7evP TNXUU8pRRAqIpKsknY0S9uHAYys+elF0gBa5hLLLhKzrO+qzgzmLEGUDNxDrViOvPYAa feVq3U+i9DfTZ6sgc9m9h5/UwwZRRgraemh2k6oVbErboEgN4p3YAVuVyDS1AJWJDl8j rm6LuvVMpdY0NNSm57MmPcxuLFXzSZWYC8OXgwDS+DORcIh7BOQa68py3kFOTrJpnqbg Urjg== X-Gm-Message-State: AOAM530G6k0rUCtPliDO1+C6uRWovRBnE5Z2/b3vMNx76KZDP8zcUBQ5 fpg+R073GdmkVwkcd6Pv4c0= X-Google-Smtp-Source: ABdhPJx4BNu1OiNs7JVdcsEY0jyquN7HOC8QSbFKSCYaH/B+Ol7S0IcSLEWIOc+JSt1PtzP9YKcVeA== X-Received: by 2002:a1c:600a:: with SMTP id u10mr7693491wmb.139.1616674172571; Thu, 25 Mar 2021 05:09:32 -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: Kevin Wolf , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.1 2/2] hw/block/pflash_cfi02: Do not create aliases when not necessary Date: Thu, 25 Mar 2021 13:09:21 +0100 Message-Id: <20210325120921.858993-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210325120921.858993-1-f4bug@amsat.org> References: <20210325120921.858993-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) When no mapping is requested, it is pointless to create alias regions. Only create them when multiple mappings are requested to simplify the memory layout. The flatview is not changed. For example using 'qemu-system-sh4 -M r2d -S -monitor stdio', * before: (qemu) info mtree address-space: memory 0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000000ffffff (prio 0, i/o): pflash 0000000000000000-0000000000ffffff (prio 0, romd): alias pflash-alia= s @r2d.flash 0000000000000000-0000000000ffffff 0000000004000000-000000000400003f (prio 0, i/o): r2d-fpga 000000000c000000-000000000fffffff (prio 0, ram): r2d.sdram (qemu) info mtree -f FlatView #0 AS "memory", root: system AS "cpu-memory-0", root: system Root memory region: system 0000000000000000-0000000000ffffff (prio 0, romd): r2d.flash 0000000004000000-000000000400003f (prio 0, i/o): r2d-fpga 000000000c000000-000000000fffffff (prio 0, ram): r2d.sdram * after: (qemu) info mtree address-space: memory 0000000000000000-ffffffffffffffff (prio 0, i/o): system 0000000000000000-0000000000ffffff (prio 0, romd): r2d.flash 0000000004000000-000000000400003f (prio 0, i/o): r2d-fpga 000000000c000000-000000000fffffff (prio 0, ram): r2d.sdram (qemu) info mtree -f FlatView #0 AS "memory", root: system AS "cpu-memory-0", root: system Root memory region: system 0000000000000000-0000000000ffffff (prio 0, romd): r2d.flash 0000000004000000-000000000400003f (prio 0, i/o): r2d-fpga 000000000c000000-000000000fffffff (prio 0, ram): r2d.sdram Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/block/pflash_cfi02.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 35e30bb812c..02c514fb6e0 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -917,8 +917,12 @@ static void pflash_cfi02_realize(DeviceState *dev, Err= or **errp) pfl->sector_erase_map =3D bitmap_new(pfl->total_sectors); =20 pfl->rom_mode =3D true; - pflash_setup_mappings(pfl); - sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); + if (pfl->mappings > 1) { + pflash_setup_mappings(pfl); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); + } else { + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->orig_mem); + } =20 timer_init_ns(&pfl->timer, QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); pfl->status =3D 0; --=20 2.26.2