From nobody Tue Oct 28 12:16:32 2025 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 1514977464131161.4388061934535; Wed, 3 Jan 2018 03:04:24 -0800 (PST) Received: from localhost ([::1]:48637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgqN-0004h9-A4 for importer@patchew.org; Wed, 03 Jan 2018 06:04:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgoS-0003R5-8D for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWgoO-00067v-Sr for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:24 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:39883) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWgoO-00067n-Nv for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:02:20 -0500 Received: by mail-qt0-x242.google.com with SMTP id k19so1632109qtj.6 for ; Wed, 03 Jan 2018 03:02:20 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id r55sm417735qta.57.2018.01.03.03.02.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 03:02:19 -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=3brZcXXtUcQm3OblDnyi3kCHGeIEI035FvpIZcPGm9k=; b=XKEg+CoAnH+Im5X5+7+N0e6+3ywaS2uQDxxTkFd3jxVBOlqccFTKOnPrSsegWJnBJK VsTPWpkPgFbaGcpIiPcyGTlmRvDaIEtSKbtIHKSY8ADeRHbvTCADs08BDbyhEWNdY5dc ZnzsXf9b0ifICpcYiv6eZM59I6iXUaU4XHR5WBTS7HT/pSbg+8IxsmGno7dE6SHTcWIH A/B/lCZKJwzckaiii2ROapEJMXF4auyMbOBDP+ljzyIytHaAdo+z5YqVjli8MokyrKuO v5dORHBlPuzAykApHTQ2kVWxEoibJljQ6pr+DZgYKqMQxvko1Ot9a/js0EBDcWiaz/Gg ldHw== 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=3brZcXXtUcQm3OblDnyi3kCHGeIEI035FvpIZcPGm9k=; b=WcQxsSJ9raamPYUflrwUoI0sSGaFJxRJm0UAH1oHgenEGWS++S0phH5OcHtJrf8xjc Xi+mI9EMonER5wYKbXcD1SBKMKcY27q2FZf4XDzXfeGfuORKgktMAICpGC/SF5i+S0Tr XFs2QI/NIrWHDNkFQ6itJVnp9ezAZy5n1Y1HYAqHLjZtUf4BOORu8VVUGo1QBZON2A7Y okZMNt/QfTlrqCNosuUXEMGqM3bEnTwFaFHc+r/nC0BYWzXODQKT2HKhNVwxWggd7My7 kPz/mjJD3aKh1OMPe9XBengO7jcjrYhJnmfL/O8WOJpMb69a9Ika8mwYQO9E5F30bsEi aXdQ== X-Gm-Message-State: AKGB3mI1mTXiifD1KJCmE+Vi/edwxSx5rRmrdIrOicJlqvA3IIGh9Txc ZC6CuAfV6jpYvibFC3f1imE= X-Google-Smtp-Source: ACJfBoteUzmyHrQrGBmUBQnK1ytRezV4PV988wRg+wYuZp5IljO1qpItLiH39x8NBflWQNZ2RmQ8Qg== X-Received: by 10.200.47.169 with SMTP id l38mr1177023qta.183.1514977340150; Wed, 03 Jan 2018 03:02:20 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 08:01:25 -0300 Message-Id: <20180103110126.29209-17-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103110126.29209-1-f4bug@amsat.org> References: <20180103110126.29209-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 v4 16/17] 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: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?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 25a3ee5ef6..97129e178e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1118,12 +1118,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