Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752592AbcDSHUj (ORCPT ); Tue, 19 Apr 2016 03:20:39 -0400 Received: from 7of9.schinagl.nl ([88.159.158.68]:48654 "EHLO 7of9.schinagl.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751926AbcDSHUh (ORCPT ); Tue, 19 Apr 2016 03:20:37 -0400 X-Greylist: delayed 424 seconds by postgrey-1.27 at vger.kernel.org; Tue, 19 Apr 2016 03:20:37 EDT From: Olliver Schinagl To: Ulf Hansson , Maxime Ripard , Chen-Yu Tsai , Venu Byravarasu , Adrian Hunter , Michal Hocko , Lars-Peter Clausen , Sudeep Holla , Sergei Shtylyov , Wolfram Sang , Wenkai Du , Chaotian Jing , Kuninori Morimoto , Hans de Goede , Jaehoon Chung , Michal Suchanek Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Olliver Schinagl Subject: [PATCH 1/2] mmc: core: Improve marking broken HPI through devicetree Date: Tue, 19 Apr 2016 09:12:13 +0200 Message-Id: <1461049934-12848-2-git-send-email-oliver@schinagl.nl> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1461049934-12848-1-git-send-email-oliver@schinagl.nl> References: <1461049934-12848-1-git-send-email-oliver@schinagl.nl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2258 Lines: 55 In patch 81f8a7be66 Hans de Goede added a patch to allow marking an mmc device as to having an broken HPI implementation. After talking some with Hans, we now think it is actually the mmc controller that can be broken and not support broken HPI's. This patch adds a new capability, mmc-broken-hpi, which allows us to mark a broken hpi implementation on the host level. Signed-off-by: Olliver Schinagl --- drivers/mmc/core/host.c | 2 ++ drivers/mmc/core/mmc.c | 2 +- include/linux/mmc/host.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 6e4c55a..9b63b36 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -270,6 +270,8 @@ int mmc_of_parse(struct mmc_host *host) host->caps |= MMC_CAP_HW_RESET; if (of_property_read_bool(np, "cap-sdio-irq")) host->caps |= MMC_CAP_SDIO_IRQ; + if (of_property_read_bool(np, "mmc-broken-hpi")) + host->caps |= MMC_CAP_BROKEN_HPI; if (of_property_read_bool(np, "full-pwr-cycle")) host->caps2 |= MMC_CAP2_FULL_PWR_CYCLE; if (of_property_read_bool(np, "keep-power-in-suspend")) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 4dbe3df..9a19562 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1592,7 +1592,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, /* * Enable HPI feature (if supported) */ - if (card->ext_csd.hpi) { + if (card->ext_csd.hpi && !(host->caps & MMC_CAP_BROKEN_HPI)) { err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HPI_MGMT, 1, card->ext_csd.generic_cmd6_time); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 8dd4d29..20f758e 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -264,6 +264,7 @@ struct mmc_host { #define MMC_CAP_DRIVER_TYPE_A (1 << 23) /* Host supports Driver Type A */ #define MMC_CAP_DRIVER_TYPE_C (1 << 24) /* Host supports Driver Type C */ #define MMC_CAP_DRIVER_TYPE_D (1 << 25) /* Host supports Driver Type D */ +#define MMC_CAP_BROKEN_HPI (1 << 29) /* Host support for HPI is broken */ #define MMC_CAP_CMD23 (1 << 30) /* CMD23 supported. */ #define MMC_CAP_HW_RESET (1 << 31) /* Hardware reset */ -- 2.8.0.rc3