From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web08.4069.1639119050698133948 for ; Thu, 09 Dec 2021 22:50:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=nlwD9cg3; spf=pass (domain: linaro.org, ip: 209.85.210.174, mailfrom: masami.hiramatsu@linaro.org) Received: by mail-pf1-f174.google.com with SMTP id z6so7630856pfe.7 for ; Thu, 09 Dec 2021 22:50:50 -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 :user-agent:mime-version:content-transfer-encoding; bh=Vw1NZg3Mlw9IMlEV1fbFx81GruYyY5E4EHzeI48o1B0=; b=nlwD9cg30onLrCRK5rixST985DiGvUH3ABaYqVXpaOCgGM5/pwiiX/1CzksmJJCygI aRK5USlMJ/O0I8RGh1eS62Unl/aBlhERcZDdInidt7Ms7Qw41G2sg9x1bH2Brjmcm46/ 7pjdomf4ugO6/0i6hZbK2u0D8H0Dxxy8Zd8ZTx04VXyDfRqVNj5//D+dAXdq2z3+1lbt cdccz5bjB22BbJY5tpBPYhYt5F4XQZp4KgbjL0ng9yBP0ykF3iWQDBAoSMZmTxxO8dQ7 u+9eHNT3ARU++wf2xURtF0cCxdIYKMsmIFVoluhFwXMJy0uIKFRiC6yP0CUD83rP0QzM 7e2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=Vw1NZg3Mlw9IMlEV1fbFx81GruYyY5E4EHzeI48o1B0=; b=3Qdkm7qxof9iiHkldC0DYs9zk4DxAZijiyGR3T+2Z8+uNDK5xPUNakX+F+h5cBlbtz JWQRaQSA3Gjfc3YmmD0QQhYS7yVWnqp74QRvw+FDBXOX/rzX0mMrkzZIueInlR9HMhf9 4MkrB8aJOe4LBzc2eg5CIoHnhfKhJHymuqD2hsEMVqg3/Kxkv7+gQ6baV+lRnlwTL3wW OTGmdaxdKehZv5juDfKgheQ/of7XSge3NePf6YfbnOVqrl3RBROn+lAjQ2z2yskpeV1v xsz06WPkcECpUMP/QvOL9uaTpxjAJs0Vmyd8HKt8ZivizT8s7EJZ/THNqFdLB+ezWtd1 BcqQ== X-Gm-Message-State: AOAM53111q3C+BroiSvPHD+El+T2FXmxjsOklhSmV8WxH7f7pBkYymZC 5NFoddfwh7okcWvZNpHKqCOnIA== X-Google-Smtp-Source: ABdhPJxQGMLjj3bjt5vKOmbMizpzY8S89GzbsdJ9N7NHMYQiBbM1c34avDYvdykqcFC3Hi8j8FrHGQ== X-Received: by 2002:a63:4a19:: with SMTP id x25mr37837983pga.202.1639119050185; Thu, 09 Dec 2021 22:50:50 -0800 (PST) Return-Path: Received: from localhost.localdomain (122x208x150x49.ap122.ftth.ucom.ne.jp. [122.208.150.49]) by smtp.gmail.com with ESMTPSA id g5sm11258694pjt.15.2021.12.09.22.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Dec 2021 22:50:49 -0800 (PST) From: "Masami Hiramatsu" To: Ard Biesheuvel , Leif Lindholm Cc: devel@edk2.groups.io, Kazuhiko Sakamoto , Masahisa Kojima Subject: [PATCH v3 2/6] [edk2-platforms] Silicon/Socionext/SynQuacer: Fix GenericWatchdog interrupt number Date: Fri, 10 Dec 2021 15:50:47 +0900 Message-Id: <163911904726.561661.11019780823237451137.stgit@localhost> X-Mailer: git-send-email 2.25.1 In-Reply-To: <163911902995.561661.9429300579159746333.stgit@localhost> References: <163911902995.561661.9429300579159746333.stgit@localhost> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit This fixes Socionext DeveloperBox GenericWatchdog interrupt number to 93 instead of 94. Since the 93 is the default interrupt number defined in ArmPkg/ArmPkg.dec, this doesn't redefine gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum. Signed-off-by: Masami Hiramatsu Reported-by: Kazuhiko Sakamoto --- Changes in v2: - Just focus on using PcdGenericWatchdogEl2IntrNum in Gtdt.aslc --- .../Socionext/SynQuacer/AcpiTables/AcpiTables.inf | 1 + Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf index 96efb2d38e..886777a0fa 100644 --- a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf +++ b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf @@ -50,6 +50,7 @@ gArmTokenSpaceGuid.PcdGenericWatchdogControlBase gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase + gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc index c811fc5a0c..e7ab88b0a8 100644 --- a/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc +++ b/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc @@ -76,7 +76,7 @@ EFI_ACPI_6_0_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { EFI_ACPI_6_0_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT ( FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), - 94, + FixedPcdGet32 (PcdGenericWatchdogEl2IntrNum), 0), };