[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 09/16] sdhci: simplify sdhci_get_fifolen()
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v9 09/16] sdhci: simplify sdhci_get_fifolen() |
Date: |
Mon, 22 Jan 2018 23:08:13 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/sd/sdhci-internal.h | 4 +++-
hw/sd/sdhci.c | 20 +++++---------------
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h
index b7751c815f..577ca9da54 100644
--- a/hw/sd/sdhci-internal.h
+++ b/hw/sd/sdhci-internal.h
@@ -24,6 +24,8 @@
#ifndef SDHCI_INTERNAL_H
#define SDHCI_INTERNAL_H
+#include "hw/registerfields.h"
+
/* R/W SDMA System Address register 0x0 */
#define SDHC_SYSAD 0x00
@@ -179,7 +181,7 @@
#define SDHC_CAN_DO_ADMA2 0x00080000
#define SDHC_CAN_DO_ADMA1 0x00100000
#define SDHC_64_BIT_BUS_SUPPORT (1 << 28)
-#define SDHC_CAPAB_BLOCKSIZE(x) (((x) >> 16) & 0x3)
+FIELD(SDHC_CAPAB, MAXBLOCKLENGTH, 16, 2);
/* HWInit Maximum Current Capabilities Register 0x0 */
#define SDHC_MAXCURR 0x48
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 1c781c4ba5..dce1a49af1 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -59,6 +59,11 @@
*/
#define SDHC_CAPAB_REG_DEFAULT 0x057834b4
+static inline unsigned int sdhci_get_fifolen(SDHCIState *s)
+{
+ return 1 << (9 + FIELD_EX32(s->capareg, SDHC_CAPAB, MAXBLOCKLENGTH));
+}
+
static uint8_t sdhci_slotint(SDHCIState *s)
{
return (s->norintsts & s->norintsigen) || (s->errintsts & s->errintsigen)
||
@@ -1118,21 +1123,6 @@ static const MemoryRegionOps sdhci_mmio_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
-static inline unsigned int sdhci_get_fifolen(SDHCIState *s)
-{
- switch (SDHC_CAPAB_BLOCKSIZE(s->capareg)) {
- case 0:
- return 512;
- case 1:
- return 1024;
- case 2:
- return 2048;
- default:
- hw_error("SDHC: unsupported value for maximum block size\n");
- return 0;
- }
-}
-
static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp)
{
if (s->sd_spec_version != 2) {
--
2.15.1
- [Qemu-devel] [PATCH v9 00/16] SDHCI: clean v1/v2 Specs (part 2), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 01/16] sdhci: use error_propagate(local_err) in realize(), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 02/16] sdhci: add qtest to check the SD capabilities register, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 03/16] sdhci: add check_capab_readonly() qtest, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 04/16] sdhci: add a check_capab_baseclock() qtest, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 05/16] sdhci: add a check_capab_sdma() qtest, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 06/16] sdhci: add qtest to check the SD Spec version, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 07/16] sdhci: add a 'spec_version property' (default to v2), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 08/16] sdhci: use a numeric value for the default CAPAB register, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 09/16] sdhci: simplify sdhci_get_fifolen(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v9 10/16] sdhci: check the Spec v1 capabilities correctness, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 12/16] sdhci: Fix 64-bit ADMA2, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 13/16] sdhci: check Spec v2 capabilities (DMA and 64-bit bus), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 14/16] hw/arm/exynos4210: access the 64-bit capareg with qdev_prop_set_uint64(), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 15/16] hw/arm/exynos4210: add a comment about a very similar SDHCI (Spec. v2), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v9 16/16] hw/arm/xilinx_zynq: fix the capabilities register to match the datasheet, Philippe Mathieu-Daudé, 2018/01/22