mbox

[tpmdd-devel,PULL,REQUEST] Pull TPM Fixes/Changes / TPM2.0 Support for 3.19 (for-linus)

Message ID 201412162331.29824.PeterHuewe@gmx.de
State Superseded, archived
Headers show

Pull-request

https://github.com/PeterHuewe/linux-tpmdd/ james-for-linus

Message

Peter Hüwe Dec. 16, 2014, 10:31 p.m. UTC
Hi James,

sorry for the ultra late pull request - I saw you didn't pull my previous request yet,
so hopefully we are still in time :)

This patchset now includes the support for TPM2.0 chips, thanks to the work of
 Jarkko, Jason, Stefan, Scot and many others who made this work possible.
Countless hours have been put into these patches - 
and I think they got quite a good review coverage and testing (probably the best ever in the TPM subsystem :)
(hey we reached v10 of this patches :)


To make it easier for you I rebased the changes onto your security/for-linus tree already.
I can send you one against your -next if you wish.

4 patches are marked for stable.
Based against your latest -for-linus



The following changes since commit 5057975ae38452679b964f1382c5efcb9faee74e:

  KEYS: remove a bogus NULL check (2014-12-16 18:05:20 +1100)

are available in the git repository at:

  https://github.com/PeterHuewe/linux-tpmdd/ james-for-linus

for you to fetch changes up to 7caba94b5b20ed242a87502e63d20e2cc2e7af11:

  tpm: TPM 2.0 FIFO Interface (2014-12-16 23:09:59 +0100)

----------------------------------------------------------------
Ashley Lai (1):
      tpm_ibmvtpm: Update email address in maintainers list and ibmvtpm driver

Christophe Ricard (16):
      tpm/tpm_i2c_stm_st33: Fix potential bug in tpm_stm_i2c_send
      tpm/tpm_i2c_stm_st33: Update Kconfig in order to be inline to other similar product
      tpm/tpm_i2c_stm_st33: Change License header to have up to date address information
      tpm/tpm_i2c_stm_st33: Fix few coding style error reported by scripts/checkpatch.pl
      tpm/tpm_i2c_stm_st33: Move tpm registers to tpm_i2c_stm_st33.c
      tpm/tpm_i2c_stm_st33: Add new tpm_stm_dev structure and remove tpm_i2c_buffer[0], [1] buffer.
      tpm/tpm_i2c_stm_st33: Remove reference to io_serirq
      tpm/tpm_i2c_stm_st33: Replace err/rc/ret by ret for a function return code
      tpm/tpm_i2c_stm_st33: Replace tpm_st33_* function with tpm_stm_*
      tpm/tpm_i2c_stm_st33: Add devicetree structure
      tpm/tpm_i2c_stm_st33/dts/st33zp24_i2c: Add DTS Documentation
      tpm/tpm_i2c_stm_st33: Few code cleanup
      tpm/tpm_i2c_stm_st33: Interrupt management improvement
      tpm/tpm_i2c_stm_st33: Remove useless i2c read on interrupt registers
      tpm/tpm_i2c_stm_st33: Increment driver version to 1.2.1.
      tpm/tpm_i2c_stm_st33: Fix coccinelle warnings. Possible NULL pointer dereference

David Howells (1):
      TPM: Add new TPMs to the tail of the list to prevent inadvertent change of dev

Fabian Frederick (1):
      tpm: remove unnecessary sizeof(u8)

Hon Ching (Vicky) Lo (1):
      tpm: Fix NULL return in tpm_ibmvtpm_get_desired_dma

Jarkko Sakkinen (8):
      tpm: merge duplicate transmit_cmd() functions
      tpm: two-phase chip management functions
      tpm: fix raciness of PPI interface lookup
      tpm: rename chip->dev to chip->pdev
      tpm: device class for tpm
      tpm: TPM 2.0 baseline support
      tpm: TPM 2.0 CRB Interface
      tpm: TPM 2.0 FIFO Interface

Kiran Padwal (1):
      char: tpm: Add missing error check for devm_kzalloc

Markus Elfring (1):
      char: tpm: Deletion of unnecessary checks before the function call "tpm_dev_vendor_release"

