mbox

[GIT,PULL] ARM: mvebu: pci/mbus fixes for v3.15

Message ID 20140429131101.GI28159@titan.lakedaemon.net
State New
Headers show

Pull-request

git://git.infradead.org/linux-mvebu.git tags/mvebu-mbus_pci-fixes-3.15

Message

Jason Cooper April 29, 2014, 1:11 p.m. UTC
arm-soc guys,

This rather large (for fixes) changeset resolves multiple problems with
the mvebu PCIe driver.  While it works fine for simple use cases, more
complicated uses highlighted multiple problems with MSI handling and mbus
window creation.

These changes are Acked by the appropriate maintainers and have been in
-next for about a week.

Please pull.

thx,

Jason.


The following changes since commit c9eaa447e77efe77b7fa4c953bd62de8297fd6c5:

  Linux 3.15-rc1 (2014-04-13 14:18:35 -0700)

are available in the git repository at:

  git://git.infradead.org/linux-mvebu.git tags/mvebu-mbus_pci-fixes-3.15

for you to fetch changes up to 398f5d5e10b6b917cd9d35ef21d545b0afbada22:

  PCI: mvebu: split PCIe BARs into multiple MBus windows when needed (2014-04-24 03:48:41 +0000)

----------------------------------------------------------------
mvebu drivers (mbus and pci) fixes for v3.15

 - pci

    - fix off-by-one for mbus window size
    - split BARs into multiple mbus windows when needed

 - mbus

    - avoid setting undefined window size
    - allow several windows with the same target/attr

----------------------------------------------------------------
Jason Gunthorpe (1):
      bus: mvebu-mbus: Avoid setting an undefined window size

Thomas Petazzoni (2):
      bus: mvebu-mbus: allow several windows with the same target/attribute
      PCI: mvebu: split PCIe BARs into multiple MBus windows when needed

Willy Tarreau (1):
      PCI: mvebu: fix off-by-one in the computed size of the mbus windows

 drivers/bus/mvebu-mbus.c     | 22 ++++++++---
 drivers/pci/host/pci-mvebu.c | 92 ++++++++++++++++++++++++++++++++++++--------
 2 files changed, 92 insertions(+), 22 deletions(-)

Comments

Olof Johansson May 5, 2014, 5:40 a.m. UTC | #1
On Tue, Apr 29, 2014 at 09:11:01AM -0400, Jason Cooper wrote:
> arm-soc guys,
> 
> This rather large (for fixes) changeset resolves multiple problems with
> the mvebu PCIe driver.  While it works fine for simple use cases, more
> complicated uses highlighted multiple problems with MSI handling and mbus
> window creation.
> 
> These changes are Acked by the appropriate maintainers and have been in
> -next for about a week.

Merged all three. We usually don't split up fixes in separate branches, so no
need to do so in the future.


-Olof
Jason Cooper May 5, 2014, 11:49 a.m. UTC | #2
On Sun, May 04, 2014 at 10:40:33PM -0700, Olof Johansson wrote:
> On Tue, Apr 29, 2014 at 09:11:01AM -0400, Jason Cooper wrote:
> > arm-soc guys,
> > 
> > This rather large (for fixes) changeset resolves multiple problems with
> > the mvebu PCIe driver.  While it works fine for simple use cases, more
> > complicated uses highlighted multiple problems with MSI handling and mbus
> > window creation.
> > 
> > These changes are Acked by the appropriate maintainers and have been in
> > -next for about a week.
> 
> Merged all three. We usually don't split up fixes in separate branches, so no
> need to do so in the future.

Noted.  The mbus/pci/irqchip fix series was a complicated one, but I
could've (should've) merged it into mvebu/fixes before sending the pull
request.  Will do so in the future.

We've (mvebu, and other sub-archs afaict) been splitting /fixes and
/dt-fixes for a while now.  Which I think helps reinforce the
independence of the two.  Do you want those merged together as well,
now?

thx,

Jason.
Olof Johansson May 5, 2014, 4:02 p.m. UTC | #3
On Mon, May 5, 2014 at 4:49 AM, Jason Cooper <jason@lakedaemon.net> wrote:
> On Sun, May 04, 2014 at 10:40:33PM -0700, Olof Johansson wrote:
>> On Tue, Apr 29, 2014 at 09:11:01AM -0400, Jason Cooper wrote:
>> > arm-soc guys,
>> >
>> > This rather large (for fixes) changeset resolves multiple problems with
>> > the mvebu PCIe driver.  While it works fine for simple use cases, more
>> > complicated uses highlighted multiple problems with MSI handling and mbus
>> > window creation.
>> >
>> > These changes are Acked by the appropriate maintainers and have been in
>> > -next for about a week.
>>
>> Merged all three. We usually don't split up fixes in separate branches, so no
>> need to do so in the future.
>
> Noted.  The mbus/pci/irqchip fix series was a complicated one, but I
> could've (should've) merged it into mvebu/fixes before sending the pull
> request.  Will do so in the future.
>
> We've (mvebu, and other sub-archs afaict) been splitting /fixes and
> /dt-fixes for a while now.  Which I think helps reinforce the
> independence of the two.  Do you want those merged together as well,
> now?

Depends on volume. If it's a lot of fixes, separate is fine. If it's
just a few patches, then you're mostly causing extra work by
separating. This set seemed a bit on the small side for splitting out.


-Olof