From nobody Tue Nov 18 07:49:12 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1608337602; cv=none; d=zohomail.com; s=zohoarc; b=PR0H5aUokJNV2FyhoaV9zP4XSQ1GYz4r8p9wEeokUJvU84zMb9lI4B3SS5mXkF22koZ+tcLeoSyfRxCvLQKX88VIktFHAr3x9IWcoqh0pwOHlI6/NaeEwgPUvpVc4xPh8oxyc/864BMe1XpVqXjqCBwfI5Uq2TNdl/laigH2iwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608337602; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=EP26QphpZv4PRijhALYqwD2rrPC6l5BRDwk55robjYw=; b=fTPiXi9tNbjeFeA5vLB/W706zZrSmNf6QFf9G54vN4eib0usXOWx5MWhWLNV4OIMMNFGFwu0Fb1TPCZPowIc2q45akvES9fCYLaQ2XPG3hp6+xRFxLZAZeovOk+Pb8jIkaWWvLYpUoXqmEkYG8yCVSz5OZCG5jRctgmUpASWcGo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608337602681790.4302180001736; Fri, 18 Dec 2020 16:26:42 -0800 (PST) Received: from localhost ([::1]:41336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqQ53-000196-2g for importer@patchew.org; Fri, 18 Dec 2020 19:26:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34964) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqQ3B-0000Nf-8f for qemu-devel@nongnu.org; Fri, 18 Dec 2020 19:24:45 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kqQ39-0008HR-C9 for qemu-devel@nongnu.org; Fri, 18 Dec 2020 19:24:44 -0500 Received: by mail-wr1-x42b.google.com with SMTP id c5so4391899wrp.6 for ; Fri, 18 Dec 2020 16:24:42 -0800 (PST) Received: from lootbox.konsulko.bg (lan.nucleusys.com. [92.247.61.126]) by smtp.gmail.com with ESMTPSA id u66sm13760951wmg.30.2020.12.18.16.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Dec 2020 16:24:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EP26QphpZv4PRijhALYqwD2rrPC6l5BRDwk55robjYw=; b=nYPOcWnIz0Yz1L9G23x1SykZzW4nV77H7sBBztXyHPMEsfDt8jDKoea6jVYyQvFfO7 N5ihHUjx4SeuRaYQs4h2XiGqk4zDbPVFSHRGcSVIxiOYfz6vWVbgEzd8wfg71qLgK90L 2b+y4NevHXmZgSBKb5jX38HJ2C/WttVGINWe8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EP26QphpZv4PRijhALYqwD2rrPC6l5BRDwk55robjYw=; b=d/X7iRfRrM6+mNlqzZYr2I9TeusKen9VRi7nH5TnNp9VVmnUzmIpckrPIU2Xe0S4Lt Nh+g1EPjpKQFZBKvLHg21Nm0e/IJ5TJukr+EXZ/L21MJT9sMhip1LDydldOswCfSLHk8 KRSjvcmRkzQ2Q/tTXDrl+hUe/5CQKXnZ9hCFUp1+e9CJaqhs10y4SZgq5f5R2KuK68qU 9B7cN7A2m5BSBgGC7fVWIZmodsr0njRl5lyuCfHUbv3ot9RWiZ6b7AvaTQqeUozJvtwX oO0UmZnLEwSYEcfaU4DReWBd53HyuNnfmyx/H5z4v0xEcVooc9A8fc4HZgunY+jTp5x5 BxPw== X-Gm-Message-State: AOAM530tnMKDIMIsYXmy9SQctw2a7SdOcJTPOGFb+4K2TWiT/wjrvqJN qmFdRmH5K5W87xL2H2edFgw7vL1FQZnmXz3p X-Google-Smtp-Source: ABdhPJx6y4aurR3v4u7Rbo+36VjAeAa2BUJTSctwjjbA1zRpt67uinMfH2aiBoXA9uk1YOLnXzuKdA== X-Received: by 2002:a05:6000:85:: with SMTP id m5mr6868614wrx.378.1608337481084; Fri, 18 Dec 2020 16:24:41 -0800 (PST) From: Vitaly Wool To: qemu-devel@nongnu.org Subject: [PATCH] hw/riscv: microchip_pfsoc: specify XIP image Date: Sat, 19 Dec 2020 02:24:30 +0200 Message-Id: <20201219002430.18481-1-vitaly.wool@konsulko.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=vitaly.wool@konsulko.com; helo=mail-wr1-x42b.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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vitaly Wool Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @konsulko.com) Content-Type: text/plain; charset="utf-8" Add command line parameter to microchip_pfsoc machine to be able to specify XIP kernel image file. To pass over XIP image file, it will be enough to run $ qemu-system-riscv64 -M microchip-icicle-kit,xipImage=3D ... Signed-off-by: Vitaly Wool --- hw/riscv/microchip_pfsoc.c | 42 +++++++++++++++++++++++++++--- include/hw/riscv/microchip_pfsoc.h | 1 + 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index e952b49e8c..04d81d52fe 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -181,6 +181,7 @@ static void microchip_pfsoc_soc_instance_init(Object *o= bj) static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) { MachineState *ms =3D MACHINE(qdev_get_machine()); + MicrochipIcicleKitState *mks =3D MICROCHIP_ICICLE_KIT_MACHINE(ms); MicrochipPFSoCState *s =3D MICROCHIP_PFSOC(dev); const struct MemmapEntry *memmap =3D microchip_pfsoc_memmap; MemoryRegion *system_memory =3D get_system_memory(); @@ -415,10 +416,19 @@ static void microchip_pfsoc_soc_realize(DeviceState *= dev, Error **errp) memmap[MICROCHIP_PFSOC_IOSCB].base); =20 /* QSPI Flash */ - memory_region_init_rom(qspi_xip_mem, OBJECT(dev), - "microchip.pfsoc.qspi_xip", - memmap[MICROCHIP_PFSOC_QSPI_XIP].size, - &error_fatal); + if (mks->xip_image) { + memory_region_init_ram_from_file(qspi_xip_mem, OBJECT(dev), + "microchip.pfsoc.qspi_xip", + memmap[MICROCHIP_PFSOC_QSPI_XIP].= size, + 0x10000 /* align */, 0 /* ram_fla= gs */, + mks->xip_image, &error_fatal); + qspi_xip_mem->readonly =3D true; + } else { + memory_region_init_rom(qspi_xip_mem, OBJECT(dev), + "microchip.pfsoc.qspi_xip", + memmap[MICROCHIP_PFSOC_QSPI_XIP].size, + &error_fatal); + } memory_region_add_subregion(system_memory, memmap[MICROCHIP_PFSOC_QSPI_XIP].base, qspi_xip_mem); @@ -517,6 +527,24 @@ static void microchip_icicle_kit_machine_init(MachineS= tate *machine) } } =20 +static void microchip_pfsoc_prop_set_xipimage(Object *obj, + const char *value, + Error **errp) +{ + MicrochipIcicleKitState *s =3D MICROCHIP_ICICLE_KIT_MACHINE(obj); + + g_free(s->xip_image); + s->xip_image =3D g_strdup(value); +} + +static char *microchip_pfsoc_prop_get_xipimage(Object *obj, + Error **errp) +{ + MicrochipIcicleKitState *s =3D MICROCHIP_ICICLE_KIT_MACHINE(obj); + + return g_strdup(s->xip_image); +} + static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void = *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -536,6 +564,12 @@ static void microchip_icicle_kit_machine_class_init(Ob= jectClass *oc, void *data) * See memory_tests() in mss_ddr.c in the HSS source code. */ mc->default_ram_size =3D 1537 * MiB; + + object_class_property_add_str(oc, "xipImage", + microchip_pfsoc_prop_get_xipimage, + microchip_pfsoc_prop_set_xipimage); + object_class_property_set_description(oc, "xipImage", + "Kernel XIP image to run from QSPI NOR= "); } =20 static const TypeInfo microchip_icicle_kit_machine_typeinfo =3D { diff --git a/include/hw/riscv/microchip_pfsoc.h b/include/hw/riscv/microchi= p_pfsoc.h index d0c666aae0..a7b180a5d4 100644 --- a/include/hw/riscv/microchip_pfsoc.h +++ b/include/hw/riscv/microchip_pfsoc.h @@ -65,6 +65,7 @@ typedef struct MicrochipIcicleKitState { =20 /*< public >*/ MicrochipPFSoCState soc; + char *xip_image; } MicrochipIcicleKitState; =20 #define TYPE_MICROCHIP_ICICLE_KIT_MACHINE \ --=20 2.20.1