[Linaro-uefi,Linaro-uefi,v1,15/21] Hisilicon: switch to generic watchdog driver

Message ID 1490015485-53685-16-git-send-email-chenhui.sun@linaro.org
State New
Headers show
Series
  • D02/D03 platforms bug fix
Related show

Commit Message

Chenhui Sun March 20, 2017, 1:11 p.m.
SP805 watchdog driver does not really take effect the platforms, so we
switch to generic watchdog driver.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: wanglijun <wanglijun@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Signed-off-by: Yi Li <phoenix.liyi@huawei.com>
---
 Platforms/Hisilicon/D02/Pv660D02.dsc | 2 +-
 Platforms/Hisilicon/D02/Pv660D02.fdf | 2 +-
 Platforms/Hisilicon/D03/D03.dsc      | 2 +-
 Platforms/Hisilicon/D03/D03.fdf      | 2 +-
 Platforms/Hisilicon/D05/D05.dsc      | 2 +-
 Platforms/Hisilicon/D05/D05.fdf      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Comments

Leif Lindholm March 21, 2017, 4:46 p.m. | #1
On Mon, Mar 20, 2017 at 09:11:19PM +0800, Chenhui Sun wrote:
> SP805 watchdog driver does not really take effect the platforms, so we
> switch to generic watchdog driver.

Again, this description does not explain what problem is being
resolved. Please clarify the commit message.

If there is no need for a hardware watchdog, the change itself looks
plausible.

Regards,

Leif

> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: wanglijun <wanglijun@huawei.com>
> Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
> Signed-off-by: Yi Li <phoenix.liyi@huawei.com>
> ---
>  Platforms/Hisilicon/D02/Pv660D02.dsc | 2 +-
>  Platforms/Hisilicon/D02/Pv660D02.fdf | 2 +-
>  Platforms/Hisilicon/D03/D03.dsc      | 2 +-
>  Platforms/Hisilicon/D03/D03.fdf      | 2 +-
>  Platforms/Hisilicon/D05/D05.dsc      | 2 +-
>  Platforms/Hisilicon/D05/D05.fdf      | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc
> index 3f2ea31..2a70974 100644
> --- a/Platforms/Hisilicon/D02/Pv660D02.dsc
> +++ b/Platforms/Hisilicon/D02/Pv660D02.dsc
> @@ -339,7 +339,7 @@
>    ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
>  
>    ArmPkg/Drivers/TimerDxe/TimerDxe.inf
> -  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
> +  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>  
>    IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
>    #
> diff --git a/Platforms/Hisilicon/D02/Pv660D02.fdf b/Platforms/Hisilicon/D02/Pv660D02.fdf
> index 406b501..b430712 100644
> --- a/Platforms/Hisilicon/D02/Pv660D02.fdf
> +++ b/Platforms/Hisilicon/D02/Pv660D02.fdf
> @@ -196,7 +196,7 @@ READ_LOCK_STATUS   = TRUE
>  
>    INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
>    INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
> -  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
> +  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>  
>    #
>    # FAT filesystem + GPT/MBR partitioning
> diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc
> index 81b8271..24c88a3 100644
> --- a/Platforms/Hisilicon/D03/D03.dsc
> +++ b/Platforms/Hisilicon/D03/D03.dsc
> @@ -396,7 +396,7 @@
>  
>    ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>  
> -  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
> +  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>    IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
>    #
>    #ACPI
> diff --git a/Platforms/Hisilicon/D03/D03.fdf b/Platforms/Hisilicon/D03/D03.fdf
> index 3102f94..b254667 100644
> --- a/Platforms/Hisilicon/D03/D03.fdf
> +++ b/Platforms/Hisilicon/D03/D03.fdf
> @@ -189,7 +189,7 @@ READ_LOCK_STATUS   = TRUE
>    INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
>    INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>  
> -  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
> +  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>  
>    #
>    # FAT filesystem + GPT/MBR partitioning
> diff --git a/Platforms/Hisilicon/D05/D05.dsc b/Platforms/Hisilicon/D05/D05.dsc
> index 78c7913..9de1be6 100644
> --- a/Platforms/Hisilicon/D05/D05.dsc
> +++ b/Platforms/Hisilicon/D05/D05.dsc
> @@ -516,7 +516,7 @@
>  
>    ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>  
> -  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
> +  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>    IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
>    #
>    #ACPI
> diff --git a/Platforms/Hisilicon/D05/D05.fdf b/Platforms/Hisilicon/D05/D05.fdf
> index 5a646f3..987427c 100644
> --- a/Platforms/Hisilicon/D05/D05.fdf
> +++ b/Platforms/Hisilicon/D05/D05.fdf
> @@ -193,7 +193,7 @@ READ_LOCK_STATUS   = TRUE
>    INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
>    INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>  
> -  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
> +  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>  
>    #
>    # FAT filesystem + GPT/MBR partitioning
> -- 
> 1.9.1
>
Chenhui Sun April 1, 2017, 9:37 a.m. | #2
Hi Leif,


