[GIT PULL] NTB bug fixes for v4.15

[GIT PULL] NTB bug fixes for v4.15

[Jon Mason]

Hello Linus,
Here is a new Switchtec NTB driver and a few NTB bug fixes for 4.15.
It's been sitting in my ntb-next branch for some time and should be
throughly tested.  Please consider pulling them.

Thanks,
Jon



The following changes since commit bebc6082da0a9f5d47a1ea2edc099bf671058bd4:

  Linux 4.14 (2017-11-12 10:46:13 -0800)

are available in the git repository at:

  git://github.com/jonmason/ntb tags/ntb-4.15

for you to fetch changes up to 4201a9918c49bece71d25b2ef30cbadb1fc528e8:

  ntb: intel: remove b2b memory window workaround for Skylake NTB (2017-11-18 20:54:47 -0500)

----------------------------------------------------------------
Support for the switchtec ntb and related changes.  Also, a couple of
bug fixes.

----------------------------------------------------------------
Bhumika Goyal (1):
      NTB: make idt_89hpes_cfg const

Dave Jiang (2):
      ntb: update maintainer list for Intel NTB driver
      ntb: intel: remove b2b memory window workaround for Skylake NTB

Logan Gunthorpe (15):
      NTB: switchtec: Move structure definitions into a common header
      NTB: switchtec: Export class symbol for use in upper layer driver
      NTB: switchtec: Add NTB hardware register definitions
      NTB: switchtec: Add link event notifier callback
      NTB: Ensure ntb_mw_get_align() is only called when the link is up
      NTB: Add check and comment for link up to mw_count() and mw_get_align()
      NTB: switchtec_ntb: Introduce initial NTB driver
      NTB: switchtec_ntb: Initialize hardware for memory windows
      NTB: switchtec_ntb: Initialize hardware for doorbells and messages
      NTB: switchtec_ntb: Add skeleton NTB driver
      NTB: switchtec_ntb: Add link management
      NTB: switchtec_ntb: Implement doorbell registers
      NTB: switchtec_ntb: Implement scratchpad registers
      NTB: switchtec_ntb: Add memory window support
      NTB: switchtec_ntb: Update switchtec documentation with notes for NTB

 Documentation/switchtec.txt            |   12 +
 MAINTAINERS                            |    7 +-
 drivers/ntb/hw/Kconfig                 |    1 +
 drivers/ntb/hw/Makefile                |    1 +
 drivers/ntb/hw/idt/ntb_hw_idt.c        |   16 +-
 drivers/ntb/hw/intel/ntb_hw_intel.c    |   75 +-
 drivers/ntb/hw/mscc/Kconfig            |    9 +
 drivers/ntb/hw/mscc/Makefile           |    1 +
 drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 1216 ++++++++++++++++++++++++++++++++
 drivers/ntb/ntb_transport.c            |   20 +-
 drivers/ntb/test/ntb_perf.c            |   18 +-
 drivers/ntb/test/ntb_tool.c            |    6 +-
 drivers/pci/switch/switchtec.c         |  316 ++-------
 include/linux/ntb.h                    |   11 +-
 include/linux/switchtec.h              |  373 ++++++++++
 15 files changed, 1715 insertions(+), 367 deletions(-)
 create mode 100644 drivers/ntb/hw/mscc/Kconfig
 create mode 100644 drivers/ntb/hw/mscc/Makefile
 create mode 100644 drivers/ntb/hw/mscc/ntb_hw_switchtec.c
 create mode 100644 include/linux/switchtec.h

Re: [GIT PULL] NTB bug fixes for v4.15

[Linus Torvalds]

On Sun, Nov 19, 2017 at 5:25 AM, Jon Mason <jdmason@kudzu.us> wrote:
> Hello Linus,
> Here is a new Switchtec NTB driver and a few NTB bug fixes for 4.15.
> It's been sitting in my ntb-next branch for some time and should be
> throughly tested.  Please consider pulling them.

They may have been in your ntb-next branch for some time, but they
haven't been in linux-next at all.

Normally I might not care much.

This release I asked people to send their stuff early so that I'd get
it before my travels.

I am now traveling, and am not inclined to pull stuff that hasn't been
in linux-next unless it's just obviously bug-fixes.

           Linus

Re: [GIT PULL] NTB bug fixes for v4.15

[Logan Gunthorpe]

