From patchwork Mon Apr 18 22:17:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Ricard X-Patchwork-Id: 8875951 Return-Path: X-Original-To: patchwork-tpmdd-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 754F49F441 for ; Mon, 18 Apr 2016 22:18:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9046720165 for ; Mon, 18 Apr 2016 22:18:16 +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 5CFA020221 for ; Mon, 18 Apr 2016 22:18:15 +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 1asHUj-00041b-8v; Mon, 18 Apr 2016 22:18:13 +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 1asHUg-00041P-PM for tpmdd-devel@lists.sourceforge.net; Mon, 18 Apr 2016 22:18:10 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of gmail.com designates 74.125.82.67 as permitted sender) client-ip=74.125.82.67; envelope-from=christophe.ricard@gmail.com; helo=mail-wm0-f67.google.com; Received: from mail-wm0-f67.google.com ([74.125.82.67]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1asHUf-0004Oq-UO for tpmdd-devel@lists.sourceforge.net; Mon, 18 Apr 2016 22:18:10 +0000 Received: by mail-wm0-f67.google.com with SMTP id n3so286925wmn.1 for ; Mon, 18 Apr 2016 15:18:09 -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=6OWf7ofXOo7408qj9LuBrGD3Eur2JQoLacvXkllIClE=; b=acnUaJHh5J+el5CtTJ/HHTmX7Q+qZ/zvNoOTUF3iEAu2rvVt+aGOuydW04SZ9wPBfZ YS+qtjhOrukRuxcOQbFfX8SlQexMe+QY4erlFcZOYnsQAqWwBv2y8lA1mR+JqGBMSFFs ssVR27BA4fRMrN4Mxr0oRKQpnlnduvMLPWcNpiv/ujmB+Sl+LFDaUcbn9bS1hgupOlI6 45elWRInYtRowA3LGr+I9SrzBCQqX57lMVUw2rQAKvMwrCc60gRYxawzFEOoQCc/45Dr vyeHYIKxIhEKo2Y7Ia1ESkIeV0Wz+BDOYP5iYM9f3lvKh+s/3cPRi+VsEPsAe2Bm2FIq Cx9w== X-Gm-Message-State: AOPr4FVzAUFf/aQq/DOhKImPgA5cuLWRv3u1PZybVXnhFzLoOrRGG3QtdV/JNuw0u8+ojQ== X-Received: by 10.28.130.6 with SMTP id e6mr133494wmd.94.1461017883901; Mon, 18 Apr 2016 15:18:03 -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 i11sm66187860wjn.36.2016.04.18.15.18.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Apr 2016 15:18:03 -0700 (PDT) From: Christophe Ricard X-Google-Original-From: Christophe Ricard To: jarkko.sakkinen@linux.intel.com Date: Tue, 19 Apr 2016 00:17:38 +0200 Message-Id: <1461017864-3903-7-git-send-email-christophe-h.ricard@st.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1461017864-3903-1-git-send-email-christophe-h.ricard@st.com> References: <1461017864-3903-1-git-send-email-christophe-h.ricard@st.com> X-Spam-Score: -1.6 (-) X-Headers-End: 1asHUf-0004Oq-UO 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 v4 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 | 16 +++++++++++++--- drivers/char/tpm/tpm_tis_core.h | 3 +++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 87cbad5..ea95a82 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -380,7 +380,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; } @@ -394,7 +395,7 @@ 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_val) { rc = -EIO; goto out_err; } @@ -531,6 +532,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, @@ -558,13 +561,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; @@ -836,6 +844,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; + phy->priv.data_expect_val = TPM_STS_DATA_EXPECT; + phy->priv.data_expect_mask = TPM_STS_DATA_EXPECT; dev_set_drvdata(&chip->dev, &phy->priv); diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h index 9dd6b41..dfbda98 100644 --- a/drivers/char/tpm/tpm_tis_core.h +++ b/drivers/char/tpm/tpm_tis_core.h @@ -33,10 +33,13 @@ struct tpm_tis_phy_ops { int (*read16)(struct tpm_chip *chip, u32 addr, u16 *result); int (*read32)(struct tpm_chip *chip, u32 addr, u32 *result); int (*write32)(struct tpm_chip *chip, u32 addr, u32 src); + 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;