From patchwork Sun May 31 17:54:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 281579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9481AC433DF for ; Sun, 31 May 2020 17:57:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 55CBD204EA for ; Sun, 31 May 2020 17:57:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mWlqM6b9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 55CBD204EA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfSDV-0008VA-F8 for qemu-devel@archiver.kernel.org; Sun, 31 May 2020 13:57:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfSAK-0003c5-4h; Sun, 31 May 2020 13:54:32 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:51294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfSAJ-0007b5-FL; Sun, 31 May 2020 13:54:31 -0400 Received: by mail-wm1-x343.google.com with SMTP id u13so8639648wml.1; Sun, 31 May 2020 10:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1hu7DwCrcdSlatzn9Imjz1Afklu0mU2pvXW+JIC/CUI=; b=mWlqM6b9/BHwoA0IIMk6EvG4IZKUZy+M481W1L5fMaOfUoAyf/oZyIEBcI0p/rJ2Pm T5O4FDD2RyR3+NG8/mMcWThSQLF4wc/XQ5gGD7cqZc14u5qfccO/MQbI6He6SE4qyIMI iv+XlwkMhYfWyV3uJYfbftwElcMfVdNhdhHEe6/fDglOPOJkl4T91adYLY7phf1lgO2T yJsEGJvdRYr6H/hPsVQyJpQI5Jm+1A7XORDd9kfbh/NO8xYkfz4XO1Q8z4v8CGBbN2zr 3O+ckKK4GC5B+UpvXC2yK+K9Xximkm2CDxwE0QjBG4dTqV/Ucb7yfNbpwCgJEHXFXcn1 hwkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1hu7DwCrcdSlatzn9Imjz1Afklu0mU2pvXW+JIC/CUI=; b=N6U+bbW77VvrKRBOkH/w4JsagbY+L0HaLZ9CxwaAoGNHRc0IH7kjiCCyFLsCVseOLt BIEKvovbF9pwXAOF+sj4EhN4pj7cBZcUlAyTyFXx0j9lkvP2A8kiPDxCLfm3NmOPhCOx 8LWkiOq+K+aDIwuHEYbRRjdJQ/DsNNigdnIlc/zElcOWuIJ5b6erG08+eoxJJ1RVLK+G Pdw5EppL2vUoQ9ytyyD5q2ZOyJey0ybEW3GvRoRzGBZ4ink+S/QMJ2RkEEH0zLjNqQuF mfCCwUp0sY327zRUPQ+okQ1q7Y7mMl3BgeI0gkZzCRHLiez1TDgURVCTXRIxfp6tGsHn VNJA== X-Gm-Message-State: AOAM533VKbHUboMGaZn796sxEzxtOS39oEbHwl7nYvIiDV/ptTWk96s9 GLRxrb+rHjS2MbDCukYsusG3TCQ2 X-Google-Smtp-Source: ABdhPJzz/ulACo/1WfFbWBit9hOLo0uQYfC6wcVx9x4bYnRdwzQ1IZ7kqd652hpHKAlYEM6mooyAWA== X-Received: by 2002:a1c:c2c5:: with SMTP id s188mr18162355wmf.18.1590947669222; Sun, 31 May 2020 10:54:29 -0700 (PDT) Received: from localhost.localdomain (43.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.43]) by smtp.gmail.com with ESMTPSA id z7sm17862531wrt.6.2020.05.31.10.54.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 10:54:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/6] target/s390x/mmu_helper: Use address_space_rw() in place Date: Sun, 31 May 2020 19:54:20 +0200 Message-Id: <20200531175425.10329-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200531175425.10329-1-f4bug@amsat.org> References: <20200531175425.10329-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aleksandar Rikalo , David Hildenbrand , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Beniamino Galvani , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Herv=C3=A9_Poussineau?= , Gerd Hoffmann , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" In an effort to remove the cpu_physical_memory_rw() API, update s390_cpu_virt_mem_rw() to use a more recent address_space_rw() API. Signed-off-by: Philippe Mathieu-Daudé --- target/s390x/mmu_helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 7d9f3059cd..632e8a8af4 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -529,8 +529,10 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf, /* Copy data by stepping through the area page by page */ for (i = 0; i < nr_pages; i++) { currlen = MIN(len, TARGET_PAGE_SIZE - (laddr % TARGET_PAGE_SIZE)); - cpu_physical_memory_rw(pages[i] | (laddr & ~TARGET_PAGE_MASK), - hostbuf, currlen, is_write); + address_space_rw(CPU(cpu)->as, + pages[i] | (laddr & ~TARGET_PAGE_MASK), + MEMTXATTRS_UNSPECIFIED, + hostbuf, currlen, is_write); laddr += currlen; hostbuf += currlen; len -= currlen; From patchwork Sun May 31 17:54:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 281580 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82BF4C433E0 for ; Sun, 31 May 2020 17:55:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5627D204EA for ; Sun, 31 May 2020 17:55:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P1bjHqaZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5627D204EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfSBW-00055H-Je for qemu-devel@archiver.kernel.org; Sun, 31 May 2020 13:55:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfSAL-0003cM-ME; Sun, 31 May 2020 13:54:33 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:38983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfSAK-0007cs-Pn; Sun, 31 May 2020 13:54:33 -0400 Received: by mail-wr1-x443.google.com with SMTP id t18so9214904wru.6; Sun, 31 May 2020 10:54:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DBQUDGRuCGTWntTIf+/3MDtftJR4gTvYShUP8HbRMhY=; b=P1bjHqaZWE44yroDGPGV25akgfIYjPuGLihF6RHZT8HDl0TtROZ3yDCm/0dxAPMmHW YIdgBhJiTUjWhFMYt0AIoLqQuiVw/Og550Qk9OJ8FcB0/lljfXf1P5LcVNgZhpivblTK soCIirx7gqk9sv6jnMLtuBkamYEljqIYgXVnTjxA7yz/K7j0D2FEDl7myIIkm8IOZ+BH Cud28U4PmnaaEg9atppXL0QUD0siM4OIMridWgG1qbLhM4GMBbZYSs7IAZm//dftOBcV E0eG0xuoSia7GTR4BvwpIAwxX603cNi/mJNc99NsA373ECpUZ3AgcyAy03XvOZgO7brj 9N7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DBQUDGRuCGTWntTIf+/3MDtftJR4gTvYShUP8HbRMhY=; b=DlzuR43D1nG9vyjA0rNQ+TNqpVFzIUlrvi2f/9vEwwEPosLHtWXYC42GlzRqRLrXsi atZ9DEs9SdKBpefF312n1lCtR0zbtaRsDew7QSTBey8CfDEy8PotjngNNGPxUkdvrXx5 aF8oyj4aPt/GPqllM++cA7p5oNVvaiIDsB1KV8UkyZcQVmBm1ud4fp96fI4arZy1FyMx 9YBy9PHSYVGnXnYVFGAmP8tzVuylQtuaSL9TG2F0CFog9eAjgrI5ypJzrxPlDyoRhr/b sqPRW4VyUOOM3tGV/nlAOtINpJZu+XMDtWUEOaB+1JPlRPxAW29ArGJeyeXRsGNZ3FY5 VQ+Q== X-Gm-Message-State: AOAM532ewBwPOZlzg9bdVcpuM6VkGMstE3wcYjlyRwlEh+7QKIS+3N2X BK84g1l1Pkusv2ikRPWdouLxe2eV X-Google-Smtp-Source: ABdhPJytI2CNMDNjMq8ZFRMNVmEv8gdBBAxqVsiqsYyIK0qBiIp1jl4HClPeskoN0yIUV2a0GsdPFA== X-Received: by 2002:adf:b354:: with SMTP id k20mr18343908wrd.412.1590947670503; Sun, 31 May 2020 10:54:30 -0700 (PDT) Received: from localhost.localdomain (43.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.43]) by smtp.gmail.com with ESMTPSA id z7sm17862531wrt.6.2020.05.31.10.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 10:54:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/6] hw/dma/rc4030: Use DMA address space to do DMA accesses Date: Sun, 31 May 2020 19:54:21 +0200 Message-Id: <20200531175425.10329-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200531175425.10329-1-f4bug@amsat.org> References: <20200531175425.10329-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aleksandar Rikalo , David Hildenbrand , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Beniamino Galvani , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Herv=C3=A9_Poussineau?= , Gerd Hoffmann , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The DMA device should not use the CPU address space to do its operation, but its own address space. Replace cpu_physical_memory_write() by dma_memory_read() since we already have the DMA address space available. Signed-off-by: Philippe Mathieu-Daudé --- hw/dma/rc4030.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c index eefbabd758..c39fe2bb69 100644 --- a/hw/dma/rc4030.c +++ b/hw/dma/rc4030.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" +#include "sysemu/dma.h" #include "hw/irq.h" #include "hw/mips/mips.h" #include "hw/sysbus.h" @@ -301,7 +302,7 @@ static void rc4030_write(void *opaque, hwaddr addr, uint64_t data, if (s->cache_ltag == 0x80000001 && s->cache_bmask == 0xf0f0f0f) { hwaddr dest = s->cache_ptag & ~0x1; dest += (s->cache_maint & 0x3) << 3; - cpu_physical_memory_write(dest, &val, 4); + dma_memory_read(&s->dma_as, dest, &val, 4); } break; /* Remote Speed Registers */ From patchwork Sun May 31 17:54:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 281578 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA12BC433DF for ; Sun, 31 May 2020 17:59:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C7A4204EA for ; Sun, 31 May 2020 17:59:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X+8eI/C4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C7A4204EA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfSF8-000244-UN for qemu-devel@archiver.kernel.org; Sun, 31 May 2020 13:59:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfSAO-0003g9-6j; Sun, 31 May 2020 13:54:36 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:36076) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfSAN-0007dS-Ei; Sun, 31 May 2020 13:54:35 -0400 Received: by mail-wm1-x344.google.com with SMTP id d128so9187218wmc.1; Sun, 31 May 2020 10:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RUMqPKblWHjVxZ98nIqqASbuDI8vJG3qcSLvSLKCBt8=; b=X+8eI/C4OhMfctTsS73+OghNMtcX/UEvdJo2GwriLZwNzWr6kcvX7lAzZaBK/UOsLR QNV34xFe+hb1aFe1WxT+liWxk8XdVB+xkrJxHZ4V6Zpycz6bBCoOXmNIYc1ueiVCM7OV GAnFaLBS4kA8vdtTQyiTgn/EFiATZUbk0tce6OPAS7bPLAWBeVE8ZonfKKTZLDYYglHS +9ejhU+BBCnY6Gd1X/bK1LedC75UiWzR5CZ3dE7AaTFPGduYnaSI00iEnye7fSZZ/fsn mi1b2v2HsfdAWhoLO/lXNPq6xJ73BR5j3KRxu1B5ImPH4JoEsBUXLWq3PUBb9TrwX6+a 2t7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RUMqPKblWHjVxZ98nIqqASbuDI8vJG3qcSLvSLKCBt8=; b=NrXDrCavVU0PtPw00P+y32HnofRpoE5VyjCSwJOnmv8yDNN6hSwfQI8VkJKgGJxoHY 3eLBmFj4UvR4syzDNbo3SvPkkkuJaO3oOyl+cmBj8Fd2qtCJk0SuPqWaX8oX92wngWrH +sW5N/qk8COoShcl44DFG+MkGPcWetWXYnUzpJi3TubcbJ+3YQ5jVORz9ZYu5TLjS4Y+ x3eP3fqO+w5FLBKYHV7kPdCah7nrwQ9gjOYHkP0Wrn864OyFue2AiKUzYJ43tToPKWxB uRLdGd5p06FN9OPAy+wzE/jd4yAYdxdw4r9fHaf1KS48mKWUcXkyhd4IX8vVVUf7zs2I hixQ== X-Gm-Message-State: AOAM532TXkrvdyN59tiuEGrOHVIODvR9uIp0V8LBMcmE9dSx5lU72gA9 2xkjxUa0818As1iOWbd7mgRTzBwl X-Google-Smtp-Source: ABdhPJwCaiuZuI9J6B7vunUSeiqVjQhHpoq0Dhwc6Ep+Qgglfz6RGDoUPVR5vT5eCKikFH0pqMvm4w== X-Received: by 2002:a1c:96c3:: with SMTP id y186mr17785194wmd.60.1590947673231; Sun, 31 May 2020 10:54:33 -0700 (PDT) Received: from localhost.localdomain (43.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.43]) by smtp.gmail.com with ESMTPSA id z7sm17862531wrt.6.2020.05.31.10.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 May 2020 10:54:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/6] exec/cpu-common: Do not restrict CPU to 32-bit memory access maximum Date: Sun, 31 May 2020 19:54:23 +0200 Message-Id: <20200531175425.10329-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200531175425.10329-1-f4bug@amsat.org> References: <20200531175425.10329-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aleksandar Rikalo , David Hildenbrand , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Beniamino Galvani , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Herv=C3=A9_Poussineau?= , Gerd Hoffmann , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Most CPUs can do 64-bit operations. Update the CPUReadMemoryFunc and CPUWriteMemoryFunc prototypes. Signed-off-by: Philippe Mathieu-Daudé --- include/exec/cpu-common.h | 4 ++-- hw/usb/hcd-musb.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index b47e5630e7..5ac766e3b6 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -43,8 +43,8 @@ extern ram_addr_t ram_size; /* memory API */ -typedef void CPUWriteMemoryFunc(void *opaque, hwaddr addr, uint32_t value); -typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); +typedef void CPUWriteMemoryFunc(void *opaque, hwaddr addr, uint64_t value); +typedef uint64_t CPUReadMemoryFunc(void *opaque, hwaddr addr); void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); /* This should not be used by devices. */ diff --git a/hw/usb/hcd-musb.c b/hw/usb/hcd-musb.c index c29fbef6fc..4063cbccf8 100644 --- a/hw/usb/hcd-musb.c +++ b/hw/usb/hcd-musb.c @@ -1243,7 +1243,7 @@ static void musb_ep_writeh(void *opaque, int ep, int addr, uint16_t value) } /* Generic control */ -static uint32_t musb_readb(void *opaque, hwaddr addr) +static uint64_t musb_readb(void *opaque, hwaddr addr) { MUSBState *s = (MUSBState *) opaque; int ep, i; @@ -1305,7 +1305,7 @@ static uint32_t musb_readb(void *opaque, hwaddr addr) }; } -static void musb_writeb(void *opaque, hwaddr addr, uint32_t value) +static void musb_writeb(void *opaque, hwaddr addr, uint64_t value) { MUSBState *s = (MUSBState *) opaque; int ep; @@ -1392,7 +1392,7 @@ static void musb_writeb(void *opaque, hwaddr addr, uint32_t value) }; } -static uint32_t musb_readh(void *opaque, hwaddr addr) +static uint64_t musb_readh(void *opaque, hwaddr addr) { MUSBState *s = (MUSBState *) opaque; int ep, i; @@ -1446,7 +1446,7 @@ static uint32_t musb_readh(void *opaque, hwaddr addr) }; } -static void musb_writeh(void *opaque, hwaddr addr, uint32_t value) +static void musb_writeh(void *opaque, hwaddr addr, uint64_t value) { MUSBState *s = (MUSBState *) opaque; int ep; @@ -1502,7 +1502,7 @@ static void musb_writeh(void *opaque, hwaddr addr, uint32_t value) }; } -static uint32_t musb_readw(void *opaque, hwaddr addr) +static uint64_t musb_readw(void *opaque, hwaddr addr) { MUSBState *s = (MUSBState *) opaque; int ep; @@ -1520,7 +1520,7 @@ static uint32_t musb_readw(void *opaque, hwaddr addr) }; } -static void musb_writew(void *opaque, hwaddr addr, uint32_t value) +static void musb_writew(void *opaque, hwaddr addr, uint64_t value) { MUSBState *s = (MUSBState *) opaque; int ep;