From patchwork Fri Jun 5 17:42:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cooper X-Patchwork-Id: 6557091 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 411DB9F3D1 for ; Fri, 5 Jun 2015 18:01:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CDD9204D8 for ; Fri, 5 Jun 2015 18:01:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6FD4F20490 for ; Fri, 5 Jun 2015 18:01:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752494AbbFESBZ (ORCPT ); Fri, 5 Jun 2015 14:01:25 -0400 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:26579 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751968AbbFESBY (ORCPT ); Fri, 5 Jun 2015 14:01:24 -0400 X-IronPort-AV: E=Sophos;i="5.13,560,1427785200"; d="scan'208";a="66549356" Received: from irvexchcas07.broadcom.com (HELO IRVEXCHCAS07.corp.ad.broadcom.com) ([10.9.208.55]) by mail-gw3-out.broadcom.com with ESMTP; 05 Jun 2015 11:12:45 -0700 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS07.corp.ad.broadcom.com (10.9.208.55) with Microsoft SMTP Server (TLS) id 14.3.235.1; Fri, 5 Jun 2015 11:01:21 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.3.235.1; Fri, 5 Jun 2015 11:01:21 -0700 Received: from stbsrv-and-3.and.broadcom.com (unknown [10.28.16.21]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 473BA42F65; Fri, 5 Jun 2015 10:41:39 -0700 (PDT) From: Al Cooper To: , , CC: Al Cooper Subject: [PATCH V3 3/8] mmc: lock: Add function to unlock a password locked card Date: Fri, 5 Jun 2015 13:42:22 -0400 Message-ID: <1433526147-25941-4-git-send-email-alcooperx@gmail.com> X-Mailer: git-send-email 1.8.4.474.g128a96c In-Reply-To: <1433526147-25941-1-git-send-email-alcooperx@gmail.com> References: <1433526147-25941-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,T_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 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 4b0d26e..61f1f78 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2777,6 +2777,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) @@ -2793,6 +2814,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)