On 19/11/17 11:12 AM, Linus Torvalds wrote:
> I am now traveling, and am not inclined to pull stuff that hasn't been
> in linux-next unless it's just obviously bug-fixes.

Sigh. This work has been held up for two cycles due to issues with the
process.

If it's of any consideration, my Switchtec NTB patches were in one of my
repos which is subscribed to the kbuild test robot. I did receive a
build success notification email on it a few months ago. It's also an
isolated driver which shouldn't have any effect on any other systems.

I've also been postponing a couple of other minor patches to the
original Switchtec driver because they will have merge conflicts with
the NTB work.

Thanks,

Logan


> Date: Fri, 04 Aug 2017 03:55:34 +0800
> From: kbuild test robot <fengguang.wu@intel.com>
> Subject: [p2pmem:switchtec_ntb_v4] BUILD SUCCESS
>  253e1151b5dbb16cd21aee8cb125fd618d6846e0
> Message-ID: <59837fb6.PD30U+EhLwDZh5Rw%fengguang.wu@intel.com>
> 
> https://github.com/sbates130272/linux-p2pmem.git  switchtec_ntb_v4
> 253e1151b5dbb16cd21aee8cb125fd618d6846e0  NTB: switchtec_ntb: Update switchtec documentation with notes for NTB
> 
> elapsed time: 180m
> 
> configs tested: 159
>
> The following configs have been built successfully.
> More configs may be tested in the coming days.>
> <snip>

Re: [GIT PULL] NTB bug fixes for v4.15

[Linus Torvalds]

On Sun, Nov 19, 2017 at 8:25 PM, Logan Gunthorpe <logang@deltatee.com> wrote:
>
>
> On 19/11/17 11:12 AM, Linus Torvalds wrote:
>> I am now traveling, and am not inclined to pull stuff that hasn't been
>> in linux-next unless it's just obviously bug-fixes.
>
> Sigh. This work has been held up for two cycles due to issues with the
> process.
>
> If it's of any consideration, my Switchtec NTB patches were in one of my
> repos which is subscribed to the kbuild test robot. I did receive a
> build success notification email on it a few months ago. It's also an
> isolated driver which shouldn't have any effect on any other systems.

Gaah. I guess I can take the pull request.

I do want to protest the timing and the lack of linux-next coverage.
If it has really been ready for months, why hasn't it been in
linux-next at all?

         Linus

Re: [GIT PULL] NTB bug fixes for v4.15

[Logan Gunthorpe]

On 19/11/17 11:37 PM, Linus Torvalds wrote:
> Gaah. I guess I can take the pull request.

Many thanks.

> I do want to protest the timing and the lack of linux-next coverage.
> If it has really been ready for months, why hasn't it been in
> linux-next at all?

Understood. I can't speak for Jon, but in the future if I have patches
in the queue, I will definitely remind him to send it to Stephen for the
linux-next tree. And I'll make sure it gets there ahead of the merge window.

Logan

Re: [GIT PULL] NTB bug fixes for v4.15

[Stephen Rothwell]

Hi Logan,

On Sun, 19 Nov 2017 23:51:48 -0700 Logan Gunthorpe <logang@deltatee.com> wrote:
>
> > I do want to protest the timing and the lack of linux-next coverage.
> > If it has really been ready for months, why hasn't it been in
> > linux-next at all?  
> 
> Understood. I can't speak for Jon, but in the future if I have patches
> in the queue, I will definitely remind him to send it to Stephen for the
> linux-next tree. And I'll make sure it gets there ahead of the merge window.

OK, all I need is the (git) URL for a tree/branch (or tag) and a
contact (or more than one) to whom I can report conflicts and build
problems.  I then fetch it every day (so all you have to do it add stuff
to that branch when it is ready).

I noticed that one of the current set of commits removed Jon as a
MAINTAINER, so I am not sure what part he would play.
-- 
Cheers,
Stephen Rothwell

Re: [GIT PULL] NTB bug fixes for v4.15

[Dave Jiang]

