From patchwork Fri Jan 25 15:57:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 1031161 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43mNwV5Fvfz9s7T for ; Sat, 26 Jan 2019 02:58:18 +1100 (AEDT) Received: from localhost ([127.0.0.1]:46588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn3s0-0008OK-OV for incoming@patchwork.ozlabs.org; Fri, 25 Jan 2019 10:58:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn3rT-0008K9-5T for qemu-devel@nongnu.org; Fri, 25 Jan 2019 10:57:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gn3rQ-00084A-TH for qemu-devel@nongnu.org; Fri, 25 Jan 2019 10:57:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40972) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gn3rB-0007yB-Cz; Fri, 25 Jan 2019 10:57:30 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06A6CBDD0; Fri, 25 Jan 2019 15:57:19 +0000 (UTC) Received: from localhost (ovpn-117-242.ams2.redhat.com [10.36.117.242]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F4D26EE28; Fri, 25 Jan 2019 15:57:12 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 15:57:11 +0000 Message-Id: <20190125155711.2351-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 25 Jan 2019 15:57:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] pflash: flush rom device memory region X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Max Reitz , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" pflash devices should mark the memory region dirty and invalidate TBs after directly writing to the RAM backing the ROM device. Note that pflash_cfi01_get_memory() is used by several machine types to populate ROM contents directly. Callers are untouched by this patch because they only modify memory before the guest is started. Signed-off-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daudé --- Based-on: <20190123212234.32068-1-stefanha@redhat.com> Split from the original patch series. Philippe asked me to drop the flush calls in ->realize() since they are unnecessary. Peter: Your ARM tree has the memory_region_flush_rom_device() patch that this depends on, so it may be easiest for this to go via your tree. hw/block/pflash_cfi01.c | 3 +++ hw/block/pflash_cfi02.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index bffb4c40e7..2f0b9c4c02 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -446,6 +446,7 @@ static inline void pflash_data_write(pflash_t *pfl, hwaddr offset, break; } + memory_region_flush_rom_device(&pfl->mem, offset, width); } static void pflash_write(pflash_t *pfl, hwaddr offset, @@ -482,6 +483,8 @@ static void pflash_write(pflash_t *pfl, hwaddr offset, if (!pfl->ro) { memset(p + offset, 0xff, pfl->sector_len); pflash_update(pfl, offset, pfl->sector_len); + memory_region_flush_rom_device(&pfl->mem, offset, + pfl->sector_len); } else { pfl->status |= 0x20; /* Block erase error */ } diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 0f8b7b8c7b..47edce8dcf 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -378,6 +378,8 @@ static void pflash_write (pflash_t *pfl, hwaddr offset, pflash_update(pfl, offset, 4); break; } + + memory_region_flush_rom_device(&pfl->orig_mem, offset, width); } pfl->status = 0x00 | ~(value & 0x80); /* Let's pretend write is immediate */ @@ -426,6 +428,8 @@ static void pflash_write (pflash_t *pfl, hwaddr offset, if (!pfl->ro) { memset(pfl->storage, 0xFF, pfl->chip_len); pflash_update(pfl, 0, pfl->chip_len); + memory_region_flush_rom_device(&pfl->orig_mem, 0, + pfl->chip_len); } pfl->status = 0x00; /* Let's wait 5 seconds before chip erase is done */ @@ -441,6 +445,8 @@ static void pflash_write (pflash_t *pfl, hwaddr offset, if (!pfl->ro) { memset(p + offset, 0xFF, pfl->sector_len); pflash_update(pfl, offset, pfl->sector_len); + memory_region_flush_rom_device(&pfl->orig_mem, offset, + pfl->sector_len); } pfl->status = 0x00; /* Let's wait 1/2 second before sector erase is done */