From: Borislav Petkov <bp@alien8.de>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
Jiang Liu <jiang.liu@linux.intel.com>,
x86@kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Yinghai Lu <yinghai@kernel.org>
Subject: Re: [patch 2/4] x86: pci: acpi: Respect ioresource flags
Date: Fri, 12 Dec 2014 14:39:45 +0100 [thread overview]
Message-ID: <20141212133945.GB30699@pd.tnic> (raw)
In-Reply-To: <20141211193112.630941351@linutronix.de>
On Thu, Dec 11, 2014 at 07:48:20PM -0000, Thomas Gleixner wrote:
> setup_res() blindly clear all resource->flags except IO and MEM. So if
> a resource is marked disabled by the acpi code, setup_res() will use
> it nevertheless.
>
> Preserve the flags and add proper checks to setup_res() and
> __release_pci_root_info(). The latter is simplified while at it.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
> arch/x86/pci/acpi.c | 35 ++++++++++++++++-------------------
> 1 file changed, 16 insertions(+), 19 deletions(-)
>
> Index: tip/arch/x86/pci/acpi.c
> ===================================================================
> --- tip.orig/arch/x86/pci/acpi.c
> +++ tip/arch/x86/pci/acpi.c
> @@ -218,6 +218,12 @@ static void teardown_mcfg_map(struct pci
> }
> #endif
>
> +static bool is_valid_resource(struct resource *res)
> +{
> + return (res->flags & (IORESOURCE_MEM | IORESOURCE_IO)) &&
> + !(res->flags & IORESOURCE_DISABLED);
> +}
> +
> static acpi_status count_resource(struct acpi_resource *acpi_res, void *data)
> {
> struct pci_root_info *info = data;
> @@ -228,7 +234,7 @@ static acpi_status count_resource(struct
> !acpi_dev_resource_address_space(acpi_res, &r))
> return AE_OK;
>
> - if ((r.flags & (IORESOURCE_IO | IORESOURCE_MEM)) && resource_size(&r))
> + if (is_valid_resource(&r))
> info->res_num++;
>
> return AE_OK;
Ok, this makes definitely more sense in getting rid of the
*clearing* of the flags which is intuitively backwards to what it should
do.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
next prev parent reply other threads:[~2014-12-12 13:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-11 19:48 [patch 0/4] x86: Fix the ACPI resource handling and range checking Thomas Gleixner
2014-12-11 19:48 ` [patch 1/4] x86, pci, acpi: Redo sanity checks for root brigde probing Thomas Gleixner
2014-12-12 11:33 ` Borislav Petkov
2014-12-11 19:48 ` [patch 2/4] x86: pci: acpi: Respect ioresource flags Thomas Gleixner
2014-12-12 13:39 ` Borislav Petkov [this message]
2014-12-11 19:48 ` [patch 3/4] x86: pci: acpi: Fix the range check for IO resources Thomas Gleixner
2014-12-12 14:56 ` Borislav Petkov
2014-12-11 19:48 ` [patch 4/4] acpi: ioapic: Respect the resource flags Thomas Gleixner
2014-12-12 2:44 ` Yinghai Lu
2014-12-12 7:53 ` Thomas Gleixner
2014-12-12 8:24 ` Yinghai Lu
2014-12-12 8:46 ` Jiang Liu
2014-12-12 11:43 ` Thomas Gleixner
2014-12-17 5:44 ` Jiang Liu
2014-12-17 8:55 ` Thomas Gleixner
2014-12-12 11:39 ` Thomas Gleixner
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=20141212133945.GB30699@pd.tnic \
--to=bp@alien8.de \
--cc=bhelgaas@google.com \
--cc=jiang.liu@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yinghai@kernel.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
all inboxes | Powered by JetHome®