lkml.org 
[lkml]   [2015]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 065/132] vTPM: set virtual device before passing to ibmvtpm_reset_crq
    Date
    3.13.11-ckt24 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Hon Ching \\\\(Vicky\\\\) Lo" <honclo@linux.vnet.ibm.com>

    commit 9d75f08946e8485109458ccf16f714697c207f41 upstream.

    tpm_ibmvtpm_probe() calls ibmvtpm_reset_crq(ibmvtpm) without having yet
    set the virtual device in the ibmvtpm structure. So in ibmvtpm_reset_crq,
    the phype call contains empty unit addresses, ibmvtpm->vdev->unit_address.

    Signed-off-by: Hon Ching(Vicky) Lo <honclo@linux.vnet.ibm.com>
    Signed-off-by: Joy Latten <jmlatten@linux.vnet.ibm.com>
    Reviewed-by: Ashley Lai <ashley@ahsleylai.com>
    Fixes: 132f76294744 ("drivers/char/tpm: Add new device driver to support IBM vTPM")
    Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/char/tpm/tpm_ibmvtpm.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
    index 7116dcb3..3802733 100644
    --- a/drivers/char/tpm/tpm_ibmvtpm.c
    +++ b/drivers/char/tpm/tpm_ibmvtpm.c
    @@ -618,6 +618,9 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
    goto cleanup;
    }

    + ibmvtpm->dev = dev;
    + ibmvtpm->vdev = vio_dev;
    +
    crq_q = &ibmvtpm->crq_queue;
    crq_q->crq_addr = (struct ibmvtpm_crq *)get_zeroed_page(GFP_KERNEL);
    if (!crq_q->crq_addr) {
    @@ -662,8 +665,6 @@ static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,

    crq_q->index = 0;

    - ibmvtpm->dev = dev;
    - ibmvtpm->vdev = vio_dev;
    TPM_VPRIV(chip) = (void *)ibmvtpm;

    spin_lock_init(&ibmvtpm->rtce_lock);
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-07-23 04:41    [W:4.323 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site