From patchwork Thu May 19 04:03:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Wang X-Patchwork-Id: 1633165 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=microsoft.com header.i=@microsoft.com header.a=rsa-sha256 header.s=selector2 header.b=Zj3GKmBd; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L3ntG1J6Gz9tky for ; Thu, 19 May 2022 21:38:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3791F83C1B; Thu, 19 May 2022 13:38:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=microsoft.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=microsoft.com header.i=@microsoft.com header.b="Zj3GKmBd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 237E683937; Thu, 19 May 2022 06:03:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2070a.outbound.protection.outlook.com [IPv6:2a01:111:f400:feab::70a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1D36B820B7 for ; Thu, 19 May 2022 06:03:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=microsoft.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=wangjudy@microsoft.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eEa51dOYsorWK4Mp1FBRu7Kl7qJXYVnCujFozvZ0FFYT1Yx49Eckbmu2yfol7bYaAsCiPo1NKykvVPM127sOUz3QXuTX4DTFcT9rpKhZOi+Bq08DoRylTEVtoay7oqb+buYWLPZleeTdwrSLhb3S8HGdBy6skG7hXvygJI4BT1apmeSmPLj8o7wxwrug6ZpzUwAguvV3mPYfMoBKdiR8m+itBPCt2WH4QhYCGwNhlB1lJBUFjrN2KwwsPk1ABwmWa1t9an/BprAzCrn8NcaEDAiTJbAbl4yvXKbSHnoehmBW+fcikmxn/vtzPgaHs7U+KdALtBm+i7ZOLX9ZXbCVQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6C68LDMKBd2pRg7k8H34nRim3bZExKn9DE6m8tVDQJw=; b=KOLb5qpUktqjQpQzXhVGFmZSq18C3dClQ4WZ0E0OZnLiOIV5MP36ko9g2FPetsuYtB0IfyWVrJ/etkgrtXpaK4u026hWPmyI2gzHyxZVF6kt2K/Vy3zc5WM/F9Q7hb/JKOSJjQoh28ZFGvhsEvmYnPd0XBYuz1WYjlDcLiFbfV4VzUT+PH/fwbW8hy0skGX6xtOjA5fmD6Fzho017vCHEsZ0MNKsOJ3lahok6mUPq+VVRzdAktMknDHDugNqNUjuquhI9ngaAqjhJyzwXKeBv33sqP+l1oNEoTlDKU2+zxECpPZEQ0ddrNZtQzWAH6SpE2TG2GrO3DwxgdmWK5jPAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6C68LDMKBd2pRg7k8H34nRim3bZExKn9DE6m8tVDQJw=; b=Zj3GKmBdzYUevFHQekS2A0WqrTCGrXKspCJaHaGEkhlo2E6pEQ0Ga8brpxXWVKiWDIyw5ZKLGAGUc+cArWlBMZ+TPdned8g32EHjgCxzCG8RzSkXWOOZ2iaOwD2Q4mNbxozg7GVRXfVGah7NSLy5cWQGXt14fO0/A+RfZhZYTFM= Received: from HK0P153MB0244.APCP153.PROD.OUTLOOK.COM (2603:1096:203:ae::11) by SI2P153MB0656.APCP153.PROD.OUTLOOK.COM (2603:1096:4:1fb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.2; Thu, 19 May 2022 04:03:34 +0000 Received: from HK0P153MB0244.APCP153.PROD.OUTLOOK.COM ([fe80::38b0:55b4:d78d:7268]) by HK0P153MB0244.APCP153.PROD.OUTLOOK.COM ([fe80::38b0:55b4:d78d:7268%7]) with mapi id 15.20.5293.007; Thu, 19 May 2022 04:03:34 +0000 From: Judy Wang To: "u-boot@lists.denx.de" Subject: [PATCH] drivers:optee:rpmb: initialize drivers of mmc devices in UCLASS_BLK for rpmb access Thread-Topic: [PATCH] drivers:optee:rpmb: initialize drivers of mmc devices in UCLASS_BLK for rpmb access Thread-Index: AdhrNMqSIHocrnakQbakQNJTYOUOrw== Date: Thu, 19 May 2022 04:03:33 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=f7db7e9c-89a6-40a9-a898-c7f7e76b1389; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2022-05-19T02:42:21Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5c3c6fc0-999f-45d6-0cba-08da394c8b07 x-ms-traffictypediagnostic: SI2P153MB0656:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3zuQ4jCd5sfszb8nv/bC2niL9CzHHDZUE58DHCYPrIDwR17R4kbAAZtUtpRXvPa/8Z+1J/dd3KssyAOlDlMCqFv8hKsvOyZeM0f5+d6AqbfEk7lkIyb6TUx+JaeShPP05nPBPMqkS5+gcDSABe5uFWETzIOFsRPqVthTsWsMRAUDY6QONLbOGDsMo2FUm/kkMiIBWEE7LJmXiskm8fX/lRaxvdK0aaELsefV3W7n7mHXqpcX0SsIjhL8Q7Vzo0eq5cPSPJdWN7foP+qxOH+WCuWAn1/oEV14jCH9Idi4bR4cXQhjo1B+UfU16q4nZCASeVL6a5J6lD1O3th8THmlYn6QxVLqY+K4n/s6SvfiujqxzZK92MIw7X1S7CB6jG3ZvuPN5xghrCL9260T7CJp8dCyWVX8DLthAz/xk+KUvjObCUB/Pq05njEqBmiEWM5sanr4M+ycvtxiP4VAGYfXCga/xyxt28QnL0y6hLy8VdodAdGYsRzwjBKnnYu/stwt7NyQRyRTqAZH0fkxrcnw5h/301ouyVluxxKfYjiRfhA31ly5imVadwl1IGkQGrEHdC32UxuVLzekOnqr9T40G6Jr5C3v6wLBzO+O4/ch29SDlr4HRXZL1Gmpzx1FRvIItdoOtG7lItS3wYp4fxDrFjEKKznuj+PdbMvlxB6GCXuBARhfgv7an+VPw1iUoJihqKhht9gF33C6w/lRTdiVVBfBYurC/uWq/VEBayBMl3LNMnxNDYfZmzsaeU8JcHpd x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:HK0P153MB0244.APCP153.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(451199009)(38070700005)(8990500004)(52536014)(38100700002)(2906002)(8936002)(5660300002)(122000001)(82960400001)(82950400001)(86362001)(6506007)(316002)(55016003)(6916009)(508600001)(10290500003)(33656002)(7696005)(83380400001)(66946007)(53546011)(71200400001)(76116006)(66556008)(66476007)(66446008)(8676002)(64756008)(186003)(9686003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: vkSrMqWvmzAMHwg8lQimIcquVb3ROE9D27bcIazODYNgjkjJt2RJPj6Y3sHyFXJ1Ax8XJsTOPDy0EYKBVEQzNANf6T5nSSoBFX1+kzPDJf/injNSyecTK4+Gf+aGEVXc7pA4U1NjC/yc5/ZOrXHk111JfchuZrbfpOOfRWSnTeIQOCnDQY3VHBjrABeDgATJ72uCucPN///oOMKDVJqsYwVaVOZsWKLfBumuRI/K8f0e6oJNMoEf/r03Mn7DLnh+zX8AErcfQh96f1laQf7XSvmRpM5Ur3Y4Fbb2f3V8ItCx18u/IzfAr+Efv4WFnannW/0ePAEoiHWUB6cRYKhrIhETV/E0itSj6twvG6154iF4ngx2ESZtn6pBbE4qXmrG6psgE5/CgUUc4Pbyg76fOFaC4nzf1/x0hSZ0PF0Mkv10+RMmDKbwzuiGAAR01NFgCanUcXUPygxc1z1fZ1fsidRhhRThfVnDc66PbKAMXGo0oPpda2OwUdR4b11QNSZWDbqYQZipHWa+fdRzIihsKtfiOJeXXGcBBouz1mP30cDreiep3cU6yjl9qSO6owxArD2AlPYX7YAZJ1tyQQJPBYdkLZ3GNS9ARcxXnm59bFFY5e3KoCADN9D+BeVuFYaU9RchKicG4zQTewm+sZ0YZqTrwuoMy5f1cc+sjzUE9hwVc2OQPJjwvvR8vhD0Td+BX6oW1Cr4InNCurRrOI6XPUdmeS3IcvvpfzFt6na4i9zuyL8OX1HWQuO8TV7EHIatIC25h5lG6gyf6WJTwe8Jep9PQ9+/LnEr0e7bJydnRmYS0tUHPgP0fJJ7krE1At5yhrp0DFYR3ox2Z5noDiCdRD2LNOOnKmShjyJx7sOkNcTRtyPw0hvAa/PTT/2nae0DteMNq2YzK0P161qqbMBSdH9QSMwOmtatInlBJadNblIv/l92cYLG0KOq3yEzSJjWVO68a5BmcUmfcCxSq0rrXNTZZke0wmBUMAD725+/b1O3BZ4ept6laeSXpYTRx4YrIIAz04C/qcmkRSfbX5oy7fxpnpnLVk8qy95jCxxE8YhlWAWGD7kiWKV4mkkmSXm1lZA07G5L5QcPnNXd2w2xqXEDKGpzG14FwhMDu7JnPcTV1m+FkhW5cZK7JtCyUfND8Hw2pUsPDi78Z2zf/OB2UL+aInaOHWr3j6YDU9fkncQ0kO2lgSviCVhwswcHm9adDgNaqzUwypj6uVWFBH2dEniGq8Mx0UxpZP6yiKTC4K6u9CvISS7ufA2+YBwexlmw0dHO0cRW3HT0I6VVdn3b9A+VQDG1gAZkUJz1pSP5mxeaaG9so+MW2QejNuME4ccuP594Fx5gSzS1CdEq+AiO87NlNpBvF6mEibukA1iXE4PetUee5DJsvvXwF3ugxcUoKrqGyFqSgatZKoZZg+DmPiAyYbQcGtr8z7ODEaMQEGvw3q7IV7SzlUo9upj5H3OPaqf6nRNSPdd41nuoPhKV8TG/O3wx/j+9RP1KU2wyOK8wM8pfx/SZaPkMLhf4+gqcqM9X0Z6gJCCzC9mmpP0CIy/ExMctucsm3etQEVoqRUZSg9f4eyu5PuSHLJM1/XFz/hscSnXxP3vidpQsD1dq1DEX2TH5shj0OV65zVvHr+mqDMhIykDI9Zr7VD40yFA5i7Fh9lD6YkPmr/tYR79+/fyySyAj7mgvSn2wJd40MEigaJlfSy+UUFuWd4bolZMGeN7l7cpm5/erDnycF6YX9g== MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: HK0P153MB0244.APCP153.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 5c3c6fc0-999f-45d6-0cba-08da394c8b07 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 May 2022 04:03:33.8670 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: l/efUAgPOnzUXsHA6ZEQCqs9eKe5+HfoEfysK1Ui4CHvrowe6VRVVJJP9eZ0QtQnrn0jG4r1mTn5y81B0AzvrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2P153MB0656 X-Mailman-Approved-At: Thu, 19 May 2022 13:38:22 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From bc1eae1b8883dca98c2874efca1d3e492db20cf3 Mon Sep 17 00:00:00 2001 From: judyw Date: Tue, 3 May 2022 14:04:40 +0800 Subject: [PATCH] drivers:optee:rpmb: initialize drivers of mmc devices in UCLASS_BLK for rpmb access CONFIG_MMC only initializes drivers for devices in UCLASS_MMC, we need to initialize drivers for devices of type IF_TYPE_MMC in UCLASS_BLK as well because they are the child devices of devices in UCLASS_MMC. This is required for feature RPMB since it will access eMMC in optee-os. Signed-off-by: judyw --- drivers/tee/optee/rpmb.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c index 0804fc963c..cf5e0a08e6 100644 --- a/drivers/tee/optee/rpmb.c +++ b/drivers/tee/optee/rpmb.c @@ -72,6 +72,10 @@ static struct mmc *get_mmc(struct optee_private *priv, int dev_id) debug("Cannot find RPMB device\n"); return NULL; } + if (mmc_init(mmc)) { + log(LOGC_BOARD, LOGL_ERR, "%s:MMC device %d init failed\n", __func__, dev_id); + return NULL; + } if (!(mmc->version & MMC_VERSION_MMC)) { debug("Device id %d is not an eMMC device\n", dev_id); return NULL; @@ -104,6 +108,11 @@ static u32 rpmb_get_dev_info(u16 dev_id, struct rpmb_dev_info *info) if (!mmc) return TEE_ERROR_ITEM_NOT_FOUND; + if (mmc_init(mmc)) { + log(LOGC_BOARD, LOGL_ERR, "%s:MMC device %d init failed\n", __func__, dev_id); + return TEE_ERROR_NOT_SUPPORTED; + } + if (!mmc->ext_csd) return TEE_ERROR_GENERIC;