From nobody Tue Feb 10 19:14:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+95243+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95243+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1665766208; cv=none; d=zohomail.com; s=zohoarc; b=KdJd/D/3EFd/JvvhTK+6wNdYQa6bT4QB7+WcagwLO05YV88CC6xuRuEuAnlkQKZyeqpjJGSR8QtVpMUNgFIZ5JChTjL/ljfwH1o6HoHyDVSoJxEQ3mam7E0vP2mZopA7/VNbVdvXVvDrCi/2ZCZQjjwKblKdXCSS0NwhgQPWG5Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1665766208; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Aq4kUUUv3gxNJUEnw3GaZnkDsd07gsQ+9pYQHXSQw7g=; b=hdxyUm13035WhGKnrnrWC5T31Ock3/NG9GxJTQuSThq78jduAbzg7PP6hao7seISmmKAicxsbjm0eysSKaaSvpVgtDErOYvf3eVQYK5gVke86qyCs7HMIFjZVwF3ay3mBJ0/sDlqhYBl1Dp9qwkcBvrrMIn7H742d3I8or+SULk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95243+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 166576620889299.16431825544203; Fri, 14 Oct 2022 09:50:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id vWrLYY1788612xZJxld1FQUu; Fri, 14 Oct 2022 09:50:08 -0700 X-Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web08.9721.1665766206462408920 for ; Fri, 14 Oct 2022 09:50:06 -0700 X-Received: by mail-pl1-f176.google.com with SMTP id f23so5262352plr.6 for ; Fri, 14 Oct 2022 09:50:06 -0700 (PDT) X-Gm-Message-State: ZVSrSz2BmaX7Xlvi4l5jf8OEx1787277AA= X-Google-Smtp-Source: AMsMyM61Ku6lgqhWLPz6YgqZsP9S3qkVaPkT+L3rRxJFeX68irXZwnbeerH19GXG0FOWETXpm4bMKg== X-Received: by 2002:a17:902:dad2:b0:17f:7439:20f2 with SMTP id q18-20020a170902dad200b0017f743920f2mr6060131plx.29.1665766205730; Fri, 14 Oct 2022 09:50:05 -0700 (PDT) X-Received: from localhost.localdomain ([49.206.13.138]) by smtp.gmail.com with ESMTPSA id f3-20020a62db03000000b0056265011136sm1963368pfg.112.2022.10.14.09.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 09:50:05 -0700 (PDT) From: "Sunil V L" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Jiewen Yao , Jordan Justen , Gerd Hoffmann Subject: [edk2-devel] [edk2-staging/RiscV64QemuVirt PATCH V4 30/34] OvmfPkg/NorFlashDxe: Avoid switching to array mode during writes Date: Fri, 14 Oct 2022 22:18:32 +0530 Message-Id: <20221014164836.1513036-31-sunilvl@ventanamicro.com> In-Reply-To: <20221014164836.1513036-1-sunilvl@ventanamicro.com> References: <20221014164836.1513036-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,sunilvl@ventanamicro.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1665766208; bh=LV5TrreB5JsrFxuiqVLJk8y7zpKG2Wbi1w4fnpcWizE=; h=Cc:Date:From:Reply-To:Subject:To; b=QWzQlsU4mEi+Z7j/pIj1DIe11eWBLIZ0FjS7mm7eKUdCJKCEHxgZ02kJOPcseL1kVXt IDV3EaXMU2Fshp+B2UAiiikXjr7IP/8sNXJwMjeRCcYiJw3P+kIGS+mJhHGLVnw7q6Nby Axu7DW/n+/8U5YZziEuK+IIeYonKTCMxQfE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1665766209328100006 Content-Type: text/plain; charset="utf-8" Switching to array mode (i.e., ROM memory mode rather than NOR flash programming mode) is rather costly when running under KVM emulation, as it involves setting up the read-only memslot in the hypervisor's stage 2 page tables. So let's avoid jumping between modes unnecessarily, and only switch back to array mode when we are done writing to flash. Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Signed-off-by: Ard Biesheuvel --- OvmfPkg/Drivers/NorFlashDxe/NorFlash.c | 9 +++------ OvmfPkg/Drivers/NorFlashDxe/NorFlashDxe.c | 3 +++ OvmfPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.c | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/Drivers/NorFlashDxe/NorFlash.c b/OvmfPkg/Drivers/NorFl= ashDxe/NorFlash.c index c2a6aa281578..cdc6b5da8bfb 100644 --- a/OvmfPkg/Drivers/NorFlashDxe/NorFlash.c +++ b/OvmfPkg/Drivers/NorFlashDxe/NorFlash.c @@ -205,9 +205,6 @@ NorFlashWriteSingleWord ( SEND_NOR_COMMAND (Instance->DeviceBaseAddress, 0, P30_CMD_CLEAR_STATUS= _REGISTER); } =20 - // Put device back into Read Array mode - SEND_NOR_COMMAND (Instance->DeviceBaseAddress, 0, P30_CMD_READ_ARRAY); - return Status; } =20 @@ -338,9 +335,6 @@ NorFlashWriteBuffer ( } =20 EXIT: - // Put device back into Read Array mode - SEND_NOR_COMMAND (Instance->DeviceBaseAddress, 0, P30_CMD_READ_ARRAY); - return Status; } =20 @@ -750,6 +744,9 @@ NorFlashWriteSingleBlock ( } =20 TempStatus =3D NorFlashWriteSingleWord (Instance, WordAddr, WordToWr= ite); + // Put device back into Read Array mode + SEND_NOR_COMMAND (Instance->DeviceBaseAddress, 0, P30_CMD_READ_ARRAY= ); + if (EFI_ERROR (TempStatus)) { return EFI_DEVICE_ERROR; } diff --git a/OvmfPkg/Drivers/NorFlashDxe/NorFlashDxe.c b/OvmfPkg/Drivers/No= rFlashDxe/NorFlashDxe.c index f7b92de21a57..862a8e621fd0 100644 --- a/OvmfPkg/Drivers/NorFlashDxe/NorFlashDxe.c +++ b/OvmfPkg/Drivers/NorFlashDxe/NorFlashDxe.c @@ -316,6 +316,9 @@ NorFlashWriteFullBlock ( } =20 EXIT: + // Put device back into Read Array mode + SEND_NOR_COMMAND (Instance->DeviceBaseAddress, 0, P30_CMD_READ_ARRAY); + if (!EfiAtRuntime ()) { // Interruptions can resume. gBS->RestoreTPL (OriginalTPL); diff --git a/OvmfPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.c b/OvmfPkg/D= rivers/NorFlashDxe/NorFlashStandaloneMm.c index b72ad97b0b55..f6dec84176d4 100644 --- a/OvmfPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.c +++ b/OvmfPkg/Drivers/NorFlashDxe/NorFlashStandaloneMm.c @@ -270,6 +270,9 @@ NorFlashWriteFullBlock ( } =20 EXIT: + // Put device back into Read Array mode + SEND_NOR_COMMAND (Instance->DeviceBaseAddress, 0, P30_CMD_READ_ARRAY); + if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "NOR FLASH Programming [WriteSingleBlock] failed = at address 0x%08x. Exit Status =3D \"%r\".\n", WordAddress, Status)); } --=20 2.38.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95243): https://edk2.groups.io/g/devel/message/95243 Mute This Topic: https://groups.io/mt/94330867/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-