From patchwork Wed May 23 15:14:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 136676 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1023815lji; Wed, 23 May 2018 08:15:30 -0700 (PDT) X-Google-Smtp-Source: AB8JxZom2bc4B7a6Y3qDgKZVGtlboJPnCQ/YcN5WNNizcsmwXVbBYfACjgcLiaCckQ8TG2MWUU2H X-Received: by 2002:a17:902:8d81:: with SMTP id v1-v6mr3316753plo.136.1527088530539; Wed, 23 May 2018 08:15:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527088530; cv=none; d=google.com; s=arc-20160816; b=StsOGt3f50ZMyHJWfFGZDbhIv4PwA172n04qm5OBXkG+bmbxrzx6sXrkhqUTQJQUGU pKhfyvT9CSJffsyutJMVzNnzhNFk2/IoWSyMUssO5z/NgQ0rfCDsV2y6CYSQ7+cOxF6v st/eAoqdni21VNOo9or2mTo7yhsB8lCfzQ4HB014Fwsi8kaDPhxBKIJVcG6kU8DVBxgN B4iqq5G+SXehs9NUMdTr/g+fnT/f5IqAmzB9nnTb85Cy2xKw2OpeSv6z9Lc3lEmbkGIB zbVGOUXtX0Q9peWtnui5syZebMcbL1LGntNtJtA9/x2cQF4o+0ghZD3o4Rh9Tl7ttK16 ZyMg== 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=zjMeG2bF6qpAbahqslcEevDn9btNohEATggiRtIq7Mc=; b=IxN6hhs50RwnkAxvRzQSBA5WUUjfi/GtZVcn+Mk2vZOK/r8hmZiCsEyaBpN4ddcJ5S qF7yuyJOIcvWy6ZklofUpGjBL9NUb+irCvu2yuzHGA8S88KXncVheDSxl90BU3HsxRqd IEI1jBJQEuIHJzdI9Gbk6v3CJjLuaKAHbzUp5/GlUy+Gss7Ki8EubrrNAV0yHUEBSzRK Q/5+uLZ0qmWl1+FnLvLc/GQu6DheesEy7RaxdMXQOO4wHHWVTV+m+icInhLH4Cm16gOw pAsKpseULFW9vxSiM+aSiEpWc5uPXV33YCuYFiVaxGC+gzcpe0TyhMSgJkL80bLYGYAH JTew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RoyBUd21; 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 y8-v6si14815498pgp.527.2018.05.23.08.15.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 08:15:30 -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=RoyBUd21; 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 2471D207E4E19; Wed, 23 May 2018 08:15:28 -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::242; helo=mail-pl0-x242.google.com; envelope-from=haojian.zhuang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) (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 1350A21BADAB2 for ; Wed, 23 May 2018 08:15:27 -0700 (PDT) Received: by mail-pl0-x242.google.com with SMTP id c41-v6so13209230plj.10 for ; Wed, 23 May 2018 08:15:27 -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=AA5C7tr5aGnWTvtVEUml9wqWmOP/fZNqVecTfznqckw=; b=RoyBUd21MqsZlOeJ4Kr13sY2Keb9qixbN20688geXZeLyJSM6E0HUj8+/IPLmwzMiJ 8j57SzF/A+q5RTiVSHF95EXRZ5zbQjycmb6RQv3gkMc7mgIIQPn+LeXmBOUy3V+XG4Zg kbrxFr3Sj46eJBw99cAB8kfU4fMWEIwKSaq3k= 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=AA5C7tr5aGnWTvtVEUml9wqWmOP/fZNqVecTfznqckw=; b=iGVDQbtVsFyj+Y3l3C3Ymdijg4gACnBWjcvBCHcdZPgQafOw2BMCV1x+9PuzMeJTKV M4WnJSxMjULPnu2j0JGtJtnqUK2tZOD8oHOVsvlRhSGtD48ivsSNl4mzq7lssg2zf+WN jpf3ZJizrXUfqOQbKfPaFZeXnKIjoXhusIFNjh8i+2oPd82lZ1umyH/dvteNrAGi6KtO tQ0xMpjT2Xaro5kY8LdcsINUmFyZuLcLDncNpzeoncB5DyDVcr/FPGlASOSnrYYFiJUF evhcUMuLBdg9DajJdP5LJZ7YtGvLMaxTxHTBN1fNXixAP1oti5DjP8a5blFPimu69pM+ 6B4g== X-Gm-Message-State: ALKqPwckR98dLc+7qnFrPDsxuhDibPsE+LDLphvFlzB6OUalw85otJ4W /3dZQfwUGQiFf5sZdzhYf4cNRm4Pevk= X-Received: by 2002:a17:902:d882:: with SMTP id b2-v6mr3273503plz.220.1527088526492; Wed, 23 May 2018 08:15:26 -0700 (PDT) Received: from localhost.localdomain ([64.64.108.17]) by smtp.gmail.com with ESMTPSA id s16-v6sm30466511pfm.114.2018.05.23.08.15.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 May 2018 08:15:25 -0700 (PDT) From: Haojian Zhuang To: edk2-devel@lists.01.org Date: Wed, 23 May 2018 23:14:57 +0800 Message-Id: <1527088497-495-7-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527088497-495-1-git-send-email-haojian.zhuang@linaro.org> References: <1527088497-495-1-git-send-email-haojian.zhuang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v5 6/6] Platform/HiKey: 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 HiKey platform. It detects the pattern in memory and GPIO pin setting, and simulates them into virtual key. Cc: Leif Lindholm Cc: Ard Biesheuvel Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Haojian Zhuang --- Platform/Hisilicon/HiKey/HiKey.dsc | 5 ++ Platform/Hisilicon/HiKey/HiKey.fdf | 5 ++ Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 93 ++++++++++++++++++++++++++ Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h | 5 ++ Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 5 ++ 5 files changed, 113 insertions(+) -- 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/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/HiKey.dsc index 5cc4ff27f01b..83dd68a820b1 100644 --- a/Platform/Hisilicon/HiKey/HiKey.dsc +++ b/Platform/Hisilicon/HiKey/HiKey.dsc @@ -192,6 +192,11 @@ [Components.common] Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf + # + # Virtual Keyboard + # + EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf + Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf # diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/HiKey.fdf index 39020d27dbcd..2bca7232b6e5 100644 --- a/Platform/Hisilicon/HiKey/HiKey.fdf +++ b/Platform/Hisilicon/HiKey/HiKey.fdf @@ -123,6 +123,11 @@ [FV.FvMain] INF Platform/Hisilicon/HiKey/HiKeyGpioDxe/HiKeyGpioDxe.inf INF ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf + # + # Virtual Keyboard + # + INF EmbeddedPkg/Drivers/VirtualKeyboardDxe/VirtualKeyboardDxe.inf + INF Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf # diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c index b812f8bd483d..afd2f050896a 100644 --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c @@ -43,6 +43,8 @@ UartInit ( MmioWrite32 (PMUSSI_ONOFF8_REG, Val); } +STATIC EMBEDDED_GPIO *mGpio; + STATIC VOID MtcmosInit ( @@ -87,6 +89,90 @@ HiKeyInitPeripherals ( 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; + } + Status = mGpio->Set (mGpio, DETECT_J15_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_J15_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 HiKeyEntryPoint ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable @@ -98,5 +184,12 @@ HiKeyEntryPoint ( if (EFI_ERROR (Status)) { return Status; } + + Status = gBS->InstallProtocolInterface ( + &ImageHandle, + &gPlatformVirtualKeyboardProtocolGuid, + EFI_NATIVE_INTERFACE, + &mVirtualKeyboard + ); return Status; } diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h index 07f9ae6a949a..3d608183fa58 100644 --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.h @@ -15,10 +15,15 @@ #ifndef __HIKEYDXE_H__ #define __HIKEYDXE_H__ +#include #include #include +#include #include +#include +#include + #include #include diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf index 34734391b45a..41aa7f8081ed 100644 --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf @@ -28,11 +28,16 @@ [Packages] MdePkg/MdePkg.dec [LibraryClasses] + CacheMaintenanceLib DebugLib IoLib UefiLib UefiDriverEntryPoint +[Protocols] + gEmbeddedGpioProtocolGuid + gPlatformVirtualKeyboardProtocolGuid + [Guids] gEfiEndOfDxeEventGroupGuid