From patchwork Thu Oct 30 06:36:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Branden X-Patchwork-Id: 39809 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5DAA3202FE for ; Thu, 30 Oct 2014 06:38:05 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id k14sf2494986wgh.11 for ; Wed, 29 Oct 2014 23:38:04 -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=c/OrvnlXBxlGu8hPZvCan7hWvPcsEsR2aUtclxzlA4c=; b=Q7otKKOBLEgMMgrLBG5KqDYr18H0XCMuYtFfZvfEhx1Gc4PhrMzFZ8/6+7Cv3BSvcX Dh+EVrYDSlzf330ONzCyzqjAfOqXP0sKu8qXat8D+RWipYR9sssDXHTAOQ9ptKInXuFU gDQOv3MekJMJxKTXwz+o1EEGt5fwlzq1IDDWGbSTUpP4o6gxG4mn+mqADucIgKsgRPNa l/0w3wIyRBDzlkb8kJ/bNSa5BCb/pqugXnw+aa7GuAQdYuTlWHdHkWkxiB5T51mc2BDQ hd6baXewZQmbcj5BsSSjBSF0bAk65nZzSf3ZsdqXHOc9R3ad0bCqVYtVKgNznjarqyLQ d6KQ== X-Gm-Message-State: ALoCoQk9nhdD/1i4M3EMafGSJb4qcIl+EQAPIxqz/J3/zU4ix4IdyUdvbVuGoo4jTw/Yi1MKhNNB X-Received: by 10.194.86.66 with SMTP id n2mr4459wjz.7.1414651084535; Wed, 29 Oct 2014 23:38:04 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.4 with SMTP id j4ls72125lae.59.gmail; Wed, 29 Oct 2014 23:38:04 -0700 (PDT) X-Received: by 10.152.198.204 with SMTP id je12mr16674064lac.61.1414651084347; Wed, 29 Oct 2014 23:38:04 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id a4si10481622lbm.77.2014.10.29.23.38.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Oct 2014 23:38:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by mail-la0-f47.google.com with SMTP id gd6so2698797lab.34 for ; Wed, 29 Oct 2014 23:38:04 -0700 (PDT) X-Received: by 10.152.5.38 with SMTP id p6mr16343960lap.44.1414651084268; Wed, 29 Oct 2014 23:38:04 -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 c5csp783802lbz; Wed, 29 Oct 2014 23:38:03 -0700 (PDT) X-Received: by 10.68.103.97 with SMTP id fv1mr14858783pbb.141.1414651082634; Wed, 29 Oct 2014 23:38:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l3si5773694pdc.176.2014.10.29.23.38.01 for ; Wed, 29 Oct 2014 23:38:02 -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 S1758241AbaJ3Gh7 (ORCPT + 26 others); Thu, 30 Oct 2014 02:37:59 -0400 Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:15186 "EHLO mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758148AbaJ3GhI (ORCPT ); Thu, 30 Oct 2014 02:37:08 -0400 X-IronPort-AV: E=Sophos;i="5.07,284,1413270000"; d="scan'208";a="49476493" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw2-out.broadcom.com with ESMTP; 30 Oct 2014 00:01:00 -0700 Received: from IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.174.1; Wed, 29 Oct 2014 23:37:07 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) with Microsoft SMTP Server id 14.3.174.1; Wed, 29 Oct 2014 23:37:06 -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 1A27C40FE6; Wed, 29 Oct 2014 23:36:48 -0700 (PDT) From: Scott Branden To: Ulf Hansson , Russell King , Peter Griffin , Stephen Warren , Chris Ball , Piotr Krol CC: , , Joe Perches , , Ray Jui , , Scott Branden Subject: [PATCHv2 4/5] mmc: shdci-bcm2835: add verify for 32-bit back-to-back workaround Date: Wed, 29 Oct 2014 23:36:56 -0700 Message-ID: <1414651017-3545-5-git-send-email-sbranden@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1414651017-3545-1-git-send-email-sbranden@broadcom.com> References: <1414651017-3545-1-git-send-email-sbranden@broadcom.com> 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.215.47 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: , Add a verify option to driver to print out an error message if a potential back to back write could cause a clock domain issue. Signed-off-by: Scott Branden --- drivers/mmc/host/Kconfig | 9 +++++++++ drivers/mmc/host/sdhci-bcm2835.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 1386065..020de98 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -292,6 +292,15 @@ config MMC_SDHCI_BCM2835 If unsure, say N. +config MMC_SDHCI_BCM2835_VERIFY_WORKAROUND + bool "Verify BCM2835 workaround does not do back to back writes" + depends on MMC_SDHCI_BCM2835 + default y + help + This enables code that verifies the bcm2835 workaround. + The verification code checks that back to back writes to the same + register do not occur. + config MMC_MOXART tristate "MOXART SD/MMC Host Controller support" depends on ARCH_MOXART && MMC diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c index f8c450a..11af27f 100644 --- a/drivers/mmc/host/sdhci-bcm2835.c +++ b/drivers/mmc/host/sdhci-bcm2835.c @@ -27,6 +27,9 @@ struct bcm2835_sdhci_host { u32 shadow_cmd; u32 shadow_blk; +#ifdef CONFIG_MMC_SDHCI_BCM2835_VERIFY_WORKAROUND + int previous_reg; +#endif }; #define REG_OFFSET_IN_BITS(reg) ((reg) << 3 & 0x18) @@ -58,6 +61,20 @@ static u8 bcm2835_sdhci_readb(struct sdhci_host *host, int reg) static inline void bcm2835_sdhci_writel(struct sdhci_host *host, u32 val, int reg) { +#ifdef CONFIG_MMC_SDHCI_BCM2835_VERIFY_WORKAROUND + struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); + struct bcm2835_sdhci_host *bcm2835_host = pltfm_host->priv; + + if (bcm2835_host->previous_reg == reg) { + if ((reg != SDHCI_HOST_CONTROL) + && (reg != SDHCI_CLOCK_CONTROL)) { + dev_err(mmc_dev(host->mmc), + "back-to-back write to 0x%x\n", reg); + } + } + bcm2835_host->previous_reg = reg; +#endif + writel(val, host->ioaddr + reg); }