From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5864DC3E8A4 for ; Sun, 3 Feb 2019 15:56:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2847F218D8 for ; Sun, 3 Feb 2019 15:56:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OwPgGURi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2847F218D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=csie.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=47EL9+Tf6Cn6qyJqCGHWptEwFRF8NQNtp0Sl9wY2E/8=; b=OwPgGURig5AnWn t0A5VlYZMjIJchgpU31OwGrwO4LlhD1W6TqXn39dBg4hZQYOUTOlaYD/zaWvc01i/3kMPt0KmaOCb ICmwCV0jV6/rh1sfnGtCyvvvyyv2MDI4oqjO6TYTSuaRwwpNcGiPOKiPwqxCFnzEzTxMJkRHUn1Am MEiJ1tjf8LfXrc9hG+6A88ruDA8Oi6+xumTQhM1lR1WiH2Hkobc0eGlakvtsPlhjSxkT3OPfcSWAI 91uXDCUBYGQF5lldM1H9X9VBZq+H0aeYILmN4DXKIyPQfqWjp211CbK2WrBCggW/a/Yg1T0zSpTHB 0P16ltLlSjcBj4SQZPVQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gqK8U-0000yN-PX; Sun, 03 Feb 2019 15:56:46 +0000 Received: from mirror2.csie.ntu.edu.tw ([140.112.30.76] helo=wens.csie.org) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gqK8M-0000x6-Rm for linux-arm-kernel@lists.infradead.org; Sun, 03 Feb 2019 15:56:41 +0000 Received: by wens.csie.org (Postfix, from userid 1000) id A21CD5FD3D; Sun, 3 Feb 2019 23:56:28 +0800 (CST) From: Chen-Yu Tsai To: Ulf Hansson , Maxime Ripard Subject: [PATCH 2/3] mmc: sunxi: Filter out unsupported modes declared in the device tree Date: Sun, 3 Feb 2019 23:56:27 +0800 Message-Id: <20190203155628.16767-3-wens@csie.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190203155628.16767-1-wens@csie.org> References: <20190203155628.16767-1-wens@csie.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190203_075639_038150_6DA9233A X-CRM114-Status: GOOD ( 11.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Chris Blake , linux-mmc@vger.kernel.org, linux-sunxi@googlegroups.com, stable@vger.kernel.org, linux-kernel@vger.kernel.org, Chen-Yu Tsai , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org The MMC device tree bindings include properties used to signal various signalling speed modes. Until now the sunxi driver was accepting them without any further filtering, while the sunxi device trees were not actually using them. Since some of the H5 boards can not run at higher speed modes stably, we are resorting to declaring the higher speed modes per-board. Regardless, having boards declare modes and blindly following them, even without proper support in the driver, is generally a bad thing. Filter out all unsupported modes from the capabilities mask after the device tree properties have been parsed. Cc: Signed-off-by: Chen-Yu Tsai --- This should be backported to stable kernels in case people try to run new device trees (that declare newly supported modes) with old kernels. --- drivers/mmc/host/sunxi-mmc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index 7415af8c8ff6..a01433012db0 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -1415,6 +1415,22 @@ static int sunxi_mmc_probe(struct platform_device *pdev) if (ret) goto error_free_dma; + /* + * If we don't support delay chains in the SoC, we can't use any + * of the DDR speed modes. Mask them out in case the device + * tree specifies the properties for them, which gets added to + * the caps by mmc_of_parse() above. + */ + if (!(host->cfg->clk_delays || host->use_new_timings)) + mmc->caps &= ~(MMC_CAP_3_3V_DDR | MMC_CAP_1_8V_DDR | + MMC_CAP_1_2V_DDR); + + /* TODO: UHS modes untested due to lack of supporting boards */ + mmc->caps &= ~MMC_CAP_UHS; + + /* TODO: This driver doesn't support HS200 and HS400 modes yet */ + mmc->caps2 &= ~(MMC_CAP2_HS200 | MMC_CAP2_HS400); + ret = sunxi_mmc_init_host(host); if (ret) goto error_free_dma; -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel