From nobody Mon Feb 9 18:18:55 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 1516308205719887.685064989105; Thu, 18 Jan 2018 12:43:25 -0800 (PST) Received: from localhost ([::1]:53804 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecH1r-0001Zc-ON for importer@patchew.org; Thu, 18 Jan 2018 15:43:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecGzt-0000O7-Ft for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecGzs-0007RP-Be for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:17 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:41763) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ecGzs-0007RD-7a for qemu-devel@nongnu.org; Thu, 18 Jan 2018 15:41:16 -0500 Received: by mail-qt0-x244.google.com with SMTP id i1so16769430qtj.8 for ; Thu, 18 Jan 2018 12:41:16 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 24sm5484621qkv.64.2018.01.18.12.41.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 12:41:15 -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=wxVbnZCfxKYhpJYr5Znp8CfS6nQEKo7LDY4/PhY7mtg=; b=nwOixcBwq5svDDAZmqrKjWzu5KAb1BOtnAvaQKM4hcd67ZTJ1izmBLh2uSl4Oxrtkg ZX3qamuXObqkg94/UFNh5gbxjlfvMvWwjKcpCrbKbCl+dSM0CMFLOeZZ/dWRmE6WKw1V ATCJcIXzZ2KYO8QlBxYdHOnt+KZCDsiUJ75M8sNh4qTZhIU+GN48oXj1qnp1nFD2lDSD Tb32wNKymOSM79uTwsRnNahHgFdpIC9AyyeZSUF7hRprHIBW40TRaUyB6FewxsgXHQia 1sJsR7NObNyNsVi8GoNTkbEyQHb8ZrjskfOZ9rmx25J+Xno6wkgS4vumjVDHbrst5mM4 wMAw== 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=wxVbnZCfxKYhpJYr5Znp8CfS6nQEKo7LDY4/PhY7mtg=; b=Fn1EJ7p8JlGgAN3NhqbAIoBVEymCLSF7C0wF0FMSEMzYA+AoAv2OzEtERpFGFZrY66 wvE10CDD9mrvcw6lKXxR6rmZvTToR9PWGsC8iKDnVy8NYAW4xlCTxbQqG0Swn7CKTFTj GU1cFj2Nuxat+/Llkf031yRLRmsvdNiEMMEwncWuyr7mU9xykG7KFH8aq4A9eimGzA1/ 55Gny1voyWl/htdoRa4B7e/J6mgotxr4hi0nZH1HGyKGP3DJFpSx7L7RqNa2Ke8vzG0i XrbK7kCdesz4MdTQBu6r3PnircSzd7XaFfM1qgClKpUFWCBvlBEvLLrIIXJwjy5FBOSC iGiw== X-Gm-Message-State: AKwxytfnKI6nyPdc5iyObyv1/hQrePYTVDEsOrlznj8rZ9Gh7qtvP57Z 4LIClTHji/gvhQmpDqWUUO8= X-Google-Smtp-Source: ACJfBosGZxslsMcUqwzpv3KaRmIew1aNGxMgfoxxJOmMAGwR5wTSFE/bHqujDatvO9Zz/EEwoLCgcw== X-Received: by 10.200.54.138 with SMTP id a10mr4648831qtc.123.1516308075717; Thu, 18 Jan 2018 12:41:15 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 18 Jan 2018 17:40:46 -0300 Message-Id: <20180118204058.5768-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180118204058.5768-1-f4bug@amsat.org> References: <20180118204058.5768-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::244 Subject: [Qemu-devel] [PATCH v7 02/14] sdhci: rename the hostctl1 register 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" , Prasad J Pandit , Peter Crosthwaite , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Sai Pavan Boddu 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 As per the Spec v3.00 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- include/hw/sd/sdhci.h | 2 +- hw/sd/sdhci.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index bf3bf243d7..98edcc1048 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -57,7 +57,7 @@ typedef struct SDHCIState { uint16_t cmdreg; /* Command Register */ uint32_t rspreg[4]; /* Response Registers 0-3 */ uint32_t prnsts; /* Present State Register */ - uint8_t hostctl; /* Host Control Register */ + uint8_t hostctl1; /* Host Control Register */ uint8_t pwrcon; /* Power control Register */ uint8_t blkgap; /* Block Gap Control Register */ uint8_t wakcon; /* WakeUp Control Register */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 946dff0fac..ec7430c83c 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -598,7 +598,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) uint32_t adma1 =3D 0; uint64_t adma2 =3D 0; hwaddr entry_addr =3D (hwaddr)s->admasysaddr; - switch (SDHC_DMA_TYPE(s->hostctl)) { + switch (SDHC_DMA_TYPE(s->hostctl1)) { case SDHC_CTRL_ADMA2_32: dma_memory_read(s->dma_as, entry_addr, (uint8_t *)&adma2, sizeof(adma2)); @@ -787,7 +787,7 @@ static void sdhci_data_transfer(void *opaque) SDHCIState *s =3D (SDHCIState *)opaque; =20 if (s->trnmod & SDHC_TRNS_DMA) { - switch (SDHC_DMA_TYPE(s->hostctl)) { + switch (SDHC_DMA_TYPE(s->hostctl1)) { case SDHC_CTRL_SDMA: if ((s->blkcnt =3D=3D 1) || !(s->trnmod & SDHC_TRNS_MULTI)) { sdhci_sdma_transfer_single_block(s); @@ -896,7 +896,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset,= unsigned size) ret =3D s->prnsts; break; case SDHC_HOSTCTL: - ret =3D s->hostctl | (s->pwrcon << 8) | (s->blkgap << 16) | + ret =3D s->hostctl1 | (s->pwrcon << 8) | (s->blkgap << 16) | (s->wakcon << 24); break; case SDHC_CLKCON: @@ -1014,7 +1014,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) MASKED_WRITE(s->sdmasysad, mask, value); /* Writing to last byte of sdmasysad might trigger transfer */ if (!(mask & 0xFF000000) && TRANSFERRING_DATA(s->prnsts) && s->blk= cnt && - s->blksize && SDHC_DMA_TYPE(s->hostctl) =3D=3D SDHC_CTRL_S= DMA) { + s->blksize && SDHC_DMA_TYPE(s->hostctl1) =3D=3D SDHC_CTRL_= SDMA) { if (s->trnmod & SDHC_TRNS_MULTI) { sdhci_sdma_transfer_multi_blocks(s); } else { @@ -1066,7 +1066,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) if (!(mask & 0xFF0000)) { sdhci_blkgap_write(s, value >> 16); } - MASKED_WRITE(s->hostctl, mask, value); + MASKED_WRITE(s->hostctl1, mask, value); MASKED_WRITE(s->pwrcon, mask >> 8, value >> 8); MASKED_WRITE(s->wakcon, mask >> 24, value >> 24); if (!(s->prnsts & SDHC_CARD_PRESENT) || ((s->pwrcon >> 1) & 0x7) <= 5 || @@ -1322,7 +1322,7 @@ const VMStateDescription sdhci_vmstate =3D { VMSTATE_UINT16(cmdreg, SDHCIState), VMSTATE_UINT32_ARRAY(rspreg, SDHCIState, 4), VMSTATE_UINT32(prnsts, SDHCIState), - VMSTATE_UINT8(hostctl, SDHCIState), + VMSTATE_UINT8(hostctl1, SDHCIState), VMSTATE_UINT8(pwrcon, SDHCIState), VMSTATE_UINT8(blkgap, SDHCIState), VMSTATE_UINT8(wakcon, SDHCIState), --=20 2.15.1