From patchwork Thu May 31 03:10:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 137316 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp6067763lji; Wed, 30 May 2018 20:10:44 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKsKCVxR4rO/27XvT0phjnKmpUG5yYEf74YzHeBrRwnU9aqZ0P7ghpgEdRWp6aRw7wSeb7K X-Received: by 2002:a63:7a49:: with SMTP id j9-v6mr4110026pgn.353.1527736244596; Wed, 30 May 2018 20:10:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527736244; cv=none; d=google.com; s=arc-20160816; b=wQqh6+2z/vF08PWs3n+QcO44cfWI6RUO7QlmXxxdkCJZwpos50JAzpvdKQ49dLymO8 LWu+ZWaerTvqTy7ws9F4gJKoaeeCXfD15QMKblnqwl6dUG9gBigX+IZWsWmj4Ue9Sz1K P1TCizEFuPiEs2/yr/h337vV/Lh0KM13Pq5ShO6JMBQ+TByT9RWCLZvJosBNzST3V8Hq RgKjpPMBwvcXHXPKeV15D5eowgOzt2LBBldQ6y5c99JpZBECsgw+bKb/9OxIBPOo1MF7 S2qyp3LE5JeAIjh//2IKdMYv5nlgrRWHK0UAG1xuvzzxmMfyUoR2+hR9AaYCcc48tfvJ XP6w== 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=nbAKPf5AG4SPvGjlcFFOepKpv0xjg+cOmok7AW6kOcI=; b=PB8QCwtAowzmZ2hCrR0o4GKCggLWLAnXvkY7U5NmJb7oAjK2Ojo8AEZgN4ewHUAT5g l9faCNoc6K7aRaWBBHdlHPUaxOIWqpxOwWEhrZaPTTQlC9lSvoxlrFIS5Kdrak/5rKVN XtVCmZ81yEiOsDRptaAAmJEfQlmvMSYpkydS2bbA5L1SLic998BiWyVKzWUetOwwDTqf Pge3xdkkG+a+L0dEv0VKZAc0VxLdfwZrHfUbqmOArassWfscFxlFDMHISr44+MpUy+cX gA8JosgjoDSZD9Z1bCcQx9/Zc5V6MAxf2jUDrNI81eXY/Lm9+nLx5aZlg14hNMvUBnBl mtvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GFLDTY/P; 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 a6-v6si13543935pgd.579.2018.05.30.20.10.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 May 2018 20:10:44 -0700 (PDT) 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=GFLDTY/P; 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 980D2209859B5; Wed, 30 May 2018 20:10:40 -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 659D82098C20D for ; Wed, 30 May 2018 20:10:39 -0700 (PDT) Received: by mail-pl0-x243.google.com with SMTP id c41-v6so12294886plj.10 for ; Wed, 30 May 2018 20:10:39 -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=g0BLZj9RLJ2WCXwS+YhJcktPYZ40k7D5I0i5K8ImEdM=; b=GFLDTY/PTVuVd/Kuxz2eQ0zNm6iDpsxi4/bqMbC2BevdICX4t/R7ZCQRuT9p4juBA3 E1qsm7By65A1TBI3JaGAAztiA0WK0MM64L5MOpD0xLuP94Iwd0jfjW2lYdL1q8w2UdcU 8L7lqcWYR+SGBkjWwwGuhkNRd4Scsfsa80fwg= 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=g0BLZj9RLJ2WCXwS+YhJcktPYZ40k7D5I0i5K8ImEdM=; b=iqh2Rr21y0N2PvlFOFUbo2shukwqPd407jEeNDf4RQiFzQbtzA6yue/aqrFldUYnwk K6XHSgS7qrGlsTHV0+mkvbnpMUIjjsu6tSqNtky/fAKPpKB7kL33I3tEBBNGcfFjVe/w 9a74egTkXgPS5XOhwOlq8u7LAqfOu+Ea0ZTxJee33IhwwwzHcQspkZyFGXSeHu40l9tS L2TspiHrKX/Z/lmK4SjPgpBfZvT9oRpZCkWqvP8/GvVTfE2r35k7MxCSKnw4dKgusjBO NZb/oie6AZcAZQffIbVv6JUs9S0l0xf7foyG8kBEKFFR2VXHRDbh+E2BHmbimK3puMLg nLNw== X-Gm-Message-State: ALKqPwe+aT8fyzdXo8lgQMw1t8akeRjWRWNyZ7tBmWSGqVTAzVXmh46C EH2oPMq2yrOMOureXi/ZdyyOklnmdYw= X-Received: by 2002:a17:902:b417:: with SMTP id x23-v6mr5367815plr.388.1527736238846; Wed, 30 May 2018 20:10:38 -0700 (PDT) Received: from localhost.localdomain ([64.64.108.182]) by smtp.gmail.com with ESMTPSA id q75-v6sm77114646pfj.94.2018.05.30.20.10.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 May 2018 20:10:37 -0700 (PDT) From: Haojian Zhuang To: edk2-devel@lists.01.org Date: Thu, 31 May 2018 11:10:10 +0800 Message-Id: <1527736210-17133-7-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527736210-17133-1-git-send-email-haojian.zhuang@linaro.org> References: <1527736210-17133-1-git-send-email-haojian.zhuang@linaro.org> Subject: [edk2] [PATCH v7 edk-platforms 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 Reviewed-by: Leif Lindholm --- Platform/Hisilicon/HiKey/HiKey.dsc | 5 + Platform/Hisilicon/HiKey/HiKey.fdf | 5 + Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.inf | 5 + Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c | 98 ++++++++++++++++++++ 4 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.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 diff --git a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c index 8c752e06499c..832615f9cc80 100644 --- a/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c +++ b/Platform/Hisilicon/HiKey/HiKeyDxe/HiKeyDxe.c @@ -12,10 +12,15 @@ * **/ +#include #include #include +#include #include +#include +#include + #include #include @@ -50,6 +55,8 @@ UartInit ( MmioWrite32 (PMUSSI_ONOFF8_REG, Val); } +STATIC EMBEDDED_GPIO *mGpio; + STATIC VOID MtcmosInit ( @@ -94,6 +101,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 @@ -105,5 +196,12 @@ HiKeyEntryPoint ( if (EFI_ERROR (Status)) { return Status; } + + Status = gBS->InstallProtocolInterface ( + &ImageHandle, + &gPlatformVirtualKeyboardProtocolGuid, + EFI_NATIVE_INTERFACE, + &mVirtualKeyboard + ); return Status; }