From patchwork Wed Nov 15 16:35:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Radu Pirea X-Patchwork-Id: 10059847 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 5910C604D4 for ; Wed, 15 Nov 2017 16:36:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D9B4289F7 for ; Wed, 15 Nov 2017 16:36:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 408782A0EF; Wed, 15 Nov 2017 16:36:00 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 A6C81289F7 for ; Wed, 15 Nov 2017 16:35:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757599AbdKOQf7 (ORCPT ); Wed, 15 Nov 2017 11:35:59 -0500 Received: from esa6.microchip.iphmx.com ([216.71.154.253]:35923 "EHLO esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757314AbdKOQf6 (ORCPT ); Wed, 15 Nov 2017 11:35:58 -0500 X-IronPort-AV: E=Sophos;i="5.44,434,1505804400"; d="scan'208";a="6275953" Received: from exsmtp02.microchip.com (HELO email.microchip.com) ([198.175.253.38]) by esa6.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 15 Nov 2017 09:35:46 -0700 Received: from rob-ult-m19893.microchip.com (10.10.76.4) by chn-sv-exch02.mchp-main.com (10.10.76.38) with Microsoft SMTP Server id 14.3.352.0; Wed, 15 Nov 2017 09:35:45 -0700 From: Radu Pirea To: , , , CC: Radu Pirea Subject: [RFC PATCH 1/2] Revert "spi: atmel: fix corrupted data issue on SAM9 family SoCs" Date: Wed, 15 Nov 2017 18:35:31 +0200 Message-ID: <1510763732-10151-2-git-send-email-radu.pirea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510763732-10151-1-git-send-email-radu.pirea@microchip.com> References: <1510763732-10151-1-git-send-email-radu.pirea@microchip.com> MIME-Version: 1.0 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 7094576ccdc3acfe1e06a1e2ab547add375baf7f. A better fix was found and DMA for SAM9 SoCs must be enabled. Signed-off-by: Radu Pirea --- drivers/spi/spi-atmel.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index f95da36..4e5e51f 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -269,7 +269,6 @@ struct atmel_spi_caps { bool is_spi2; bool has_wdrbt; bool has_dma_support; - bool has_pdc_support; }; /* @@ -1426,28 +1425,7 @@ static void atmel_get_caps(struct atmel_spi *as) as->caps.is_spi2 = version > 0x121; as->caps.has_wdrbt = version >= 0x210; -#ifdef CONFIG_SOC_SAM_V4_V5 - /* - * Atmel SoCs based on ARM9 (SAM9x) cores should not use spi_map_buf() - * since this later function tries to map buffers with dma_map_sg() - * even if they have not been allocated inside DMA-safe areas. - * On SoCs based on Cortex A5 (SAMA5Dx), it works anyway because for - * those ARM cores, the data cache follows the PIPT model. - * Also the L2 cache controller of SAMA5D2 uses the PIPT model too. - * In case of PIPT caches, there cannot be cache aliases. - * However on ARM9 cores, the data cache follows the VIVT model, hence - * the cache aliases issue can occur when buffers are allocated from - * DMA-unsafe areas, by vmalloc() for instance, where cache coherency is - * not taken into account or at least not handled completely (cache - * lines of aliases are not invalidated). - * This is not a theorical issue: it was reproduced when trying to mount - * a UBI file-system on a at91sam9g35ek board. - */ - as->caps.has_dma_support = false; -#else as->caps.has_dma_support = version >= 0x212; -#endif - as->caps.has_pdc_support = version < 0x212; } /*-------------------------------------------------------------------------*/ @@ -1588,7 +1566,7 @@ static int atmel_spi_probe(struct platform_device *pdev) } else if (ret == -EPROBE_DEFER) { return ret; } - } else if (as->caps.has_pdc_support) { + } else { as->use_pdc = true; }