From patchwork Mon Mar 12 08:16:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 131368 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp456370ljb; Mon, 12 Mar 2018 01:16:56 -0700 (PDT) X-Google-Smtp-Source: AG47ELvKarlkzrQO/8XB8McE46fc1gixqj+hTOrE7b/a0yyuRLNbE6N1qjgUO/OBIwwMwc6UapCb X-Received: by 10.98.65.72 with SMTP id o69mr7111658pfa.97.1520842616029; Mon, 12 Mar 2018 01:16:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520842616; cv=none; d=google.com; s=arc-20160816; b=zorSWOqDRphS9djFD1+jTB1fHVtJFLTR+9qqIZ4FCF3dExE6JnbnE+ryyYUeqQnOxJ Y7/44sZzZBjSjIFsusF7GRHTfpd2ogHRgSKHAdpe0FiPo06e4ctq0y4ge24OfibZ27O5 XacnaR37uASvUAh7yFODYqhY+gJylEg5pxRr7eJ+YNApL2F811Qpd1dO6jjXg781VoEh 0n6V6F4AqUnRRnIf9HHX7L7/8+OwWNazG6jBXgDObyLOFRi1H3FSK/YS4dVat2f6nGCp sdXGp6Hmu34lXdKBeDEzEOpKDV45mFKBcVZnXxoS8B3NuvFGxVEtGQ19XhIOx64+OpUl LeqA== 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=5Fplo8ktY+fXjLAhxXTkJHwdh15uaGPKHiL+LhZJmzk=; b=nNG5oQt+h6Dl/56IKGpaR3k7JN7Lrbso71ccDhcyFPwVG3Dc7oMeawgCDSalnCnc/5 y8dRn+vAfQYimWJdroLJQBVJ6MLougF2kO2IpxwpfqI2oWaf5SDC6oaYd+f+tS4ByAsV DJP35w69jPQ3y+ijGwpETdmfA/o2fZqHgnoZL6RKYL+jz0fqYniFQY2onfTQZPqoP2XS 781hk6fv23uIZTx8HX09aDjImkIarfqmViuzRhkSNIV8kGrN4f7rwgiaudB2wj0hIW0I OTMTYjyx5DEk8Ovq82XjswnLychzNVwax/bG6O665QhulDlR+PtdVpXp3v0QeKb8UXU0 8JOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eXlO0qWI; 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 f9-v6si5708473pli.445.2018.03.12.01.16.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Mar 2018 01:16:56 -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=eXlO0qWI; 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 0501122603B07; Mon, 12 Mar 2018 01:10:35 -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=heyi.guo@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 47711223DB100 for ; Mon, 12 Mar 2018 01:10:34 -0700 (PDT) Received: by mail-pl0-x242.google.com with SMTP id 61-v6so8915671plf.3 for ; Mon, 12 Mar 2018 01:16:54 -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=Sb6P1Gi031jyLtilPjVSVctdhCNfte1EYLGSRBhLJcw=; b=eXlO0qWIFcYShtwxEoXbffEKPIy9Vl2iMoNUBMbNlmgBk44mTBWAsoGUPDEMFdh5z3 e95GnkrwDMPYA7tbrAT0AN/XdwmpgSius16aRbWKvZuPZNMljj9x7kFHhetO8wsRI0uA oy2yZaPEwazv+PnWJ63Kr70kbe9ykYEy0PTtE= 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=Sb6P1Gi031jyLtilPjVSVctdhCNfte1EYLGSRBhLJcw=; b=OIixiIMk61414MtKvet2rS3jg15J/A+2mcPKNJTOesh0bCHAWzL4Z8yhfzl9CHFUkY yz9+lrCTxnvKhjXZv3nyCrj73bJRiROiJOXnbqUvRbNWZMZqjeP8fupEKez5QACQOC8M 00U8YWpnq2aK0ZdCvD6LEClSgtMBXKqp9f5UsfMSTpgcIDcHIuT7AeRl5AJPJQFf1M5H EWVDjpvDGt58e5TvsX8STAVk2vpNPHxYo1IK8CHJMO7qpVX40sSU2F1ccejLDTF7m/T9 xA+Pzjt1eBK/fGJ+js7YkZGl8uBnyiYrSts1iv4RLxjDCVq7ojUi+tGy7z7w/yPqn9Mx QwJA== X-Gm-Message-State: AElRT7F+K8PQxS6eFvBcjs3FMe9/vWf/hzceZd6YbZG4COQ8QrN9e9bj f/xwNuneheNVM4eNm19uV7Ny21YUrVg= X-Received: by 2002:a17:902:4103:: with SMTP id e3-v6mr7356811pld.172.1520842614290; Mon, 12 Mar 2018 01:16:54 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.76]) by smtp.gmail.com with ESMTPSA id q81sm16560512pfl.188.2018.03.12.01.16.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 01:16:53 -0700 (PDT) From: Heyi Guo To: edk2-devel@lists.01.org Date: Mon, 12 Mar 2018 16:16:16 +0800 Message-Id: <1520842578-95453-2-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520842578-95453-1-git-send-email-heyi.guo@linaro.org> References: <1520842578-95453-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [edk2-platforms PATCH v2 1/3] Hisilicon/D0x: Set ACPI GTDT always-on flag X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heyi Guo , Leif Lindholm , Jason Zhang , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Jason Zhang Timer is always working on Hisilicon D0x, even system enters WFI/WFE, and there is no other low power status, so we set "always-on" flag in ACPI GTDT. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jason Zhang Signed-off-by: Heyi Guo Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Graeme Gregory --- Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc | 3 ++- Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc index 4c1050ae83b9..3feb99e88c88 100644 --- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc +++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Gtdt.aslc @@ -40,8 +40,9 @@ #define GTDT_TIMER_LEVEL_TRIGGERED 0 #define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY #define GTDT_TIMER_ACTIVE_HIGH 0 +#define GTDT_TIMER_ALWAYS_ON_CAPABILITY EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY -#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) +#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ALWAYS_ON_CAPABILITY | GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) #pragma pack (1) diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc index 16e2c6a972ba..2a9d209c00f0 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc @@ -28,7 +28,7 @@ #define GTDT_TIMER_ACTIVE_HIGH 0 #define GTDT_TIMER_ALWAYS_ON_CAPABILITY EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY -#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) +#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ALWAYS_ON_CAPABILITY | GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) #pragma pack (1) From patchwork Mon Mar 12 08:16:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 131369 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp456533ljb; Mon, 12 Mar 2018 01:17:10 -0700 (PDT) X-Google-Smtp-Source: AG47ELu/fEo6OqJmwD6SfSiChqoUVKOMpSzgVucgo8S25FojE43usQLMZpQOHB6L/zlukiTs/q4l X-Received: by 2002:a17:902:6ecd:: with SMTP id l13-v6mr7283918pln.374.1520842630487; Mon, 12 Mar 2018 01:17:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520842630; cv=none; d=google.com; s=arc-20160816; b=jz1A3E5pow8aPzCHTNF9GR50mnVxXWXjMeI1r1TLIGaVRXOYrwcG0HyeQVl6XXHnT7 AD94RA0H4R00RJXUh5QNHCSbhXWtTHUq6brtI5VHrm4DbHkBjTPyH3XePh+q/GZGJ61M VqCI6qqznDGDJECVZykNyng+EB2lWYbzKibKwrsP69fydrQyG1FrtEeTJUpr3/U/nYMw LKDF0/ry6x10X2OUkzjRSlSWwFffTOu7zZTzwTNFpA0n+WSPHtO6DDaM9pbp4R83OdUK QDxXzWRwV+s2NiYQ/j3WnjuC8YlycswX6ECXEUI1/xhgwpKvFfOo2Mv74+ggozP10QNW B0YQ== 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=3MnI+wEXHXilJWVImVbkUzbp37NxH0K+3LvaomwsYnA=; b=qFJfhYelmNCPC+twSQfvChWBmFV7WMr8OU0cXtayAWtKGH8Z1hxDU56Vgb06v3iHR8 F8M2sUI90atwhpO3ErCapgnNmwHf8DT1xQBRwe2ILYZImop7hPy411xvaNVRYXimqmbM vDA7vqoEkYFHIP2QcpfuInKFZgvKU7Z/79hggdNnhAs7o0AodzhO6qaui5E7kR32uxV1 mN+9SBsmBCX8+D2bkzPPhb3NBdJZRJ7M0pIE9DpWSoS5/ELEBrZ3OgEGKDa519U618do 6kXinnNzCcI0xC1wrSryx9NwNaiU8bcdj40tYlWKDekQCsokHeUV9qTWfUYzHsfJYvpd U9wQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DW/6udmd; 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 t74si5408880pfk.160.2018.03.12.01.17.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Mar 2018 01:17:10 -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=DW/6udmd; 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 739FF22603B01; Mon, 12 Mar 2018 01:10:49 -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:c00::244; helo=mail-pf0-x244.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) (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 877DA223DB100 for ; Mon, 12 Mar 2018 01:10:47 -0700 (PDT) Received: by mail-pf0-x244.google.com with SMTP id j2so4021903pff.10 for ; Mon, 12 Mar 2018 01:17:08 -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=s2ygcDtyjRulqW3GZCvVM3WJgh9okvTFb4aJuQZhkR8=; b=DW/6udmd4RCkM60Q3zCLlDDhpv+UPK1rh+6O38EV3tbZ6DTt6MKEoxFlV+FHiIGrHd KYmDMDjdiVevXgdvVlrV5BbY0Z6h7/f4sl8KaWdmJF42tuMmK6HVlvzqlPPXJ05ozcSh 4BZHPtzxxsx3mAqxtACIpTLlMD8tJq7TBaRYI= 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=s2ygcDtyjRulqW3GZCvVM3WJgh9okvTFb4aJuQZhkR8=; b=fJ7NJnwQEBMGRtEujb/1FSs96fLcPso2WYwIdAj5ZbNNxHK4eIT03ns3wy91aLPcNX S28Mvw/WicdpBicx9YVAMFk0u4/mi+dVmMA+opRliUS+inIPhrDZ/gLyliNPrGe3bKRT SNI3TqVWPWt/XofIFmnpCRk7pnhhurkYinFoAJHM/6DvpikhtPk5JKCot1ZIh1A1ETVC sDOZixNoHJzUketZgdnlGjxKRe+6FPsAbkaLQxl/THLan3aPpS9kShhV5f5dQRU4v6YE CmZQMmcxYsGEVctgtQWIHf6PruYs7CvVKtErtiAcecn6/h1AVl/KI6BBqPoGPR+WFoED FuiQ== X-Gm-Message-State: AElRT7G9yi4WYgHS5RRAHcVA1yimd0KA8lu0p3bxc8vfm/f6C/tX8Q5f hiw3+xOsVBrC9DTuJIm3sgJFAe+ULY8= X-Received: by 10.99.121.5 with SMTP id u5mr5923413pgc.444.1520842627642; Mon, 12 Mar 2018 01:17:07 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.76]) by smtp.gmail.com with ESMTPSA id q81sm16560512pfl.188.2018.03.12.01.17.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 01:17:07 -0700 (PDT) From: Heyi Guo To: edk2-devel@lists.01.org Date: Mon, 12 Mar 2018 16:16:17 +0800 Message-Id: <1520842578-95453-3-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520842578-95453-1-git-send-email-heyi.guo@linaro.org> References: <1520842578-95453-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [edk2-platforms PATCH v2 2/3] Hisilicon: disable GICv3 legacy mode X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Haojian Zhuang , Heyi Guo , Leif Lindholm , gongchengya , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: gongchengya Hi1616 GIC does not fully support GICv2 legacy mode, and SBSA watchdog interrupts 400 and 496 cannot be signaled to CPU, so we switch to pure GICv3 mode. For other Hisilicon platforms, we suppose they don't need V2 legacy mode either if they have GICv3. D03 also works for this patch. If the platforms only have GICv2, this change will have no impact on them. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: gongchengya Signed-off-by: Heyi Guo Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Haojian Zhuang --- Silicon/Hisilicon/Hisilicon.dsc.inc | 2 +- 1 file changed, 1 insertion(+), 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/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc index b196322a20e2..f8d5f0b270b3 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -249,7 +249,7 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE - gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|TRUE + gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy|FALSE [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|44 From patchwork Mon Mar 12 08:16:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 131370 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp456604ljb; Mon, 12 Mar 2018 01:17:18 -0700 (PDT) X-Google-Smtp-Source: AG47ELuWFX33Eawrjvl3PcjWW6UB5u1fl8gt4qA0fwgM4EiLbxb+qqy5kgSlO0tBIPKuCyX/JIgJ X-Received: by 2002:a17:902:8484:: with SMTP id c4-v6mr7244751plo.271.1520842637882; Mon, 12 Mar 2018 01:17:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520842637; cv=none; d=google.com; s=arc-20160816; b=lfXhjWoutpVQcAzIoPbyhz4eHj2+ZU/3sVS6OQkFRFMyMQWdGzTinae9GoYMnsYy4B agwJDLwZm80dc4bn8YnJyiSxRmzKs9SiR8da/lQY3+BMoZe2DbJaaH8gl+q5cPM0nWn7 +ruwhjH/reOSteOfRWHfRUbNTm6q//O3WP7Ssjygeu5zesBbqkQS2Xhy3jv5eWYa/vrE KiKKs5i46rliKM+6CwZ1wGdrThLNyyKzFAJoVqN9jgquYNuLn5/2kdU8KOF/lbuwEzkF mgO9v0Tk0rBH7T8yDxILjKznI8iqlEfRWdHNYJ+2kcWAopDvgNnFkK30WH8aY2WzLDai 9fJA== 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=vH8Hz19t7nFYZldb6cSe9MRTiZjOwdrNe83/Q+NHu0c=; b=EZdetMzKp5ZdF1gGu+L2kxTzsgbD6hXfCTp8thS+BQjEa8b2TFZlGnQQnSbtOpv/MM YoaGx8plF5TdHv2iuymBqN3gQ3sCodAsNI7v1fxCA+VWCG0xFC1gqgOBU/LWe72HkvIw ksBZIUDu7QvdlrU/utUadXMA7LzDH1wDEQ8csI65bwSXLWs6ByGNPjsBxPcrrcBTvUtg WkVetAXjf5jCbfoRh6+BJKSLelqGEIapnp/Dj/2nYdA52BeppaNY8vhtjOr6ClngdN/F k4dYn74/X7IbOL0gBRg6iy7dBG0FW1dDFL7UyN3kax5VOuJ3la2TPMmoJXNF0Jt4xypS tj6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bQ9K242B; 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 e127si1667938pgc.170.2018.03.12.01.17.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Mar 2018 01:17:17 -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=bQ9K242B; 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 D59B622631464; Mon, 12 Mar 2018 01:10:56 -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=heyi.guo@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 11248223DB100 for ; Mon, 12 Mar 2018 01:10:55 -0700 (PDT) Received: by mail-pl0-x243.google.com with SMTP id 61-v6so8916035plf.3 for ; Mon, 12 Mar 2018 01:17:15 -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=4Uys4lrtLy0k1BUWH/73abDysI7SHOky+Q2GcpQ2Hu0=; b=bQ9K242BI+CrarZNMU+uXQvFWdm2VbMNqBbiGq+JjTXmn5/eSeMlcedVYKNVMp+fl2 8O27OaOURkvcam7+TXJy5nRfp7O8L9WUEmVYR7/bqsP23E8B4QpnRZVHHQupOIGCjSLc gix2goU0HOgMzpK5qdczk57miVcqokzDPvBJM= 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=4Uys4lrtLy0k1BUWH/73abDysI7SHOky+Q2GcpQ2Hu0=; b=aV4iybHLpZKQ/S3wayWkrO3600YYNhBsq8C+U8vNPiD9X4TnToEDAeR6MnOfk8JMpa VErf3YjM/ppU7nOrGduRrNmpo8R4FKzWLR0YWv1sdjUnbEkWAwC9cHU+ZWAU11wYS1zQ zohtLxSN7aLB4Qy/Rc01WRV7p+h+IHB18nmxHxS8rQpWByHAy8sIz8vOgYGnccS/GaPu 40FvOo5/jL3JHZyL591MuNlMJdXgvIVlEApYUJbyQG58jMLv+A5XlBEoO2fhUkZFNCJk RoQIT7aDu/GC95x33BarLIiOjFYOYQI1diHY3qsHRvccABpeYbphugvbsc9GQTj+S8xF k1Ew== X-Gm-Message-State: AElRT7HYzb+q2lC2QKMWYFBETKnwaVI9reZERTXla+ncZ69eat2tgpQA 2yxLwWzSotv/im9aFbRxWoWR95t1WN4= X-Received: by 2002:a17:902:9a08:: with SMTP id v8-v6mr7360933plp.252.1520842635216; Mon, 12 Mar 2018 01:17:15 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.76]) by smtp.gmail.com with ESMTPSA id q81sm16560512pfl.188.2018.03.12.01.17.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Mar 2018 01:17:14 -0700 (PDT) From: Heyi Guo To: edk2-devel@lists.01.org Date: Mon, 12 Mar 2018 16:16:18 +0800 Message-Id: <1520842578-95453-4-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520842578-95453-1-git-send-email-heyi.guo@linaro.org> References: <1520842578-95453-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [edk2-platforms PATCH v2 3/3] Hisilicon/D05: Support SBSA watchdog X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heyi Guo , Chenhui Sun , Leif Lindholm , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Chenhui Sun Add description of SBSA watchdogs to ACPI GTDT on D05. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Chenhui Sun Signed-off-by: Heyi Guo Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Graeme Gregory --- Notes: v2: - Use local defines instead of PCD+define for watchdog base address [Ard] Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc | 25 ++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) -- 2.7.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc index 2a9d209c00f0..9f27696cf022 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc @@ -30,6 +30,14 @@ #define GTDT_GTIMER_FLAGS (GTDT_TIMER_ALWAYS_ON_CAPABILITY | GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) +// Generic watchdog address for SCCL (Super CPU cluster) A and SCCL B on Hi1616. +// Watchdogs on socket 1 are not mapped to SPI interrupts so we can't describe +// them in GTDT. +#define GENERIC_WATCHDOG_CONTROL_BASE_SCCL_A 0x40500000 +#define GENERIC_WATCHDOG_REFRESH_BASE_SCCL_A 0x40600000 +#define GENERIC_WATCHDOG_CONTROL_BASE_SCCL_B 0x60500000 +#define GENERIC_WATCHDOG_REFRESH_BASE_SCCL_B 0x60600000 + #pragma pack (1) typedef struct { @@ -57,22 +65,15 @@ EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags 0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress -#ifdef notyet - PV660_WATCHDOG_COUNT, // UINT32 PlatformTimerCount + HI1616_WATCHDOG_COUNT, // UINT32 PlatformTimerCount sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32 PlatfromTimerOffset }, { - EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( - //FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 93, 0), - 0, 0, 0, 0), - EFI_ACPI_6_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( - //FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 94, EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER) - 0, 0, 0, 0) + EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( + GENERIC_WATCHDOG_REFRESH_BASE_SCCL_A, GENERIC_WATCHDOG_CONTROL_BASE_SCCL_A, 400, 0), + EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( + GENERIC_WATCHDOG_REFRESH_BASE_SCCL_B, GENERIC_WATCHDOG_CONTROL_BASE_SCCL_B, 496, 0) } -#else /* !notyet */ - 0, 0 - } -#endif }; //