From nobody Fri May 17 03:12:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625999781; cv=none; d=zohomail.com; s=zohoarc; b=Gdd9KstF+kum4yQNTUhhq8nEmXtQmFwa5BHHB7WWlu8HGxnJ0aoOul6QiO3KbiR42n7cfuXGWqC6ZfSXjTqWn4zDHk2C4tJ63Z+mvL5Gk3IoBdEAjd2RJ0XWNKHBShPvIp/1UxxNlHL+lGo/sVEqhPcvVjaTK8agNSY0WUR+UxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625999781; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mTZV+n/oh33t5seqMlDVWHULoEHrUF2lMDudl7/Bh6s=; b=CbA/LOxdRdSCx4vIYCO3RC5GNi31cEuCtaZjtpD9xJ0lBeWezU5b1ZMocptqY0PQd0HTX7Qqptr6magJIW2pXbw0MmNHXrlhUgmACM3DVq+PNfJBW/JMu11EaLUnuDZuOhX0Hin02E4tWeB56dncFVfhnuPM/n2HefqcvS954U4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1625999781793988.2178845991514; Sun, 11 Jul 2021 03:36:21 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id a13so20070425wrf.10 for ; Sun, 11 Jul 2021 03:36:21 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (static-189-95-145-212.ipcom.comunitel.net. [212.145.95.189]) by smtp.gmail.com with ESMTPSA id j17sm20194210wmq.9.2021.07.11.03.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 03:36:19 -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=mTZV+n/oh33t5seqMlDVWHULoEHrUF2lMDudl7/Bh6s=; b=bA0pK6Bf+Y3nBimW4sJ28eCDZm5DWog5sFVgr4LKRSNLkBOs0OLEdo2K5rmer2l7B8 Q301sZ6NAAK6I/tKKh4GkjagC59u/dnY7yHI2G3arsgZuICzbMN64i0mlorF5xQN0zYu W+bwG5SN7i3G+Kw+QTLVPzJLwizq5CQIfsPKkZRD1wVmmy3NtaHsH2205edbborJ6nFy js4xgmqZaOxEKqw6aAGDQTYvDooQOQcckdrF93HiqScStfqpeWNU05ZUZTF3N19gig92 gq2L3rsC0R0gwkRtgHbcQ37LMwfbExZtSM2W0EZejozpVGu64PGBaVubZVtBfe1wmwNp VlOQ== 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=mTZV+n/oh33t5seqMlDVWHULoEHrUF2lMDudl7/Bh6s=; b=fpmgDBXALc2U5VWp60EPtlOB0O6733FkrxM6cHkYCSuLwq7hO85gkbjlV/ue0ds39x clDo+fp7NQ5Re04u5gJ77n0xTJpJKlUeKjszsbInQyX8l7oJjZfYrrbfzUr7EiZCiALA OoIJrBo7Nu+HDA/q95e+AgE3Z2N5Tlzlhsdr0mDJZUY9IHtEZ7gVCPL3NQH0KuCnKAMd W5FZDukiWHLQxBHcxmvBm84FdObwoeRJ/yx89orbBAT45IkcXiSmGgJvyd/3NKc1IJSI TcvSnvn/lD1tEv8VaUD/csOYKpVD77jL1NAZI4WbciEXXHSuGEmMzONqSlRqEFer2GTq B0vg== X-Gm-Message-State: AOAM5303B8F1QOHe+SxQ4h9rvbNRoflmEoHO4modSVBk4bGvnNf+UUf8 VlEHFTPORssDNAbrJQZQzXM= X-Google-Smtp-Source: ABdhPJyPfz0EbqyyVcD2WyIpJdL4gi52TxHGQXdgohCh98ZHVCNyxIspaWll1VI27Bjj/Nv/pfQA/Q== X-Received: by 2002:a5d:4449:: with SMTP id x9mr27022000wrr.52.1625999780052; Sun, 11 Jul 2021 03:36:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jason Wang , Laurent Vivier , Finn Thain , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 1/5] dp8393x: Replace address_space_rw(is_write=1) by address_space_write() Date: Sun, 11 Jul 2021 12:36:08 +0200 Message-Id: <20210711103612.2661521-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210711103612.2661521-1-f4bug@amsat.org> References: <20210711103612.2661521-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625999783685100001 Replace address_space_rw(is_write=3D1) by address_space_write() and remove pointless cast. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Finn Thain Message-Id: <20210710174954.2577195-2-f4bug@amsat.org> Tested-by: Mark Cave-Ayland --- hw/net/dp8393x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 11810c9b600..9118364aa33 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -816,8 +816,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, size =3D sizeof(uint16_t) * width; address =3D dp8393x_crda(s) + sizeof(uint16_t) * 6 * width; dp8393x_put(s, width, 0, 0); - address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED, - (uint8_t *)s->data, size, 1); + address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, + s->data, size); =20 /* Move to next descriptor */ s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; @@ -846,8 +846,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, /* Pad short packets to keep pointers aligned */ if (rx_len < padded_len) { size =3D padded_len - rx_len; - address_space_rw(&s->as, address, MEMTXATTRS_UNSPECIFIED, - (uint8_t *)"\xFF\xFF\xFF", size, 1); + address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, + "\xFF\xFF\xFF", size); address +=3D size; } =20 --=20 2.31.1 From nobody Fri May 17 03:12:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625999786; cv=none; d=zohomail.com; s=zohoarc; b=YAlf0JsrW5aMsji5qqQLyA9KOGdBGHq0SmSfEiW9B23uWGE8cqxh/vHTDksYR/SUqh6ZaK5vfbsrB2toSe8vtPWggkAj8jgF1PF/KmEdB9qimmzWusFxRFbCTQ8/vxkdxx5BbYg40Q8eFvDdnSiF+t+omC05Enm1AQFet6M6ApQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625999786; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ciVo7kEqxY4swYhIluiodO0kr4geA/OgIFKlydbaSPI=; b=BmIKVY9K3b1sh02LN+L31zlSCX2c+W9tX0efKjX9h8v+kaCld0cYoGDdfiPsYgyJ9EFUCYxLl9JJBYP2NfvH8xLqq82+g6X4+1i6c+JVukwuLCQinrLPvRACtfxuF4D+50+/HNXbR9nCZSJsxfd7685C9zBwS+KP/n+m/DLq1QM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1625999786755437.46858845210977; Sun, 11 Jul 2021 03:36:26 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id t5so6238444wrw.12 for ; Sun, 11 Jul 2021 03:36:26 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (static-189-95-145-212.ipcom.comunitel.net. [212.145.95.189]) by smtp.gmail.com with ESMTPSA id x8sm3425829wrt.93.2021.07.11.03.36.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 03:36:24 -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=ciVo7kEqxY4swYhIluiodO0kr4geA/OgIFKlydbaSPI=; b=k5wd24nPiUZP0klrfhD/ftxHQvKRSpn3QX1YWr+dR614rzAAAF5IFwYC1zSIcQ+Bon 8fuvF77G2E9ue+g8UKSCFFsyaPxe0JAug1jEM0R4drB5Ninz5LvxXvS0K8lHCr5e5pqP UDqj1k+RynemhCER00WSgsQYpCq3AYyLCR9fBmvjryU02frf21O+8lWJPobZZo7lD0ry rbKTg7FhOF0jPSy3z1bE5BXv0/YuT8JtHrr29cCnHywORB1TROFq9pc8KvfogWX/Ilia yewn9fBzTmH0MSvVKURJVcNEEjZssVJglzqso/fDDpufKEoc1oknLtBjS7cUySzh6Cge aihw== 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=ciVo7kEqxY4swYhIluiodO0kr4geA/OgIFKlydbaSPI=; b=UeQjOtfxzhuZtYzTEN6EWBvw3MY95JWrVIMWlN4obQtdFOIjFecqJwlbvfo8fL9o7z TbiM5IBEZM/zbnAZv+SUVCT8n7Dxu9regzAniVA4gpsz2lAPe0yF5ImxKHk5npYbcTYv PGuUZdykVzJB1QWImGG6fkBz/+CKJoD5AoxgPytpmBh9L9VVdFPbFXmHQ9Bqf9Esh0aj qQBFFYUp+RJgxclujOLIHnz9p+v2/Ga+W6N3+0iuO8ypIPMJKZ61ayHaiAO+sxtvJXGg 2qG0d00T2tHt4yHwgEBUpCdwsHnOp8H7mPkgbhEmaY2Y5u9bELCJN429bNDaHsrx9hmr 49JQ== X-Gm-Message-State: AOAM530wzoU3ZLtCK/B9y/b2yPDV2DEOLd1uYbeIGLUQl47qqipxfdo5 5kbgoYnt6dh3iZetmC8ae1A= X-Google-Smtp-Source: ABdhPJxqxhcGWqi1BjMywXXQ7OZbdJQ7hgvhruyFkbdtdPWJH+7lxRQhkwdXNZWSbFQcv4iGWaDh+Q== X-Received: by 2002:adf:a54b:: with SMTP id j11mr35078063wrb.305.1625999785075; Sun, 11 Jul 2021 03:36:25 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jason Wang , Laurent Vivier , Finn Thain , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 2/5] dp8393x: Replace 0x40 magic value by SONIC_REG16_COUNT definition Date: Sun, 11 Jul 2021 12:36:09 +0200 Message-Id: <20210711103612.2661521-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210711103612.2661521-1-f4bug@amsat.org> References: <20210711103612.2661521-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625999787848100001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Finn Thain Message-Id: <20210710174954.2577195-3-f4bug@amsat.org> Tested-by: Mark Cave-Ayland --- hw/net/dp8393x.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 9118364aa33..d1e147a82a6 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -85,6 +85,7 @@ static const char *reg_names[] =3D { #define SONIC_MPT 0x2e #define SONIC_MDT 0x2f #define SONIC_DCR2 0x3f +#define SONIC_REG_COUNT 0x40 =20 #define SONIC_CR_HTX 0x0001 #define SONIC_CR_TXP 0x0002 @@ -158,7 +159,7 @@ struct dp8393xState { =20 /* Registers */ uint8_t cam[16][6]; - uint16_t regs[0x40]; + uint16_t regs[SONIC_REG_COUNT]; =20 /* Temporaries */ uint8_t tx_buffer[0x10000]; @@ -972,7 +973,7 @@ static void dp8393x_realize(DeviceState *dev, Error **e= rrp) =20 address_space_init(&s->as, s->dma_mr, "dp8393x"); memory_region_init_io(&s->mmio, OBJECT(dev), &dp8393x_ops, s, - "dp8393x-regs", 0x40 << s->it_shift); + "dp8393x-regs", SONIC_REG_COUNT << s->it_shift); =20 s->nic =3D qemu_new_nic(&net_dp83932_info, &s->conf, object_get_typename(OBJECT(dev)), dev->id, s); @@ -987,7 +988,7 @@ static const VMStateDescription vmstate_dp8393x =3D { .minimum_version_id =3D 0, .fields =3D (VMStateField []) { VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 6), - VMSTATE_UINT16_ARRAY(regs, dp8393xState, 0x40), + VMSTATE_UINT16_ARRAY(regs, dp8393xState, SONIC_REG_COUNT), VMSTATE_END_OF_LIST() } }; --=20 2.31.1 From nobody Fri May 17 03:12:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625999791; cv=none; d=zohomail.com; s=zohoarc; b=AsNiUZNI9lBhgpt94MPOMuEkBkPJgeFhxhBmIYH5+jLxCBChn7JWigorwZvl5bHuIKuGKdICTk9fWkzfYWExtgHOiu/ENsy2kM64wA3i3NxWobbb5f5gZJJM/CTZBv2Wo26BdrREevjgAsO+NyjHF12Et055Y6dmUUhvnMmkjBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625999791; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D2ifaiSyT2ObTU4DYndDlaBCTGyO6T4d5PvvzrO+4sI=; b=kOICIRsTZhGnL6e01Nd4sspz5zzqBD8NF7/Zcc3jgne1OHDnN5O4PYavUY/+Pk5XidWI0sGyMX42AuRXL4fm/zAV9xQAF3misMcAGdDmmdHBPVdu1wJdo9AfpL18uYx9F86gd8H3jpDj4hhr4c67I2SsgnFp67ZIhrruJ9asw/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1625999791893709.4685470762608; Sun, 11 Jul 2021 03:36:31 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id m2so9048306wrq.2 for ; Sun, 11 Jul 2021 03:36:31 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (static-189-95-145-212.ipcom.comunitel.net. [212.145.95.189]) by smtp.gmail.com with ESMTPSA id f12sm16331659wmg.16.2021.07.11.03.36.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 03:36:29 -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=D2ifaiSyT2ObTU4DYndDlaBCTGyO6T4d5PvvzrO+4sI=; b=XpnpyUpRcOiPcGZJzRMH8PqJLNjPKCz9GlBVVuwKlQmI/zG6F9SdvCkHE/5IrBqOH2 BAmFNaWLEK5JlSiKBPrtS6ix2RKf0X0eP27J6GpWJxMNJWm8UeLl1kVHqGcpOCOt6fqx fwdHChHcZFPlcXkIbP9GABt8CNDIbGz5OhkXFL1H8Lmvxp4zoyj6Fn5ZkroIbSLWHaX0 bcYwqt7Tyvsot9MTxRTQfS1t6x5znQSgIEhO84x8mCkGKIzvOBsZXpjYFV+LMFFoYfs8 ZB7986MwbCw/zAdgUoFrePHGw4wRDPsgOkwPA3CJS62T5UX/+4hiLA8mpAOowwpMUbEu ZdgQ== 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=D2ifaiSyT2ObTU4DYndDlaBCTGyO6T4d5PvvzrO+4sI=; b=k+x+/VYnSiXJwWoYSarItA3W8Eu9wGF/f5LBuesdl4O3N6di3qtGZ4CjcGdQzZ4Trp ijHtMN8uPfsAJ/qsUfvnDfnMHZZ2kJ4EfRdmJXKZ7HjYeUQ6SDJx1yLymus8+/gkztGF ES0/XVvggrlmC1j4vqLmGGCn1x6CgWsb399j3jM8pD90XXBPMJfAF16P02pzWf4IkWgK dhAqLXWaSs+VCL5orLe7Tm+w19hCchsnf7hx9DA9dxd3b4w31ue5pWPdkRUeDDgIPqer 5wJ5OFutGnRcm5nCTt1q+TuOoUfwfVrC+3hiaaliAItjoGKrle5F3ZxsBT29tXgmdyCu rckA== X-Gm-Message-State: AOAM531GE69N3W5jbqxh3f7Ll4mBj720QRLARz/NYQ88X7FVOxPNziV3 l/7w/EC6A34n1aBsboHI6Vk= X-Google-Smtp-Source: ABdhPJxlcgEMuLlJVjlv+WBYQOdthRqRlVtvHxsZFFJFSQhl/2Nx+hpeeVlH0trA8zU49J+eS2u0gQ== X-Received: by 2002:adf:e0c8:: with SMTP id m8mr52763077wri.261.1625999790130; Sun, 11 Jul 2021 03:36:30 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jason Wang , Laurent Vivier , Finn Thain , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 3/5] dp8393x: Store CAM registers as 16-bit Date: Sun, 11 Jul 2021 12:36:10 +0200 Message-Id: <20210711103612.2661521-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210711103612.2661521-1-f4bug@amsat.org> References: <20210711103612.2661521-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625999792322100001 Per the DP83932C datasheet from July 1995: 4.0 SONIC Registers 4.1 THE CAM UNIT The Content Addressable Memory (CAM) consists of sixteen 48-bit entries for complete address filtering of network packets. Each entry corresponds to a 48-bit destination address that is user programmable and can contain any combination of Multicast or Physical addresses. Each entry is partitioned into three 16-bit CAM cells accessible through CAM Address Ports (CAP 2, CAP 1 and CAP 0) with CAP0 corresponding to the least significant 16 bits of the Destination Address and CAP2 corresponding to the most significant bits. Store the CAM registers as 16-bit as it simplifies the code. Having now the CAM registers as arrays of 3 uint16_t, we can avoid using the VMSTATE_BUFFER_UNSAFE macro by using VMSTATE_UINT16_2DARRAY which is more appropriate. This breaks the migration stream however. Co-developed-by: Philippe Mathieu-Daud=C3=A9 Co-developed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Finn Thain Message-Id: <20210710174954.2577195-5-f4bug@amsat.org> Tested-by: Mark Cave-Ayland --- Missing: Signed-off-by: Mark Cave-Ayland --- hw/net/dp8393x.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index d1e147a82a6..283de9db0bf 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -158,7 +158,7 @@ struct dp8393xState { MemoryRegion mmio; =20 /* Registers */ - uint8_t cam[16][6]; + uint16_t cam[16][3]; uint16_t regs[SONIC_REG_COUNT]; =20 /* Temporaries */ @@ -281,15 +281,13 @@ static void dp8393x_do_load_cam(dp8393xState *s) address_space_read(&s->as, dp8393x_cdp(s), MEMTXATTRS_UNSPECIFIED, s->data, size); index =3D dp8393x_get(s, width, 0) & 0xf; - s->cam[index][0] =3D dp8393x_get(s, width, 1) & 0xff; - s->cam[index][1] =3D dp8393x_get(s, width, 1) >> 8; - s->cam[index][2] =3D dp8393x_get(s, width, 2) & 0xff; - s->cam[index][3] =3D dp8393x_get(s, width, 2) >> 8; - s->cam[index][4] =3D dp8393x_get(s, width, 3) & 0xff; - s->cam[index][5] =3D dp8393x_get(s, width, 3) >> 8; - trace_dp8393x_load_cam(index, s->cam[index][0], s->cam[index][1], - s->cam[index][2], s->cam[index][3], - s->cam[index][4], s->cam[index][5]); + s->cam[index][0] =3D dp8393x_get(s, width, 1); + s->cam[index][1] =3D dp8393x_get(s, width, 2); + s->cam[index][2] =3D dp8393x_get(s, width, 3); + trace_dp8393x_load_cam(index, + s->cam[index][0] >> 8, s->cam[index][0] & 0= xff, + s->cam[index][1] >> 8, s->cam[index][1] & 0= xff, + s->cam[index][2] >> 8, s->cam[index][2] & 0= xff); /* Move to next entry */ s->regs[SONIC_CDC]--; s->regs[SONIC_CDP] +=3D size; @@ -592,8 +590,7 @@ static uint64_t dp8393x_read(void *opaque, hwaddr addr,= unsigned int size) case SONIC_CAP1: case SONIC_CAP0: if (s->regs[SONIC_CR] & SONIC_CR_RST) { - val =3D s->cam[s->regs[SONIC_CEP] & 0xf][2 * (SONIC_CAP0 - reg= ) + 1] << 8; - val |=3D s->cam[s->regs[SONIC_CEP] & 0xf][2 * (SONIC_CAP0 - re= g)]; + val =3D s->cam[s->regs[SONIC_CEP] & 0xf][SONIC_CAP0 - reg]; } break; /* All other registers have no special contraints */ @@ -984,10 +981,10 @@ static void dp8393x_realize(DeviceState *dev, Error *= *errp) =20 static const VMStateDescription vmstate_dp8393x =3D { .name =3D "dp8393x", - .version_id =3D 0, - .minimum_version_id =3D 0, + .version_id =3D 1, + .minimum_version_id =3D 1, .fields =3D (VMStateField []) { - VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 6), + VMSTATE_UINT16_2DARRAY(cam, dp8393xState, 16, 3), VMSTATE_UINT16_ARRAY(regs, dp8393xState, SONIC_REG_COUNT), VMSTATE_END_OF_LIST() } --=20 2.31.1 From nobody Fri May 17 03:12:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625999796; cv=none; d=zohomail.com; s=zohoarc; b=A/h0spUMAWDuRRXKEbwRYMNYZz/iS1BjjL9TyiaPlI/wlgiRWiJJ4FuiW2P39TS3eJ5OBdpvenusY5Q6vGE4/jo2n6YFKkpwkvy+GAgIFgQoICTJmUdGGYxFsZkMRef7YcxdWlI0FKB6mGlp66lc8F/UzmYgrRh5i5Ocet3k/oI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625999796; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BW43eT/YMTWZC1AYauXSkubmTZfnC0cY3WoLVD92V9o=; b=OQ6oMQKeUX5AwlbNwIo5GmTIxDYrCad5ccOQEMtNWfons261nOPZafA9zzmCrNyUXIwdoeSBziVHl7VSnOhT7DX68Us+jP+oPPiLsxxWk/INMexYeZLRt5d2oKCMOw5+ZLZ6nrkz92okH6RovX91smZlsXTwjI8ioDHj5K8rWQo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1625999796933599.6586120751925; Sun, 11 Jul 2021 03:36:36 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id a5-20020a7bc1c50000b02901e3bbe0939bso9318719wmj.0 for ; Sun, 11 Jul 2021 03:36:36 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (static-189-95-145-212.ipcom.comunitel.net. [212.145.95.189]) by smtp.gmail.com with ESMTPSA id e15sm10802474wrp.29.2021.07.11.03.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 03:36: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=BW43eT/YMTWZC1AYauXSkubmTZfnC0cY3WoLVD92V9o=; b=m4WkgrSjzcSRpGrW839CFzVIVmY7Ua3qb4veHOJSptZuy6XeUWPoGrmrb6/+pP02gt NcYkjU3Ywl24Unn98+Nfp44cpx8Colua4n+wwZ/PR55J7lujSjsvrapcYOLnYY4cZPX0 z638xJl/atJwRsUI8Y2TtBvoC6cHsN01yaHRfINRNUhWO/XRft1rA6xV/TZkBcS9aS0A 8JgOJMoXynR4wRpa5facsVdlDvL2U77iKzV1pEc3OBayLUuhFESh8dkojTD2nFAxFOoP lg/JO+gW93X1L83CjWpi2o6OPMTOVlymv4RxhT9Vc6u7pdNBgk6E5j58aCslKNa+1DX2 KIMQ== 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=BW43eT/YMTWZC1AYauXSkubmTZfnC0cY3WoLVD92V9o=; b=ohLcl0UEuKMvH+uoNA9eDSHKqFj/yG08o9kSRcz0uX/T6OuEZydC6BVbzJ8eYqfKNm dLoJlTzvY7Nq3aelBAOc++OwZSCmVeAhtttZVGA6F3RwFzpSnHmNYgYZjSF01v3eWWza 6njUc3nFYlURz2ZwJBHqhb7NNmF78v6aL4GFAjwKk1/1WrZwrTCb5O0AhruQP0BlXDFL vb3CV2VBqAj9Hul7bTmHUZBXZS2ha8ZlxeKwZ33Jlxv4bCt7pj9kL1oNRcZlvenvJMEo FpFKGjI9uNWbed9S3vdcy10vCvnNQv/tDVtzmCL70acrzDDr38pv8TKMPu22CAXrUimo qMDg== X-Gm-Message-State: AOAM531158wKq/gCYRlDCQXReGHI/jfqW82cWWHsnJs48ngm6hIWVUZI VRC79ZMZVo1g4NdcfiS1RJStkXETdNDznA== X-Google-Smtp-Source: ABdhPJwn1Q9Ccz3gLtqPVvWaHwvU8/mgfbdehGYmS/hQJtjEMSYhvkQ9/zCvuep8LT4oeSDB8nL6GQ== X-Received: by 2002:a1c:9886:: with SMTP id a128mr32834767wme.150.1625999795066; Sun, 11 Jul 2021 03:36:35 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jason Wang , Laurent Vivier , Finn Thain , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 4/5] dp8393x: Rewrite dp8393x_get() / dp8393x_put() Date: Sun, 11 Jul 2021 12:36:11 +0200 Message-Id: <20210711103612.2661521-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210711103612.2661521-1-f4bug@amsat.org> References: <20210711103612.2661521-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625999798320100001 Instead of accessing N registers via a single address_space API call using a temporary buffer (stored in the device state) and updating each register, move the address_space call in the register put/get. The load/store and word size checks are moved to put/get too. This simplifies a bit, making the code easier to read. Co-developed-by: Philippe Mathieu-Daud=C3=A9 Co-developed-by: Mark Cave-Ayland Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Mark Cave-Ayland Tested-by: Mark Cave-Ayland Tested-by: Finn Thain Message-Id: <20210710174954.2577195-8-f4bug@amsat.org> --- hw/net/dp8393x.c | 160 +++++++++++++++++++---------------------------- 1 file changed, 63 insertions(+), 97 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 283de9db0bf..4057a263de3 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -163,7 +163,6 @@ struct dp8393xState { =20 /* Temporaries */ uint8_t tx_buffer[0x10000]; - uint16_t data[12]; int loopback_packet; =20 /* Memory access */ @@ -220,34 +219,48 @@ static uint32_t dp8393x_wt(dp8393xState *s) return s->regs[SONIC_WT1] << 16 | s->regs[SONIC_WT0]; } =20 -static uint16_t dp8393x_get(dp8393xState *s, int width, int offset) +static uint16_t dp8393x_get(dp8393xState *s, hwaddr addr, int offset) { + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; uint16_t val; =20 - if (s->big_endian) { - val =3D be16_to_cpu(s->data[offset * width + width - 1]); + if (s->regs[SONIC_DCR] & SONIC_DCR_DW) { + addr +=3D offset << 2; + if (s->big_endian) { + val =3D address_space_ldl_be(&s->as, addr, attrs, NULL); + } else { + val =3D address_space_ldl_le(&s->as, addr, attrs, NULL); + } } else { - val =3D le16_to_cpu(s->data[offset * width]); + addr +=3D offset << 1; + if (s->big_endian) { + val =3D address_space_lduw_be(&s->as, addr, attrs, NULL); + } else { + val =3D address_space_lduw_le(&s->as, addr, attrs, NULL); + } } + return val; } =20 -static void dp8393x_put(dp8393xState *s, int width, int offset, - uint16_t val) +static void dp8393x_put(dp8393xState *s, + hwaddr addr, int offset, uint16_t val) { - if (s->big_endian) { - if (width =3D=3D 2) { - s->data[offset * 2] =3D 0; - s->data[offset * 2 + 1] =3D cpu_to_be16(val); + const MemTxAttrs attrs =3D MEMTXATTRS_UNSPECIFIED; + + if (s->regs[SONIC_DCR] & SONIC_DCR_DW) { + addr +=3D offset << 2; + if (s->big_endian) { + address_space_stl_be(&s->as, addr, val, attrs, NULL); } else { - s->data[offset] =3D cpu_to_be16(val); + address_space_stl_le(&s->as, addr, val, attrs, NULL); } } else { - if (width =3D=3D 2) { - s->data[offset * 2] =3D cpu_to_le16(val); - s->data[offset * 2 + 1] =3D 0; + addr +=3D offset << 1; + if (s->big_endian) { + address_space_stw_be(&s->as, addr, val, attrs, NULL); } else { - s->data[offset] =3D cpu_to_le16(val); + address_space_stw_le(&s->as, addr, val, attrs, NULL); } } } @@ -278,12 +291,10 @@ static void dp8393x_do_load_cam(dp8393xState *s) =20 while (s->regs[SONIC_CDC] & 0x1f) { /* Fill current entry */ - address_space_read(&s->as, dp8393x_cdp(s), - MEMTXATTRS_UNSPECIFIED, s->data, size); - index =3D dp8393x_get(s, width, 0) & 0xf; - s->cam[index][0] =3D dp8393x_get(s, width, 1); - s->cam[index][1] =3D dp8393x_get(s, width, 2); - s->cam[index][2] =3D dp8393x_get(s, width, 3); + index =3D dp8393x_get(s, dp8393x_cdp(s), 0) & 0xf; + s->cam[index][0] =3D dp8393x_get(s, dp8393x_cdp(s), 1); + s->cam[index][1] =3D dp8393x_get(s, dp8393x_cdp(s), 2); + s->cam[index][2] =3D dp8393x_get(s, dp8393x_cdp(s), 3); trace_dp8393x_load_cam(index, s->cam[index][0] >> 8, s->cam[index][0] & 0= xff, s->cam[index][1] >> 8, s->cam[index][1] & 0= xff, @@ -294,9 +305,7 @@ static void dp8393x_do_load_cam(dp8393xState *s) } =20 /* Read CAM enable */ - address_space_read(&s->as, dp8393x_cdp(s), - MEMTXATTRS_UNSPECIFIED, s->data, size); - s->regs[SONIC_CE] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_CE] =3D dp8393x_get(s, dp8393x_cdp(s), 0); trace_dp8393x_load_cam_done(s->regs[SONIC_CE]); =20 /* Done */ @@ -312,14 +321,12 @@ static void dp8393x_do_read_rra(dp8393xState *s) /* Read memory */ width =3D (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; size =3D sizeof(uint16_t) * 4 * width; - address_space_read(&s->as, dp8393x_rrp(s), - MEMTXATTRS_UNSPECIFIED, s->data, size); =20 /* Update SONIC registers */ - s->regs[SONIC_CRBA0] =3D dp8393x_get(s, width, 0); - s->regs[SONIC_CRBA1] =3D dp8393x_get(s, width, 1); - s->regs[SONIC_RBWC0] =3D dp8393x_get(s, width, 2); - s->regs[SONIC_RBWC1] =3D dp8393x_get(s, width, 3); + s->regs[SONIC_CRBA0] =3D dp8393x_get(s, dp8393x_rrp(s), 0); + s->regs[SONIC_CRBA1] =3D dp8393x_get(s, dp8393x_rrp(s), 1); + s->regs[SONIC_RBWC0] =3D dp8393x_get(s, dp8393x_rrp(s), 2); + s->regs[SONIC_RBWC1] =3D dp8393x_get(s, dp8393x_rrp(s), 3); trace_dp8393x_read_rra_regs(s->regs[SONIC_CRBA0], s->regs[SONIC_CRBA1], s->regs[SONIC_RBWC0], s->regs[SONIC_RBWC1]= ); =20 @@ -415,28 +422,22 @@ static void dp8393x_do_receiver_disable(dp8393xState = *s) static void dp8393x_do_transmit_packets(dp8393xState *s) { NetClientState *nc =3D qemu_get_queue(s->nic); - int width, size; int tx_len, len; uint16_t i; =20 - width =3D (s->regs[SONIC_DCR] & SONIC_DCR_DW) ? 2 : 1; - while (1) { /* Read memory */ - size =3D sizeof(uint16_t) * 6 * width; s->regs[SONIC_TTDA] =3D s->regs[SONIC_CTDA]; trace_dp8393x_transmit_packet(dp8393x_ttda(s)); - address_space_read(&s->as, dp8393x_ttda(s) + sizeof(uint16_t) * wi= dth, - MEMTXATTRS_UNSPECIFIED, s->data, size); tx_len =3D 0; =20 /* Update registers */ - s->regs[SONIC_TCR] =3D dp8393x_get(s, width, 0) & 0xf000; - s->regs[SONIC_TPS] =3D dp8393x_get(s, width, 1); - s->regs[SONIC_TFC] =3D dp8393x_get(s, width, 2); - s->regs[SONIC_TSA0] =3D dp8393x_get(s, width, 3); - s->regs[SONIC_TSA1] =3D dp8393x_get(s, width, 4); - s->regs[SONIC_TFS] =3D dp8393x_get(s, width, 5); + s->regs[SONIC_TCR] =3D dp8393x_get(s, dp8393x_ttda(s), 1) & 0xf000; + s->regs[SONIC_TPS] =3D dp8393x_get(s, dp8393x_ttda(s), 2); + s->regs[SONIC_TFC] =3D dp8393x_get(s, dp8393x_ttda(s), 3); + s->regs[SONIC_TSA0] =3D dp8393x_get(s, dp8393x_ttda(s), 4); + s->regs[SONIC_TSA1] =3D dp8393x_get(s, dp8393x_ttda(s), 5); + s->regs[SONIC_TFS] =3D dp8393x_get(s, dp8393x_ttda(s), 6); =20 /* Handle programmable interrupt */ if (s->regs[SONIC_TCR] & SONIC_TCR_PINT) { @@ -458,15 +459,12 @@ static void dp8393x_do_transmit_packets(dp8393xState = *s) i++; if (i !=3D s->regs[SONIC_TFC]) { /* Read next fragment details */ - size =3D sizeof(uint16_t) * 3 * width; - address_space_read(&s->as, - dp8393x_ttda(s) - + sizeof(uint16_t) * width * (4 + 3 * i= ), - MEMTXATTRS_UNSPECIFIED, s->data, - size); - s->regs[SONIC_TSA0] =3D dp8393x_get(s, width, 0); - s->regs[SONIC_TSA1] =3D dp8393x_get(s, width, 1); - s->regs[SONIC_TFS] =3D dp8393x_get(s, width, 2); + s->regs[SONIC_TSA0] =3D dp8393x_get(s, dp8393x_ttda(s), + 4 + 3 * i); + s->regs[SONIC_TSA1] =3D dp8393x_get(s, dp8393x_ttda(s), + 5 + 3 * i); + s->regs[SONIC_TFS] =3D dp8393x_get(s, dp8393x_ttda(s), + 6 + 3 * i); } } =20 @@ -499,22 +497,12 @@ static void dp8393x_do_transmit_packets(dp8393xState = *s) s->regs[SONIC_TCR] |=3D SONIC_TCR_PTX; =20 /* Write status */ - dp8393x_put(s, width, 0, - s->regs[SONIC_TCR] & 0x0fff); /* status */ - size =3D sizeof(uint16_t) * width; - address_space_write(&s->as, dp8393x_ttda(s), - MEMTXATTRS_UNSPECIFIED, s->data, size); + dp8393x_put(s, dp8393x_ttda(s), 0, s->regs[SONIC_TCR] & 0x0fff); =20 if (!(s->regs[SONIC_CR] & SONIC_CR_HTX)) { /* Read footer of packet */ - size =3D sizeof(uint16_t) * width; - address_space_read(&s->as, - dp8393x_ttda(s) - + sizeof(uint16_t) * width - * (4 + 3 * s->regs[SONIC_TFC]), - MEMTXATTRS_UNSPECIFIED, s->data, - size); - s->regs[SONIC_CTDA] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_CTDA] =3D dp8393x_get(s, dp8393x_ttda(s), + 4 + 3 * s->regs[SONIC_TFC]); if (s->regs[SONIC_CTDA] & SONIC_DESC_EOL) { /* EOL detected */ break; @@ -762,7 +750,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, cons= t uint8_t * buf, dp8393xState *s =3D qemu_get_nic_opaque(nc); int packet_type; uint32_t available, address; - int width, rx_len, padded_len; + int rx_len, padded_len; uint32_t checksum; int size; =20 @@ -775,10 +763,8 @@ static ssize_t dp8393x_receive(NetClientState *nc, con= st uint8_t * buf, =20 rx_len =3D pkt_size + sizeof(checksum); if (s->regs[SONIC_DCR] & SONIC_DCR_DW) { - width =3D 2; padded_len =3D ((rx_len - 1) | 3) + 1; } else { - width =3D 1; padded_len =3D ((rx_len - 1) | 1) + 1; } =20 @@ -799,11 +785,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, con= st uint8_t * buf, /* Check for EOL */ if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) { /* Are we still in resource exhaustion? */ - size =3D sizeof(uint16_t) * 1 * width; - address =3D dp8393x_crda(s) + sizeof(uint16_t) * 5 * width; - address_space_read(&s->as, address, MEMTXATTRS_UNSPECIFIED, - s->data, size); - s->regs[SONIC_LLFA] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_LLFA] =3D dp8393x_get(s, dp8393x_crda(s), 5); if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) { /* Still EOL ; stop reception */ return -1; @@ -811,11 +793,7 @@ static ssize_t dp8393x_receive(NetClientState *nc, con= st uint8_t * buf, /* Link has been updated by host */ =20 /* Clear in_use */ - size =3D sizeof(uint16_t) * width; - address =3D dp8393x_crda(s) + sizeof(uint16_t) * 6 * width; - dp8393x_put(s, width, 0, 0); - address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, - s->data, size); + dp8393x_put(s, dp8393x_crda(s), 6, 0x0000); =20 /* Move to next descriptor */ s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; @@ -869,32 +847,20 @@ static ssize_t dp8393x_receive(NetClientState *nc, co= nst uint8_t * buf, =20 /* Write status to memory */ trace_dp8393x_receive_write_status(dp8393x_crda(s)); - dp8393x_put(s, width, 0, s->regs[SONIC_RCR]); /* status */ - dp8393x_put(s, width, 1, rx_len); /* byte count */ - dp8393x_put(s, width, 2, s->regs[SONIC_TRBA0]); /* pkt_ptr0 */ - dp8393x_put(s, width, 3, s->regs[SONIC_TRBA1]); /* pkt_ptr1 */ - dp8393x_put(s, width, 4, s->regs[SONIC_RSC]); /* seq_no */ - size =3D sizeof(uint16_t) * 5 * width; - address_space_write(&s->as, dp8393x_crda(s), - MEMTXATTRS_UNSPECIFIED, - s->data, size); + dp8393x_put(s, dp8393x_crda(s), 0, s->regs[SONIC_RCR]); /* status */ + dp8393x_put(s, dp8393x_crda(s), 1, rx_len); /* byte count */ + dp8393x_put(s, dp8393x_crda(s), 2, s->regs[SONIC_TRBA0]); /* pkt_ptr0 = */ + dp8393x_put(s, dp8393x_crda(s), 3, s->regs[SONIC_TRBA1]); /* pkt_ptr1 = */ + dp8393x_put(s, dp8393x_crda(s), 4, s->regs[SONIC_RSC]); /* seq_no */ =20 /* Check link field */ - size =3D sizeof(uint16_t) * width; - address_space_read(&s->as, - dp8393x_crda(s) + sizeof(uint16_t) * 5 * width, - MEMTXATTRS_UNSPECIFIED, s->data, size); - s->regs[SONIC_LLFA] =3D dp8393x_get(s, width, 0); + s->regs[SONIC_LLFA] =3D dp8393x_get(s, dp8393x_crda(s), 5); if (s->regs[SONIC_LLFA] & SONIC_DESC_EOL) { /* EOL detected */ s->regs[SONIC_ISR] |=3D SONIC_ISR_RDE; } else { /* Clear in_use */ - size =3D sizeof(uint16_t) * width; - address =3D dp8393x_crda(s) + sizeof(uint16_t) * 6 * width; - dp8393x_put(s, width, 0, 0); - address_space_write(&s->as, address, MEMTXATTRS_UNSPECIFIED, - s->data, size); + dp8393x_put(s, dp8393x_crda(s), 6, 0x0000); =20 /* Move to next descriptor */ s->regs[SONIC_CRDA] =3D s->regs[SONIC_LLFA]; --=20 2.31.1 From nobody Fri May 17 03:12:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625999802; cv=none; d=zohomail.com; s=zohoarc; b=erEB8xYPM0A2bJK5SfM9mzL9nfRU8MpXzXzIbZPdKzMNW5DVlxUbKPYJL7Djaao27BuczktXs+beAW71GhGl96Sna5cB9Egrz/MsBw8K3dFXQSpTcv2TDPsEmX1nvwpJMxpU0AH9f5KVIcsqfxr8IHXVJhHq5dRS3jGXSvshwVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625999802; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qQHrIVyJXHGkbXKhjJkgDmeXIckABcf9Z2uGW8Bcsrk=; b=VFBpt+GHxAUnBLZHnvoo6MdQCYi6kW8z9t4MbapPGSAxAttXzsMF0om4ivRqBvIIZyfaGU8K/iHx4mIY/C/7XpD1aBoD2SFklRR2aksAICBDjBFjHDOzygjJW8/KmM/JRb6O0Z8iv4CJywlj7uqIUu1rmj78JXeDv9vr2xrzn+I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 16259998020061014.9659385115333; Sun, 11 Jul 2021 03:36:42 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id w13so9235078wmc.3 for ; Sun, 11 Jul 2021 03:36:41 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (static-189-95-145-212.ipcom.comunitel.net. [212.145.95.189]) by smtp.gmail.com with ESMTPSA id i2sm16896993wmq.43.2021.07.11.03.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Jul 2021 03:36:39 -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=qQHrIVyJXHGkbXKhjJkgDmeXIckABcf9Z2uGW8Bcsrk=; b=YnWfC6kmGSLD14yMHKdJVN71izMjnT7G8HrVPcZ6dKQm5tnKfo5aBeuWVnKGsRavVk DSvKhaLSOsz3czG2DaTmqtcXe18jtUYMaYlIPyG5eLOMyVu16DBz8zK2jPwtDYDu3RTE D3v3vE5iJCEpt0PKpTtJhhxNTG+4XxS5pptsPOhq5ihNskD317qVm73GIhub0UlbI8V/ ht0HjnZaIvpz9mppjRtx8iK84CuQUnJOxIi/ex61zFHCLgeFUno0EzUIuBr8FlM3M3+h IFHuWJAy8g0uH2VVBcb7KAgNlyHZ+yzygDzPubps2Sougtf649OHxdJh/TLb64l66HuV taFg== 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=qQHrIVyJXHGkbXKhjJkgDmeXIckABcf9Z2uGW8Bcsrk=; b=FDXFAnm6THB9QQt0O1b2UpqOYOmeb9cktpLoR0hI6SLEWibqlVnvOef+vwE4fM0ldi YGkJQr4CQ0QCFtMPt9ZcBfGGv/xWzKKsqh6ix9OvpmkVhJdZQ0CFitBdXzY4EIxTchPE sHLlqUhqY9zHmr9QNWF5a4p1TtjrtWOnW+Hce59HEPvVcF/RiiLw4xc4/kxkZrgjyDhb Nxa7sSjT5DSsRzUbbEuBYV2gtOgGSo2NRtX0Tz02dlTx1VEJAAmchgbsce83cxOBMy+J 5u13kCCJ9BJNKCW48BrdFQ2qc7FFw6tv6a/xpF7PcOp3ukeDBCi54qAXhljNHl9Ti7C5 nrog== X-Gm-Message-State: AOAM532sGcnECI/IaJgYPCrC0dJiVLf97tqP0FB2tqmOFPcn6tb9TplJ eOKuAfM6c4uQZle0d3h3n2Q= X-Google-Smtp-Source: ABdhPJzP6tHeY/Njq9hho1h/0Ifv2N6B0etrXP45aD4LUN1240Qw+Zuaa4S4qheJzbg3prqtAm/Fag== X-Received: by 2002:a7b:cf03:: with SMTP id l3mr25864087wmg.110.1625999800268; Sun, 11 Jul 2021 03:36:40 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Jason Wang , Laurent Vivier , Finn Thain , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 5/5] dp8393x: don't force 32-bit register access Date: Sun, 11 Jul 2021 12:36:12 +0200 Message-Id: <20210711103612.2661521-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210711103612.2661521-1-f4bug@amsat.org> References: <20210711103612.2661521-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1625999802426100001 From: Mark Cave-Ayland Commit 3fe9a838ec "dp8393x: Always use 32-bit accesses" set .impl.min_acces= s_size and .impl.max_access_size to 4 to try and fix the Linux jazzsonic driver wh= ich uses 32-bit accesses. The problem with forcing the register access to 32-bit in this way is that = since the dp8393x uses 16-bit registers, a manual endian swap is required for devices= on big endian machines with 32-bit accesses. For both access sizes and machine endians the QEMU memory API can do the ri= ght thing automatically: all that is needed is to set .impl.min_access_size to 2 to d= eclare that the dp8393x implements 16-bit registers. Normally .impl.max_access_size should also be set to 2, however that doesn'= t quite work in this case since the register stride is specified using a (dynamic) = it_shift property which is applied during the MMIO access itself. The effect of this= is that for a 32-bit access the memory API performs 2 x 16-bit accesses, but the us= e of it_shift within the MMIO access itself causes the register value to be repe= ated in both the top 16-bits and bottom 16-bits. The Linux jazzsonic driver expects the = stride to be zero-extended up to access size and therefore fails to correctly detect the= dp8393x device due to the extra data in the top 16-bits. The solution here is to remove .impl.max_access_size so that the memory API= will correctly zero-extend the 16-bit registers to the access size up to and inc= luding it_shift. Since it_shift is never greater than 2 than this will always do t= he right thing for both 16-bit and 32-bit accesses regardless of the machine endian,= allowing the manual endian swap code to be removed. Signed-off-by: Mark Cave-Ayland Fixes: 3fe9a838ec ("dp8393x: Always use 32-bit accesses") Message-Id: <20210705214929.17222-2-mark.cave-ayland@ilande.co.uk> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Finn Thain Tested-by: Mark Cave-Ayland --- hw/net/dp8393x.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 4057a263de3..45b954e46c2 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -588,15 +588,14 @@ static uint64_t dp8393x_read(void *opaque, hwaddr add= r, unsigned int size) =20 trace_dp8393x_read(reg, reg_names[reg], val, size); =20 - return s->big_endian ? val << 16 : val; + return val; } =20 -static void dp8393x_write(void *opaque, hwaddr addr, uint64_t data, +static void dp8393x_write(void *opaque, hwaddr addr, uint64_t val, unsigned int size) { dp8393xState *s =3D opaque; int reg =3D addr >> s->it_shift; - uint32_t val =3D s->big_endian ? data >> 16 : data; =20 trace_dp8393x_write(reg, reg_names[reg], val, size); =20 @@ -677,11 +676,16 @@ static void dp8393x_write(void *opaque, hwaddr addr, = uint64_t data, } } =20 +/* + * Since .impl.max_access_size is effectively controlled by the it_shift + * property, leave it unspecified for now to allow the memory API to + * correctly zero extend the 16-bit register values to the access size up = to and + * including it_shift. + */ static const MemoryRegionOps dp8393x_ops =3D { .read =3D dp8393x_read, .write =3D dp8393x_write, - .impl.min_access_size =3D 4, - .impl.max_access_size =3D 4, + .impl.min_access_size =3D 2, .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 --=20 2.31.1