From nobody Tue Oct 28 04:13:16 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 1515003635701847.7595298008408; Wed, 3 Jan 2018 10:20:35 -0800 (PST) Received: from localhost ([::1]:60149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWneU-0001yL-SR for importer@patchew.org; Wed, 03 Jan 2018 13:20:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTI-0000ml-Eb for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:09:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnTH-00079C-Jj for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:09:00 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:34600) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnTH-000791-FV for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:59 -0500 Received: by mail-qk0-x242.google.com with SMTP id g81so2561847qke.1 for ; Wed, 03 Jan 2018 10:08:59 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:58 -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=wcTPlANRt+KvCoyFoPcTIIvBZG2ePSc/goRHCNMXxYk=; b=b0cgmIuxZZ7Wi0Fh+P8zbMsfmh9SQf7FRW5C8jiYNR5ZqCi/XHYZsFUKnJxOBuL6hb nJANaK/e/XPeCvyfxjPMY30sbA9a/vi37Df/8rrqcmXbVhlBxmbUAb6GaEyMzlwJa6Le kwILuSxUBDKNlf//vRMgl/uPn+/GfygD7RWJlt+K47sx4oEPgJrRNqSl2BF90ucrE8tK OtU6ab4cSa6B/ewd8LCaRHYOyECPej3AUryq6QjkTVjm7v1AQW45oxc3Qu7RcN7xLtLx ZH++qTEAf4C6kLKOsWq1eGad1Bcq8L0axRfEXQlbgFSyj/Bfc0ewkLaZpMmcew00dbSu +i7Q== 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=wcTPlANRt+KvCoyFoPcTIIvBZG2ePSc/goRHCNMXxYk=; b=DHrwry32HEzOM51Vd/xWA12aYoY0kupOysXBGePj3bIN7E62oiSypWoFsqwaf3HBGS IUh24wMh+aZf4CSoLCYdb6eNP5L6idMKt6ZfvJU0HLtBqTvQC4U2gyG8Q7IGMKGqyjuE pBzxho3jNa0YhSBEVQFOCVSSC4kn+kHWPT3QjHa+gsMy7fnAvjQVnfZ7uV7369pgHUdf 4WJ+tdicnrrOesNm27+HCvO6YNZD8OuAr2mukVKCAMyjEZ2gDR5XnaoVKG87oDk1pDBV BqKrXvzxDIOg4V6dLSohpEP0b6hVuNfJKfRn5NMfZmJ80fv3wUAUv3f5dY1hXEzcgDu6 CKLQ== X-Gm-Message-State: AKGB3mIzvQHgsOzextLfT9LBI2cVkfW3Mc8TbDEgbcV1z1bFc2PUJYIe j8U9pnYPB4lNNXWbUdgNCzg= X-Google-Smtp-Source: ACJfBotJGu+Ak/z1uQlEmC/ZJklV1MSfmJD8ftUwXbwipVhTvN+duC+XdaMioQTfwyqZrEDsbMKm2w== X-Received: by 10.55.27.84 with SMTP id b81mr2832879qkb.26.1515002939127; Wed, 03 Jan 2018 10:08:59 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:08:04 -0300 Message-Id: <20180103180805.18140-17-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-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::242 Subject: [Qemu-devel] [PATCH v5 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 a688c6db46..5ed4b472c6 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