From nobody Fri May 17 21:35:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615155995; cv=none; d=zohomail.com; s=zohoarc; b=aTsyDkwIGp3j/pHvB1fXLyqjgeXn17ZgjAmC3LoWBxc6UUDtxIVwyFJ3arx89y9YaL3yhnbvJD+pjngDr6lWS4Ntd8/g+AGCXLcYk9Z41BFTWxGgnyKYgtoz1mYQDTR8YuBy4GstRv3vUvNRgM2iBkF1ywDS1PcCUaZkcHyaPhA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615155995; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IXFyeqK1CTpX3BeruT6hgoEpNJU4XbuAmq1jWxI1ce0=; b=hbUqtWAxfw0XnAMRaDVmCxwgr9GUwM4T08nvq88KDjsvP/we+yf6V9+McVEs18PgoCQUYVwk5/ypxis0wE4Mqjfj/e3ZAAhTi+z/SJSflqRSiAxqX4qaKUbERNzl90b+6NT1BBvERarlJ0OkotrWfLTIY3M0PafDUrJCTy8n/Lw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1615155995778254.745641471431; Sun, 7 Mar 2021 14:26:35 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id r15-20020a05600c35cfb029010e639ca09eso2672875wmq.1 for ; Sun, 07 Mar 2021 14:26:35 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y18sm7651000wrw.39.2021.03.07.14.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 14:26:33 -0800 (PST) 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=IXFyeqK1CTpX3BeruT6hgoEpNJU4XbuAmq1jWxI1ce0=; b=sD9qbS0fWhWvt05Ei8vEt3U1rTE+JEYpE7xBlc2nN6PKRyBh7FwOysRoiav1YTgW3J J9cJlej7hFd1VkgH7PNjKyhBNIZ6W5WVFL8AaNVBt6593fc+ChvTjFyd+mt0W/At3xe7 uCtqh1T9io/O6OLYooPIv1P4YwRS+AqogTtvigSXRZMf6hMcub//UqTQQXloCAlmM8Kx RiF4a4H3PwotrmsUGTg2tHNtHQ53HRDi97rBBmee59O4XcxQD2JciGp6GBe+Ztm1olB3 6QVOIcIjt0feq9YbEJO1p21kKhcHjSzNbK2TEUYNFpsPWSYQ5WxmSCREc25C/wc3Bxjb xW9A== 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=IXFyeqK1CTpX3BeruT6hgoEpNJU4XbuAmq1jWxI1ce0=; b=FufGeAUxlfhILRAGeW7KVh8wK7HC2IDM0K1LK4UMd0cu3f/Kk+08ZP1xOU/KzlvjI1 cJe0PvQO8mVvLpwWhGn8Kx3MxXDczEVzSo1kEIjc+h8A+hzfFeuwnflO9eI5v98wS3iD WSYBw7M4wRMn70TX9ju9e6kHWR6eIgBpGCpUfD2nGes26UwfKMYzlhok/LjgUoz7iZZq IPJS0syy0RnvU/KGC1Ew+tif+RBWl7fxdBwFSrvYbwvRVkDqck4DrV+zgdmMuOavR8CZ 6r4OA6FPacGtaBJHNpIk4ALtzcfHUXdmF1g2qACMxC1A8ss22cJF/jpaxy2lNdn12irk a4Hw== X-Gm-Message-State: AOAM5316snul9AjVEYBW41DCmKmij6z2ZBBY1MxPT7fcQ4751NFoPSic ufPL4snmluWGsXY7G81bi9w= X-Google-Smtp-Source: ABdhPJwEZI9+cwNyR2xYkhawW7HxyYUEpg+gjWEa6EjaudXqiA063myUhNzmeMjW8Mj2LQ3RBNOtiQ== X-Received: by 2002:a1c:1fc6:: with SMTP id f189mr19409691wmf.68.1615155994040; Sun, 07 Mar 2021 14:26:34 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, "Michael S. Tsirkin" , Eduardo Habkost , Jiaxun Yang , Max Filippov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Aurelien Jarno , Paolo Bonzini , qemu-block@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Kevin Wolf , Max Reitz Subject: [PATCH 1/4] hw/i386/pc: Get pflash MemoryRegion with sysbus_mmio_get_region() Date: Sun, 7 Mar 2021 23:26:22 +0100 Message-Id: <20210307222625.347268-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210307222625.347268-1-f4bug@amsat.org> References: <20210307222625.347268-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) TYPE_PFLASH_CFI01 is a TYPE_SYS_BUS_DEVICE which registers its romd MemoryRegion with sysbus_init_mmio(), so we can use the generic sysbus_mmio_get_region() to get the region, no need for a specific pflash_cfi01_get_memory() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_sysfw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index 9fe72b370e8..caad9cbd5eb 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -297,7 +297,7 @@ static void pc_system_flash_map(PCMachineState *pcms, 0x100000000ULL - total_size); =20 if (i =3D=3D 0) { - flash_mem =3D pflash_cfi01_get_memory(system_flash); + flash_mem =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(system_fla= sh), 0); pc_isa_bios_init(rom_memory, flash_mem, size); =20 /* Encrypt the pflash boot ROM */ --=20 2.26.2 From nobody Fri May 17 21:35:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 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=1615156001; cv=none; d=zohomail.com; s=zohoarc; b=TRIz0ZC43bQ/vEl3/9Az0FCWCrq+ytguW5QpwIJmh1yp4kdL8uMpLX7Y3rfquevNQN3tFJqrbVJAo54MQDxRkShJKzZXve99WmW2bnB+r4NSWe2PkSRuK6k98V5vf+RwH2uI7oH5E2NcfyyTs3c5EOS+w76VoNdIu5KW0GDlgRc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615156001; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l+x3ilWAF4HBxRoA4j1jhis87Mqt2ccHGS29X/ly8xQ=; b=TMXBGAU6Cw6bvUKeX0fk2nyPtImgcI3o0WjwMCt58wS4swQHKgAvRMPQWYuh4PXLf4RH28pHqJKC7Eq4kfwd5bpH0OTng1T0ankqSOIwDm/uqk3FCAaV4fYqs3qv1etC2Q+NOoCPdabf++bfZwrsPvZU1Us+nax7EltfXcbNxzo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1615156001167561.5064600737376; Sun, 7 Mar 2021 14:26:41 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id m20-20020a7bcb940000b029010cab7e5a9fso2669832wmi.3 for ; Sun, 07 Mar 2021 14:26:40 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id i3sm15276232wra.66.2021.03.07.14.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 14:26:39 -0800 (PST) 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=l+x3ilWAF4HBxRoA4j1jhis87Mqt2ccHGS29X/ly8xQ=; b=lJQbqDxyPL7OkfklQEPEdF4dkq2hcD7h7dD+9+TJj0NzweP2sOTO40MZkYuvOU3OCo ZwDaAT8XtuPDTaR6xXniwM9ubHVKhTVASIWMbaVq5nnwsip4YnGqFILk/iYPpeHybRJc xII+2OOtuCTQUwB60uIXF6ue/WUD4m4glRwd7pE7laAUMrcSMHmSmWbwKBNIwNW4uJwp zmMKRiSylhlmbiGu+kG7wQxT2NeaXM8Il03/hPJSosMmgmQ7ZC3Ql3cnQU4cbUO80q+P 7EgtKYVKJZYEK0i+eAcyOVqThiWHTpX+PEhQkiT27mMduzYPlAReruG2FgY1bvloSPQy 12/w== 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=l+x3ilWAF4HBxRoA4j1jhis87Mqt2ccHGS29X/ly8xQ=; b=PWOVxS29GR1ihqL5kTx2kK24CMD5fOXGNQdDj0cdoLeNuhcSX4r1lVx0B8dwbYBuDS mlzkZ1/D0pscqlWEj7BOVfntiLAjzW8SxJJtP+euFR94oazzluE7sS9FTjyj0fjOuvN9 q7okglxTmC7xFIkXvtVUR47ymex4MsqdqBZoMoA2AAeOu3ALZKLtmfyb3d7cwfepEQKt adtVSytp6ZlNUpyihm0sAKsUXintenbhEq274Vh/dWXa6nZnbFVw0tHrfJeEN+3kFkEJ T0Vj6V6N5FqM9ZPYPAFn/GwJBoVyJNw0jV+V9lHz8c1hiW0xU0y5jvDKhmwFP9aEY6gD EI1A== X-Gm-Message-State: AOAM531JK5SFq5/GsspB92+iEPGjfp/9VN0m1gHC2Tsw5AcNcm2pjh5S lp89X3+qIO4X1f0sXS/nB1Elk5qju9g= X-Google-Smtp-Source: ABdhPJyUhNO/SIB2PXWMtVRQU048vlvq05i9AeNOH5BfX+1XIiVkImWodcADLM3sSQm91Dmr1WSoaw== X-Received: by 2002:a1c:f702:: with SMTP id v2mr18811766wmh.131.1615155999449; Sun, 07 Mar 2021 14:26:39 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, "Michael S. Tsirkin" , Eduardo Habkost , Jiaxun Yang , Max Filippov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Aurelien Jarno , Paolo Bonzini , qemu-block@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Kevin Wolf , Max Reitz Subject: [PATCH 2/4] hw/mips/malta: Get pflash MemoryRegion with sysbus_mmio_get_region() Date: Sun, 7 Mar 2021 23:26:23 +0100 Message-Id: <20210307222625.347268-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210307222625.347268-1-f4bug@amsat.org> References: <20210307222625.347268-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) TYPE_PFLASH_CFI01 is a TYPE_SYS_BUS_DEVICE which registers its romd MemoryRegion with sysbus_init_mmio(), so we can use the generic sysbus_mmio_get_region() to get the region, no need for a specific pflash_cfi01_get_memory() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 9afc0b427bf..43b985bccf9 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1295,7 +1295,7 @@ void mips_malta_init(MachineState *machine) dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, 65536, 4, 0x0000, 0x0000, 0x0000, 0x0000, be); - bios =3D pflash_cfi01_get_memory(fl); + bios =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(fl), 0); fl_idx++; if (kernel_filename) { ram_low_size =3D MIN(ram_size, 256 * MiB); --=20 2.26.2 From nobody Fri May 17 21:35:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615156006; cv=none; d=zohomail.com; s=zohoarc; b=j2Ectfx/erh//sWd8kqsP3JRlKXC/3xMBU3nb6WZlNPl4MTtft2INdONHKhW+FnlhyANtxtlHI0wd0lWM2U+TwGIsefFz9mzgH7N3qX8GTSIsE1tpM9F8RPkdwuqD/JbR26D2NiKldYLoeeSTTwHd+hBX3+96ar7wGYEQeiBmfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615156006; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0BCq3Drp2YKmgjdsiPGLc9i+7eBAXIDTVaKRreDzvDM=; b=LZK7fhAl+8lpJyCzYGOYlLwwASVa7xjy5NsqLkUqeTD2VflNcPjqgSCrUMNuwGF487zMNATgIRcEBz0bwpleuGy0ENiBdYRYSTYuHKVVy1Ti0NKDOghwzqp1j4CpGghWQNl/OQXSPFiPkBmMT4PvQE9ahZ19sDTICHxRvarAOUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1615156006440934.4041921730787; Sun, 7 Mar 2021 14:26:46 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id c76-20020a1c9a4f0000b029010c94499aedso2670299wme.0 for ; Sun, 07 Mar 2021 14:26:45 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id o13sm16337145wro.15.2021.03.07.14.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 14:26:44 -0800 (PST) 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=0BCq3Drp2YKmgjdsiPGLc9i+7eBAXIDTVaKRreDzvDM=; b=ZOCdMAD0FzW8aTBJIhDc/isYkoXmf1d90CMtnqiCnakGiu3dEblkp21rP7wUPULtp5 eVC2b2X7buuSSiLDz8Kd6UTU9wtdOSAIOVVbBBFMAkPA1dSVP0D7mJ5fxMLGtrbzuyN0 ZFp7jtLpbh+XC+jqOsN3gXFCY9V4BPKx/cDb4QNE/5MM0tntsmWugj7B00DPUJuX70pv CUompYNuab/zWBFsnaGywoX7fY/bbfWFPNRuqvIIVMa+YRTF1GEIG46GuoTwnb+P0TSU lVSFPvjQuq86xIRfXDvBOK//KFS5xcun9wFcmIr+YiQViu7S5VTF5iU/fpBF9/1noE9l UN9A== 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=0BCq3Drp2YKmgjdsiPGLc9i+7eBAXIDTVaKRreDzvDM=; b=alNAoB6eFBzjx/q7wPcUX4p/KHL0V6UE4hDb80FRddoF0ewpl2TwqmmDzm7Z1UJ9K3 69oVSimbDkCELWBNC0FhN/z89JJNBlqBJ5yX7iTgOAJMQpfM/nt84MYGBcw9CBfLs1Vy bssWWRu28V0mzX9RYRzKX4jgxyXw5s5KX3SZ3t3i8dpbHu3KHtNS2jOgF8ftkbg2eOsT e3iWOegnZAdjznxNPL+el3WU9luaUdQD0bnmzJ99G0P5so6W8Grn55yXFBXGQ7steS0P ovQVxPUqU7Fttxr92qzt8PFQvK8ERCWBlvn/z6hYbv4FxHz6Zo6g1REh9tsfiNRWVYzg BekA== X-Gm-Message-State: AOAM533XBz/D+1MRgx8gsYqioqE1LvcCORxqY8Me9sRMKnjphY78KWOv FpbbCGVhk7DFGSxp+ZJxCqs= X-Google-Smtp-Source: ABdhPJzKzD+CBH2r3r8R7pZ5OgsuOXMSOBZDP3SbfQAZ4wu7O1KAPls9taxYfIgn4pxJ3U+oeL4VUA== X-Received: by 2002:a7b:ce19:: with SMTP id m25mr19442964wmc.74.1615156004792; Sun, 07 Mar 2021 14:26:44 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, "Michael S. Tsirkin" , Eduardo Habkost , Jiaxun Yang , Max Filippov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Aurelien Jarno , Paolo Bonzini , qemu-block@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Kevin Wolf , Max Reitz Subject: [PATCH 3/4] hw/xtensa/xtfpga: Get pflash MemoryRegion with sysbus_mmio_get_region() Date: Sun, 7 Mar 2021 23:26:24 +0100 Message-Id: <20210307222625.347268-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210307222625.347268-1-f4bug@amsat.org> References: <20210307222625.347268-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) TYPE_PFLASH_CFI01 is a TYPE_SYS_BUS_DEVICE which registers its romd MemoryRegion with sysbus_init_mmio(), so we can use the generic sysbus_mmio_get_region() to get the region, no need for a specific pflash_cfi01_get_memory() helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Max Filippov --- hw/xtensa/xtfpga.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 7be53f1895b..1d15a9aae9f 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -460,10 +460,11 @@ static void xtfpga_init(const XtfpgaBoardDesc *board,= MachineState *machine) } } else { if (flash) { - MemoryRegion *flash_mr =3D pflash_cfi01_get_memory(flash); + MemoryRegion *flash_mr; MemoryRegion *flash_io =3D g_malloc(sizeof(*flash_io)); uint32_t size =3D env->config->sysrom.location[0].size; =20 + flash_mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(flash), 0); if (board->flash->size - board->flash->boot_base < size) { size =3D board->flash->size - board->flash->boot_base; } --=20 2.26.2 From nobody Fri May 17 21:35:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615156011; cv=none; d=zohomail.com; s=zohoarc; b=Hv/bZunGLpc8FY18axtfEy6kFy0oO7L9DfKnN1Az4QLcvng939q11fFpNg2A5vHuN1VBKQ5JOOg2+Q4puCH2QSmkZg8BymH79w+m63tSPamVMILofmUlM3jIu5kN/EC6o85qQt2bvtz8weCF8gvnUAX6ZtEYJI5X3sgqP60hNrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615156011; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wZgAkdNgYHHPx7xJjD/iFjUKEdSHqpiwnSo8fnDzN4Y=; b=cdJcjHJE7XgcZXy4YAD1pcSJVE5of/Mp7DNSelEjD+X20P9LYVqMhO2Qx+b2TbiS6LmcF+ItCz1irR75J04dZHksER8xpB5gYG2M406kSq7NfsEm1waKxHVyG4LlGwZtTyEGQCZdaZzG/LYx/GhjpmTTzpvp8JmGsLW1wMELVuQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1615156011738304.32376949352556; Sun, 7 Mar 2021 14:26:51 -0800 (PST) Received: by mail-wm1-f50.google.com with SMTP id y124-20020a1c32820000b029010c93864955so2675656wmy.5 for ; Sun, 07 Mar 2021 14:26:51 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id h22sm15736238wmb.36.2021.03.07.14.26.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Mar 2021 14:26:49 -0800 (PST) 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=wZgAkdNgYHHPx7xJjD/iFjUKEdSHqpiwnSo8fnDzN4Y=; b=FIdkUaV1A183dEm4W+tX1DVeznV8BCvkKmI23ZEblgI8HldsVtHimFa0wa7/1E+4cd pAk9cG/Xz3j07v+pXbPfPIF2dOWEGkvYyEK2WVeWK7kBNmL1oazTs2YyhYoXn4NYKYHT tK0+g+sc1xpHPQ+xoH6ai5JIX2UpChkoZRCHw2wMcLXT+UVXxU6z/WeYm0UBfJAFvahe d0MPzjZW8r+FHl38QujI2D6YX9uXZ+yKXjTocFm4r8Wc1Mz/UlXUh2ww9hIeSz+TZGzD cOI0aAyZ+k/21deeYt7Va0EtTI9dO9PocjExeXEpSewxC9X2wgLnFSrb/afx/UXaW/lw Y94A== 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=wZgAkdNgYHHPx7xJjD/iFjUKEdSHqpiwnSo8fnDzN4Y=; b=oZE7RU5aHr2nj1S88h1LksvkZsnLPejEboOs3IQxhmmopc5a8dkr0QqKc7vAKVKbi2 OeNNh3dDhhZvOZlft5hr+/30nfYFNlJFNlNL0orbf8tRhHGySQnUJuZ3adflUTWc4GCn GKki52jFsDVLQBn2fnJwMt1O3oObpWhOxvsjlrvEGUelOLOQPWbmZ+72ddaz3oDtWGpY OkxAIkzGd+fs0VB15w9n25uzP7EIQ6v9PMaoHpxzoYAkGC7/7kJ44JHEHhVwL5tta16V tq418qK0gy/yJjv4BH/JwhrAJcU/CHXuL69iMjiRHZDz9QgxoPNr3AYeY3qPqpRAZCmo xvFw== X-Gm-Message-State: AOAM533+az0Pn/dEzmx0igfEPQVio9adJBcjDH2kLTunosM2szoo+Xgz V5ZyzA8CYVQmkLPh5FrFlU0= X-Google-Smtp-Source: ABdhPJyrNASPTh86DSEvpDlPLC4lO0ju1nGa3QgR02XuK+f3i9zi7YtwgccaaClSKgGVasKUBvKS9g== X-Received: by 2002:a1c:4b11:: with SMTP id y17mr18827650wma.171.1615156010040; Sun, 07 Mar 2021 14:26:50 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, "Michael S. Tsirkin" , Eduardo Habkost , Jiaxun Yang , Max Filippov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Aurelien Jarno , Paolo Bonzini , qemu-block@nongnu.org, Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Kevin Wolf , Max Reitz Subject: [PATCH 4/4] hw/block/pflash_cfi01: Remove pflash_cfi01_get_memory() Date: Sun, 7 Mar 2021 23:26:25 +0100 Message-Id: <20210307222625.347268-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210307222625.347268-1-f4bug@amsat.org> References: <20210307222625.347268-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) Since we replaced all uses of pflash_cfi01_get_memory() with sysbus_mmio_get_region(), we can now remove this unused helper. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/block/flash.h | 1 - hw/block/pflash_cfi01.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h index 7dde0adcee7..6c87b584c1d 100644 --- a/include/hw/block/flash.h +++ b/include/hw/block/flash.h @@ -22,7 +22,6 @@ PFlashCFI01 *pflash_cfi01_register(hwaddr base, uint16_t id2, uint16_t id3, int be); BlockBackend *pflash_cfi01_get_blk(PFlashCFI01 *fl); -MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl); void pflash_cfi01_legacy_drive(PFlashCFI01 *dev, DriveInfo *dinfo); =20 /* pflash_cfi02.c */ diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 22287a1522e..d6d3d94ac68 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -984,11 +984,6 @@ BlockBackend *pflash_cfi01_get_blk(PFlashCFI01 *fl) return fl->blk; } =20 -MemoryRegion *pflash_cfi01_get_memory(PFlashCFI01 *fl) -{ - return &fl->mem; -} - /* * Handle -drive if=3Dpflash for machines that use properties. * If @dinfo is null, do nothing. --=20 2.26.2