| From 2ba33a4e9e22ac4dda928d3e9b5978a3a2ded4e0 Mon Sep 17 00:00:00 2001 |
| From: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Date: Wed, 12 Feb 2020 17:59:40 +0300 |
| Subject: ACPI: watchdog: Fix gas->access_width usage |
| |
| From: Mika Westerberg <mika.westerberg@linux.intel.com> |
| |
| commit 2ba33a4e9e22ac4dda928d3e9b5978a3a2ded4e0 upstream. |
| |
| ACPI Generic Address Structure (GAS) access_width field is not in bytes |
| as the driver seems to expect in few places so fix this by using the |
| newly introduced macro ACPI_ACCESS_BYTE_WIDTH(). |
| |
| Fixes: b1abf6fc4982 ("ACPI / watchdog: Fix off-by-one error at resource assignment") |
| Fixes: 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") |
| Reported-by: Jean Delvare <jdelvare@suse.de> |
| Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Reviewed-by: Jean Delvare <jdelvare@suse.de> |
| Cc: 4.16+ <stable@vger.kernel.org> # 4.16+ |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/acpi/acpi_watchdog.c | 3 +-- |
| drivers/watchdog/wdat_wdt.c | 2 +- |
| 2 files changed, 2 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/acpi/acpi_watchdog.c |
| +++ b/drivers/acpi/acpi_watchdog.c |
| @@ -126,12 +126,11 @@ void __init acpi_watchdog_init(void) |
| gas = &entries[i].register_region; |
| |
| res.start = gas->address; |
| + res.end = res.start + ACPI_ACCESS_BYTE_WIDTH(gas->access_width) - 1; |
| if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { |
| res.flags = IORESOURCE_MEM; |
| - res.end = res.start + ALIGN(gas->access_width, 4) - 1; |
| } else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) { |
| res.flags = IORESOURCE_IO; |
| - res.end = res.start + gas->access_width - 1; |
| } else { |
| pr_warn("Unsupported address space: %u\n", |
| gas->space_id); |
| --- a/drivers/watchdog/wdat_wdt.c |
| +++ b/drivers/watchdog/wdat_wdt.c |
| @@ -389,7 +389,7 @@ static int wdat_wdt_probe(struct platfor |
| |
| memset(&r, 0, sizeof(r)); |
| r.start = gas->address; |
| - r.end = r.start + gas->access_width - 1; |
| + r.end = r.start + ACPI_ACCESS_BYTE_WIDTH(gas->access_width) - 1; |
| if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { |
| r.flags = IORESOURCE_MEM; |
| } else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) { |
