From nobody Tue Feb 10 11:12:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1625322017; cv=none; d=zohomail.com; s=zohoarc; b=j54mzEZM10dxOC60nWW207Ow02wrCauSwqxkJuSKbH1TsRLS5oafdgz74J+eil4ZmO68v8ai4zE5F4xKAixrNTchPIhO3a1Un0hbH9UqAaF4z2cwr1YJm4ib3m1T4yc3CIoEaIDIYcftYBZ1Tc+MIR8Zo5wldHgaoED8fkKVA7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625322017; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BBcm2+wolkRxeEQOcXfgwJq5vFDQEScUBa14FBrpn3k=; b=f6rEqY2uTEXBwsZw2u3nuxxzvL/s+66KE8oyhhTvNvja+opnAMYMETU9ghhJPoo1l9ySc2JXIp255ugvdm2WZWtlaSQqAgLsrPNs84VFCvzuIJuXJ759Hh7QBvHLg8v692yzd9Wh9RIvhVuPZiDSOxshUHmlYyei0boyu6iNIjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 162532201727877.83176417917957; Sat, 3 Jul 2021 07:20:17 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id o33-20020a05600c5121b02901e360c98c08so10913755wms.5 for ; Sat, 03 Jul 2021 07:20:16 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (184.red-95-127-187.staticip.rima-tde.net. [95.127.187.184]) by smtp.gmail.com with ESMTPSA id q5sm6445998wrx.57.2021.07.03.07.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jul 2021 07:20:15 -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=BBcm2+wolkRxeEQOcXfgwJq5vFDQEScUBa14FBrpn3k=; b=Ae+hrxsI1VSH7L+2I1trurB0AO6G23kUV4BogxdwP5XYzy0o8itrEvdLaKz5T01xh9 TW/KLds9aAx1QmAMnhp8BXm96RvuiMnARs1t1LTS5GDD6BqR5wNfYlkYSBr8MsX8Yu9H 2mLNheO7LIfYmlQ2cO+byEE0Ncrlgp6FCpghQYPbDn2lfkBA6WOldrfD7s/cSg8U+f18 eYg9HgHU2RTVm8f0V+Fjm6rWE8OsGXIgxaZv4UpipDb4X/Y2J1kFazK/9p/j149eSo9t 7jtXsLmAN4mdrnqZzBroK/4ljoew2/UUZmoFf0Gt3WK1BbJo9hK5pebL/cDq9mJ2Aof1 GSzg== 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=BBcm2+wolkRxeEQOcXfgwJq5vFDQEScUBa14FBrpn3k=; b=bNBk75HQ6BAx9ssCFlvmWMGYCKirG+zZxmkdYnouOnmQkTBovvMPCHXTMR5W8+Z4G/ FjLZEOmYWVk1bXZokzw1S7zAIj2ZV/2HIP4NcO3k9sYpT4AVxzPmILhjYIJqwB155CbL DiTbbBGSGeOAYD3S/AlZGnr1Ha+L5zIduLdJr6H6RLrf/2pzbBMwgym2lDTPRbC05Dv/ GpjZq8KnYiQnWB/4cAPvoyHSbymljSWNaDnOogf6d1lAgYDqMXOJcVWovUOm0UbcfZPl DFL5/r0eIchJXQpc87Bd43rf3X3lfsIuYdg+eYb5AA8613D/qi6DaDaIr4YEdGthh/c5 bqNg== X-Gm-Message-State: AOAM532bRrjnCWzAPVGsQql1f7VCWBDZs46tK09bLM31qB9OOi8hTF/H 57T9sLhoOy5GfjzF7ZQUbcE= X-Google-Smtp-Source: ABdhPJxUB+YnD2kavDllvKLJe5nPqx0ujN+2pJ5uQm3RYTh4qI+RY7juayefUvc5a+v9HvES1B3FAw== X-Received: by 2002:a05:600c:21da:: with SMTP id x26mr5221843wmj.141.1625322015568; Sat, 03 Jul 2021 07:20:15 -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: Laurent Vivier , Jason Wang , Finn Thain , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 4/6] dp8393x: Store CAM registers as 16-bit Date: Sat, 3 Jul 2021 16:19:45 +0200 Message-Id: <20210703141947.352295-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210703141947.352295-1-f4bug@amsat.org> References: <20210703141947.352295-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: 1625322018519100001 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. There is no change in the migration stream. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland Tested-by: Mark Cave-Ayland --- hw/net/dp8393x.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index c9b478c127c..e0055b178b1 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -157,7 +157,7 @@ struct dp8393xState { MemoryRegion mmio; =20 /* Registers */ - uint8_t cam[16][6]; + uint16_t cam[16][3]; uint16_t regs[0x40]; =20 /* Temporaries */ @@ -280,15 +280,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; @@ -591,8 +589,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][2 * (SONIC_CAP0 - reg= )]; } break; /* All other registers have no special contraints */ @@ -987,7 +984,7 @@ static const VMStateDescription vmstate_dp8393x =3D { .version_id =3D 0, .minimum_version_id =3D 0, .fields =3D (VMStateField []) { - VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 6), + VMSTATE_BUFFER_UNSAFE(cam, dp8393xState, 0, 16 * 3 * 2), VMSTATE_UINT16_ARRAY(regs, dp8393xState, 0x40), VMSTATE_END_OF_LIST() } --=20 2.31.1