From patchwork Tue Feb 13 04:07:48 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: 872569 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="c7B4YXHo"; 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 3zgTf52QzLz9s7v for ; Tue, 13 Feb 2018 15:12:45 +1100 (AEDT) Received: from localhost ([::1]:37376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elRxT-0003e6-Co for incoming@patchwork.ozlabs.org; Mon, 12 Feb 2018 23:12:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elRtg-0000qR-LO for qemu-devel@nongnu.org; Mon, 12 Feb 2018 23:08:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elRtf-0007dT-O2 for qemu-devel@nongnu.org; Mon, 12 Feb 2018 23:08:48 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:46157) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1elRtf-0007cb-Jk for qemu-devel@nongnu.org; Mon, 12 Feb 2018 23:08:47 -0500 Received: by mail-qk0-x243.google.com with SMTP id g129so6524368qkb.13 for ; Mon, 12 Feb 2018 20:08:47 -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=bQS09yqaJLhruC8O55IZOMAVRrnrL4iBqnUYFHJyNDo=; b=c7B4YXHoS0puIGLHEUEEDdF5bX/RT7Z+V7DLALMhNBbWcWwK9pYPpe5b/PE8EryY76 GPP68mm7AIuKg2gr4zskqag5fO6Dv9jHVLsCYLT/QLlMcZgEswjwOZI9ASoxgGt3Jhbl rNT7ko+pHS2wrSMVuj25r9zjsC2tZJK6pHFsXA+0RvnNCuQ262LFZ4+s1CJNgBmcFKGG /RF15vPae0EnQrYLbC6NidVaqIItClyKLtkA/WCY3g2fi+MeBHPFzMz/JJDkTnLYPsGw 4CCyGVW+4oKzQb3JPjXdiPC/Jy5lz6SpvTPyICWCk/bE5VqY4rU7mmOcjqQWO7EgC++E quHg== 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=bQS09yqaJLhruC8O55IZOMAVRrnrL4iBqnUYFHJyNDo=; b=tXxo0s1NPXRcjTVWHrhJIY0T/1Q1viJLs0AM0l6R+R4ic/gUbHHAXdhKVr5vQAG0sL fmQxSkbsj8tknFZBOMI0tULHNldy4tXtsE8LUHIw9bBLNsjnvU+/wcg+nW75Y7Vulzez cARHLR39s/PGF5Vhggnd2Yy7NoPRgZjWo/mtGx/T793anzGx/PPc3M5vX2q0uGg11ZaV AKKegSIDb4GYMS11zBlnUa2cFaJMypG0D/p/8l/N5HCUh2oX1jCQ7oQFvP4W+sYxYl3M aKdDyfW29VW1lpO8RzSO/RFzqZBnyLJwy15GGOYLnks7zS7Roto/HEJpnS3mrmM0I2LY Zv/g== X-Gm-Message-State: APf1xPByMR0hWpO/FOH6rOjSonivSMp7fvslzyppThGOkfhabjFgsMod 1At9gKpENF+NOxHPAcls5Dk= X-Google-Smtp-Source: AH8x225+zzVbcnAlVa8yiLJfJZh2FSK6RnluE4OZtYqeaEDxjDR+JJ3SzPHNh1qm1NZsvxbIAYFdBg== X-Received: by 10.55.50.141 with SMTP id y135mr20552187qky.165.1518494927163; Mon, 12 Feb 2018 20:08:47 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q2sm7350435qki.10.2018.02.12.20.08.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 20:08:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini Date: Tue, 13 Feb 2018 01:07:48 -0300 Message-Id: <20180213040809.26021-10-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180213040809.26021-1-f4bug@amsat.org> References: <20180213040809.26021-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::243 Subject: [Qemu-devel] [PATCH v13 09/30] 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" , Peter Maydell , Fam Zheng , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis 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 64556480a9..def1c7f7aa 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 @@ -185,7 +187,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 491e624262..f22ed9181c 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -58,6 +58,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) {