Proper watchdog control base is 0xf0610000, so fix the
incorrect value.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Platform/Marvell/Armada/Armada.dsc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
index 1b68ef3..cf81615 100644
--- a/Platform/Marvell/Armada/Armada.dsc.inc
+++ b/Platform/Marvell/Armada/Armada.dsc.inc
@@ -269,7 +269,7 @@
   gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000
 
   # ARM SBSA Watchdog
-  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0620000
+  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0610000
   gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0xF0600000
   gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum|34
 
-- 
2.7.4

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

On Fri, Dec 01, 2017 at 03:28:52AM +0100, Marcin Wojtas wrote:
> Proper watchdog control base is 0xf0610000, so fix the
> incorrect value.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  Platform/Marvell/Armada/Armada.dsc.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
> index 1b68ef3..cf81615 100644
> --- a/Platform/Marvell/Armada/Armada.dsc.inc
> +++ b/Platform/Marvell/Armada/Armada.dsc.inc
> @@ -269,7 +269,7 @@
>    gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000
>  
>    # ARM SBSA Watchdog
> -  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0620000
> +  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0610000

Hmm, do we never start the watchdog, or how did we not notice this?
I can confirm against the docs that the fix is correct, so:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

>    gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase|0xF0600000
>    gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum|34
>  
> -- 
> 2.7.4
> 
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

2017-12-01 14:19 GMT+01:00 Leif Lindholm <leif.lindholm@linaro.org>:
> On Fri, Dec 01, 2017 at 03:28:52AM +0100, Marcin Wojtas wrote:
>> Proper watchdog control base is 0xf0610000, so fix the
>> incorrect value.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> ---
>>  Platform/Marvell/Armada/Armada.dsc.inc | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
>> index 1b68ef3..cf81615 100644
>> --- a/Platform/Marvell/Armada/Armada.dsc.inc
>> +++ b/Platform/Marvell/Armada/Armada.dsc.inc
>> @@ -269,7 +269,7 @@
>>    gEmbeddedTokenSpaceGuid.PcdMetronomeTickPeriod|1000
>>
>>    # ARM SBSA Watchdog
>> -  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0620000
>> +  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase|0xF0610000
>
> Hmm, do we never start the watchdog, or how did we not notice this?
> I can confirm against the docs that the fix is correct, so:
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>

The problem was noticed when running SBSA test suite on a branch
already equipped with ACPI support.

Marcin
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel