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.3027.1636104220022311512 for ; Fri, 05 Nov 2021 02:23:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=HS0PULEC; 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 r28so7923960pga.0 for ; Fri, 05 Nov 2021 02:23: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 :user-agent:mime-version:content-transfer-encoding; bh=jGu7L7H3jRfZow0q3LLwW0WeyduEUTuUJMhLFbbxLiE=; b=HS0PULECl0CHI/GWhtKbmqzou5N9yy9NsxqbTxSSyCTWrJYoIs+kcLVlQ84g76xi3O 1+1SkN5AwS1P1u20GbnuK3FF8L2zH48bzW6hzJeKlKkjWWIklqdxF5VsrYBB7b6rJuRU KQ/RIVWd7e9V2ZB45LTHflja5Wzad7MjbflHR43vNhsd+BrAcQ7BGVksT2a8VwqQV9S6 2/bdesTlDNw1oglPEpCeB83+f+9Rn77ugqrZBgzm9WoZ0mo8ZJZDsYrgGBBiX5mASOdK UbQt8PxcQYDK3+nZxJlRAXrZJhwf9goGuOjUsj++AvJJWOawkxZjJt0foOoe9sl7zUAj oTpA== 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=jGu7L7H3jRfZow0q3LLwW0WeyduEUTuUJMhLFbbxLiE=; b=16B6q/Wh4DzWIRE2gsqeJuqyy1YEeSMuWjxJt0Ja1hgzK7GH7j5zNNXBy78LBPZIfE EFrAfxdSvWa+r6uVnIiE38NoMVZqzsX8E9mCDLOqLbmWKeHzHjs4Le6KP5T4L1SbweYq KS2LMG4Tc9U1VHfkHLmk4kUG2ZP/s4UrNcetT5Ihfxab6GNis7cpkwJ4YhPVtnHyo298 75qZ63BKojB+YjI/RgQfywmVOpG6aNi7rlJwXT/9b5IWeJF4RRspQamWmWu7KuudtPuA oH4bCse7NIOcF1GSX7rpD7uOp6taHwcmZVddve8GA5Uwetww9rTgNWozJK4r9xDbTShY s8OA== X-Gm-Message-State: AOAM532AgvtsGwSnJPfkoEvkmrLE2eR1ekq0Fx3bNwBpm7k5F6Al/bEk /qyZd0+sy4EECVqsGHB6n+GDMg== X-Google-Smtp-Source: ABdhPJw5Mhe2ovc8lhd+qwD/u5AQrOLkdV+JqU1IStBK8dmdtZ3NH7TdpNQj6bFBxwrm+TZ35ByyGg== X-Received: by 2002:a62:a50f:0:b0:49e:552a:388 with SMTP id v15-20020a62a50f000000b0049e552a0388mr5093280pfm.10.1636104219606; Fri, 05 Nov 2021 02:23:39 -0700 (PDT) Return-Path: Received: from localhost.localdomain (122x208x150x49.ap122.ftth.ucom.ne.jp. [122.208.150.49]) by smtp.gmail.com with ESMTPSA id f20sm6940894pfc.220.2021.11.05.02.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 02:23:39 -0700 (PDT) From: "Masami Hiramatsu" To: Ard Biesheuvel , Leif Lindholm Cc: devel@edk2.groups.io, Kazuhiko Sakamoto , Masahisa Kojima Subject: [PATCH 2/5] [edk2-platforms] Silicon/Socionext/SynQuacer: Fix GenericWatchdog interrupt number Date: Fri, 5 Nov 2021 18:23:36 +0900 Message-Id: <163610421657.391624.390954447741641256.stgit@localhost> X-Mailer: git-send-email 2.25.1 In-Reply-To: <163610419943.391624.9289897029386201296.stgit@localhost> References: <163610419943.391624.9289897029386201296.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 --- .../Socionext/SynQuacer/AcpiTables/AcpiTables.inf | 1 + Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) 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..b045a49efa 100644 --- a/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc +++ b/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc @@ -74,9 +74,9 @@ EFI_ACPI_6_0_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { // UINT32 GTxCommonFlags }, EFI_ACPI_6_0_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT ( - FixedPcdGet32 (PcdGenericWatchdogRefreshBase), - FixedPcdGet32 (PcdGenericWatchdogControlBase), - 94, + FixedPcdGet64 (PcdGenericWatchdogRefreshBase), + FixedPcdGet64 (PcdGenericWatchdogControlBase), + FixedPcdGet32 (PcdGenericWatchdogEl2IntrNum), 0), };