From patchwork Wed Apr 13 19:55:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Ricard X-Patchwork-Id: 8827401 Return-Path: X-Original-To: patchwork-tpmdd-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0BDA0C0554 for ; Wed, 13 Apr 2016 19:56:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E2E92037E for ; Wed, 13 Apr 2016 19:56:21 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E7AB820272 for ; Wed, 13 Apr 2016 19:56:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1aqQtd-0000PG-Pb; Wed, 13 Apr 2016 19:56:17 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1aqQtc-0000P9-6r for tpmdd-devel@lists.sourceforge.net; Wed, 13 Apr 2016 19:56:16 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of gmail.com designates 74.125.82.65 as permitted sender) client-ip=74.125.82.65; envelope-from=christophe.ricard@gmail.com; helo=mail-wm0-f65.google.com; Received: from mail-wm0-f65.google.com ([74.125.82.65]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1aqQtb-0003tb-8v for tpmdd-devel@lists.sourceforge.net; Wed, 13 Apr 2016 19:56:16 +0000 Received: by mail-wm0-f65.google.com with SMTP id n3so17048776wmn.1 for ; Wed, 13 Apr 2016 12:56:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v42WO67aBUhJG7g6hQaS/8FgUbvo6/+XlM12j0TfAgs=; b=eWywpwyaozf/xlRm/UQW9zn6ioAG7veTBiTczdeHas7CvEtNakuyLTynFNFrV6vU5w e1GW3oZf2piWX4HJhse8ywuaI/CiJI2uVkroN0VN9x3bBB4PFznYvPoDzC9oGD4ejTF+ 45v5qWGNELRpJV+SRQ7q59d22NS8rkTf6cn6F7n6Fl+vzqTCeWlblxJZ1xOdCgMMvbAt PthZhUlnd7fSzCn8cpkesMb6WARQ9HU4Ra56l4j2PUthryzOXKzUjyH9OJfDOc3IOnp0 wz5jROQugQEAJoQJpJI8wYL70eJyo+V7DJV16Zc2rcAMuz5flg2Ks+JMtjYrTphxg+hk e5Lw== X-Gm-Message-State: AD7BkJLdsiaLMloaAcuDj6HfN2oXFGy2L3YX/4LEaLShJzlm+zWhNvzzHqb3LqNl5Pcz/A== X-Received: by 10.28.35.86 with SMTP id j83mr31382743wmj.18.1460577369314; Wed, 13 Apr 2016 12:56:09 -0700 (PDT) Received: from localhost.localdomain (ax113-6-78-236-204-66.fbx.proxad.net. [78.236.204.66]) by smtp.gmail.com with ESMTPSA id 202sm10488911wmw.5.2016.04.13.12.56.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Apr 2016 12:56:08 -0700 (PDT) From: Christophe Ricard X-Google-Original-From: Christophe Ricard To: jarkko.sakkinen@linux.intel.com Date: Wed, 13 Apr 2016 21:55:45 +0200 Message-Id: <1460577351-24632-7-git-send-email-christophe-h.ricard@st.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460577351-24632-1-git-send-email-christophe-h.ricard@st.com> References: <1460577351-24632-1-git-send-email-christophe-h.ricard@st.com> X-Spam-Score: -1.6 (-) X-Headers-End: 1aqQtb-0003tb-8v Cc: jean-luc.blanc@st.com, ashley@ashleylai.com, tpmdd-devel@lists.sourceforge.net, christophe-h.ricard@st.com, benoit.houyere@st.com Subject: [tpmdd-devel] [PATCH v2 06/12] tpm: Manage itpm workaround with tis specific data_expect bit X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,HK_RANDOM_ENVFROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In order to keep this itpm workaround available after the tpm_tis rework, we are changing the way it is managed by using a tpm_tis_phy_ops structure allowing to manage TPM_STS_EXPECT_DATA bit behavior according to different TPM vendor. Those 2 fields might be used only for tpm_tis (lpc) phy in the future. Signed-off-by: Christophe Ricard --- drivers/char/tpm/tpm_tis.c | 22 +++++++++++++++++++--- drivers/char/tpm/tpm_tis_core.h | 7 +++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 2056481..a641af0 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -377,7 +377,8 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len) wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, &priv->int_queue, false); status = tpm_tis_status(chip); - if (!itpm && (status & TPM_STS_DATA_EXPECT) == 0) { + if ((status & priv->data_expect_mask) != + priv->data_expect_val) { rc = -EIO; goto out_err; } @@ -391,7 +392,8 @@ static int tpm_tis_send_data(struct tpm_chip *chip, u8 *buf, size_t len) wait_for_tpm_stat(chip, TPM_STS_VALID, chip->timeout_c, &priv->int_queue, false); status = tpm_tis_status(chip); - if ((status & TPM_STS_DATA_EXPECT) != 0) { + if ((status & priv->data_expect_mask) == + priv->data_expect_mask) { rc = -EIO; goto out_err; } @@ -529,6 +531,8 @@ static bool tpm_tis_update_timeouts(struct tpm_chip *chip, static int probe_itpm(struct tpm_chip *chip) { struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); + u8 data_expect_mask = priv->data_expect_mask; + u8 data_expect_val = priv->data_expect_val; int rc = 0; u8 cmd_getticks[] = { 0x00, 0xc1, 0x00, 0x00, 0x00, 0x0a, @@ -556,13 +560,18 @@ static int probe_itpm(struct tpm_chip *chip) release_locality(chip, priv->locality, 0); itpm = true; + priv->data_expect_mask = 0; + priv->data_expect_val = 0; rc = tpm_tis_send_data(chip, cmd_getticks, len); if (rc == 0) { dev_info(&chip->dev, "Detected an iTPM.\n"); rc = 1; - } else + } else { + priv->data_expect_mask = data_expect_mask; + priv->data_expect_val = data_expect_val; rc = -EFAULT; + } out: itpm = rem_itpm; @@ -598,6 +607,11 @@ static const struct tpm_class_ops tpm_tis = { .req_canceled = tpm_tis_req_canceled, }; +static struct tpm_tis_phy_ops tis_phy_ops = { + .data_expect_mask = TPM_STS_DATA_EXPECT, + .data_expect_val = TPM_STS_DATA_EXPECT, +}; + static int tpm_mem_read_bytes(struct tpm_chip *chip, u32 addr, u16 len, u8 *result) { @@ -852,6 +866,8 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info, chip->timeout_b = TIS_TIMEOUT_B_MAX; chip->timeout_c = TIS_TIMEOUT_C_MAX; chip->timeout_d = TIS_TIMEOUT_D_MAX; + priv->data_expect_req = TPM_STS_DATA_EXPECT; + priv->data_expect_mask = TPM_STS_DATA_EXPECT; priv->phy_id = phy; dev_set_drvdata(&chip->dev, priv); diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h index 732f305..cba82f8 100644 --- a/drivers/char/tpm/tpm_tis_core.h +++ b/drivers/char/tpm/tpm_tis_core.h @@ -36,14 +36,21 @@ struct tpm_tis_class_lowlevel { int (*write32)(struct tpm_chip *chip, u32 addr, u32 src); }; +struct tpm_tis_phy_ops { + int (*post_probe)(struct tpm_chip *chip); +}; + struct tpm_tis_data { u16 manufacturer_id; + u8 data_expect_mask; + u8 data_expect_val; int locality; int irq; bool irq_tested; wait_queue_head_t int_queue; wait_queue_head_t read_queue; const struct tpm_tis_class_lowlevel *lowlevel; + const struct tpm_tis_phy_ops *phy_ops; void *phy_id; };