From nobody Mon Feb 9 18:45:53 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514570476569614.4876133019638; Fri, 29 Dec 2017 10:01:16 -0800 (PST) Received: from localhost ([::1]:48893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUyxy-0003F2-Cv for importer@patchew.org; Fri, 29 Dec 2017 13:01:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUynl-0003LV-5d for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUynk-0006aD-9x for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:37 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:41616) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUynk-0006ZV-4p for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:36 -0500 Received: by mail-qk0-x241.google.com with SMTP id a8so16160233qkb.8 for ; Fri, 29 Dec 2017 09:50:35 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t41sm24223893qtt.84.2017.12.29.09.50.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Dec 2017 09:50:35 -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=LZOG2qYnUu5n7o5QOclXIvKEPZo7oMv4I5HwTohMz7k=; b=A5NsHIN9xd/xinzJaGqhlHW7an9u4aMVaw86SJn4QLnECjewmSTl1/OvaHBvIAl8cR nviCfOufpu01UXnqAiDBfiotvwtH8EmXuLDr4Ye9nv61Aq3Um055rnl6qKWFfgl1AJi5 CQsKbx4eJ1Og/Gep1Ol+hYe1KFwf3iM2+EAVxsILt4O2DoPhIGuM4XntVF6jgoB7fTJ8 ZJPrFyHNzadb1dW+DjYQxGp6OGF9N6AHUoveEVi3VepVmgGvIu4DUZHGIADTn+oOfHSP pzjD6prrsVYvzv0BqtPbJubpLmOmBlKzRSVqm/KZSdHQZXW2im+oqaS8IY/IyLujBC70 UBeg== 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=LZOG2qYnUu5n7o5QOclXIvKEPZo7oMv4I5HwTohMz7k=; b=O4s7Z9JBO11MpH9cW4Imm9MTNPvWzM68yV1Mrlhfj8koSDN+sEIuIxiT31irae4PIx VaQ4Fa4ZbCWKKPDVFGGGrr4ywXww0JYiwu1IiGzLX50v/XCx080JVlyms+La7CUTyA0U odHyIyXIbTjaBSosXqwg7XXrd+zMzpaXVlENi+hklO0q7dQDNNIgUIuLCu63pwG8d53e Q6j7AKVsvbmSjExvkjsZ1YwQHNkLhWabuin9dP01o1rq9iOO321P9HJD7op1aoHL7vld ATBw7C/Tg4uoC/r9G2DI3+1dkxKMMWPXONMf9gN9zialCXlV40SaWLBshTKWxSWtSjqU 4jLw== X-Gm-Message-State: AKGB3mK+f/C98pM+b693lAM7JP+xnyR7Q0TssCTqd7u1qh0GB19fLYJc WTr7uNKBFQGSNxGuY2ml/yBqmR4n X-Google-Smtp-Source: ACJfBovBXggOhJoHtrNnSwMyd2AxE/GQ1HuEfwW9PqnSFkfAJuWHNzEjl3NORsTpHPbDouVOfCcZKQ== X-Received: by 10.55.20.198 with SMTP id 67mr2966316qku.55.1514569835641; Fri, 29 Dec 2017 09:50:35 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Date: Fri, 29 Dec 2017 14:49:07 -0300 Message-Id: <20171229174933.1781-17-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171229174933.1781-1-f4bug@amsat.org> References: <20171229174933.1781-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:c09::241 Subject: [Qemu-devel] [PATCH v3 16/42] sdhci: use deposit64() on admasysaddr 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: Peter Crosthwaite , =?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-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 This makes the code slightly safer, and 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 a47ed61248..7f2c3dc9d5 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1117,12 +1117,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