From nobody Tue Feb 10 11:13:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618825423; cv=none; d=zohomail.com; s=zohoarc; b=KlUdaUY9Rg9wuwDcYrKDLuwmaKFlwnBokLOvSbLbiEKqPUnIk1z4n1m8GwqG28E4sWvytnoP2IqWd3uQCr/t3/dilqH9O89GCp55SSXU+LigRnh3+ZuhyLNaDpcjqu66r0YNTugOo1VY1NKC9pZMow7TFINSVJhI1a3epwWFXU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618825423; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JtPHGXi9+ZTv4ayRzYeSfqDe3/H34ya16cXAvGHk8ns=; b=jr7B5m5CjaA7elJso417vluW72i6iE/QcovQv4/rNo0ji1QhckMdwBy18kM3ojdaFWt8QyrnJN9u0hOtZ0RGCcO5mZIu/VYKWUF86lB1wk3nlJgf/MNi/JbgllIC/sx+bX+qpGc7HnMzlM2YCadi4tbtN62F2DVjuUkaxe6lrJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1618825423365708.101296884271; Mon, 19 Apr 2021 02:43:43 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id g9so17249521wrx.0 for ; Mon, 19 Apr 2021 02:43:42 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id i12sm20510138wrm.77.2021.04.19.02.43.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 02:43:41 -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=JtPHGXi9+ZTv4ayRzYeSfqDe3/H34ya16cXAvGHk8ns=; b=B3X7/nLQKcvkVPTy6ZAaoTk8LefVhKIvifLMxHhKC1yR30pdWM/E5pv0Y15vJY8Y/A OGm7yQ9tzlDx/VfhmvfKhTnAcwcg3fHKOiklCtJ0nKiJkzMq9PRblY721B5B1lr78omQ Rf6zPPzs+cWSotRJ//eVjGbepATZnRS3kavHx2mOd69gGci1hdPIXn7j+PiZE+zlVR7s zZt0yZHvXEbuUQiwFoICjaE2+cMcJQX0IHXF2P2IVNkX9ojnMa5cntJnPKFGQBKr7ZaJ Pz7e2uFyZCoxunsw6z1fDFuLCrP39PidC+Hn2I7cOgKZW3YyYPxsnmsjBo1uqu9sZqVN 6qLg== 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=JtPHGXi9+ZTv4ayRzYeSfqDe3/H34ya16cXAvGHk8ns=; b=lu3j8pkE3s5dWRQtV0qiVZTeK5d4CQeYyqmAoEa84JLFHbzregwYF6peLCY+VwjwR3 Y4KJA99Y2givUhi3+4fu21caiDdsR7mMvXOIsqEfpwMAlI4zxtmkfFEk54FR0GFhf4en VzW3VC/SSbbPFhKDk45JTDqUAdrmQDghkx9mg2RE42XzyLUscsy4VJtNQw7CGHkXEAAv Y5PUfjRQsmSt85zbOaVu1v0hJWEaeMfR+CeHSv3pNzyl3+f8CeD4nnS+XFB65A2oTtXr z0x53rQEgquhf9320tG5YbsY02jC6kCF2OpfGyKC9wCSb7jcDpZUoxhGkFPxhpPr3txa vlHA== X-Gm-Message-State: AOAM531VWW0aWFFfDBjGGnWtX4D1YkjCYYSS0gdaE0BvkFVQwQki5yzw vic5GMgczLlndYknfzsBjb4= X-Google-Smtp-Source: ABdhPJzSGGgH0VOwusuxbv5aErzxPHvG6k3FVMbwvOpndYD6swr7R85i1z+6jZlKTq2wiYqFEqo3kA== X-Received: by 2002:adf:fcca:: with SMTP id f10mr13683276wrs.148.1618825421710; Mon, 19 Apr 2021 02:43:41 -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?= , qemu-arm@nongnu.org, qemu-block@nongnu.org, David Edmondson , Richard Henderson , Stephen Checkoway , Jan Kiszka , Peter Maydell Subject: [PATCH v2 2/7] hw/arm/musicpal: Open-code pflash_cfi02_register() call Date: Mon, 19 Apr 2021 11:43:24 +0200 Message-Id: <20210419094329.1402767-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210419094329.1402767-1-f4bug@amsat.org> References: <20210419094329.1402767-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) To be able to manually map the flash region on the main memory (in the next commit), first expand the pflash_cfi02_register in place. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/arm/musicpal.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 9cebece2de0..8b58b66f263 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -10,6 +10,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "cpu.h" #include "hw/sysbus.h" @@ -1640,6 +1641,7 @@ static void musicpal_init(MachineState *machine) /* Register flash */ dinfo =3D drive_get(IF_PFLASH, 0, 0); if (dinfo) { + static const size_t sector_size =3D 64 * KiB; BlockBackend *blk =3D blk_by_legacy_dinfo(dinfo); =20 flash_size =3D blk_getlength(blk); @@ -1649,17 +1651,30 @@ static void musicpal_init(MachineState *machine) exit(1); } =20 + dev =3D qdev_new(TYPE_PFLASH_CFI02); + qdev_prop_set_drive(dev, "drive", blk); + qdev_prop_set_uint32(dev, "num-blocks", flash_size / sector_size); + qdev_prop_set_uint32(dev, "sector-length", sector_size); + qdev_prop_set_uint8(dev, "width", 2); /* 16-bit */ + qdev_prop_set_uint8(dev, "mappings", MP_FLASH_SIZE_MAX / flash_siz= e); + qdev_prop_set_uint8(dev, "big-endian", 0); + qdev_prop_set_uint16(dev, "id0", 0x00bf); + qdev_prop_set_uint16(dev, "id1", 0x236d); + qdev_prop_set_uint16(dev, "id2", 0x0000); + qdev_prop_set_uint16(dev, "id3", 0x0000); + qdev_prop_set_uint16(dev, "unlock-addr0", 0x5555); + qdev_prop_set_uint16(dev, "unlock-addr1", 0x2aaa); + qdev_prop_set_string(dev, "name", "musicpal.flash"); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, + 0x100000000ULL - MP_FLASH_SIZE_MAX); + /* * The original U-Boot accesses the flash at 0xFE000000 instead of * 0xFF800000 (if there is 8 MB flash). So remap flash access if t= he * image is smaller than 32 MB. */ - pflash_cfi02_register(0x100000000ULL - MP_FLASH_SIZE_MAX, - "musicpal.flash", flash_size, - blk, 0x10000, - MP_FLASH_SIZE_MAX / flash_size, - 2, 0x00BF, 0x236D, 0x0000, 0x0000, - 0x5555, 0x2AAA, 0); } sysbus_create_simple(TYPE_MV88W8618_FLASHCFG, MP_FLASHCFG_BASE, NULL); =20 --=20 2.26.3