Received: by 2002:a17:906:1c8e:b0:a51:b7b1:b069 with SMTP id g14csp1911657ejh; Tue, 9 Apr 2024 06:39:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULg7HVNdibF2i+9c1JB+N4H/aiOZ4zcyTn1WTGP4+I7FEzG1Hs5JwEqKlHK+Vsuqi/A8VK2+ZVl10oZ0ZfrjNR9S+kyuPP X-Google-Smtp-Source: AGHT+IFTrqUrpmzsv3Ktziv62/jXkEHImPkCqhgpp5TOX4zk14iLrg9tmedSLECvwc5jcx8Pj2oi X-Received: by 2002:a05:620a:25cb:b0:78d:5d7c:9896 with SMTP id y11-20020a05620a25cb00b0078d5d7c9896mr3903251qko.36.1712669943481; Tue, 09 Apr 2024 06:39:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712669943; cv=none; d=google.com; s=arc-20160816; b=sTDE+HTkTynhvpYKkY8uQh/Is9p6iOZSi+pSQh791q+7mJMFexP2LCXkHZ9x+U582Z 4sYUNpMr5aRDWVmWjAOYvVdHuGfjvwBCEE/sPmy+aOOkE5jk3Ll9DI/P1LB+jdBfM2uf qpeXrkF7waUc47VbvVe+htHYB4EyvdDCSSY8AJlEcwDowaU6JHr0BdX98HssTaEXgJi8 x4FunbyzUGFO5PM8P8vYNL+yNmEPKlOUajsFu6pvdyvw7j44IrDZDRFdOR4jgaEai7fj gSDaS9R331I1iRIxzQvp3W8uXLGK8rkWyoGM2BfBuMJBfnTiCLbNFjkBc2ovOk52Sc0Z a8lQ== 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=EZB+SBD3c6Tl2ilo7C5/8FmcEWLXBUIeUjZwCbvwe1A=; fh=QOl9Xi9nQ721K4qxGgLCqy+fNk/yfBHdpOYFmb4mu2g=; b=GOQ3Lxa5BcTHnh1CVwxVuyYeQTtwnizEjoPc4E2TGweok/hKFPA6voVUm/LbkLqcaX wfVFCim6fzd11MRy3fcnJxld4LovsM2I7uPbDqRSjJfS5YPZwEpQpsn4ZTvbb4iLJSTf 5a7GakMwGtI+6p7J06e/YrHHmlOLkjwvUIStBwGPhL32r3Eke2eVRM2Q7xtTghJ47z90 /bymIkfccuCIwf42ScG+qzN2lGlEHzqbiqJdgOwO6BnUUXff6jBH7jjPx9S2of5iPIuF 49inmcrsRZoyZof+rb2jjSdpUjGjRamiffcbUvqsjd63J98GiXNBqw5ldssm2iDwoIKH Trrw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RRetPFKy; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=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 bj11-20020a05620a190b00b0078d3e84647fsi11099055qkb.674.2024.04.09.06.39.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Apr 2024 06:39:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=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=RRetPFKy; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=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 1ruBfx-0005nn-M7; Tue, 09 Apr 2024 09:38:13 -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 1ruBfw-0005nT-M4 for qemu-devel@nongnu.org; Tue, 09 Apr 2024 09:38:12 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ruBfv-0008B9-0Q for qemu-devel@nongnu.org; Tue, 09 Apr 2024 09:38:12 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-41550858cabso38549225e9.2 for ; Tue, 09 Apr 2024 06:38:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712669889; x=1713274689; darn=nongnu.org; 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=EZB+SBD3c6Tl2ilo7C5/8FmcEWLXBUIeUjZwCbvwe1A=; b=RRetPFKy65vGiYnCsjFXIO0bxwFMbkXL39j00xg/mLDey/hfLYhelWEMfz9Efvacib yFuzEi3btgzt7kbQoVKkL2yMs4hp5/4hrmezaEW2RmG7l2/4WfGX1y1/SJmKFvHEVCkD xl82goS4h+Cb6Fso9HdjXxa8ZX5IrX5qjX3LivBzSOIL3jhfvDeiiJPuSfVbk2G/TEnt oZTIbSXiJ2WTU0LVBv9CCt+pEHiQH1sKzV5qnJQp3YxfG1NZh86HK0fhpcA0mc8cBaQe /gDg42BW4ZzUCp6lCtghtEDPtghqYnLaFDtZ4C/lWrAC055erQmgKJQpbb/HMONys0VR lLEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712669889; x=1713274689; 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=EZB+SBD3c6Tl2ilo7C5/8FmcEWLXBUIeUjZwCbvwe1A=; b=nkmQQaXIuyJ7HD1NevmsfyYtff/Od7nFEbQLvxyDHHaB1+4JZ+o5NRB69S+NKLfwS/ x1Gd44vQQRiRtJ7YxJfBUCNhJLnVGG7R9Ik8wceCbysEV7+/AlsQHs4v7xjHBNsIkwUD oVLdudhbhCEKAWWiGGKs/EonMMfRKM4nnhVkV0WHHXvsL3aobfsBaa7+F7alCPkzsK1W Y7TAWWdL6XRju3vS0bSqwNIPIH6FeF4E6PUoKPJ0ipH0maCoj3jP7xhpL8ZRQKDZtH+L oJXDFJU+LGSQMrdIjwOGr3S+Ldmex32TdzOD19m/59ASxywrEY9zgvzBxrb2SDw6AKC+ dQ2g== X-Gm-Message-State: AOJu0YxzhnmRaQXKFyjprREHm75AGIeguwA+ZZwke4cKNvqbF5NFtOuy 4w/b9cq9cA45bB8b4yGTVf6F4IO6ElZNS0Cx+jPCT31fgZFER49Qc1HIyDJGP6o1lRoYHEc1Rmh m X-Received: by 2002:a05:600c:1913:b0:416:2471:e102 with SMTP id j19-20020a05600c191300b004162471e102mr9168921wmq.37.1712669889014; Tue, 09 Apr 2024 06:38:09 -0700 (PDT) Received: from m1x-phil.lan ([176.176.160.134]) by smtp.gmail.com with ESMTPSA id s11-20020a05600c45cb00b004162d06768bsm18084976wmo.21.2024.04.09.06.38.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 09 Apr 2024 06:38:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Chuhong Yuan , Jason Wang , Alexander Bulekov , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-9.0 v2 01/11] hw/net/lan9118: Replace magic '2048' value by MIL_TXFIFO_SIZE definition Date: Tue, 9 Apr 2024 15:37:50 +0200 Message-ID: <20240409133801.23503-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240409133801.23503-1-philmd@linaro.org> References: <20240409133801.23503-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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 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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: AGY8q5cY2KLU The magic 2048 is explained in the LAN9211 datasheet (DS00002414A) in chapter 1.4, "10/100 Ethernet MAC": The MAC Interface Layer (MIL), within the MAC, contains a 2K Byte transmit and a 128 Byte receive FIFO which is separate from the TX and RX FIFOs. [...] Signed-off-by: Philippe Mathieu-Daudé --- (Not including Peter R-b from v1 due to semantic change) hw/net/lan9118.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c index 47ff25b441..8214569a2c 100644 --- a/hw/net/lan9118.c +++ b/hw/net/lan9118.c @@ -150,6 +150,12 @@ do { printf("lan9118: " fmt , ## __VA_ARGS__); } while (0) #define GPT_TIMER_EN 0x20000000 +/* + * The MAC Interface Layer (MIL), within the MAC, contains a 2K Byte transmit + * and a 128 Byte receive FIFO which is separate from the TX and RX FIFOs. + */ +#define MIL_TXFIFO_SIZE 2048 + enum tx_state { TX_IDLE, TX_B, @@ -166,7 +172,7 @@ typedef struct { int32_t pad; int32_t fifo_used; int32_t len; - uint8_t data[2048]; + uint8_t data[MIL_TXFIFO_SIZE]; } LAN9118Packet; static const VMStateDescription vmstate_lan9118_packet = { @@ -182,7 +188,7 @@ static const VMStateDescription vmstate_lan9118_packet = { VMSTATE_INT32(pad, LAN9118Packet), VMSTATE_INT32(fifo_used, LAN9118Packet), VMSTATE_INT32(len, LAN9118Packet), - VMSTATE_UINT8_ARRAY(data, LAN9118Packet, 2048), + VMSTATE_UINT8_ARRAY(data, LAN9118Packet, MIL_TXFIFO_SIZE), VMSTATE_END_OF_LIST() } }; @@ -544,7 +550,7 @@ static ssize_t lan9118_receive(NetClientState *nc, const uint8_t *buf, return -1; } - if (size >= 2048 || size < 14) { + if (size >= MIL_TXFIFO_SIZE || size < 14) { return -1; } -- 2.41.0