From nobody Fri May 3 03:29:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com ARC-Seal: i=1; a=rsa-sha256; t=1555943441; cv=none; d=zoho.com; s=zohoarc; b=fgJfsRHw2q0Ny7+AtecC5XxdPO8Yt9n0616GKFgYvErdGExIZ+b0dJjq00Jj2ce67y7oVn/uZWzT4fpDnkIvGUKerBJ0aJeeldAW1svBluWDf4klyB7tDlfXIarppsBs9C8r+XqQ05BkQktvPZxTtpMHklyuIIHFAiCroaAm5sE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555943441; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=TAkAEQslBT4X+Y5eAh5OCFU79u6ALGBYynB4L5pLfks=; b=Lf/a2xKHwNxN+PdIiaQPekJLV48foUKlhx3JVsSlDZYC7o4H6dZyJMsrvuKi7AELL82gVsE5LCJsvsnpkZYY2E5rFthp08kBRuIMgU77C4aS9BlW6FDHbcsWL5A7SNDsrATm8ZmUZq6mDaBIXHuGR+s45mocAgNswPNoWsSwklc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555943441528193.94229932796725; Mon, 22 Apr 2019 07:30:41 -0700 (PDT) Received: from localhost ([127.0.0.1]:38108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZxr-0000fg-FG for importer@patchew.org; Mon, 22 Apr 2019 10:30:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45082) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZwF-0007um-Q5 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 10:28:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIZgs-0005Ld-S8 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 10:13:03 -0400 Received: from m12-12.163.com ([220.181.12.12]:59543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZgs-0005Kp-8C for qemu-devel@nongnu.org; Mon, 22 Apr 2019 10:13:02 -0400 Received: from localhost.localdomain (unknown [183.159.69.175]) by smtp8 (Coremail) with SMTP id DMCowACXUzO0y71cvQ2cBg--.39054S3; Mon, 22 Apr 2019 22:12:07 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=TAkAEQslBT4X+Y5eAh 5OCFU79u6ALGBYynB4L5pLfks=; b=ToT4qNoBSUnsG2QmkIen2Kbf9sJ1t6//kl RwjLLvl3BjMm2LbhjQvrGUCBDr+iPjIxwAj1tn3GP4ncSNR1UE90PP0AC+jNsEUu nlICqGmLy75a0URFJxHl6d9FjHd80F/nyXHBN9R5qO8h82FeKnZSiANP+bOAqMj9 Vo5JQSiMY= From: Li Qiang To: jslaby@suse.cz, pbonzini@redhat.com Date: Mon, 22 Apr 2019 07:11:54 -0700 Message-Id: <20190422141156.15746-2-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--.39054S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrZF4xJFWUXF4UurW3Kr4rKrg_yoW3urg_Jw 1xGFZ7urW5Wry3AF9YqF13ur1xW3yrAFn5uFnagr4fJa4rCF98Z3sagrnxXw47Gw1fCwn5 ZaykZFy5Kr9rWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUjxnY3UUUUU== X-Originating-IP: [183.159.69.175] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiKReebVXlqxQeaQAAs1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v3 1/3] edu: mmio: allow 64-bit access 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The edu spec says the MMIO area can be accessed by 64-bit. However currently the 'max_access_size' is not so the MMIO access dispatch can only access 32-bit one time. This patch fixes this to respect the spec. Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daude --- hw/misc/edu.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 91af452c9e..65fc32b928 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -289,6 +289,15 @@ static const MemoryRegionOps edu_mmio_ops =3D { .read =3D edu_mmio_read, .write =3D edu_mmio_write, .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 8, + }, + .impl =3D { + .min_access_size =3D 4, + .max_access_size =3D 8, + }, + }; =20 /* --=20 2.17.1 From nobody Fri May 3 03:29:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com ARC-Seal: i=1; a=rsa-sha256; t=1555943516; cv=none; d=zoho.com; s=zohoarc; b=kP/cn6OmhR0dRjMjdBkeVLuRO7R17d96XPigaewWu4yaove6aTvWnlt+S+EQIAtm3WeCEWpSQtvwy9ffJnnePXOsW1ombxDSATQoaH+PxnBoKQathLxdmxmtKrPHIwGP8roR6yH4nSVHY4MaHXeSdI95zsuFjY//4ZYyP2WeuLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555943516; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ocpxbx74syTndxPAzjCBgtsjTGrKulmkE9I+7Wjy7y8=; b=RDo7GAGxbOLyDn/5Zme8PPR68PXyKymiS8n5oO8d3/vaI0V9OcXQj/2a1WtVTu1dfZFW6gxj3g7EbdW3pR/R79FIfnJNFvpAozs1EKZ6qzEPI657p3SJOqOb0xlKb+aM1rfdbC+aWVYLt/HdDf5IfnDj5Aiq1kkvDKByUooW15Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555943516883759.0256065634294; Mon, 22 Apr 2019 07:31:56 -0700 (PDT) Received: from localhost ([127.0.0.1]:38140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZz8-00026a-15 for importer@patchew.org; Mon, 22 Apr 2019 10:31:54 -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 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) 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= 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The edu spec says when address >=3D 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 add= r, unsigned size) EduState *edu =3D opaque; uint64_t val =3D ~0ULL; =20 - if (size !=3D 4) { + if (addr < 0x80 && size !=3D 4) { + return val; + } + + if (addr >=3D 0x80 && size !=3D 4 && size !=3D 8) { return val; } =20 --=20 2.17.1 From nobody Fri May 3 03:29:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com ARC-Seal: i=1; a=rsa-sha256; t=1555943440; cv=none; d=zoho.com; s=zohoarc; b=a/X2c5RakiU+95EFtVDJEmAy4C22aCONiQ1n7LUo82gvD0n+U6XWobWto+caEuqcYzCBhZ0E+3cEf1ufjnMy7rFIndVipbkj4PtSeEl/Ss/Ny86EwVcQpiNgEukETm2hC4i+VYCv0S2a2UVOfMWbViaFVLjX17io1buWKRrsM2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555943440; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=nQoqn/+2UWQM9V3Ss/BbafTfJ2pjBYmf2/7+vVlg1QY=; b=Krh5qeeLdtiPUyV5hV4+AEAWvy4gH2l/v+WCfXDR4XqcThuAucnIVECSlkaJqaoc0YZ6ANnYO09c3qHdG3aBtzzDgynDsXxqFIZtb5//UHko+65fjQ6e22bPjCtD5DFL/0HNZMydy0vzNyi2osvu9DxdTsyuXeBdT9Ynjsqel8A= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555943440669388.11676898173585; Mon, 22 Apr 2019 07:30:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:38093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZxn-0000c0-Jl for importer@patchew.org; Mon, 22 Apr 2019 10:30:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZwG-0007oA-4j 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 1hIZgr-0005L0-8k for qemu-devel@nongnu.org; Mon, 22 Apr 2019 10:13:02 -0400 Received: from m12-12.163.com ([220.181.12.12]:59099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIZgq-0005KQ-N3 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 10:13:01 -0400 Received: from localhost.localdomain (unknown [183.159.69.175]) by smtp8 (Coremail) with SMTP id DMCowACXUzO0y71cvQ2cBg--.39054S5; Mon, 22 Apr 2019 22:12:10 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=nQoqn/+2UWQM9V3Ss/ BbafTfJ2pjBYmf2/7+vVlg1QY=; b=PgiY9KHRLJmHcLrUlMs7YVFzl7fPqTNX/V y++oU1siE0qaDHal2BH8Rj++h57b3zifDkKrdQsSCDM4CtWQU2yqkkSgXgkU/2dp yuZMkbMblwieb+PR6Sqba2j2NRJWvIdgZAGt6BhP3vYr+eFneSoXqzpgnEHBJ2rP E3tvuZxy4= From: Li Qiang To: jslaby@suse.cz, pbonzini@redhat.com Date: Mon, 22 Apr 2019 07:11:56 -0700 Message-Id: <20190422141156.15746-4-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--.39054S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7uF45WF15KFWxuryrur4kZwb_yoW8ZF13p3 45Grs3XF4FgFyfJryUAw4DXF1rGrn5tFWrK3yUCrsY9ayrWFs7CFyUA342vrWxWryIvF13 uFZYvF43uF4xZrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jOJ5rUUUUU= X-Originating-IP: [183.159.69.175] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiKRqebVXlqxQejgAAsf X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v3 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: philmd@redhat.com, liq3ea@gmail.com, qemu-devel@nongnu.org, Li Qiang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The dma related variable dma.dst/src/cnt is dma_addr_t, it is uint64_t in x64 platform. Change these usage from uint32_to uint64_t to avoid trancation in edu_dma_timer. Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daude --- 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 33de05141f..401ada74af 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) } } =20 -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 <=3D addr && addr < end; } =20 -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 =3D addr + size1; - uint32_t end2 =3D start + size2; + uint64_t end1 =3D addr + size1; + uint64_t end2 =3D start + size2; =20 if (within(addr, start, end2) && end1 > addr && within(end1, start, end2)) { return; } =20 - 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); } =20 @@ -139,13 +140,13 @@ static void edu_dma_timer(void *opaque) } =20 if (EDU_DMA_DIR(edu->dma.cmd) =3D=3D EDU_DMA_FROM_PCI) { - uint32_t dst =3D edu->dma.dst; + uint64_t dst =3D edu->dma.dst; edu_check_range(dst, edu->dma.cnt, DMA_START, DMA_SIZE); dst -=3D 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 =3D edu->dma.src; + uint64_t src =3D edu->dma.src; edu_check_range(src, edu->dma.cnt, DMA_START, DMA_SIZE); src -=3D DMA_START; pci_dma_write(&edu->pdev, edu_clamp_addr(edu, edu->dma.dst), --=20 2.17.1