From nobody Tue Feb 10 10:20:22 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1575377007; cv=none; d=zohomail.com; s=zohoarc; b=nsebi9LWi4809iEUekP8Ptv/UZzWudmk8dO3MYay0FCqzvaIOher+zHwe3dKnP5bbvxUNVytJU3r4GnG82Sb9HNcJAMk+wo/88PuPSX0Cp/s2ac9gqRkDsDN6BBUzaGxUi1bDV2ufwN2bAMvB+m0Psunc4eSpnzNhxKkcth0Ryo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575377007; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HNx5awebTenw3cog8mBdUqGHqH9AuegEds8jI01zaEQ=; b=PcDtLdsrEIllfxrHAFzdZarwTMjniEfi0AQLGvwN4XKPyK3KOVbFHAOAUkc76bSjtlOfhe75D2DY3gHRRV+ZiOzyktaPgO6YJJbkSl8sINaroiP881RWphd8UmPbbLCQOO2ANBt6TASqhnskQZryRv0Dqiaup7jYgYgfX13B0nI= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575377007110449.9705946599505; Tue, 3 Dec 2019 04:43:27 -0800 (PST) Received: from localhost ([::1]:52790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ic7WX-0007oA-SQ for importer@patchew.org; Tue, 03 Dec 2019 07:43:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48911) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ic7JV-00084R-Ak for qemu-devel@nongnu.org; Tue, 03 Dec 2019 07:29:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ic7JN-0003j8-MJ for qemu-devel@nongnu.org; Tue, 03 Dec 2019 07:29:53 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:40894 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ic7JG-0003Q7-F6; Tue, 03 Dec 2019 07:29:44 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 631662E73581EE20096E; Tue, 3 Dec 2019 20:29:31 +0800 (CST) Received: from HGHY4Z004218071.china.huawei.com (10.133.224.57) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.439.0; Tue, 3 Dec 2019 20:29:23 +0800 From: Xiang Zheng To: , , Subject: [PATCH 2/5] tests: fw_cfg: Support read/write of fw_cfg registers on aarch64 Date: Tue, 3 Dec 2019 20:27:50 +0800 Message-ID: <20191203122753.19792-3-zhengxiang9@huawei.com> X-Mailer: git-send-email 2.15.1.windows.2 In-Reply-To: <20191203122753.19792-1-zhengxiang9@huawei.com> References: <20191203122753.19792-1-zhengxiang9@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.224.57] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.35 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lersek@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, kraxel@redhat.com, wanghaibin.wang@huawei.com, pbonzini@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refer to the fw_cfg registers locations of x86 and arm in docs/specs/fw_cfg.txt, the test codes need to differ on the addresses for read/write. Besides, fix the endian problems in mm_fw_cfg_select(). Signed-off-by: Xiang Zheng --- tests/libqos/fw_cfg.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/libqos/fw_cfg.c b/tests/libqos/fw_cfg.c index 1f46258f96..c1518c5e81 100644 --- a/tests/libqos/fw_cfg.c +++ b/tests/libqos/fw_cfg.c @@ -57,7 +57,14 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) =20 static void mm_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key) { - qtest_writew(fw_cfg->qts, fw_cfg->base, key); + const char *arch =3D qtest_get_arch(); + uint64_t offset =3D 0; + + if (!strcmp(arch, "aarch64")) { + offset =3D 8; + } + + qtest_writew(fw_cfg->qts, fw_cfg->base + offset, cpu_to_be16(key)); } =20 /* @@ -108,9 +115,15 @@ static void mm_fw_cfg_read(QFWCFG *fw_cfg, void *data,= size_t len) { uint8_t *ptr =3D data; int i; + uint64_t offset =3D 2; + const char *arch =3D qtest_get_arch(); + + if (!strcmp(arch, "aarch64")) { + offset =3D 0; + } =20 for (i =3D 0; i < len; i++) { - ptr[i] =3D qtest_readb(fw_cfg->qts, fw_cfg->base + 2); + ptr[i] =3D qtest_readb(fw_cfg->qts, fw_cfg->base + offset); } } =20 --=20 2.19.1