On 11/20/2017 03:37 PM, Stephen Rothwell wrote:
> Hi Logan,
> 
> On Sun, 19 Nov 2017 23:51:48 -0700 Logan Gunthorpe <logang@deltatee.com> wrote:
>>
>>> I do want to protest the timing and the lack of linux-next coverage.
>>> If it has really been ready for months, why hasn't it been in
>>> linux-next at all?  
>>
>> Understood. I can't speak for Jon, but in the future if I have patches
>> in the queue, I will definitely remind him to send it to Stephen for the
>> linux-next tree. And I'll make sure it gets there ahead of the merge window.
> 
> OK, all I need is the (git) URL for a tree/branch (or tag) and a
> contact (or more than one) to whom I can report conflicts and build
> problems.  I then fetch it every day (so all you have to do it add stuff
> to that branch when it is ready).
> 
> I noticed that one of the current set of commits removed Jon as a
> MAINTAINER, so I am not sure what part he would play.
> 

He is still the NTB subsystem maintainer with more hardware drivers
continue being added. I just removed him from the Intel hardware driver
so he's not getting bothered with questions that should be coming to me.

Re: [GIT PULL] NTB bug fixes for v4.15

[Stephen Rothwell]

Hi Dave,

On Mon, 20 Nov 2017 15:40:13 -0700 Dave Jiang <dave.jiang@intel.com> wrote:
>
> He is still the NTB subsystem maintainer with more hardware drivers
> continue being added. I just removed him from the Intel hardware driver
> so he's not getting bothered with questions that should be coming to me.

Ah, my mistake.

-- 
Cheers,
Stephen Rothwell

Re: [GIT PULL] NTB bug fixes for v4.15

[Logan Gunthorpe]

On 20/11/17 03:37 PM, Stephen Rothwell wrote:
> OK, all I need is the (git) URL for a tree/branch (or tag) and a
> contact (or more than one) to whom I can report conflicts and build
> problems.  I then fetch it every day (so all you have to do it add stuff
> to that branch when it is ready).
> 
> I noticed that one of the current set of commits removed Jon as a
> MAINTAINER, so I am not sure what part he would play.
> 

The branch you would want to automatically fetch is

https://github.com/jonmason/ntb.git ntb-next

Jon's probably the contact you want for merge conflicts (Jon Mason 
<jdmason@kudzu.us>) as he's the one who typically pushes to those 
branches and submits PRs to Linus. You could also add the mailing list: 
linux-ntb@googlegroups.com. Dave and Allen are also maintainers but I'll 
let them speak up if they want to be contacted for this.

Thanks Stephen,

Logan

Re: [GIT PULL] NTB bug fixes for v4.15

[Dave Jiang]

On 11/20/2017 03:53 PM, Logan Gunthorpe wrote:
> 
> 
> On 20/11/17 03:37 PM, Stephen Rothwell wrote:
>> OK, all I need is the (git) URL for a tree/branch (or tag) and a
>> contact (or more than one) to whom I can report conflicts and build
>> problems.  I then fetch it every day (so all you have to do it add stuff
>> to that branch when it is ready).
>>
>> I noticed that one of the current set of commits removed Jon as a
>> MAINTAINER, so I am not sure what part he would play.
>>
> 
> The branch you would want to automatically fetch is
> 
> https://github.com/jonmason/ntb.git ntb-next
> 
> Jon's probably the contact you want for merge conflicts (Jon Mason
> <jdmason@kudzu.us>) as he's the one who typically pushes to those
> branches and submits PRs to Linus. You could also add the mailing list:
> linux-ntb@googlegroups.com. Dave and Allen are also maintainers but I'll
> let them speak up if they want to be contacted for this.

Thanks Logan! I'm ok with it either way. I'll see it if it goes to the
mailing list.

Re: [GIT PULL] NTB bug fixes for v4.15

[Stephen Rothwell]

Hi Logan,

On Mon, 20 Nov 2017 15:53:07 -0700 Logan Gunthorpe <logang@deltatee.com> wrote:
>
> On 20/11/17 03:37 PM, Stephen Rothwell wrote:
> > OK, all I need is the (git) URL for a tree/branch (or tag) and a
> > contact (or more than one) to whom I can report conflicts and build
> > problems.  I then fetch it every day (so all you have to do it add stuff
> > to that branch when it is ready).
> > 
> > I noticed that one of the current set of commits removed Jon as a
> > MAINTAINER, so I am not sure what part he would play.
> >   
> 
> The branch you would want to automatically fetch is
> 
> https://github.com/jonmason/ntb.git ntb-next
> 
> Jon's probably the contact you want for merge conflicts (Jon Mason 
> <jdmason@kudzu.us>) as he's the one who typically pushes to those 
> branches and submits PRs to Linus. You could also add the mailing list: 
> linux-ntb@googlegroups.com. Dave and Allen are also maintainers but I'll 
> let them speak up if they want to be contacted for this.

