From: Jean Delvare <jdelvare@suse.de>
To: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>,
linux-acpi@vger.kernel.org,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
linux-watchdog@vger.kernel.org,
Robert Moore <robert.moore@intel.com>,
Erik Kaneda <erik.kaneda@intel.com>,
Tom Abraham <tabraham@suse.com>
Subject: Re: [PATCH v2 2/3] ACPI / watchdog: Fix gas->access_width usage
Date: Wed, 12 Feb 2020 16:55:37 +0100 [thread overview]
Message-ID: <20200212165537.46f251cf@endymion> (raw)
In-Reply-To: <20200212145941.32914-3-mika.westerberg@linux.intel.com>
On Wed, 12 Feb 2020 17:59:40 +0300, Mika Westerberg wrote:
> 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")
It does not actually fix that commit, as the bug already existed prior
to it. It has to be applied on top of that commit though because they
touch the same lines, granted.
> 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>
> ---
> drivers/acpi/acpi_watchdog.c | 3 +--
> drivers/watchdog/wdat_wdt.c | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
> index b5516b04ffc0..d827a4a3e946 100644
> --- 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);
> diff --git a/drivers/watchdog/wdat_wdt.c b/drivers/watchdog/wdat_wdt.c
> index b069349b52f5..e1b1fcfc02af 100644
> --- a/drivers/watchdog/wdat_wdt.c
> +++ b/drivers/watchdog/wdat_wdt.c
> @@ -389,7 +389,7 @@ static int wdat_wdt_probe(struct platform_device *pdev)
>
> 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) {
Reviewed-by: Jean Delvare <jdelvare@suse.de>
--
Jean Delvare
SUSE L3 Support
next prev parent reply other threads:[~2020-02-12 15:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 14:59 [PATCH v2 0/3] ACPI / watchdog: Fix two reported issues Mika Westerberg
2020-02-12 14:59 ` [PATCH v2 1/3] ACPICA: Introduce ACPI_ACCESS_BYTE_WIDTH() macro Mika Westerberg
2020-02-12 21:02 ` Moore, Robert
2020-02-12 14:59 ` [PATCH v2 2/3] ACPI / watchdog: Fix gas->access_width usage Mika Westerberg
2020-02-12 15:55 ` Jean Delvare [this message]
2020-02-12 16:58 ` Mika Westerberg
2020-02-12 14:59 ` [PATCH v2 3/3] ACPI / watchdog: Set default timeout in probe Mika Westerberg
2020-02-12 16:04 ` Jean Delvare
2020-02-13 22:53 ` [PATCH v2 0/3] ACPI / watchdog: Fix two reported issues Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200212165537.46f251cf@endymion \
--to=jdelvare@suse.de \
--cc=erik.kaneda@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mika.westerberg@linux.intel.com \
--cc=rjw@rjwysocki.net \
--cc=robert.moore@intel.com \
--cc=tabraham@suse.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).