From patchwork Thu Aug 31 16:58:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Steffen X-Patchwork-Id: 9932517 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B0F0A60362 for ; Thu, 31 Aug 2017 16:58:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A17DF28994 for ; Thu, 31 Aug 2017 16:58:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9474828A16; Thu, 31 Aug 2017 16:58:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BFE328994 for ; Thu, 31 Aug 2017 16:58:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751866AbdHaQ6k (ORCPT ); Thu, 31 Aug 2017 12:58:40 -0400 Received: from smtp11.infineon.com ([217.10.52.105]:3956 "EHLO smtp11.infineon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751827AbdHaQ6j (ORCPT ); Thu, 31 Aug 2017 12:58:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=infineon.com; i=@infineon.com; q=dns/txt; s=IFXMAIL; t=1504198720; x=1535734720; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=A5qSDEKWthn1XYH959szuYDBna5Hr2udrUOw72O8Pxw=; b=pnnYd0jbWDAlS92QjP2s3scDizrozHY7XjDyBVxNFt29TSESJj/Ivm9V UShpHN4g3nITTiNPFBD6PGnPncSuarBRVyd51/l6g0KFE0trqvF40AjRK i1g7ZGWim1EhEFS1aigPIkygL4p6vBWi0EEBYaIPwLuWkHG5wAFzhZ4Ej g=; X-SBRS: None Received: from unknown (HELO mucxv003.muc.infineon.com) ([172.23.11.20]) by smtp11.infineon.com with ESMTP/TLS/AES256-GCM-SHA384; 31 Aug 2017 18:58:39 +0200 Received: from MUCSE607.infineon.com (mucse607.infineon.com [172.23.7.108]) by mucxv003.muc.infineon.com (Postfix) with ESMTPS; Thu, 31 Aug 2017 18:58:38 +0200 (CEST) Received: from MUCSE603.infineon.com (172.23.7.104) by MUCSE607.infineon.com (172.23.7.108) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Thu, 31 Aug 2017 18:58:37 +0200 Received: from ABGN5CG4522MQD.eu.infineon.com (172.29.170.103) by MUCSE603.infineon.com (172.23.7.104) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Thu, 31 Aug 2017 18:58:37 +0200 From: Alexander Steffen To: , , CC: , , Alexander Steffen , Subject: [PATCH RESEND v3 1/2] tpm_tis_spi: Use DMA-safe memory for SPI transfers Date: Thu, 31 Aug 2017 18:58:18 +0200 Message-ID: <20170831165819.13544-2-Alexander.Steffen@infineon.com> X-Mailer: git-send-email 2.11.1.windows.1 In-Reply-To: <20170831165819.13544-1-Alexander.Steffen@infineon.com> References: <20170831165819.13544-1-Alexander.Steffen@infineon.com> MIME-Version: 1.0 X-Originating-IP: [172.29.170.103] X-ClientProxiedBy: MUCSE601.infineon.com (172.23.7.102) To MUCSE603.infineon.com (172.23.7.104) Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The buffers used as tx_buf/rx_buf in a SPI transfer need to be DMA-safe. This cannot be guaranteed for the buffers passed to tpm_tis_spi_read_bytes and tpm_tis_spi_write_bytes. Therefore, we need to use our own DMA-safe buffer and copy the data to/from it. The buffer needs to be allocated separately, to ensure that it is cacheline-aligned and not shared with other data, so that DMA can work correctly. Fixes: 0edbfea537d1 ("tpm/tpm_tis_spi: Add support for spi phy") Cc: stable@vger.kernel.org Signed-off-by: Alexander Steffen Reviewed-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis_spi.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/char/tpm/tpm_tis_spi.c b/drivers/char/tpm/tpm_tis_spi.c index 88fe72a..05ce841 100644 --- a/drivers/char/tpm/tpm_tis_spi.c +++ b/drivers/char/tpm/tpm_tis_spi.c @@ -47,8 +47,8 @@ struct tpm_tis_spi_phy { struct tpm_tis_data priv; struct spi_device *spi_device; - u8 tx_buf[4]; - u8 rx_buf[4]; + u8 *tx_buf; + u8 *rx_buf; }; static inline struct tpm_tis_spi_phy *to_tpm_tis_spi_phy(struct tpm_tis_data *data) @@ -115,10 +115,9 @@ static int tpm_tis_spi_transfer(struct tpm_tis_data *data, u32 addr, u16 len, if (direction) { spi_xfer.tx_buf = NULL; - spi_xfer.rx_buf = buffer; } else { - spi_xfer.tx_buf = buffer; spi_xfer.rx_buf = NULL; + memcpy(phy->tx_buf, buffer, transfer_len); } spi_message_init(&m); @@ -127,6 +126,9 @@ static int tpm_tis_spi_transfer(struct tpm_tis_data *data, u32 addr, u16 len, if (ret < 0) goto exit; + if (direction) + memcpy(buffer, phy->rx_buf, transfer_len); + len -= transfer_len; buffer += transfer_len; } @@ -194,6 +196,14 @@ static int tpm_tis_spi_probe(struct spi_device *dev) phy->spi_device = dev; + phy->tx_buf = devm_kmalloc(&dev->dev, MAX_SPI_FRAMESIZE, GFP_KERNEL); + if (!phy->tx_buf) + return -ENOMEM; + + phy->rx_buf = devm_kmalloc(&dev->dev, MAX_SPI_FRAMESIZE, GFP_KERNEL); + if (!phy->rx_buf) + return -ENOMEM; + return tpm_tis_core_init(&dev->dev, &phy->priv, -1, &tpm_spi_phy_ops, NULL); }