acpi/fadt: check no-zero failures for X_PM* for 6.1 and before
diff mbox series

Message ID 20191031205058.19596-1-alex.hung@canonical.com
State Accepted
Headers show
Series
  • acpi/fadt: check no-zero failures for X_PM* for 6.1 and before
Related show

Commit Message

Alex Hung Oct. 31, 2019, 8:50 p.m. UTC
Starting from ACPI 6.2, X_PM* fields update the descriptions as below

"If this field contains a nonzero value which can be used by the
OSPM, then the PM* field must be ignored by the OSPM."

As a result, skip failures for ACPI 6.2 and later.

Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 src/acpi/fadt/fadt.c | 133 +++++++++++++++++++++++++------------------
 1 file changed, 78 insertions(+), 55 deletions(-)

Comments

Colin King Nov. 6, 2019, 10:47 a.m. UTC | #1
On 31/10/2019 20:50, Alex Hung wrote:
> Starting from ACPI 6.2, X_PM* fields update the descriptions as below
> 
> "If this field contains a nonzero value which can be used by the
> OSPM, then the PM* field must be ignored by the OSPM."
> 
> As a result, skip failures for ACPI 6.2 and later.
> 
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  src/acpi/fadt/fadt.c | 133 +++++++++++++++++++++++++------------------
>  1 file changed, 78 insertions(+), 55 deletions(-)
> 
> diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c
> index e0a4fdbf..47373e67 100644
> --- a/src/acpi/fadt/fadt.c
> +++ b/src/acpi/fadt/fadt.c
> @@ -962,11 +962,11 @@ static void acpi_table_check_fadt_pm1a_evt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm1aEvtBlkNotSet",
> -			    "FADT PM1A_EVT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		if (!both_zero)
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm1aEvtBlkNotSet",
> +				    "FADT PM1A_EVT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
>  			fwts_advice(fw,
>  				    "Both FADT 32- and 64-bit PM1A_EVT_BLK "
>  				    "fields are being used, but only one "
> @@ -974,6 +974,9 @@ static void acpi_table_check_fadt_pm1a_evt_blk(fwts_framework *fw)
>  				    "value are not equal the kernel cannot "
>  				    "unambiguously determine which value "
>  				    "is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM1A_EVT_BLK field is set "
> +			    "and 32-bit PM1A_EVT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1005,16 +1008,20 @@ static void acpi_table_check_fadt_pm1b_evt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm1bEvtBlkNotSet",
> -			    "FADT PM1A_EVT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM1B_EVT_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm1bEvtBlkNotSet",
> +				    "FADT PM1B_EVT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM1B_EVT_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM1B_EVT_BLK field is set "
> +			    "and 32-bit PM1B_EVT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1060,16 +1067,20 @@ static void acpi_table_check_fadt_pm1a_cnt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm1aCntBlkNotSet",
> -			    "FADT PM1A_CNT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM1A_CNT_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm1aCntBlkNotSet",
> +				    "FADT PM1A_CNT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM1A_CNT_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM1A_CNT_BLK field is set "
> +			    "and 32-bit PM1A_CNT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1101,16 +1112,20 @@ static void acpi_table_check_fadt_pm1b_cnt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm1bCntBlkNotSet",
> -			    "FADT PM1A_CNT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM1B_CNT_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm1bCntBlkNotSet",
> +				    "FADT PM1B_CNT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM1B_CNT_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM1B_CNT_BLK field is set "
> +			    "and 32-bit PM1B_CNT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1142,16 +1157,20 @@ static void acpi_table_check_fadt_pm2_cnt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm2CntBlkNotSet",
> -			    "FADT PM2_CNT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM2_CNT_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm2CntBlkNotSet",
> +				    "FADT PM2_CNT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM2_CNT_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM2_CNT_BLK field is set "
> +			    "and 32-bit PM2_CNT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1183,16 +1202,20 @@ static void acpi_table_check_fadt_pm_tmr_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm2CntBlkNotSet",
> -			    "FADT PM1A_CNT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM_TMR_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm2CntBlkNotSet",
> +				    "FADT PM1A_CNT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM_TMR_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM_TMR_BLK field is set "
> +			    "and 32-bit PM_TMR_BLK will be ignored.");
>  	}
>  }
>  
> 
This is always a fun part of the code. Thanks for fixing this up for 6.1