Scot Doyle (1):
      tpm_tis: verify interrupt during init

 Documentation/ABI/stable/sysfs-class-tpm           |  22 +-
 .../devicetree/bindings/security/tpm/st33zp24.txt  |  36 ++
 MAINTAINERS                                        |   8 +-
 drivers/char/tpm/Kconfig                           |  15 +-
 drivers/char/tpm/Makefile                          |   5 +-
 drivers/char/tpm/tpm-chip.c                        | 256 ++++++++
 drivers/char/tpm/tpm-dev.c                         |  42 +-
 drivers/char/tpm/tpm-interface.c                   | 263 +++------
 drivers/char/tpm/tpm-sysfs.c                       |  29 +-
 drivers/char/tpm/tpm.h                             | 118 +++-
 drivers/char/tpm/tpm2-cmd.c                        | 617 +++++++++++++++++++
 drivers/char/tpm/tpm_atmel.c                       |  25 +-
 drivers/char/tpm/tpm_crb.c                         | 354 +++++++++++
 drivers/char/tpm/tpm_i2c_atmel.c                   |  52 +-
 drivers/char/tpm/tpm_i2c_infineon.c                |  43 +-
 drivers/char/tpm/tpm_i2c_nuvoton.c                 |  69 +--
 drivers/char/tpm/tpm_i2c_stm_st33.c                | 657 +++++++++++----------
 drivers/char/tpm/tpm_ibmvtpm.c                     |  27 +-
 drivers/char/tpm/tpm_ibmvtpm.h                     |   2 +-
 drivers/char/tpm/tpm_infineon.c                    |  51 +-
 drivers/char/tpm/tpm_nsc.c                         |  34 +-
 drivers/char/tpm/tpm_of.c                          |   2 +-
 drivers/char/tpm/tpm_ppi.c                         | 141 +++--
 drivers/char/tpm/tpm_tis.c                         | 274 ++++++---
 drivers/char/tpm/xen-tpmfront.c                    |  14 +-
 .../linux/platform_data}/tpm_i2c_stm_st33.h        |  26 +-
 26 files changed, 2277 insertions(+), 905 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/security/tpm/st33zp24.txt
 create mode 100644 drivers/char/tpm/tpm-chip.c
 create mode 100644 drivers/char/tpm/tpm2-cmd.c
 create mode 100644 drivers/char/tpm/tpm_crb.c
 rename {drivers/char/tpm => include/linux/platform_data}/tpm_i2c_stm_st33.h (62%)



Thanks,
Peter
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk

Comments

James Morris Dec. 19, 2014, 2:56 a.m. UTC | #1
On Tue, 16 Dec 2014, Peter H?we wrote:

> Hi James,
> 
> sorry for the ultra late pull request - I saw you didn't pull my previous request yet,
> so hopefully we are still in time :)

Nope, way too late.  You need to get your pull request to me by -rc4.
Peter Hüwe Dec. 20, 2014, 3:25 p.m. UTC | #2
Am Freitag, 19. Dezember 2014, 03:56:14 schrieb James Morris:
> On Tue, 16 Dec 2014, Peter H?we wrote:
> > Hi James,
> > 
> > sorry for the ultra late pull request - I saw you didn't pull my previous
> > request yet, so hopefully we are still in time :)
> 
> Nope, way too late.  You need to get your pull request to me by -rc4.

Okay :/ 
getting this info already on the first pull request would have saved some 
trouble, but okay.

Any chance to get the -stable stuff in (maybe for rc1?) 

Thanks,
Peter

------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
James Morris Jan. 5, 2015, 2:05 a.m. UTC | #3
On Sat, 20 Dec 2014, Peter H?we wrote:

> Am Freitag, 19. Dezember 2014, 03:56:14 schrieb James Morris:
> > On Tue, 16 Dec 2014, Peter H?we wrote:
> > > Hi James,
> > > 
> > > sorry for the ultra late pull request - I saw you didn't pull my previous
> > > request yet, so hopefully we are still in time :)
> > 
> > Nope, way too late.  You need to get your pull request to me by -rc4.
> 
> Okay :/ 
> getting this info already on the first pull request would have saved some 
> trouble, but okay.

Are you talking about a private email you sent me?  You should not send 
pull requests or general development emails privately to maintainers.

Also, you should know that you need to get your normal pull requests to me 
by -rc4, per http://kernsec.org/wiki/index.php/Kernel_Repository

You should also know that I can't add patches to my next branch during the 
merge window.


> Any chance to get the -stable stuff in (maybe for rc1?) 

Yes, you can always send pull requests for serious bugfixes, which are 
handled separately.
Peter Hüwe Jan. 5, 2015, 2:47 a.m. UTC | #4
Hi James,
happy new year to you.

Am Montag, 5. Januar 2015, 03:05:29 schrieb James Morris:
> On Sat, 20 Dec 2014, Peter H?we wrote:
> > Am Freitag, 19. Dezember 2014, 03:56:14 schrieb James Morris:
> > > On Tue, 16 Dec 2014, Peter H?we wrote:
> > > > Hi James,
> > > > 
> > > > sorry for the ultra late pull request - I saw you didn't pull my
> > > > previous request yet, so hopefully we are still in time :)
> > > 
> > > Nope, way too late.  You need to get your pull request to me by -rc4.
> > 
> > Okay :/
> > getting this info already on the first pull request would have saved some
> > trouble, but okay.
> 
> Are you talking about a private email you sent me?  You should not send
> pull requests or general development emails privately to maintainers.

The one I mean was sent out on 5th december, not sent privately
http://sourceforge.net/p/tpmdd/mailman/message/33117252/

(I actually sent it twice to you since your mail provider did not like my 
@gmx.de address on the first attempt :)

But lsm mailing list was not on cc.

Nevermind.

Regards,
Peter




------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net