From patchwork Thu Dec 19 20:04: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: 3384121 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 4C91DC0D4B for ; Thu, 19 Dec 2013 20:05:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35F4B206B9 for ; Thu, 19 Dec 2013 20:05:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D140206BB for ; Thu, 19 Dec 2013 20:04:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755724Ab3LSUE6 (ORCPT ); Thu, 19 Dec 2013 15:04:58 -0500 Received: from mail-lb0-f180.google.com ([209.85.217.180]:56700 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755380Ab3LSUE5 (ORCPT ); Thu, 19 Dec 2013 15:04:57 -0500 Received: by mail-lb0-f180.google.com with SMTP id x18so672227lbi.25 for ; Thu, 19 Dec 2013 12:04:56 -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=5zliz1to3vc024xsXcH/Xp/xD4IAK4rqtUjU6Losirw=; b=R5efVk3vgRQMM1IRsznwAbilWqN0ChwZFeCrxuPm8dPKEVA41ZprnVVw54CdTshkua PYihqQ67ZCHflRcnOLiw1W2Y5MfsGyBxZu4UM8SlqAdpl2pQGw3W1Epl6bxS6P+Ej5mi WOY2GPyfVhQmcnEvDtAhZdW+G9kTG882IP3ACxyBtUllb8D91CFVoKErtpIq771IZzZ3 YDA4L36PHach5l34fDFda79ib3a/aeEFMZ68TIWfuPe5AWZV4ei3hMAGC4teHdFRusQ3 rJeoqBam4KlN2C9V3I6Pfh5yVi6DRRlzSeh2QmBLGI2qyIfssoULcP4K6XCfgdObnVew 27pQ== X-Gm-Message-State: ALoCoQnSp9lGlI5lCYMqzawhpX+j4Dwero91dZGMMsTuERXPlZx9mhoJX9gtzfZ8DX5eLETEUUHt X-Received: by 10.112.181.232 with SMTP id dz8mr1685136lbc.8.1387483496380; Thu, 19 Dec 2013 12:04:56 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id tc8sm3091113lbb.9.2013.12.19.12.04.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 12:04:55 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson Subject: [PATCH V2 2/2] mmc: core: Enable MMC_CAP2_CACHE_CTRL as default Date: Thu, 19 Dec 2013 21:04:21 +0100 Message-Id: <1387483461-6317-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1387483461-6317-1-git-send-email-ulf.hansson@linaro.org> References: <1387483461-6317-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 | 4 ---- drivers/mmc/core/mmc.c | 3 +-- include/linux/mmc/host.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index df591a9..1228a59 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2582,12 +2582,8 @@ EXPORT_SYMBOL(mmc_power_restore_host); */ 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 */