From patchwork Wed May 9 09:54:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 135241 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5427046lji; Wed, 9 May 2018 02:55:20 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrvSBQwv0tyjQARzMm7cj1SJK74oPuokJfEwnIvwmGP7p0pnaoUYvUQJSnl9gfNu2cZntw3 X-Received: by 2002:a17:902:bc88:: with SMTP id bb8-v6mr34287419plb.175.1525859720303; Wed, 09 May 2018 02:55:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525859720; cv=none; d=google.com; s=arc-20160816; b=LfEHJY9hN8uIyLMgWIHncL62oB1LjWPDgGq3zLKSxR7ChhLFmAiWc+1HdEBguJlCom sfPA/89349ZJSVafxttuSjaupNXsOBgHyxHJsJbiPXtb00d0FPRBTZRtKibUjPlxr7PA CxwERfJA5zRGZuWD9BYMrzBO8kQ+Snl7kYuIhaixnRjCxuTVpKm+2Emtyr1jlrM+vt8x mUtn9uPi6FRAvYPazQK6TkZXNrD4XnOPVuNh6QVXDrOTgw0e7ZRDFk+mfGfMirFb+hW7 Jxy9pxKhkmSbSXsBfxiCzd/zvPk8VH0QVFO3Yf/fuN/YGz24x9B4c4EQyInZPF6EBcQv 187g== 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=RqKEwD+XoXqAf3cL9gs5+9bm4EankhFTdzGoEKeKa48=; b=enprBs9u7jwWJ5CjCRLdmXVP8D2SLJyERcdgjthV8K2KPX3CuqRY4CuBtC5QS6eSSV ugX/IGdjVBNd6da0v1f+bHekOCq0h3TQGPza0FcILhrIVZsL1IRWeV5S2H+XvycTdel7 ThiFMEjG54/6f0aHbx6crWEfuwjNBwodW6LNXRb975D7uiExyHFbJ0cFtlct5uyJECg0 LUfk2eacVmpYFg1pwOeENTGbIpW2XgU7bbOw4wXc8lDMqw9ku3SwtohzBZNSE93RAvtm BV605qUV4Z6Qt7QSBleLYE+FbrBWYeV5ssIeILLdzEbz/8KHIcCKHS7whBdPoJPiYyww YpPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=btxIepYG; 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 a33-v6si1281969pli.275.2018.05.09.02.55.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 02:55:20 -0700 (PDT) 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=btxIepYG; 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 E967320945D88; Wed, 9 May 2018 02:55:19 -0700 (PDT) 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=2607:f8b0:400e:c01::243; helo=mail-pl0-x243.google.com; envelope-from=haojian.zhuang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x243.google.com (mail-pl0-x243.google.com [IPv6:2607:f8b0:400e:c01::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 75EFC203B85B8 for ; Wed, 9 May 2018 02:55:18 -0700 (PDT) Received: by mail-pl0-x243.google.com with SMTP id ay10-v6so3991174plb.1 for ; Wed, 09 May 2018 02:55:18 -0700 (PDT) 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=cVEForyeXwhaz1i1rCngtjikhPFHQpLzJeXOyO+mMaY=; b=btxIepYGKNxxzWmMuP2SLCdUEPMfpOEXpspgKyMA1GyjfLi5HQfPNX3ebv8uDPN0+v LgD22V8qgLKPCGkmsUR/c3WTej81942Koji9cUFkCoDWQLssQn4HZrvP4rN6ZrDfzFgv BiZ80tss/LMx4h0tacAo3hCfRcC2xIVncKVFE= 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=cVEForyeXwhaz1i1rCngtjikhPFHQpLzJeXOyO+mMaY=; b=VBiow+yM4SFL7FAwk/AwQ7fOYAs1y8YBmA4ThRK+GzdVCps4ruUuAY8TAaoe518hkl BMFBGcHPfyCrqiXscHkR3X8cWXlCYTnjRGlZVwGBHw96yAfzTN5w66+tvbR3DYMJAEV2 AQnk33EmBtSQG0deBjNiWncIlI1v6GiUreHLLSBaKxSZoOT334wkvuHgnP4QFSF+Q24H RtZW5Trla+ISeWfdT56ZqlDtG/EHLhjLpHNNOLdSOotNWItfWZGxOKzboeFPw0h5Qa30 VsMKkSY1y2hAq2BEpk604mQfeQhwxVgAFEIyNCjCwIWDQhNrbtOWzUHrgJOa0/AFWu9Q TQjw== X-Gm-Message-State: ALQs6tBTijwfR2/OyUUXuD4Awh7miROhjnfcP1k/8pZN9zftC3Qh6Poj md4JBxx01pg8M8FzodkyIb4ZJdpNGnA= X-Received: by 2002:a17:902:6505:: with SMTP id b5-v6mr44659802plk.147.1525859717599; Wed, 09 May 2018 02:55:17 -0700 (PDT) Received: from localhost.localdomain ([64.64.108.170]) by smtp.gmail.com with ESMTPSA id k1-v6sm17966139pgt.88.2018.05.09.02.55.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 May 2018 02:55:16 -0700 (PDT) From: Haojian Zhuang To: edk2-devel@lists.01.org Date: Wed, 9 May 2018 17:54:56 +0800 Message-Id: <1525859699-16888-4-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525859699-16888-1-git-send-email-haojian.zhuang@linaro.org> References: <1525859699-16888-1-git-send-email-haojian.zhuang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 3/6] Platform/HiKey960: enable virtual keyboard X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Haojian Zhuang , Leif Lindholm , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Enable virtual keyboard on HiKey960 platform. It checks two conditions, such as pattern in memory and GPIO pin setting. Cc: Leif Lindholm Cc: Ard Biesheuvel Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Haojian Zhuang --- Platform/Hisilicon/HiKey960/HiKey960.dsc | 5 ++ Platform/Hisilicon/HiKey960/HiKey960.fdf | 5 ++ .../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c | 98 +++++++++++++++++++++- .../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h | 3 + .../Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf | 1 + 5 files changed, 111 insertions(+), 1 deletion(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/HiKey960/HiKey960.dsc index 6cc1c1edf453..79e68754976d 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc @@ -182,6 +182,11 @@ [Components.common] Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf + # + # Virtual Keyboard + # + EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf + Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf # diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/HiKey960/HiKey960.fdf index b7d70b010598..d65f77878575 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf @@ -123,6 +123,11 @@ [FV.FvMain] INF Platform/Hisilicon/HiKey960/HiKey960GpioDxe/HiKey960GpioDxe.inf INF ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf + # + # Virtual Keyboard + # + INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf + INF Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf # diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c index fc4cc24724e5..400f6d0196eb 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.c @@ -14,7 +14,8 @@ #include "HiKey960Dxe.h" -STATIC UINTN mBoardId; +STATIC UINTN mBoardId; +STATIC EMBEDDED_GPIO *mGpio; STATIC VOID @@ -315,6 +316,94 @@ OnEndOfDxe ( EFI_STATUS EFIAPI +VirtualKeyboardRegister ( + IN VOID + ) +{ + EFI_STATUS Status; + + Status = gBS->LocateProtocol ( + &gEmbeddedGpioProtocolGuid, + NULL, + (VOID **) &mGpio + ); + if (EFI_ERROR (Status)) { + return Status; + } + return EFI_SUCCESS; +} + +EFI_STATUS +EFIAPI +VirtualKeyboardReset ( + IN VOID + ) +{ + EFI_STATUS Status; + + if (mGpio == NULL) { + return EFI_INVALID_PARAMETER; + } + // + // Configure GPIO68 as GPIO function + // + MmioWrite32 (0xe896c108, 0); + Status = mGpio->Set (mGpio, DETECT_SW_FASTBOOT, GPIO_MODE_INPUT); + return Status; +} + +BOOLEAN +EFIAPI +VirtualKeyboardQuery ( + IN VIRTUAL_KBD_KEY *VirtualKey + ) +{ + EFI_STATUS Status; + UINTN Value = 0; + + if ((VirtualKey == NULL) || (mGpio == NULL)) { + return FALSE; + } + if (MmioRead32 (ADB_REBOOT_ADDRESS) == ADB_REBOOT_BOOTLOADER) { + goto Done; + } else { + Status = mGpio->Get (mGpio, DETECT_SW_FASTBOOT, &Value); + if (EFI_ERROR (Status) || (Value != 0)) { + return FALSE; + } + } +Done: + VirtualKey->Signature = VIRTUAL_KEYBOARD_KEY_SIGNATURE; + VirtualKey->Key.ScanCode = SCAN_NULL; + VirtualKey->Key.UnicodeChar = L'f'; + return TRUE; +} + +EFI_STATUS +EFIAPI +VirtualKeyboardClear ( + IN VIRTUAL_KBD_KEY *VirtualKey + ) +{ + if (VirtualKey == NULL) { + return EFI_INVALID_PARAMETER; + } + if (MmioRead32 (ADB_REBOOT_ADDRESS) == ADB_REBOOT_BOOTLOADER) { + MmioWrite32 (ADB_REBOOT_ADDRESS, ADB_REBOOT_NONE); + WriteBackInvalidateDataCacheRange ((VOID *)ADB_REBOOT_ADDRESS, 4); + } + return EFI_SUCCESS; +} + +PLATFORM_VIRTUAL_KBD_PROTOCOL mVirtualKeyboard = { + VirtualKeyboardRegister, + VirtualKeyboardReset, + VirtualKeyboardQuery, + VirtualKeyboardClear +}; + +EFI_STATUS +EFIAPI HiKey960EntryPoint ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable @@ -348,5 +437,12 @@ HiKey960EntryPoint ( if (EFI_ERROR (Status)) { return Status; } + + Status = gBS->InstallProtocolInterface ( + &ImageHandle, + &gPlatformVirtualKeyboardProtocolGuid, + EFI_NATIVE_INTERFACE, + &mVirtualKeyboard + ); return Status; } diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h index 2e89d10e2723..2d5349888ed5 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.h @@ -33,6 +33,9 @@ #include #include +#include +#include + #define ADC_ADCIN0 0 #define ADC_ADCIN1 1 #define ADC_ADCIN2 2 diff --git a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf index a1a7d005ce8b..46a9a5803e3d 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf +++ b/Platform/Hisilicon/HiKey960/HiKey960Dxe/HiKey960Dxe.inf @@ -39,6 +39,7 @@ [LibraryClasses] [Protocols] gEmbeddedGpioProtocolGuid + gPlatformVirtualKeyboardProtocolGuid [Guids] gEfiEndOfDxeEventGroupGuid