From patchwork Wed Oct 15 16:43:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Branden X-Patchwork-Id: 38788 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E971320C4E for ; Wed, 15 Oct 2014 16:43:23 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id b13sf969560wgh.0 for ; Wed, 15 Oct 2014 09:43:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=wd61hiWPsyzjwfk784uOU7hemmd2jKdg5Oi27KbXqUU=; b=fw0dNqvwCKjj4FJTbI4mz/k7WmkJkg/IpfDvK+9iTHehB50EEvuMeZXyhX3M/HOG2v K0BNUXqhFPGl2P3AsHUtpBc2SAx3tYT3Ry20Mm9hXeY59/d8BJrgRYSCkLQFdAgrPqB3 1SrUXRi8HysTxz8Nf3gFGZUxpMeRDWtU2/m487j9Gqwv3l1muSuCteD9YZWL7LVqND0n mIVkgxUpdTQWlS8f2cvppVnbx/jCRPQr+w87DGLiwVA2bYyiNmasaZsPJ69uhyaUL0Tv iNBt9TpFhKTJlQIwPf6iL+VdEKwD23lPQImsqyEZXU+rJX+TMm74pTv1ylLRoAO7tpWI uK4A== X-Gm-Message-State: ALoCoQlfHXiwaye/N2PmcwwsqunjDZ5jfWe5wmxwyJqpeMGB+InNxJlfYDsmM06ZgHqb9+Y44tGw X-Received: by 10.181.27.135 with SMTP id jg7mr2303960wid.5.1413391403061; Wed, 15 Oct 2014 09:43:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.227 with SMTP id i3ls69373lae.28.gmail; Wed, 15 Oct 2014 09:43:22 -0700 (PDT) X-Received: by 10.152.202.135 with SMTP id ki7mr13648175lac.40.1413391402783; Wed, 15 Oct 2014 09:43:22 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com [209.85.217.180]) by mx.google.com with ESMTPS id p7si31286296lbr.56.2014.10.15.09.43.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Oct 2014 09:43:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by mail-lb0-f180.google.com with SMTP id n15so1335935lbi.39 for ; Wed, 15 Oct 2014 09:43:22 -0700 (PDT) X-Received: by 10.112.12.35 with SMTP id v3mr7990121lbb.80.1413391402645; Wed, 15 Oct 2014 09:43:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp637633lbz; Wed, 15 Oct 2014 09:43:21 -0700 (PDT) X-Received: by 10.66.90.134 with SMTP id bw6mr13601848pab.35.1413391400570; Wed, 15 Oct 2014 09:43:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oz2si16176435pbc.237.2014.10.15.09.43.19 for ; Wed, 15 Oct 2014 09:43:20 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751911AbaJOQnO (ORCPT + 27 others); Wed, 15 Oct 2014 12:43:14 -0400 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:26913 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751652AbaJOQnL (ORCPT ); Wed, 15 Oct 2014 12:43:11 -0400 X-IronPort-AV: E=Sophos;i="5.04,725,1406617200"; d="scan'208";a="48511100" Received: from irvexchcas07.broadcom.com (HELO IRVEXCHCAS07.corp.ad.broadcom.com) ([10.9.208.55]) by mail-gw1-out.broadcom.com with ESMTP; 15 Oct 2014 11:02:38 -0700 Received: from IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) by IRVEXCHCAS07.corp.ad.broadcom.com (10.9.208.55) with Microsoft SMTP Server (TLS) id 14.3.174.1; Wed, 15 Oct 2014 09:43:13 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) with Microsoft SMTP Server id 14.3.174.1; Wed, 15 Oct 2014 09:43:10 -0700 Received: from mail.broadcom.com (lbrmn-lnxub113.ric.broadcom.com [10.136.13.65]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 74EE540FE6; Wed, 15 Oct 2014 09:42:58 -0700 (PDT) From: Scott Branden To: Ulf Hansson , Russell King , Peter Griffin , Stephen Warren , Chris Ball CC: , , Joe Perches , , Ray Jui , , Scott Branden Subject: [PATCH 1/1] mmc: sdhci-bcm2835: added quirk and removed udelay in write ops Date: Wed, 15 Oct 2014 09:43:05 -0700 Message-ID: <1413391385-4061-1-git-send-email-sbranden@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sbranden@broadcom.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Added quirk SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 present in controller. Removed udelay in write ops by using shadow registers for 16 bit accesses to 32-bit registers (where necessary). Optimized 32-bit operations when doing 8/16 register accesses. Signed-off-by: Scott Branden --- drivers/mmc/host/sdhci-bcm2835.c | 139 ++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 73 deletions(-) diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c index 439d259..d967a4f 100644 --- a/drivers/mmc/host/sdhci-bcm2835.c +++ b/drivers/mmc/host/sdhci-bcm2835.c @@ -25,42 +25,28 @@ #include "sdhci-pltfm.h" /* - * 400KHz is max freq for card ID etc. Use that as min card clock. We need to - * know the min to enable static calculation of max BCM2835_SDHCI_WRITE_DELAY. - */ -#define MIN_FREQ 400000 - -/* * The Arasan has a bugette whereby it may lose the content of successive - * writes to registers that are within two SD-card clock cycles of each other - * (a clock domain crossing problem). It seems, however, that the data - * register does not have this problem, which is just as well - otherwise we'd - * have to nobble the DMA engine too. + * writes to the same register that are within two SD-card clock cycles of + * each other (a clock domain crossing problem). Problem does not happen with + * data. + * This wouldn't be a problem with the code except that we can only write the + * controller with 32-bit writes. So two different 16-bit registers in the + * written back to back creates the problem. * - * This should probably be dynamically calculated based on the actual card - * frequency. However, this is the longest we'll have to wait, and doesn't - * seem to slow access down too much, so the added complexity doesn't seem - * worth it for now. - * - * 1/MIN_FREQ is (max) time per tick of eMMC clock. - * 2/MIN_FREQ is time for two ticks. - * Multiply by 1000000 to get uS per two ticks. - * *1000000 for uSecs. - * +1 for hack rounding. + * In reality, this only happens when a SDHCI_BLOCK_SIZE and SDHCI_BLOCK_COUNT + * are written followed by SDHCI_TRANSFER_MODE and SDHCI_COMMAND. + * The BLOCK_SIZE and BLOCK_COUNT are meaningless until a command issued so + * the work around can be further optimized. We can keep shadow values of + * BLOCK_SIZE, BLOCK_COUNT, and TRANSFER_MODE until a COMMAND is issued. + * Then, write the BLOCK_SIZE+BLOCK_COUNT in a single 32-bit write followed + * by the TRANSFER+COMMAND in another 32-bit write. */ -#define BCM2835_SDHCI_WRITE_DELAY (((2 * 1000000) / MIN_FREQ) + 1) -struct bcm2835_sdhci { - u32 shadow; +struct bcm2835_sdhci_host { + u32 shadow_cmd; + u32 shadow_blk; }; -static void bcm2835_sdhci_writel(struct sdhci_host *host, u32 val, int reg) -{ - writel(val, host->ioaddr + reg); - - udelay(BCM2835_SDHCI_WRITE_DELAY); -} - static inline u32 bcm2835_sdhci_readl(struct sdhci_host *host, int reg) { u32 val = readl(host->ioaddr + reg); @@ -71,76 +57,83 @@ static inline u32 bcm2835_sdhci_readl(struct sdhci_host *host, int reg) return val; } -static void bcm2835_sdhci_writew(struct sdhci_host *host, u16 val, int reg) -{ - struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); - struct bcm2835_sdhci *bcm2835_host = pltfm_host->priv; - u32 oldval = (reg == SDHCI_COMMAND) ? bcm2835_host->shadow : - bcm2835_sdhci_readl(host, reg & ~3); - u32 word_num = (reg >> 1) & 1; - u32 word_shift = word_num * 16; - u32 mask = 0xffff << word_shift; - u32 newval = (oldval & ~mask) | (val << word_shift); - - if (reg == SDHCI_TRANSFER_MODE) - bcm2835_host->shadow = newval; - else - bcm2835_sdhci_writel(host, newval, reg & ~3); -} - static u16 bcm2835_sdhci_readw(struct sdhci_host *host, int reg) { - u32 val = bcm2835_sdhci_readl(host, (reg & ~3)); - u32 word_num = (reg >> 1) & 1; - u32 word_shift = word_num * 16; - u32 word = (val >> word_shift) & 0xffff; - + u32 val = bcm2835_sdhci_readl(host->ioaddr, (reg & ~3)); + u16 word = val >> (reg << 3 & 0x18) & 0xffff; return word; } -static void bcm2835_sdhci_writeb(struct sdhci_host *host, u8 val, int reg) +static u8 bcm2835_sdhci_readb(struct sdhci_host *host, int reg) { - u32 oldval = bcm2835_sdhci_readl(host, reg & ~3); - u32 byte_num = reg & 3; - u32 byte_shift = byte_num * 8; - u32 mask = 0xff << byte_shift; - u32 newval = (oldval & ~mask) | (val << byte_shift); + u32 val = bcm2835_sdhci_readl(host->ioaddr, (reg & ~3)); + u8 byte = val >> (reg << 3 & 0x18) & 0xff; + return byte; +} - bcm2835_sdhci_writel(host, newval, reg & ~3); +static void bcm2835_sdhci_writel(struct sdhci_host *host, u32 val, int reg) +{ + writel(val, host->ioaddr + reg); } -static u8 bcm2835_sdhci_readb(struct sdhci_host *host, int reg) +static void bcm2835_sdhci_writew(struct sdhci_host *host, u16 val, int reg) { - u32 val = bcm2835_sdhci_readl(host, (reg & ~3)); - u32 byte_num = reg & 3; - u32 byte_shift = byte_num * 8; - u32 byte = (val >> byte_shift) & 0xff; + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct bcm2835_sdhci_host *bcm2835_host = pltfm_host->priv; + u32 word_shift = reg << 3 & 0x18; + u32 mask = 0xffff << word_shift; + u32 oldval; + u32 newval; + + if (reg == SDHCI_COMMAND) { + if (bcm2835_host->shadow_blk != 0) { + writel(bcm2835_host->shadow_blk, + host->ioaddr + SDHCI_BLOCK_SIZE); + bcm2835_host->shadow_blk = 0; + } + oldval = bcm2835_host->shadow_cmd; + } else if (reg == SDHCI_BLOCK_SIZE || reg == SDHCI_BLOCK_COUNT) { + oldval = bcm2835_host->shadow_blk; + } else { + oldval = readl(host->ioaddr + (reg & ~3)); + } + newval = (oldval & ~mask) | (val << word_shift); - return byte; + if (reg == SDHCI_TRANSFER_MODE) + bcm2835_host->shadow_cmd = newval; + else if (reg == SDHCI_BLOCK_SIZE || reg == SDHCI_BLOCK_COUNT) + bcm2835_host->shadow_blk = newval; + else + writel(newval, host->ioaddr + (reg & ~3)); } -static unsigned int bcm2835_sdhci_get_min_clock(struct sdhci_host *host) +static void bcm2835_sdhci_writeb(struct sdhci_host *host, u8 val, int reg) { - return MIN_FREQ; + u32 oldval = readl(host->ioaddr + (reg & ~3)); + u32 byte_shift = reg << 3 & 0x18; + u32 mask = 0xff << byte_shift; + u32 newval = (oldval & ~mask) | (val << byte_shift); + + writel(newval, host->ioaddr + (reg & ~3)); } static const struct sdhci_ops bcm2835_sdhci_ops = { - .write_l = bcm2835_sdhci_writel, - .write_w = bcm2835_sdhci_writew, - .write_b = bcm2835_sdhci_writeb, .read_l = bcm2835_sdhci_readl, .read_w = bcm2835_sdhci_readw, .read_b = bcm2835_sdhci_readb, + .write_l = bcm2835_sdhci_writel, + .write_w = bcm2835_sdhci_writew, + .write_b = bcm2835_sdhci_writeb, .set_clock = sdhci_set_clock, .get_max_clock = sdhci_pltfm_clk_get_max_clock, - .get_min_clock = bcm2835_sdhci_get_min_clock, .set_bus_width = sdhci_set_bus_width, .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, }; static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = { - .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | + .quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 | + SDHCI_QUIRK_BROKEN_CARD_DETECTION | SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK, .ops = &bcm2835_sdhci_ops, }; @@ -148,7 +141,7 @@ static const struct sdhci_pltfm_data bcm2835_sdhci_pdata = { static int bcm2835_sdhci_probe(struct platform_device *pdev) { struct sdhci_host *host; - struct bcm2835_sdhci *bcm2835_host; + struct bcm2835_sdhci_host *bcm2835_host; struct sdhci_pltfm_host *pltfm_host; int ret;