Acked-by: Colin Ian King <colin.king@canonical.com>
Ivan Nov. 7, 2019, 7:52 a.m. UTC | #2
On 11/1/19 4:50 AM, Alex Hung wrote:
> Starting from ACPI 6.2, X_PM* fields update the descriptions as below
>
> "If this field contains a nonzero value which can be used by the
> OSPM, then the PM* field must be ignored by the OSPM."
>
> As a result, skip failures for ACPI 6.2 and later.
>
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  src/acpi/fadt/fadt.c | 133 +++++++++++++++++++++++++------------------
>  1 file changed, 78 insertions(+), 55 deletions(-)
>
> diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c
> index e0a4fdbf..47373e67 100644
> --- a/src/acpi/fadt/fadt.c
> +++ b/src/acpi/fadt/fadt.c
> @@ -962,11 +962,11 @@ static void acpi_table_check_fadt_pm1a_evt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm1aEvtBlkNotSet",
> -			    "FADT PM1A_EVT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		if (!both_zero)
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm1aEvtBlkNotSet",
> +				    "FADT PM1A_EVT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
>  			fwts_advice(fw,
>  				    "Both FADT 32- and 64-bit PM1A_EVT_BLK "
>  				    "fields are being used, but only one "
> @@ -974,6 +974,9 @@ static void acpi_table_check_fadt_pm1a_evt_blk(fwts_framework *fw)
>  				    "value are not equal the kernel cannot "
>  				    "unambiguously determine which value "
>  				    "is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM1A_EVT_BLK field is set "
> +			    "and 32-bit PM1A_EVT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1005,16 +1008,20 @@ static void acpi_table_check_fadt_pm1b_evt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm1bEvtBlkNotSet",
> -			    "FADT PM1A_EVT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM1B_EVT_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm1bEvtBlkNotSet",
> +				    "FADT PM1B_EVT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM1B_EVT_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM1B_EVT_BLK field is set "
> +			    "and 32-bit PM1B_EVT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1060,16 +1067,20 @@ static void acpi_table_check_fadt_pm1a_cnt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm1aCntBlkNotSet",
> -			    "FADT PM1A_CNT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM1A_CNT_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm1aCntBlkNotSet",
> +				    "FADT PM1A_CNT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM1A_CNT_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM1A_CNT_BLK field is set "
> +			    "and 32-bit PM1A_CNT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1101,16 +1112,20 @@ static void acpi_table_check_fadt_pm1b_cnt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm1bCntBlkNotSet",
> -			    "FADT PM1A_CNT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM1B_CNT_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm1bCntBlkNotSet",
> +				    "FADT PM1B_CNT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM1B_CNT_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM1B_CNT_BLK field is set "
> +			    "and 32-bit PM1B_CNT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1142,16 +1157,20 @@ static void acpi_table_check_fadt_pm2_cnt_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm2CntBlkNotSet",
> -			    "FADT PM2_CNT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM2_CNT_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm2CntBlkNotSet",
> +				    "FADT PM2_CNT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM2_CNT_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM2_CNT_BLK field is set "
> +			    "and 32-bit PM2_CNT_BLK will be ignored.");
>  	}
>  }
>  
> @@ -1183,16 +1202,20 @@ static void acpi_table_check_fadt_pm_tmr_blk(fwts_framework *fw)
>  			    "non-zero.  However, they are at least equal so "
>  			    "the kernel will at least have a usable value.");
>  	} else {
> -		fwts_failed(fw, LOG_LEVEL_MEDIUM,
> -			    "FADTPm2CntBlkNotSet",
> -			    "FADT PM1A_CNT_BLK is a required field and must "
> -			    "have either a 32-bit or 64-bit address set.");
> -		fwts_advice(fw,
> -			    "Both FADT 32- and 64-bit PM_TMR_BLK "
> -			    "fields are being used, but only one should be "
> -			    "non-zero.  Since the fields value are not equal "
> -			    "the kernel cannot unambiguously determine which "
> -			    "value is the correct one.");
> +		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
> +			fwts_failed(fw, LOG_LEVEL_MEDIUM,
> +				    "FADTPm2CntBlkNotSet",
> +				    "FADT PM1A_CNT_BLK is a required field and must "
> +				    "have either a 32-bit or 64-bit address set.");
> +			fwts_advice(fw,
> +				    "Both FADT 32- and 64-bit PM_TMR_BLK "
> +				    "fields are being used, but only one should be "
> +				    "non-zero.  Since the fields value are not equal "
> +				    "the kernel cannot unambiguously determine which "
> +				    "value is the correct one.");
> +		}
> +		fwts_passed(fw, "FADT 64-bit X_PM_TMR_BLK field is set "
> +			    "and 32-bit PM_TMR_BLK will be ignored.");
>  	}
>  }
>  

Acked-by: Ivan Hu <ivan.hu@canonical.com>

Patch
diff mbox series

