[GIT] [3.9] NFC pull request

[GIT] [3.9] NFC pull request

[Samuel Ortiz]

Hi John,

This is the second NFC pull request for 3.9.

We have:

- A few pn533 fixes on top of Waldemar refactorization of the driver, one of
  them fixes target mode.

- A new driver for Inside Secure microread chipset. It supports two
  physical layers: i2c and MEI. The MEI one depends on a patchset that's
  been sent to Greg Kroah-Hartman for inclusion into the 3.9 kernel [1]. The
  dependency is a KConfig one which means this code is not buildable as long
  as the MEI API is not usptream.

Thanks in advance for pulling them in.

[1] https://lkml.org/lkml/2013/2/8/165


The following changes since commit 9ebea3829fac7505e0cd2642fbd13cfa9c038831:

  Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-28 13:54:03 -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.9-2

for you to fetch changes up to 52f2eaeec11c16c219f0e99b8496fbba86889830:

  NFC: pn533: Fix target polling mode (2013-02-08 12:18:48 +0100)

----------------------------------------------------------------
This is the 2nd NFC pull request.

With this one we have a new NFC driver for Inside Secure microread and a few
pn533 fixes.
Microread is an HCI based NFC IP and the driver we're pushing supports tags
R/W, and NFC p2p. It's supported over the i2c and MEI busses.

----------------------------------------------------------------
Eric Lapuyade (1):
      NFC: Initial support for Inside Secure microread

Samuel Ortiz (2):
      NFC: microread: Add i2c physical layer
      NFC: microread: Add MEI physical layer

Thierry Escande (1):
      NFC: pn533: Fix target polling mode

Waldemar Rymarkiewicz (2):
      nfc: pn533: Use static poll_mod and std_frame_ops
      nfc: pn533: Remove unreachable code

 drivers/nfc/Kconfig                     |    1 +
 drivers/nfc/Makefile                    |    1 +
 drivers/nfc/microread/Kconfig           |   35 ++
 drivers/nfc/microread/Makefile          |   10 +
 drivers/nfc/microread/i2c.c             |  340 +++++++++++++++
 drivers/nfc/microread/mei.c             |  241 ++++++++++
 drivers/nfc/microread/microread.c       |  728 +++++++++++++++++++++++++++++++
 drivers/nfc/microread/microread.h       |   33 ++
 drivers/nfc/pn533.c                     |    8 +-
 include/linux/platform_data/microread.h |   35 ++
 10 files changed, 1427 insertions(+), 5 deletions(-)
 create mode 100644 drivers/nfc/microread/Kconfig
 create mode 100644 drivers/nfc/microread/Makefile
 create mode 100644 drivers/nfc/microread/i2c.c
 create mode 100644 drivers/nfc/microread/mei.c
 create mode 100644 drivers/nfc/microread/microread.c
 create mode 100644 drivers/nfc/microread/microread.h
 create mode 100644 include/linux/platform_data/microread.h

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

Re: [GIT] [3.9] NFC pull request

[John W. Linville]

On Fri, Feb 08, 2013 at 02:23:35PM +0100, Samuel Ortiz wrote:
> Hi John,
> 
> This is the second NFC pull request for 3.9.
> 
> We have:
> 
> - A few pn533 fixes on top of Waldemar refactorization of the driver, one of
>   them fixes target mode.
> 
> - A new driver for Inside Secure microread chipset. It supports two
>   physical layers: i2c and MEI. The MEI one depends on a patchset that's
>   been sent to Greg Kroah-Hartman for inclusion into the 3.9 kernel [1]. The
>   dependency is a KConfig one which means this code is not buildable as long
>   as the MEI API is not usptream.
> 
> Thanks in advance for pulling them in.
> 
> [1] https://lkml.org/lkml/2013/2/8/165
> 
> 
> The following changes since commit 9ebea3829fac7505e0cd2642fbd13cfa9c038831:
> 
>   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-28 13:54:03 -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.9-2
> 
> for you to fetch changes up to 52f2eaeec11c16c219f0e99b8496fbba86889830:
> 
>   NFC: pn533: Fix target polling mode (2013-02-08 12:18:48 +0100)

Pulling now...

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

Re: [GIT] [3.9] NFC pull request

[Samuel Ortiz]

Hi John,

On Fri, Feb 08, 2013 at 02:43:25PM -0500, John W. Linville wrote:
> On Fri, Feb 08, 2013 at 02:23:35PM +0100, Samuel Ortiz wrote:
> > Hi John,
> > 
> > This is the second NFC pull request for 3.9.
> > 
> > We have:
> > 
> > - A few pn533 fixes on top of Waldemar refactorization of the driver, one of
> >   them fixes target mode.
> > 
> > - A new driver for Inside Secure microread chipset. It supports two
> >   physical layers: i2c and MEI. The MEI one depends on a patchset that's
> >   been sent to Greg Kroah-Hartman for inclusion into the 3.9 kernel [1]. The
> >   dependency is a KConfig one which means this code is not buildable as long
> >   as the MEI API is not usptream.
> > 
> > Thanks in advance for pulling them in.
> > 
> > [1] https://lkml.org/lkml/2013/2/8/165
> > 
> > 
> > The following changes since commit 9ebea3829fac7505e0cd2642fbd13cfa9c038831:
> > 
> >   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-28 13:54:03 -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.9-2
> > 
> > for you to fetch changes up to 52f2eaeec11c16c219f0e99b8496fbba86889830:
> > 
> >   NFC: pn533: Fix target polling mode (2013-02-08 12:18:48 +0100)
> 
> Pulling now...
The MEI bus API got some more comments from Greg Kroah-Hartman and got
slightly changed. I fixed it up in my tree, and below is a pull request for
getting this single patch. Please let me know if you want me to send the patch
through email instead.


