From nobody Tue Feb 10 02:54:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616718483; cv=none; d=zohomail.com; s=zohoarc; b=JyE+PhrDJDtMPwGn4TQToe3/FgfuDrAiZ4ibcF2e4Vw48vLoWM3Ii4COu6+atXnCXMRwc+Mf9OHi/xmiVxmZeD20CUvBjh9EFmoMzvQp6fX54ZVUGGrIgn7dZR2j2Q82/WEWBpPLBZ9Qa1wc8jTMQLMwANpZYKuHqns9P0zp29Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616718483; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dJbcGY6sOvOVraPquf/gluBsf0D+iYUyhVli41P2iL8=; b=dyIIjEoau4C61ddlW7tFWmkSD9VtHHRS50OE9ne/FZFYZl5lKl9vc0DsX1IJVUwkd8iIXL00ltTmGxxxCWM9NJ+DRXu23auyXAORg0LYYy32SOXUb5tRmKqRHaqtorsNs/SsZ0kuYXq2+dyyQKJcnwIDo/EUKYD6sSJc3pO15+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1616718483421729.4035007842284; Thu, 25 Mar 2021 17:28:03 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id b2-20020a7bc2420000b029010be1081172so2120297wmj.1 for ; Thu, 25 Mar 2021 17:28:02 -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 a13sm9524931wrp.31.2021.03.25.17.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Mar 2021 17:28:01 -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=dJbcGY6sOvOVraPquf/gluBsf0D+iYUyhVli41P2iL8=; b=QavHjpPUU/2FTrNGn+BNIYCIvSckEOAjdO1WvSBeaip7H1mVUFLLisbh1i/Z0/73gP 3GfhCvlwYq1zpN5UtUW2Cvc8Bo4R+FbIVaconwCJZYTkfUJRkhFfXz41v60Aaopnh+0A wKpcAkarUjmjvn+uP4OExdtLGJ+iaaB0j69Qx3JnFFGP38SGGWZu22Wvqhp+msEnxOOz 4XT/3m/wChvdP3fYiML2p3JHQoOgie3VeqcSJOcA5gk9vHCvsfj+2qxFVj2jtVtDbX7g jd34gix/Q+at6nXkHgrV90bQ4ZCHjSRYEDG4lvk5HwD8VpRV+oVNc7MXKkaxje2ZNxka t8Eg== 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=dJbcGY6sOvOVraPquf/gluBsf0D+iYUyhVli41P2iL8=; b=EpEIZrdWTzU3x2WHbf9cuWhPSA7/TKQGCBzhyyPmJ6aBc8jEW00WNaiewvdXV6jB4T ee6Q9zaz4WvM6xBacoFsQ+FFrFpItxlmaa1muzPMH87LVVloi6/IK3Bv6MH7+FAGe3c7 Sa0M38vY4wENACB2RJgOQEYs0hqOML0UbaZJwD9DYVryUjX7my3JTyijxAU/JOMGkFMH /MOkqbh1kz3x/RRpWtdhDSFB05q6wiiKW4HlNtjzESI1f9gzAhdZ8TvWFrckzrmslYOH 6BZZ8Lr/mOqTUEETFq0z0Q6+mhpdkmwpL+uGK54tk8/IDFK6+xRLx0UbAFcLkLfmDE/7 msew== X-Gm-Message-State: AOAM531CeXbXVPgF5609V9OHgiDrb3iUy9nSiJMHRWwxmLOpoNrGFeLQ 5hZF9qlWxxLKGX50WXm0bCs= X-Google-Smtp-Source: ABdhPJzAxyJzBhSmyfeQ71RrGp7Fb6STCrZIx7mGw3rdXekioUzmFk44J8ZOW7GI0HCYiSPxwUd1NQ== X-Received: by 2002:a1c:e341:: with SMTP id a62mr10654555wmh.152.1616718481720; Thu, 25 Mar 2021 17:28:01 -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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Mark Cave-Ayland , Peter Maydell , Richard Henderson , Alistair Francis , "Edgar E. Iglesias" , qemu-ppc@nongnu.org, qemu-arm@nongnu.org, David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Max Reitz , qemu-block@nongnu.org (open list:Block layer core) Subject: [PATCH-for-6.1 06/10] hw/block/pflash_cfi02: Remove pflash_setup_mappings() Date: Fri, 26 Mar 2021 01:27:24 +0100 Message-Id: <20210326002728.1069834-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210326002728.1069834-1-f4bug@amsat.org> References: <20210326002728.1069834-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) All boards calling pflash_cfi02_register() use nb_mappings=3D1, which does not do any mapping: $ git grep -wl pflash_cfi02_register hw/ hw/arm/xilinx_zynq.c hw/block/pflash_cfi02.c hw/lm32/lm32_boards.c hw/ppc/ppc405_boards.c hw/sh4/r2d.c We can remove this now unneeded code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Gibson --- hw/block/pflash_cfi02.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 02c514fb6e0..6f4b3e3c3fe 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -75,7 +75,6 @@ struct PFlashCFI02 { uint32_t nb_blocs[PFLASH_MAX_ERASE_REGIONS]; uint32_t sector_len[PFLASH_MAX_ERASE_REGIONS]; uint32_t chip_len; - uint8_t mappings; uint8_t width; uint8_t be; int wcycle; /* if 0, the flash is read normally */ @@ -92,13 +91,6 @@ struct PFlashCFI02 { uint16_t unlock_addr1; uint8_t cfi_table[0x4d]; QEMUTimer timer; - /* - * The device replicates the flash memory across its memory space. Em= ulate - * that by having a container (.mem) filled with an array of aliases - * (.mem_mappings) pointing to the flash memory (.orig_mem). - */ - MemoryRegion mem; - MemoryRegion *mem_mappings; /* array; one per mapping */ MemoryRegion orig_mem; bool rom_mode; int read_counter; /* used for lazy switch-back to rom mode */ @@ -158,23 +150,6 @@ static inline void toggle_dq2(PFlashCFI02 *pfl) pfl->status ^=3D 0x04; } =20 -/* - * Set up replicated mappings of the same region. - */ -static void pflash_setup_mappings(PFlashCFI02 *pfl) -{ - unsigned i; - hwaddr size =3D memory_region_size(&pfl->orig_mem); - - memory_region_init(&pfl->mem, OBJECT(pfl), "pflash", pfl->mappings * s= ize); - pfl->mem_mappings =3D g_new(MemoryRegion, pfl->mappings); - for (i =3D 0; i < pfl->mappings; ++i) { - memory_region_init_alias(&pfl->mem_mappings[i], OBJECT(pfl), - "pflash-alias", &pfl->orig_mem, 0, size); - memory_region_add_subregion(&pfl->mem, i * size, &pfl->mem_mapping= s[i]); - } -} - static void pflash_reset_state_machine(PFlashCFI02 *pfl) { trace_pflash_reset(pfl->name); @@ -917,12 +892,7 @@ 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; - 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); - } + 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; @@ -950,7 +920,6 @@ static Property pflash_cfi02_properties[] =3D { DEFINE_PROP_UINT32("num-blocks3", PFlashCFI02, nb_blocs[3], 0), DEFINE_PROP_UINT32("sector-length3", PFlashCFI02, sector_len[3], 0), DEFINE_PROP_UINT8("width", PFlashCFI02, width, 0), - DEFINE_PROP_UINT8("mappings", PFlashCFI02, mappings, 0), DEFINE_PROP_UINT8("big-endian", PFlashCFI02, be, 0), DEFINE_PROP_UINT16("id0", PFlashCFI02, ident0, 0), DEFINE_PROP_UINT16("id1", PFlashCFI02, ident1, 0), @@ -1008,6 +977,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base, { DeviceState *dev =3D qdev_new(TYPE_PFLASH_CFI02); =20 + assert(nb_mappings <=3D 1); if (blk) { qdev_prop_set_drive(dev, "drive", blk); } @@ -1015,7 +985,6 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base, qdev_prop_set_uint32(dev, "num-blocks", size / sector_len); qdev_prop_set_uint32(dev, "sector-length", sector_len); qdev_prop_set_uint8(dev, "width", width); - qdev_prop_set_uint8(dev, "mappings", nb_mappings); qdev_prop_set_uint8(dev, "big-endian", !!be); qdev_prop_set_uint16(dev, "id0", id0); qdev_prop_set_uint16(dev, "id1", id1); --=20 2.26.2