From patchwork Wed May 9 06:01:04 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: 10388165 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 58F1260153 for ; Wed, 9 May 2018 06:06:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 489C628909 for ; Wed, 9 May 2018 06:06:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D40028DA5; Wed, 9 May 2018 06:06:21 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, 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 C0DBD28909 for ; Wed, 9 May 2018 06:06:20 +0000 (UTC) Received: from localhost ([::1]:54698 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGIF2-0004KG-3v for patchwork-qemu-devel@patchwork.kernel.org; Wed, 09 May 2018 02:06:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGIAH-00009V-ED for qemu-devel@nongnu.org; Wed, 09 May 2018 02:01:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGIAE-0005hF-P9 for qemu-devel@nongnu.org; Wed, 09 May 2018 02:01:25 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:41751) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGIAE-0005g4-Ko for qemu-devel@nongnu.org; Wed, 09 May 2018 02:01:22 -0400 Received: by mail-qt0-x242.google.com with SMTP id g13-v6so44208071qth.8 for ; Tue, 08 May 2018 23:01:22 -0700 (PDT) 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=3sOeEMUxVD9ijnVfb/nF73+bmclv+x4ZlWE6oQqP8aQ=; b=uzYDlj+nsNRZbeRNelqS51aLdZaOAjusGjd4iXIqBj9yK+pQaOACQAtWe6gSz7LUK8 L1njUdn7GYJjmiX1nhwv4h4/eMgUEbLjgIcbe/oLL3hylkTBjCIqMDrUM2Xa/yjylEZ1 TCqVATy2n9+o+QMJiaoOe7d2dihB1RmgMa+CYahk0iH4zGqVY9wJyjrXOUj89lB7zmQ5 uW6QT+l+xdECO0UYuxvpxG7RfvmSLJbXfgAx2WDKVH8AIGAfYiQCWsk7fzfQWzStKvf7 z6UJGtLC6L3dCw4TJb2xaGRJLZFdz4VVFJGedxmd6iA/j5Th6/ZBiWChmCqYX5eth/5a Fu1w== 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=3sOeEMUxVD9ijnVfb/nF73+bmclv+x4ZlWE6oQqP8aQ=; b=VCvmlexgzvcLMIoJgWtOTWAneE/LNH4F0IYWe6NDdA8oTSjjdrJ8WSfRh99PbnSqbo WQ8PM2HzP5BRwLTauQRiQJaXbYYErRuctnrWpPYcIZ9Fsxb0BDnSHSPtkGjTaRu9SabN rjKBoEzIF55JXlJi+QSNQ4c5C9nISyPm/HFyRj2VCIdPd6JpM2GDaznnjZTPAcNUN5T2 UCEP9pXAljt+tcyqxcncClmCIyMa+twgn7dlzFiNirzj7LFgU0VLwr3PDvmz4eF8GTWu esOYYxTvPKIry/IuRPLFgokoacP4u72eYtbOVL/TTXXjuAEjAbpUKnIKETwRKghGSUO5 rAww== X-Gm-Message-State: ALKqPweH1cLaiZEHT6oBeTOP+taQfVzNPQS0A4VMEVwfbblXRGkJPoU1 qih2m+SY0fejWntApwXZZSE= X-Google-Smtp-Source: AB8JxZp+ETDDQO3fywHrkNTmzYNwW6J7kUTBAi+6TlAJ+zRGyn5fh9xKbL7o7nyX7AFNYdL7FSTRbQ== X-Received: by 2002:a0c:d108:: with SMTP id a8-v6mr10732327qvh.159.1525845681863; Tue, 08 May 2018 23:01:21 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 42-v6sm1707217qte.41.2018.05.08.23.01.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 23:01:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , "Edgar E . Iglesias" , Alistair Francis Date: Wed, 9 May 2018 03:01:04 -0300 Message-Id: <20180509060104.4458-5-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509060104.4458-1-f4bug@amsat.org> References: <20180509060104.4458-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:c0d::242 Subject: [Qemu-devel] [PATCH v2 4/4] sdcard: Add a 'uhs' property, update the OCR register ACCEPT_SWITCH_1V8 bit 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: =?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/sd.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index d8dd88f872..a0e8a1b46a 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -94,6 +94,10 @@ struct SDState { BlockBackend *blk; bool spi; + /** + * The UHS mode the card supports if any, else #UHS_NOT_SUPPORTED + */ + uint8_t uhs_mode_supported; /* Runtime changeables */ @@ -300,6 +304,9 @@ static void sd_set_ocr(SDState *sd) { /* All voltages OK */ sd->ocr = R_OCR_VDD_VOLTAGE_WIN_HI_MASK; + + sd->ocr = FIELD_DP32(sd->ocr, OCR, ACCEPT_SWITCH_1V8, + sd->uhs_mode_supported != UHS_NOT_SUPPORTED); } static void sd_ocr_powerup(void *opaque) @@ -2240,6 +2247,7 @@ static Property sd_properties[] = { * board to ensure that ssi transfers only occur when the chip select * is asserted. */ DEFINE_PROP_BOOL("spi", SDState, spi, false), + DEFINE_PROP_UINT8("uhs", SDState, uhs_mode_supported, UHS_NOT_SUPPORTED), DEFINE_PROP_END_OF_LIST() };