From patchwork Wed Dec 17 21:10:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 422369 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B3AE71400E9 for ; Thu, 18 Dec 2014 08:13:16 +1100 (AEDT) Received: from localhost ([::1]:51564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1LuE-0006ej-9T for incoming@patchwork.ozlabs.org; Wed, 17 Dec 2014 16:13:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1Lrz-0002aW-AZ for qemu-devel@nongnu.org; Wed, 17 Dec 2014 16:11:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1Lrt-0008Bh-1K for qemu-devel@nongnu.org; Wed, 17 Dec 2014 16:10:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1Lrs-0008Al-P0 for qemu-devel@nongnu.org; Wed, 17 Dec 2014 16:10:48 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBHLAi2f020818 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 17 Dec 2014 16:10:45 -0500 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-31.ams2.redhat.com [10.36.116.31]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sBHLAHmJ026713; Wed, 17 Dec 2014 16:10:41 -0500 From: Laszlo Ersek To: peter.maydell@linaro.org, qemu-devel@nongnu.org, rjones@redhat.com, drjones@redhat.com, lersek@redhat.com, pbonzini@redhat.com, agraf@suse.de Date: Wed, 17 Dec 2014 22:10:07 +0100 Message-Id: <1418850613-26821-6-git-send-email-lersek@redhat.com> In-Reply-To: <1418850613-26821-1-git-send-email-lersek@redhat.com> References: <1418850613-26821-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 05/11] exec: allows 8-byte accesses in subpage_ops X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Paolo Bonzini Otherwise fw_cfg accesses are split into 4-byte ones before they reach the fw_cfg ops / handlers. Signed-off-by: Paolo Bonzini Signed-off-by: Laszlo Ersek --- Notes: v5: - new in v5 [reported by Laszlo, fixed by Paolo] exec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index 963481a..619e046 100644 --- a/exec.c +++ b/exec.c @@ -1767,9 +1767,9 @@ static const MemoryRegionOps watch_mem_ops = { static uint64_t subpage_read(void *opaque, hwaddr addr, unsigned len) { subpage_t *subpage = opaque; - uint8_t buf[4]; + uint8_t buf[8]; #if defined(DEBUG_SUBPAGE) printf("%s: subpage %p len %u addr " TARGET_FMT_plx "\n", __func__, subpage, len, addr); @@ -1781,8 +1781,10 @@ static uint64_t subpage_read(void *opaque, hwaddr addr, case 2: return lduw_p(buf); case 4: return ldl_p(buf); + case 8: + return ldq_p(buf); default: abort(); } } @@ -1790,9 +1792,9 @@ static uint64_t subpage_read(void *opaque, hwaddr addr, static void subpage_write(void *opaque, hwaddr addr, uint64_t value, unsigned len) { subpage_t *subpage = opaque; - uint8_t buf[4]; + uint8_t buf[8]; #if defined(DEBUG_SUBPAGE) printf("%s: subpage %p len %u addr " TARGET_FMT_plx " value %"PRIx64"\n", @@ -1807,8 +1809,11 @@ static void subpage_write(void *opaque, hwaddr addr, break; case 4: stl_p(buf, value); break; + case 8: + stq_p(buf, value); + break; default: abort(); } address_space_write(subpage->as, addr + subpage->base, buf, len); @@ -1829,8 +1834,12 @@ static bool subpage_accepts(void *opaque, hwaddr addr, static const MemoryRegionOps subpage_ops = { .read = subpage_read, .write = subpage_write, + .impl.min_access_size = 1, + .impl.max_access_size = 8, + .valid.min_access_size = 1, + .valid.max_access_size = 8, .valid.accepts = subpage_accepts, .endianness = DEVICE_NATIVE_ENDIAN, };