在 2017/3/22 0:46, Leif Lindholm 写道:
> On Mon, Mar 20, 2017 at 09:11:19PM +0800, Chenhui Sun wrote:
>> SP805 watchdog driver does not really take effect the platforms, so we
>> switch to generic watchdog driver.
> Again, this description does not explain what problem is being
> resolved. Please clarify the commit message.
>
> If there is no need for a hardware watchdog, the change itself looks
> plausible.
The system hung during SCT SetWatchdogTimer_Func testing,
but we found that it is not caused by this driver, we will continue to 
debug it, I will drop this patch first.

Thanks and Regards,
Chenhui
> Regards,
>
> Leif
>
>> Contributed-under: TianoCore Contribution Agreement 1.0
>> Signed-off-by: wanglijun <wanglijun@huawei.com>
>> Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
>> Signed-off-by: Yi Li <phoenix.liyi@huawei.com>
>> ---
>>   Platforms/Hisilicon/D02/Pv660D02.dsc | 2 +-
>>   Platforms/Hisilicon/D02/Pv660D02.fdf | 2 +-
>>   Platforms/Hisilicon/D03/D03.dsc      | 2 +-
>>   Platforms/Hisilicon/D03/D03.fdf      | 2 +-
>>   Platforms/Hisilicon/D05/D05.dsc      | 2 +-
>>   Platforms/Hisilicon/D05/D05.fdf      | 2 +-
>>   6 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc
>> index 3f2ea31..2a70974 100644
>> --- a/Platforms/Hisilicon/D02/Pv660D02.dsc
>> +++ b/Platforms/Hisilicon/D02/Pv660D02.dsc
>> @@ -339,7 +339,7 @@
>>     ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
>>   
>>     ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>> -  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
>> +  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>>   
>>     IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
>>     #
>> diff --git a/Platforms/Hisilicon/D02/Pv660D02.fdf b/Platforms/Hisilicon/D02/Pv660D02.fdf
>> index 406b501..b430712 100644
>> --- a/Platforms/Hisilicon/D02/Pv660D02.fdf
>> +++ b/Platforms/Hisilicon/D02/Pv660D02.fdf
>> @@ -196,7 +196,7 @@ READ_LOCK_STATUS   = TRUE
>>   
>>     INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
>>     INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>> -  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
>> +  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>>   
>>     #
>>     # FAT filesystem + GPT/MBR partitioning
>> diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc
>> index 81b8271..24c88a3 100644
>> --- a/Platforms/Hisilicon/D03/D03.dsc
>> +++ b/Platforms/Hisilicon/D03/D03.dsc
>> @@ -396,7 +396,7 @@
>>   
>>     ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>>   
>> -  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
>> +  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>>     IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
>>     #
>>     #ACPI
>> diff --git a/Platforms/Hisilicon/D03/D03.fdf b/Platforms/Hisilicon/D03/D03.fdf
>> index 3102f94..b254667 100644
>> --- a/Platforms/Hisilicon/D03/D03.fdf
>> +++ b/Platforms/Hisilicon/D03/D03.fdf
>> @@ -189,7 +189,7 @@ READ_LOCK_STATUS   = TRUE
>>     INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
>>     INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>>   
>> -  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
>> +  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>>   
>>     #
>>     # FAT filesystem + GPT/MBR partitioning
>> diff --git a/Platforms/Hisilicon/D05/D05.dsc b/Platforms/Hisilicon/D05/D05.dsc
>> index 78c7913..9de1be6 100644
>> --- a/Platforms/Hisilicon/D05/D05.dsc
>> +++ b/Platforms/Hisilicon/D05/D05.dsc
>> @@ -516,7 +516,7 @@
>>   
>>     ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>>   
>> -  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
>> +  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>>     IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
>>     #
>>     #ACPI
>> diff --git a/Platforms/Hisilicon/D05/D05.fdf b/Platforms/Hisilicon/D05/D05.fdf
>> index 5a646f3..987427c 100644
>> --- a/Platforms/Hisilicon/D05/D05.fdf
>> +++ b/Platforms/Hisilicon/D05/D05.fdf
>> @@ -193,7 +193,7 @@ READ_LOCK_STATUS   = TRUE
>>     INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
>>     INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
>>   
>> -  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
>> +  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
>>   
>>     #
>>     # FAT filesystem + GPT/MBR partitioning
>> -- 
>> 1.9.1
>>

