From patchwork Wed Feb 7 18:19:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 870580 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GxrwqCR6"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zc8pp6qJ8z9s4q for ; Thu, 8 Feb 2018 05:23:46 +1100 (AEDT) Received: from localhost ([::1]:42155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejUNk-0004fs-VD for incoming@patchwork.ozlabs.org; Wed, 07 Feb 2018 13:23:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejUKI-00029s-Lx for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:20:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejUKC-00051L-Us for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:20:10 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:37156) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ejUKC-00051B-Q7 for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:20:04 -0500 Received: by mail-qk0-x244.google.com with SMTP id c128so2318619qkb.4 for ; Wed, 07 Feb 2018 10:20:04 -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=CJcCd45F8+A4vABbq5ncEfOD1zDCAnlEhafaIXycSmQ=; b=GxrwqCR6eGYS9o8MacfD01Vm6GhVlBEnt5AuVYUnKhH0Gi0VZY3a0Tcfc6CFBbXNHs LDxuQEUDKM6kIwhcERvAmJ6QvvPpxlHzTBhKdP7dSx3Hgx81Y8z5a98zECEYClQJwj1B h+JQFgQhoJx0HipnXLuEHziPl5Zyt5eIi6pSSoZfKAoEVKSp0jFCLAQFx0XKhFfIlV1B 6QhikkP7aMAvOxaztfrwGuBqUSzQLFE/hRgbnufcrdrq6hsmEp/4qXr/PgKbVXvMfe5x 4wdSb8P/KJMrDyyz/UNEuSlw1siY0JqnOnf05NetczkZ+AIXqZNvr1tOEAu/mJsXwYvC 4KCA== 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=CJcCd45F8+A4vABbq5ncEfOD1zDCAnlEhafaIXycSmQ=; b=fWWhRnJTRPYHUTo6qBxVS/nVPd/MZQusJl5jU2iwQikJP5NxBjP7xVinjys4YYPGE0 bpnjZ60KVeiO2aeWoa3Qy/4fW+BtogO8k2pNntZ3/01X4mUiBhlZTEbGNQy9fIVQPU2y nVCirJNiatSY+kDCkXQZFWvtmRUOp1RbaE8CHN+pAT0fZwBdLGkyVD5fWOsYUJU+o2D5 mpoOZv7Z47Hje0r3yzs8TSxrcPMr84msMMFl3JUooV4yvhJeDQJ7TxRPMagsgEmXq5Wa L75tQdn682AFpaYUTALsioX08u5p/3nFVyKjHHSASeT32EvsuWfaeEVPdt/aRNpXaMSZ 7qwg== X-Gm-Message-State: APf1xPCaVrqmHjGElOzrkY1uIc6mvaI7CeI0B1X2mdsve1pcNzVaS/Te iJTM7894CEEZYa+3ADThV+c= X-Google-Smtp-Source: AH8x226t/NoElYsahWVX2zAct+Rpi17tuQxni0Mr+wM3RBo6G+j95v08G1lzfsn2I1ZgT49VfwpXJg== X-Received: by 10.55.74.206 with SMTP id x197mr9864893qka.201.1518027604327; Wed, 07 Feb 2018 10:20:04 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id f7sm1426248qtm.21.2018.02.07.10.20.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2018 10:20:03 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Stefan Hajnoczi , Peter Maydell Date: Wed, 7 Feb 2018 15:19:22 -0300 Message-Id: <20180207181929.8701-10-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180207181929.8701-1-f4bug@amsat.org> References: <20180207181929.8701-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v10 09/16] sdhci: simplify sdhci_get_fifolen() 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" , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- 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 da30b58723..b1bcaa6153 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) {