From patchwork Fri Sep 5 21:42:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 4855031 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 830A19F9DF for ; Fri, 5 Sep 2014 21:42:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CCECE201E4 for ; Fri, 5 Sep 2014 21:42:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 088F4201C0 for ; Fri, 5 Sep 2014 21:42:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752492AbaIEVme (ORCPT ); Fri, 5 Sep 2014 17:42:34 -0400 Received: from mail-la0-f45.google.com ([209.85.215.45]:59006 "EHLO mail-la0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751470AbaIEVmd (ORCPT ); Fri, 5 Sep 2014 17:42:33 -0400 Received: by mail-la0-f45.google.com with SMTP id pn19so14680188lab.18 for ; Fri, 05 Sep 2014 14:42:31 -0700 (PDT) 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:organization :user-agent:mime-version:content-transfer-encoding:content-type; bh=0+dS4qvlyHmiMp+XnBsdqE1JIPeHVW2GmJNpVbhP2q8=; b=hgtC7KFOlK9tiz0jG9rgh1K5pWjqCz8LIEpKpFn+4odCsJIxvrAwXyVGS5GSvITQu8 GoA7TcPLJrrjTmI85QO6vOmhyLt83EUPTrz9jl6uMNQmjjfLUvO9j/V+NvzCOgKG3tVY OexsFxVtJWQZM554ZG7J2CyUYDci3O6aQZUmNejsxYNtXWUELLcO7EA6TTdmu5e43nwW 6ODoaFrahNazaYIgTbXXNhCzjpLTvjfcFsVzZSp4oIRe+yDg3wFGlMt6EQiaa6v0p8Tg wW38v05bPnuWl89qj2vPfU+yrrrR89JSoPpEljkf/CcxDbQBiIWcq2Oy8802vqOU77HQ w70Q== X-Gm-Message-State: ALoCoQllRB61b/aC0JR7eO6BsFgUWRzZ1iW9r2FckxAXxR0TfZ0VcMREJFlUAASU13ZlzBCuRabh X-Received: by 10.152.3.35 with SMTP id 3mr14559415laz.5.1409953351617; Fri, 05 Sep 2014 14:42:31 -0700 (PDT) Received: from wasted.cogentembedded.com (ppp30-108.pppoe.mtu-net.ru. [81.195.30.108]) by mx.google.com with ESMTPSA id t12sm1103901lbp.44.2014.09.05.14.42.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Sep 2014 14:42:30 -0700 (PDT) From: Sergei Shtylyov To: linux-mmc@vger.kernel.org, ian.molton@codethink.co.uk, chris@printf.net, ulf.hansson@linaro.org Cc: linux-sh@vger.kernel.org Subject: [PATCH v2] tmio_mmc_pio: prevent endless loop in tmio_mmc_set_clock() Date: Sat, 06 Sep 2014 01:42:29 +0400 Message-ID: <2535223.qa7H57Aml3@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.13.3 (Linux/3.15.10-201.fc20.x86_64; KDE/4.13.3; x86_64; ; ) MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 I spent a couple of days with the driver just hanging due to me forgetting to specify the external crystal frequency, so that clk_get_rate() returned 0 and thus the loop in tmio_mmc_set_clock() never ended. I don't think that's an acceptable behavior, so I suggest that the minimum frequency is checked for 0 in tmio_mmc_host_probe(). Signed-off-by: Sergei Shtylyov --- The patch is against Ulf Hansson's 'mmc.git' repo's 'fixes' branch. Changes in version 2: - fixed grammar in the changelog. drivers/mmc/host/tmio_mmc_pio.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: mmc/drivers/mmc/host/tmio_mmc_pio.c =================================================================== --- mmc.orig/drivers/mmc/host/tmio_mmc_pio.c +++ mmc/drivers/mmc/host/tmio_mmc_pio.c @@ -1044,6 +1044,15 @@ int tmio_mmc_host_probe(struct tmio_mmc_ } /* + * Check the sanity of mmc->f_min to prevent tmio_mmc_set_clock() from + * looping forever... + */ + if (mmc->f_min == 0) { + ret = -EINVAL; + goto pm_disable; + } + + /* * There are 4 different scenarios for the card detection: * 1) an external gpio irq handles the cd (best for power savings) * 2) internal sdhi irq handles the cd