From patchwork Sat Apr 20 16:14:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 10910381 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 5526C922 for ; Sat, 20 Apr 2019 16:16:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 469E2286BD for ; Sat, 20 Apr 2019 16:16:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B1CA28797; Sat, 20 Apr 2019 16:16:24 +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 DDF3E286BD for ; Sat, 20 Apr 2019 16:16:23 +0000 (UTC) Received: from localhost ([127.0.0.1]:43112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHsf9-0005zt-74 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 20 Apr 2019 12:16:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHsdr-0004st-5r for qemu-devel@nongnu.org; Sat, 20 Apr 2019 12:15:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHsdo-0001vE-Az for qemu-devel@nongnu.org; Sat, 20 Apr 2019 12:15:02 -0400 Received: from m12-13.163.com ([220.181.12.13]:43634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHsdk-0001qd-AW for qemu-devel@nongnu.org; Sat, 20 Apr 2019 12:15:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=r3Jtft8lSmafyHvM/Q IfK3f6RiL1dgUnclr6+lM0mBM=; b=B3IEMdO3a0MwLoe5xqRDrCw704vRWs38+5 Y0DXK2m896fDbz5QbWmXUEqPQvr3OzAzOEqT2ccyWs7BCohUFssDpP0hzyYuuDpi 6IBI14W3V4JKbfwD6LPSR+vz1QR9Myi/96SrZVrWqlHI1wiJT//KKpcht48lxQ0z XeyV2X25U= Received: from localhost.localdomain (unknown [183.159.69.175]) by smtp9 (Coremail) with SMTP id DcCowAAXzKN4RbtcjaXHAg--.9660S5; Sun, 21 Apr 2019 00:14:53 +0800 (CST) From: Li Qiang To: jslaby@suse.cz, pbonzini@redhat.com Date: Sat, 20 Apr 2019 09:14:46 -0700 Message-Id: <20190420161446.2274-4-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190420161446.2274-1-liq3ea@163.com> References: <20190420161446.2274-1-liq3ea@163.com> X-CM-TRANSID: DcCowAAXzKN4RbtcjaXHAg--.9660S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tF43CF1UGr48tw15Zr43Wrg_yoW8Zr1Dp3 45Grn3XF4FgFyfJryjyw4DXFn5Grn8JFWrK3y8CwsY9ayrWFs7CFyUC3429ryxWryIvr1f uFZYqF43uF42vrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j52-nUUUUU= X-Originating-IP: [183.159.69.175] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiFAucbVaD0UJ5bwAAs+ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.13 Subject: [Qemu-devel] [PATCH v2 3/3] edu: uses uint64_t in dma operation 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: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The dma related variable is dma_addr_t, it is uint64_t in x64 platform. Change these usage from uint32_to uint64_t to avoid trancation. Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daudé --- Change since v1: Fix format compile error on Windows hw/misc/edu.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 4018dddcb8..f4a6d5f1c5 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -98,23 +98,24 @@ static void edu_lower_irq(EduState *edu, uint32_t val) } } -static bool within(uint32_t addr, uint32_t start, uint32_t end) +static bool within(uint64_t addr, uint64_t start, uint64_t end) { return start <= addr && addr < end; } -static void edu_check_range(uint32_t addr, uint32_t size1, uint32_t start, +static void edu_check_range(uint64_t addr, uint64_t size1, uint64_t start, uint32_t size2) { - uint32_t end1 = addr + size1; - uint32_t end2 = start + size2; + uint64_t end1 = addr + size1; + uint64_t end2 = start + size2; if (within(addr, start, end2) && end1 > addr && within(end1, start, end2)) { return; } - hw_error("EDU: DMA range 0x%.8x-0x%.8x out of bounds (0x%.8x-0x%.8x)!", + hw_error("EDU: DMA range 0x%016"PRIx64"-0x%016"PRIx64 + " out of bounds (0x%016"PRIx64"-0x%016"PRIx64")!", addr, end1 - 1, start, end2 - 1); } @@ -139,13 +140,13 @@ static void edu_dma_timer(void *opaque) } if (EDU_DMA_DIR(edu->dma.cmd) == EDU_DMA_FROM_PCI) { - uint32_t dst = edu->dma.dst; + uint64_t dst = edu->dma.dst; edu_check_range(dst, edu->dma.cnt, DMA_START, DMA_SIZE); dst -= DMA_START; pci_dma_read(&edu->pdev, edu_clamp_addr(edu, edu->dma.src), edu->dma_buf + dst, edu->dma.cnt); } else { - uint32_t src = edu->dma.src; + uint64_t src = edu->dma.src; edu_check_range(src, edu->dma.cnt, DMA_START, DMA_SIZE); src -= DMA_START; pci_dma_write(&edu->pdev, edu_clamp_addr(edu, edu->dma.dst),