From patchwork Fri Oct 27 14:39:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1856269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=ZT3Fjw/T; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SH5Bl3XDzz23jV for ; Sat, 28 Oct 2023 01:48:31 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwO0t-0000jK-6Z; Fri, 27 Oct 2023 10:40:39 -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 1qwO0Q-0007On-NR for qemu-devel@nongnu.org; Fri, 27 Oct 2023 10:40:12 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwO0K-0008FD-HL for qemu-devel@nongnu.org; Fri, 27 Oct 2023 10:40:08 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40839807e82so12980875e9.0 for ; Fri, 27 Oct 2023 07:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698417603; x=1699022403; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=K78hyFiUfjBNQ327SfBAJK9OTghHVAMBRjNgq2p4Bk0=; b=ZT3Fjw/TsXFmfMnHGVCab/I7hDj847TUccGpgoum4USD9iu7sVVnlZJf2XOH8Hiw0u XYPwgkQDFNo3YDVdvpDuGB5vfIgA8PhoGbtCi4wz3y58QXlFi83MLrFrM8QWPav5tVE6 FL3AFC0JZV9tuh8TD9GWpwcb1tLhpzdCmDz4AsvJN5l9g8hEJ1r/9TRUlU8Di3XKgKEt 2LYzb85Hn7tp6QQnZ3zIJlgpNTKfhYWbBRDY7GOJ56fq2QCBzukCLPGxIohFRKSTkW5L +rpinXoh/q0jyuvSI0Az74a2mTBqoRKAtjMFdXHfm9KrZ4n6BlO+Bg+hYTkntmPOKBC0 zO7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698417603; x=1699022403; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K78hyFiUfjBNQ327SfBAJK9OTghHVAMBRjNgq2p4Bk0=; b=D54LNFx20b1Q001nCeku+7HFc/6ILar2BXjDrFlGzC24d6wkbiRK01IU5DSAteLKps nAGxlrXMziWjvHawKN5M/PK+1krtpotNlx5kh6AbFfEUXEYK4iJTX3U23a7J+ZoeZbHu DoteI1ZP0s1lG7HF+m2EkkWu87St7I6A3MlG3U05oIFeOWwq03uWXpjQfY0HHkgVVyw8 UIDGpFnuxU+Ds2fbkkRRKoNbEkNAWXljfOC3e7r0G9OGq/MOHWW/34cfaxYKH9a/ZxIC Z6Jx+8XgVF2i/Ilz+qXF48YdGc/3KTntezIgQPa4LDQxBJfSCC6bNtzWikiSI1gJZrvp hspQ== X-Gm-Message-State: AOJu0YzW9k5gyLoutf3ShHA1S7G6maSD2d8uk7nCx5i9MIDfQkXfeqYr weLvIIvQKcTOn/iJ0OiXFZiPTee6TOw+9zIUKNk= X-Google-Smtp-Source: AGHT+IGudAHt79dh0UoQArOwii4NbCA1HmZ5yR2Fk3OhIF+CTp8P1s/YV8OVEx0/arRJ2nOiQfIzRA== X-Received: by 2002:a05:600c:3585:b0:405:3be0:c78d with SMTP id p5-20020a05600c358500b004053be0c78dmr6681313wmq.3.1698417602753; Fri, 27 Oct 2023 07:40:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e2-20020a5d5002000000b0031c6581d55esm1874123wrt.91.2023.10.27.07.40.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:40:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 38/41] hw/net/cadence_gem: use FIELD to describe DESCONF6 register fields Date: Fri, 27 Oct 2023 15:39:39 +0100 Message-Id: <20231027143942.3413881-39-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231027143942.3413881-1-peter.maydell@linaro.org> References: <20231027143942.3413881-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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=ham 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Luc Michel Use the FIELD macro to describe the DESCONF6 register fields. Signed-off-by: Luc Michel Reviewed-by: Philippe Mathieu-Daudé Message-id: 20231017194422.4124691-9-luc.michel@amd.com Signed-off-by: Peter Maydell --- hw/net/cadence_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 7e6cab71071..dffcc64df25 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -283,7 +283,7 @@ REG32(DESCONF3, 0x288) REG32(DESCONF4, 0x28c) REG32(DESCONF5, 0x290) REG32(DESCONF6, 0x294) -#define GEM_DESCONF6_64B_MASK (1U << 23) + FIELD(DESCONF6, DMA_ADDR_64B, 23, 1) REG32(DESCONF7, 0x298) REG32(INT_Q1_STATUS, 0x400) @@ -1463,7 +1463,7 @@ static void gem_reset(DeviceState *d) s->regs[R_DESCONF] = 0x02D00111; s->regs[R_DESCONF2] = 0x2ab10000 | s->jumbo_max_len; s->regs[R_DESCONF5] = 0x002f2045; - s->regs[R_DESCONF6] = GEM_DESCONF6_64B_MASK; + s->regs[R_DESCONF6] = R_DESCONF6_DMA_ADDR_64B_MASK; s->regs[R_INT_Q1_MASK] = 0x00000CE6; s->regs[R_JUMBO_MAX_LEN] = s->jumbo_max_len;