From patchwork Tue Nov 12 18:10:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 842721 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp3718884wru; Tue, 12 Nov 2024 10:18:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWbeDF63ZXemIt2jz/W5wADVNbvsu4DORKuNzAw2CdfqJVK9mJiYq9d22AMZUaZjwzYdtaBpA==@linaro.org X-Google-Smtp-Source: AGHT+IEzV30UGQs/R3CSerqP42/M4PgzXCFj2xuf1Rr/vu3HaHnlFbSgtgsYx7a0M/LkiXCTK4Gu X-Received: by 2002:a05:622a:2b47:b0:460:8fd3:b393 with SMTP id d75a77b69052e-4630937fd66mr266800901cf.28.1731435482953; Tue, 12 Nov 2024 10:18:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731435482; cv=none; d=google.com; s=arc-20240605; b=O07HZ8tjZiasiW8zTimtAzULwoRZ8JZ2z/3n8UNwMeDIOF2Ylp18imM+K3q/zf8+kG 9usXVKqNnSY00RrBWE4XQ0CTS6Tzh0gsHnBLW5Y4s4sDWcUHcKKTdymdDaanoeTeljUN WpGoHNqEmHI4a7ZZDrHNSvRib0tCeeNnEcscr8sr94q08M00MwT3ercSrgdTiCHQgDa0 9yeliwyxj3HugdnUyrfTey/iJm71KhV0hYjZunuLaWgNav6q+JQj+afhF8tTp1Y8m4tw AyJav31SkJ2awT9Mtj10QaXogvhR7ShuIzthbsymTAjI+9Pl6EpQN98FKV+LNtgp0Ymm 9Ntg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=S0A+XO8SEDEpUXfiyI42zPsZnM8n4BbkRd6mjrTW2c4=; fh=qmVcbpKGT2NGruxhf8fgQHnlhHRaRjD5ibgD08FHYfA=; b=BXD2vFk77iEzNfCNy+N/Ojgj2EqI0D9OWvkcCDznkP7pKnwM25tUFQyMwr4P0SBJ8w wiLgQL0Axp0Hl4R3hJe4MuhnH9w8HXHON8DWWgx06pGkc/VULF5z5T5TsK/jGw6swo+p vfJcP+JMZKCM4XRVh2tYt2N3CzXs+pj//j8ss+zYo3rbC8D81zDb/jxCAIQVhdDGnrdS c6JG4RkjIBrouaWhFNQ8Sl5H5Bweklv48x4uY1mlmDejFo0ccxFOrzXSEM/CIQMqfbM9 CiKvQk5I8JPZ8JDt+sX385bsRf0DU0ljSspkRO5nHaCHvoQxl3G4rfcWp6ekws75Aa/K YboQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xqNcY8GR; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-462ff5c7620si132961951cf.240.2024.11.12.10.18.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Nov 2024 10:18:02 -0800 (PST) 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=xqNcY8GR; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tAvMZ-0005A6-Uf; Tue, 12 Nov 2024 13:11:40 -0500 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 1tAvMV-00054k-JY for qemu-devel@nongnu.org; Tue, 12 Nov 2024 13:11:36 -0500 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tAvMU-0001vs-2t for qemu-devel@nongnu.org; Tue, 12 Nov 2024 13:11:35 -0500 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-539f72c913aso10479629e87.1 for ; Tue, 12 Nov 2024 10:11:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1731435092; x=1732039892; 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=S0A+XO8SEDEpUXfiyI42zPsZnM8n4BbkRd6mjrTW2c4=; b=xqNcY8GRY/9EYPcLNhmwzaEMNRPkvyvvAMy8c37per7ygQ5pI4MURCKpYq9qJh82y/ YJ7KI+jKybXshCZEYtem4m72u1RTakX0+QAMsGsLxfAkl1MeKtLcoktghFUA2Ufmp5WD fo+/l7dFxU8D5Vv9FUSTO2vM9jkT9TlJbHYSwC1+/LrtviSE5Npgq2KjNvm4do0QvRXO UzSqIlAKX6qsKRKpqznkpVyHVtmaiL5hCDyL9EUxAgdwy/hvUk1wKMVP8jBOha5mj74+ bt2GmDJwIBloKfj+Yel69xlBnZvZvf28G+xmsbg7g1hfxoAGPwo2v33AjKNDczrzljZN 8P5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731435092; x=1732039892; 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=S0A+XO8SEDEpUXfiyI42zPsZnM8n4BbkRd6mjrTW2c4=; b=PqeUOhQs03nIheivq51Q3DncnWR0ehUcQ4BzapVtYU3O/bp31o38APSEW2eWW1vCGv 3HyPUZ3Gmz530ZYAVDAASZ2wjF8j0w1T7SZChYqejfwIw9qkpbgYhNM1NbQB4EpvOfkH aczGINr6s8mP853IIFXFi4IPm9unbWACPq693r4XwpnW/9fIk3w6CR39jbH9eBYyiXDe eUjHgnyV1ae9BSMzxkk8JTTzeSxk31UDAF0agUp533WT+I5jgpohZ7NC5L2VdhdoRyvM R37ZFgSs2CcVrDrIsM3Vpx7Rr1VUFZFpQk6tZRmdBzXf8qe6A0FdJR1urRujIyzXAP9h Q1Dg== X-Gm-Message-State: AOJu0YzxErotCV8lVEeRntOCtz3lbB3OUlSUIvP86DsQ/9Us8tBKqGAp NTuJTeoKwOl7080mQNjkTmPcTBpfwAqbetLyGy7OMw+ZIvy4CVdlkwQcDWM97krUotcHJzOpBrj E X-Received: by 2002:a05:6512:4024:b0:533:3fc8:43ee with SMTP id 2adb3069b0e04-53d862c6b7bmr9259602e87.13.1731435091801; Tue, 12 Nov 2024 10:11:31 -0800 (PST) Received: from localhost.localdomain (cnf78-h01-176-184-27-250.dsl.sta.abo.bbox.fr. [176.184.27.250]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432aa7397e4sm252183635e9.40.2024.11.12.10.11.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 12 Nov 2024 10:11:31 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Richard Henderson , Peter Maydell , Anton Johansson , Jason Wang , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Thomas Huth , Alistair Francis , Paolo Bonzini , Gustavo Romero , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH 07/20] hw/net/xilinx_ethlite: Rename rxbuf -> port_index Date: Tue, 12 Nov 2024 19:10:31 +0100 Message-ID: <20241112181044.92193-8-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112181044.92193-1-philmd@linaro.org> References: <20241112181044.92193-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12b; envelope-from=philmd@linaro.org; helo=mail-lf1-x12b.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 'rxbuf' is the index of the port used. Rename it as 'port_index'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias --- hw/net/xilinx_ethlite.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 76b1e7d826..20919b4f54 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -72,8 +72,7 @@ struct XlnxXpsEthLite uint32_t c_tx_pingpong; uint32_t c_rx_pingpong; - unsigned int txbuf; - unsigned int rxbuf; + unsigned int port_index; UnimplementedDeviceState mdio; uint32_t regs[R_MAX]; @@ -183,7 +182,7 @@ static const MemoryRegionOps eth_ops = { static bool eth_can_rx(NetClientState *nc) { XlnxXpsEthLite *s = qemu_get_nic_opaque(nc); - unsigned int rxbase = s->rxbuf * (0x800 / 4); + unsigned int rxbase = s->port_index * (0x800 / 4); return !(s->regs[rxbase + R_RX_CTRL0] & CTRL_S); } @@ -191,7 +190,7 @@ static bool eth_can_rx(NetClientState *nc) static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) { XlnxXpsEthLite *s = qemu_get_nic_opaque(nc); - unsigned int rxbase = s->rxbuf * (0x800 / 4); + unsigned int rxbase = s->port_index * (0x800 / 4); /* DA filter. */ if (!(buf[0] & 0x80) && memcmp(&s->conf.macaddr.a[0], buf, 6)) @@ -214,7 +213,7 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) } /* If c_rx_pingpong was set flip buffers. */ - s->rxbuf ^= s->c_rx_pingpong; + s->port_index ^= s->c_rx_pingpong; return size; } @@ -222,7 +221,7 @@ static void xilinx_ethlite_reset(DeviceState *dev) { XlnxXpsEthLite *s = XILINX_ETHLITE(dev); - s->rxbuf = 0; + s->port_index = 0; } static NetClientInfo net_xilinx_ethlite_info = {