From patchwork Wed Mar 7 06:55:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 130849 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp4845002lja; Tue, 6 Mar 2018 22:56:35 -0800 (PST) X-Google-Smtp-Source: AG47ELs5jWkgdqS7tqHVA93jljD8g+f4fJ2ewzWzEQCOZ0YBQW5CjTJQM4t1xidD5aPKY7thB9PI X-Received: by 2002:a17:902:7e0d:: with SMTP id b13-v6mr19179984plm.97.1520405795845; Tue, 06 Mar 2018 22:56:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520405795; cv=none; d=google.com; s=arc-20160816; b=fQx7Ug/8selVTQo1VWc9+92ClFNZNVtumUSr6UYKkcDU7USbvME5JBdlyHFTNFtwTq Z5edbLRWU/+7oTj+Fea2PPnSL472wUTDMSGwAs2yhkI4kZrXEd94n1hBHH8c0nIzM5mH QufgCWtAZjbaao2yMuwvFQn7vQQQdkP577c/M0wb2IAFEyMW+W9gJQ2cOChmj4ec3R3H HFRN9QqwrBrPHCWmiO8zMcCqUKRPgZMJO8layPI68BsIH0ngp4BEb1sAHww2fhIVSwHP lCDDJgKJHjn/CUMckFPYeynv4dksr6aG2iXFLpIgrb7oPVuV5+dpTzag2rckhOT1hNga jjBQ== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=5Fplo8ktY+fXjLAhxXTkJHwdh15uaGPKHiL+LhZJmzk=; b=NzL2HBkWCgPzDSdYMoM3uaTeYE5ghC1dq2JzkYacrmwFfVBqCGBW0WN2ZadJrKUxtj tecUwtxKJjoV6cLY8IzQrvJe6F53HHYjbXT+YK3+TJQ05OtEX+f4Wg0hFb+xlnUqn/sR ztgUxztcsgK9wfreG7Ru06cOxkRnryS0G6Okstm2ReJLDnlnoYcAX1sJMFQgB5vnfbGJ dO5KX8RUgVF18SSTUBHTdRlLZlqKviLHbK+sy5mtkLr8yd04s7O6n3M0zDMpUxweNK+H AdQAIBJRkVH5ldFuopgb1h9Mfu4JDLtlbUh2x/4Kw5OY+FxURWQkl5+vGOANjG61U3ni sTOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=UZzudY4c; 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 q67si13424626pfj.146.2018.03.06.22.56.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 22:56:35 -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=UZzudY4c; 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 7698E224E6938; Tue, 6 Mar 2018 22:50:20 -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=2607:f8b0:400e:c05::242; helo=mail-pg0-x242.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::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 4210222135D46 for ; Tue, 6 Mar 2018 22:50:17 -0800 (PST) Received: by mail-pg0-x242.google.com with SMTP id q27so558079pgn.8 for ; Tue, 06 Mar 2018 22:56:32 -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; bh=Sb6P1Gi031jyLtilPjVSVctdhCNfte1EYLGSRBhLJcw=; b=UZzudY4cmDgNNqRt8z690bOFnVA5kBv6H0i6befX57xJMhvfy5IeB9QlHtgJEDNUVO 9fTzFpHv7ccdXjZKv2PnpE7taWtBuImevpInWXvjdCnZbbj66ZPf9q+PT738GN80PP1q xBmSGMvD3TJwT/bOCxBf60GKpbFI6qJQk8SRM= 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; bh=Sb6P1Gi031jyLtilPjVSVctdhCNfte1EYLGSRBhLJcw=; b=NaoBpOhlEXqYVpvZNvI3TftUei0aRLOrgMKbzim3p9tuq0noYoiFYDkcC7NvWxAtHR zU2w859g4Zo4UV06oLCEtKHXU/MJzmSbgZPHui0Vd8Z08uFci6A96TMdyiLUEnVdVyTS M7wdda375K6UCmUYEihV9M1jwfXtghB/NPQCxj1+WdjX/twPG4Ts5v0UHnPUQFrc9aHQ nK5h/UOj23OAfjX3xuf1sDfl8YS2O7wQa+7JL7E8h0PHKSSdezH4CF7sPBZK0l2dK/n0 p4dXYsMPX65m6L7uEIwvRnS4mPv/lgGcrr5n30tA3xEHkczTxv5MhPpNqpueT0x/X0Tn veww== X-Gm-Message-State: APf1xPApHqtb40w+uEABHGebodtqqx7GTBkgaGK+Lzfu0eX6JfdBozpu 3RMjdzIAOGsN1Jb+TD1XygUGaYEtiOg= X-Received: by 10.98.200.131 with SMTP id i3mr21747361pfk.40.1520405792462; Tue, 06 Mar 2018 22:56:32 -0800 (PST) Received: from localhost.localdomain ([45.56.152.76]) by smtp.gmail.com with ESMTPSA id m18sm28340291pgu.51.2018.03.06.22.56.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 22:56:31 -0800 (PST) From: Heyi Guo To: edk2-devel@lists.01.org Date: Wed, 7 Mar 2018 14:55:45 +0800 Message-Id: <1520405747-11023-1-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.4 Subject: [edk2] [PATCH 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 Wed Mar 7 06:55:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 130850 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp4845045lja; Tue, 6 Mar 2018 22:56:41 -0800 (PST) X-Google-Smtp-Source: AG47ELt+D3qItxgzJm8s39XtmA98bWQRPHMtjP4LAWh3vaivSczk6Wz1Ff4A977YCZaTZp+0wuHM X-Received: by 2002:a17:902:7b92:: with SMTP id w18-v6mr18865451pll.159.1520405801276; Tue, 06 Mar 2018 22:56:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520405801; cv=none; d=google.com; s=arc-20160816; b=zVEf4HUeEra5l0N6NkedH9bGy0W0FcJqjL7tGChSOKU3bZDSrVGKP0hthSK+JsZNh7 d1qTHf83oV7XbY8NklJQ8e1jy0gBLwc4a9X2EQN/vzlD2IHxmaD+Djgv2+A9ZNj694H/ hqWCRAGCoL3vv29Dw0O6ciVZo6B6BRAbnfZoQlnWa/DaAhJIzRPN+vpp6bfUZ2q+NsOJ Fq6b079z+Qrht8v/j10j5M1/XNbVaN16BMPt9T4nax+Shlq+dYdLDFIzZtbzoDej35EK Kwxpgg6KknAoxUHEejIg6MBEkZ9j7TegQ2SAGJoOqeAfDMmioQ+BcuWsFTZX6RE/VARK jTjw== 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=NRUwrQnWDEzOWl77uIyy787PJNKz7f6xnVb1XmnBCLssqbqBPDjZXxywkwrOvl9Ufa Bn8aUCnuJ9RTmT75itcP/kMfvYo+iV0tVbM3Crpvce1FUqbGpry1Udr36WVxShpMORxD B5zM51FTXM4sdRSw8KuWL84XZu8bIF+vYojdh8Y19hb64G/CQzkPMVcUmlDeNOsB8uC4 +rxJRxWo4sgTLtTR7aGa+TydrICZdjTSXFbg212Zu5bBbt7HF9LWYdGyMWS5btsA2sqT oYqW4TBRWMFfhTHmbpCRo4Ooq1xGmZi649c4+9kPXdR2ZugxQFHNzlk6+MchwWkOBjdN z/fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SVrIH6Bt; 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 79si11013904pga.647.2018.03.06.22.56.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 22:56:41 -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=SVrIH6Bt; 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 DC7412228350C; Tue, 6 Mar 2018 22:50:25 -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=2607:f8b0:400e:c01::244; helo=mail-pl0-x244.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x244.google.com (mail-pl0-x244.google.com [IPv6:2607:f8b0:400e:c01::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 0E1BB22135D27 for ; Tue, 6 Mar 2018 22:50:24 -0800 (PST) Received: by mail-pl0-x244.google.com with SMTP id m22-v6so823262pls.5 for ; Tue, 06 Mar 2018 22:56:39 -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=s2ygcDtyjRulqW3GZCvVM3WJgh9okvTFb4aJuQZhkR8=; b=SVrIH6Btnm2fjDt2IA46dKHIXWXmsJSYUUxo/tf5a8+BcOvoG1b4f4TMcNXrQLfKZb 1u3Eayojn0N6tiVSHHoknvHCQcMSM246k1BFhRLxBP6dDPeZpp1RYgMsAgAlpr+BCD7t CDpZbvDb69D8ASBTyZJn3AnYHCVWF52CPZcSc= 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=ackRl27PECI/eTJGTCkJfDqeYTP/F/UOi3DBJVDqbbUwc7kNA7dOasYJTaqKCKtOWU QND6vhcmRDn7MmzsP3QBtapz3LibYkYfd611yBwLR88HP7wMX1cewesl11t/n79KNHKb 4qHt8aLn1z4hy9aiHiazypNZAqhhEzabbm7DfKT40n0fB4LO6iIf+o6RGIAiQSdpry1e arhAJfSc1fOrFdC+HXjTdy8N3BpxYSGMLWQ9arABCEW9FOEkw6Z9nGdQ6ZrXGmAOUPpj 26hYp1HJ0suo21FvY2MREnELpubMrPdYQ5kRL41x+lLT0NtkeITWYGQPdieDrybtILjS BGBg== X-Gm-Message-State: APf1xPDBoBxmmwJ67iY4eWU41Vv8lFGMj3w9F8pIh7DoEvPhjVlllId2 EW4GESxsVhVeWrm5rhCxtMGWQePCJVs= X-Received: by 2002:a17:902:a607:: with SMTP id u7-v6mr19010569plq.367.1520405799522; Tue, 06 Mar 2018 22:56:39 -0800 (PST) Received: from localhost.localdomain ([45.56.152.76]) by smtp.gmail.com with ESMTPSA id m18sm28340291pgu.51.2018.03.06.22.56.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 22:56:39 -0800 (PST) From: Heyi Guo To: edk2-devel@lists.01.org Date: Wed, 7 Mar 2018 14:55:46 +0800 Message-Id: <1520405747-11023-2-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520405747-11023-1-git-send-email-heyi.guo@linaro.org> References: <1520405747-11023-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH 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 Wed Mar 7 06:55:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 130851 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp4845145lja; Tue, 6 Mar 2018 22:56:47 -0800 (PST) X-Google-Smtp-Source: AG47ELtEbM2JEjbP5P0CqcWfwN8al9O8qy+3eTu1Bs2In0ULJBOGgxobJEJ84J4xHhJ39BV2Q0gK X-Received: by 10.99.108.66 with SMTP id h63mr16969944pgc.177.1520405807736; Tue, 06 Mar 2018 22:56:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520405807; cv=none; d=google.com; s=arc-20160816; b=ywchtGyeFa/Ee6PAridR+IUUu2oVsDHMTat2cIAeri2ktbTYncG2/PcXzAOwwaE52S ufnbbc8L1mcn2YGhekbwf4Etvj6yBwVOOVb0kxhiRm+bUmNbShes1TEqs2lcgLQxyuFM szj6kiHA+6ToGdY/h9VwO4LTc9AzSL+nisNdkAzQwNXw4+Q/GTa2auJ2K9eUBykzJHFS teNDTQHet05+yd89+a+M90o30AVZQ2D+9WyQcSKj1HpE0PQ2l7xnQ8ikGaRr8TWTLm8V S3qGqzN2ZZhqiPbQ7M5Ejj1yNiIAsYs3wp65MlcLCB3g++/x9LaaMO/+dDdyUBTWYDMw uh1Q== 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=0DN7AGeuIo9zvU96psaSzaVHyuiw0TC3T69jk7eCOv4=; b=CqgR9tn769A5SUqWrW58IJX8x3rf77VIEnAooLk9ahWjxcdTx2U2557cKqgZLcsh8p UahgJ5l94NcHzfYXr5r6NDao84yeaAM9GliXZYfbQ6kJKF+a6i434W/J7y+CJtosBUjf z4qCqU/7nDokovfFV8qMQ7jLTHFp+ps4w0WA2gkNgVUE7otA+CwBRiZ7E30TBGykZaW9 5AeAHPSQKVED9HbGk7DhzOD/OXPp76uZFzWeip9f5HksbTVkp9ZaQOFQIMRdFCVM0LEt ZW8IcNE0tbin7F6BC+vGElEQhIPtnVFXGJcoGaq63heHxL3js0YS9XCZT8Afj2pBfQFY bwTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=EXYlVdrS; 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 h8-v6si12609836pli.210.2018.03.06.22.56.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 22:56:47 -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=EXYlVdrS; 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 47869223CDC39; Tue, 6 Mar 2018 22:50:32 -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=2607:f8b0:400e:c05::244; helo=mail-pg0-x244.google.com; envelope-from=heyi.guo@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::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 0996D21E082A0 for ; Tue, 6 Mar 2018 22:50:30 -0800 (PST) Received: by mail-pg0-x244.google.com with SMTP id l4so555901pgp.11 for ; Tue, 06 Mar 2018 22:56:45 -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=neDvKqgPRZmZUqTkOs6TXabH1xIh/p/4x2zBRIfaVLQ=; b=EXYlVdrS3megoEcrHKlQ8woW09hFWXegAVpxtUj9Po8jYEkdtxt2ZiVcliHuKHBhDS +9QlkenfXii2YLisxP2QM9zR6O83QrDReSS8mezY7ocxgLqBxb4LtAWCkW1O2B+f9u1J VqHTN8UCe2vDnGj0NnEqwedgcy2TQPYQOwG0c= 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=neDvKqgPRZmZUqTkOs6TXabH1xIh/p/4x2zBRIfaVLQ=; b=eQNQ0U8TGvyFYesFzVsVUTeiUT2/gTMtNM68wmL8WCcc2PpWHqcNRMb7ZTRedF7emc MF3c76H+9xaQqqnonL0cpD591sstoE0jgpNdoz2Tg7gRG54uri1zPG1xBG1E3EzzpSEM r7E81rQyp8KjW53VIL616OK9q4+P61mKnztwSQOMQsMEcC+PZfLMbN6E8jqOYn5LFoQs xH1wy9igwYIU+glyWZzWYppmu0/axKmCL/sTuY3/+J5IShmLdziMktZyWUI9DHqOicCV U0k/wnNgRo+gxAEYtuObt2nXzQW4FbXvyqWWx3oEWX/2/r+sPzYRbChlTSQXlWSrsZlv BFjw== X-Gm-Message-State: APf1xPDIhefP21ovwNlkIg3B3B3dvtdR9+Gann1B0xE/2aH/hQfi1kT9 4ojJ5hYvfUepdDtkAhmLdg11XTBdAfA= X-Received: by 10.98.15.72 with SMTP id x69mr21570367pfi.16.1520405805244; Tue, 06 Mar 2018 22:56:45 -0800 (PST) Received: from localhost.localdomain ([45.56.152.76]) by smtp.gmail.com with ESMTPSA id m18sm28340291pgu.51.2018.03.06.22.56.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 22:56:44 -0800 (PST) From: Heyi Guo To: edk2-devel@lists.01.org Date: Wed, 7 Mar 2018 14:55:47 +0800 Message-Id: <1520405747-11023-3-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520405747-11023-1-git-send-email-heyi.guo@linaro.org> References: <1520405747-11023-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH 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 --- Platform/Hisilicon/D05/D05.dsc | 4 ++++ Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf | 2 ++ Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc | 19 +++++++------------ 3 files 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/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 0792b0814ea1..22eaf356224d 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -418,6 +418,10 @@ [PcdsFixedAtBuild.common] gHisiTokenSpaceGuid.Pcdsoctype|0x1610 + # SBSA watchdog on Hi1616 + gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0x40500000 + gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0x40600000 + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf index bb279c8e428e..6955e6145c30 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf @@ -55,5 +55,7 @@ [FixedPcd] gArmTokenSpaceGuid.PcdArmArchTimerIntrNum gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum + gArmTokenSpaceGuid.PcdGenericWatchdogControlBase + gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc index 2a9d209c00f0..6bc1bde2a490 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Gtdt.aslc @@ -29,6 +29,7 @@ #define GTDT_TIMER_ALWAYS_ON_CAPABILITY EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY #define GTDT_GTIMER_FLAGS (GTDT_TIMER_ALWAYS_ON_CAPABILITY | GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) +#define WATCHDOG_SPAN 0x20000000 #pragma pack (1) @@ -57,22 +58,16 @@ 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( + FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 400, 0), + EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( + FixedPcdGet32 (PcdGenericWatchdogRefreshBase) + WATCHDOG_SPAN, FixedPcdGet32 (PcdGenericWatchdogControlBase) + WATCHDOG_SPAN, 496, 0) + } -#else /* !notyet */ - 0, 0 - } -#endif }; //