From patchwork Tue Aug 13 15:21:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 2843763 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 757449F271 for ; Tue, 13 Aug 2013 15:22:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6DE24204EB for ; Tue, 13 Aug 2013 15:22:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4161F20453 for ; Tue, 13 Aug 2013 15:22:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757932Ab3HMPWW (ORCPT ); Tue, 13 Aug 2013 11:22:22 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:2907 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757986Ab3HMPWT (ORCPT ); Tue, 13 Aug 2013 11:22:19 -0400 Received: from [10.9.208.57] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Tue, 13 Aug 2013 08:18:18 -0700 X-Server-Uuid: 06151B78-6688-425E-9DE2-57CB27892261 Received: from IRVEXCHSMTP3.corp.ad.broadcom.com (10.9.207.53) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Tue, 13 Aug 2013 08:22:10 -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.1.438.0; Tue, 13 Aug 2013 08:22:10 -0700 Received: from stbsrv-and-2.and.broadcom.com ( stbsrv-and-2.and.broadcom.com [10.32.128.96]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 87244F2D73; Tue, 13 Aug 2013 08:22:09 -0700 (PDT) From: "Al Cooper" To: cjb@laptop.org, linux-mmc@vger.kernel.org cc: "Al Cooper" Subject: [PATCH 6/7] mmc: lock: Prevent partition table read for locked cards. Date: Tue, 13 Aug 2013 11:21:29 -0400 Message-ID: <1376407290-21477-7-git-send-email-alcooperx@gmail.com> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1376407290-21477-1-git-send-email-alcooperx@gmail.com> References: <1376407290-21477-1-git-send-email-alcooperx@gmail.com> MIME-Version: 1.0 X-WSS-ID: 7E1491B031W83731149-01-01 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,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 From: Al Cooper Change the MMC block layer to avoid reading the partition table when the card is locked because read commands will fail. refs #SWLINUX-2545 Signed-off-by: Al Cooper --- drivers/mmc/card/block.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index cd0b7f4..8eb254f 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2047,6 +2047,13 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, md->disk->flags |= GENHD_FL_NO_PART_SCAN; /* + * If the card is locked, reads will fail so prevent partition + * table scan + */ + if (mmc_card_locked(card)) + md->disk->flags |= GENHD_FL_NO_PART_SCAN; + + /* * As discussed on lkml, GENHD_FL_REMOVABLE should: * * - be set for removable media with permanent block devices