Applied Duncan Laurie's TPM patch (again, lost it somewhere in the shuffle).

Per https://patchwork.kernel.org/patch/2284471/