From patchwork Mon Apr 24 16:50:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 676582 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp2265229wrs; Mon, 24 Apr 2023 09:52:11 -0700 (PDT) X-Google-Smtp-Source: AKy350aXjkcE1VrSAA8gUGRmh1YJ+1ldjVvy8ptbcA/BVAEFSxMRodj/I/O4l+OAHk2jqCsAvWeO X-Received: by 2002:ac8:7fc4:0:b0:3e2:4280:bc5d with SMTP id b4-20020ac87fc4000000b003e24280bc5dmr25033948qtk.23.1682355131218; Mon, 24 Apr 2023 09:52:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682355131; cv=none; d=google.com; s=arc-20160816; b=Wg7bPSPe2W9GXtpGLhll3nzNSSzXCtjVOrLC9TqmEfesbhX3o2eD5MpXAyX7AD4e6w AEW0Mqjl5Qr9kEYKfp2WIfpkVm0SFuB1v7WPdh4yIlFHNlsyiu7S/mVIS26v20v7FgOJ 94+EKRB7wp+LIvBNJTrzIwVyfyIsbuyWriX5O9A0L8QyHrSAF33VRLUGhu8HpwcjeITb hwGKNoIL96X32WB+Y4yuP8ulTR0itXgH2l553kkGPTgplmOW8LCBaGSjsv9o7E8K3BlN ZnG2m6xP1ySK+7ErF3iQcus257n5LkJwtNCJmEbpJHqTnBYtIcuiI9yTEmRVLTtPOggI 8dkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KDoq9PyOjHZooAPOHtlklGAcY5q2//1VIptVhgf5CWk=; b=sSObUpKuexY2Vc/z0ajYAgBdbBZPtb3hZxU0phC0fE7Q/DwTRDBQ2WCIMkC63u7tA2 qx1ZVRKHo/GrcGwaFKdQ4WNpKK783IYDF+CxkM5Oc481xMJNty8ZOHB0wnzZBMKMFjn5 VvQl03ccadyBcPVREuVMPpvhdrFvAYMFM4DQt2LnbBKgFue8sEexdFzABqCSO52Tbl8O AIxrJkizsqjXWjiPGYX+KWwmij0lvkWXgdo/z5Us3lxlHUzJ+PTtNFfAC98KcznxxeOu fVmOzt5LBi7D4j5zhAHUjdZEb+htMEFvetrn9cq6mD52UQZPhSVIAfV1u5lTlQsQDO3n bWXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="aYR9K/U7"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k18-20020a05620a07f200b007066f405b31si7123398qkk.295.2023.04.24.09.52.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Apr 2023 09:52:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="aYR9K/U7"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqzPB-00038p-6q; Mon, 24 Apr 2023 12:51:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqzP4-00035I-Ba for qemu-devel@nongnu.org; Mon, 24 Apr 2023 12:51:02 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqzP2-00029y-4Z for qemu-devel@nongnu.org; Mon, 24 Apr 2023 12:51:02 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-2f833bda191so2834620f8f.1 for ; Mon, 24 Apr 2023 09:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682355056; x=1684947056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KDoq9PyOjHZooAPOHtlklGAcY5q2//1VIptVhgf5CWk=; b=aYR9K/U7r7GLAzB34mn7InSVi3oVnx1JTcFGS4b0CC7uUm6knh0ACuI83LDhm76UK4 6ILiOkySMs0RZxyPr9hTJyxxHO9p1f3vnjwwrcZzQIcngY2A2bGO+JWVlF29UlKsbAcl qalN+lQvr8l+2HZoW2ipOZKhgvg0rItvSz+xY7uYz2byCd//1oQ/tGAbVmSYdjkoF/wP o0Cyuj7Tzq7hcdv8hszOTeTRrtc8ZH69K5cfZJBzOfIE1N2rnRDqKic9ld2bi2ex4G+i yWnStC6wTDibl27/Gc7ramsfWGrNrgSLFvZgIcTynn4rfIGIN9VWn4HPneVel9Fpcp5r 3Qwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682355056; x=1684947056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KDoq9PyOjHZooAPOHtlklGAcY5q2//1VIptVhgf5CWk=; b=QFJLd6J4go6CXCvKrL2I6kZzADMFMK53xl+iloTB0lBaeYhIzsHYGPfPcjN2PrJQ+u SfrFzBL5TVNH7iweOXOgkUB+YVh1CoCHusEQ4BdWtOr5FBQwO/oMNrkJbDxb2Ww31JyU dUUonedhjiKsn3ahuUsuzZj5UOAhyl48oI9VoRxxenZtlJdkqnlEODEcVsGrRFHvs4cE 15DIhdwtvu8xD2a/4IasuOqyoX6Q5HdbHRzb7RabYx5gypcbWlAtZECiyJqNtTRRuMze bajs/2jsAqx8JdUNwueCiLlUwMrZXX63BgEI4DS3KIT7a10b3Zng27zBf6xYQVjKN13o NjxQ== X-Gm-Message-State: AAQBX9fJ5qYHnc3NBGKk9SuMFogig4XFB95WW/Q9Lo2geZOuaFiLiQSl W3DrHUK0urFMmih38v26lfGw/A== X-Received: by 2002:adf:e54c:0:b0:2fb:ca40:e42c with SMTP id z12-20020adfe54c000000b002fbca40e42cmr10097973wrm.6.1682355056231; Mon, 24 Apr 2023 09:50:56 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id b5-20020a056000054500b002e5ff05765esm11211279wrf.73.2023.04.24.09.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 09:50:55 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Beniamino Galvani , Strahinja Jankovic , qemu-stable@nongnu.org Subject: [PATCH 2/2] hw/net/allwinner-sun8i-emac: Correctly byteswap descriptor fields Date: Mon, 24 Apr 2023 17:50:53 +0100 Message-Id: <20230424165053.1428857-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424165053.1428857-1-peter.maydell@linaro.org> References: <20230424165053.1428857-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In allwinner-sun8i-emac we just read directly from guest memory into a host FrameDescriptor struct and back. This only works on little-endian hosts. Reading and writing of descriptors is already abstracted into functions; make those functions also handle the byte-swapping so that TransferDescriptor structs as seen by the rest of the code are always in host-order, and fix two places that were doing ad-hoc descriptor reading without using the functions. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- hw/net/allwinner-sun8i-emac.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index b861d8ff352..fac4405f452 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -350,8 +350,13 @@ static void allwinner_sun8i_emac_get_desc(AwSun8iEmacState *s, FrameDescriptor *desc, uint32_t phys_addr) { - dma_memory_read(&s->dma_as, phys_addr, desc, sizeof(*desc), + uint32_t desc_words[4]; + dma_memory_read(&s->dma_as, phys_addr, &desc_words, sizeof(desc_words), MEMTXATTRS_UNSPECIFIED); + desc->status = le32_to_cpu(desc_words[0]); + desc->status2 = le32_to_cpu(desc_words[1]); + desc->addr = le32_to_cpu(desc_words[2]); + desc->next = le32_to_cpu(desc_words[3]); } static uint32_t allwinner_sun8i_emac_next_desc(AwSun8iEmacState *s, @@ -400,10 +405,15 @@ static uint32_t allwinner_sun8i_emac_tx_desc(AwSun8iEmacState *s, } static void allwinner_sun8i_emac_flush_desc(AwSun8iEmacState *s, - FrameDescriptor *desc, + const FrameDescriptor *desc, uint32_t phys_addr) { - dma_memory_write(&s->dma_as, phys_addr, desc, sizeof(*desc), + uint32_t desc_words[4]; + desc_words[0] = cpu_to_le32(desc->status); + desc_words[1] = cpu_to_le32(desc->status2); + desc_words[2] = cpu_to_le32(desc->addr); + desc_words[3] = cpu_to_le32(desc->next); + dma_memory_write(&s->dma_as, phys_addr, &desc_words, sizeof(desc_words), MEMTXATTRS_UNSPECIFIED); } @@ -638,8 +648,7 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, break; case REG_TX_CUR_BUF: /* Transmit Current Buffer */ if (s->tx_desc_curr != 0) { - dma_memory_read(&s->dma_as, s->tx_desc_curr, &desc, sizeof(desc), - MEMTXATTRS_UNSPECIFIED); + allwinner_sun8i_emac_get_desc(s, &desc, s->tx_desc_curr); value = desc.addr; } else { value = 0; @@ -652,8 +661,7 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, break; case REG_RX_CUR_BUF: /* Receive Current Buffer */ if (s->rx_desc_curr != 0) { - dma_memory_read(&s->dma_as, s->rx_desc_curr, &desc, sizeof(desc), - MEMTXATTRS_UNSPECIFIED); + allwinner_sun8i_emac_get_desc(s, &desc, s->rx_desc_curr); value = desc.addr; } else { value = 0;