From nobody Tue Nov 26 14:44:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1707261858; cv=none; d=zohomail.com; s=zohoarc; b=ZTjx8LpEcU6Eg0YE2hdgQk+dLCGJqMzzvRm3G8E1bNzniCr7iMZVFBx50VpNzmp0PTyME1NqeqrfnMXezPwJm/dmKQmfxGLV/O9nt+lX6U1VQ1mqvZJ9tAtoGhN9KOJh6V53iluRDhvVTxsA/OZVNwKtl3QHEjm2tj8uBEg+oqA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707261858; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3/7wq4rDW0adpnVVVOuyGh9CpM8L7rZHr/Fp+pYK5Z0=; b=cflxAljh9PTeRLg+7WtOWK4Nz+4F8SceFwULBdDfVVarGQamDGZb5evqPIEctc1lcTmbhf7a5sdWDg66DaoPTgCMYEciWRpDdcs9PewBOLvDjqA2gWmp23SxTfoAf98jXpy2LXoK5l2iUXhQk/lZMHCztqPemZJtK+pGRQg8OyQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707261858345346.86763086597523; Tue, 6 Feb 2024 15:24:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXUnG-0002Cg-2z; Tue, 06 Feb 2024 18:24:00 -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 <3f7_CZQwKCj4sfgnmjxyjkfslttlqj.htrvjrz-ij0jqstslsz.twl@flex--nabihestefan.bounces.google.com>) id 1rXUn6-0002AF-Bo for qemu-devel@nongnu.org; Tue, 06 Feb 2024 18:23:48 -0500 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3f7_CZQwKCj4sfgnmjxyjkfslttlqj.htrvjrz-ij0jqstslsz.twl@flex--nabihestefan.bounces.google.com>) id 1rXUn3-0006Wa-ND for qemu-devel@nongnu.org; Tue, 06 Feb 2024 18:23:48 -0500 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5ee22efe5eeso639487b3.3 for ; Tue, 06 Feb 2024 15:23:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707261823; x=1707866623; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3/7wq4rDW0adpnVVVOuyGh9CpM8L7rZHr/Fp+pYK5Z0=; b=R4xZeBghsTMCtq4jECASj1dsynqch+Pm0oVmM4mNg+cpPO+uWouvomT+3kvo8Qka0B cmq6pKZ9ojSNJrco2+bgrO5vNXqKs8/9ZbiEYXYcSgYqHFJymjsI/tNDT0aLNwbA9jy6 OnGto4qd8F5HHLhyzYa+8wyxqwSKUsVIcb9qR3qhJ4u0jfz9EYTlUT+dl4/JCjUc8V6R 8AQVSvjnewq1cL9zxDAXytc1jxTX4KcOCFD+bmbahcj3C4k+aqyMzgLQM7L5KSTVQswF MxAS7EYn41Aevgr8932O7MiLSiZxtw7K98NX2Pg4BDLmPm8wVN4wQKHnusL0i58n/Y0g i49g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707261823; x=1707866623; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3/7wq4rDW0adpnVVVOuyGh9CpM8L7rZHr/Fp+pYK5Z0=; b=PpLy+THJuGOc0XQzmqlVWLl4tJeDt2bGvJB3JJdY6ZSG65cr4fbOyZOqfMNR3ZOrDQ B5xnp+fQ7MlQzeq/5W+cwRSG9jy+SU0p0QxBeW4+WGcO6xgkJ7QLPa2bEcKgOo1/rhh5 gQbDy/Wp01vXUiT+FXCsjy/Jc9b0N0LYw/Q519TatP5yB/tMzMAzw9UHyZqcHiTBL3UY j/dYmhsGdCqZNC3KbAggLN0TZRyJ19rOE9i22Ay7SCYSNTwkjEMb9UewqE2Fuljs/M9z AHmJILAH6LkYddLpD1roxwMPpZXlrzkqyn5dStVli8XvOb4+m1Qou2AWfrbAlmXw03tj gFXw== X-Forwarded-Encrypted: i=1; AJvYcCVhD8+eSG3iDbUTEQ8nCa3bAW2KkmpRQMvrca8aZo41IdVg6Y9n1lZa51Ne4Vm9moJpbWh3/fgWa+9gf8hSvKL+N9HBREo= X-Gm-Message-State: AOJu0YzB77BkRFxdVxWhrO4ZnKuuwtv1sPZqoeKIKi443RJl+zD9nR+8 JWReNBD5x7FJfpR6QSsetGq5x9EbhYURaJ+KA0ieEoTAJfi7FMEFdai3/voJRGuUWOAYITVbltg Xcmi9bIqsQ9uA6+s0nkBsDVsg6Q== X-Google-Smtp-Source: AGHT+IEnLijRM1Cw64MY0m2ygMs7GhSw1WvuyaQNA9rDhpiowewljMxzh0I+B5XgE9GcDFUS9/KDY0l1ZZBuMTOpFVY= X-Received: from nabihestefan.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:2737]) (user=nabihestefan job=sendgmr) by 2002:a05:690c:86:b0:604:b83:9cad with SMTP id be6-20020a05690c008600b006040b839cadmr559647ywb.5.1707261823646; Tue, 06 Feb 2024 15:23:43 -0800 (PST) Date: Tue, 6 Feb 2024 23:23:37 +0000 In-Reply-To: <20240206232337.1043760-1-nabihestefan@google.com> Mime-Version: 1.0 References: <20240206232337.1043760-1-nabihestefan@google.com> X-Mailer: git-send-email 2.43.0.594.gd9cf4e227d-goog Message-ID: <20240206232337.1043760-2-nabihestefan@google.com> Subject: [PATCH 1/1] tests/qtest: Fixing GMAC test to run in 7xx From: Nabih Estefan To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, kfting@nuvoton.com, wuhaotsh@google.com, jasowang@redhat.com, avi.fishman@nuvoton.com, nabihestefan@google.com, kwliu@nuvoton.com, tomer.maimon@nuvoton.com, Hila.Miranda-Kuzi@nuvoton.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1149; envelope-from=3f7_CZQwKCj4sfgnmjxyjkfslttlqj.htrvjrz-ij0jqstslsz.twl@flex--nabihestefan.bounces.google.com; helo=mail-yw1-x1149.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, 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, T_SCC_BODY_TEXT_LINE=-0.01, USER_IN_DEF_DKIM_WL=-7.5 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1707261883711100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Fixing the nocm_gmac-test.c file to run on a nuvoton 7xx machine instead of 8xx. Also fixing comments referencing this and values expecting 8xx. Change-Id: I07b91e8be473e6a1ece65a2202608b52ed4025b8 Signed-Off-By: Nabih Estefan --- tests/qtest/meson.build | 4 ++-- tests/qtest/npcm_gmac-test.c | 12 ++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 39557d5ecb..2b89e8634b 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -192,7 +192,8 @@ qtests_npcm7xx =3D \ 'npcm7xx_sdhci-test', 'npcm7xx_smbus-test', 'npcm7xx_timer-test', - 'npcm7xx_watchdog_timer-test'] + \ + 'npcm7xx_watchdog_timer-test', + 'npcm_gmac-test'] + \ (slirp.found() ? ['npcm7xx_emc-test'] : []) qtests_aspeed =3D \ ['aspeed_hace-test', @@ -231,7 +232,6 @@ qtests_aarch64 =3D \ (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : [])= + \ (config_all_accel.has_key('CONFIG_TCG') and = \ config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test']= : []) + \ - (config_all_devices.has_key('CONFIG_NPCM7XX') ? qtests_npcm7xx : []) + \ ['arm-cpu-features', 'numa-test', 'boot-serial-test', diff --git a/tests/qtest/npcm_gmac-test.c b/tests/qtest/npcm_gmac-test.c index 9e58b15ca1..0d1bc8107b 100644 --- a/tests/qtest/npcm_gmac-test.c +++ b/tests/qtest/npcm_gmac-test.c @@ -36,7 +36,7 @@ typedef struct TestData { const GMACModule *module; } TestData; =20 -/* Values extracted from hw/arm/npcm8xx.c */ +/* Values extracted from hw/arm/npcm7xx.c */ static const GMACModule gmac_module_list[] =3D { { .irq =3D 14, @@ -46,14 +46,6 @@ static const GMACModule gmac_module_list[] =3D { .irq =3D 15, .base_addr =3D 0xf0804000 }, - { - .irq =3D 16, - .base_addr =3D 0xf0806000 - }, - { - .irq =3D 17, - .base_addr =3D 0xf0808000 - } }; =20 /* Returns the index of the GMAC module. */ @@ -196,7 +188,7 @@ static void test_init(gconstpointer test_data) { const TestData *td =3D test_data; const GMACModule *mod =3D td->module; - QTestState *qts =3D qtest_init("-machine npcm845-evb"); + QTestState *qts =3D qtest_init("-machine npcm750-evb"); =20 #define CHECK_REG32(regno, value) \ do { \ --=20 2.43.0.594.gd9cf4e227d-goog