From patchwork Wed Dec 18 11:09:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3369601 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 071F6C0D4A for ; Wed, 18 Dec 2013 11:09:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D0B1E203AB for ; Wed, 18 Dec 2013 11:09:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB28920465 for ; Wed, 18 Dec 2013 11:09:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753617Ab3LRLJa (ORCPT ); Wed, 18 Dec 2013 06:09:30 -0500 Received: from mail-la0-f45.google.com ([209.85.215.45]:35316 "EHLO mail-la0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753435Ab3LRLJ3 (ORCPT ); Wed, 18 Dec 2013 06:09:29 -0500 Received: by mail-la0-f45.google.com with SMTP id eh20so3796150lab.4 for ; Wed, 18 Dec 2013 03:09:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IPm9FUzUxuwaiqxCO0LjNUilnXuekXmbXy5iSkqSyAk=; b=SJAq0g21m9AzYivwVR3Xp4Yp6l1yecTD5xgbjYW4vsRSJ96JlSQTsBfEZA6BHXGDwK OP8KN9kXv6kKtzrIuIaJk2ImHe5qUZg27iKfiy3wgR1/gmdLINwlhNsMOa7e/SjfQhov jEUOm1zUvjN/m/1GlL2x4h7ny9jujSVzshBoDwNOI23GL8tZDzNKtoTQ6todP5KJG5a0 z+WBJGT/NuhhimHCGNX9cqsRyjzgz0MpTqOBdhJBnN0h+bT2nnr7JyMHyF/7XUpwQ6Sj xOZ8ar1doU5PTjB7gqjXivYLPrlsi+ifvH5+6Gw/1+dfonNae4OZ4ZuDVpPLcOjQNA1i lgHg== X-Gm-Message-State: ALoCoQnMMPIhGFefBptBSx/2t6wqqqNUAWkNpmvvtSfZqIVaLka54tXaDP7xptNUeVH1lQZJI+wQ X-Received: by 10.112.143.163 with SMTP id sf3mr1322161lbb.20.1387364968027; Wed, 18 Dec 2013 03:09:28 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id ld10sm27868575lab.8.2013.12.18.03.09.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Dec 2013 03:09:26 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson Subject: [PATCH 2/2] mmc: core: Enable MMC_CAP2_CACHE_CTRL as default Date: Wed, 18 Dec 2013 12:09:21 +0100 Message-Id: <1387364961-15464-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387364961-15464-1-git-send-email-ulf.hansson@linaro.org> References: <1387364961-15464-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There are no reason to why the use of a non-volatile internal eMMC cache should be controlled by a host cap. Instead let's just enable it if the eMMC card supports it. Signed-off-by: Ulf Hansson Acked-by: Seungwon Jeon --- drivers/mmc/core/core.c | 3 --- drivers/mmc/core/mmc.c | 3 +-- include/linux/mmc/host.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index df591a9..66ec347 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2585,9 +2585,6 @@ int mmc_flush_cache(struct mmc_card *card) struct mmc_host *host = card->host; int err = 0; - if (!(host->caps2 & MMC_CAP2_CACHE_CTRL)) - return err; - if (mmc_card_mmc(card) && (card->ext_csd.cache_size > 0) && (card->ext_csd.cache_ctrl & 1)) { diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index ef1cc73..7ab3e9c 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1287,8 +1287,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, * If cache size is higher than 0, this indicates * the existence of cache and it can be turned on. */ - if ((host->caps2 & MMC_CAP2_CACHE_CTRL) && - card->ext_csd.cache_size > 0) { + if (card->ext_csd.cache_size > 0) { err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_CACHE_CTRL, 1, card->ext_csd.generic_cmd6_time); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index f539bc7..8383e3f 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -264,7 +264,6 @@ struct mmc_host { u32 caps2; /* More host capabilities */ #define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */ -#define MMC_CAP2_CACHE_CTRL (1 << 1) /* Allow cache control */ #define MMC_CAP2_FULL_PWR_CYCLE (1 << 2) /* Can do full power cycle */ #define MMC_CAP2_NO_MULTI_READ (1 << 3) /* Multiblock reads don't work */ #define MMC_CAP2_NO_SLEEP_CMD (1 << 4) /* Don't allow sleep command */