From nobody Tue Apr 30 07:34:59 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=1557506770; cv=none; d=zoho.com; s=zohoarc; b=gI1DjSyL9h5+zUlW3UwCfZzikKblF5VMZK5yHy1UippT0SwIdmTS5g5489k+HzY5Gh9rUfB8/fLM8yqWYfrjjfxd/trzKipcZhHnnf9iQCjprB9dLH0/I8BTfp1m4PVHGRLusYIdmOdeREpaf2K8ns9pZV/sswTAoBc0bGr22pU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557506770; 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=gAiP2SLLRgEi/3cZGS6YMDmlkcJ8VVqiS4ybhUwSBWvrQIJoihT24trCe+98dysC+xLaOa8O3wjevOoEeEBGsc8S6nZEYPfhNB3HutswAFMpPb3Xg/PKwHtU9OEbP0nRk7GRsLEjDaRVJfImrzMVf3osclofLAgHSxHcMy5xyzU= 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 1557506770303650.0165121017126; Fri, 10 May 2019 09:46:10 -0700 (PDT) Received: from localhost ([127.0.0.1]:46674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8eq-0005qJ-65 for importer@patchew.org; Fri, 10 May 2019 12:46:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8cz-0004ap-Oa for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP8cx-0002TZ-Qa for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:09 -0400 Received: from m12-13.163.com ([220.181.12.13]:46005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8cu-0002Qe-3W for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:06 -0400 Received: from localhost.localdomain (unknown [183.159.64.133]) by smtp9 (Coremail) with SMTP id DcCowAB3fTFLqtVcVYWnCg--.3399S3; Sat, 11 May 2019 00:44:00 +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=atMpWE9NfCa8GoiKHkpZLj3h32797ZQ9sW 6agk9hgaE/9EmqvsxVGa2INuti9qYWMxKEoB3KF2WECkLxW+hFR0r8BlooLusLDr QiJxntXA75xFnCi9m2hg1ijoaJFBx4sD4NEa+4ufoHZCpMKO1Z2cPgl3IWNXj0UH icba3fSGQ= From: Li Qiang To: pbonzini@redhat.com, jslaby@suse.cz Date: Fri, 10 May 2019 09:43:47 -0700 Message-Id: <20190510164349.81507-2-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510164349.81507-1-liq3ea@163.com> References: <20190510164349.81507-1-liq3ea@163.com> X-CM-TRANSID: DcCowAB3fTFLqtVcVYWnCg--.3399S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrZF4xJFWUXF4UurW3Kr4rKrg_yoW3urg_Jw 1xGFZ7urW5Wry3AF9YqF13ur1xW3yrAFn5uFnagr4fJa4rCF98Z3sagrnxXw47Gw1fCwn5 ZaykZFy5Kr9rWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUUVMNUUUUUU== X-Originating-IP: [183.159.64.133] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBZhCwbVaD1aHioAAAsI X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.13 Subject: [Qemu-devel] [PATCH v4 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: liq3ea@gmail.com, philmd@redhat.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 Tue Apr 30 07:34:59 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=1557506781; cv=none; d=zoho.com; s=zohoarc; b=MNlq+59CfHFxxWANWOU7OYsWeNy5ekLWm6AsZQKwCMXCVl40xwkQeibOtkUVq0YA++1xIaN+H+5lg/6DCDmm6kvLWxesvRaD2iYlTfoRVw+M4QPDwXQMkUO6Ixnof/xYmmxFD0RCy4Ht8DOJm4V67XOv8eQ8pICiA18WPaHA/cU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557506781; 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=QIasgmbFmQFh6heCmIoYYkbFdxWLVq+R+/WMqUG2ufw=; b=jGeypwK5cfKLbUrzDNemBcyz3O/lUdqlXsyb2BP4Jz7FRUM86uhNT3kHrBg2EKBEbu8l65eNKeQQq7prJDFY2sDkrahhLkC13TAQAqvFzvu3tl5iBO4W4ayu3pzDTYREFegs1iPT9648bGSz3eFxM2T+nwUPJ+B60BH2uOm7D9E= 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 1557506781376217.73301009190993; Fri, 10 May 2019 09:46:21 -0700 (PDT) Received: from localhost ([127.0.0.1]:46676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8f2-00065d-Bf for importer@patchew.org; Fri, 10 May 2019 12:46:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8d6-0004gO-Gl for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP8d5-0002Wj-Fl for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:16 -0400 Received: from m12-13.163.com ([220.181.12.13]:46138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8cx-0002Se-WA for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:15 -0400 Received: from localhost.localdomain (unknown [183.159.64.133]) by smtp9 (Coremail) with SMTP id DcCowAB3fTFLqtVcVYWnCg--.3399S4; Sat, 11 May 2019 00:44:01 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=QIasgmbFmQFh6heCmI oYYkbFdxWLVq+R+/WMqUG2ufw=; b=KcMN8NL/TEWg1qIbJjkXqrvWFqEdoC/lrA SPE8vMTrBcYanSqHa3xy5tPsHxILnCobWNE0UBWVg5XnM9Ro5ZRex7tZIW+3Lcz1 xiBLKxHniMsQSFte3sd7QJHNE3OrJDpnyyNdDxrflbKC9qtBPhQY7L9VO6LCBn38 F+1CfZih0= From: Li Qiang To: pbonzini@redhat.com, jslaby@suse.cz Date: Fri, 10 May 2019 09:43:48 -0700 Message-Id: <20190510164349.81507-3-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510164349.81507-1-liq3ea@163.com> References: <20190510164349.81507-1-liq3ea@163.com> X-CM-TRANSID: DcCowAB3fTFLqtVcVYWnCg--.3399S4 X-Coremail-Antispam: 1Uf129KBjvdXoWrZFWrCw18XrWDAw1fGw4rZrb_yoWxAwc_A3 y0ka9rZFWDKFy3CF12vFnxZr1UJw4rZryfua1Iqrs7ArZ8CrW8A34vgFnrGw47XrZxury8 Z3yDZFyvkr9IgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8-18DUUUUU== X-Originating-IP: [183.159.64.133] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBLxGwbVUMJPd5SAAAsY X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.13 Subject: [Qemu-devel] [PATCH v4 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: liq3ea@gmail.com, philmd@redhat.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 --- 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 Tue Apr 30 07:34:59 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=1557507223; cv=none; d=zoho.com; s=zohoarc; b=dNDmrK180FsL72R+itzgNXA14yIwC3njc+/XAiO3UhVtVXj9kp4RHXAAip+4/DpzT2z+1E8dlPcFKF9D3Q5uIiTj3zNfw2lHvZWQIDDOKIg5YpmlXiIkAhxN+FLqTS6Ri3n2nlgRD9fgJe3kBP1mBVIGne7wMNCQE+tDL8+VKyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557507223; 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=bD784GuXCTHvAqf9FLz4k1N7zeMg3+JJ22MHAx8bcDQ=; b=G2UoV1jgCOgLtL+9QmUSD9g/Da0E7QSpRPsugS2R8RnlzZPz90VbkO9VfKtICSzmf+9Gejh7j3XtixPa2flMHLuFkhT796xi7q4QlevYfiEW5VyZh96u+DDKYxpbUZtHi6M198kmxGvK2SrVKaPzOLF4sWnA/Hv3T1+VXB6bPl8= 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 155750722323173.94108526373304; Fri, 10 May 2019 09:53:43 -0700 (PDT) Received: from localhost ([127.0.0.1]:46815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8mA-0004wG-8x for importer@patchew.org; Fri, 10 May 2019 12:53:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8d1-0004c7-KR for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP8cz-0002U4-KH for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:11 -0400 Received: from m12-13.163.com ([220.181.12.13]:46185) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP8cw-0002S2-1x for qemu-devel@nongnu.org; Fri, 10 May 2019 12:44:07 -0400 Received: from localhost.localdomain (unknown [183.159.64.133]) by smtp9 (Coremail) with SMTP id DcCowAB3fTFLqtVcVYWnCg--.3399S5; Sat, 11 May 2019 00:44:02 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=bD784GuXCTHvAqf9FL z4k1N7zeMg3+JJ22MHAx8bcDQ=; b=gvgXbDqQJ88U/EfOciI8Ua4IWLZPhNd0Ws PiNDCS75OV/F8BM7HN3MKYyOoigE6MKf8r01SYMNcJca9oC24nYTPbybMlGWlzwt qLqMez8wumAWg7X9wsN7arm1rFQ4jyC055wQJwlMHp2c234AN0DyogFa1YXOxbmu 93cAp1/oc= From: Li Qiang To: pbonzini@redhat.com, jslaby@suse.cz Date: Fri, 10 May 2019 09:43:49 -0700 Message-Id: <20190510164349.81507-4-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510164349.81507-1-liq3ea@163.com> References: <20190510164349.81507-1-liq3ea@163.com> X-CM-TRANSID: DcCowAB3fTFLqtVcVYWnCg--.3399S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7uF45WF15KFWxury7Xr1UKFg_yoW8ZFW5p3 45Grn3XF4FgFyfJry5Aw4DXr1rGrn5tF4rK3y8CrsY9ayrXFs7CFyUJ3429rWxW34Ivr13 uFZYqF43uF4xZrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j4wZ7UUUUU= X-Originating-IP: [183.159.64.133] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiFBKwbVaD0qDHjwAAs0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.13 Subject: [Qemu-devel] [PATCH v4 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: liq3ea@gmail.com, philmd@redhat.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-Daud=C3=A9 --- Change since v3: Change 'size2' para of 'edu_check_range' to 64-bits. hw/misc/edu.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 33de05141f..19e5545e2c 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, - uint32_t size2) +static void edu_check_range(uint64_t addr, uint64_t size1, uint64_t start, + uint64_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