From patchwork Wed Mar 5 23:44:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 3780231 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 74D8C9F35F for ; Wed, 5 Mar 2014 23:53:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9805520218 for ; Wed, 5 Mar 2014 23:53:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2636201F9 for ; Wed, 5 Mar 2014 23:53:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752444AbaCEXxA (ORCPT ); Wed, 5 Mar 2014 18:53:00 -0500 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:7333 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756720AbaCEXw7 (ORCPT ); Wed, 5 Mar 2014 18:52:59 -0500 X-IronPort-AV: E=Sophos;i="4.97,596,1389772800"; d="scan'208";a="18215522" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw1-out.broadcom.com with ESMTP; 05 Mar 2014 16:34:27 -0800 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, 5 Mar 2014 15:52:58 -0800 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, 5 Mar 2014 15:52:59 -0800 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 95CACEAD4B; Wed, 5 Mar 2014 15:52:58 -0800 (PST) From: Al Cooper To: , CC: Al Cooper Subject: [PATCH V3 3/7] mmc: lock: Add function to unlock a password locked card Date: Wed, 5 Mar 2014 18:44:48 -0500 Message-ID: <1394063092-9048-4-git-send-email-alcooperx@gmail.com> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1394063092-9048-1-git-send-email-alcooperx@gmail.com> References: <1394063092-9048-1-git-send-email-alcooperx@gmail.com> 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=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,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 This function will try to get a password for the card and use the password to unlock it. It will leave the card state flag set appropriately. Signed-off-by: Al Cooper --- drivers/mmc/core/core.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 8fc8c11..978e4e5 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2793,6 +2793,27 @@ static inline void mmc_unregister_key_type(void) unregister_key_type(&key_type_mmc); } +int mmc_unlock_card(struct mmc_card *card) +{ + int stat; + struct mmc_password password; + + mmc_card_set_locked(card); + stat = mmc_get_password(card, &password); + if (stat) { + pr_warn("%s: Cannot find matching key\n", + mmc_hostname(card->host)); + return stat; + } + stat = mmc_lock_unlock(card, &password, MMC_LOCK_MODE_UNLOCK); + if (stat) + pr_warn("%s: Password failed to unlock card\n", + mmc_hostname(card->host)); + else + mmc_card_clear_locked(card); + return stat; +} + #else /* CONFIG_MMC_LOCK */ int mmc_get_password(struct mmc_card *card, struct mmc_password *password) @@ -2809,6 +2830,11 @@ static inline void mmc_unregister_key_type(void) { } +int mmc_unlock_card(struct mmc_card *card) +{ + return -ENOKEY; +} + #endif /* CONFIG_MMC_LOCK */ static int __init mmc_init(void)