From: Liu Jiang <liuj97@gmail.com>
To: Kevin Hao <haokexin@gmail.com>
Cc: linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>
Subject: Re: [PATCH 2/2] PCI: unset the resource if we can't get the correct CPU address
Date: Fri, 17 May 2013 00:18:07 +0800 [thread overview]
Message-ID: <519506BF.3010400@gmail.com> (raw)
In-Reply-To: <1368536876-27307-3-git-send-email-haokexin@gmail.com>
On Tue 14 May 2013 09:07:56 PM CST, Kevin Hao wrote:
> In the current kernel, we just set the CPU address to the bus address
> if we can't find the match region for one specific bus address. If BAR
> of one pci device is set to address which happens to be a legitimate
> CPU address by firmware, the kernel will think this resource is legal
> and will not try to reassign later. In cases the CPU address and bus
> address isn't equal, the device will not work. So we should check
> if we can translate the bus address to CPU address correctly. If not,
> we should unset this resource and wish the kernel will reassign it
> later.
>
> Since we will invoke pcibios_bus_to_resource unconditionally if we
> don't goto fail, move it out of if/else wrap.
>
> Signed-off-by: Kevin Hao <haokexin@gmail.com>
> ---
> drivers/pci/probe.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 70f10fa..c96772f 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -250,12 +250,10 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
> pci_write_config_dword(dev, pos + 4, 0);
> region.start = 0;
> region.end = sz64;
> - pcibios_bus_to_resource(dev, res, ®ion);
> bar_disabled = true;
> } else {
> region.start = l64;
> region.end = l64 + sz64;
> - pcibios_bus_to_resource(dev, res, ®ion);
> }
> } else {
> sz = pci_size(l, sz, mask);
> @@ -265,7 +263,12 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
>
> region.start = l;
> region.end = l + sz;
> - pcibios_bus_to_resource(dev, res, ®ion);
> + }
> +
> + if (!pcibios_bus_to_resource(dev, res, ®ion)) {
> + res->flags |= IORESOURCE_UNSET;
> + res->end -= res->start;
> + res->start = 0;
> }
>
> goto out;
Hi Kevin,
Will this break subtractive decode PCI bridges and devices?
Regards!
Gerry
next prev parent reply other threads:[~2013-05-16 16:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-14 13:07 [PATCH 0/2] fix the pci device malfunction if a wrong bus address is assigned by firmware Kevin Hao
2013-05-14 13:07 ` [PATCH 1/2] PCI: make pcibios_bus_to_resource return either success or failure Kevin Hao
2013-05-14 13:07 ` [PATCH 2/2] PCI: unset the resource if we can't get the correct CPU address Kevin Hao
2013-05-16 16:18 ` Liu Jiang [this message]
2013-05-17 2:11 ` Kevin Hao
2013-05-17 14:51 ` Liu Jiang
2013-05-19 2:24 ` Kevin Hao
2013-05-20 15:27 ` Liu Jiang
2013-05-23 20:22 ` Bjorn Helgaas
2013-05-24 2:54 ` Kevin Hao
2013-05-24 17:13 ` Bjorn Helgaas
2013-05-25 11:17 ` Kevin Hao
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=519506BF.3010400@gmail.com \
--to=liuj97@gmail.com \
--cc=bhelgaas@google.com \
--cc=haokexin@gmail.com \
--cc=linux-pci@vger.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;
as well as URLs for NNTP newsgroup(s).