[git pull] PCI fixes

[git pull] PCI fixes

[Jesse Barnes]

[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]

The following changes since commit
839d8810747bbf39e0a5a7f223b67bffa7945f8d:

  Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (2011-10-30 15:54:59 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci for-linus

Nothing too exciting this time, mostly some minor fixes for things
normal people don't really hit.  Happy Thanksgiving.

Bjorn Helgaas (1):
      PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs

Joerg Roedel (2):
      PCI: Fix compile errors with PCI_ATS and !PCI_IOV
      PCI: Let PCI_PRI depend on PCI

Kenji Kaneshige (2):
      PCI: pciehp: wait 1000 ms before Link Training check
      PCI: pciehp: wait 100 ms after Link Training check

Rafael J. Wysocki (1):
      PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug

Yinghai Lu (1):
      PCI: pciehp: Retrieve link speed after link is trained

 drivers/pci/Kconfig                |    1 +
 drivers/pci/hotplug/acpiphp_glue.c |   29 ++++++++++++++++++++++++-----
 drivers/pci/hotplug/pciehp_ctrl.c  |    3 ---
 drivers/pci/hotplug/pciehp_hpc.c   |   27 ++++++++++++++++++---------
 drivers/pci/hotplug/shpchp_core.c  |    4 ++--
 drivers/pci/hotplug/shpchp_hpc.c   |    4 ++--
 include/linux/pci-ats.h            |    6 +++---
 include/linux/pci.h                |    2 +-
 8 files changed, 51 insertions(+), 25 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [git pull] PCI fixes

[Linus Torvalds]

On Wed, Nov 23, 2011 at 2:44 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Nothing too exciting this time, mostly some minor fixes for things
> normal people don't really hit.  Happy Thanksgiving.

Ugh. This looks bogus:

> Kenji Kaneshige (2):
>      PCI: pciehp: wait 1000 ms before Link Training check

Look at that patch more closely. After the patch, the code looks like this:


         if (ctrl->link_active_reporting)
                 pcie_wait_link_active(ctrl);
         else
                 msleep(1000);

+	/*
+	 * Need to wait for 1000 ms after Data Link Layer Link Active
+	 * (DLLLA) bit reads 1b before sending configuration request.
+	 * We need it before checking Link Training (LT) bit becuase
+	 * LT is still set even after DLLLA bit is set on some platform.
+	 */
+	msleep(1000);

and I'm pretty sure you should remove the "else msleep(1000)" there.
Doing the 1s wait *twice* seems entirely bogus, even if you are
missing link_active_reporting. No?

I pulled it since I can't test it, but it really smells fishy to me.

                  Linus

Re: [git pull] PCI fixes

[Jesse Barnes]

[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]

On Wed, 23 Nov 2011 15:02:01 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Wed, Nov 23, 2011 at 2:44 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Nothing too exciting this time, mostly some minor fixes for things
> > normal people don't really hit.  Happy Thanksgiving.
> 
> Ugh. This looks bogus:
> 
> > Kenji Kaneshige (2):
> >      PCI: pciehp: wait 1000 ms before Link Training check
> 
> Look at that patch more closely. After the patch, the code looks like this:
> 
> 
>          if (ctrl->link_active_reporting)
>                  pcie_wait_link_active(ctrl);
>          else
>                  msleep(1000);
> 
> +	/*
> +	 * Need to wait for 1000 ms after Data Link Layer Link Active
> +	 * (DLLLA) bit reads 1b before sending configuration request.
> +	 * We need it before checking Link Training (LT) bit becuase
> +	 * LT is still set even after DLLLA bit is set on some platform.
> +	 */
> +	msleep(1000);
> 
> and I'm pretty sure you should remove the "else msleep(1000)" there.
> Doing the 1s wait *twice* seems entirely bogus, even if you are
> missing link_active_reporting. No?
> 
> I pulled it since I can't test it, but it really smells fishy to me.

Sure looks like it... Kenji-san, you went back and forth on this one a
little, can you confirm (and preferably test)?

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [git pull] PCI fixes

[Kenji Kaneshige]

(2011/12/06 4:22), Jesse Barnes wrote:
> On Wed, 23 Nov 2011 15:02:01 -0800
> Linus Torvalds<torvalds@linux-foundation.org>  wrote:
>
>> On Wed, Nov 23, 2011 at 2:44 PM, Jesse Barnes<jbarnes@virtuousgeek.org>  wrote:
>>>
>>> Nothing too exciting this time, mostly some minor fixes for things
>>> normal people don't really hit.  Happy Thanksgiving.
>>
>> Ugh. This looks bogus:
>>
>>> Kenji Kaneshige (2):
>>>       PCI: pciehp: wait 1000 ms before Link Training check
>>
>> Look at that patch more closely. After the patch, the code looks like this:
>>
>>
>>           if (ctrl->link_active_reporting)
>>                   pcie_wait_link_active(ctrl);
>>           else
>>                   msleep(1000);
>>
>> +	/*
>> +	 * Need to wait for 1000 ms after Data Link Layer Link Active
>> +	 * (DLLLA) bit reads 1b before sending configuration request.
>> +	 * We need it before checking Link Training (LT) bit becuase
>> +	 * LT is still set even after DLLLA bit is set on some platform.
>> +	 */
>> +	msleep(1000);
>>
>> and I'm pretty sure you should remove the "else msleep(1000)" there.
>> Doing the 1s wait *twice* seems entirely bogus, even if you are
>> missing link_active_reporting. No?
>>
>> I pulled it since I can't test it, but it really smells fishy to me.
>
> Sure looks like it... Kenji-san, you went back and forth on this one a
> little, can you confirm (and preferably test)?
>
> Thanks,

I'm very sorry for the long delay.

Each 1000 ms wait has defferent meaning. But as Linus pointed out, the
first one ("else msleep(1000)") can be removed. I'll work on this.
Though the patch is not clean, I tested it from the regression point of
view. And Yinghai also confirmed it fix his problem.

Here are explanation for each 1000 ms with history.

>>           if (ctrl->link_active_reporting)
>>                   pcie_wait_link_active(ctrl);
>>           else
>>                   msleep(1000);

This chunk is to wait for Link Active. After PCIe specification 1.1,
downstream port with hotplug slots needs to support link active reporting.
But older specification PCIe 1.0a doesn't have link active reporting. The
"else msleep(1000)" is for PCIe 1.0a. It wait for 1 sec instead of polling
data link layer link active bit. In PCIe 1.0a spec, the bit corresponding
to the data link layer link active bit in PCIe 1.1 or later is defined
reserved zero. So as Linus pointed out, we can remove "else msleep(1000)".
The reason why I added "if (crtl->link_active_reporting)" here was that I
didn't want to change the behavior for old hot-plug controller (PCIe 1.0a),
but I think it was too much.

>> +	/*
>> +	 * Need to wait for 1000 ms after Data Link Layer Link Active
>> +	 * (DLLLA) bit reads 1b before sending configuration request.
>> +	 * We need it before checking Link Training (LT) bit becuase
>> +	 * LT is still set even after DLLLA bit is set on some platform.
>> +	 */
>> +	msleep(1000);

In the past, pciehp waits 100 ms instead of 1 sec after checking the link
state. This 100 ms was based on PCIe spec. But we encountered the problem
that configuration access to some HBA card doesn't return the proper value.
To fix this problem, we replaced this 100 ms wait with 1 sec wait. This is
based on the PCIe description "software must allow 1 second after the Data
Link Layer Link Active bit reads 1b before it is permitted to determine
that a hot plugged device which fails to return a Successful Completion for
a Valid Configuration Request is a broken device". Then, another problem
was reported by Yinghai Lu. The problem is that LT bit is still set even
after DLLLA bit is set on his platform. To fix the problem 1 sec wait was
moved to before LT check, which was placed after LT check.

Regards,
Kenji Kaneshige

Re: [git pull] PCI fixes

[Linus Torvalds]

On Tue, Dec 6, 2011 at 12:08 AM, Kenji Kaneshige
<kaneshige.kenji@jp.fujitsu.com> wrote:
>
> In the past, pciehp waits 100 ms instead of 1 sec after checking the link
> state. This 100 ms was based on PCIe spec.

I would like to point out that these kinds of delays are *really*
annoying to users. And they add up.

One second per se is not a huge problem, but imagine that you're
hotplugging some regular user device (think thunderbolt or something
that we'd expect normal users to see). First one second for the kernel
to even see it, then some random udev rules, then some disk spinup
times or whatever, and soon a few delays here and a few delays there,
and it takes say three seconds for the folder to show up on the
desktop (or whatever acknowledgement of "yes, I see your device now").

That's a *long* time, and it's irritating to the user. It makes the
user think "the machine is slow".

We used to have this exact problem with USB hotplugging with slow
devices, so I know. It's still not necessarily immediate, but it's
better than it has been.

One second *total* is what people will consider pretty much immediate.
Any more than that is "thumb twiddling time".

And quite frankly, an unconditional one-second delay here seems bad.
Two seconds was unacceptable, one second is just bad.

>                                                              This is
> based on the PCIe description "software must allow 1 second after the Data
> Link Layer Link Active bit reads 1b before it is permitted to determine
> that a hot plugged device which fails to return a Successful Completion for
> a Valid Configuration Request is a broken device".

Quite frankly, the way that reads to me says "you must wait at most 1s
before you consider a device broken".

But a *successful* read of the LT bit should abort the wait early. So
that good devices that aren't broken can complete setup much faster.

Please try to make something like that work. Instead of always waiting
for one second, wait for up to one second only for failure cases. Any
possibility of that?

Clearly most devices are perfectly fine almost immediately. It's sad
to wait for good devices for no good reason.

                       Linus

Re: [git pull] PCI fixes

[Yinghai Lu]

[-- Attachment #1: Type: text/plain, Size: 453 bytes --]

On Tue, Dec 6, 2011 at 8:14 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> Please try to make something like that work. Instead of always waiting
> for one second, wait for up to one second only for failure cases. Any
> possibility of that?

i had another version that was not send out. that worked on my test setups too.
it will try to read pci conf several times in 1s.

please check refreshed version against your tree.

Thanks

Yinghai

[-- Attachment #2: pciehp_debug_x_3_1_access_pci_conf.patch --]
[-- Type: text/x-patch, Size: 2158 bytes --]

---
 drivers/pci/hotplug/pciehp_hpc.c |   47 ++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 15 deletions(-)

Index: linux-2.6/drivers/pci/hotplug/pciehp_hpc.c
===================================================================
--- linux-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c
+++ linux-2.6/drivers/pci/hotplug/pciehp_hpc.c
@@ -265,6 +265,35 @@ static void pcie_wait_link_active(struct
 	ctrl_dbg(ctrl, "Data Link Layer Link Active not set in 1000 msec\n");
 }
 
+static bool pci_bus_check_dev(struct pci_bus *bus, int devfn)
+{
+	u32 l;
+	int delay = 1000;
+
+again:
+	if (pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &l))
+		goto wait;
+
+	/* some broken boards return 0 or ~0 if a slot is empty: */
+	if (l == 0xffffffff || l == 0x00000000 ||
+	    l == 0x0000ffff || l == 0xffff0000)
+		goto wait;
+
+	/* Configuration request Retry Status */
+	if (l == 0xffff0001)
+		goto wait;
+
+	return true;
+
+wait:
+	mdelay(100);
+	delay -= 100;
+	if (delay > 0)
+		goto again;
+
+	return false;
+}
+
 int pciehp_check_link_status(struct controller *ctrl)
 {
 	u16 lnk_status;
@@ -280,13 +309,9 @@ int pciehp_check_link_status(struct cont
         else
                 msleep(1000);
 
-	/*
-	 * Need to wait for 1000 ms after Data Link Layer Link Active
-	 * (DLLLA) bit reads 1b before sending configuration request.
-	 * We need it before checking Link Training (LT) bit becuase
-	 * LT is still set even after DLLLA bit is set on some platform.
-	 */
-	msleep(1000);
+	/* wait 100ms before read pci conf, and try in 1s */
+	msleep(100);
+	pci_bus_check_dev(ctrl->pcie->port->subordinate, PCI_DEVFN(0, 0));
 
 	retval = pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status);
 	if (retval) {
@@ -302,14 +327,6 @@ int pciehp_check_link_status(struct cont
 		return retval;
 	}
 
-	/*
-	 * If the port supports Link speeds greater than 5.0 GT/s, we
-	 * must wait for 100 ms after Link training completes before
-	 * sending configuration request.
-	 */
-	if (ctrl->pcie->port->subordinate->max_bus_speed > PCIE_SPEED_5_0GT)
-		msleep(100);
-
 	pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);
 
 	return retval;

Re: [git pull] PCI fixes

[Kenji Kaneshige]

(2011/12/07 1:14), Linus Torvalds wrote:
> On Tue, Dec 6, 2011 at 12:08 AM, Kenji Kaneshige
> <kaneshige.kenji@jp.fujitsu.com>  wrote:
>>
>> In the past, pciehp waits 100 ms instead of 1 sec after checking the link
>> state. This 100 ms was based on PCIe spec.
>
> I would like to point out that these kinds of delays are *really*
> annoying to users. And they add up.
>
> One second per se is not a huge problem, but imagine that you're
> hotplugging some regular user device (think thunderbolt or something
> that we'd expect normal users to see). First one second for the kernel
> to even see it, then some random udev rules, then some disk spinup
> times or whatever, and soon a few delays here and a few delays there,
> and it takes say three seconds for the folder to show up on the
> desktop (or whatever acknowledgement of "yes, I see your device now").
>
> That's a *long* time, and it's irritating to the user. It makes the
> user think "the machine is slow".
>
> We used to have this exact problem with USB hotplugging with slow
> devices, so I know. It's still not necessarily immediate, but it's
> better than it has been.
>
> One second *total* is what people will consider pretty much immediate.
> Any more than that is "thumb twiddling time".
>
> And quite frankly, an unconditional one-second delay here seems bad.
> Two seconds was unacceptable, one second is just bad.
>
>>                                                               This is
>> based on the PCIe description "software must allow 1 second after the Data
>> Link Layer Link Active bit reads 1b before it is permitted to determine
>> that a hot plugged device which fails to return a Successful Completion for
>> a Valid Configuration Request is a broken device".
>
> Quite frankly, the way that reads to me says "you must wait at most 1s
> before you consider a device broken".
>
> But a *successful* read of the LT bit should abort the wait early. So
> that good devices that aren't broken can complete setup much faster.
>
> Please try to make something like that work. Instead of always waiting
> for one second, wait for up to one second only for failure cases. Any
> possibility of that?
>
> Clearly most devices are perfectly fine almost immediately. It's sad
> to wait for good devices for no good reason.
>

Thank you for comments. Yes, I think we can do more efforts on this.

To improve this, I think what we need is something to know if configuration
request to the hot-added device starts working. One possible idea so far is
to enable CRS Software Visibility and check vendor ID. The pci_scan_device()
function already has vendor ID check, but the code to enable CRS was removed
for some reason.

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ad7edfe0490877864dc0312e5f3315ea37fc4b3a

Regards,
Kenji Kaneshige

Re: [git pull] PCI fixes

[Kenji Kaneshige]

+	/* Configuration request Retry Status */
+	if (l == 0xffff0001)
+		goto wait;

I think this works only when CRS Software Visibility is enabled,
isn't it? Currently there is no code to enable CRS Software
Visibility. And there can be root ports that doesn't support CRS
Software Visibility. We need consideration about this.

+	mdelay(100);
+	delay -= 100;
+	if (delay > 0)
+		goto again;

We must use msleep() instead of mdelay().

Regards,
Kenji Kaneshige


(2011/12/07 7:36), Yinghai Lu wrote:
> On Tue, Dec 6, 2011 at 8:14 AM, Linus Torvalds
> <torvalds@linux-foundation.org>  wrote:
>> Please try to make something like that work. Instead of always waiting
>> for one second, wait for up to one second only for failure cases. Any
>> possibility of that?
>
> i had another version that was not send out. that worked on my test setups too.
> it will try to read pci conf several times in 1s.
>
> please check refreshed version against your tree.
>
> Thanks
>
> Yinghai

Re: [git pull] PCI fixes

[Yinghai Lu]

On Wed, Dec 7, 2011 at 12:18 AM, Kenji Kaneshige
<kaneshige.kenji@jp.fujitsu.com> wrote:
> +       /* Configuration request Retry Status */
> +       if (l == 0xffff0001)
> +               goto wait;
>
> I think this works only when CRS Software Visibility is enabled,
> isn't it? Currently there is no code to enable CRS Software
> Visibility. And there can be root ports that doesn't support CRS
> Software Visibility. We need consideration about this.

I copied and change from pci_scan_device...

/*
 * Read the config data for a PCI device, sanity-check it
 * and fill in the dev structure...
 */
static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
{
        struct pci_dev *dev;
        u32 l;
        int delay = 1;

        if (pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &l))
                return NULL;

        /* some broken boards return 0 or ~0 if a slot is empty: */
        if (l == 0xffffffff || l == 0x00000000 ||
            l == 0x0000ffff || l == 0xffff0000)
                return NULL;

        /* Configuration request Retry Status */
        while (l == 0xffff0001) {
                msleep(delay);
                delay *= 2;
                if (pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &l))
                        return NULL;
                /* Card hasn't responded in 60 seconds?  Must be stuck. */
                if (delay > 60 * 1000) {
                        printk(KERN_WARNING "pci %04x:%02x:%02x.%d: not "
                                        "responding\n", pci_domain_nr(bus),
                                        bus->number, PCI_SLOT(devfn),
                                        PCI_FUNC(devfn));
                        return NULL;
                }
        }

so CRS code is not removed cleanly?

>
> +       mdelay(100);
> +       delay -= 100;
> +       if (delay > 0)
> +               goto again;
>
> We must use msleep() instead of mdelay().

yes.

Thanks

Yinghai Lu

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
45196cee28a5bcfb6ddbe2bffa4270cbed66ae4b:

  Merge tag 'usb-3.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (2012-02-22 13:00:53 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci for-linus

A couple of fixes for booting specific machines, and one for a minor
memory leak on pre-_CRS platforms.

Jonathan Nieder (2):
      x86/PCI: use host bridge _CRS info on MSI MS-7253
      x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version

Yinghai Lu (1):
      PCI: fix memleak when ACPI _CRS is not used.

 arch/x86/pci/acpi.c |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

Thanks,
Jesse

[git pull] PCI fixes

[Jesse Barnes]

[-- Attachment #1: Type: text/plain, Size: 821 bytes --]

The following changes since commit
acb42a3b611d7ad4cb173c3b37674b549df2ffeb:

  Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2012-01-27 07:56:25 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci for-linus

One regression fix for SR-IOV on PPC and a couple of misc fixes from
Yinghai.

Vaidyanathan Srinivasan (1):
      PCI: set pci sriov page size before reading SRIOV BAR

Yinghai Lu (2):
      PCI: workaround hard-wired bus number V2
      PCI: Fix pci cardbus removal

 drivers/pci/iov.c    |    3 +--
 drivers/pci/probe.c  |    5 +++++
 drivers/pci/remove.c |   28 ++++++++++++++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [git pull] PCI fixes

[Yinghai Lu]

On Fri, Jan 6, 2012 at 12:46 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> There was some talk awhile back of pulling the SR-IOV resources out of
> the pci_dev resource array (adding a separate member to track them only
> if CONFIG_PCI_IOV is enabled), that would probably be the way to go.
> Then fix up whatever resource walking code that cares about IOV BARs
> (there isn't much I think).
>
> Any thoughts Yinghai?

We can add helpers like
for_each_resource_for_dev()
for_each_resource_for_dev_bridge()

Thanks

Yinghai

Re: [git pull] PCI fixes

[Jesse Barnes]

[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]

On Sun, 18 Dec 2011 14:14:13 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Sat, Dec 17, 2011 at 9:52 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Crap, and after you guys spent so long coming up with a clean version.
> >
> > Linus, can you just apply this one on top? I think it's the one Yinghai and Ram agreed to.
> 
> Ok, applied, but I have to say that I hate it.
> 
> Why don't we just move the stupid iov indexes to the end, and then
> ignore them by not counting through them in
> __pci_enable_device_flags()? So the regular PCI code would always walk
> through the resources 0 .. PCI_BRIDGE_RESOURCES_END or something. And
> then the magic IOV code could look at its own ones that the generic
> code apparently doesn't even want to know about.
> 
> Hmm?

There was some talk awhile back of pulling the SR-IOV resources out of
the pci_dev resource array (adding a separate member to track them only
if CONFIG_PCI_IOV is enabled), that would probably be the way to go.
Then fix up whatever resource walking code that cares about IOV BARs
(there isn't much I think).

Any thoughts Yinghai?

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [git pull] PCI fixes

[Linus Torvalds]

On Sat, Dec 17, 2011 at 9:52 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Crap, and after you guys spent so long coming up with a clean version.
>
> Linus, can you just apply this one on top? I think it's the one Yinghai and Ram agreed to.

Ok, applied, but I have to say that I hate it.

Why don't we just move the stupid iov indexes to the end, and then
ignore them by not counting through them in
__pci_enable_device_flags()? So the regular PCI code would always walk
through the resources 0 .. PCI_BRIDGE_RESOURCES_END or something. And
then the magic IOV code could look at its own ones that the generic
code apparently doesn't even want to know about.

Hmm?

But as mentioned, in the meantime I applied this.

                Linus

Re: [git pull] PCI fixes

[Jesse Barnes]

Yinghai Lu <yinghai@kernel.org> wrote:

>On Sat, Dec 17, 2011 at 9:29 AM, Jesse Barnes
><jbarnes@virtuousgeek.org> wrote:
>> Ram Pai (1):
>>      PCI: defer enablement of SRIOV BARS
>
>oh, no!
>
>It seems you let the old version slip into linus tree.
>
>Now we need attached patch get into linus tree.
>
>Thanks
>
>Yinghai Lu

Crap, and after you guys spent so long coming up with a clean version.

Linus, can you just apply this one on top? I think it's the one Yinghai and Ram agreed to. 

Thanks, 
Jesse
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Yinghai Lu]

[-- Attachment #1: Type: text/plain, Size: 285 bytes --]

On Sat, Dec 17, 2011 at 9:29 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> Ram Pai (1):
>      PCI: defer enablement of SRIOV BARS

oh, no!

It seems you let the old version slip into linus tree.

Now we need attached patch get into linus tree.

Thanks

Yinghai Lu

[-- Attachment #2: fix_sriov_late.patch --]
[-- Type: text/x-patch, Size: 1660 bytes --]

[PATCH] pci: Fix hotplug of Express Module with pci bridges

Found hotplug of one setup does not work with recent change in pci tree.

After checking the bridge conf setup, found bridges get assigned, but not get enabled.

Finally found following commit, simplely ignore bridge resource when enabling pci device.

| commit bbef98ab0f019f1b0c25c1acdf1683c68933d41b
| Author: Ram Pai <linuxram@us.ibm.com>
| Date:   Sun Nov 6 10:33:10 2011 +0800
|
|    PCI: defer enablement of SRIOV BARS
|...
|    NOTE: Note, there is subtle change in the pci_enable_device() API.  Any
|    driver that depends on SRIOV BARS to be enabled in pci_enable_device()
|    can fail.

Put back bridge resource and ROM resource checking to fix the problem.

That should fix regression like BIOS does not assign correct resource to bridge.

Discussion can be found at:
	http://www.spinics.net/lists/linux-pci/msg12874.html

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 drivers/pci/pci.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/pci/pci.c
===================================================================
--- linux-2.6.orig/drivers/pci/pci.c
+++ linux-2.6/drivers/pci/pci.c
@@ -1139,7 +1139,11 @@ static int __pci_enable_device_flags(str
 	if (atomic_add_return(1, &dev->enable_cnt) > 1)
 		return 0;		/* already enabled */
 
-	for (i = 0; i < PCI_ROM_RESOURCE; i++)
+	/* only skip sriov related */
+	for (i = 0; i <= PCI_ROM_RESOURCE; i++)
+		if (dev->resource[i].flags & flags)
+			bars |= (1 << i);
+	for (i = PCI_BRIDGE_RESOURCES; i < DEVICE_COUNT_RESOURCE; i++)
 		if (dev->resource[i].flags & flags)
 			bars |= (1 << i);
 

[git pull] PCI fixes

[Jesse Barnes]

[-- Attachment #1: Type: text/plain, Size: 1177 bytes --]

The following changes since commit
8e8da023f5af71662867729db5547dc54786093c:

  x86: Fix boot failures on older AMD CPU's (2011-12-04 11:57:09 -0800)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci for-linus

Just a few regression fixes.  We have a fix for the extra msleep you
pointed out last time as well, but I was saving it for -next since it
took awhile for Kenji-san and Yinghai to settle on something, and it
changes a core behavior.

Ajaykumar Hotchandani (1):
      PCI: Set device power state to PCI_D0 for device without native PM support

James Bottomley (1):
      PCI: fix ats compile failure

Rafael J. Wysocki (1):
      PCI hotplug: Always allow acpiphp to handle non-PCIe bridges

Ram Pai (1):
      PCI: defer enablement of SRIOV BARS

 drivers/pci/ats.c                  |    1 +
 drivers/pci/hotplug/acpiphp_glue.c |   30 ++++++++++++------------------
 drivers/pci/iov.c                  |    7 +++++++
 drivers/pci/pci.c                  |    5 ++++-
 4 files changed, 24 insertions(+), 19 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [git pull] PCI fixes

[Jesse Barnes]

On Fri, 19 Aug 2011 10:12:24 -0700
Jesse Barnes <jbarnes@virtuousgeek.org> wrote:

> On Fri, 19 Aug 2011 09:46:54 -0700
> Greg KH <greg@kroah.com> wrote:
> 
> > On Fri, Aug 19, 2011 at 09:17:49AM -0700, Jesse Barnes wrote:
> > > The following changes since commit
> > > 5c80c71b9a0ec518b4b58d2a61de01a04f4a4453:
> > > 
> > >   Merge branch 'for-linus' of
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
> > >   (2011-08-18 14:20:00 -0700)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ..BRANCH.NOT.VERIFIED..
> > 
> > I think that branch name is not correct :)
> 
> Yeah a pull from that probably won't work will it?
> 
> for-linus is the branch name, sorry.

Here's the pull req for master.kernel.org so you know what to expect.
Looks like the mirroring is taking longer than usual right now.

The following changes since commit 5c80c71b9a0ec518b4b58d2a61de01a04f4a4453:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (2011-08-18 14:20:00 -0700)

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

David Daney (1):
      PCI: OF: Don't crash when bridge parent is NULL.

Jon Mason (2):
      PCI: Set PCI-E Max Payload Size on fabric
      PCI: export pcie_bus_configure_settings symbol

Ram Pai (3):
      PCI : ability to relocate assigned pci-resources
      PCI: make cardbus-bridge resources optional
      PCI: code and comments cleanup

Yinghai Lu (2):
      PCI: honor child buses add_size in hot plug configuration
      PCI: make SRIOV resources optional

 arch/x86/pci/acpi.c              |    9 ++
 drivers/pci/hotplug/pcihp_slot.c |   45 +----------
 drivers/pci/of.c                 |    2 +-
 drivers/pci/pci.c                |   67 +++++++++++++++
 drivers/pci/pci.h                |    4 +
 drivers/pci/probe.c              |  146 +++++++++++++++++++++++++++++++++
 drivers/pci/setup-bus.c          |  166 ++++++++++++++++++++++++++-----------
 drivers/pci/setup-res.c          |  152 ++++++++++++++++++++++-------------
 include/linux/pci.h              |   16 ++++-
 9 files changed, 454 insertions(+), 153 deletions(-)

Re: [git pull] PCI fixes

[Jesse Barnes]

On Fri, 19 Aug 2011 09:46:54 -0700
Greg KH <greg@kroah.com> wrote:

> On Fri, Aug 19, 2011 at 09:17:49AM -0700, Jesse Barnes wrote:
> > The following changes since commit
> > 5c80c71b9a0ec518b4b58d2a61de01a04f4a4453:
> > 
> >   Merge branch 'for-linus' of
> >   git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
> >   (2011-08-18 14:20:00 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ..BRANCH.NOT.VERIFIED..
> 
> I think that branch name is not correct :)

Yeah a pull from that probably won't work will it?

for-linus is the branch name, sorry.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Greg KH]

On Fri, Aug 19, 2011 at 09:17:49AM -0700, Jesse Barnes wrote:
> The following changes since commit
> 5c80c71b9a0ec518b4b58d2a61de01a04f4a4453:
> 
>   Merge branch 'for-linus' of
>   git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
>   (2011-08-18 14:20:00 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ..BRANCH.NOT.VERIFIED..

I think that branch name is not correct :)

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
5c80c71b9a0ec518b4b58d2a61de01a04f4a4453:

  Merge branch 'for-linus' of
  git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
  (2011-08-18 14:20:00 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ..BRANCH.NOT.VERIFIED..

I just pushed the OF fix and should have sent it earlier this week so
it's still mirroring out.  It's a trivial fix so I hope you don't mind
it missing out on the normal linux-next soak time.

The rest of the changes are mostly related to the now hidden resource
re-allocation code, along with a good couple from Jon to better handle
PCIe parameters (this one has been going through a lot of review and
testing, but I can move it over to my -next tree if you don't think
it's appropriate).

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

David Daney (1):
      PCI: OF: Don't crash when bridge parent is NULL.

Jon Mason (2):
      PCI: Set PCI-E Max Payload Size on fabric
      PCI: export pcie_bus_configure_settings symbol

Ram Pai (3):
      PCI : ability to relocate assigned pci-resources
      PCI: make cardbus-bridge resources optional
      PCI: code and comments cleanup

Yinghai Lu (2):
      PCI: honor child buses add_size in hot plug configuration
      PCI: make SRIOV resources optional

 arch/x86/pci/acpi.c              |    9 ++
 drivers/pci/hotplug/pcihp_slot.c |   45 +----------
 drivers/pci/of.c                 |    2 +-
 drivers/pci/pci.c                |   67 +++++++++++++++
 drivers/pci/pci.h                |    4 +
 drivers/pci/probe.c              |  146 +++++++++++++++++++++++++++++++++ 
 drivers/pci/setup-bus.c          |  166 ++++++++++++++++++++++++++-----------
 drivers/pci/setup-res.c          |  152 ++++++++++++++++++++++-------------
 include/linux/pci.h              |   16 ++++-
9 files changed, 454 insertions(+), 153 deletions(-)

Re: [git pull] PCI fixes

[Ram Pai]

On Tue, Jun 28, 2011 at 10:02:27AM -0700, Jesse Barnes wrote:
> On Fri, 24 Jun 2011 15:56:42 -0700
> Linus Torvalds <torvalds@linux-foundation.org> wrote:
> 
> > 
> > 
> > 
> > Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> > >
> > >How about a boot param?  We've done similar things for _CRS, and it
> > >might give Yinghai and Ram some more flexibility in improving our
> > >dynamic resource allocation before enabling it again (if ever).
> > 
> > I'm OK with that, but then I'd suggest against the currently not yet merged series that doesn't seem to work anyway...
> > 
> > IOW, just a simple patch that disables the resource re-allocation, and enables it with some command line option.
> 
> Ram or Yinghai, want to come up with something?  (And
> note: pci=bridge_realloc or something would be a lot more descriptive
> than pci=try=2!)
Jesse,

	Will have something your way soon.

RP

Re: [git pull] PCI fixes

[Jesse Barnes]

On Fri, 24 Jun 2011 15:56:42 -0700
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> 
> 
> 
> Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> >How about a boot param?  We've done similar things for _CRS, and it
> >might give Yinghai and Ram some more flexibility in improving our
> >dynamic resource allocation before enabling it again (if ever).
> 
> I'm OK with that, but then I'd suggest against the currently not yet merged series that doesn't seem to work anyway...
> 
> IOW, just a simple patch that disables the resource re-allocation, and enables it with some command line option.

Ram or Yinghai, want to come up with something?  (And
note: pci=bridge_realloc or something would be a lot more descriptive
than pci=try=2!)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Yinghai Lu]

On 06/24/2011 05:00 PM, Jesse Barnes wrote:
> On Fri, 24 Jun 2011 15:56:42 -0700
> Linus Torvalds <torvalds@linux-foundation.org> wrote:
> 
>>
>>
>>
>> Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>>>
>>> How about a boot param?  We've done similar things for _CRS, and it
>>> might give Yinghai and Ram some more flexibility in improving our
>>> dynamic resource allocation before enabling it again (if ever).
>>
>> I'm OK with that, but then I'd suggest against the currently not yet merged series that doesn't seem to work anyway...
>>
>> IOW, just a simple patch that disables the resource re-allocation, and enables it with some command line option.
> 
> Ok sounds good, thanks.

please check the draft one,  not sure if you like
pci=try=2
or
pci=reallocate_bridge


[PATCH] pci: disable pci trying to reallocate pci bridge by default.

| PCI: update bridge resources to get more big ranges when allocating space (again)
|	da7822e5ad71ec9b745b412639f1e5e0ba795a20

still too risky and cause some systems have problem.

Disable reallocating feature, So other user could use command line enable it
to enable it with "pci=try=2"

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 Documentation/kernel-parameters.txt |    6 ++++++
 drivers/pci/pci.c                   |    4 ++++
 drivers/pci/pci.h                   |    2 ++
 drivers/pci/setup-bus.c             |   15 +++++++++------
 4 files changed, 21 insertions(+), 6 deletions(-)

Index: linux-2.6/Documentation/kernel-parameters.txt
===================================================================
--- linux-2.6.orig/Documentation/kernel-parameters.txt
+++ linux-2.6/Documentation/kernel-parameters.txt
@@ -1980,6 +1980,12 @@ bytes respectively. Such letter suffixes
 				for broken drivers that don't call it.
 		skip_isa_align	[X86] do not align io start addr, so can
 				handle more pci cards
+		try=n		set the pci_try_num to reallocate the pci bridge resource
+				1: default
+				2: will set the num to max_depth, and try to reallocate res
+				   to get big range for the bridge. assume the pci peer root
+				   resource is right from _CRS or from hostbridge pci reg
+				   reading out.
 		firmware	[ARM] Do not re-enumerate the bus but instead
 				just use the configuration from the
 				bootloader. This is currently used on
Index: linux-2.6/drivers/pci/pci.c
===================================================================
--- linux-2.6.orig/drivers/pci/pci.c
+++ linux-2.6/drivers/pci/pci.c
@@ -3485,6 +3485,10 @@ static int __init pci_setup(char *str)
 				pci_no_aer();
 			} else if (!strcmp(str, "nodomains")) {
 				pci_no_domains();
+			} else if (!strncmp(str, "try=", 4)) {
+				int try_num = memparse(str + 4, &str);
+				if (try_num > 0)
+					pci_try_num = try_num;
 			} else if (!strncmp(str, "cbiosize=", 9)) {
 				pci_cardbus_io_size = memparse(str + 9, &str);
 			} else if (!strncmp(str, "cbmemsize=", 10)) {
Index: linux-2.6/drivers/pci/pci.h
===================================================================
--- linux-2.6.orig/drivers/pci/pci.h
+++ linux-2.6/drivers/pci/pci.h
@@ -223,6 +223,8 @@ static inline int pci_ari_enabled(struct
 	return bus->self && bus->self->ari_enabled;
 }
 
+extern int pci_try_num;
+
 #ifdef CONFIG_PCI_QUIRKS
 extern int pci_is_reassigndev(struct pci_dev *dev);
 resource_size_t pci_specified_resource_alignment(struct pci_dev *dev);
Index: linux-2.6/drivers/pci/setup-bus.c
===================================================================
--- linux-2.6.orig/drivers/pci/setup-bus.c
+++ linux-2.6/drivers/pci/setup-bus.c
@@ -1030,6 +1030,7 @@ static int __init pci_get_max_depth(void
  * second  and later try will clear small leaf bridge res
  * will stop till to the max  deepth if can not find good one
  */
+int pci_try_num = 1;
 void __init
 pci_assign_unassigned_resources(void)
 {
@@ -1042,16 +1043,18 @@ pci_assign_unassigned_resources(void)
 	unsigned long type_mask = IORESOURCE_IO | IORESOURCE_MEM |
 				  IORESOURCE_PREFETCH;
 	unsigned long failed_type;
-	int max_depth = pci_get_max_depth();
-	int pci_try_num;
-
 
 	head.next = NULL;
 	add_list.next = NULL;
 
-	pci_try_num = max_depth + 1;
-	printk(KERN_DEBUG "PCI: max bus depth: %d pci_try_num: %d\n",
-		 max_depth, pci_try_num);
+	if (pci_try_num > 1) {
+		int max_depth = pci_get_max_depth();
+
+		if (max_depth + 1 > pci_try_num)
+			pci_try_num = max_depth + 1;
+		printk(KERN_DEBUG "PCI: max bus depth: %d pci_try_num: %d\n",
+			max_depth, pci_try_num);
+	}
 
 again:
 	/* Depth first, calculate sizes and alignments of all

Re: [git pull] PCI fixes

[Jesse Barnes]

On Fri, 24 Jun 2011 15:56:42 -0700
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> 
> 
> 
> Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> >How about a boot param?  We've done similar things for _CRS, and it
> >might give Yinghai and Ram some more flexibility in improving our
> >dynamic resource allocation before enabling it again (if ever).
> 
> I'm OK with that, but then I'd suggest against the currently not yet merged series that doesn't seem to work anyway...
> 
> IOW, just a simple patch that disables the resource re-allocation, and enables it with some command line option.

Ok sounds good, thanks.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Linus Torvalds]

Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
>How about a boot param?  We've done similar things for _CRS, and it
>might give Yinghai and Ram some more flexibility in improving our
>dynamic resource allocation before enabling it again (if ever).

I'm OK with that, but then I'd suggest against the currently not yet merged series that doesn't seem to work anyway...

IOW, just a simple patch that disables the resource re-allocation, and enables it with some command line option.

         Linus

Re: [git pull] PCI fixes

[Jesse Barnes]

On Fri, 24 Jun 2011 09:07:46 -0700
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Fri, Jun 24, 2011 at 8:53 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Some discussion was under "PCI: fix cardbus and sriov regressions",
> > which includes a patchset as well. Oliver Hartkopp's problem is the one
> > that worries me most. The SR-IOV issue is really a BIOS bug and
> > unlikely to affect many people anyway (SR-IOV is really a big server
> > feature).
> 
> Ouch. That is much bigger than I was hoping for. Especially that
> second patch doesn't look like some -rc5 candidate.
> 
> And the fact that Oliver then at the end shows an impossibly aligned
> resource shows that it clearly isn't even remotely correct even AFTER
> the patches, so that doesn't make me get all warm and fuzzy either.
> 
> So I guess we should just revert again.

How about a boot param?  We've done similar things for _CRS, and it
might give Yinghai and Ram some more flexibility in improving our
dynamic resource allocation before enabling it again (if ever).

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Linus Torvalds]

On Fri, Jun 24, 2011 at 8:53 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Some discussion was under "PCI: fix cardbus and sriov regressions",
> which includes a patchset as well. Oliver Hartkopp's problem is the one
> that worries me most. The SR-IOV issue is really a BIOS bug and
> unlikely to affect many people anyway (SR-IOV is really a big server
> feature).

Ouch. That is much bigger than I was hoping for. Especially that
second patch doesn't look like some -rc5 candidate.

And the fact that Oliver then at the end shows an impossibly aligned
resource shows that it clearly isn't even remotely correct even AFTER
the patches, so that doesn't make me get all warm and fuzzy either.

So I guess we should just revert again.

                         Linus

Re: [git pull] PCI fixes

[Jesse Barnes]

On Fri, 24 Jun 2011 08:38:07 -0700
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Thu, Jun 23, 2011 at 1:37 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Just a few minor fixes.  We have one open issue with the resource
> > re-allocation code that was re-added.  Ram has a fix but I'm concerned
> > it will introduce other regressions.  So at this point we have a few
> > options:
> >  - revert the bridge resource re-allocation code (again)
> >  - hide the re-allocation code behind a new kernel option (and not
> >    try=!), this would at least let us experiment with new strategies
> >    and PNP resource tracking etc
> >  - apply Ram's patch and revert it all later if things are still broken
> 
> I think I've missed the regression discussion, so can you forward a
> description and the fix?
> 
> I have to admit that I'm inclined to try the fix if it's clean, just
> in the hope to get over this finally. But I'd like to see  what the
> problem/fix is...
> 
> Maybe I've seen it and just didn't react.

Some discussion was under "PCI: fix cardbus and sriov regressions",
which includes a patchset as well. Oliver Hartkopp's problem is the one
that worries me most. The SR-IOV issue is really a BIOS bug and
unlikely to affect many people anyway (SR-IOV is really a big server
feature).

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Linus Torvalds]

On Thu, Jun 23, 2011 at 1:37 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Just a few minor fixes.  We have one open issue with the resource
> re-allocation code that was re-added.  Ram has a fix but I'm concerned
> it will introduce other regressions.  So at this point we have a few
> options:
>  - revert the bridge resource re-allocation code (again)
>  - hide the re-allocation code behind a new kernel option (and not
>    try=!), this would at least let us experiment with new strategies
>    and PNP resource tracking etc
>  - apply Ram's patch and revert it all later if things are still broken

I think I've missed the regression discussion, so can you forward a
description and the fix?

I have to admit that I'm inclined to try the fix if it's clean, just
in the hope to get over this finally. But I'd like to see  what the
problem/fix is...

Maybe I've seen it and just didn't react.

            Linus

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
af0d6a0a3a30946f7df69c764791f1b0643f7cd6:

  Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2011-06-01 02:07:22 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just a few minor fixes.  We have one open issue with the resource
re-allocation code that was re-added.  Ram has a fix but I'm concerned
it will introduce other regressions.  So at this point we have a few
options:
  - revert the bridge resource re-allocation code (again)
  - hide the re-allocation code behind a new kernel option (and not
    try=!), this would at least let us experiment with new strategies
    and PNP resource tracking etc
  - apply Ram's patch and revert it all later if things are still broken

The last option gets us the most coverage, but it's a bit late in the
cycle to be experimenting like this...

David S. Miller (1):
      PCI: Fix warning in drivers/pci/probe.c on sparc64

Márton Németh (1):
      x86/PCI/ACPI: fix type mismatch

Randy Dunlap (1):
      PCI: fix new kernel-doc warning

 arch/x86/pci/acpi.c |    2 +-
 drivers/pci/pci.c   |    2 +-
 drivers/pci/probe.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
a44f99c7efdb88fa41128065c9a9445c19894e34:

  Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 (2011-03-20 18:14:55 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

A few misc. fixes.

Naga Chumbalkar (3):
      PCI: PCIe links may not get configured for ASPM under POWERSAVE mode
      PCI: Changing ASPM policy, via /sys, to POWERSAVE could cause NMIs
      PCI: Disable ASPM when _OSC control is not granted for PCIe services

Rafael J. Wysocki (1):
      PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

 drivers/acpi/pci_root.c         |   11 ++++++++---
 drivers/pci/pci.c               |    6 ++++++
 drivers/pci/pcie/aspm.c         |   33 +++++++++++++++++++++++++++++++++
 drivers/pci/pcie/portdrv_core.c |    5 +----
 include/linux/pci-aspm.h        |    4 ++++
 include/linux/pci.h             |    7 +++----
 6 files changed, 55 insertions(+), 11 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
6313e3c21743cc88bb5bd8aa72948ee1e83937b6:

  Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2010-12-08 06:40:59 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

This has the reverts and fixes you wanted from Bjorn along with another
fix for some AMD machines with nVidia chipsets.  (I thought I had other
fixes queued up but I must have been mixing up my branches, so this is
all there is for now.)

Bjorn Helgaas (9):
      Revert "PCI: fix pci_bus_alloc_resource() hang, prefer positive decode"
      Revert "x86: allocate space within a region top-down"
      Revert "x86/PCI: allocate space from the end of a region, not the beginning"
      Revert "PCI: allocate bus resources from the top down"
      Revert "resources: support allocating space within a region from the top down"
      resources: add arch hook for preventing allocation in reserved areas
      x86: avoid low BIOS area when allocating address space
      x86: avoid E820 regions when allocating address space
      x86: avoid high BIOS area when allocating address space

Neil Horman (1):
      PCI: Update MCP55 quirk to not affect non HyperTransport variants

 Documentation/kernel-parameters.txt |    5 --
 arch/x86/include/asm/e820.h         |    3 +
 arch/x86/kernel/Makefile            |    1 +
 arch/x86/kernel/resource.c          |   48 ++++++++++++++++
 arch/x86/kernel/setup.c             |    1 -
 arch/x86/pci/i386.c                 |   18 ++----
 drivers/pci/bus.c                   |   81 ++-------------------------
 drivers/pci/quirks.c                |    3 +
 include/linux/ioport.h              |    2 +-
 kernel/resource.c                   |  104 +++-------------------------------
 10 files changed, 76 insertions(+), 190 deletions(-)
 create mode 100644 arch/x86/kernel/resource.c

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Jesse Barnes]

On Tue, 16 Nov 2010 12:16:36 +0100
Andreas Schwab <schwab@linux-m68k.org> wrote:

> Jesse Barnes <jbarnes@virtuousgeek.org> writes:
> 
> > Martin Wilck (1):
> >       PCI: fix size checks for mmap() on /proc/bus/pci files
> 
> That breaks X.
> 
> process "X" tried to map 0x00010000 bytes at page 0x00000000 on 0000:00:10.0 BAR 2 (start 0x        90000000, size 0x           10000)
> ------------[ cut here ]------------
> WARNING: at drivers/pci/pci-sysfs.c:758
> Modules linked in: usb_storage uas uinput cpufreq_conservative rfcomm cpufreq_userspace cpufreq_powersave sco bridge stp llc bnep l2cap crc16 snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device tun nf_conntrack_ipv6 nf_defrag_ipv6 ip6t_REJECT ip6t_LOG ip6table_filter ip6_tables xt_TCPMSS xt_recent ipt_MASQUERADE xt_state ipt_REJECT ipt_LOG xt_tcpudp iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 iptable_filter ip_tables x_tables loop dm_mod btusb bluetooth arc4 snd_aoa_codec_tas ecb snd_aoa_fabric_layout snd_aoa snd_aoa_i2sbus snd_pcm b43 joydev mac80211 snd_timer snd_page_alloc firewire_ohci appletouch snd soundcore cfg80211 sungem sungem_phy firewire_core rfkill sr_mod crc_itu_t sg snd_aoa_soundbus ssb cdrom sd_mod pata_macio libata scsi_mod
> NIP: c0177b10 LR: c0177b10 CTR: 00000001
> REGS: c2461d90 TRAP: 0700   Tainted: G        W    (2.6.37-rc2)
> MSR: 00029032 <EE,ME,CE,IR,DR>  CR: 20000824  XER: 20000000
> TASK = c2568d00[2009] 'X' THREAD: c2460000
> GPR00: c0177b10 c2461e40 c2568d00 0000008a 00006a86 ffffffff c055fb36 c055febc 
> GPR08: 000069fe c0440000 c055febc c2461e00 ffffffff 1022e9e4 10226a14 00000000 
> GPR16: 103eadc0 00000000 00000001 1022bf1c ef136688 00000000 ffffffea 00000001 
> GPR24: 00000000 00000000 00000000 00010000 ef806d68 ef136688 00000002 ef806c38 
> NIP [c0177b10] pci_mmap_resource+0xf0/0x174
> LR [c0177b10] pci_mmap_resource+0xf0/0x174
> Call Trace:
> [c2461e40] [c0177b10] pci_mmap_resource+0xf0/0x174 (unreliable)
> [c2461e80] [c00f7514] mmap+0x74/0xfc
> [c2461eb0] [c008e3e4] mmap_region+0x1e4/0x3bc
> [c2461f00] [c008e93c] sys_mmap_pgoff+0xa4/0xe0
> [c2461f30] [c00060a0] sys_mmap+0x28/0x40
> [c2461f40] [c0010bc4] ret_from_syscall+0x0/0x40
> --- Exception: c01 at 0xfa95f24
>     LR = 0xfd897c8
> Instruction dump:
> 3b400000 7fff0214 813f0134 38090001 7f6a0050 3c60c03d 7fc8f378 93410008 
> 39200000 3863bd36 9361000c 4819c31d <0fe00000> 3800ffea 48000070 7fc4f378 
> ---[ end trace a096109c06ace62c ]---

Oops, I think there's a fix here in my inbox, will either revert or
send the fix asap.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 626 bytes --]

On Tue, Nov 16, 2010 at 12:16:36PM +0100, Andreas Schwab wrote:
> Jesse Barnes <jbarnes@virtuousgeek.org> writes:
> 
> > Martin Wilck (1):
> >       PCI: fix size checks for mmap() on /proc/bus/pci files
> 
> That breaks X.
> 
> process "X" tried to map 0x00010000 bytes at page 0x00000000 on 0000:00:10.0 BAR 2 (start 0x        90000000, size 0x           10000)

Ah, thanks. Just had the same issue on one of my laptops, too...

Regards,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [git pull] PCI fixes

[Andreas Schwab]

Jesse Barnes <jbarnes@virtuousgeek.org> writes:

> Martin Wilck (1):
>       PCI: fix size checks for mmap() on /proc/bus/pci files

That breaks X.

process "X" tried to map 0x00010000 bytes at page 0x00000000 on 0000:00:10.0 BAR 2 (start 0x        90000000, size 0x           10000)
------------[ cut here ]------------
WARNING: at drivers/pci/pci-sysfs.c:758
Modules linked in: usb_storage uas uinput cpufreq_conservative rfcomm cpufreq_userspace cpufreq_powersave sco bridge stp llc bnep l2cap crc16 snd_pcm_oss snd_mixer_oss snd_seq snd_seq_device tun nf_conntrack_ipv6 nf_defrag_ipv6 ip6t_REJECT ip6t_LOG ip6table_filter ip6_tables xt_TCPMSS xt_recent ipt_MASQUERADE xt_state ipt_REJECT ipt_LOG xt_tcpudp iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 iptable_filter ip_tables x_tables loop dm_mod btusb bluetooth arc4 snd_aoa_codec_tas ecb snd_aoa_fabric_layout snd_aoa snd_aoa_i2sbus snd_pcm b43 joydev mac80211 snd_timer snd_page_alloc firewire_ohci appletouch snd soundcore cfg80211 sungem sungem_phy firewire_core rfkill sr_mod crc_itu_t sg snd_aoa_soundbus ssb cdrom sd_mod pata_macio libata scsi_mod
NIP: c0177b10 LR: c0177b10 CTR: 00000001
REGS: c2461d90 TRAP: 0700   Tainted: G        W    (2.6.37-rc2)
MSR: 00029032 <EE,ME,CE,IR,DR>  CR: 20000824  XER: 20000000
TASK = c2568d00[2009] 'X' THREAD: c2460000
GPR00: c0177b10 c2461e40 c2568d00 0000008a 00006a86 ffffffff c055fb36 c055febc 
GPR08: 000069fe c0440000 c055febc c2461e00 ffffffff 1022e9e4 10226a14 00000000 
GPR16: 103eadc0 00000000 00000001 1022bf1c ef136688 00000000 ffffffea 00000001 
GPR24: 00000000 00000000 00000000 00010000 ef806d68 ef136688 00000002 ef806c38 
NIP [c0177b10] pci_mmap_resource+0xf0/0x174
LR [c0177b10] pci_mmap_resource+0xf0/0x174
Call Trace:
[c2461e40] [c0177b10] pci_mmap_resource+0xf0/0x174 (unreliable)
[c2461e80] [c00f7514] mmap+0x74/0xfc
[c2461eb0] [c008e3e4] mmap_region+0x1e4/0x3bc
[c2461f00] [c008e93c] sys_mmap_pgoff+0xa4/0xe0
[c2461f30] [c00060a0] sys_mmap+0x28/0x40
[c2461f40] [c0010bc4] ret_from_syscall+0x0/0x40
--- Exception: c01 at 0xfa95f24
    LR = 0xfd897c8
Instruction dump:
3b400000 7fff0214 813f0134 38090001 7f6a0050 3c60c03d 7fc8f378 93410008 
39200000 3863bd36 9361000c 4819c31d <0fe00000> 3800ffea 48000070 7fc4f378 
---[ end trace a096109c06ace62c ]---

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
f6614b7bb405a9b35dd28baea989a749492c46b2:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (2010-11-09 10:34:48 -0800)

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

There's one very recent commit in here, but it's just a warning fix
from Randy so should be ok.

This set includes a fix for a long standing mmap issue on /proc/bus/pci
(present since we added the map range checking during that e1000 EEPROM
fire drill) and a fix from Bjorn for a recent resource handling
regression.  It also adds a little code to better handle device power
states at enable time; rather than assuming device state is unknown at
enable time (which will prevent us from configuring things like MSI),
we read the current state out of the device if possible, fixing some
network and gfx related bugs in the process.

Bjorn Helgaas (2):
      x86/PCI: coalesce overlapping host bridge windows
      PCI: fix pci_bus_alloc_resource() hang, prefer positive decode

Jesse Barnes (1):
      PCI: read current power state at enable time

Martin Wilck (1):
      PCI: fix size checks for mmap() on /proc/bus/pci files

Randy Dunlap (1):
      PCI: sysfs: fix printk warnings

Steven Rostedt (1):
      PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area

 arch/x86/pci/acpi.c               |  103 +++++++++++++++++++++++++++++-------
 drivers/pci/bus.c                 |   70 +++++++++++++++++--------
 drivers/pci/hotplug/ibmphp_ebda.c |    6 ++
 drivers/pci/pci-sysfs.c           |   23 ++++++--
 drivers/pci/pci.c                 |   12 ++++
 drivers/pci/pci.h                 |    7 ++-
 drivers/pci/proc.c                |    2 +-
 7 files changed, 174 insertions(+), 49 deletions(-)

-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
502adf5778f4151dcba3f64dd6ed322151f3712c:

  Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2010-08-24 12:21:49 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

As promised, here are the changes from Rafael and Kenji-san that fix up
our OSC handling to conform much better to what platforms expect.  The
patchset does include some cleanups, but overall I'd consider it a
major bugfix.  However if you'd like me to refactor things, I can.

Dave Airlie (1):
      PCI: provide stub pci_domain_nr function for !CONFIG_PCI configs

Jesse Barnes (1):
      x86/PCI: only define pci_domain_nr if PCI and PCI_DOMAINS are set

Kenji Kaneshige (1):
      PCI: PCIe: Remove the port driver module exit routine

Rafael J. Wysocki (10):
      PCI: PCIe AER: Introduce pci_aer_available()
      PCI: PCIe: Introduce commad line switch for disabling port services
      ACPI/PCI: Reorder checks in acpi_pci_osc_control_set()
      ACPI/PCI: Make acpi_pci_query_osc() return control bits
      ACPI/PCI: Do not preserve _OSC control bits returned by a query
      ACPI/PCI: Negotiate _OSC control bits before requesting them
      PCI: PCIe: Ask BIOS for control of all native services at once
      PCI: PCIe: Disable PCIe port services during port initialization
      PCI: PCIe: Move PCIe PME code to the pcie directory
      PCI hotplug: Fix build with CONFIG_ACPI unset

 Documentation/kernel-parameters.txt        |   17 +++--
 arch/x86/include/asm/pci.h                 |    6 +-
 drivers/acpi/pci_root.c                    |   97 ++++++++++++++++------------
 drivers/pci/hotplug/acpi_pcihp.c           |    6 +-
 drivers/pci/hotplug/pciehp.h               |   16 +----
 drivers/pci/hotplug/pciehp_acpi.c          |    4 +-
 drivers/pci/hotplug/pciehp_core.c          |    4 +-
 drivers/pci/pci.h                          |    2 +
 drivers/pci/pcie/Makefile                  |    3 +-
 drivers/pci/pcie/aer/aerdrv.c              |    9 ++-
 drivers/pci/pcie/aer/aerdrv_acpi.c         |   36 ----------
 drivers/pci/pcie/aer/aerdrv_core.c         |   14 +----
 drivers/pci/pcie/{pme/pcie_pme.c => pme.c} |   66 ++-----------------
 drivers/pci/pcie/pme/Makefile              |    8 --
 drivers/pci/pcie/pme/pcie_pme.h            |   28 --------
 drivers/pci/pcie/pme/pcie_pme_acpi.c       |   54 ---------------
 drivers/pci/pcie/portdrv.h                 |   22 ++++++
 drivers/pci/pcie/portdrv_acpi.c            |   77 ++++++++++++++++++++++
 drivers/pci/pcie/portdrv_core.c            |   53 ++++++++++++++-
 drivers/pci/pcie/portdrv_pci.c             |   38 +++++++++--
 include/acpi/acpi_bus.h                    |    3 -
 include/linux/acpi.h                       |    4 +-
 include/linux/pci.h                        |    3 +
 23 files changed, 280 insertions(+), 290 deletions(-)
 rename drivers/pci/pcie/{pme/pcie_pme.c => pme.c} (83%)
 delete mode 100644 drivers/pci/pcie/pme/Makefile
 delete mode 100644 drivers/pci/pcie/pme/pcie_pme.h
 delete mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c
 create mode 100644 drivers/pci/pcie/portdrv_acpi.c

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Jesse Barnes]

On Wed, 9 Jun 2010 16:14:10 -0700 (PDT)
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> On Wed, 9 Jun 2010, Jesse Barnes wrote:
> > 
> > Nothing too big here; I do have a couple of fixes in the queue that
> > aren't included here though.  I'll be pulling them together over the
> > next couple of days.
> 
> Hmm. None of these seem to really be relevant. The fact that one is from 
> me doesn't make me any more eager to pull. Are any of these real 
> regressions (the missing parenthesis one seems to be the only one that 
> could be serious, but I didn't grep for actual use).

Ok I've updated the tree to cover the regressions reported so far,
including the printk change so we get fewer spurious reports.  Note it
hasn't gone through linux-next yet, but the patches are all small and
have each been tested individually.

There's one change in particular I'd like you (along with the cc'd
arch maintainers) to review:

commit 837c4ef13c44296bb763a0ca0e84a076592474cf
Author: Yinghai Lu <yinghai.lu@oracle.com>
Date:   Thu Jun 3 13:43:03 2010 -0700

    PCI: clear bridge resource range if BIOS assigned bad one

This fixes a regression rather minimally, but may have side effects I'm
not seeing.  An alternative to that fix would be to revert

commit d65245c3297ac63abc51a976d92f45f2195d2854
Author: Yinghai Lu <yinghai@kernel.org>
Date:   Fri Jan 22 01:02:23 2010 -0800

    PCI: don't shrink bridge resources

but it seems that's a bit more risky at this point, since it could
affect hotplug and rescan cases.  Really this code needs to be
reworked, especially in light of the revert of
977d17bb1749517b353874ccdc9b85abc7a58c2a which tried (and failed)
to perform aggressive reallocation when devices weren't configured.
I'll try to find some time next week to work on that.

The following changes since commit 9dda696f0de87a2e5cfabb147e28c76b7d3c6846:
  Linus Torvalds (1):
        Merge branch 'release' of git://git.kernel.org/.../aegl/linux-2.6

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Bjorn Helgaas (1):
      PCI: change resource collision messages from KERN_ERR to KERN_INFO

Jesse Barnes (1):
      Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"

Jiri Slaby (1):
      PCI: hotplug/cpqphp, fix NULL dereference

Yinghai Lu (1):
      PCI: clear bridge resource range if BIOS assigned bad one

 Documentation/ABI/testing/sysfs-bus-pci |   40 -------------------------
 arch/microblaze/pci/pci-common.c        |    1 +
 arch/mn10300/unit-asb2305/pci-asb2305.c |    1 +
 arch/powerpc/kernel/pci-common.c        |    1 +
 arch/x86/pci/i386.c                     |    2 +
 drivers/pci/hotplug/cpqphp_core.c       |    7 ++++
 drivers/pci/pci-sysfs.c                 |   37 -----------------------
 drivers/pci/setup-res.c                 |   10 +++---
 drivers/pci/slot.c                      |   48 -------------------------------
 9 files changed, 17 insertions(+), 130 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Jesse Barnes]

On Wed, 9 Jun 2010 16:14:10 -0700 (PDT)
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> 
> 
> On Wed, 9 Jun 2010, Jesse Barnes wrote:
> > 
> > Nothing too big here; I do have a couple of fixes in the queue that
> > aren't included here though.  I'll be pulling them together over the
> > next couple of days.
> 
> Hmm. None of these seem to really be relevant. The fact that one is from 
> me doesn't make me any more eager to pull. Are any of these real 
> regressions (the missing parenthesis one seems to be the only one that 
> could be serious, but I didn't grep for actual use).

I wanted Bjorn's fix to avoid false regression and bug reports, but
yes, the others are just trivial patches.  I can drop them out and send
you a new tree once I pull in the other fixes if you'd prefer that.

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Linus Torvalds]

On Wed, 9 Jun 2010, Jesse Barnes wrote:
> 
> Nothing too big here; I do have a couple of fixes in the queue that
> aren't included here though.  I'll be pulling them together over the
> next couple of days.

Hmm. None of these seem to really be relevant. The fact that one is from 
me doesn't make me any more eager to pull. Are any of these real 
regressions (the missing parenthesis one seems to be the only one that 
could be serious, but I didn't grep for actual use).

			Linus

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
9dda696f0de87a2e5cfabb147e28c76b7d3c6846: Linus Torvalds (1):
        Merge branch 'release' of
git://git.kernel.org/.../aegl/linux-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Nothing too big here; I do have a couple of fixes in the queue that
aren't included here though.  I'll be pulling them together over the
next couple of days.

Bjorn Helgaas (1):
      PCI: change resource collision messages from KERN_ERR to KERN_INFO

Clemens Ladisch (1):
      PCI quirk: AMD 780: work around wrong vendor ID on APC bridge

Dan Carpenter (1):
      PCI: hotplug/shpchp_hpc: add parenthesis in SLOT_REG_RSVDZ_MASK

Linus Torvalds (1):
      PCI aerdrv: fix annoying warnings

Stephen Hemminger (1):
      PCI: sparse warning (trivial)

Tejun Heo (1):
      PCI: disable MSI on VIA K8M800

 drivers/pci/bus.c                  |    2 +-
 drivers/pci/hotplug/shpchp_hpc.c   |    2 +-
 drivers/pci/pcie/aer/aerdrv_core.c |   17 +++++++++--------
 drivers/pci/quirks.c               |   24 +++++++++++++++++++++---
 drivers/pci/setup-res.c            |   10 +++++-----
 5 files changed, 37 insertions(+), 18 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
b91ce4d14a21fc04d165be30319541e0f9204f15: Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Two fixes from Bjorn for _CRS related stuff.  The "compute address
space" one hasn't seen any soak time in -next, which I'm nervous about,
but it seems like a good related change, so I'll leave it up to you.

If you don't want it, just let me know and I'll drop it and resend just
the BIOS_END patch, which definitely fixes real bugs.

Bjorn Helgaas (2):
      x86/PCI: never allocate PCI MMIO resources below BIOS_END
      x86/PCI: compute Address Space length rather than using _LEN

 arch/x86/pci/acpi.c |   40 ++--------------------------------------
 arch/x86/pci/i386.c |    3 +++
 2 files changed, 5 insertions(+), 38 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30: Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/ide-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

A few more fixes for the new resource management code, and a couple of
misc. fixes from Alexander and Matthew.

Alexander Duyck (1):
      PCI aerdrv: use correct bit defines and add 2ms delay to aer_root_reset

Bjorn Helgaas (3):
      x86/PCI: ignore Consumer/Producer bit in ACPI window descriptions
      PCI: revert broken device warning
      x86/PCI: parse additional host bridge window resource types

Matthew Garrett (1):
      PCI: Ensure we re-enable devices on resume

 arch/x86/pci/acpi.c           |   42 +++++++++++++++++++++++++++++++++++-----
 drivers/pci/pci.c             |    6 +----
 drivers/pci/pcie/aer/aerdrv.c |   10 +++++++-
 drivers/pci/probe.c           |   23 ++++++---------------
 4 files changed, 52 insertions(+), 29 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
fc7f99cf36ebae853639dabb43bc2f0098c59aef: Linus Torvalds (1):
        Merge branch 'for-linus' of
git://git.kernel.org/.../sage/ceph-client

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Bjorn's been working hard to track down regressions related to the new
"use _CRS by default" code, and things are looking better than I
thought they would at this point.  I believe Yinghai is also tracking a
regression or two related to the new re-allocation code, but that's
also looking fairly good.

Note this does include a few extra bits of debug output; though not
strictly bug fixes I figured they'd help us track down any remaining
issues with the new code, and so were important enough to include here.

Bjorn Helgaas (11):
      resources: add interfaces that return conflict information
      PCI: for address space collisions, show conflicting resource
      PCI: break out primary/secondary/subordinate for readability
      PCI: make disabled window printk style match the enabled ones
      PCI: print resources consistently with %pR
      PCI: complain about devices that seem to be broken
      PCI: don't say we claimed a resource if we failed
      x86/PCI: remove redundant warnings
      frv/PCI: remove redundant warnings
      x86/PCI: for host bridge address space collisions, show conflicting resource
      x86/PCI: truncate _CRS windows with _LEN > _MAX - _MIN + 1

Clemens Ladisch (1):
      PCI quirk: RS780/RS880: work around missing MSI initialization

Dean Nelson (3):
      PCI: fix return value from pcix_get_max_mmrbc()
      PCI: fix access of PCI_X_CMD by pcix get and set mmrbc functions
      PCI: cleanup error return for pcix get and set mmrbc functions

Matthew Wilcox (1):
      PCI quirk: Disable MSI on VIA K8T890 systems

Paul Mundt (1):
      PCI: kill off pci_register_set_vga_state() symbol export.

Tim Yamin (1):
      PCI quirk: only apply CX700 PCI bus parking quirk if external VT6212L is present

 arch/frv/mb93090-mb00/pci-frv.c         |    4 +--
 arch/x86/pci/acpi.c                     |   22 +++++++++--
 arch/x86/pci/i386.c                     |    5 ---
 drivers/gpu/drm/radeon/radeon_irq_kms.c |    8 +----
 drivers/pci/hotplug/pciehp_hpc.c        |    5 +--
 drivers/pci/ioapic.c                    |    9 ++---
 drivers/pci/pci.c                       |   44 ++++++++++------------
 drivers/pci/probe.c                     |   53 +++++++++++++++++----------
 drivers/pci/quirks.c                    |   59 ++++++++++++++++++++++++++++---
 drivers/pci/setup-res.c                 |   14 ++++---
 drivers/pcmcia/rsrc_nonstatic.c         |   12 ++----
 include/linux/ioport.h                  |    2 +
 kernel/resource.c                       |   44 +++++++++++++++++++----
 13 files changed, 184 insertions(+), 97 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit 61c39bb354a1f791ba6f562b766a72e508a036ee:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just a couple this time, the most controversial being the removal of
intel_bus.c.  We tried, but it's looking like a long idea in the log
term.  The machine it was intended to serve has working _CRS support
now, so they can boot with pci=use_crs.  For 2.6.34 we'll try using
more _CRS data by default, I'm hoping if we can get it right that it'll
fix a few other resource issues (though we have yet to address the
issue that broke things last time: huge numbers of _CRS resources on
some machines; should be easy to fix though).

Andrew Patterson (1):
      PCI: fix nested spinlock hang in aer_inject

Jeff Garrett (1):
      x86/PCI: remove IOH range fetching

 arch/x86/pci/Makefile             |    2 +-
 arch/x86/pci/intel_bus.c          |   94 -------------------------------------
 drivers/pci/pcie/aer/aer_inject.c |   12 ++--
 3 files changed, 7 insertions(+), 101 deletions(-)
 delete mode 100644 arch/x86/pci/intel_bus.c

-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit 2c1f1895ef2aa8f0e5497893eff71304aef332e1:
  Linus Torvalds (1):
        Merge branch 'drm-linus' of git://git.kernel.org/.../airlied/drm-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

A few misc fixes since the last request, including a fix from Rafael to allow
devices to resume more reliably (namely those that need extra time to come
back from D3).

David John (1):
      PCI: Check the node argument passed to cpumask_of_node

Hidetoshi Seto (1):
      PCI: pcie portdrv: style cleanup

Rafael J. Wysocki (1):
      PCI/PM: Use per-device D3 delays

Youquan,Song (2):
      PCI: AER: fix aer inject result in kernel oops
      PCIe AER: prevent AER injection if hardware masks error reporting

 drivers/net/sky2.c                |    1 +
 drivers/pci/pci-sysfs.c           |    6 ++++--
 drivers/pci/pci.c                 |   19 +++++++++++++++----
 drivers/pci/pcie/aer/aer_inject.c |   28 ++++++++++++++++++++++++++--
 drivers/pci/pcie/portdrv_core.c   |   16 +++++++---------
 drivers/pci/pcie/portdrv_pci.c    |   17 ++++++++---------
 include/linux/pci.h               |    1 +
 7 files changed, 62 insertions(+), 26 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit 8bea8672edfca7ec5f661cafb218f1205863b343:
  Stephen Rothwell (1):
        mfd: compile fix for twl4030 renaming

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

A few misc fixes.  A few people have run into the CLS bug so far, which Csaba
kindly provided a fix for (detection of PCI cache line size is a good
improvement, but it will fail in some cases due to a virtualized or buggy
platform).

This set also adds the device specific reset quirk code from Dexuan;
needed for some devices especially in virtualized environments.

Benjamin Herrenschmidt (1):
      PCI/cardbus: Add a fixup hook and fix powerpc

Csaba Henk (1):
      PCI: Handle case when no pci device can provide cache line size hint

Detlef Riekenberg (1):
      vgaarbiter: fix a typo in the vgaarbiter Documentation

Dexuan Cui (3):
      PCI: support device-specific reset methods
      PCI: add Intel USB specific reset method
      PCI: add Intel 82599 Virtual Function specific reset method

Jiri Slaby (1):
      PCI: fix section mismatch on update_res()

Rafael J. Wysocki (1):
      PCI/PM: Propagate wake-up enable for PCIe devices too

Stefan Assmann (2):
      PCI: change PCI nomenclature in drivers/pci/ (comment changes)
      PCI: change PCI nomenclature in drivers/pci/ (non-comment changes)

 Documentation/vgaarbiter.txt           |    2 +-
 arch/powerpc/kernel/pci-common.c       |   13 +++++++
 arch/x86/pci/bus_numa.c                |    2 +-
 drivers/pci/hotplug/shpchp.h           |    2 +-
 drivers/pci/intel-iommu.c              |    6 ++--
 drivers/pci/intr_remapping.c           |    2 +-
 drivers/pci/pci-acpi.c                 |   10 +----
 drivers/pci/pci.c                      |   30 +++++++++++++++--
 drivers/pci/pci.h                      |    8 ++++
 drivers/pci/pcie/aer/Kconfig.debug     |    4 +-
 drivers/pci/pcie/aer/aer_inject.c      |    6 ++--
 drivers/pci/pcie/aer/aerdrv.c          |    2 +-
 drivers/pci/pcie/aer/aerdrv_acpi.c     |    2 +-
 drivers/pci/pcie/aer/aerdrv_core.c     |    6 ++--
 drivers/pci/pcie/aer/aerdrv_errprint.c |    4 +-
 drivers/pci/pcie/aspm.c                |    4 +-
 drivers/pci/pcie/portdrv_pci.c         |    2 +-
 drivers/pci/quirks.c                   |   57 +++++++++++++++++++++++++++++++-
 drivers/pci/search.c                   |    6 ++--
 drivers/pcmcia/cardbus.c               |    2 +-
 include/linux/pci.h                    |    3 ++
 21 files changed, 135 insertions(+), 38 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Just a few more fixes for 2.6.32.  There's still one outstanding patch
(from you for the prefetchable resource allocation issue) that I'm
integrating now.

The following changes since commit 91d3f9bacdb4950d2f79fe2ba296aa249f60d06c:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../anholt/drm-intel

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Jan Beulich (1):
      x86/PCI: Adjust GFP mask handling for coherent allocations

Kenji Kaneshige (1):
      PCI ASPM: fix oops on root port removal

 arch/x86/include/asm/dma-mapping.h |   10 +++++++---
 arch/x86/kernel/pci-dma.c          |    6 ++----
 drivers/pci/pcie/aspm.c            |    6 ++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
0eca52a92735f43462165efe00a7e394345fb38e: Linus Torvalds (1):
        Merge git://git.kernel.org/.../davem/ide-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Nothing earth shattering here since there haven't been any big PCI related
regressions reported (yet).  Probably the most significant change here is from
Yinghai; a patch to allocate larger bridge ranges if possible.  It's the only
one with potential to cause big trouble, but it looks safe and doesn't seem
to have caused issues so far...

Bjorn Helgaas (2):
      PCI: PCIe portdrv: remove "-driver" from driver name
      PCI: remove pci_assign_resource_fixed()

Gabe Black (1):
      PCI quirk: TI XIO200a erroneously reports support for fast b2b transfers

Kenji Kaneshige (1):
      PCI: Prevent AER driver from being loaded on non-root port PCIE devices

Rafael J. Wysocki (1):
      PCI PM: Read device power state from register after updating it

Randy Dunlap (1):
      PCI: pci.c: fix kernel-doc notation

Yinghai Lu (1):
      PCI: get larger bridge ranges when space is available

 drivers/pci/pci.c              |   14 +++++++++-----
 drivers/pci/pcie/aer/aerdrv.c  |    2 +-
 drivers/pci/pcie/portdrv_pci.c |    3 +--
 drivers/pci/quirks.c           |   19 +++++++++++++++++++
 drivers/pci/setup-bus.c        |   13 +++++++++++--
 drivers/pci/setup-res.c        |   37 -------------------------------------
 include/linux/pci_ids.h        |    1 +
 7 files changed, 42 insertions(+), 47 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
90bc1a658a53f8832ee799685703977a450e5af9: Linus Torvalds (1):
        Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just a couple of fixes for ia64 related breakages that crept in this
time around.

Kenji Kaneshige (2):
      PCI hotplug: SGI hotplug: fix build failure
      PCI hotplug: SGI hotplug: do not use hotplug_slot_attr

 drivers/pci/hotplug/sgi_hotplug.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit 2bfdd79eaa0043346e773ba5f6cfd811ea31b73d:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../tiwai/sound-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Nothing too exciting here (as one would hope).  A few fixes for the
_CRS case (which is no longer the default), along with misc MSI fixes
and quirks.

Shortlog & diffstat below.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Alan Cox (1):
      PCI: More PATA quirks for not entering D3

Alexey Zaytsev (1):
      PCI: make pci_name() take const argument

Fernando Luis Vázquez Cao (1):
      PCI: remove pci_dac_dma_... APIs on mn10300

Hidetoshi Seto (4):
      PCI MSI: Return if alloc_msi_entry for MSI-X failed
      PCI MSI: shorten PCI_MSIX_ENTRY_* symbol names
      PCI MSI: Unmask MSI if setup failed
      PCI MSI: Fix restoration of MSI/MSI-X mask states in suspend/resume

Ingo Molnar (1):
      ia64/PCI: adjust section annotation for pcibios_setup()

Joe Perches (1):
      PCI ECRC: Remove unnecessary semicolons

Matthew Wilcox (1):
      PCI: Fix IRQ swizzling for ARI-enabled devices

Randy Dunlap (1):
      PCI: fix kernel-doc warnings

Yinghai Lu (2):
      x86/PCI: fix boundary checking when using root CRS
      x86/PCI: get root CRS before scanning children

Yu Zhao (1):
      PCI: check if bus has a proper bridge device before triggering SBR

 arch/ia64/pci/pci.c                    |    2 +-
 arch/mn10300/include/asm/pci.h         |    4 --
 arch/x86/pci/acpi.c                    |   59 ++++++++++++-----------------
 arch/x86/pci/amd_bus.c                 |    8 +++-
 drivers/pci/hotplug/pci_hotplug_core.c |    2 +
 drivers/pci/msi.c                      |   64 ++++++++++++++++++++++---------
 drivers/pci/msi.h                      |   10 ++--
 drivers/pci/pci.c                      |   15 ++++++-
 drivers/pci/pcie/aer/ecrc.c            |    2 +-
 drivers/pci/quirks.c                   |    5 ++
 drivers/pci/slot.c                     |    4 +-
 include/linux/pci.h                    |    2 +-
 12 files changed, 104 insertions(+), 73 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

A couple more fixes; hopefully there's still time.  The device class
fix is an especially important regression fix.


The following changes since commit
9fa7eb283c5cdc2b0f4a8cfe6387ed82e5e9a3d3: Linus Torvalds (1):
        Linux 2.6.30-rc8

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Yinghai Lu (1):
      x86/pci: fix mmconfig detection with 32bit near 4g

Yu Zhao (1):
      PCI: use fixed-up device class when configuring device

 arch/x86/pci/mmconfig-shared.c |    6 +++---
 drivers/pci/probe.c            |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please consider pulling the PCI fixes from
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

The MSI fix has been tested and fixes the problem Dave reported.  It's
not a complete fix (i.e. it doesn't prevent writes to MSI regs when
MSI is disabled), but I'd rather have the tested one upstream at this
point than delay things further. We can fix the more theoretical
problems in linux-next (there's ongoing discussion about the best way
to do this).

Matthew Wilcox (1):
      PCI MSI: Fix MSI-X with NIU cards

Zhang, Yanmin (1):
      PCI: Fix pci-e port driver slot_reset bad default return value

 drivers/pci/msi.c              |    8 ++++++--
 drivers/pci/pcie/aer/aerdrv.h  |    3 +++
 drivers/pci/pcie/portdrv_pci.c |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

The following changes since commit
091069740304c979f957ceacec39c461d0192158: Linus Torvalds (1):
        Linux 2.6.30-rc3

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Nothing major here; a few fixes from Yinghai (with attendant cleanups,
hope that's ok; rather than rolling them into the original patch they
came in piecemeal), and one suspend/resume fix from Yu (which hasn't
actually bitten anyone afaik).

Thanks,
Jesse

Matthew Wilcox (1):
      x86/PCI: Move set_pci_bus_resources_arch_default into arch/x86

Randy Dunlap (1):
      docbooks: add/fix PCI kernel-doc

Thomas Renninger (1):
      PCI quirk: disable MSI on VIA VT3364 chipsets

Yinghai Lu (4):
      x86/PCI: don't call e820_all_mapped with -1 in the mmconfig case
      x86/PCI: set_pci_bus_resources_arch_default cleanups
      PCI: cleanup debug output resources
      x86/PCI: don't bother with root quirks if _CRS is used

Yu Zhao (1):
      PCI: only save/restore existent registers in the PCIe capability

 Documentation/DocBook/kernel-api.tmpl |    6 ++-
 arch/x86/include/asm/topology.h       |    2 +-
 arch/x86/pci/amd_bus.c                |    6 ++-
 arch/x86/pci/common.c                 |    5 ++-
 arch/x86/pci/i386.c                   |    4 ++
 arch/x86/pci/mmconfig-shared.c        |    6 +-
 drivers/pci/access.c                  |    4 +-
 drivers/pci/htirq.c                   |    1 +
 drivers/pci/pci-sysfs.c               |   12 ++++--
 drivers/pci/pci.c                     |   70 ++++++++++++++++++++++++++-------
 drivers/pci/probe.c                   |    6 ---
 drivers/pci/quirks.c                  |    1 +
 drivers/pci/setup-bus.c               |    6 ++-
 drivers/pci/slot.c                    |    4 +-
 include/linux/pci_regs.h              |    1 +
 15 files changed, 97 insertions(+), 37 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please consider pulling my for-linus branch from:
  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

This has the fix for the sky2 VPD bug, as well as a few others related
to the newly merged code.

Alex Chiang (4):
      PCI: annotate pci_rescan_bus as __ref, not __devinit
      PCI: allow PCI core hotplug to remove PCI root bus
      PCI Hotplug: acpiphp: grab refcount on p2p subordinate bus
      PCI: pci_slot: grab refcount on slot's bus

Anton Vorontsov (1):
      PCI: Fix oops in pci_vpd_truncate

Randy Dunlap (1):
      PCI-IOV: fix missing kernel-doc

Yu Zhao (1):
      PCI: SR-IOV quirk for Intel 82576 NIC

Yuji Shimada (2):
      PCI: Setup disabled bridges even if buses are added
      PCI: don't corrupt enable_cnt when doing manual resource alignment

 drivers/acpi/pci_slot.c            |    5 +++
 drivers/pci/access.c               |    3 +-
 drivers/pci/bus.c                  |    2 +-
 drivers/pci/hotplug/acpiphp_glue.c |   14 ++++++++
 drivers/pci/iov.c                  |    1 +
 drivers/pci/pci-sysfs.c            |    6 +---
 drivers/pci/pci.c                  |    4 +-
 drivers/pci/probe.c                |    2 +-
 drivers/pci/quirks.c               |   62 +++++++++++++++++++++++++++++++++---
 drivers/pci/setup-bus.c            |    2 +-
 include/linux/pci.h                |    5 +++
 11 files changed, 90 insertions(+), 16 deletions(-)

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Jesse Barnes]

On Thursday, February 26, 2009 2:24:28 pm Jesse Barnes wrote:
> Please pull my for-linus branch:
> git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
> for-linus

Oh, and I'll be down under next week, trying to stay away from email & 
patches, so Matthew Wilcox & Alex Chiang will be sending you any urgent 2.6.29 
patches during that time.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Jesse Barnes]

On Thursday, February 26, 2009 2:36:03 pm Matthew Wilcox wrote:
> On Thu, Feb 26, 2009 at 02:24:28PM -0800, Jesse Barnes wrote:
> > Matthew Wilcox (1):
> >       PCI/MSI: fix msi_mask() shift fix
>
> This one already appears to be in Linus' tree ... did you drive git
> request-pull badly?

No I just haven't merged his tree since then.  But then no one else should be 
touching these PCI bits, right? :)

-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fixes

[Matthew Wilcox]

On Thu, Feb 26, 2009 at 02:24:28PM -0800, Jesse Barnes wrote:
> Matthew Wilcox (1):
>       PCI/MSI: fix msi_mask() shift fix

This one already appears to be in Linus' tree ... did you drive git
request-pull badly?

-- 
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

A few documentation fixes/additions, quirks, and the obligatory hotplug
related fixes.

Alex Chiang (1):
      PCI: Documentation: fix minor PCIe HOWTO thinko

Andrew Patterson (1):
      PCI: Enable PCIe AER only after checking firmware support

Chris Wright (1):
      PCI: add some sysfs ABI docs

Eric W. Biederman (1):
      PCI: pciehp: Handle interrupts that happen during initialization.

Matthew Wilcox (1):
      PCI/MSI: fix msi_mask() shift fix

Randy Dunlap (3):
      PCI: fix rom.c kernel-doc warning
      PCI: fix struct pci_platform_pm_ops kernel-doc
      PCI: fix missing kernel-doc and typos

Stefan Assmann (1):
      PCI: AMD 813x B2 devices do not need boot interrupt quirk

Yinghai Lu (2):
      PCI quirk: enable MSI on 8132
      PCI: don't enable too many HT MSI mappings

 Documentation/ABI/testing/sysfs-bus-pci |   43 +++++++++++
 Documentation/PCI/PCIEBUS-HOWTO.txt     |    2 +-
 drivers/pci/hotplug/pciehp.h            |    2 +
 drivers/pci/hotplug/pciehp_core.c       |    7 ++
 drivers/pci/hotplug/pciehp_hpc.c        |   15 ++--
 drivers/pci/msi.c                       |   10 +--
 drivers/pci/pci.c                       |   13 ++-
 drivers/pci/pci.h                       |   20 +++---
 drivers/pci/pcie/aer/aerdrv_core.c      |   48 ++++++++++--
 drivers/pci/pcie/portdrv_pci.c          |    2 -
 drivers/pci/quirks.c                    |  122 +++++++++++++++++++++++++++----
 drivers/pci/rom.c                       |    1 +
 12 files changed, 229 insertions(+), 56 deletions(-)

-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

Please consider pulling my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

The only real fix here is the fix for the MSI mask fix, the other stuff is
just documentation.

Alex Chiang (1):
      PCI: Documentation: fix minor PCIe HOWTO thinko

Matthew Wilcox (1):
      PCI/MSI: fix msi_mask() shift fix

Randy Dunlap (3):
      PCI: fix rom.c kernel-doc warning
      PCI: fix struct pci_platform_pm_ops kernel-doc
      PCI: fix missing kernel-doc and typos

 Documentation/PCI/PCIEBUS-HOWTO.txt |    2 +-
 drivers/pci/msi.c                   |   10 ++++------
 drivers/pci/pci.c                   |   13 +++++++++----
 drivers/pci/pci.h                   |   20 ++++++++++----------
 drivers/pci/rom.c                   |    1 +
 5 files changed, 25 insertions(+), 21 deletions(-)

-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fixes

[Jesse Barnes]

Please consider pulling my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

A few more fixes for this round (and a few more pending, want to get them
through linux-next first though).  There's one patch for new hw support here,
but it's a two liner, and missing a whole release would be a pain, so I'm
including it; hope that's not a problem.

-- 
Jesse Barnes, Intel Open Source Technology Center

Darrick J. Wong (1):
      PCI hotplug: fakephp: Allocate PCI resources before adding the device

Matthew Garrett (1):
      PCI hotplug: Change link order of pciehp & acpiphp

Matthew Wilcox (1):
      PCI MSI: Fix undefined shift by 32

Rafael J. Wysocki (4):
      PCI PM: Fix suspend error paths and testing facility breakage
      PCI PM: Fix hibernation breakage on EeePC 701
      PCI PM: Power up devices before restoring their state
      PCI PM: Do not wait for buses in B2 or B3 during resume

Seth Heasley (1):
      PCI: irq and pci_ids patch for Intel Tigerpoint DeviceIDs

 arch/x86/pci/irq.c            |    1 +
 drivers/pci/hotplug/Makefile  |    6 ++++-
 drivers/pci/hotplug/fakephp.c |   42 +++++++++++++++++++++++++---------------
 drivers/pci/msi.c             |   13 ++++++++++-
 drivers/pci/pci-driver.c      |   21 +++++++++++++++++++-
 drivers/pci/pci.c             |   32 +++++++++++++++---------------
 include/linux/pci_ids.h       |    1 +
 7 files changed, 80 insertions(+), 36 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please consider pulling my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

It only contains a few fixes, the most notable being Rafael's change to restore
PCI config space early, fixing bugs on various platforms.

Shortlog & diffstat below.

-- 
Jesse Barnes, Intel Open Source Technology Center

Hidetoshi Seto (1):
      PCI/MSI: bugfix/utilize for msi_capability_init()

Jiri Slaby (1):
      PCI hotplug: fix lock imbalance in pciehp

Rafael J. Wysocki (1):
      PCI PM: Restore standard config registers of all devices early

 drivers/pci/hotplug/pciehp_core.c |    4 +-
 drivers/pci/msi.c                 |   16 +++----
 drivers/pci/pci-driver.c          |   91 +++++++++++--------------------------
 drivers/pci/pci.c                 |   63 +++++++++++++++++++++++---
 drivers/pci/pci.h                 |    6 +++
 include/linux/pci.h               |    5 ++
 6 files changed, 105 insertions(+), 80 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

There are a few more regression fixes, mostly for minor hotplug related
issues.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Hidetoshi Seto (1):
      PCI: fix aer resume sanity check

Justin Chen (1):
      PCI hotplug: acpiphp wants a 64-bit _SUN

Kenji Kaneshige (1):
      PCI: pciehp: fix unexpected power off with pciehp_force

Neil Horman (1):
      PCI hotplug: ibmphp: Fix module ref count underflow

 drivers/pci/hotplug/acpiphp.h      |    2 +-
 drivers/pci/hotplug/acpiphp_core.c |    2 +-
 drivers/pci/hotplug/acpiphp_glue.c |    4 ++--
 drivers/pci/hotplug/ibmphp_core.c  |    5 -----
 drivers/pci/hotplug/pciehp_core.c  |   23 ++++++++++++-----------
 drivers/pci/pcie/aer/aerdrv_core.c |    2 +-
 6 files changed, 17 insertions(+), 21 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

Just one more fix for 2.6.28 is queued up so far, but it does allow booting
on certain platforms, so it's an important one.

Thanks,
Jesse

Kenji Kaneshige (1):
      PCI: ignore bit0 of _OSC return code

 drivers/pci/pci-acpi.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

A few more fixes for 2.6.28.

Thanks,
Jesse

Ed Swierk (1):
      PCI: fix range check on mmapped sysfs resource files

Harvey Harrison (1):
      PCI: annotate return value of pci_ioremap_bar with __iomem

Randy Dunlap (1):
      PCI: remove excess kernel-doc notation

Yu Zhao (1):
      PCI: fix VPD limit quirk for Broadcom 5708S

 drivers/pci/pci-sysfs.c |    2 +-
 drivers/pci/quirks.c    |   36 ++++++++++++++++++------------------
 drivers/pci/rom.c       |    6 ++++--
 include/linux/pci.h     |    2 +-
 4 files changed, 24 insertions(+), 22 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

Includes a few more regression fixes (compiler warnings and a thinko in the
new ASPM option).

Thanks,
Jesse

Greg Kroah-Hartman (1):
      PCI: fix compiler warnings in pci_get_subsys()

Sitsofe Wheeler (1):
      PCI: Fix pcie_aspm=force


 drivers/pci/pcie/aspm.c |    2 +-
 drivers/pci/search.c    |    6 +++---
 include/linux/pci.h     |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please, sir, please pull some more:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

This pull has a few more regression fixes, though I don't think any are listed
on Rafael's list atm.  The fakephp and iommu fixes are the most important, but
the others are definite regressions vs. earlier kernels as well, but don't have
very visible symptoms in most configurations.

Adrian Bunk (1):
      PCI: fix pciehp_free_irq()

Alex Chiang (1):
      PCI Hotplug: fakephp: fix deadlock... again

David Woodhouse (1):
      PCI/iommu: blacklist DMAR on Intel G31/G33 chipsets

Johann Felix Soden (2):
      PCI: Fix printk warnings in probe.c
      PCI: Fix printk warnings in setup-bus.c

Yinghai Lu (1):
      PCI: re-add debug prints for unmodified BARs


 drivers/pci/hotplug/fakephp.c    |    6 +++---
 drivers/pci/hotplug/pciehp_hpc.c |    2 +-
 drivers/pci/intel-iommu.c        |   23 +++++++++++++++++++++++
 drivers/pci/probe.c              |   18 +++++++++++++++---
 drivers/pci/setup-bus.c          |    6 +++++-
 5 files changed, 47 insertions(+), 8 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

Just a few fixes to regressions we found this time around.  We're still
working on making the slot name stuff better, but the fixes from Alex here
will be compatible with anything we do later (mainly we want to avoid
creating entries for slots that aren't really hot pluggable anyway, which
will just mean Alex's conflict resolution code won't be needed as often).

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Alex Chiang (2):
      PCI: pciehp: Rename duplicate slot name N as N-1, N-2, N-M...
      PCI: shpchp: Rename duplicate slot name N as N-1, N-2, N-M...

Greg Kroah-Hartman (1):
      PCI: fix reference leak in pci_get_dev_by_id()

 drivers/pci/hotplug/pciehp.h      |    1 -
 drivers/pci/hotplug/pciehp_core.c |   21 ++++++++++++++-------
 drivers/pci/hotplug/pciehp_hpc.c  |   11 +----------
 drivers/pci/hotplug/shpchp_core.c |   34 +++++++++++++++-------------------
 drivers/pci/search.c              |    2 ++
 5 files changed, 32 insertions(+), 37 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

This one is mostly misc. fixes that have been soaking for awhile.  We still
need to resolve the PCI hotplug slot naming stuff a bit better, but we've
got patches for that which will probably be ready for the next pull request.

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center


Andi Kleen (1):
      x86/PCI: allow scanning of 255 PCI busses

Ingo Molnar (1):
      Merge branch 'linus' into pci-for-jesse

Jesse Barnes (2):
      Merge branch 'pci-for-jesse' of git://git.kernel.org/.../tip/linux-2.6-tip into x86-merge
      Merge branch 'x86-merge' into for-linus

Jiri Slaby (2):
      PCI: acpi_pcihp: run _OSC on a root bridge
      PCI: add acpi_find_root_bridge_handle

Seth Heasley (1):
      x86/PCI: irq and pci_ids patch for Intel Ibex Peak PCHs

Yinghai Lu (3):
      pci: debug extra pci resources range
      pci: debug extra pci bus resources
      x86, pci: detect end_bus_number according to acpi/e820 reserved, v2

 arch/x86/pci/irq.c                 |    2 +
 arch/x86/pci/legacy.c              |    2 +-
 arch/x86/pci/mmconfig-shared.c     |   65 ++++++++++++++++++++++++++---------
 drivers/pci/hotplug/acpi_pcihp.c   |   38 ++++++++++++++-------
 drivers/pci/pcie/aer/aerdrv_acpi.c |    7 +---
 drivers/pci/probe.c                |    3 ++
 drivers/pci/setup-bus.c            |   35 +++++++++++++++++++
 include/linux/pci-acpi.h           |   11 ++++++
 include/linux/pci_ids.h            |    3 ++
 9 files changed, 130 insertions(+), 36 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

The most exciting thing in this set is the MSI restore fix.  It should get
suspend/resume working again on several machines.  Shortlog & diffstat
below.

-- 
Jesse Barnes, Intel Open Source Technology Center

Andrew Morton (1):
      PCI: make pci_register_driver() a macro

Dean Hildebrand (1):
      PCI: Limit VPD length for Broadcom 5708S

Dmitry Baryshkov (1):
      DMA: make dma-coherent.c documentation kdoc-friendly

Eric Dumazet (1):
      PCI: add Broadcom 5708S to VPD length quirk

Jesse Barnes (1):
      PCI: fully restore MSI state at resume time

Rafael J. Wysocki (1):
      PCI PM: Export pci_pme_active to drivers

Simon Horman (1):
      PCI: check the return value of device_create_bin_file() in pci_create_bus()

akpm@linux-foundation.org (1):
      PCI: remove duplicate symbol from pci_ids.h


 drivers/pci/msi.c       |    5 +--
 drivers/pci/pci.c       |    3 +-
 drivers/pci/probe.c     |   54 +++++++++++++++++++++++++++++++++--------------
 drivers/pci/quirks.c    |    7 +++++-
 include/linux/pci.h     |   11 ++++++---
 include/linux/pci_ids.h |    2 -
 kernel/dma-coherent.c   |   10 ++++----
 7 files changed, 60 insertions(+), 32 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

Tony noticed that a PCI fix he sent me was applied by both a PCI pull and an
x86 pull.  Unfortunately, the patches in each tree weren't identical and the
double application ended up removing some bfsort quirks for Dell machines.
Specifically it looks like the one that came in through Ingo & Thomas,
a1676072558854b95336c8f7db76b0504e909a0a, modified the end of the list, while
the one that I sent upstream, 8d64c781f0c5fbfdf8016bd1634506ff2ad1376a,
modified the entry above #ifdef __i386__, and with both applied we lose the
quirks for DL385 & DL585.

I fixed things up in my for-linus branch by reverting
a1676072558854b95336c8f7db76b0504e909a0a, matching the shortlog & diff below.

Thanks,
Jesse

Jesse Barnes (1):
      Revert "PCI: Correct last two HP entries in the bfsort whitelist"

diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 940185e..6e64aaf 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_tab
 #endif
        {
                .callback = set_bf_sort,
-               .ident = "HP ProLiant DL360",
+               .ident = "HP ProLiant DL385 G2",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"),
                },
        },
        {
                .callback = set_bf_sort,
-               .ident = "HP ProLiant DL380",
+               .ident = "HP ProLiant DL585 G2",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
                },
        },
        {}

Re: [git pull] PCI fixes

[Rafael J. Wysocki]

On Saturday, 14 of June 2008, Jesse Barnes wrote:
> Please pull the final (I hope!) fixes for 2.6.26:
> git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus
> 
> It's mainly a set of fixes I got from Ingo which have been soaking for
> awhile, including the resourceN_wc API, which should have been pushed
> upstream before now, but which has seen a lot of exposure in Ingo's
> tree.  Shortlog, diffstat & diff below.
> 
> Note that to take advantage of the new resourceN_wc file in X you'll need
> something like the patch I just posted to xorg@lists.freedesktop.org.
> 
> Also, since I pulled the changes from Ingo, there are two duplicates (Bertram
> & Tony's patches) and a merge commit; hopefully they won't cause trouble.
> 
> Thanks,
> Jesse
> 
> Bertram Felgenhauer (1):
>       pci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
> 
> Jesse Barnes (2):
>       Merge branch 'pci-for-jesse' of git://git.kernel.org/.../x86/linux-2.6-tip into for-linus
>       PCI: fixup write combine comment in pci_mmap_resource
> 
> Miquel van Smoorenburg (2):
>       x86: pci-dma.c: use __GFP_NO_OOM instead of __GFP_NORETRY
>       x86, pci-dma.c: don't always add __GFP_NORETRY to gfp
> 
> Pavel Machek (1):
>       suspend-vs-iommu: prevent suspend if we could not resume

This has been merged already AFAICS, commit
cd76374e9de4501acc74f833dc6cb5e7a5dca115 .

Thanks,
Rafael

[git pull] PCI fixes

[Jesse Barnes]

[-- Attachment #1: Type: text/plain, Size: 1818 bytes --]

Please pull the final (I hope!) fixes for 2.6.26:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

It's mainly a set of fixes I got from Ingo which have been soaking for
awhile, including the resourceN_wc API, which should have been pushed
upstream before now, but which has seen a lot of exposure in Ingo's
tree.  Shortlog, diffstat & diff below.

Note that to take advantage of the new resourceN_wc file in X you'll need
something like the patch I just posted to xorg@lists.freedesktop.org.

Also, since I pulled the changes from Ingo, there are two duplicates (Bertram
& Tony's patches) and a merge commit; hopefully they won't cause trouble.

Thanks,
Jesse

Bertram Felgenhauer (1):
      pci, x86: add workaround for bug in ASUS A7V600 BIOS (rev 1005)

Jesse Barnes (2):
      Merge branch 'pci-for-jesse' of git://git.kernel.org/.../x86/linux-2.6-tip into for-linus
      PCI: fixup write combine comment in pci_mmap_resource

Miquel van Smoorenburg (2):
      x86: pci-dma.c: use __GFP_NO_OOM instead of __GFP_NORETRY
      x86, pci-dma.c: don't always add __GFP_NORETRY to gfp

Pavel Machek (1):
      suspend-vs-iommu: prevent suspend if we could not resume

Tony Camuso (1):
      PCI: Correct last two HP entries in the bfsort whitelist

Yinghai Lu (1):
      PCI: use dev_to_node in pci_call_probe

venkatesh.pallipadi@intel.com (1):
      x86: PAT export resource_wc in pci sysfs

 Documentation/filesystems/sysfs-pci.txt |    1 
 arch/x86/kernel/pci-dma.c               |   14 +++--
 arch/x86/pci/common.c                   |    8 +--
 drivers/pci/pci-driver.c                |    2 
 drivers/pci/pci-sysfs.c                 |   85 +++++++++++++++++++++++---------
 include/linux/pci.h                     |    1 
 6 files changed, 79 insertions(+), 32 deletions(-)


[-- Attachment #2: diff.txt --]
[-- Type: text/plain, Size: 8129 bytes --]

diff --git a/Documentation/filesystems/sysfs-pci.txt b/Documentation/filesystems/sysfs-pci.txt
index 5daa2aa..68ef488 100644
--- a/Documentation/filesystems/sysfs-pci.txt
+++ b/Documentation/filesystems/sysfs-pci.txt
@@ -36,6 +36,7 @@ files, each with their own function.
        local_cpus	   nearby CPU mask (cpumask, ro)
        resource		   PCI resource host addresses (ascii, ro)
        resource0..N	   PCI resource N, if present (binary, mmap)
+       resource0_wc..N_wc  PCI WC map resource N, if prefetchable (binary, mmap)
        rom		   PCI ROM resource, if present (binary, ro)
        subsystem_device	   PCI subsystem device (ascii, ro)
        subsystem_vendor	   PCI subsystem vendor (ascii, ro)
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index c5ef1af..dc00a13 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -378,6 +378,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
 	struct page *page;
 	unsigned long dma_mask = 0;
 	dma_addr_t bus;
+	int noretry = 0;
 
 	/* ignore region specifiers */
 	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
@@ -397,20 +398,25 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
 	if (dev->dma_mask == NULL)
 		return NULL;
 
-	/* Don't invoke OOM killer */
-	gfp |= __GFP_NORETRY;
+	/* Don't invoke OOM killer or retry in lower 16MB DMA zone */
+	if (gfp & __GFP_DMA)
+		noretry = 1;
 
 #ifdef CONFIG_X86_64
 	/* Why <=? Even when the mask is smaller than 4GB it is often
 	   larger than 16MB and in this case we have a chance of
 	   finding fitting memory in the next higher zone first. If
 	   not retry with true GFP_DMA. -AK */
-	if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
+	if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) {
 		gfp |= GFP_DMA32;
+		if (dma_mask < DMA_32BIT_MASK)
+			noretry = 1;
+	}
 #endif
 
  again:
-	page = dma_alloc_pages(dev, gfp, get_order(size));
+	page = dma_alloc_pages(dev,
+		noretry ? gfp | __GFP_NORETRY : gfp, get_order(size));
 	if (page == NULL)
 		return NULL;
 
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 6e64aaf..940185e 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -328,18 +328,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
 #endif
 	{
 		.callback = set_bf_sort,
-		.ident = "HP ProLiant DL385 G2",
+		.ident = "HP ProLiant DL360",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),
 		},
 	},
 	{
 		.callback = set_bf_sort,
-		.ident = "HP ProLiant DL585 G2",
+		.ident = "HP ProLiant DL380",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),
 		},
 	},
 	{}
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 72cf61e..e1637bd 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -181,7 +181,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
 	   any need to change it. */
 	struct mempolicy *oldpol;
 	cpumask_t oldmask = current->cpus_allowed;
-	int node = pcibus_to_node(dev->bus);
+	int node = dev_to_node(&dev->dev);
 
 	if (node >= 0) {
 		node_to_cpumask_ptr(nodecpumask, node);
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 271d41c..6f3c744 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -489,13 +489,13 @@ pci_mmap_legacy_mem(struct kobject *kobj, struct bin_attribute *attr,
  * @kobj: kobject for mapping
  * @attr: struct bin_attribute for the file being mapped
  * @vma: struct vm_area_struct passed into the mmap
+ * @write_combine: 1 for write_combine mapping
  *
  * Use the regular PCI mapping routines to map a PCI resource into userspace.
- * FIXME: write combining?  maybe automatic for prefetchable regions?
  */
 static int
 pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
-		  struct vm_area_struct *vma)
+		  struct vm_area_struct *vma, int write_combine)
 {
 	struct pci_dev *pdev = to_pci_dev(container_of(kobj,
 						       struct device, kobj));
@@ -518,7 +518,21 @@ pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
 	vma->vm_pgoff += start >> PAGE_SHIFT;
 	mmap_type = res->flags & IORESOURCE_MEM ? pci_mmap_mem : pci_mmap_io;
 
-	return pci_mmap_page_range(pdev, vma, mmap_type, 0);
+	return pci_mmap_page_range(pdev, vma, mmap_type, write_combine);
+}
+
+static int
+pci_mmap_resource_uc(struct kobject *kobj, struct bin_attribute *attr,
+		     struct vm_area_struct *vma)
+{
+	return pci_mmap_resource(kobj, attr, vma, 0);
+}
+
+static int
+pci_mmap_resource_wc(struct kobject *kobj, struct bin_attribute *attr,
+		     struct vm_area_struct *vma)
+{
+	return pci_mmap_resource(kobj, attr, vma, 1);
 }
 
 /**
@@ -541,9 +555,46 @@ pci_remove_resource_files(struct pci_dev *pdev)
 			sysfs_remove_bin_file(&pdev->dev.kobj, res_attr);
 			kfree(res_attr);
 		}
+
+		res_attr = pdev->res_attr_wc[i];
+		if (res_attr) {
+			sysfs_remove_bin_file(&pdev->dev.kobj, res_attr);
+			kfree(res_attr);
+		}
 	}
 }
 
+static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
+{
+	/* allocate attribute structure, piggyback attribute name */
+	int name_len = write_combine ? 13 : 10;
+	struct bin_attribute *res_attr;
+	int retval;
+
+	res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
+	if (res_attr) {
+		char *res_attr_name = (char *)(res_attr + 1);
+
+		if (write_combine) {
+			pdev->res_attr_wc[num] = res_attr;
+			sprintf(res_attr_name, "resource%d_wc", num);
+			res_attr->mmap = pci_mmap_resource_wc;
+		} else {
+			pdev->res_attr[num] = res_attr;
+			sprintf(res_attr_name, "resource%d", num);
+			res_attr->mmap = pci_mmap_resource_uc;
+		}
+		res_attr->attr.name = res_attr_name;
+		res_attr->attr.mode = S_IRUSR | S_IWUSR;
+		res_attr->size = pci_resource_len(pdev, num);
+		res_attr->private = &pdev->resource[num];
+		retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr);
+	} else
+		retval = -ENOMEM;
+
+	return retval;
+}
+
 /**
  * pci_create_resource_files - create resource files in sysfs for @dev
  * @dev: dev in question
@@ -557,31 +608,19 @@ static int pci_create_resource_files(struct pci_dev *pdev)
 
 	/* Expose the PCI resources from this device as files */
 	for (i = 0; i < PCI_ROM_RESOURCE; i++) {
-		struct bin_attribute *res_attr;
 
 		/* skip empty resources */
 		if (!pci_resource_len(pdev, i))
 			continue;
 
-		/* allocate attribute structure, piggyback attribute name */
-		res_attr = kzalloc(sizeof(*res_attr) + 10, GFP_ATOMIC);
-		if (res_attr) {
-			char *res_attr_name = (char *)(res_attr + 1);
-
-			pdev->res_attr[i] = res_attr;
-			sprintf(res_attr_name, "resource%d", i);
-			res_attr->attr.name = res_attr_name;
-			res_attr->attr.mode = S_IRUSR | S_IWUSR;
-			res_attr->size = pci_resource_len(pdev, i);
-			res_attr->mmap = pci_mmap_resource;
-			res_attr->private = &pdev->resource[i];
-			retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr);
-			if (retval) {
-				pci_remove_resource_files(pdev);
-				return retval;
-			}
-		} else {
-			return -ENOMEM;
+		retval = pci_create_attr(pdev, i, 0);
+		/* for prefetchable resources, create a WC mappable file */
+		if (!retval && pdev->resource[i].flags & IORESOURCE_PREFETCH)
+			retval = pci_create_attr(pdev, i, 1);
+
+		if (retval) {
+			pci_remove_resource_files(pdev);
+			return retval;
 		}
 	}
 	return 0;
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 509159b..d18b1dd 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -206,6 +206,7 @@ struct pci_dev {
 	struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */
 	int rom_attr_enabled;		/* has display of the rom attribute been enabled? */
 	struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
+	struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */
 #ifdef CONFIG_PCI_MSI
 	struct list_head msi_list;
 #endif

Re: [git pull] PCI fixes

[Jesse Barnes]

On Friday, June 06, 2008 3:04 pm Jeff Garzik wrote:
> Jesse Barnes wrote:
> > Please pull a few more fixes for 2.6.26:
> > git pull
> > git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
> > for-linus
> >
> > There's nothing big or critical here, just a couple of things that would
> > be nice to see in 2.6.26: a fix for OLPC and a new quirk for VIA bridges.
> >
> > Thanks,
> > Jesse
> >
> > Andres Salomon (1):
> >       PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
> >
> > Bertram Felgenhauer (1):
> >       x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
> >
> >  arch/x86/Kconfig    |   11 +++++------
> >  arch/x86/pci/init.c |    3 ++-
> >  arch/x86/pci/irq.c  |    7 +++++++
> >  arch/x86/pci/olpc.c |    5 +++--
> >  arch/x86/pci/pci.h  |    2 +-
> >  5 files changed, 18 insertions(+), 10 deletions(-)
>
> Even though these patches have made a previous appearance on the list,
> any chance you could be talked into including a summary patch, when you
> push upstream?  It's nice to be able to give the push one last look.

Sure, that's a good idea.  Especially for post-merge window pull requests
like this.  Here's this one for reference (note that I don't really think
some of this OLPC code being patched should exist in its current form at
all, but I don't think this patch makes things any worse).

Jesse

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dcbec34..52e18e6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1508,13 +1508,13 @@ config PCI_GOMMCONFIG
 config PCI_GODIRECT
 	bool "Direct"
 
-config PCI_GOANY
-	bool "Any"
-
 config PCI_GOOLPC
 	bool "OLPC"
 	depends on OLPC
 
+config PCI_GOANY
+	bool "Any"
+
 endchoice
 
 config PCI_BIOS
@@ -1531,9 +1531,8 @@ config PCI_MMCONFIG
 	depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
 
 config PCI_OLPC
-	bool
-	depends on PCI && PCI_GOOLPC
-	default y
+	def_bool y
+	depends on PCI && OLPC && (PCI_GOOLPC || PCI_GOANY)
 
 config PCI_DOMAINS
 	def_bool y
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index e70b9c5..b821f44 100644
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -15,7 +15,8 @@ static __init int pci_access_init(void)
 	pci_mmcfg_early_init();
 
 #ifdef CONFIG_PCI_OLPC
-	pci_olpc_init();
+	if (!pci_olpc_init())
+		return 0;	/* skip additional checks if it's an XO */
 #endif
 #ifdef CONFIG_PCI_BIOS
 	pci_pcbios_init();
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 0908fca..ca8df9c 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -621,6 +621,13 @@ static __init int via_router_probe(struct irq_router *r,
 			 */
 			device = PCI_DEVICE_ID_VIA_8235;
 			break;
+		case PCI_DEVICE_ID_VIA_8237:
+			/**
+			 * Asus a7v600 bios wrongly reports 8237
+			 * as 586-compatible
+			 */
+			device = PCI_DEVICE_ID_VIA_8237;
+			break;
 		}
 	}
 
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
index 5e76365..e11e9e8 100644
--- a/arch/x86/pci/olpc.c
+++ b/arch/x86/pci/olpc.c
@@ -302,12 +302,13 @@ static struct pci_raw_ops pci_olpc_conf = {
 	.write = pci_olpc_write,
 };
 
-void __init pci_olpc_init(void)
+int __init pci_olpc_init(void)
 {
 	if (!machine_is_olpc() || olpc_has_vsa())
-		return;
+		return -ENODEV;
 
 	printk(KERN_INFO "PCI: Using configuration type OLPC\n");
 	raw_pci_ops = &pci_olpc_conf;
 	is_lx = is_geode_lx();
+	return 0;
 }
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index f3972b1..720c4c5 100644
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -101,7 +101,7 @@ extern struct pci_raw_ops pci_direct_conf1;
 extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
-extern void pci_olpc_init(void);
+extern int pci_olpc_init(void);
 
 /* pci-mmconfig.c */
 

Re: [git pull] PCI fixes

[Jeff Garzik]

Jesse Barnes wrote:
> Please pull a few more fixes for 2.6.26:
> git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus
> 
> There's nothing big or critical here, just a couple of things that would be
> nice to see in 2.6.26: a fix for OLPC and a new quirk for VIA bridges.
> 
> Thanks,
> Jesse
> 
> Andres Salomon (1):
>       PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC
> 
> Bertram Felgenhauer (1):
>       x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)
> 
>  arch/x86/Kconfig    |   11 +++++------
>  arch/x86/pci/init.c |    3 ++-
>  arch/x86/pci/irq.c  |    7 +++++++
>  arch/x86/pci/olpc.c |    5 +++--
>  arch/x86/pci/pci.h  |    2 +-
>  5 files changed, 18 insertions(+), 10 deletions(-)

Even though these patches have made a previous appearance on the list, 
any chance you could be talked into including a summary patch, when you 
push upstream?  It's nice to be able to give the push one last look.

	Jeff

[git pull] PCI fixes

[Jesse Barnes]

Please pull a few more fixes for 2.6.26:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

There's nothing big or critical here, just a couple of things that would be
nice to see in 2.6.26: a fix for OLPC and a new quirk for VIA bridges.

Thanks,
Jesse

Andres Salomon (1):
      PCI/x86: fix up PCI stuff so that PCI_GOANY supports OLPC

Bertram Felgenhauer (1):
      x86/PCI: add workaround for bug in ASUS A7V600 BIOS (rev 1005)

 arch/x86/Kconfig    |   11 +++++------
 arch/x86/pci/init.c |    3 ++-
 arch/x86/pci/irq.c  |    7 +++++++
 arch/x86/pci/olpc.c |    5 +++--
 arch/x86/pci/pci.h  |    2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull the PCI fixes:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

Hopefully this'll be the last set of important fixes needed for 2.6.26.
Kenji-san tracked down and fixed several PCI hotplug problems, and Shaohua
fixed an interesting ASPM bug caused by a PCIe multifunction device that had
at least one non-PCIe sub-function.  One of the hotplug problems ended up
being a structural problem, so we'll probably have to rework the fix again
a bit more properly in 2.6.27 (once we figure out how we want to do it).

Thanks,
Jesse

Kenji Kaneshige (7):
      shpchp: add message about shpchp_slot_with_bus option
      pciehp: fix NULL dereference in interrupt handler
      pciehp: fix slow probing
      pciehp: poll cmd completion if hotplug interrupt is disabled
      pciehp: move msleep after power off
      pci hotplug core: add check of duplicate slot name
      pciehp: add message about pciehp_slot_with_bus option

Shaohua Li (1):
      PCI: don't enable ASPM on devices with mixed PCIe/PCI functions

 hotplug/pci_hotplug_core.c |    7 ++
 hotplug/pciehp.h           |   11 ++-
 hotplug/pciehp_core.c      |    6 +-
 hotplug/pciehp_ctrl.c      |   36 ++++++------
 hotplug/pciehp_hpc.c       |  129 ++++++++++++++++++++++++++++++++++-----------
 hotplug/shpchp_core.c      |    4 +
 pcie/aspm.c                |   20 ++++++
 7 files changed, 159 insertions(+), 54 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull the PCI fixes:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

We're still tracking down a couple of PCI hotplug regressions (there's a new
delay at probe time and drivers fighting over ports), so this won't be the
last pull request, but I wanted to get this HP fix upstream.  This pull also
includes an update for the PCI error list entry in MAINTAINERS; I forgot to
update it when linux-pci@ moved.

Thanks,
Jesse

Jesse Barnes (1):
      PCI: correct mailing list address

Tony Camuso (1):
      PCI: Correct last two HP entries in the bfsort whitelist


 MAINTAINERS           |    2 +-
 arch/x86/pci/common.c |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

[git pull] PCI fixes

[Jesse Barnes]

Please pull the PCI fixes:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

This includes a few important but perhaps slightly more dangerous fixes than
the previous set.  Highlights are:  a fix for the X MTRR mapping
incompatibility bug, a critical fix for ISA DMA, and support for more complex
_OSC topologies.  In order to fixup the changelog, I ended up rebasing this
time, hopefully I got everything right.

Thanks,
Jesse

Björn Krombholz (1):
      PCI: enable nv_msi_ht_cap_quirk for ALi bridges

Kenji Kaneshige (3):
      PCI ACPI: fix uninitialized variable in __pci_osc_support_set
      ACPI/PCI: handle multiple _OSC
      ACPI/PCI: another multiple _OSC memory leak fix

Shaohua Li (1):
      ACPI/PCI: handle multiple _OSC

Takashi Iwai (1):
      x86/PCI: fix broken ISA DMA

Venki Pallipadi (1):
      x86/PCI: X86_PAT & mprotect

mark gross (1):
      PCI: Make the intel-iommu_wait_op macro work when jiffies are not running

 arch/x86/kernel/pci-dma.c |    8 ++-
 arch/x86/pci/i386.c       |    4 -
 drivers/pci/intel-iommu.c |    6 +-
 drivers/pci/pci-acpi.c    |  109 +++++++++++++++++++++++++++++++++-------------
 drivers/pci/quirks.c      |    1 
 5 files changed, 89 insertions(+), 39 deletions(-)