[GIT] [3.10] NFC pull request

[GIT] [3.10] NFC pull request

[Samuel Ortiz]

Hi John,

This is the first NFC pull request for 3.10.

The 2 features we have with this one are:

- An LLCP Service Name Lookup (SNL) netlink interface for querying LLCP
  service availability from user space.
  Along the way, Thierry also improved the existing SNL interface for
  aggregating SNL responses.

- An initial LLCP socket options implementation, for setting the Receive
  Window (RW) and the Maximum Information Unit Extension (MIUX) per socket.
  This is need for the LLCP validation tests.

We also have a microread MEI build failure here: I am not sending this one to
3.9 because the MEI bus code is not there yet, so it won't break for anyone
else than me.

Thanks in advance for pulling those changes in.

The following changes since commit cd48d8ba149484c4723a2b75159deeb83f3d2273:

  NFC: microread: Fix mei physical layer (2013-02-11 18:35:36 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.10-1

for you to fetch changes up to ec97c981a6760f85543520fef40bfde32fe82b4a:

  NFC: llcp: Add cleanup support for unreplied SNL requests (2013-03-07 20:11:12 +0100)

----------------------------------------------------------------
Samuel Ortiz (5):
      NFC: microread: Fix MEI build failure
      NFC: llcp: Rename socket rw and miu fields
      NFC: llcp: Implement socket options
      NFC: llcp: Use socket specific link parameters before the local ones
      NFC: llcp: Remove redundant printk

Thierry Escande (4):
      NFC: Add missing type policies for netlink attributes
      NFC: llcp: Service Name Lookup SDRES aggregation
      NFC: llcp: Service Name Lookup netlink interface
      NFC: llcp: Add cleanup support for unreplied SNL requests

 drivers/nfc/microread/mei.c |    2 +-
 include/linux/socket.h      |    1 +
 include/uapi/linux/nfc.h    |   16 ++++
 net/nfc/llcp/commands.c     |  205 +++++++++++++++++++++++++++++++++++--------
 net/nfc/llcp/llcp.c         |  114 +++++++++++++++++++++---
 net/nfc/llcp/llcp.h         |   36 +++++++-
 net/nfc/llcp/sock.c         |  130 +++++++++++++++++++++++++--
 net/nfc/netlink.c           |  172 ++++++++++++++++++++++++++++++++++++
 net/nfc/nfc.h               |   14 +++
 9 files changed, 636 insertions(+), 54 deletions(-)
-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: [linux-nfc] [GIT] [3.10] NFC pull request

[Samuel Ortiz]

Hi John,

On Fri, Mar 08, 2013 at 12:44:06PM +0100, Samuel Ortiz wrote:
> Hi John,
> 
> This is the first NFC pull request for 3.10.
After pulling this one on top of your current tree, I just realized that it
fails to build due to the hlist changes (dropping the node parameters from
iterarors).
I'll rebase my changes on top of your HEAD and re-send a pull request, sorry.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

[GIT] [3.10] NFC pull request

[Samuel Ortiz]

Hi John,

This is the first NFC pull request for the 3.10 kernel. I have now rebased
those changes on top of wireless-next and they build fine.

The 2 features we have with this one are:

- An LLCP Service Name Lookup (SNL) netlink interface for querying LLCP
  service availability from user space.
  Along the way, Thierry also improved the existing SNL interface for
  aggregating SNL responses.

- An initial LLCP socket options implementation, for setting the Receive
  Window (RW) and the Maximum Information Unit Extension (MIUX) per socket.
  This is need for the LLCP validation tests.

We also have a microread MEI build failure here: I am not sending this one to
3.9 because the MEI bus code is not there yet, so it won't break for anyone
else than me.

Thanks in advance for pulling them in.

The following changes since commit c678fb2a915b71f8faa78d9ab6d409b8ff3276cc:

  mwifiex: fix potential null dereference 'mef_entry' (2013-03-08 16:02:48 -0500)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.10-1

for you to fetch changes up to 40213fa8513c2a92e7390f25571f7c17c7955e2b:

  NFC: llcp: Add cleanup support for unreplied SNL requests (2013-03-10 23:16:41 +0100)

----------------------------------------------------------------
Samuel Ortiz (5):
      NFC: microread: Fix MEI build failure
      NFC: llcp: Rename socket rw and miu fields
      NFC: llcp: Implement socket options
      NFC: llcp: Use socket specific link parameters before the local ones
      NFC: llcp: Remove redundant printk

Thierry Escande (4):
      NFC: Add missing type policies for netlink attributes
      NFC: llcp: Service Name Lookup SDRES aggregation
      NFC: llcp: Service Name Lookup netlink interface
      NFC: llcp: Add cleanup support for unreplied SNL requests

 drivers/nfc/microread/mei.c |    2 +-
 include/linux/socket.h      |    1 +
 include/uapi/linux/nfc.h    |   16 ++++
 net/nfc/llcp/commands.c     |  205 +++++++++++++++++++++++++++++++++++--------
 net/nfc/llcp/llcp.c         |  112 ++++++++++++++++++++---
 net/nfc/llcp/llcp.h         |   36 +++++++-
 net/nfc/llcp/sock.c         |  130 +++++++++++++++++++++++++--
 net/nfc/netlink.c           |  172 ++++++++++++++++++++++++++++++++++++
 net/nfc/nfc.h               |   14 +++
 9 files changed, 634 insertions(+), 54 deletions(-)
-- 
Intel Open Source Technology Centre
http://oss.intel.com/

[GIT] [3.10] NFC pull request

[Samuel Ortiz]

Hi John,

A bit late, but this is the 2nd NFC pull request for 3.10.

With this one we have:

- A major pn533 update. The pn533 framing support has been changed in order to
  easily support all pn533 derivatives. For example we now support the ACR122
  USB dongle.

- An NFC MEI physical layer code factorization through the mei_phy NFC API.
  Both the microread and the pn544 drivers now use it.

- LLCP aggregation support. This allows NFC p2p devices to send aggregated
  frames containing all sort of LLCP frames except SYMM and aggregation
  frames.

- More LLCP socket options for getting the remote device link parameters.

- Fixes for the LLCP socket option code added with the first pull request for
  3.10.

- Some support for LLCP corner cases like 0 length SDUs and general DISC
  (tagged with a 0,0 dsap ssap couple) handling.

- RFKILL support for NFC.

Thanks in advance for pulling them in.

The following changes since commit fe29f54cd574eab7b521445419f355c0ecd995cc:

  ipw2x00: move to kstrto* functions (2013-04-10 14:10:34 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.10-2

for you to fetch changes up to bb03dceb83852614ae3ad6b3731a31422890b0b9:

  NFC: pn544: Add MEI physical layer (2013-04-16 00:39:41 +0200)

----------------------------------------------------------------
Eric Lapuyade (1):
      NFC: mei: Add a common mei bus API for NFC drivers

Marina Makienko (1):
      NFC: pn533: Add missing usb_put_dev

Olivier Guiter (1):
      NFC: llcp: Fix zero octets length SDU handling

Samuel Ortiz (11):
      NFC: pn533: Use dynamic debug for pn533 hex dumps
      NFC: llcp: Socket miux is a big endian field
      NFC: llcp: Fall back to local values when getting socket options
      NFC: llcp: Only keep raw sockets alive when the LLCP local leaves
      NFC: llcp: Remove local_cleanup last argument
      NFC: llcp: Terminate connection when receiving a DISC on (0,0)
      NFC: Prevent polling when device is down
      NFC: pn533: Turn radio on and off when bringing the device up and down
      rfkill: Add NFC to the list of supported radios
      NFC: RFKILL support
      NFC: pn544: Add MEI physical layer

Thierry Escande (4):
      NFC: llcp: Aggregated frames support
      NFC: llcp: Use localy stored remote_miu value if not set at socket level
      NFC: llcp: Reset RW, LTO, and MIU remote parameters when link goes down
      NFC: llcp: Add support in getsockopt for RW, LTO, and MIU remote parameters

Waldemar Rymarkiewicz (19):
      NFC: pn533: Reword all std frame logic funct
      NFC: pn533: Print out response status bits in hex
      NFC: pn533: Fix div by zero while stopping polling
      NFC: pn533: Update copyrights note
      NFC: pn533: Rename pn533_fw_reset appropriately
      NFC: pn533: Fix memleak while scheduling next cmd
      NFC: pn533: Optimise issued cmd context tracking
      NFC: pn533: Keep cmd context in pn533 struct
      NFC: pn533: Remove redundant cmd_ prefix in the struct
      NFC: pn533: Fix incorrect kfree of complete args
      NFC: pn533: Simplify __pn533_send_frame_async
      NFC: pn533: Avoid function declarations
      NFC: pn533: Re-group fields in struct pn533
      NFC: pn533: Move wq_in_error to cmd context
      NFC: pn533: Add protocol type for frame ops
      NFC: pn533: Add support for ACS ACR122U reader
      NFC: pn533: Add pn533_abort_cmd procedure
      NFC: pn533: Remove unused pn533_cmd_complete_t
      NFC: pn533: Increase version number

 drivers/nfc/Kconfig           |   10 +
 drivers/nfc/Makefile          |    1 +
 drivers/nfc/mei_phy.c         |  164 +++++++++++
 drivers/nfc/mei_phy.h         |   30 ++
 drivers/nfc/microread/Kconfig |    2 +-
 drivers/nfc/microread/mei.c   |  139 +--------
 drivers/nfc/pn533.c           |  653 ++++++++++++++++++++++++++++-------------
 drivers/nfc/pn544/Kconfig     |   13 +-
 drivers/nfc/pn544/Makefile    |    2 +
 drivers/nfc/pn544/mei.c       |  121 ++++++++
 include/net/nfc/nfc.h         |    2 +
 include/uapi/linux/nfc.h      |    7 +-
 include/uapi/linux/rfkill.h   |    2 +
 net/nfc/core.c                |   43 +++
 net/nfc/llcp/commands.c       |   30 +-
 net/nfc/llcp/llcp.c           |  127 +++++---
 net/nfc/llcp/llcp.h           |    5 +-
 net/nfc/llcp/sock.c           |   43 ++-
 net/rfkill/core.c             |    4 +-
 19 files changed, 1011 insertions(+), 387 deletions(-)
 create mode 100644 drivers/nfc/mei_phy.c
 create mode 100644 drivers/nfc/mei_phy.h
 create mode 100644 drivers/nfc/pn544/mei.c
-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: [GIT] [3.10] NFC pull request

[John W. Linville]

On Tue, Apr 16, 2013 at 01:05:08AM +0200, Samuel Ortiz wrote:
> Hi John,
> 
> A bit late, but this is the 2nd NFC pull request for 3.10.
> 
> With this one we have:
> 
> - A major pn533 update. The pn533 framing support has been changed in order to
>   easily support all pn533 derivatives. For example we now support the ACR122
>   USB dongle.
> 
> - An NFC MEI physical layer code factorization through the mei_phy NFC API.
>   Both the microread and the pn544 drivers now use it.
> 
> - LLCP aggregation support. This allows NFC p2p devices to send aggregated
>   frames containing all sort of LLCP frames except SYMM and aggregation
>   frames.
> 
> - More LLCP socket options for getting the remote device link parameters.
> 
> - Fixes for the LLCP socket option code added with the first pull request for
>   3.10.
> 
> - Some support for LLCP corner cases like 0 length SDUs and general DISC
>   (tagged with a 0,0 dsap ssap couple) handling.
> 
> - RFKILL support for NFC.
> 
> Thanks in advance for pulling them in.
> 
> The following changes since commit fe29f54cd574eab7b521445419f355c0ecd995cc:
> 
>   ipw2x00: move to kstrto* functions (2013-04-10 14:10:34 -0400)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.10-2
> 
> for you to fetch changes up to bb03dceb83852614ae3ad6b3731a31422890b0b9:
> 
>   NFC: pn544: Add MEI physical layer (2013-04-16 00:39:41 +0200)

Pulling now...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

[GIT] [3.10] NFC pull request

[Samuel Ortiz]

Hi John,

Another NFC pull request for 3.10, in order to address Dave's request for
cleaning the LLCP Makefile up. If it's too late for the 3.10 merge window, or
if you want me to rebase this code on top of net-next and send the pull
request directly to Dave, please let me know.

Here it goes:

The following changes since commit b006ed545cbadf1ebd4683719554742d20dbcede:

  mwifiex: rework round robin scheduling of bss nodes. (2013-04-23 15:18:40 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.10-3

for you to fetch changes up to 30cc4587659e1c9b1bfade8b2a757d91e04758ab:

  NFC: Move LLCP code to the NFC top level diirectory (2013-04-26 12:37:28 +0200)

----------------------------------------------------------------
The last NFC pull request for 3.10:

This one only contains one patch for moving the LLCP code into net/nfc.
It fixes a build annoyance reported by Dave Miller caused by the fact
that the LLCP code object targets are not in the same directory as the
Makefile trying to build them is. It prevents us from doing e.g.

	make net/nfc/llcp/sock.o

Moving the LLCP code into net/nfc and not making it optional anymore
makes sense as LLCP is a fundamental piece of the NFC specifications
and thus should be in the core NFC directory.

----------------------------------------------------------------
Samuel Ortiz (1):
      NFC: Move LLCP code to the NFC top level diirectory

 net/nfc/Kconfig                              |    1 -
 net/nfc/Makefile                             |    6 ++-
 net/nfc/{llcp => }/llcp.h                    |    0
 net/nfc/llcp/Kconfig                         |    7 ---
 net/nfc/{llcp/commands.c => llcp_commands.c} |    2 +-
 net/nfc/{llcp/llcp.c => llcp_core.c}         |    2 +-
 net/nfc/{llcp/sock.c => llcp_sock.c}         |    2 +-
 net/nfc/netlink.c                            |    3 +-
 net/nfc/nfc.h                                |   64 --------------------------
 9 files changed, 8 insertions(+), 79 deletions(-)
 rename net/nfc/{llcp => }/llcp.h (100%)
 delete mode 100644 net/nfc/llcp/Kconfig
 rename net/nfc/{llcp/commands.c => llcp_commands.c} (99%)
 rename net/nfc/{llcp/llcp.c => llcp_core.c} (99%)
 rename net/nfc/{llcp/sock.c => llcp_sock.c} (99%)


-- 
Intel Open Source Technology Centre
http://oss.intel.com/

[GIT] [3.10] NFC pull request

[Samuel Ortiz]

Hi John,

This pull request includes Marcel's Kconfig dependency fix on top of the LLCP
code move to net/nfc.

Thanks in advance for pulling these 2 in.

The following changes since commit b006ed545cbadf1ebd4683719554742d20dbcede:

  mwifiex: rework round robin scheduling of bss nodes. (2013-04-23 15:18:40 -0400)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.10-4

for you to fetch changes up to c204ea092eead40d2ac577fc3b5c77052ec22a59:

  NFC: Add missing RFKILL dependency for Kconfig (2013-04-27 01:02:46 +0200)

----------------------------------------------------------------
With this one we have:

- One patch for moving the LLCP code into net/nfc.
  It fixes a build annoyance reported by Dave Miller caused by the fact
  that the LLCP code object targets are not in the same directory as the
  Makefile trying to build them is. It prevents us from doing e.g.

        make net/nfc/llcp/sock.o

  Moving the LLCP code into net/nfc and not making it optional anymore
  makes sense as LLCP is a fundamental piece of the NFC specifications
  and thus should be in the core NFC directory.

- One patch that fixes the missing dependency against RFKILL. Without it NFC
  fails to properly build when it's builtin and CONFIG_RFKILL=m.

----------------------------------------------------------------
Marcel Holtmann (1):
      NFC: Add missing RFKILL dependency for Kconfig

Samuel Ortiz (1):
      NFC: Move LLCP code to the NFC top level diirectory

 net/nfc/Kconfig                              |    2 +-
 net/nfc/Makefile                             |    6 ++-
 net/nfc/{llcp => }/llcp.h                    |    0
 net/nfc/llcp/Kconfig                         |    7 ---
 net/nfc/{llcp/commands.c => llcp_commands.c} |    2 +-
 net/nfc/{llcp/llcp.c => llcp_core.c}         |    2 +-
 net/nfc/{llcp/sock.c => llcp_sock.c}         |    2 +-
 net/nfc/netlink.c                            |    3 +-
 net/nfc/nfc.h                                |   64 --------------------------
 9 files changed, 9 insertions(+), 79 deletions(-)
 rename net/nfc/{llcp => }/llcp.h (100%)
 delete mode 100644 net/nfc/llcp/Kconfig
 rename net/nfc/{llcp/commands.c => llcp_commands.c} (99%)
 rename net/nfc/{llcp/llcp.c => llcp_core.c} (99%)
 rename net/nfc/{llcp/sock.c => llcp_sock.c} (99%)

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: [GIT] [3.10] NFC pull request

[John W. Linville]

On Sat, Apr 27, 2013 at 01:28:05AM +0200, Samuel Ortiz wrote:
> Hi John,
> 
> This pull request includes Marcel's Kconfig dependency fix on top of the LLCP
> code move to net/nfc.
> 
> Thanks in advance for pulling these 2 in.
> 
> The following changes since commit b006ed545cbadf1ebd4683719554742d20dbcede:
> 
>   mwifiex: rework round robin scheduling of bss nodes. (2013-04-23 15:18:40 -0400)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git tags/nfc-next-3.10-4
> 
> for you to fetch changes up to c204ea092eead40d2ac577fc3b5c77052ec22a59:
> 
>   NFC: Add missing RFKILL dependency for Kconfig (2013-04-27 01:02:46 +0200)
> 
> ----------------------------------------------------------------
> With this one we have:
> 
> - One patch for moving the LLCP code into net/nfc.
>   It fixes a build annoyance reported by Dave Miller caused by the fact
>   that the LLCP code object targets are not in the same directory as the
>   Makefile trying to build them is. It prevents us from doing e.g.
> 
>         make net/nfc/llcp/sock.o
> 
>   Moving the LLCP code into net/nfc and not making it optional anymore
>   makes sense as LLCP is a fundamental piece of the NFC specifications
>   and thus should be in the core NFC directory.
> 
> - One patch that fixes the missing dependency against RFKILL. Without it NFC
>   fails to properly build when it's builtin and CONFIG_RFKILL=m.

I'm pulling this one now, since it was requested by Dave...

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.