From nobody Mon Feb 9 20:34:18 2026 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.zohomail.com; dkim=fail; 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 1513308071697611.7317182658135; Thu, 14 Dec 2017 19:21:11 -0800 (PST) Received: from localhost ([::1]:43974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgYd-0000vc-QD for importer@patchew.org; Thu, 14 Dec 2017 22:21:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgTu-0005ZR-Qv for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:16:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePgTr-0000k5-M4 for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:16:14 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:45811) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePgTr-0000jh-HY; Thu, 14 Dec 2017 22:16:11 -0500 Received: by mail-qt0-x242.google.com with SMTP id g10so10522005qtj.12; Thu, 14 Dec 2017 19:16:11 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l125sm3484740qkc.3.2017.12.14.19.16.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 19:16:10 -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=rnBBtaCu7CpYvlb66OM09K3kE8oHqz9H4CESxgFEEA8=; b=vSrKPVE0uHR8CnTxJu9Flvx5t3Di+Pd1zQ2iYsBGUNzwsUHkmFVWAYppRfcS7oRw6X /kVfFODqT3r//3xjkjXdFHvjJ2VTJ43NyT0MGJu3QhqIgHIIw/5kIJEvYdftyRM7zJRI iZDYJLoW3Ax2RzRdaBBx7UBWdNKeGgGG1l2NpORGaugZrDEM0Rr6SrovSkkNiZd0nun9 Q1bCTBRqYTQheTHc+mRtwQ5XNun2Ea0GIZB6hYriWytOSfaXlDvG98NwHv1FvCE4El/O q/41whWwg+kvH9iQLFAi0h171vTorOWaw5si5dvFdXBlzLIro0TekaO0VGujaEJfjyZM U0Ig== 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=rnBBtaCu7CpYvlb66OM09K3kE8oHqz9H4CESxgFEEA8=; b=Fqxsq51W6GqcbnVh5o92B0v6FNWdUFBnwXF3FEZk73pVipWQrpy9HTZxt0e1lku2/N 1xNWZhEmuB3rQyVV8XnBBKiagjZhbq7qYtYlkAdlz3yofcWxy29MFKV+9Zlujg3vMUTz siaLuYLiE5yMRPpJb5NGWOAbao05NBDH86BImwJERnxu259sxyoUJQov463tOzZB20p4 lPFfb5YmAmXV0FQAVbCqnWpvnxgVr9oqFMUBekW79ldgJ+u7vk5PJ2FZ3HWaKrZCUFpO 2Yv8njKwLi4Hs3YmanVWKuIfRWVkUhIqaPYbhvj3eNrro71cxlL9KKS1GJzbAyLOjeQ7 Hqug== X-Gm-Message-State: AKGB3mJvOMVFC1L+WzD8jnTuic12HaSl9/XE8z0pL+olK9tCoSPsuILz k9rRdNaPi0UK/Pi6dHLOHtA= X-Google-Smtp-Source: ACJfBoslw1rSDffoz1ytStaFLKBA9Mul5hKKtRvpU1rzXTUlNCEV4pbA9/LRt9kiobrY3iy2mnpklg== X-Received: by 10.200.56.72 with SMTP id r8mr20784032qtb.203.1513307771064; Thu, 14 Dec 2017 19:16:11 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Michael Walle , Andrzej Zaborowski , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky Date: Fri, 15 Dec 2017 00:15:29 -0300 Message-Id: <20171215031547.31006-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171215031547.31006-1-f4bug@amsat.org> References: <20171215031547.31006-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: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v2 02/20] sdhci: use deposit64() 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: Prasad J Pandit , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Sai Pavan Boddu , qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This makes the code slightly safer, also easier to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b7d2a20985..3c78033d49 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1132,12 +1132,10 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, unsigned size) MASKED_WRITE(s->admaerr, mask, value); break; case SDHC_ADMASYSADDR: - s->admasysaddr =3D (s->admasysaddr & (0xFFFFFFFF00000000ULL | - (uint64_t)mask)) | (uint64_t)value; + s->admasysaddr =3D deposit64(s->admasysaddr, 0, 32, value); break; case SDHC_ADMASYSADDR + 4: - s->admasysaddr =3D (s->admasysaddr & (0x00000000FFFFFFFFULL | - ((uint64_t)mask << 32))) | ((uint64_t)value << 32); + s->admasysaddr =3D deposit64(s->admasysaddr, 32, 32, value); break; case SDHC_FEAER: s->acmd12errsts |=3D value; --=20 2.15.1