From nobody Thu May 2 23:27:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486424512010526.7180304876811; Mon, 6 Feb 2017 15:41:52 -0800 (PST) Received: from localhost ([::1]:51168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1casus-00026S-Gz for importer@patchew.org; Mon, 06 Feb 2017 18:41:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1castC-0001CP-Mq for qemu-devel@nongnu.org; Mon, 06 Feb 2017 18:40:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1castB-0001Sj-Sp for qemu-devel@nongnu.org; Mon, 06 Feb 2017 18:40:06 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:33502) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1castB-0001SV-Ph; Mon, 06 Feb 2017 18:40:05 -0500 Received: by mail-qk0-x243.google.com with SMTP id 11so10898201qkl.0; Mon, 06 Feb 2017 15:40:05 -0800 (PST) Received: from yoga.lan ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id 37sm1817879qto.43.2017.02.06.15.40.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2017 15:40:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oNwpzTmz9xj76Q9WhHHRpyOBSf0BPOFlIQQ+bgOmWt8=; b=Jiy7K1qD5rLu5XinmDQVgzT4KU+RzVeiyV7ef/c/jhV7V3KGO8eIXuOyKhiORyQz+Q 68S/D7njDI2zbg4DoTZnvfVwMUATcw6aOdMQGx5Wr8/mxCygmLBKwciBAm/Yx9+jLbdq GAfuY+JIfv02+YIlBm52adcQlKGVyab5DDSLRyYh0kxred/ILuZrCzLN/1xle4DVi25O jYDz0pyZUrVzkitns8Es5VuXByKBgjNGgxIRGPOdmaECclSo/C+rzMU7/70ULnIduQbt 6vpcfrFZ/qjz94S1TtwXYWhCP8x9WebJ1uL2OIlkj4zOEGtkQ8E81l23RYAeuerxEJ0f fVUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oNwpzTmz9xj76Q9WhHHRpyOBSf0BPOFlIQQ+bgOmWt8=; b=SKdBlewSx49pIuWyfdwdkEjElox5e/Dwddg3qHCuteGfyRN7KIsXQKf2/xlOaIn2Th VT/zuhSOo78Wt6Kn0UPbm7RcCZASVeY0L58x0MwXh7r4qYC60/MvkVHvehYDRxqho35E QAZt2Qq8VYotq92WpnUSjG89uLcdy4NYcBuD3rJhqHx8UQhP5u6RnM/bmB71GEG5A3vu kxZzM8tGhWXPk8CVDNhWQwiPdu4ijE5YmfIBCkpeQVGW/9crBvHbJYJ8hoDu/yU9u5Kt bJ4ptCpmh/5XkaCCBJ+l+MThF6NHrcBB1Ak6nvuXDcQLsW6Zf4d+PtdF8T6NhEiy8sXc D1Tg== X-Gm-Message-State: AMke39mfQwYUDyB3euPJ/WBjq8y12O7HjaxZpSF6XzN8QpJpJWJwYjXW/g5s2VZHntmFOQ== X-Received: by 10.55.114.132 with SMTP id n126mr11702139qkc.112.1486424405171; Mon, 06 Feb 2017 15:40:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Crosthwaite , Alistair Francis Date: Mon, 6 Feb 2017 20:39:30 -0300 Message-Id: <20170206233931.14921-2-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170206233931.14921-1-f4bug@amsat.org> References: <20170206233931.14921-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH 1/2] register: inline register_enabled_mask X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 This patch prepares for the fix of register_read() incorrect mask. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/register.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/core/register.c b/hw/core/register.c index 4bfbc508de..12f4c1e62d 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -59,6 +59,15 @@ static inline uint64_t register_read_val(RegisterInfo *r= eg) return 0; /* unreachable */ } =20 +static inline uint64_t register_enabled_mask(int data_size, unsigned size) +{ + if (data_size < size) { + size =3D data_size; + } + + return MAKE_64BIT_MASK(0, size * 8); +} + void register_write(RegisterInfo *reg, uint64_t val, uint64_t we, const char *prefix, bool debug) { @@ -192,11 +201,7 @@ void register_write_memory(void *opaque, hwaddr addr, } =20 /* Generate appropriate write enable mask */ - if (reg->data_size < size) { - we =3D MAKE_64BIT_MASK(0, reg->data_size * 8); - } else { - we =3D MAKE_64BIT_MASK(0, size * 8); - } + we =3D register_enabled_mask(reg->data_size, size); =20 register_write(reg, value, we, reg_array->prefix, reg_array->debug); --=20 2.11.0 From nobody Thu May 2 23:27:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1486424514213921.7343064977786; Mon, 6 Feb 2017 15:41:54 -0800 (PST) Received: from localhost ([::1]:51169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1casuu-000292-UN for importer@patchew.org; Mon, 06 Feb 2017 18:41:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1castF-0001F7-Cy for qemu-devel@nongnu.org; Mon, 06 Feb 2017 18:40:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1castE-0001X2-Oi for qemu-devel@nongnu.org; Mon, 06 Feb 2017 18:40:09 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:36342) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1castE-0001We-Kz; Mon, 06 Feb 2017 18:40:08 -0500 Received: by mail-qk0-x241.google.com with SMTP id i34so10857703qkh.3; Mon, 06 Feb 2017 15:40:08 -0800 (PST) Received: from yoga.lan ([138.117.48.226]) by smtp.gmail.com with ESMTPSA id 37sm1817879qto.43.2017.02.06.15.40.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Feb 2017 15:40:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xf3c4J5d297luFoiOvz6DsQ481WXZgZNbb6h2ruzv3s=; b=LoNU5ksfADYV0XYmVZn+Fm+NvADvBJ/mpe2puZrHYsDlDO/OolKRwzmOEiFOD5MDA0 q/BaO9VOgL1HxKV7e7pOj8qx5qXVW9GQToUiVIHUN0IF88O5S9gXOVKPzahgJX8mVpXU 1q2FjziAC+jEc4xPhIUI1IfYPH6SUMvbnU1e7lRCKKktekRH68/jB11/ImeDJjRgt3Qj +LcK8LDF51YYKLhqX7jR3Y01GMrdJXni8/qUsTl/qaWH8Q3VZ3ZJmGryGkKIkYIxwadS LDu6SApVu08zto3KBtGfIyu6O2TNZ/4TNilyTMvO3XNZwEWs4HkEPX+FmoV7WQHw05jx yG4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xf3c4J5d297luFoiOvz6DsQ481WXZgZNbb6h2ruzv3s=; b=cgiLgsR1i6PiT/cPviT8zDavIf634tg+3CGyPNU7kck9MjUJuNdmfunXGobzAvoZ/j SHyDfmUkk2vxByXOYB5WdyAvIURg2sNTBd0XPVhPj1HqjIg0LWhN9rx22pfLNASluSMp dopeDXqFdtPP+9pcxTBNDShAGHWaWbqS9AEgC/0djSkulo+/1UySTjXrRmOveoL0AchB nvx5wQYUEjXdl+MIvEvAt+q8EhYTmKoeBcsCfLsRiOVvAnqgM5q6D6I0MmqcrvjeiWlo CkpquEQLjazrq0cnrXUPTLFCtggSO4pBCnkaoHnLyzIDRQHh+z/oPcjbXu5V1a0NjqCE a0LA== X-Gm-Message-State: AMke39k6rB96nrVldCDo0YM5ruec30E2VKc9YYn+5N3YHadCBEb0qaEDHn+v5Hxni4cXAg== X-Received: by 10.55.170.17 with SMTP id t17mr11380888qke.15.1486424408132; Mon, 06 Feb 2017 15:40:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Crosthwaite , Alistair Francis Date: Mon, 6 Feb 2017 20:39:31 -0300 Message-Id: <20170206233931.14921-3-f4bug@amsat.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170206233931.14921-1-f4bug@amsat.org> References: <20170206233931.14921-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 2/2] register: fix incorrect read mask X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 The register_read() function expects a bitmask argument. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/register.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/core/register.c b/hw/core/register.c index 12f4c1e62d..482e3f827a 100644 --- a/hw/core/register.c +++ b/hw/core/register.c @@ -213,6 +213,7 @@ uint64_t register_read_memory(void *opaque, hwaddr addr, RegisterInfoArray *reg_array =3D opaque; RegisterInfo *reg =3D NULL; uint64_t read_val; + uint64_t re; int i; =20 for (i =3D 0; i < reg_array->num_elements; i++) { @@ -228,7 +229,10 @@ uint64_t register_read_memory(void *opaque, hwaddr add= r, return 0; } =20 - read_val =3D register_read(reg, size * 8, reg_array->prefix, + /* Generate appropriate read enable mask */ + re =3D register_enabled_mask(reg->data_size, size); + + read_val =3D register_read(reg, re, reg_array->prefix, reg_array->debug); =20 return extract64(read_val, 0, size * 8); --=20 2.11.0