From patchwork Fri Nov 10 13:58:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 118531 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp2229712edl; Fri, 10 Nov 2017 05:59:09 -0800 (PST) X-Google-Smtp-Source: AGs4zMZNeKuE6uQYDsReEJAbcrQDmRjGRat4AXN4UvUYxehDWYw+yFz2pYHz0NYCBkSF2EQjXtXI X-Received: by 10.101.81.135 with SMTP id h7mr407977pgq.417.1510322349769; Fri, 10 Nov 2017 05:59:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510322349; cv=none; d=google.com; s=arc-20160816; b=mGfT5VLjcTcQX9Tp52jQlASMp+e9Irm4GwY+weUmr9Wsu4FdEVLSvMxlkZ03sEFaUS 3xYagFScKZ+3bMkspA/oaUtZZW+oUgXExvgdoNmAoWKYJNgavNEWmvIZ4B+SDyBJRRWL Eu1voFGP1kQeGAXL3lvRYWyf6Udlt35fG5D1U6o8vHyDRalU0byBf9YrprEKbwd4yXTz d13tHDGmG0vUBgHPp2l9fh69dY73TRlQOyJKufpuq0SjTCwxfH+jczKpri0fK0rMGfcd KnW9lYr3o0lCWyl7lFG0wOgf8lAJN78NjYjP0fBIY3Acxtm6W+LZ8VKw+RPEBUW31ikU 7fFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=DbPtUfsFbAvq0cBHh5bhbbXEL1bd2kXFf5QuxCeKZxU=; b=TF6dfSDCbJcLb84sBjitVEDih6LVUWJCkpWXWdvrqYCPrn61DodXKEgbUyTWHs0BuV k9G8AnrQjIBKNYIHxq8QZqAGtYkVpC51wQybYcOtX3Ap7Mh7wB/0b71jfqjHEXplP2cJ jH3NdHWFuKni/A00PVfwit81IAQnHqZpUJ3Kjp+p/x8HSVZn78heiesi3uHANuqtAf2S wGFNrcsomfKT/YraPgG5r9m61nqvpg4398u/CMFiVbd7q6YMIMirJeAT3Is34VZIuszK FS9DQc1WNslg3PhkRMRz3fBxMI3/8x6mquB0/T6UHdeNa9nN+fkpCZN5Bl8QDmTyst/B tMzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=brheBqW6; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id d6si8597344plo.114.2017.11.10.05.59.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 05:59:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=brheBqW6; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3E3A42035521E; Fri, 10 Nov 2017 05:55:06 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::243; helo=mail-wm0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 08C0F21B00DC3 for ; Fri, 10 Nov 2017 05:55:04 -0800 (PST) Received: by mail-wm0-x243.google.com with SMTP id r68so2940858wmr.3 for ; Fri, 10 Nov 2017 05:59:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CRDSNfbHgLHrN3USvzxUVAp9Fzy1NxuK2E9jNhS1gB8=; b=brheBqW6Pgc0z21DOVQzOZ5AQO+i/sKAbjowq/hvcOd1oSgOxWAZTMxu+KQsaWatSC thCX09kJV7VpuFT+X1A9fmdk93ZUfOgIrTnWDgSbRbNn3iCtTZe+wXXIlQ31/JFJtR1Y MMs858ha5IaeMN/wGQDYS8k0raI/OHYFbDRJI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CRDSNfbHgLHrN3USvzxUVAp9Fzy1NxuK2E9jNhS1gB8=; b=JzAyjbhrOJebJU+rH9ra4rux0MhGUfvljmxNsFIUECpigEEy2zN284YL63+VMucyiC XwGws0+w57I9z1LOuw5iO0DRjRBkaZeMzqHyeu1BG5ykJfgxYjOQWvqDYa7JdYXWXE12 M+HiPLJMMRXT08+lwOjgLeGPheG4+SORd/YAo/2edj9lZz04xWUcJVJQt2kBdRk74MwL mpC+TQpKUA51LuRhOreMmdPXwRIKgxewPAv28QKxQdWXunlVgzcAYOMDnAI77nvJQiA5 3waHdLBzRfGrnyQjueOP0iMAanKMqHy/ahE7gaqACkQP0sYR8hju/UPvUZcyGtALna1k PXug== X-Gm-Message-State: AJaThX7rdsPzPdFrIDR51kJkIJIMZoZ4W982ZsaxaaPMkHdb5Qx5u9g4 Hj3LZNGwaFS2E9T38TajFEqLhn21I0o= X-Received: by 10.28.111.76 with SMTP id k73mr330770wmc.110.1510322345362; Fri, 10 Nov 2017 05:59:05 -0800 (PST) Received: from localhost.localdomain ([160.167.170.128]) by smtp.gmail.com with ESMTPSA id d125sm769726wmd.2.2017.11.10.05.59.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 05:59:04 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, michael.d.kinney@intel.com Date: Fri, 10 Nov 2017 13:58:46 +0000 Message-Id: <20171110135847.361-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171110135847.361-1-ard.biesheuvel@linaro.org> References: <20171110135847.361-1-ard.biesheuvel@linaro.org> Subject: [edk2] [RFC PATCH 1/2] MdeModulePkg: introduce SD/MMC override protocol X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: feng.tian@intel.com, Ard Biesheuvel , star.zeng@intel.com, liming.gao@intel.com, eric.dong@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Many ARM based SoCs have integrated SDHCI controllers, and often, these implementations deviate in subtle ways from the pertinent specifications. On the one hand, these deviations are quite easy to work around, but on the other hand, having a collection of SoC specific workarounds in the generic driver stack is undesirable. So let's introduce an optional SD/MMC override protocol that we can invoke at the appropriate moments in the device initialization. That way, the workaround itself remains platform specific, but we can still use the generic driver stack on such platforms. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Include/Protocol/SdMmcOverride.h | 95 ++++++++++++++++++++ MdeModulePkg/MdeModulePkg.dec | 3 + 2 files changed, 98 insertions(+) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h new file mode 100644 index 000000000000..95fc48bb8dee --- /dev/null +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h @@ -0,0 +1,95 @@ +/** @file + Protocol to describe overrides required to support non-standard SDHCI + implementations + + Copyright (c) 2017, Linaro, Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __SD_MMC_OVERRIDE_H__ +#define __SD_MMC_OVERRIDE_H__ + +#define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \ + { 0xeaf9e3c1, 0xc9cd, 0x46db, { 0xa5, 0xe5, 0x5a, 0x12, 0x4c, 0x83, 0x23, 0x23 } } + +#define EDKII_SD_MMC_OVERRIDE_PROTOCOL_VERSION 0x1 + +typedef struct _SD_MMC_OVERRIDE SD_MMC_OVERRIDE; + +typedef enum { + SD_MMC_OVERRIDE_RESET_PRE_HOOK, + SD_MMC_OVERRIDE_RESET_POST_HOOK, + SD_MMC_OVERRIDE_INIT_HOST_PRE_HOOK, + SD_MMC_OVERRIDE_INIT_HOST_POST_HOOK, +} SD_MMC_OVERRIDE_HOOK; + +/** + + Override function for SDHCI capability bits + + @param[in] ControllerHandle The EFI_HANDLE of the controller. + @param[in] Slot The 0 based slot index. + @param[in,out] SdMmcHcSlotCapability The SDHCI capability structure. + + @retval EFI_SUCCESS The override function completed successfully. + @retval EFI_NOT_FOUND The specified controller or slot does not exist. + @retval EFI_INVALID_PARAMETER SdMmcHcSlotCapability is NULL + +**/ +typedef +EFI_STATUS +(EFIAPI * SD_MMC_OVERRIDE_CAPABILITY) ( + IN EFI_HANDLE ControllerHandle, + IN UINT8 Slot, + IN OUT VOID *SdMmcHcSlotCapability + ); + +/** + + Override function for SDHCI controller operations + + @param[in] ControllerHandle The EFI_HANDLE of the controller. + @param[in] Slot The 0 based slot index. + @param[in,out] HookType The type of operation and whether the + hook is invoked right before (pre) or + right after (post) + + @retval EFI_SUCCESS The override function completed successfully. + @retval EFI_NOT_FOUND The specified controller or slot does not exist. + @retval EFI_INVALID_PARAMETER HookType is invalid + +**/ +typedef +EFI_STATUS +(EFIAPI * SD_MMC_OVERRIDE_INVOKE_HOOK) ( + IN EFI_HANDLE ControllerHandle, + IN UINT8 Slot, + IN SD_MMC_OVERRIDE_HOOK HookType + ); + +struct _SD_MMC_OVERRIDE { + // + // Protocol version of this implementation + // + UINTN Version; + // + // Callback to override SD/MMC host controller capability bits + // + SD_MMC_OVERRIDE_CAPABILITY OverrideCapability; + // + // Callback to invoke SD/MMC override hooks + // + SD_MMC_OVERRIDE_INVOKE_HOOK InvokeHook; +}; + +extern EFI_GUID gEdkiiSdMmcOverrideProtocolGuid; + +#endif diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 92ee02708013..d14326199591 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -559,6 +559,9 @@ [Protocols] ## Include/Protocol/SmmEndofS3Resume.h gEdkiiSmmEndOfS3ResumeProtocolGuid = { 0x96f5296d, 0x05f7, 0x4f3c, {0x84, 0x67, 0xe4, 0x56, 0x89, 0x0e, 0x0c, 0xb5 } } + ## Include/Protocol/SdMmcOverride.h + gEdkiiSdMmcOverrideProtocolGuid = { 0xeaf9e3c1, 0xc9cd, 0x46db, { 0xa5, 0xe5, 0x5a, 0x12, 0x4c, 0x83, 0x23, 0x23 } } + # # [Error.gEfiMdeModulePkgTokenSpaceGuid] # 0x80000001 | Invalid value provided. From patchwork Fri Nov 10 13:58:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 118532 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp2229746edl; Fri, 10 Nov 2017 05:59:12 -0800 (PST) X-Google-Smtp-Source: AGs4zMYdEAakLfv1hKEnlzGEDkRtyZpOqpSpOsF50UBeSU10QVmYKw49xAIrlW6a88kMGW+WMMDq X-Received: by 10.84.128.227 with SMTP id a90mr473532pla.224.1510322351915; Fri, 10 Nov 2017 05:59:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510322351; cv=none; d=google.com; s=arc-20160816; b=rRYr1Z6LmG/k+ay1iM9tyb1ZxhPXH1DWk7l5t5BVPX4yLm7Cz2YGz1W9uKxm57AreF dvday1eNEMlnlBQo+1+BA2MAQ49UmSEEaveUauL7u7zMGZE2+xYGAyo3apR5oZKF4NmO PicXOWMh1KaWWay1/+yp4Aj/eVlJ7g0DpwdyhxwFub4UjOW8AJqsTDsHtbbM7V++TiyB 7uMVBhYZ6FwUYjVpftNJMKg3Z+Uh1vbYEJcLfMowJ8H4Gf4z102y8GXPyPe87YbDwoYT jOjM1F9NpzdAGdivTnMWosE+uJqxJWnXJbPW87g9R7n6srDEpu/7nrzhLauCib3coszX V4yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=yq8hyPJe/bB+KGM9CLF4Aqlly7IUc1eRuFdEl9AWA5E=; b=sReBokOH4/qeovrGDhIfSe8BoV24+w3AQMK7a2+kuHHtEY5mv4SG71dpGPl4CnAu32 6jtx56t5L4tJQ8JQ9/CiCV9bdMQdJgpHG1IsmuZfFZqW/K/H9mubplW336foe2B7byu/ tV1x5xkGmDIA+yx3zHislaDRZUW6oMIv7jlmou0Kuvc2skyl34GBinsLUY3NY5ZLvqB2 iaAyvr0fARkd47TzH6Gdb0lUr4UWZ2jV4R66oddYyMYqCY8IQ0VfKS2MNgQwIraaTaF5 v9gvNXRz/zVFb9GxbI3KG6h3d5rXQjI0KrW6FeLOjttGY6qjzZyd1O5IlHsNyyOktiC5 0ABQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ia7tvzpP; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id j61si8983629plb.272.2017.11.10.05.59.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 05:59:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ia7tvzpP; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 74CD02035521F; Fri, 10 Nov 2017 05:55:08 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9D21621B00DC5 for ; Fri, 10 Nov 2017 05:55:06 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id g141so2914526wmg.2 for ; Fri, 10 Nov 2017 05:59:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ODvyVYqEoni6KNczEty9ken5ASiYEGjLYWxBlPw8cKM=; b=ia7tvzpPllFeGHpoSoJ+mkqUkp3vqVQMVaaRkRDOda0Op+rIi9Ps6ZDZ4Xjed3/14Z UrCDiD3KSbVWRbWT9w+59c+Jz/ShWClxfFBEkFR+nZ2FlycYNJ9Ru+oqfTczxO6HjiPS bhcT67EMZ0JQaOhQDqQjZTQoNw5YVYZyCYQhA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ODvyVYqEoni6KNczEty9ken5ASiYEGjLYWxBlPw8cKM=; b=rhCaULn32CPNUCgvqFlP5xrblG+qe4Va70CQOK6GOzvA7sFIp4WP+jDH4fHU19Lohk /qVdHINOC3eXV+PIADQtukz6WJsXhLwJ3zSolJ7iwWwdS+I4paMdpALC2QafWra7Jfnd 5pr4k3Eq9h0Heo+VJv1mGho0dUloDMMrlg3F89rN47JBxbBrShJ5fIQ/0dbOl4nY1/zr hmn8LP4BBecQNmYbg98Z+mrNjsAHJkFMv3OA8L+qjm0GZcjq+NYVWcDAGd7yn+w+QaEx ZUgBi12NFMmDAXbS7vd9fRAVnNCtGVEXOgY80lJtDN7vig21gURT9H1jOPS/nmXuyVtn Ex+A== X-Gm-Message-State: AJaThX6v4IkXwUyuuyeY9KJb6cWM/tuZldXK1yEKSQDlRsIK3E90wqjX QXgHSDsjAMJSKWMdVBjcGzofHabM4vE= X-Received: by 10.28.58.81 with SMTP id h78mr347913wma.10.1510322347932; Fri, 10 Nov 2017 05:59:07 -0800 (PST) Received: from localhost.localdomain ([160.167.170.128]) by smtp.gmail.com with ESMTPSA id d125sm769726wmd.2.2017.11.10.05.59.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2017 05:59:07 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, michael.d.kinney@intel.com Date: Fri, 10 Nov 2017 13:58:47 +0000 Message-Id: <20171110135847.361-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171110135847.361-1-ard.biesheuvel@linaro.org> References: <20171110135847.361-1-ard.biesheuvel@linaro.org> Subject: [edk2] [RFC PATCH 2/2] MdeModulePkg/SdMmcPciHcDxe: allow HC capabilities to be overridden X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: feng.tian@intel.com, Ard Biesheuvel , star.zeng@intel.com, liming.gao@intel.com, eric.dong@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Invoke the newly introduced SD/MMC override protocol to override the capabilities register after reading it from the device registers, and to call the pre/post host init and reset hooks at the appropriate times. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c | 111 +++++++++++++++++++- MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h | 6 ++ MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf | 2 + 3 files changed, 114 insertions(+), 5 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c index 0be8828abfcc..d328e9f867c4 100644 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c @@ -60,7 +60,8 @@ SD_MMC_HC_PRIVATE_DATA gSdMmcPciHcTemplate = { { // MaxCurrent 0, }, - 0 // ControllerVersion + 0, // ControllerVersion + NULL // Override }; SD_DEVICE_PATH mSdDpTemplate = { @@ -213,6 +214,88 @@ Done: return; } +STATIC +EFI_STATUS +SdMmcPciHcResetHost ( + IN SD_MMC_HC_PRIVATE_DATA *Private, + IN UINT8 Slot + ) +{ + EFI_STATUS Status; + + if (Private->Override != NULL && + Private->Override->InvokeHook != NULL) { + Status = Private->Override->InvokeHook ( + Private->ControllerHandle, + Slot, + SD_MMC_OVERRIDE_RESET_PRE_HOOK); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_WARN, "%a: SD/MMC pre reset hook failed - %r\n", + __FUNCTION__, Status)); + return Status; + } + } + + Status = SdMmcHcReset (Private->PciIo, Slot); + if (EFI_ERROR (Status)) { + return Status; + } + + if (Private->Override != NULL && + Private->Override->InvokeHook != NULL) { + Status = Private->Override->InvokeHook ( + Private->ControllerHandle, + Slot, + SD_MMC_OVERRIDE_RESET_POST_HOOK); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_WARN, "%a: SD/MMC post reset hook failed - %r\n", + __FUNCTION__, Status)); + } + } + return Status; +} + +STATIC +EFI_STATUS +SdMmcPciHcInitHost ( + IN SD_MMC_HC_PRIVATE_DATA *Private, + IN UINT8 Slot + ) +{ + EFI_STATUS Status; + + if (Private->Override != NULL && + Private->Override->InvokeHook != NULL) { + Status = Private->Override->InvokeHook ( + Private->ControllerHandle, + Slot, + SD_MMC_OVERRIDE_INIT_HOST_PRE_HOOK); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_WARN, "%a: SD/MMC pre init hook failed - %r\n", + __FUNCTION__, Status)); + return Status; + } + } + + Status = SdMmcHcInitHost (Private->PciIo, Slot, Private->Capability[Slot]); + if (EFI_ERROR (Status)) { + return Status; + } + + if (Private->Override != NULL && + Private->Override->InvokeHook != NULL) { + Status = Private->Override->InvokeHook ( + Private->ControllerHandle, + Slot, + SD_MMC_OVERRIDE_INIT_HOST_POST_HOOK); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_WARN, "%a: SD/MMC post init hook failed - %r\n", + __FUNCTION__, Status)); + } + } + return Status; +} + /** Sd removable device enumeration callback function when the timer event is signaled. @@ -281,14 +364,14 @@ SdMmcPciHcEnumerateDevice ( // // Reset the specified slot of the SD/MMC Pci Host Controller // - Status = SdMmcHcReset (Private->PciIo, Slot); + Status = SdMmcPciHcResetHost (Private, Slot); if (EFI_ERROR (Status)) { continue; } // // Reinitialize slot and restart identification process for the new attached device // - Status = SdMmcHcInitHost (Private->PciIo, Slot, Private->Capability[Slot]); + Status = SdMmcPciHcInitHost (Private, Slot); if (EFI_ERROR (Status)) { continue; } @@ -601,6 +684,12 @@ SdMmcPciHcDriverBindingStart ( goto Done; } + Status = gBS->HandleProtocol (Controller, &gEdkiiSdMmcOverrideProtocolGuid, + (VOID **)&Private->Override); + if (!EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "%a: using SD/MMC override protocol\n", __FUNCTION__)); + } + Support64BitDma = TRUE; for (Slot = FirstBar; Slot < (FirstBar + SlotNum); Slot++) { Private->Slot[Slot].Enable = TRUE; @@ -609,6 +698,18 @@ SdMmcPciHcDriverBindingStart ( if (EFI_ERROR (Status)) { continue; } + if (Private->Override != NULL && + Private->Override->OverrideCapability != NULL) { + Status = Private->Override->OverrideCapability ( + Controller, + Slot, + &Private->Capability[Slot]); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_WARN, "%a: Failed to override capability - %r\n", + __FUNCTION__, Status)); + continue; + } + } DumpCapabilityReg (Slot, &Private->Capability[Slot]); Support64BitDma &= Private->Capability[Slot].SysBus64; @@ -627,7 +728,7 @@ SdMmcPciHcDriverBindingStart ( // // Reset the specified slot of the SD/MMC Pci Host Controller // - Status = SdMmcHcReset (PciIo, Slot); + Status = SdMmcPciHcResetHost (Private, Slot); if (EFI_ERROR (Status)) { continue; } @@ -642,7 +743,7 @@ SdMmcPciHcDriverBindingStart ( continue; } - Status = SdMmcHcInitHost (PciIo, Slot, Private->Capability[Slot]); + Status = SdMmcPciHcInitHost (Private, Slot); if (EFI_ERROR (Status)) { continue; } diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h index 6a2a27969936..b51e0529f885 100644 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h @@ -35,6 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include +#include #include #include "SdMmcPciHci.h" @@ -115,6 +116,11 @@ typedef struct { UINT64 MaxCurrent[SD_MMC_HC_MAX_SLOT]; UINT32 ControllerVersion; + + // + // Optional protocol to deal with non-standard SDHCI implementations + // + SD_MMC_OVERRIDE *Override; } SD_MMC_HC_PRIVATE_DATA; #define SD_MMC_HC_TRB_SIG SIGNATURE_32 ('T', 'R', 'B', 'T') diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf index e26e6a098c17..154ce45d8223 100644 --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf @@ -48,6 +48,7 @@ [Sources] [Packages] MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec [LibraryClasses] DevicePathLib @@ -61,6 +62,7 @@ [LibraryClasses] DebugLib [Protocols] + gEdkiiSdMmcOverrideProtocolGuid ## SOMETIMES_CONSUMES gEfiDevicePathProtocolGuid ## TO_START gEfiPciIoProtocolGuid ## TO_START gEfiSdMmcPassThruProtocolGuid ## BY_START