diff --git a/src/acpi/fadt/fadt.c b/src/acpi/fadt/fadt.c
index e0a4fdbf..47373e67 100644
--- a/src/acpi/fadt/fadt.c
+++ b/src/acpi/fadt/fadt.c
@@ -962,11 +962,11 @@  static void acpi_table_check_fadt_pm1a_evt_blk(fwts_framework *fw)
 			    "non-zero.  However, they are at least equal so "
 			    "the kernel will at least have a usable value.");
 	} else {
-		fwts_failed(fw, LOG_LEVEL_MEDIUM,
-			    "FADTPm1aEvtBlkNotSet",
-			    "FADT PM1A_EVT_BLK is a required field and must "
-			    "have either a 32-bit or 64-bit address set.");
-		if (!both_zero)
+		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
+			fwts_failed(fw, LOG_LEVEL_MEDIUM,
+				    "FADTPm1aEvtBlkNotSet",
+				    "FADT PM1A_EVT_BLK is a required field and must "
+				    "have either a 32-bit or 64-bit address set.");
 			fwts_advice(fw,
 				    "Both FADT 32- and 64-bit PM1A_EVT_BLK "
 				    "fields are being used, but only one "
@@ -974,6 +974,9 @@  static void acpi_table_check_fadt_pm1a_evt_blk(fwts_framework *fw)
 				    "value are not equal the kernel cannot "
 				    "unambiguously determine which value "
 				    "is the correct one.");
+		}
+		fwts_passed(fw, "FADT 64-bit X_PM1A_EVT_BLK field is set "
+			    "and 32-bit PM1A_EVT_BLK will be ignored.");
 	}
 }
 
@@ -1005,16 +1008,20 @@  static void acpi_table_check_fadt_pm1b_evt_blk(fwts_framework *fw)
 			    "non-zero.  However, they are at least equal so "
 			    "the kernel will at least have a usable value.");
 	} else {
-		fwts_failed(fw, LOG_LEVEL_MEDIUM,
-			    "FADTPm1bEvtBlkNotSet",
-			    "FADT PM1A_EVT_BLK is a required field and must "
-			    "have either a 32-bit or 64-bit address set.");
-		fwts_advice(fw,
-			    "Both FADT 32- and 64-bit PM1B_EVT_BLK "
-			    "fields are being used, but only one should be "
-			    "non-zero.  Since the fields value are not equal "
-			    "the kernel cannot unambiguously determine which "
-			    "value is the correct one.");
+		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
+			fwts_failed(fw, LOG_LEVEL_MEDIUM,
+				    "FADTPm1bEvtBlkNotSet",
+				    "FADT PM1B_EVT_BLK is a required field and must "
+				    "have either a 32-bit or 64-bit address set.");
+			fwts_advice(fw,
+				    "Both FADT 32- and 64-bit PM1B_EVT_BLK "
+				    "fields are being used, but only one should be "
+				    "non-zero.  Since the fields value are not equal "
+				    "the kernel cannot unambiguously determine which "
+				    "value is the correct one.");
+		}
+		fwts_passed(fw, "FADT 64-bit X_PM1B_EVT_BLK field is set "
+			    "and 32-bit PM1B_EVT_BLK will be ignored.");
 	}
 }
 
@@ -1060,16 +1067,20 @@  static void acpi_table_check_fadt_pm1a_cnt_blk(fwts_framework *fw)
 			    "non-zero.  However, they are at least equal so "
 			    "the kernel will at least have a usable value.");
 	} else {
-		fwts_failed(fw, LOG_LEVEL_MEDIUM,
-			    "FADTPm1aCntBlkNotSet",
-			    "FADT PM1A_CNT_BLK is a required field and must "
-			    "have either a 32-bit or 64-bit address set.");
-		fwts_advice(fw,
-			    "Both FADT 32- and 64-bit PM1A_CNT_BLK "
-			    "fields are being used, but only one should be "
-			    "non-zero.  Since the fields value are not equal "
-			    "the kernel cannot unambiguously determine which "
-			    "value is the correct one.");
+		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
+			fwts_failed(fw, LOG_LEVEL_MEDIUM,
+				    "FADTPm1aCntBlkNotSet",
+				    "FADT PM1A_CNT_BLK is a required field and must "
+				    "have either a 32-bit or 64-bit address set.");
+			fwts_advice(fw,
+				    "Both FADT 32- and 64-bit PM1A_CNT_BLK "
+				    "fields are being used, but only one should be "
+				    "non-zero.  Since the fields value are not equal "
+				    "the kernel cannot unambiguously determine which "
+				    "value is the correct one.");
+		}
+		fwts_passed(fw, "FADT 64-bit X_PM1A_CNT_BLK field is set "
+			    "and 32-bit PM1A_CNT_BLK will be ignored.");
 	}
 }
 