Patch hide | download patch | download mbox

diff --git a/Platforms/Hisilicon/D02/Pv660D02.dsc b/Platforms/Hisilicon/D02/Pv660D02.dsc
index 3f2ea31..2a70974 100644
--- a/Platforms/Hisilicon/D02/Pv660D02.dsc
+++ b/Platforms/Hisilicon/D02/Pv660D02.dsc
@@ -339,7 +339,7 @@ 
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
 
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
-  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
+  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 
   IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
   #
diff --git a/Platforms/Hisilicon/D02/Pv660D02.fdf b/Platforms/Hisilicon/D02/Pv660D02.fdf
index 406b501..b430712 100644
--- a/Platforms/Hisilicon/D02/Pv660D02.fdf
+++ b/Platforms/Hisilicon/D02/Pv660D02.fdf
@@ -196,7 +196,7 @@  READ_LOCK_STATUS   = TRUE
 
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
-  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
diff --git a/Platforms/Hisilicon/D03/D03.dsc b/Platforms/Hisilicon/D03/D03.dsc
index 81b8271..24c88a3 100644
--- a/Platforms/Hisilicon/D03/D03.dsc
+++ b/Platforms/Hisilicon/D03/D03.dsc
@@ -396,7 +396,7 @@ 
 
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 
-  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
+  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
   #
   #ACPI
diff --git a/Platforms/Hisilicon/D03/D03.fdf b/Platforms/Hisilicon/D03/D03.fdf
index 3102f94..b254667 100644
--- a/Platforms/Hisilicon/D03/D03.fdf
+++ b/Platforms/Hisilicon/D03/D03.fdf
@@ -189,7 +189,7 @@  READ_LOCK_STATUS   = TRUE
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 
-  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning
diff --git a/Platforms/Hisilicon/D05/D05.dsc b/Platforms/Hisilicon/D05/D05.dsc
index 78c7913..9de1be6 100644
--- a/Platforms/Hisilicon/D05/D05.dsc
+++ b/Platforms/Hisilicon/D05/D05.dsc
@@ -516,7 +516,7 @@ 
 
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 
-  ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
+  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf
   #
   #ACPI
diff --git a/Platforms/Hisilicon/D05/D05.fdf b/Platforms/Hisilicon/D05/D05.fdf
index 5a646f3..987427c 100644
--- a/Platforms/Hisilicon/D05/D05.fdf
+++ b/Platforms/Hisilicon/D05/D05.fdf
@@ -193,7 +193,7 @@  READ_LOCK_STATUS   = TRUE
   INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf
 
-  INF ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf
+  INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning