From nobody Mon Feb 9 11:31:46 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 1515005265652828.4463638864677; Wed, 3 Jan 2018 10:47:45 -0800 (PST) Received: from localhost ([::1]:60861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWo4m-00082N-QK for importer@patchew.org; Wed, 03 Jan 2018 13:47:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnsd-0003XO-Qf for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:35:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnsb-0007d7-Lo for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:35:11 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:33361) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnsb-0007ce-Gu for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:35:09 -0500 Received: by mail-qk0-x241.google.com with SMTP id x7so2661206qkb.0 for ; Wed, 03 Jan 2018 10:35:09 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 185sm992854qkd.1.2018.01.03.10.35.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:35:08 -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=t+8Tv2mN1XIX9gVczoswouj4+tmmL9FSKztaRKY9rno=; b=IgPi3uVDr5mmUXbwVsqinoVZDavezm9hcm7IYUw83T4s81CGfGBLEK3tIithpY5NJN KcSoszuDBY2X3NiLC7PNbAj38kUy8EYYy9wShU9ScQlAjJjmf11JrDbREOYOGPocPfNF MsG95xpemnwjZJurzOvEFwMHUhDNX4AH2NsD9NTHSeCuon5xfwT8hHlhfAQSdP7Iwz5a jyS3bG8eXDTtwGBWSu6JJH8qG6KBo/sr15zussgNGXMlwyDfYl+4bGSSEi42HLavF3/L L7CvihJiqlBr1Yr+ymDXSvB/ocYMp5evOKGVJI4ce3uwXia13k/EewWtxEjnXEInyW4H lWFw== 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=t+8Tv2mN1XIX9gVczoswouj4+tmmL9FSKztaRKY9rno=; b=g7YTQ6FwiEkh0ARs48aDVieiGo+o8xpzuDLn3m8GaK8HTNP4Vzw9YTbydHKZkI8rVT zqHEKmcZ7gUftJ8IQhawB3lSWELXu0lmoOJhirxqvjDVlBX+SN88K9/BB/w2tJAVoWrL Gc3BO+bpMNpuY7J9tsVqJXUlmod9jURtPdParmDWelP/J9sVIsmH/jupB+wUqkYmiWvG I/MckI7g/VJxsgESeixb+4Vg0YWmkUnBqYaB5exgMXf2s4ikQ74g88U0GHLbvJ3bsHZ3 1WuLb7V1A1osRDYkHENuOvhNLwSgZxTmH6wffemgIbL6hL4pCCv1jhEyUUoY2Ha3l4LQ ZruA== X-Gm-Message-State: AKGB3mLubZFl0wNqHFsD+GlsaqlBsIH3/2/Yv/0mxNRf1ZrzO35IPn0a db2usJ2zfx+2/yA0HCTPZhU= X-Google-Smtp-Source: ACJfBou7wkF36qr1X5UQzE2+QQ/UIEr5BronLJhzloW2nJCLTu/kQyLTD+LX7uQ3/sBRijVizKcnjQ== X-Received: by 10.55.91.5 with SMTP id p5mr3041508qkb.293.1515004508954; Wed, 03 Jan 2018 10:35:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Date: Wed, 3 Jan 2018 15:34:08 -0300 Message-Id: <20180103183418.23730-16-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103183418.23730-1-f4bug@amsat.org> References: <20180103183418.23730-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 v4 15/25] 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: 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 As per the Spec v3.00 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/sd/sdhci.h | 2 +- hw/sd/sdhci.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 46e1e42fa1..c2da48c17c 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -65,7 +65,7 @@ typedef struct SDHCIState { /* Buffer Data Port Register - virtual access point to R and W buffers= */ uint32_t prnsts; /* Present State Register */ /* 0x28 */ - 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 58c07bae80..2bd3c5a4b9 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -600,7 +600,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)); @@ -789,7 +789,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); @@ -898,7 +898,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: @@ -1016,7 +1016,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 { @@ -1068,14 +1068,14 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t v= al, 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 || !(s->capareg & (1 << (31 - ((s->pwrcon >> 1) & 0x7))))) { s->pwrcon &=3D ~SDHC_POWER_ON; } - qemu_set_irq(s->access_led, s->hostctl & 1); + qemu_set_irq(s->access_led, s->hostctl1 & 1); break; case SDHC_CLKCON: if (!(mask & 0xFF000000)) { @@ -1285,7 +1285,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