From patchwork Wed Feb 7 18:19:20 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: 10205837 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C1E5F6020F for ; Wed, 7 Feb 2018 18:30:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1D73290A4 for ; Wed, 7 Feb 2018 18:30:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4FF5290BB; Wed, 7 Feb 2018 18:30:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E0101290A4 for ; Wed, 7 Feb 2018 18:30:57 +0000 (UTC) Received: from localhost ([::1]:42511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejUUi-0003xQ-Te for patchwork-qemu-devel@patchwork.kernel.org; Wed, 07 Feb 2018 13:30:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejUK8-0001xy-9S for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:20:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejUK7-0004z5-2Q for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:20:00 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:36548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ejUK6-0004yi-Ru for qemu-devel@nongnu.org; Wed, 07 Feb 2018 13:19:58 -0500 Received: by mail-qk0-x241.google.com with SMTP id 15so2319737qkl.3 for ; Wed, 07 Feb 2018 10:19:58 -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=jfJ5JVCbj5Si/oNj2Xvnjg1R4RmTNbGWUbn6NjfkixM=; b=u1FV+WIpT7ws3lUlFYxofp+7bhmlDheAs5BRooP8CiuuT5KeGvCmUB0FFT/HI5dPP5 Oz6TOfRoUtJN3BXNijbMqgnsUyLFDuiPB1k7ULvZrx5C2vRXiI9Z7zUQxFpPYP7NGWqy OnvlR68EkwyLg9q42MBsP1JtJlG+rTloBU093dzN2YSRM3vbsORZAjnJ40TJ5Yup9Ysi QjopTLm4f9kvwZWMaRqKwO8a4adojI74xjf/DiOsHTGrmKMHSM6FdjHjfML+l62WgY/o TdCN16Kh3/2TUPETTlABQuX1bvahEz2+IrB5Ny9EN/MRJlWRpbh4tmsjjCrSzzsEigQS A3Rg== 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=jfJ5JVCbj5Si/oNj2Xvnjg1R4RmTNbGWUbn6NjfkixM=; b=FzIoklbQWVG1bW6mZ9qqSRangdIbDw99URcVOkB5XLcCu7qrCRIEji1uEe25Qo0u+5 F/bGXG1WITzzbavT2NX6woDqR86VJlmsmqJDl34YtFSCrdGtysvsBjU9UhEi8K7os7hz Zt3G3NVofp79ynvrCIUOWiEdBWFMz8YatxR8LW8DQHdGBDDKSGhnxNU3kABCMmkLwGZO S5G0bTmM+a3xnhO7cR+PzOfHyqn5oMRJSGCpHxE/niMKRIaWGhUivZiEmfWoE9k+tg0W 2UoswCr5NIm7RyYJHMNyTK1CCNzXWhtNYtHIsqK7GMF+vLhNWvslEYdtzCPVvM3OWON5 4XIQ== X-Gm-Message-State: APf1xPDMYhNXxZp2+RY+hUAfg+7jDR1SvDrlEEWheyJAWUuEZ9Gq94x8 1dCF4iKkXyCWeSgehB4v/Cs= X-Google-Smtp-Source: AH8x224Tc9l4ZMk1XiRQVzq1AFKbqna/rA9NGwWYeXoiA55lACmqz9CSGrqsm46ZbYZt9tAhKzj4JA== X-Received: by 10.55.81.198 with SMTP id f189mr10237627qkb.204.1518027598345; Wed, 07 Feb 2018 10:19:58 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id f7sm1426248qtm.21.2018.02.07.10.19.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2018 10:19:57 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Stefan Hajnoczi , Peter Maydell Date: Wed, 7 Feb 2018 15:19:20 -0300 Message-Id: <20180207181929.8701-8-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::241 Subject: [Qemu-devel] [PATCH v10 07/16] sdhci: add a 'spec_version property' (default to v2) 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=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 4 ++-- include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 27 +++++++++++++++++++++++---- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index fc807f08f3..b7751c815f 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -210,9 +210,9 @@ /* Slot interrupt status */ #define SDHC_SLOT_INT_STATUS 0xFC -/* HWInit Host Controller Version Register 0x0401 */ +/* HWInit Host Controller Version Register */ #define SDHC_HCVER 0xFE -#define SD_HOST_SPECv2_VERS 0x2401 +#define SDHC_HCVER_VENDOR 0x24 #define SDHC_REGISTERS_MAP_SIZE 0x100 #define SDHC_INSERTION_DELAY (NANOSECONDS_PER_SECOND) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 1cf70f8c23..40798aed58 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -77,6 +77,7 @@ typedef struct SDHCIState { /* Read-only registers */ uint64_t capareg; /* Capabilities Register */ uint64_t maxcurr; /* Maximum Current Capabilities Register */ + uint16_t version; /* Host Controller Version Register */ uint8_t *fifo_buffer; /* SD host i/o FIFO buffer */ uint32_t buf_maxsz; @@ -91,6 +92,7 @@ typedef struct SDHCIState { /* Configurable properties */ bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ + uint8_t sd_spec_version; } SDHCIState; #define TYPE_PCI_SDHCI "sdhci-pci" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 817c2525e6..2bcc5ff58a 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -174,7 +174,8 @@ static void sdhci_reset(SDHCIState *s) timer_del(s->insert_timer); timer_del(s->transfer_timer); - /* Set all registers to 0. Capabilities registers are not cleared + + /* Set all registers to 0. Capabilities/Version registers are not cleared * and assumed to always preserve their value, given to them during * initialization */ memset(&s->sdmasysad, 0, (uintptr_t)&s->capareg - (uintptr_t)&s->sdmasysad); @@ -918,7 +919,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size) ret = (uint32_t)(s->admasysaddr >> 32); break; case SDHC_SLOT_INT_STATUS: - ret = (SD_HOST_SPECv2_VERS << 16) | sdhci_slotint(s); + ret = (s->version << 16) | sdhci_slotint(s); break; default: qemu_log_mask(LOG_UNIMP, "SDHC rd_%ub @0x%02" HWADDR_PRIx " " @@ -1174,11 +1175,22 @@ static inline unsigned int sdhci_get_fifolen(SDHCIState *s) } } +static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) +{ + if (s->sd_spec_version != 2) { + error_setg(errp, "Only Spec v2 is supported"); + return; + } + s->version = (SDHC_HCVER_VENDOR << 8) | (s->sd_spec_version - 1); +} + /* --- qdev common --- */ #define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ - /* Capabilities registers provide information on supported features - * of this specific host controller implementation */ \ + DEFINE_PROP_UINT8("sd-spec-version", _state, sd_spec_version, 2), \ + \ + /* Capabilities registers provide information on supported + * features of this specific host controller implementation */ \ DEFINE_PROP_UINT64("capareg", _state, capareg, SDHC_CAPAB_REG_DEFAULT), \ DEFINE_PROP_UINT64("maxcurr", _state, maxcurr, 0) @@ -1204,6 +1216,13 @@ static void sdhci_uninitfn(SDHCIState *s) static void sdhci_common_realize(SDHCIState *s, Error **errp) { + Error *local_err = NULL; + + sdhci_init_readonly_registers(s, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } s->buf_maxsz = sdhci_get_fifolen(s); s->fifo_buffer = g_malloc0(s->buf_maxsz);