From nobody Tue Feb 10 11:12:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618825433; cv=none; d=zohomail.com; s=zohoarc; b=n2A49L0MowR766mR0a6hpykGZDo01xxMqp/S79VBSbforz68MIaGjlotQs/XVrJcZbjZIGgoIoSuD6Sz7HQQ/oQh0woo+1f1B58FDGgUA8QHDvUWemM9o+Mci2v9W6PeBmfl2Smo3QeDMFDEOI8Vcq9ieVRClbclOn3BIhprsnk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618825433; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XmR3JkBwNqN9aB8s6qQPXTp8v3g1pCResCZWxmCdWQU=; b=eZ5mAquCNDBsw3z5EDVeRDW0GrGqVdTYmPcxvMkzhQl5wuWStrlusk/3Ti85zihzDN4sKxRVIzT45AphP/y1Y3alS8c2WwYe1ARyNJy0qltI8+FbYohpE2b6CUeo7gIJAuLityoKu1KAZvT/3gX3DYclRmM1GUo7n3oZckdRWc8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1618825433081272.2382591881916; Mon, 19 Apr 2021 02:43:53 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id k26so16851194wrc.8 for ; Mon, 19 Apr 2021 02:43:52 -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 q19sm19005354wmc.44.2021.04.19.02.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 02:43:50 -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=XmR3JkBwNqN9aB8s6qQPXTp8v3g1pCResCZWxmCdWQU=; b=paa2swu2/dF1gOusHim2I7d654iDzYt10AJKRcYEBYbvqU83rCT1gOmg96WzUfDE58 w9OOKdcKnNTa5ZgrYE4Tu0Uos7TiIsHqyCJuJUBsKZsbDZH6zj2P+KINIoHzA3JlzT15 WulLJHbuSDY+SN/H5F6Q7DWs9UNyvPl37vNRPT0EQlrgtfNTl0XxzPYpyA9XbdWGJHs4 p/1Q4mFL7jCpgbNmbTOC8CJxvl1OkJCWYDbmVx5F7FHrzgm7MzoUUHOHx1qaAi4i8exZ 8rHSMKRouAOeAxffZX6NuA52pN2f7cWMnreSe2mRpUCTsGkgwI0H4vtMeUNW7Rvm8gD1 s6sg== 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=XmR3JkBwNqN9aB8s6qQPXTp8v3g1pCResCZWxmCdWQU=; b=GgdireJhT5GR01Qbmn5queTGCU/0+rzlfnoy4rE7hPqYQyUP9Tt8mkViq8KzFZruhp KO3NfkNosMjZ32K8fXOK90PtO/rFbeGie1yoD431QDD4LLjon0v+/tIrPR04ID0cQoGu YxrCXfvg9sd/yeWSRwxfsYoo2fZFW4Q7CF4XDDIHu24t+b+f9wMaOBZvNi5b3ILz8aiV SwjgSS3e8eGJcW8ek5+lfKyZRXBQwmwIbIp7+M/lO6vCKOr6TtyGqMbjiXHfDOTJViRm 7G/wyjl2qu2HhXTt1GeUg3A9uBle9akaSZEhT8P9nNj+eMrl2XG+/04h9WqKY5vaN44G QWiQ== X-Gm-Message-State: AOAM531xfjBMj3OyqwRzQxajOVqISebwXO1v5Wgxyucv5BbAtn6wkPa8 cKMTkQKVMTwThSJlbYOqb+M= X-Google-Smtp-Source: ABdhPJwqI9LMO/iniVc7gwzU+EAMkH5J2aswK4xO8yxVwTFROaPLStInXbZCBThfGZPwPpePvwrMiQ== X-Received: by 2002:adf:f504:: with SMTP id q4mr13539548wro.304.1618825431429; Mon, 19 Apr 2021 02:43:51 -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 , Antony Pavlov , Peter Maydell Subject: [PATCH v2 4/7] hw/arm/digic: Open-code pflash_cfi02_register() call Date: Mon, 19 Apr 2021 11:43:26 +0200 Message-Id: <20210419094329.1402767-5-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/digic_boards.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 6cdc1d83fca..fc4a671b2e1 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -31,6 +31,8 @@ #include "hw/boards.h" #include "exec/address-spaces.h" #include "qemu/error-report.h" +#include "hw/qdev-properties.h" +#include "hw/misc/aliased_region.h" #include "hw/arm/digic.h" #include "hw/block/flash.h" #include "hw/loader.h" @@ -120,12 +122,25 @@ static void digic4_add_k8p3215uqb_rom(DigicState *s, = hwaddr addr, #define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024) #define FLASH_K8P3215UQB_SECTOR_SIZE (64 * 1024) =20 - pflash_cfi02_register(addr, "pflash", FLASH_K8P3215UQB_SIZE, - NULL, FLASH_K8P3215UQB_SECTOR_SIZE, - DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE, - 4, - 0x00EC, 0x007E, 0x0003, 0x0001, - 0x0555, 0x2aa, 0); + DeviceState *dev =3D qdev_new(TYPE_PFLASH_CFI02); + + qdev_prop_set_uint32(dev, "num-blocks", + FLASH_K8P3215UQB_SIZE / FLASH_K8P3215UQB_SECTOR_S= IZE); + qdev_prop_set_uint32(dev, "sector-length", FLASH_K8P3215UQB_SECTOR_SIZ= E); + qdev_prop_set_uint8(dev, "width", 4); /* 32-bit */ + qdev_prop_set_uint8(dev, "mappings", + DIGIC4_ROM_MAX_SIZE / FLASH_K8P3215UQB_SIZE); + qdev_prop_set_uint8(dev, "big-endian", 0); + qdev_prop_set_uint16(dev, "id0", 0x00ec); + qdev_prop_set_uint16(dev, "id1", 0x007e); + qdev_prop_set_uint16(dev, "id2", 0x0003); + qdev_prop_set_uint16(dev, "id3", 0x0001); + qdev_prop_set_uint16(dev, "unlock-addr0", 0x0555); + qdev_prop_set_uint16(dev, "unlock-addr1", 0x2aa); + qdev_prop_set_string(dev, "name", "pflash"); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr); =20 digic_load_rom(s, addr, FLASH_K8P3215UQB_SIZE, filename); } --=20 2.26.3