The following changes since commit 8708aac79e4572ba673d7a21e94ddca9f3abb7fc:

  rtlwifi: rtl8192cu: Add new USB ID (2013-02-08 14:51:43 -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.9-3

for you to fetch changes up to cd48d8ba149484c4723a2b75159deeb83f3d2273:

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

----------------------------------------------------------------
This 3rd NFC pull request for 3.9 contains a fix for the microread MEI
physical layer support, as the MEI bus API changed.

>From the MEI code, we now pass the MEI id back to the driver probe routine,
and we also pass a name and a MEI id table through the mei_bus_driver
structure. A few renames as well like e.g. mei_bus_driver to mei_driver or
mei_bus_client to mei_device in order to be closer to the driver model
practices.

----------------------------------------------------------------
Samuel Ortiz (1):
      NFC: microread: Fix mei physical layer

 drivers/nfc/microread/mei.c |   43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

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

Re: [GIT] [3.9] NFC pull request

[John W. Linville]

On Mon, Feb 11, 2013 at 07:01:59PM +0100, Samuel Ortiz wrote:
> Hi John,
> 
> On Fri, Feb 08, 2013 at 02:43:25PM -0500, John W. Linville wrote:
> > On Fri, Feb 08, 2013 at 02:23:35PM +0100, Samuel Ortiz wrote:
> > > Hi John,
> > > 
> > > This is the second NFC pull request for 3.9.
> > > 
> > > We have:
> > > 
> > > - A few pn533 fixes on top of Waldemar refactorization of the driver, one of
> > >   them fixes target mode.
> > > 
> > > - A new driver for Inside Secure microread chipset. It supports two
> > >   physical layers: i2c and MEI. The MEI one depends on a patchset that's
> > >   been sent to Greg Kroah-Hartman for inclusion into the 3.9 kernel [1]. The
> > >   dependency is a KConfig one which means this code is not buildable as long
> > >   as the MEI API is not usptream.
> > > 
> > > Thanks in advance for pulling them in.
> > > 
> > > [1] https://lkml.org/lkml/2013/2/8/165
> > > 
> > > 
> > > The following changes since commit 9ebea3829fac7505e0cd2642fbd13cfa9c038831:
> > > 
> > >   Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (2013-01-28 13:54:03 -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.9-2
> > > 
> > > for you to fetch changes up to 52f2eaeec11c16c219f0e99b8496fbba86889830:
> > > 
> > >   NFC: pn533: Fix target polling mode (2013-02-08 12:18:48 +0100)
> > 
> > Pulling now...
> The MEI bus API got some more comments from Greg Kroah-Hartman and got
> slightly changed. I fixed it up in my tree, and below is a pull request for
> getting this single patch. Please let me know if you want me to send the patch
> through email instead.
> 
> 
> The following changes since commit 8708aac79e4572ba673d7a21e94ddca9f3abb7fc:
> 
>   rtlwifi: rtl8192cu: Add new USB ID (2013-02-08 14:51:43 -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.9-3
> 
> for you to fetch changes up to cd48d8ba149484c4723a2b75159deeb83f3d2273:
> 
>   NFC: microread: Fix mei physical layer (2013-02-11 18:35:36 +0100)
> 
> ----------------------------------------------------------------
> This 3rd NFC pull request for 3.9 contains a fix for the microread MEI
> physical layer support, as the MEI bus API changed.
> 
> From the MEI code, we now pass the MEI id back to the driver probe routine,
> and we also pass a name and a MEI id table through the mei_bus_driver
> structure. A few renames as well like e.g. mei_bus_driver to mei_driver or
> mei_bus_client to mei_device in order to be closer to the driver model
> practices.
> 
> ----------------------------------------------------------------
> Samuel Ortiz (1):
>       NFC: microread: Fix mei physical layer
> 
>  drivers/nfc/microread/mei.c |   43 ++++++++++++++++++++++++-------------------
>  1 file changed, 24 insertions(+), 19 deletions(-)

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.9] NFC pull request

[Samuel Ortiz]

Hi John,

This is the first NFC pull request for 3.9.

It brings the following goodies:

- LLCP socket timestamping (To be used e.g with the recently released nfctool
  application for a more efficient skb timestamping when sniffing).
- A pretty big pn533 rework from Waldemar, preparing the driver to support
  more flavours of pn533 based devices.
- HCI changes from Eric in preparation for the microread driver support.
- Some LLCP memory leak fixes, cleanups and slight improvements.
- pn544 and nfcwilink move to the devm_kzalloc API.
- An initial Secure Element (SE) API.
- An nfc.h license change from the original author, allowing non GPL
  application code to safely include it.

Thanks in advance for pulling them in.


The following changes since commit e7f767a7d9f809c494bfffffeda2bbdbfec110b4:

  mwifiex: use map/unmap APIs in TX and RX to reduce memcpy (2013-01-07 15:18:30 -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.9-1

for you to fetch changes up to d3710e74cf329839dea8d13b1ad56e572b06b173:

  NFC: Change nfc.h license (2013-01-14 12:28:54 +0100)

----------------------------------------------------------------
Eric Lapuyade (6):
      NFC: Fixed nfc core and hci unregistration and cleanup
      NFC: Added error handling in event_received hci ops
      NFC: Changed event_received hci ops result semantic
      NFC: Fixed skb leak in tm_send() nfc and hci ops implementations
      NFC: Add HCI quirks to support driver (non)standard implementations
      NFC: update HCI documentation

Julia Lawall (1):
      NFC: nfcwilink: Use devm_kzalloc

Lauro Ramos Venancio (1):
      NFC: Change nfc.h license

Samuel Ortiz (9):
      NFC: llcp: Remove the tx backlog queue
      NFC: llcp: Fix Rx memory leak
      NFC: pn544: Separate the core code and the i2c one into different modules
      NFC: pn544: Use module_i2c_driver
      NFC: pn544: Use devm_kzalloc API
      NFC: Initial Secure Element API
      NFC: Update pn544 documentation
      NFC: Avoid memcpy on LLCP connection less Rx path
      NFC: Use skb_copy_datagram_iovec

Thierry Escande (2):
      NFC: Add support for SO_TIMESTAMP LLCP socket option
      NFC: pn533: Fix bad allocation size

Waldemar Rymarkiewicz (28):
      NFC: pn533: Remove in/out_maxlen as it is not used
      NFC: pn533: Remove unused definitions
      NFC: pn533: Add frame header length define
      NFC: pn533: Remove pointless flags param
      NFC: pn533: Add a new pn533_send_cmd_async iface
      NFC: pn533: Add a new pn533_send_data_async iface
      NFC: pn533: Add a new pn533_send_sync iface
      NFC: pn533: Add pn533_alloc_skb for req allocation
      NFC: pn533: Remove pn533_send_cmd_frame_sync
      NFC: pn533: Del frame logic from TgGet/SetData cmd
      NFC: pn533: Del frame logic from InJumForDep cmd
      NFC: pn533: Del frame logic from Data Exchange cmd
      NFC: pn533: Dump tx and rx data in debug mode
      NFC: pn533: Remove frame logic from poll cmds
      NFC: pn533: Fix quoted strings split across lines
      NFC: pn533: Fix spacing issues
      NFC: pn533: Fix open parenthesis alignment
      NFC: pn533: Fix minor style issues
      NFC: pn533: Remove unused pn533_send_cmd_frame_asy
      NFC: pn533: Fix urb->status handling
      NFC: pn533: Cleanup debug messages
      NFC: pn533: Don't use out_frame in pn533_send_ack
      NFC: pn533: Use skb in __pn533_send_cmd_frame_asyn
      NFC: pn533: Remove deprecated dev->out_frame buff
      NFC: pn533: Cleanup pn533_cmd_complete_t
      NFC: pn533: Remove unused dev->wq_in_frame
      NFC: pn533: Introduce ops for frame logic
      NFC: pn533: Fix missing parenthesis

 Documentation/nfc/nfc-hci.txt   |  129 +++-
 Documentation/nfc/nfc-pn544.txt |   84 +--
 drivers/nfc/Kconfig             |   15 +-
 drivers/nfc/Makefile            |    2 +-
 drivers/nfc/nfcwilink.c         |   10 +-
 drivers/nfc/pn533.c             | 1593 ++++++++++++++++++++-------------------
 drivers/nfc/pn544/Kconfig       |   23 +
 drivers/nfc/pn544/Makefile      |    5 +-
 drivers/nfc/pn544/i2c.c         |   44 +-
 drivers/nfc/pn544/pn544.c       |   65 +-
 include/net/nfc/hci.h           |   22 +-
 include/net/nfc/nci_core.h      |    1 +
 include/net/nfc/nfc.h           |    8 +
 include/uapi/linux/nfc.h        |   37 +-
 net/nfc/core.c                  |   50 +-
 net/nfc/hci/command.c           |    7 +-
 net/nfc/hci/core.c              |   57 +-
 net/nfc/hci/hcp.c               |    7 +
 net/nfc/llcp/commands.c         |    2 +
 net/nfc/llcp/llcp.c             |   44 +-
 net/nfc/llcp/llcp.h             |    1 -
 net/nfc/llcp/sock.c             |   22 +-
 net/nfc/nci/core.c              |    2 +
 net/nfc/netlink.c               |    1 +
 24 files changed, 1201 insertions(+), 1030 deletions(-)
 create mode 100644 drivers/nfc/pn544/Kconfig


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