@@ -1101,16 +1112,20 @@  static void acpi_table_check_fadt_pm1b_cnt_blk(fwts_framework *fw)
 			    "non-zero.  However, they are at least equal so "
 			    "the kernel will at least have a usable value.");
 	} else {
-		fwts_failed(fw, LOG_LEVEL_MEDIUM,
-			    "FADTPm1bCntBlkNotSet",
-			    "FADT PM1A_CNT_BLK is a required field and must "
-			    "have either a 32-bit or 64-bit address set.");
-		fwts_advice(fw,
-			    "Both FADT 32- and 64-bit PM1B_CNT_BLK "
-			    "fields are being used, but only one should be "
-			    "non-zero.  Since the fields value are not equal "
-			    "the kernel cannot unambiguously determine which "
-			    "value is the correct one.");
+		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
+			fwts_failed(fw, LOG_LEVEL_MEDIUM,
+				    "FADTPm1bCntBlkNotSet",
+				    "FADT PM1B_CNT_BLK is a required field and must "
+				    "have either a 32-bit or 64-bit address set.");
+			fwts_advice(fw,
+				    "Both FADT 32- and 64-bit PM1B_CNT_BLK "
+				    "fields are being used, but only one should be "
+				    "non-zero.  Since the fields value are not equal "
+				    "the kernel cannot unambiguously determine which "
+				    "value is the correct one.");
+		}
+		fwts_passed(fw, "FADT 64-bit X_PM1B_CNT_BLK field is set "
+			    "and 32-bit PM1B_CNT_BLK will be ignored.");
 	}
 }
 
@@ -1142,16 +1157,20 @@  static void acpi_table_check_fadt_pm2_cnt_blk(fwts_framework *fw)
 			    "non-zero.  However, they are at least equal so "
 			    "the kernel will at least have a usable value.");
 	} else {
-		fwts_failed(fw, LOG_LEVEL_MEDIUM,
-			    "FADTPm2CntBlkNotSet",
-			    "FADT PM2_CNT_BLK is a required field and must "
-			    "have either a 32-bit or 64-bit address set.");
-		fwts_advice(fw,
-			    "Both FADT 32- and 64-bit PM2_CNT_BLK "
-			    "fields are being used, but only one should be "
-			    "non-zero.  Since the fields value are not equal "
-			    "the kernel cannot unambiguously determine which "
-			    "value is the correct one.");
+		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
+			fwts_failed(fw, LOG_LEVEL_MEDIUM,
+				    "FADTPm2CntBlkNotSet",
+				    "FADT PM2_CNT_BLK is a required field and must "
+				    "have either a 32-bit or 64-bit address set.");
+			fwts_advice(fw,
+				    "Both FADT 32- and 64-bit PM2_CNT_BLK "
+				    "fields are being used, but only one should be "
+				    "non-zero.  Since the fields value are not equal "
+				    "the kernel cannot unambiguously determine which "
+				    "value is the correct one.");
+		}
+		fwts_passed(fw, "FADT 64-bit X_PM2_CNT_BLK field is set "
+			    "and 32-bit PM2_CNT_BLK will be ignored.");
 	}
 }
 
@@ -1183,16 +1202,20 @@  static void acpi_table_check_fadt_pm_tmr_blk(fwts_framework *fw)
 			    "non-zero.  However, they are at least equal so "
 			    "the kernel will at least have a usable value.");
 	} else {
-		fwts_failed(fw, LOG_LEVEL_MEDIUM,
-			    "FADTPm2CntBlkNotSet",
-			    "FADT PM1A_CNT_BLK is a required field and must "
-			    "have either a 32-bit or 64-bit address set.");
-		fwts_advice(fw,
-			    "Both FADT 32- and 64-bit PM_TMR_BLK "
-			    "fields are being used, but only one should be "
-			    "non-zero.  Since the fields value are not equal "
-			    "the kernel cannot unambiguously determine which "
-			    "value is the correct one.");
+		if (fwts_get_acpi_version(fw) <= FWTS_ACPI_VERSION_61) {
+			fwts_failed(fw, LOG_LEVEL_MEDIUM,
+				    "FADTPm2CntBlkNotSet",
+				    "FADT PM1A_CNT_BLK is a required field and must "
+				    "have either a 32-bit or 64-bit address set.");
+			fwts_advice(fw,
+				    "Both FADT 32- and 64-bit PM_TMR_BLK "
+				    "fields are being used, but only one should be "
+				    "non-zero.  Since the fields value are not equal "
+				    "the kernel cannot unambiguously determine which "
+				    "value is the correct one.");
+		}
+		fwts_passed(fw, "FADT 64-bit X_PM_TMR_BLK field is set "
+			    "and 32-bit PM_TMR_BLK will be ignored.");
 	}
 }