From nobody Wed Nov 19 08:25:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615395947; cv=none; d=zohomail.com; s=zohoarc; b=KOfDe9Jm83y05G1WAHCampGewnV5+kMJZSS/MIYcGtJE3bPgF7XzhVRGmtRfOcdRTkgBjxY4CVzhCtAUg2anVAGN78MwJ4i/pe0KfB2pzyz1vEYalD9WmPRPDo8LVQRfAH+tMbNolwfWDdHr5e4tGogfukSvVKY3gAhan04/NVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615395947; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=s0XsNDgI0CDlEbZP3vlZQ/DMh7G89YHXSewtt1cAdSI=; b=X3GXvCR9+r/4F9l7qLCYUb6khd3CElikAZuwhtG/YLDUnsklY5tihRZGAShoWyudSUVy8Vjb036Ad+eaApWOYt1xRF4j8xvsAtCJGlhDpkwA5t3+/wSFtTCQ8K6jGv3k5Z7recZ30THqXzxFvGrOb/MfZmll+QmC3/gPDDsDf34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1615395946958303.7788545745118; Wed, 10 Mar 2021 09:05:46 -0800 (PST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-439-_Sltnxd2PWm1er7iYBDvSw-1; Wed, 10 Mar 2021 12:05:43 -0500 Received: by mail-ed1-f71.google.com with SMTP id k8so8675033edn.19 for ; Wed, 10 Mar 2021 09:05:42 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id de17sm41418ejc.16.2021.03.10.09.05.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 09:05:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615395944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s0XsNDgI0CDlEbZP3vlZQ/DMh7G89YHXSewtt1cAdSI=; b=VBcC9jfWCOqXxlAjw+DxPhZvpMVCAyYgb1AvyLwyFTrhexrRsTCPt23Nwrz06j4UweLrzI 8lTM+rnVlyksmyY5biyJU40tkx+pC5qnt0/+nfCFttLWYJnzlh/2yzzO+DMUa7wsQaHg30 uSpcdpNeW1jWgOBkgcWeiDxnb89HxOs= X-MC-Unique: _Sltnxd2PWm1er7iYBDvSw-1 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=s0XsNDgI0CDlEbZP3vlZQ/DMh7G89YHXSewtt1cAdSI=; b=pmjz8s/Ur49QawrEb0QZE7VNSCzv8dByD8yC0hozOJhnXf6HMQsjELehSDzdCmzPk2 ErRwquzXrfSKBuNp45W7/CT2lN0vjCqCoSrAkHBHM4D6UZD5KDwmYxDcR2Mte4vQbT16 R2mwt5UhmsB0v4r0gL3CtWJq0SRQ4gEEizpOuBX+IPRlzlHD22tF7Mjpsk6OtVuS1U+5 NUuaKof+4ydKHi00c69vIaw0gfWwPnuy4OR14Uj4WyZzr9Q/VgbzRD/ys1j/0BPyinCL FhIUcms7Hn7C85+JsNYvMAPlrJJoXXvbxdlzUKxlC2E1HZQ/bCJWAvSaYAp3YpRt47Dl suUg== X-Gm-Message-State: AOAM531SBr5PQFai2jJdrTHdELgkATXkuSX0OphCwZx7uk9dUNLYW7oL 5Zp+Q2vghtoAOwoLNN67u8PvJ+FAoXUNa6DLZugtUBVjI5JPj7/u6/3mXcqKrqQsuZQ7CsEZpuF 908B80APvkQxIYw== X-Received: by 2002:a17:906:4150:: with SMTP id l16mr4820210ejk.90.1615395941502; Wed, 10 Mar 2021 09:05:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCdYgOOtn6sbnynnldYDbeZlnSg126+PI4KNMQHyBsLpnjgo6YNRnRqHGXmmrf6FgiaAwUiw== X-Received: by 2002:a17:906:4150:: with SMTP id l16mr4820191ejk.90.1615395941342; Wed, 10 Mar 2021 09:05:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alistair Francis , Max Reitz , David Edmondson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Stephen Checkoway , Kevin Wolf , Bin Meng Subject: [PATCH v2 02/12] hw/block/pflash_cfi01: Extract pflash_cfi01_fill_cfi_table() Date: Wed, 10 Mar 2021 18:05:18 +0100 Message-Id: <20210310170528.1184868-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210310170528.1184868-1-philmd@redhat.com> References: <20210310170528.1184868-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Fill the CFI table in out of DeviceRealize() in a new function: pflash_cfi01_fill_cfi_table(). Reviewed-by: Bin Meng Reviewed-by: David Edmondson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/pflash_cfi01.c | 140 +++++++++++++++++++++------------------- 1 file changed, 73 insertions(+), 67 deletions(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index b6919bbe474..03472ea5b64 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -704,30 +704,11 @@ static const MemoryRegionOps pflash_cfi01_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -static void pflash_cfi01_realize(DeviceState *dev, Error **errp) +static void pflash_cfi01_fill_cfi_table(PFlashCFI01 *pfl) { - ERRP_GUARD(); - PFlashCFI01 *pfl =3D PFLASH_CFI01(dev); - uint64_t total_len; - int ret; uint64_t blocks_per_device, sector_len_per_device, device_len; int num_devices; =20 - if (pfl->sector_len =3D=3D 0) { - error_setg(errp, "attribute \"sector-length\" not specified or zer= o."); - return; - } - if (pfl->nb_blocs =3D=3D 0) { - error_setg(errp, "attribute \"num-blocks\" not specified or zero."= ); - return; - } - if (pfl->name =3D=3D NULL) { - error_setg(errp, "attribute \"name\" not specified."); - return; - } - - total_len =3D pfl->sector_len * pfl->nb_blocs; - /* * These are only used to expose the parameters of each device * in the cfi_table[]. @@ -742,53 +723,6 @@ static void pflash_cfi01_realize(DeviceState *dev, Err= or **errp) } device_len =3D sector_len_per_device * blocks_per_device; =20 - memory_region_init_rom_device( - &pfl->mem, OBJECT(dev), - &pflash_cfi01_ops, - pfl, - pfl->name, total_len, errp); - if (*errp) { - return; - } - - pfl->storage =3D memory_region_get_ram_ptr(&pfl->mem); - sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); - - if (pfl->blk) { - uint64_t perm; - pfl->ro =3D !blk_supports_write_perm(pfl->blk); - perm =3D BLK_PERM_CONSISTENT_READ | (pfl->ro ? 0 : BLK_PERM_WRITE); - ret =3D blk_set_perm(pfl->blk, perm, BLK_PERM_ALL, errp); - if (ret < 0) { - return; - } - } else { - pfl->ro =3D 0; - } - - if (pfl->blk) { - if (!blk_check_size_and_read_all(pfl->blk, pfl->storage, total_len, - errp)) { - vmstate_unregister_ram(&pfl->mem, DEVICE(pfl)); - return; - } - } - - /* - * Default to devices being used at their maximum device width. This w= as - * assumed before the device_width support was added. - */ - if (!pfl->max_device_width) { - pfl->max_device_width =3D pfl->device_width; - } - - pfl->wcycle =3D 0; - /* - * The command 0x00 is not assigned by the CFI open standard, - * but QEMU historically uses it for the READ_ARRAY command (0xff). - */ - pfl->cmd =3D 0x00; - pfl->status =3D 0x80; /* WSM ready */ /* Hardcoded CFI table */ /* Standard "QRY" string */ pfl->cfi_table[0x10] =3D 'Q'; @@ -876,6 +810,78 @@ static void pflash_cfi01_realize(DeviceState *dev, Err= or **errp) pfl->cfi_table[0x3f] =3D 0x01; /* Number of protection fields */ } =20 +static void pflash_cfi01_realize(DeviceState *dev, Error **errp) +{ + ERRP_GUARD(); + PFlashCFI01 *pfl =3D PFLASH_CFI01(dev); + uint64_t total_len; + int ret; + + if (pfl->sector_len =3D=3D 0) { + error_setg(errp, "attribute \"sector-length\" not specified or zer= o."); + return; + } + if (pfl->nb_blocs =3D=3D 0) { + error_setg(errp, "attribute \"num-blocks\" not specified or zero."= ); + return; + } + if (pfl->name =3D=3D NULL) { + error_setg(errp, "attribute \"name\" not specified."); + return; + } + + total_len =3D pfl->sector_len * pfl->nb_blocs; + + memory_region_init_rom_device( + &pfl->mem, OBJECT(dev), + &pflash_cfi01_ops, + pfl, + pfl->name, total_len, errp); + if (*errp) { + return; + } + + pfl->storage =3D memory_region_get_ram_ptr(&pfl->mem); + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); + + if (pfl->blk) { + uint64_t perm; + pfl->ro =3D !blk_supports_write_perm(pfl->blk); + perm =3D BLK_PERM_CONSISTENT_READ | (pfl->ro ? 0 : BLK_PERM_WRITE); + ret =3D blk_set_perm(pfl->blk, perm, BLK_PERM_ALL, errp); + if (ret < 0) { + return; + } + } else { + pfl->ro =3D 0; + } + + if (pfl->blk) { + if (!blk_check_size_and_read_all(pfl->blk, pfl->storage, total_len, + errp)) { + vmstate_unregister_ram(&pfl->mem, DEVICE(pfl)); + return; + } + } + + /* + * Default to devices being used at their maximum device width. This w= as + * assumed before the device_width support was added. + */ + if (!pfl->max_device_width) { + pfl->max_device_width =3D pfl->device_width; + } + + pfl->wcycle =3D 0; + /* + * The command 0x00 is not assigned by the CFI open standard, + * but QEMU historically uses it for the READ_ARRAY command (0xff). + */ + pfl->cmd =3D 0x00; + pfl->status =3D 0x80; /* WSM ready */ + pflash_cfi01_fill_cfi_table(pfl); +} + static void pflash_cfi01_system_reset(DeviceState *dev) { PFlashCFI01 *pfl =3D PFLASH_CFI01(dev); --=20 2.26.2