From nobody Tue Feb 10 15:29:24 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 1518188457759942.9773237754135; Fri, 9 Feb 2018 07:00:57 -0800 (PST) Received: from localhost ([::1]:60248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekAAa-0006Sm-QV for importer@patchew.org; Fri, 09 Feb 2018 10:00:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekA5L-0002LK-Qm for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:55:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekA5J-0005bL-KZ for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:55:31 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35285) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ekA5J-0005bF-Eo for qemu-devel@nongnu.org; Fri, 09 Feb 2018 09:55:29 -0500 Received: by mail-qk0-x241.google.com with SMTP id c4so7979267qkm.2 for ; Fri, 09 Feb 2018 06:55:29 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id b29sm747841qkb.28.2018.02.09.06.55.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 06:55:28 -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=XTj7Y84mqjTTRro2jwjDDpltuIiILCbtnYf/b24nk9A=; b=hhDHiP22ED/8DgX3wXU1KQgyhMfraRfmDcyZydSzAe2RmL/w5qtd8RmB5bHTkcmTPR KhurZK8uHL0ZGdkdsNhSfEOUCkAtdVfwl9ma1tHLjiyIjYYo3g2gbfA4xiqsD2MNxbAR E6pouHBXUJjD4Gy6vEcVUhlVkxACtbj/6MYIPPOfaGtpC/6xChaopbS6RO66iMe9amHP Z75KS5LBPaJAIr6bXQ8gHqP82aBUP3IIzRn8YYh/FZPc7UQjoZoDtGFLp5kV+B1gFVMi ARU6gx8Ne+UX6kgej78ImCGWxfcUT/PYj8iKlQwwYI2Q8M8KWmptOP/lEV1GKNznLqxB eZ9w== 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=XTj7Y84mqjTTRro2jwjDDpltuIiILCbtnYf/b24nk9A=; b=EWHCWAGQpLLkFmb8SC2KYiZXIShz7an1/O+u5qSair23DYZRdYvFKZFmMOw2xIHwXu aOoOQsIpuUjZqP0RF/LfQIstIO+eUx3MyuMvhy8vn/FOr7FxmkTGl5L2NHFTDUp2g97b 6RRZ9/j/yJhfdUTqJ90BzJuZyPr6fr0hqcg2ehEyQ5/cgmn1NgceVwFVwK0cvLyTV2y3 rwoxHfC2OCZadONVzh/lKZFLtTiTYQFlJTJ3rgE8IwDgw/3OvvVVpP8ojkyp3PvxWQtg hz/N30e/2Pji9/ucobdltSheUubumr4DQhMuuevmxEGRWeu2azxZXuBvF1vhtGO/3RBc NV0A== X-Gm-Message-State: APf1xPC2Fp2Ixnfi0YOioY6i+SkWJp7ddIwVgOezfvGJYGraLfwkO84b DdB1SigCzeGu+0+HldxNi/E= X-Google-Smtp-Source: AH8x224v8WZLzS/5Bp0A9dlehr/UawY686HVMWxKMzzhnRHir7B6jcZFK0okEZ9Qjuv7OWAvyTIvIw== X-Received: by 10.55.106.193 with SMTP id f184mr4440432qkc.211.1518188128920; Fri, 09 Feb 2018 06:55:28 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini Date: Fri, 9 Feb 2018 11:54:18 -0300 Message-Id: <20180209145430.26007-19-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209145430.26007-1-f4bug@amsat.org> References: <20180209145430.26007-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 v12 18/30] 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" , Peter Maydell , Alistair Francis , =?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 Reviewed-by: Alistair Francis --- include/hw/sd/sdhci.h | 2 +- hw/sd/sdhci.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 2a26b46f05..54594845ce 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -59,7 +59,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 0fa58cea84..f18264688c 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -692,7 +692,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)); @@ -881,7 +881,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); @@ -990,7 +990,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: @@ -1108,7 +1108,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 { @@ -1160,7 +1160,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 || @@ -1381,7 +1381,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), @@ -1599,13 +1599,13 @@ static uint64_t usdhc_read(void *opaque, hwaddr off= set, unsigned size) * manipulation code see comments in a similar part of * usdhc_write() */ - hostctl =3D SDHC_DMA_TYPE(s->hostctl) << (8 - 3); + hostctl =3D SDHC_DMA_TYPE(s->hostctl1) << (8 - 3); =20 - if (s->hostctl & SDHC_CTRL_8BITBUS) { + if (s->hostctl1 & SDHC_CTRL_8BITBUS) { hostctl |=3D ESDHC_CTRL_8BITBUS; } =20 - if (s->hostctl & SDHC_CTRL_4BITBUS) { + if (s->hostctl1 & SDHC_CTRL_4BITBUS) { hostctl |=3D ESDHC_CTRL_4BITBUS; } =20 --=20 2.16.1