From patchwork Mon Apr 22 14:11:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 10911097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A415C1515 for ; Mon, 22 Apr 2019 14:31:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 95B8E285C9 for ; Mon, 22 Apr 2019 14:31:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89DA52862C; Mon, 22 Apr 2019 14:31:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2DC95285C9 for ; Mon, 22 Apr 2019 14:31:39 +0000 (UTC) Received: from localhost ([127.0.0.1]:38140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZys-00026a-IP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 22 Apr 2019 10:31:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZwF-0007vk-TN for qemu-devel@nongnu.org; Mon, 22 Apr 2019 10:28:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIZgs-0005LK-6y for qemu-devel@nongnu.org; Mon, 22 Apr 2019 10:13:02 -0400 Received: from m12-12.163.com ([220.181.12.12]:58458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZgr-0005J2-J8 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 10:13:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=ocpxbx74syTndxPAzj CBgtsjTGrKulmkE9I+7Wjy7y8=; b=jEblY0WWsbJd32TqMq9FfXfXlz1M/C5uFR zkcq0fcoxGYEvBPn0zxxKR4sSciaciZ4TdNDg+3PkkwYQogI+G3nfzoqNH43cR7c ttpfalnQaQojET6OkgIx4fIZvt28FDzTyL/PeJuV8UPjtBC9kb48cP+VkBcPv2UC vSxul3U4w= Received: from localhost.localdomain (unknown [183.159.69.175]) by smtp8 (Coremail) with SMTP id DMCowACXUzO0y71cvQ2cBg--.39054S4; Mon, 22 Apr 2019 22:12:08 +0800 (CST) From: Li Qiang To: jslaby@suse.cz, pbonzini@redhat.com Date: Mon, 22 Apr 2019 07:11:55 -0700 Message-Id: <20190422141156.15746-3-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190422141156.15746-1-liq3ea@163.com> References: <20190422141156.15746-1-liq3ea@163.com> X-CM-TRANSID: DMCowACXUzO0y71cvQ2cBg--.39054S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrJryrCw15Zr4UAr13CryxAFb_yoWxArc_X3 yjka93ZrWq9Fyak3WqvFn5Zr17tw4rZrZxZw4Iqrs7ArZ0krWrA34v9FnrGr4SqrZxWryU Z3yDuF92kr9IgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8t5r7UUUUU== X-Originating-IP: [183.159.69.175] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbitByebVSIbq8CGwAAsf X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v3 2/3] edu: mmio: allow 64-bit access in read dispatch 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: philmd@redhat.com, liq3ea@gmail.com, qemu-devel@nongnu.org, Li Qiang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The edu spec says when address >= 0x80, the MMIO area can be accessed by 64-bit. Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daude --- Change since v2: Fix an error per Phillippe's advice hw/misc/edu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 65fc32b928..33de05141f 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -185,7 +185,11 @@ static uint64_t edu_mmio_read(void *opaque, hwaddr addr, unsigned size) EduState *edu = opaque; uint64_t val = ~0ULL; - if (size != 4) { + if (addr < 0x80 && size != 4) { + return val; + } + + if (addr >= 0x80 && size != 4 && size != 8) { return val; }