So, I really need Jon to request this inclusion (sorry).  And I would
prefer to not add it until after -rc1 has been released i.e. next week
probably.
-- 
Cheers,
Stephen Rothwell

Re: [GIT PULL] NTB bug fixes for v4.15

[Logan Gunthorpe]

On 21/11/17 03:19 PM, Stephen Rothwell wrote:
> So, I really need Jon to request this inclusion (sorry).  And I would
> prefer to not add it until after -rc1 has been released i.e. next week
> probably.

No worries. There's no real rush on this but it should have been done 
many cycles ago. After -rc1 is more than adequate.

Logan

Re: [GIT PULL] NTB bug fixes for v4.15

[Jon Mason]

On Tue, Nov 21, 2017 at 5:19 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Logan,
>
> On Mon, 20 Nov 2017 15:53:07 -0700 Logan Gunthorpe <logang@deltatee.com> wrote:
>>
>> On 20/11/17 03:37 PM, Stephen Rothwell wrote:
>> > OK, all I need is the (git) URL for a tree/branch (or tag) and a
>> > contact (or more than one) to whom I can report conflicts and build
>> > problems.  I then fetch it every day (so all you have to do it add stuff
>> > to that branch when it is ready).
>> >
>> > I noticed that one of the current set of commits removed Jon as a
>> > MAINTAINER, so I am not sure what part he would play.
>> >
>>
>> The branch you would want to automatically fetch is
>>
>> https://github.com/jonmason/ntb.git ntb-next
>>
>> Jon's probably the contact you want for merge conflicts (Jon Mason
>> <jdmason@kudzu.us>) as he's the one who typically pushes to those
>> branches and submits PRs to Linus. You could also add the mailing list:
>> linux-ntb@googlegroups.com. Dave and Allen are also maintainers but I'll
>> let them speak up if they want to be contacted for this.
>
> So, I really need Jon to request this inclusion (sorry).  And I would
> prefer to not add it until after -rc1 has been released i.e. next week
> probably.

Thank you for doing this.  Please include this branch at your
convenience, and email me (and the NTB mailing list if possible) with
any merge conflicts.

Thanks,
Jon

> --
> Cheers,
> Stephen Rothwell

Re: [GIT PULL] NTB bug fixes for v4.15

[Stephen Rothwell]

Hi Jon,

On Mon, 27 Nov 2017 10:46:06 -0500 Jon Mason <jdmason@kudzu.us> wrote:
>
> On Tue, Nov 21, 2017 at 5:19 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Mon, 20 Nov 2017 15:53:07 -0700 Logan Gunthorpe <logang@deltatee.com> wrote:  
> >>
> >> On 20/11/17 03:37 PM, Stephen Rothwell wrote:  
> >> > OK, all I need is the (git) URL for a tree/branch (or tag) and a
> >> > contact (or more than one) to whom I can report conflicts and build
> >> > problems.  I then fetch it every day (so all you have to do it add stuff
> >> > to that branch when it is ready).
> >> >
> >> > I noticed that one of the current set of commits removed Jon as a
> >> > MAINTAINER, so I am not sure what part he would play.
> >> >  
> >>
> >> The branch you would want to automatically fetch is
> >>
> >> https://github.com/jonmason/ntb.git ntb-next
> >>
> >> Jon's probably the contact you want for merge conflicts (Jon Mason
> >> <jdmason@kudzu.us>) as he's the one who typically pushes to those
> >> branches and submits PRs to Linus. You could also add the mailing list:
> >> linux-ntb@googlegroups.com. Dave and Allen are also maintainers but I'll
> >> let them speak up if they want to be contacted for this.  
> >
> > So, I really need Jon to request this inclusion (sorry).  And I would
> > prefer to not add it until after -rc1 has been released i.e. next week
> > probably.  
> 
> Thank you for doing this.  Please include this branch at your
> convenience, and email me (and the NTB mailing list if possible) with
> any merge conflicts.

No worries, added from today.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgement of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

-- 
Cheers,
Stephen Rothwell 
sfr@canb.auug.org.au