From nobody Fri May 17 09:38:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1587144043; cv=none; d=zohomail.com; s=zohoarc; b=WIa8iatomASjCUUUoXyfj1YsxRYnOf5pb7XZBTzOVA97+yOX6F8BfCf/iujAVBZAA4qQN4uGF2tL5FV3oXLZxXlT0zHMvNPQvkq4ZKWs36mLgkvjq2LKtlgAZtnIjDH+U3/LDvGlwAOs0934XLOoyGY0QJnzHuT/c3WhBRmztcg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587144043; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ttOhgnDLQfGWXOWogf5pjl5Ry85FgVYUCdfxTn50lGM=; b=a8ai+agINbCr4GUB0S82BHcmNIKpBCFgVcDOdjxdIGg2IBCFhO5e1VMpMsOPcHSOow5Hj1RY5okokB8/ub26MpiDbAC81qs9Kp2P/3BQvTrwGmdzRv7xxbH8WDW4zo3QwiVuuSlmRLU9ItRiZpqeKwDDpbXUhNRZauru9zRD4IE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 15871440434750.3419704988000376; Fri, 17 Apr 2020 10:20:43 -0700 (PDT) Received: from localhost ([::1]:49960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPUfR-0006Ix-8j for importer@patchew.org; Fri, 17 Apr 2020 13:20:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53782) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jPUcp-0003Ty-1g for qemu-devel@nongnu.org; Fri, 17 Apr 2020 13:17:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jPUco-0000ky-2k for qemu-devel@nongnu.org; Fri, 17 Apr 2020 13:17:58 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:38841) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jPUck-0000hB-Gq; Fri, 17 Apr 2020 13:17:54 -0400 Received: by mail-wr1-x443.google.com with SMTP id k11so3937351wrp.5; Fri, 17 Apr 2020 10:17:54 -0700 (PDT) Received: from localhost.localdomain ([37.142.6.51]) by smtp.gmail.com with ESMTPSA id 91sm19154440wra.37.2020.04.17.10.17.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 10:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ttOhgnDLQfGWXOWogf5pjl5Ry85FgVYUCdfxTn50lGM=; b=Kye46WVQ4Ke9a7G/WNj0lDYC4kqam7hYN9AOj5P97fatmE21gzdjHKhOP183Gx5q8a 58E1hO0rxjP7P3TFPUZZWHX8D3iPDcroA8xpzn1atryLsGvsdj2EEZbtPS2I/rOLZN/Q I6ParmCFre8+MiKChcBtG9eg/yaMlCidtzQNliy/5Fmgc3WMIv7Ztt8uvQwoq/ZeK37C FJFvZbqLZLSA+yOihHkep5InMauDNuiSD5c0eOMEjuTRFqxCyJqjCWHb5YNZI8o8y9UB Cv0OAQC9x5UZjqZQB1Wg3nvpm9SgnK7ZFSDhUJwuwvVZwIYRqUjGzHdSX9d+PWmctFy/ 0RAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ttOhgnDLQfGWXOWogf5pjl5Ry85FgVYUCdfxTn50lGM=; b=pe5jurk60nh8RBycN36tVh+UnGE1ONs86a8dVppXu4ejW3zheCeLKgzrNn9zinF8wD Vf3Iq0SWc8gwXtfooFgvgdIB4NHIlwA2lGJZ0mpHisyeugfrH0HzMqLr7O6ikIaa8RZw EFD+ajJrLt/mAGcnqAa4szFPEAp6J/JzLfN/N8fd6F7NEWQLn5KdPq7EqS6I2TrGnZWP Kuzl9FJqUAKsvQdxxOpZQg9rkVrKKUdmnc83Sgrjia+mFn2hvNMgjgCnSS7CnV5sokYN 1wwQ+iAGurNv0rMwHL0lUyf+vROvDE1EWOxLr3tyBLi079Vv66xW7Zx2PFnsIZSs8R41 mbjg== X-Gm-Message-State: AGi0PubhxwHuvxaLgv9YvfLT9kwmlY5U8lhIy1GRjW0dY9CHqL5hpyS0 f7O4TIA7naBwz9oMT8W1pPE= X-Google-Smtp-Source: APiQypJpl9vtYahHmM/+5ZgnMU8K0YjRUFAesEObXZpSLFBLlLaFgK1gVRszbxnKL+haeTx+Fz4y7w== X-Received: by 2002:adf:e711:: with SMTP id c17mr3386425wrm.334.1587143873393; Fri, 17 Apr 2020 10:17:53 -0700 (PDT) From: Ramon Fried To: edgar.iglesias@gmail.com, alistair@alistair23.me, peter.maydell@linaro.org, jasowang@redhat.com, qemu-arm@nongnu.org Subject: [PATCH v2] Cadence: gem: fix wraparound in 64bit descriptors Date: Fri, 17 Apr 2020 20:17:36 +0300 Message-Id: <20200417171736.441607-1-rfried.dev@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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: "Edgar E . Iglesias" , Ramon Fried , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Wraparound of TX descriptor cyclic buffer only updated the low 32 bits of the descriptor. Fix that by checking if we're working with 64bit descriptors. Signed-off-by: Ramon Fried Reviewed-by: Edgar E. Iglesias --- v2: Fix indention problem. hw/net/cadence_gem.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 51ec5a072d..b7b7985bf2 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1238,7 +1238,14 @@ static void gem_transmit(CadenceGEMState *s) /* read next descriptor */ if (tx_desc_get_wrap(desc)) { tx_desc_set_last(desc); - packet_desc_addr =3D s->regs[GEM_TXQBASE]; + + if (s->regs[GEM_DMACFG] & GEM_DMACFG_ADDR_64B) { + packet_desc_addr =3D s->regs[GEM_TBQPH]; + packet_desc_addr <<=3D 32; + } else { + packet_desc_addr =3D 0; + } + packet_desc_addr |=3D s->regs[GEM_TXQBASE]; } else { packet_desc_addr +=3D 4 * gem_get_desc_len(s, false); } --=20 2.26.0