From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web12.9303.1638519154092870810 for ; Fri, 03 Dec 2021 00:12:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=w2p5p/B5; spf=pass (domain: linaro.org, ip: 209.85.215.177, mailfrom: masami.hiramatsu@linaro.org) Received: by mail-pg1-f177.google.com with SMTP id s37so2291185pga.9 for ; Fri, 03 Dec 2021 00:12:34 -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=w2p5p/B5rq1tts5Ow8Vqce1D+vlyodwjCOsDCNJZe8LuA8QlckV4qgEg9KCZHTnmyL S2EsMFDeOON+rpH+v3gSh3Yyh2F26OcnpKY8AoFO/J7HnaxdWSyiKOx4GYUWssjDi/vm aBjcaNFUNpFF/RzlwFc/b9hx/UUS7Up3Hncdgk++EMCuIX7H7NrI+fsqH1H2/RhpsdUE FBHpl212CDRm+KwtFV5lU/ecqxh+b9DwLLuFrMTJ8anNHjpSKY/0rI/frSvBuh4UxwyT kVFoI382hXXEsiHYrP3t53zWSbSUGpWH99Gz/VpgymDG6D1X9CPWlg6J+RG8YRyjFcGI nMsw== 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=frkRbycF9eLVfaEnunNMjWrrO0KIKuyV6O1eES3jYFCXV+blbrcA6/DbWVsNN4lYMF 7FQbQHF3yVDUKYUkWcxkUWWlelpCsSUGZVkkIHCoeC35QP612n5JTjL7J3TnbamKTbwA Q6t6Au3vLfr+bwlTX5VWkkCrsbKYHhNbmZFJwRMY5yXX6P5M7ZGuZKYgmBXbDCR+9UnB hQiiwqMtBH/VvR5AzsTJKhiUcpV8wly/ELBsiaqYswgi8KXU1xMsmwYUyD1d5GX3mDD7 d5W/RQSwcJ6LL7j0K2YysG7euJSO3geO2GsvNsjgVL5L9Q4//ZYmxywIDESxNjI2gmLV V/xQ== X-Gm-Message-State: AOAM533bQZgkuYF/4dtofJN1mqd8g6Ql2vPLieRe+VORYfYbUR59rr1u +houbIuT/vFovOrdFLhSchQ///yNuln9IQ== X-Google-Smtp-Source: ABdhPJyNgxjt26aX+NC2qD4/FLN0YOiABDB04Q33eItKnfMh3pyZDicYoBpyF73sOGaooi3f4ZrYFA== X-Received: by 2002:a63:b0e:: with SMTP id 14mr3521523pgl.229.1638519153478; Fri, 03 Dec 2021 00:12:33 -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 63sm2246362pfz.119.2021.12.03.00.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Dec 2021 00:12:33 -0800 (PST) From: "Masami Hiramatsu" To: Ard Biesheuvel , Leif Lindholm Cc: devel@edk2.groups.io, Kazuhiko Sakamoto , Masahisa Kojima Subject: [PATCH v2 2/5] [edk2-platforms] Silicon/Socionext/SynQuacer: Fix GenericWatchdog interrupt number Date: Fri, 3 Dec 2021 17:12:30 +0900 Message-Id: <163851915043.1636051.5939257196491747411.stgit@localhost> X-Mailer: git-send-email 2.25.1 In-Reply-To: <163851913341.1636051.3357297397950801289.stgit@localhost> References: <163851913341.1636051.3357297397950801289.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), };