From patchwork Fri Oct 2 12:22:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 457846CB for ; Fri, 2 Oct 2020 12:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2AF9520665 for ; Fri, 2 Oct 2020 12:23:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="dPO4j5o9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387875AbgJBMXa (ORCPT ); Fri, 2 Oct 2020 08:23:30 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:54082 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387877AbgJBMWy (ORCPT ); Fri, 2 Oct 2020 08:22:54 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122252euoutp02bfb12a3b5ad61933c321c793db59841a~6LFeoxa6V2196421964euoutp02D for ; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20201002122252euoutp02bfb12a3b5ad61933c321c793db59841a~6LFeoxa6V2196421964euoutp02D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641372; bh=BzRv9HJb8VaLbApMv1Dmlo0K8h3v8k5w87oec/cJk9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dPO4j5o9SFiQprSJdfF58XgVs9rs/lCgUrNbO7ICqV3pmZJ0Isa98jLJ6vIwa+UmN uUEkDOecMWXfWeTooRDRiyAi4YKwBMeoUPa+8P4ESGdusxuaImqqVSBNQcTXodyGFR PY68KskNStTl54B1iERgXTDMKYzfJy6gE7tgw+Bc= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20201002122252eucas1p169c62e7c624d05c762f87f313c14a01f~6LFeOOIb70997709977eucas1p18; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id B0.42.06456.B9B177F5; Fri, 2 Oct 2020 13:22:51 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20201002122251eucas1p26b59b6a574f78200d0c696dd1aacc140~6LFd0O4c92501625016eucas1p2F; Fri, 2 Oct 2020 12:22:51 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20201002122251eusmtrp1bfc3344390f81445ef703a373e56d285~6LFdxH3iZ1383613836eusmtrp11; Fri, 2 Oct 2020 12:22:51 +0000 (GMT) X-AuditID: cbfec7f2-809ff70000001938-90-5f771b9bc201 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 8D.BD.06314.B9B177F5; Fri, 2 Oct 2020 13:22:51 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20201002122251eusmtip20501592c6d9078c27423915482d550d8~6LFdoAdtN1143811438eusmtip2Q; Fri, 2 Oct 2020 12:22:51 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 1/9] spi: spi-s3c64xx: swap s3c64xx_spi_set_cs() and s3c64xx_enable_datapath() Date: Fri, 2 Oct 2020 14:22:35 +0200 Message-Id: <20201002122243.26849-2-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA02SfSzUcRzH+97v7vf73eX0c5TPsGxXRiYy0m+dWay2s7ZW81+tuPgN5bA7 j63mIcvDiBjpaDURs4Sj81Sqy0OXcaN5KrYa5rElh2Qodz+W/16f7/v9/jxsXxITtfFsyPDI GEYRKYsQ4wKuputP3/ES2/jAEyOGU/SztWkOXV9cy6MLv0/idO7EPEbr9XUEPaqtQrR6YohH f24txelifTuHTvk1StA1HeMEXd26gc6YSYfLlzBpi2qckKqrM3FpQ3mS9H5jNZIa1Icv4pcF 3iFMRHgco3DzCRKETfZGRE8RCWkLQ7xk9AbPQnwSKE/IKE3hZCEBKaKqECxOjCK2WEaw2rmx oxgQ6Ob7OLuRwcIMnpFFVCWClUxr1jSNYKzrp0nAKV/IrfjIMwpWVBMHHhj0XGOBUZ0IGr4N co0uSyoYphZGTcylHKBdM0gYWUhJ4PHqh50N7SG9ssnEfMobdGUanPVYgO7RpCl7gHKGF6nD Jsa2/XdflWDGYUB9IWA4bZrHNjoLm1tdiGVLmOtuJFi2g56C7O0wuc1JUJDvxWazEWhK17is RwJjfeu40YNRx6C21Y199oW3/YsYGzWHkR8W7ArmkK95uPMshIx7ItZ9FF7mvt5paAM5c1Uo D4lVe45R7TlA9X/WU4RVI2smVikPZZTukUy8q1ImV8ZGhroGR8nVaPtL9Wx1LzWjlYHrWkSR SGwmDNPGBop4sjhlolyLgMTEVkK/3p5rImGILPEWo4gKVMRGMEotsiW5YmuhR9nsVREVKoth bjJMNKPYVTkk3yYZXVq3H/ztoOPY1wfchiCv8P5l/o1zG2NDnoUDHRfy7Tclqe80FlPZHF16 Y2+2ZdFzt+Hmg0U9S5IAqTnusvrYazbEx/+K7WZAXkVf/IxHh4HABKF2uOr9X8dP5+MmT+4f kTglNNc5S7wPtTj6tbkMlPrXfL1zpMnn9L70J7kzOU5irjJM5u6MKZSyf7ikiz9OAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t/xe7qzpcvjDSaeUbBY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DLeHI2p+Ape0XLm2usDYx72boYOTkkBEwk rk7tYO1i5OIQEljKKHF95VkghwMoISWxcm46RI2wxJ9rXWD1QgJPGSVudZSD2GwCjhL9S0+A 9YoI7GeSuHThPguIwyxwmFHi8rp1TCBVwgKJEo+//AGzWQRUJfZtu8oOYvMKWEvM/XYY6gp5 ifbl28FsTgEbiZOLtkFts5Zo/TiXFaJeUOLkzCcsIMcxC6hLrJ8nBBLmF9CSWNN0nQXEZgYa 07x1NvMERqFZSDpmIXTMQlK1gJF5FaNIamlxbnpusaFecWJucWleul5yfu4mRmBEbjv2c/MO xksbgw8xCnAwKvHwChwojRdiTSwrrsw9xCjBwawkwut09nScEG9KYmVValF+fFFpTmrxIUZT oDcnMkuJJucDk0VeSbyhqaG5haWhubG5sZmFkjhvh8DBGCGB9MSS1OzU1ILUIpg+Jg5OqQZG 7oNNc+cb+pyfEXbe5OUKtqg0u2qlS3r3U6+xLl6yaFr4Dq/yb4dMO7e8PXfpI88Z+2Vtr/Oq Q18YLllRvifxjMr3DRL3WM9NjDp529tCMerAud3yFr4/qr7MOnGzNHf/FF2vDqOzeTsmsucs bTvV++tsW4wB4zSJtUKtSq5lT5yv+omsnhD2UImlOCPRUIu5qDgRAL7qImTeAgAA X-CMS-MailID: 20201002122251eucas1p26b59b6a574f78200d0c696dd1aacc140 X-Msg-Generator: CA X-RootMTR: 20201002122251eucas1p26b59b6a574f78200d0c696dd1aacc140 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122251eucas1p26b59b6a574f78200d0c696dd1aacc140 References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Fix issues with DMA transfers bigger than 512 bytes on Exynos3250. Without the patches such transfers fail to complete. This solution to the problem is found in the vendor kernel for ARTIK5 boards based on Exynos3250. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Łukasz Stelmach --- drivers/spi/spi-s3c64xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 924b24441789..26c7cb79cd78 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -685,11 +685,11 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, sdd->state &= ~RXBUSY; sdd->state &= ~TXBUSY; - s3c64xx_enable_datapath(sdd, xfer, use_dma); - /* Start the signals */ s3c64xx_spi_set_cs(spi, true); + s3c64xx_enable_datapath(sdd, xfer, use_dma); + spin_unlock_irqrestore(&sdd->lock, flags); if (use_dma) From patchwork Fri Oct 2 12:22:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813299 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2406C139A for ; Fri, 2 Oct 2020 12:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04ECA20665 for ; Fri, 2 Oct 2020 12:23:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="sPXSDLiv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387972AbgJBMXa (ORCPT ); Fri, 2 Oct 2020 08:23:30 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:54944 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387880AbgJBMWy (ORCPT ); Fri, 2 Oct 2020 08:22:54 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122252euoutp01b4dbe078f842b2b1dd5368d6e1bae30b~6LFez-7EF0677506775euoutp01B for ; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20201002122252euoutp01b4dbe078f842b2b1dd5368d6e1bae30b~6LFez-7EF0677506775euoutp01B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641372; bh=GKVD4VWm7Cvdyywwusf1QceeQU4MFWyu++yW9esxCI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPXSDLivzlBAoP4u/0req4FO5fQBvD1f7WIEeDvB34nf9JdG4hbib/CAQ9/6VDhPm 4rUF25pss5LiKEwO7fzgKcIMq3RKJ24MCpKG/Oonjlu21qmBsND4zZWiYUG+OLhqsd TUW+s0mJSL/s6fYsrFy3+eao9wrdBq7uZjtKW5xo= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20201002122252eucas1p272f6377959e656acbf34bdf10f758c0e~6LFeav30l1010810108eucas1p20; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 81.42.06456.C9B177F5; Fri, 2 Oct 2020 13:22:52 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20201002122251eucas1p235d6797ae11f075a09841be64dc65236~6LFeGki8F2502325023eucas1p2G; Fri, 2 Oct 2020 12:22:51 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20201002122251eusmtrp2141758dc5face4f2c7fb60924e8976c5~6LFeF48ra0225802258eusmtrp2I; Fri, 2 Oct 2020 12:22:51 +0000 (GMT) X-AuditID: cbfec7f2-809ff70000001938-92-5f771b9caf6d Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id FD.B0.06017.B9B177F5; Fri, 2 Oct 2020 13:22:51 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20201002122251eusmtip10ba9a7279409444c21952bae83208a39~6LFd8yOpk0635906359eusmtip1O; Fri, 2 Oct 2020 12:22:51 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 2/9] spi: spi-s3s64xx: Add S3C64XX_SPI_QUIRK_CS_AUTO for Exynos3250 Date: Fri, 2 Oct 2020 14:22:36 +0200 Message-Id: <20201002122243.26849-3-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDKsWRmVeSWpSXmKPExsWy7djP87pzpMvjDSbM5LVY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi+KySUnNySxLLdK3S+DKuPrnPWPB draKyz8vsDcwbmLtYuTkkBAwkdg37xVLFyMXh5DACkaJG5cnMUE4Xxglnh76zwzhfGaUeH/n FFzLxgm/GSESyxklpjQsYwZJCAk8Z5RYtkgexGYTcJToX3qCFaRIRGA7k8TEz+fBljALHGWU 2PzgKgtIlbBAhMTtRf1sIDaLgKrEk1mzwFbwClhLXJv0gxlinbxE+/LtYDWcAjYSJxdtY4Oo EZQ4OfMJ2Bx+AS2JNU3XwWxmoPrmrbPB7pYQuMcusfzWRHaIQS4S0/++ZoKwhSVeHd8CFZeR +L9zPlCcA8iul5g8yQyit4dRYtucHywQNdYSd879YgOpYRbQlFi/Sx8i7Cix89gjRohWPokb bwUhTuCTmLRtOjNEmFeio00IolpFYl3/HqiBUhK9r1YwTmBUmoXkmVlIHpiFsGsBI/MqRvHU 0uLc9NRiw7zUcr3ixNzi0rx0veT83E2MwDR1+t/xTzsYv15KOsQowMGoxMObcag0Xog1say4 MvcQowQHs5IIr9PZ03FCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeY0XvYwVEkhPLEnNTk0tSC2C yTJxcEo1MOpnccsnLnnzQq6zfsXrZwHqjS/N5vdIBLz7EPBowYSo4GVyoiJtHbLnK15+sOF7 VqCuvq7C+oPiDX+B8B3JF20+9Vl/mVtzikd6WkQBoxqHx5Tdz4PjXqmlb/FxVDfnT9MP+Liq ZHHd2V0pGw2+B7K7RNjvLyy+FybL93Xzy3s/nQ0vFv9RUGIpzkg01GIuKk4EAKOWIDlPAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLIsWRmVeSWpSXmKPExsVy+t/xu7qzpcvjDb5uN7VY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DLuPrnPWPBdraKyz8vsDcwbmLtYuTkkBAw kdg44TdjFyMXh5DAUkaJv69OsXUxcgAlpCRWzk2HqBGW+HOtiw2i5imjxLFVd8Ga2QQcJfqX nmAFSYgI7GeSuHThPguIwyxwmFHi8rp1TCBVwgJhEl+6e9lBbBYBVYkns2aBdfMKWEtcm/SD GWKFvET78u1sIDangI3EyUXbwGwhoJrWj3Oh6gUlTs58wgJyHbOAusT6eUIgYX4BLYk1TddZ QGxmoDHNW2czT2AUmoWkYxZCxywkVQsYmVcxiqSWFuem5xYb6RUn5haX5qXrJefnbmIERuW2 Yz+37GDsehd8iFGAg1GJh1fgQGm8EGtiWXFl7iFGCQ5mJRFep7On44R4UxIrq1KL8uOLSnNS iw8xmgK9OZFZSjQ5H5gw8kriDU0NzS0sDc2NzY3NLJTEeTsEDsYICaQnlqRmp6YWpBbB9DFx cEo1MLaJ5W5JnLBb/If+w4pY6bsVKSoiE9eYhf9s1PaYdsNUeVKY+p3LcS5uS0Le9gvc3sfB ta0o4zrL186SxnPcIrobrVy3zQmYOOtcp8HmmaGL+c+uCl0bzHs559HzslTZk/ytfU0friio SVmfeXn22dODp6y4bA4Jv5CT84rY90Jx6YEK+Z5pF5RYijMSDbWYi4oTAf5vxongAgAA X-CMS-MailID: 20201002122251eucas1p235d6797ae11f075a09841be64dc65236 X-Msg-Generator: CA X-RootMTR: 20201002122251eucas1p235d6797ae11f075a09841be64dc65236 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122251eucas1p235d6797ae11f075a09841be64dc65236 References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Fix issues with DMA transfers bigger than 512 bytes on Exynos3250. Without the patches such transfers fail. The vendor kernel for ARTIK5 handles CS in a simmilar way. Signed-off-by: Łukasz Stelmach Reviewed-by: Krzysztof Kozlowski --- drivers/spi/spi-s3c64xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 26c7cb79cd78..4a9ca9a99857 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1379,6 +1379,7 @@ static struct s3c64xx_spi_port_config exynos4_spi_port_config = { .tx_st_done = 25, .high_speed = true, .clk_from_cmu = true, + .quirks = S3C64XX_SPI_QUIRK_CS_AUTO, }; static struct s3c64xx_spi_port_config exynos7_spi_port_config = { From patchwork Fri Oct 2 12:22:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813271 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7BB581668 for ; Fri, 2 Oct 2020 12:23:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5A5FE20795 for ; Fri, 2 Oct 2020 12:23:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="MUsfbiP2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387920AbgJBMXT (ORCPT ); Fri, 2 Oct 2020 08:23:19 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:54170 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387894AbgJBMW6 (ORCPT ); Fri, 2 Oct 2020 08:22:58 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122253euoutp020d416a4c92094ff6c7d2ffe78dd4d057~6LFfTlrwV2200222002euoutp02B for ; Fri, 2 Oct 2020 12:22:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20201002122253euoutp020d416a4c92094ff6c7d2ffe78dd4d057~6LFfTlrwV2200222002euoutp02B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641373; bh=ZDasxSLDTG8wrzz/6e9tA0XQtu/VdW0OUqVXl2oFS/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MUsfbiP2ie4P7JDHNCRmwAd+a1BAIZ0jqzwU/GBaH8uLaEW6wPVXfjY3sYwFReyIt IpHn+9rDq5t1y6w/XCMeDAWBZcuaWGdOSq7UyhQHB8nnjc16vjwRUsPHXMUgzXjtyv c3X8AYJy9ZQx7fVAmYLZHMcnZGkb2EQT79HSQ3Kg= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20201002122252eucas1p2c64faa54d42c02eb1e62e74f3aa8f3f1~6LFezFImU2502325023eucas1p2H; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 6B.EB.05997.C9B177F5; Fri, 2 Oct 2020 13:22:52 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20201002122252eucas1p1555a9b0df6f2318ab511117be3f65dee~6LFedUxGs0998509985eucas1p1M; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20201002122252eusmtrp27a12fe77a97437b5fd9f00766564b87f~6LFecuf3t0226002260eusmtrp2A; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) X-AuditID: cbfec7f4-65dff7000000176d-4f-5f771b9cfd48 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id CE.B0.06017.C9B177F5; Fri, 2 Oct 2020 13:22:52 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20201002122252eusmtip11711655e6661b1b8089a322115f4cd88~6LFeRkg990741307413eusmtip19; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 3/9] spi: spi-s3c64xx: Check return values Date: Fri, 2 Oct 2020 14:22:37 +0200 Message-Id: <20201002122243.26849-4-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFKsWRmVeSWpSXmKPExsWy7djPc7pzpMvjDZaeVLNY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi+KySUnNySxLLdK3S+DK2DD5O1vB b42Kh3t7mRoY1yp2MXJwSAiYSKxdU9HFyMUhJLCCUeLU/W1MEM4XRolHb2+zQDifGSXOvl3F 2sXICdaxac0mdojEcqCWF4eYIZznQFV95xlBqtgEHCX6l55gBUmICGxnkpj4+TzYLGaBo4wS mx9cZQGpEhawlbh8ZRpYB4uAqkTPq14WkKt4BayBxmZCrJOXaF++nQ3E5hSwkTi5aBuYzSsg KHFy5hOwMfwCWhJrmq6D2cxA9c1bZzND9D5il/j/zAvCdpHYvfY9E4QtLPHq+BZ2CFtG4v/O +UyQwKiXmDzJDORMCYEeRoltc36wQNRYS9w594sNpIZZQFNi/S59iLCjxNZN95khWvkkbrwV hLiAT2LStulQYV6JjjYhiGoViXX9e6AGSkn0vlrBOIFRaRaSX2YhuX8Wwq4FjMyrGMVTS4tz 01OLjfJSy/WKE3OLS/PS9ZLzczcxAlPU6X/Hv+xg3PUn6RCjAAejEg+vwIHSeCHWxLLiytxD jBIczEoivE5nT8cJ8aYkVlalFuXHF5XmpBYfYpTmYFES5zVe9DJWSCA9sSQ1OzW1ILUIJsvE wSnVwDjnXlSr/sload7NMhlP9rV8dw+/df5l+SHNCzKFHEemMN18s3DmuqkXEr4c2GF8ytNk 7/kJUfFMAUfnsZ6edbfaWmvGfes6idscUsznksTeTNV7KirZ2jRtecK27yqpSwKS9awLn6YW 33+6MEgw2T8hWi8xrirxqL/jW4PupMMKR9fUv/FbHqbEUpyRaKjFXFScCADLC6OETQMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t/xu7pzpMvjDWa95LVY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DL2DD5O1vBb42Kh3t7mRoY1yp2MXJySAiY SGxas4kdxBYSWMoosfuzeRcjB1BcSmLl3HSIEmGJP9e62LoYuYBKnjJKdC+/B1bPJuAo0b/0 BCtIQkRgP5PEpQv3WUAcZoHDjBKX161jAqkSFrCVuHxlGiOIzSKgKtHzqpcFZAOvgLXEqReZ EBvkJdqXb2cDsTkFbCROLtrGBnGQtUTrx7msIDavgKDEyZlPwFqZBdQl1s8TAgnzC2hJrGm6 zgJiMwONad46m3kCo9AsJB2zEDpmIalawMi8ilEktbQ4Nz232EivODG3uDQvXS85P3cTIzAi tx37uWUHY9e74EOMAhyMSjy8AgdK44VYE8uKK3MPMUpwMCuJ8DqdPR0nxJuSWFmVWpQfX1Sa k1p8iNEU6MuJzFKiyfnAZJFXEm9oamhuYWlobmxubGahJM7bIXAwRkggPbEkNTs1tSC1CKaP iYNTqoGx9Ba/1dVUTm2d+ww3gxZfrdXaYvcoLuDkPdEIKcGz26avq7nBtcqPk9E4qshHd32G gFnYbcnrn9codb29mTbRo1R7yVsDgcdxb1Q8hVvms8xbzMO1K211veotnSll7sv+WP/klewL 7btyJHHFt+RrU6+JXBa5/q9Qb3+M7XeRVG3/KGlr3RglluKMREMt5qLiRACUm4u03gIAAA== X-CMS-MailID: 20201002122252eucas1p1555a9b0df6f2318ab511117be3f65dee X-Msg-Generator: CA X-RootMTR: 20201002122252eucas1p1555a9b0df6f2318ab511117be3f65dee X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122252eucas1p1555a9b0df6f2318ab511117be3f65dee References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Check return values in prepare_dma() and s3c64xx_spi_config() and propagate errors upwards. Fixes: 788437273fa8 ("spi: s3c64xx: move to generic dmaengine API") Reviewed-by: Krzysztof Kozlowski Signed-off-by: Łukasz Stelmach --- drivers/spi/spi-s3c64xx.c | 50 ++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 4a9ca9a99857..48afd4818558 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -122,6 +122,7 @@ struct s3c64xx_spi_dma_data { struct dma_chan *ch; + dma_cookie_t cookie; enum dma_transfer_direction direction; }; @@ -271,12 +272,13 @@ static void s3c64xx_spi_dmacb(void *data) spin_unlock_irqrestore(&sdd->lock, flags); } -static void prepare_dma(struct s3c64xx_spi_dma_data *dma, +static int prepare_dma(struct s3c64xx_spi_dma_data *dma, struct sg_table *sgt) { struct s3c64xx_spi_driver_data *sdd; struct dma_slave_config config; struct dma_async_tx_descriptor *desc; + int ret; memset(&config, 0, sizeof(config)); @@ -300,12 +302,24 @@ static void prepare_dma(struct s3c64xx_spi_dma_data *dma, desc = dmaengine_prep_slave_sg(dma->ch, sgt->sgl, sgt->nents, dma->direction, DMA_PREP_INTERRUPT); + if (!desc) { + dev_err(&sdd->pdev->dev, "unable to prepare %s scatterlist", + dma->direction == DMA_DEV_TO_MEM ? "rx" : "tx"); + return -ENOMEM; + } desc->callback = s3c64xx_spi_dmacb; desc->callback_param = dma; - dmaengine_submit(desc); + dma->cookie = dmaengine_submit(desc); + ret = dma_submit_error(dma->cookie); + if (ret) { + dev_err(&sdd->pdev->dev, "DMA submission failed"); + return -EIO; + } + dma_async_issue_pending(dma->ch); + return 0; } static void s3c64xx_spi_set_cs(struct spi_device *spi, bool enable) @@ -355,11 +369,12 @@ static bool s3c64xx_spi_can_dma(struct spi_master *master, return xfer->len > (FIFO_LVL_MASK(sdd) >> 1) + 1; } -static void s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd, +static int s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd, struct spi_transfer *xfer, int dma_mode) { void __iomem *regs = sdd->regs; u32 modecfg, chcfg; + int ret = 0; modecfg = readl(regs + S3C64XX_SPI_MODE_CFG); modecfg &= ~(S3C64XX_SPI_MODE_TXDMA_ON | S3C64XX_SPI_MODE_RXDMA_ON); @@ -385,7 +400,7 @@ static void s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd, chcfg |= S3C64XX_SPI_CH_TXCH_ON; if (dma_mode) { modecfg |= S3C64XX_SPI_MODE_TXDMA_ON; - prepare_dma(&sdd->tx_dma, &xfer->tx_sg); + ret = prepare_dma(&sdd->tx_dma, &xfer->tx_sg); } else { switch (sdd->cur_bpw) { case 32: @@ -417,12 +432,17 @@ static void s3c64xx_enable_datapath(struct s3c64xx_spi_driver_data *sdd, writel(((xfer->len * 8 / sdd->cur_bpw) & 0xffff) | S3C64XX_SPI_PACKET_CNT_EN, regs + S3C64XX_SPI_PACKET_CNT); - prepare_dma(&sdd->rx_dma, &xfer->rx_sg); + ret = prepare_dma(&sdd->rx_dma, &xfer->rx_sg); } } + if (ret) + return ret; + writel(modecfg, regs + S3C64XX_SPI_MODE_CFG); writel(chcfg, regs + S3C64XX_SPI_CH_CFG); + + return 0; } static u32 s3c64xx_spi_wait_for_timeout(struct s3c64xx_spi_driver_data *sdd, @@ -555,9 +575,10 @@ static int s3c64xx_wait_for_pio(struct s3c64xx_spi_driver_data *sdd, return 0; } -static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) +static int s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) { void __iomem *regs = sdd->regs; + int ret; u32 val; /* Disable Clock */ @@ -605,7 +626,9 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) if (sdd->port_conf->clk_from_cmu) { /* The src_clk clock is divided internally by 2 */ - clk_set_rate(sdd->src_clk, sdd->cur_speed * 2); + ret = clk_set_rate(sdd->src_clk, sdd->cur_speed * 2); + if (ret) + return ret; } else { /* Configure Clock */ val = readl(regs + S3C64XX_SPI_CLK_CFG); @@ -619,6 +642,8 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) val |= S3C64XX_SPI_ENCLK_ENABLE; writel(val, regs + S3C64XX_SPI_CLK_CFG); } + + return 0; } #define XFER_DMAADDR_INVALID DMA_BIT_MASK(32) @@ -661,7 +686,9 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, sdd->cur_bpw = bpw; sdd->cur_speed = speed; sdd->cur_mode = spi->mode; - s3c64xx_spi_config(sdd); + status = s3c64xx_spi_config(sdd); + if (status) + return status; } if (!is_polling(sdd) && (xfer->len > fifo_len) && @@ -688,10 +715,15 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, /* Start the signals */ s3c64xx_spi_set_cs(spi, true); - s3c64xx_enable_datapath(sdd, xfer, use_dma); + status = s3c64xx_enable_datapath(sdd, xfer, use_dma); spin_unlock_irqrestore(&sdd->lock, flags); + if (status) { + dev_err(&spi->dev, "failed to enable data path for transfer: %d\n", status); + break; + } + if (use_dma) status = s3c64xx_wait_for_dma(sdd, xfer); else From patchwork Fri Oct 2 12:22:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813287 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6B4AA1668 for ; Fri, 2 Oct 2020 12:23:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 50E2B2074B for ; Fri, 2 Oct 2020 12:23:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="YYUL8CBe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387963AbgJBMXY (ORCPT ); Fri, 2 Oct 2020 08:23:24 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:54175 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387767AbgJBMW6 (ORCPT ); Fri, 2 Oct 2020 08:22:58 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122253euoutp0217bd2a28a64339662e761321993300e5~6LFfzrzU82316423164euoutp02E for ; Fri, 2 Oct 2020 12:22:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20201002122253euoutp0217bd2a28a64339662e761321993300e5~6LFfzrzU82316423164euoutp02E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641373; bh=iXskg/sx29oFhxvkuUJCTKesUirKCfDhLmYOrideYI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YYUL8CBevNMnnWB5+a4bJ7zp/2/IAMUn2jXJx3sk9RKs2YmIhQKI/o7uoKDaqnwNU 9Ezmp/koB/OBUJ/OoEgafNYh0/XxjUkzcqkXdbm2jrWAmVmtACu0ZwDBWfdvH9lgxQ PpxjD7+9JrxGb3geY5qo9ok0aoH5H8gF12sNikNM= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20201002122253eucas1p29500b4eab654b6b88bfbbb001d8eba76~6LFfUQQQH1017010170eucas1p2y; Fri, 2 Oct 2020 12:22:53 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 0D.EB.05997.D9B177F5; Fri, 2 Oct 2020 13:22:53 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20201002122252eucas1p1496d896453d21acda6ab83ef9b7f0b8a~6LFe1JcCP0998409984eucas1p18; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20201002122252eusmtrp28e2b31faae470ee4be13388ae961c29f~6LFe0knR00251002510eusmtrp2S; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) X-AuditID: cbfec7f4-65dff7000000176d-51-5f771b9d0384 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 9F.B0.06017.C9B177F5; Fri, 2 Oct 2020 13:22:52 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20201002122252eusmtip118bf3517dc183d5f8db4a6598c647f5b~6LFemdknH0635906359eusmtip1P; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 4/9] spi: spi-s3c64xx: Report more information when errors occur Date: Fri, 2 Oct 2020 14:22:38 +0200 Message-Id: <20201002122243.26849-5-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrFKsWRmVeSWpSXmKPExsWy7djP87pzpcvjDToWcVos/vGcyWLjjPWs FlMfPmGz6H/8mtni/PkN7BY3D61gtNj0+BqrxeVdc9gsZpzfx2TR+PEmu8XaI3fZLVbt+sPo wONxfcknZo+ds+6ye2xa1cnmsXlJvUffllWMHp83yQWwRXHZpKTmZJalFunbJXBlzL03j7ng Jm/Fg00nmRoY33J1MXJySAiYSLw9+Iyli5GLQ0hgBaPE2jUnmCCcL4wSX6Y3MoFUCQl8ZpSY cbsCpmPBmT/MEEXLGSVed/5ig3CeM0os6prOCFLFJuAo0b/0BCtIQkRgO5PExM/nwZYwCxxl lNj84CqQw8EhLBAq8XSZIIjJIqAqcfKxDkgvr4C1xK41TWwQ2+Ql2pdvB7M5BWwkTi7axgZR IyhxcuYTFhCbX0BLYk3TdTCbGai+eetssOskBB6xSzQcOscIMchFYuudy1C2sMSr41vYIWwZ if875zOB3CAhUC8xeZIZRG8Po8S2OT9YIGqsJe6cA/mSA2iBpsT6XfoQYUeJ7R/vMkO08knc eCsIcQKfxKRt06HCvBIdbUIQ1SoS6/r3QA2Ukuh9tYJxAqPSLCTPzELywCyEXQsYmVcxiqeW FuempxYb5aWW6xUn5haX5qXrJefnbmIEpqjT/45/2cG460/SIUYBDkYlHl6BA6XxQqyJZcWV uYcYJTiYlUR4nc6ejhPiTUmsrEotyo8vKs1JLT7EKM3BoiTOa7zoZayQQHpiSWp2ampBahFM lomDU6qBcQPXOuOjt/uW2PtWrU3nVBGx+ZnpyjM73WzpAW61+rd9ty1PsvjbzFq0pnnPNHWp P01TefW6T/+f8Yml+P/q7FDW1XYKIb8/Lco7/krLtt2laBKDf9aW5WyXC0ObkyX7NP+575Gq WaCwMG22aseGnoS8IhXdvps8Mc4x8ut/LJK1XvV9hn6IEktxRqKhFnNRcSIAGHIau00DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsVy+t/xu7pzpMvjDb7OULZY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DLmHtvHnPBTd6KB5tOMjUwvuXqYuTkkBAw kVhw5g9zFyMXh5DAUkaJfb/OsXYxcgAlpCRWzk2HqBGW+HOtiw2i5imjxMOHV9hAEmwCjhL9 S0+wgiREBPYzSVy6cJ8FxGEWOMwocXndOiaQKmGBYIml924wgUxlEVCVOPlYByTMK2AtsWtN ExvEBnmJ9uXbwWxOARuJk4u2gdlCQDWtH+eyQtQLSpyc+YQFZAyzgLrE+nlCIGF+AS2JNU3X WUBsZqAxzVtnM09gFJqFpGMWQscsJFULGJlXMYqklhbnpucWG+kVJ+YWl+al6yXn525iBMbk tmM/t+xg7HoXfIhRgINRiYdX4EBpvBBrYllxZe4hRgkOZiURXqezp+OEeFMSK6tSi/Lji0pz UosPMZoCfTmRWUo0OR+YLvJK4g1NDc0tLA3Njc2NzSyUxHk7BA7GCAmkJ5akZqemFqQWwfQx cXBKNTCyVX7T97l8v/UQ56nS0L/ndkV+/d56Ufe364fYz8cl6y8/X9W3XV+uLDV4r4Tt9Pwr x7fvEPPT2t637U7njn3lLxJ67yjF82gVzOWbN0XzX0Zdn7nlBlVjtjspLI/DHLUcm5vtHrMt jlZ15ZrJtuhLvd6eFa1Fp3886MuOFXboDbPedyzruLESS3FGoqEWc1FxIgDpESyj3wIAAA== X-CMS-MailID: 20201002122252eucas1p1496d896453d21acda6ab83ef9b7f0b8a X-Msg-Generator: CA X-RootMTR: 20201002122252eucas1p1496d896453d21acda6ab83ef9b7f0b8a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122252eucas1p1496d896453d21acda6ab83ef9b7f0b8a References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Report amount of pending data when a transfer stops due to errors. Report if DMA was used to transfer data and print the status code. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Łukasz Stelmach --- drivers/spi/spi-s3c64xx.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 48afd4818558..86b6125b24a6 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -731,17 +731,28 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master, if (status) { dev_err(&spi->dev, - "I/O Error: rx-%d tx-%d res:rx-%c tx-%c len-%d\n", + "I/O Error: rx-%d tx-%d rx-%c tx-%c len-%d dma-%d res-(%d)\n", xfer->rx_buf ? 1 : 0, xfer->tx_buf ? 1 : 0, (sdd->state & RXBUSY) ? 'f' : 'p', (sdd->state & TXBUSY) ? 'f' : 'p', - xfer->len); + xfer->len, use_dma ? 1 : 0, status); if (use_dma) { - if (xfer->tx_buf && (sdd->state & TXBUSY)) + struct dma_tx_state s; + + if (xfer->tx_buf && (sdd->state & TXBUSY)) { + dmaengine_pause(sdd->tx_dma.ch); + dmaengine_tx_status(sdd->tx_dma.ch, sdd->tx_dma.cookie, &s); dmaengine_terminate_all(sdd->tx_dma.ch); - if (xfer->rx_buf && (sdd->state & RXBUSY)) + dev_err(&spi->dev, "TX residue: %d\n", s.residue); + + } + if (xfer->rx_buf && (sdd->state & RXBUSY)) { + dmaengine_pause(sdd->rx_dma.ch); + dmaengine_tx_status(sdd->rx_dma.ch, sdd->rx_dma.cookie, &s); dmaengine_terminate_all(sdd->rx_dma.ch); + dev_err(&spi->dev, "RX residue: %d\n", s.residue); + } } } else { s3c64xx_flush_fifo(sdd); From patchwork Fri Oct 2 12:22:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813251 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B624139A for ; Fri, 2 Oct 2020 12:23:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69D9D20665 for ; Fri, 2 Oct 2020 12:23:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="DKOypmBv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387908AbgJBMXF (ORCPT ); Fri, 2 Oct 2020 08:23:05 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:55009 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387896AbgJBMW6 (ORCPT ); Fri, 2 Oct 2020 08:22:58 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122253euoutp012884f73d00e2d6c3af6afeaf903af93e~6LFf5TCP00521105211euoutp012 for ; Fri, 2 Oct 2020 12:22:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20201002122253euoutp012884f73d00e2d6c3af6afeaf903af93e~6LFf5TCP00521105211euoutp012 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641373; bh=lnOCU+ZnfcGa1dstHG1WG9yIqVu2Mdkx10tT0KaNnpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DKOypmBvgLJlYbEvhNzaEGoy9gnoDrpQY5cU60geFeJ7PNInPxj4vKPpGmorP5QRg dj4oNH9UcLP+6wsNIiFs1lydru7tjHU1wKkeQ0ZkfVZEsPT3XCi4ZH8OBfpDPYrnM+ bM8HjcfrEWcIZLBWUqKsVXqxUz8BjG/0orjgff/4= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20201002122253eucas1p214e6d4f5215839e45b3a4ac32c2b14b4~6LFfa84_M0641106411eucas1p29; Fri, 2 Oct 2020 12:22:53 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id DD.EB.05997.D9B177F5; Fri, 2 Oct 2020 13:22:53 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20201002122252eucas1p16b24cee16354763e4925f21cf52c6a4d~6LFfHHVGI1198111981eucas1p18; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20201002122252eusmtrp228731ca900ff8f631f224d19dafcabb9~6LFfGgYJh0225802258eusmtrp2J; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) X-AuditID: cbfec7f4-65dff7000000176d-53-5f771b9d13c9 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 60.C0.06017.C9B177F5; Fri, 2 Oct 2020 13:22:52 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20201002122252eusmtip2db7b6c2791ad3b5dbfa6114a0e0c8a6d~6LFe7Z9Hb1486314863eusmtip2k; Fri, 2 Oct 2020 12:22:52 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 5/9] spi: spi-s3c64xx: Rename S3C64XX_SPI_SLAVE_* to S3C64XX_SPI_CS_* Date: Fri, 2 Oct 2020 14:22:39 +0200 Message-Id: <20201002122243.26849-6-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDKsWRmVeSWpSXmKPExsWy7djP87pzpcvjDabfELJY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi+KySUnNySxLLdK3S+DKaL+3mrVg vWjFtlNbWBoYnwt2MXJySAiYSPy5fo+pi5GLQ0hgBaPE2S2NjBDOF0aJbW/vs0E4nxkl/i9Z yQzTsvbgRBaIxHJGiQfb21khnOeMEiu/P2ICqWITcJToX3oCLCEisJ1JYuLn82AtzAJHGSU2 P7jKAlIlLBAl8WXiDzYQm0VAVeJ9w3FGEJtXwFridssXRoh98hLty7eD1XAK2EicXLSNDaJG UOLkzCdgc/gFtCTWNF0Hs5mB6pu3zmYGWSYh8Ihd4tGa1VCHu0ic3bSfFcIWlnh1fAs7hC0j 8X/nfKCzOYDseonJk8wgenuAITDnBwtEjbXEnXO/2EBqmAU0Jdbv0ocod5RYdlkWwuSTuPFW EOICPolJ26YzQ4R5JTrahCBmqEis698DNU9KovfVCsYJjEqzkPwyC8n9sxBWLWBkXsUonlpa nJueWmyUl1quV5yYW1yal66XnJ+7iRGYpk7/O/5lB+OuP0mHGAU4GJV4eAUOlMYLsSaWFVfm HmKU4GBWEuF1Ons6Tog3JbGyKrUoP76oNCe1+BCjNAeLkjiv8aKXsUIC6YklqdmpqQWpRTBZ Jg5OqQbGiY05n/4wR2nl/vhwQTa7UtC6Tqhw6fn+F190qxKmsUg1hEsG3L5/8eO0fz/UdunN MM/av1JbfZ9JkZBBQbx3ubv6HqVtfjPzzpxw4332TmyB8bYFmS+lm/Xv2hXMfu28T9TpM2eI M5NIcvD3p5pzj1zaJ2tyg6XkhM/tyzbml3b6JnreipRVYinOSDTUYi4qTgQAIFTpMU8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLIsWRmVeSWpSXmKPExsVy+t/xe7pzpMvjDS7cs7BY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DLaL+3mrVgvWjFtlNbWBoYnwt2MXJySAiY SKw9OJGli5GLQ0hgKaNE3+cVzF2MHEAJKYmVc9MhaoQl/lzrYoOoecoo8bT/MQtIgk3AUaJ/ 6QlWkISIwH4miUsX7oNNYhY4zChxed06JpAqYYEIicdfGsE6WARUJd43HGcEsXkFrCVut3xh hFghL9G+fDsbiM0pYCNxctE2MFsIqKb141xWiHpBiZMzn7CAXMcsoC6xfp4QSJhfQEtiTdN1 sPHMQGOat85mnsAoNAtJxyyEjllIqhYwMq9iFEktLc5Nzy020itOzC0uzUvXS87P3cQIjMpt x35u2cHY9S74EKMAB6MSD6/AgdJ4IdbEsuLK3EOMEhzMSiK8TmdPxwnxpiRWVqUW5ccXleak Fh9iNAV6cyKzlGhyPjBh5JXEG5oamltYGpobmxubWSiJ83YIHIwREkhPLEnNTk0tSC2C6WPi 4JRqYFzAJbi4Z1vFU/NfHK9Epib4v1khs2XfOj3XqlZjn7zg7bFL96YdedpvI7BxxWIvvv3q t6Q/RkhJrQuea8M1Z8eFKZVrjl4XDOPvZVI2U/jW5Lw6V6FWo++N/6WX7Dp5Qr8/XNoxe07G +7AJ7cFcVx493qJ7+a/FzNpU7+vhc/Vfrtx6n+fAtzlKLMUZiYZazEXFiQDzltGT4AIAAA== X-CMS-MailID: 20201002122252eucas1p16b24cee16354763e4925f21cf52c6a4d X-Msg-Generator: CA X-RootMTR: 20201002122252eucas1p16b24cee16354763e4925f21cf52c6a4d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122252eucas1p16b24cee16354763e4925f21cf52c6a4d References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Rename S3C64XX_SPI_SLAVE_* to S3C64XX_SPI_CS_* to match documentation. Signed-off-by: Łukasz Stelmach Reviewed-by: Krzysztof Kozlowski --- drivers/spi/spi-s3c64xx.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 86b6125b24a6..13b53f9a5c3e 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -29,7 +29,7 @@ #define S3C64XX_SPI_CH_CFG 0x00 #define S3C64XX_SPI_CLK_CFG 0x04 #define S3C64XX_SPI_MODE_CFG 0x08 -#define S3C64XX_SPI_SLAVE_SEL 0x0C +#define S3C64XX_SPI_CS_REG 0x0C #define S3C64XX_SPI_INT_EN 0x10 #define S3C64XX_SPI_STATUS 0x14 #define S3C64XX_SPI_TX_DATA 0x18 @@ -64,9 +64,9 @@ #define S3C64XX_SPI_MODE_TXDMA_ON (1<<1) #define S3C64XX_SPI_MODE_4BURST (1<<0) -#define S3C64XX_SPI_SLAVE_AUTO (1<<1) -#define S3C64XX_SPI_SLAVE_SIG_INACT (1<<0) -#define S3C64XX_SPI_SLAVE_NSC_CNT_2 (2<<4) +#define S3C64XX_SPI_CS_NSC_CNT_2 (2<<4) +#define S3C64XX_SPI_CS_AUTO (1<<1) +#define S3C64XX_SPI_CS_SIG_INACT (1<<0) #define S3C64XX_SPI_INT_TRAILING_EN (1<<6) #define S3C64XX_SPI_INT_RX_OVERRUN_EN (1<<5) @@ -332,18 +332,18 @@ static void s3c64xx_spi_set_cs(struct spi_device *spi, bool enable) if (enable) { if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO)) { - writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL); + writel(0, sdd->regs + S3C64XX_SPI_CS_REG); } else { - u32 ssel = readl(sdd->regs + S3C64XX_SPI_SLAVE_SEL); + u32 ssel = readl(sdd->regs + S3C64XX_SPI_CS_REG); - ssel |= (S3C64XX_SPI_SLAVE_AUTO | - S3C64XX_SPI_SLAVE_NSC_CNT_2); - writel(ssel, sdd->regs + S3C64XX_SPI_SLAVE_SEL); + ssel |= (S3C64XX_SPI_CS_AUTO | + S3C64XX_SPI_CS_NSC_CNT_2); + writel(ssel, sdd->regs + S3C64XX_SPI_CS_REG); } } else { if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO)) - writel(S3C64XX_SPI_SLAVE_SIG_INACT, - sdd->regs + S3C64XX_SPI_SLAVE_SEL); + writel(S3C64XX_SPI_CS_SIG_INACT, + sdd->regs + S3C64XX_SPI_CS_REG); } } @@ -982,9 +982,9 @@ static void s3c64xx_spi_hwinit(struct s3c64xx_spi_driver_data *sdd) sdd->cur_speed = 0; if (sci->no_cs) - writel(0, sdd->regs + S3C64XX_SPI_SLAVE_SEL); + writel(0, sdd->regs + S3C64XX_SPI_CS_REG); else if (!(sdd->port_conf->quirks & S3C64XX_SPI_QUIRK_CS_AUTO)) - writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL); + writel(S3C64XX_SPI_CS_SIG_INACT, sdd->regs + S3C64XX_SPI_CS_REG); /* Disable Interrupts - we use Polling if not DMA mode */ writel(0, regs + S3C64XX_SPI_INT_EN); From patchwork Fri Oct 2 12:22:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813279 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EA6ED6CB for ; Fri, 2 Oct 2020 12:23:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CDBE520719 for ; Fri, 2 Oct 2020 12:23:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="HxVH/9DY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387911AbgJBMXZ (ORCPT ); Fri, 2 Oct 2020 08:23:25 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:55008 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387905AbgJBMW6 (ORCPT ); Fri, 2 Oct 2020 08:22:58 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122256euoutp0192b69b3067dafb724a2d9673ace67710~6LFh_vZs80512505125euoutp01J for ; Fri, 2 Oct 2020 12:22:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20201002122256euoutp0192b69b3067dafb724a2d9673ace67710~6LFh_vZs80512505125euoutp01J DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641376; bh=llLWfZCJtxROrMeiAZrYYreYA3AAoBgh09wtOE0v09o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HxVH/9DY4lpbz791oHy4uLubOippUyJbSJ/UfDuvIs0ic4DmLA+z1zRd6rBWM+HmF MM8iZOC0UwPAgnuQuj9BxltrXJjmrD2Y00UO3N1xGx4a+Kuxr3M8b2IHw7sL7tDX+T fVxi1WvCszAYmqz4DWmEHd6fvBBmxxQ678BIinY0= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20201002122255eucas1p1f29fd54387098d1322d9eabb09ae3b7e~6LFhgxtZ03162331623eucas1p1k; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 34.42.06456.F9B177F5; Fri, 2 Oct 2020 13:22:55 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20201002122255eucas1p2f361ef66b44801d69e0ee1425571f571~6LFg-c3h20642606426eucas1p26; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20201002122255eusmtrp13dd4645ae24a205faaf6843f3c65e8c5~6LFg_sDgO1376413764eusmtrp1N; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) X-AuditID: cbfec7f2-809ff70000001938-9c-5f771b9fc829 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 80.CD.06314.E9B177F5; Fri, 2 Oct 2020 13:22:54 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20201002122253eusmtip2086822cdaf3f38260cd2f44d61a24be2~6LFfc2tj31859318593eusmtip2S; Fri, 2 Oct 2020 12:22:53 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 6/9] spi: spi-s3c64xx: Fix doc comment for struct s3c64xx_spi_driver_data Date: Fri, 2 Oct 2020 14:22:40 +0200 Message-Id: <20201002122243.26849-7-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLKsWRmVeSWpSXmKPExsWy7djPc7rzpcvjDVauV7BY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi+KySUnNySxLLdK3S+DKePdxOVvB E+6KDS1nWRoY+zm7GDk5JARMJJbdus3YxcjFISSwglFi+/WFLBDOF0aJd4e7mCCcz4wS/3f9 ZoRp2b/9EVRiOaNEZ+8DqP7njBIf919nAqliE3CU6F96ghUkISKwnUli4ufzYIOZBY4ySmx+ cJUFpEpYIE7i4ZmvYHNZBFQl2m82gXXzClhLfLpzhxlin7xE+/LtbCA2p4CNxMlF29ggagQl Ts58AjaHX0BLYk3TdTCbGai+eetsZpBlEgKP2CW+Xn/ICjHIRWLbhtUsELawxKvjW9ghbBmJ 05N7gOIcQHa9xORJZhC9PYwS2+b8gKq3lrhz7hcbSA2zgKbE+l36EGFHiaVvFrNCtPJJ3Hgr CHECn8SkbdOZIcK8Eh1tQhDVKhLr+vdADZSS6H21gnECo9IsJM/MQvLALIRdCxiZVzGKp5YW 56anFhvmpZbrFSfmFpfmpesl5+duYgQmqtP/jn/awfj1UtIhRgEORiUe3oxDpfFCrIllxZW5 hxglOJiVRHidzp6OE+JNSaysSi3Kjy8qzUktPsQozcGiJM5rvOhlrJBAemJJanZqakFqEUyW iYNTqoExeJrcublcb06ud+v1Nuj0ydt48/ypVdp9kfUNq213b73TNrvwvchRceNYP87votcK 1BelbLt9aqvhnyK7V8u/fZjp0uei/DpM10Mz2iZOx+WS/MHm5xVml6UtD7ruDf9/LMhz2rE5 VuXntnNfqA63vr1ZVL9i1y5+uR39Xc3seg9TEhNr5p1RYinOSDTUYi4qTgQAaVNMyVADAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t/xe7rzpMvjDaadNbdY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DLePdxOVvBE+6KDS1nWRoY+zm7GDk5JARM JPZvf8TUxcjFISSwlFHiz9NnrF2MHEAJKYmVc9MhaoQl/lzrYgMJCwk8ZZR4GgQSZhNwlOhf eoIVpFVEYD+TxKUL91lAHGaBw4wSl9etYwKpEhaIkfjeeYoRxGYRUJVov9kEFucVsJb4dOcO M8QCeYn25dvZQGxOARuJk4u2gdlCQDWtH+eyQtQLSpyc+YQF5AhmAXWJ9fOEQML8AloSa5qu s4DYzEBjmrfOZp7AKDQLSccshI5ZSKoWMDKvYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECIzI bcd+bt7BeGlj8CFGAQ5GJR5egQOl8UKsiWXFlbmHGCU4mJVEeJ3Ono4T4k1JrKxKLcqPLyrN SS0+xGgK9OZEZinR5HxgssgriTc0NTS3sDQ0NzY3NrNQEuftEDgYIySQnliSmp2aWpBaBNPH xMEp1cDIcenKpsj82fnnjUTXM0fbHDiXqdt9xPqZvb6x48MXUzT/5HPzVWjp/d0uZHg178zN B8dFrrLlGPOema32I+seg2Mo09pD2/4nSB40y1f3ffhMSXEX+7HeH41r8g/f/Pt/9Z32jp6Y fGaJxUXdhycd62ldE/dhy3KvHY5t3BPufdrQ5sfpu0VOiaU4I9FQi7moOBEAul3CUN4CAAA= X-CMS-MailID: 20201002122255eucas1p2f361ef66b44801d69e0ee1425571f571 X-Msg-Generator: CA X-RootMTR: 20201002122255eucas1p2f361ef66b44801d69e0ee1425571f571 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122255eucas1p2f361ef66b44801d69e0ee1425571f571 References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Remove descriptions for non-existent fields and fix indentation. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Łukasz Stelmach --- drivers/spi/spi-s3c64xx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 13b53f9a5c3e..f85f40fd608c 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -162,11 +162,8 @@ struct s3c64xx_spi_port_config { * @cntrlr_info: Platform specific data for the controller this driver manages. * @lock: Controller specific lock. * @state: Set of FLAGS to indicate status. - * @rx_dmach: Controller's DMA channel for Rx. - * @tx_dmach: Controller's DMA channel for Tx. * @sfr_start: BUS address of SPI controller regs. * @regs: Pointer to ioremap'ed controller registers. - * @irq: interrupt * @xfer_completion: To indicate completion of xfer task. * @cur_mode: Stores the active configuration of the controller. * @cur_bpw: Stores the active bits per word settings. @@ -183,7 +180,7 @@ struct s3c64xx_spi_driver_data { struct clk *ioclk; struct platform_device *pdev; struct spi_master *master; - struct s3c64xx_spi_info *cntrlr_info; + struct s3c64xx_spi_info *cntrlr_info; spinlock_t lock; unsigned long sfr_start; struct completion xfer_completion; From patchwork Fri Oct 2 12:22:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813259 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C8A891668 for ; Fri, 2 Oct 2020 12:23:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABAD320719 for ; Fri, 2 Oct 2020 12:23:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="kVFdCIh0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387844AbgJBMXE (ORCPT ); Fri, 2 Oct 2020 08:23:04 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:55010 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387908AbgJBMW6 (ORCPT ); Fri, 2 Oct 2020 08:22:58 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122256euoutp013906925c45a12a13efc79795b6a63606~6LFh8f7xO0677506775euoutp01H for ; Fri, 2 Oct 2020 12:22:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20201002122256euoutp013906925c45a12a13efc79795b6a63606~6LFh8f7xO0677506775euoutp01H DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641376; bh=XzneccWbW6+CEoFf1aTmHjTyFh+KVtRq/ZUrB/a8b5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kVFdCIh0o+oN9hEVa9UU5pcEJ11xpwHZK3x1CmR//SuJDqxXWPwhUMXvAFXwffKlO mkluil/+ggiEjEmzT/cHSBpK0MhBLx3u8hh/yds/cd6TzwsBs1xYK7LzgR1JTSn1sC mJxT5sKjwMnpgKz3MwDOUo61kKqdEuHFkvj/XyuY= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20201002122255eucas1p29804342cb1e06a80434922e3a3d9d6fc~6LFhiKCSK1013510135eucas1p2r; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 44.42.06456.F9B177F5; Fri, 2 Oct 2020 13:22:55 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20201002122255eucas1p21976a8ba0566564b79a9dd6f62cd4caf~6LFhQR6Jx1906319063eucas1p2e; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20201002122255eusmtrp24330bdd13b9ea2ab8f6734720c6d228d~6LFhPq7HJ0225802258eusmtrp2M; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) X-AuditID: cbfec7f2-7efff70000001938-9d-5f771b9fff00 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 13.C0.06017.F9B177F5; Fri, 2 Oct 2020 13:22:55 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20201002122255eusmtip11ff21a2427deff936bc232a76845b536~6LFhGZtVQ0581605816eusmtip1h; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 7/9] spi: spi-s3c64xx: Ensure cur_speed holds actual clock value Date: Fri, 2 Oct 2020 14:22:41 +0200 Message-Id: <20201002122243.26849-8-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJKsWRmVeSWpSXmKPExsWy7djPc7rzpcvjDbZ1KVss/vGcyWLjjPWs FlMfPmGz6H/8mtni/PkN7BY3D61gtNj0+BqrxeVdc9gsZpzfx2TR+PEmu8XaI3fZLVbt+sPo wONxfcknZo+ds+6ye2xa1cnmsXlJvUffllWMHp83yQWwRXHZpKTmZJalFunbJXBlTF2fW9DH UXFm5k+2BsYnbF2MnBwSAiYSl/6fYe1i5OIQEljBKDH7zho2COcLo8TBUz8YIZzPjBJzDn1g hGnZfLSdHcQWEljOKPFsFj9E0XNGif0bIIrYBBwl+peeAJsrIrCdSWLi5/MsIA6zwFFGic0P rrKAVAkLhEp83HUcrINFQFWit/UqUxcjBwevgLVE04Y6iG3yEu3Lt4MdyylgI3Fy0TYwm1dA UOLkzCdgY/gFtCTWNF0Hs5mB6pu3zmYG2SUhcI9dovvvYbCZEgIuEh+fFkLMFJZ4dXwLO4Qt I/F/53yoknqJyZPMIFp7GCW2zfnBAlFjLXHn3C82kBpmAU2J9bv0IcKOEtvuTYZq5ZO48VYQ 4gI+iUnbpjNDhHklOtqEIKpVJNb174EaKCXR+2oF4wRGpVlIfpmF5P5ZCLsWMDKvYhRPLS3O TU8tNsxLLdcrTswtLs1L10vOz93ECExQp/8d/7SD8eulpEOMAhyMSjy8GYdK44VYE8uKK3MP MUpwMCuJ8DqdPR0nxJuSWFmVWpQfX1Sak1p8iFGag0VJnNd40ctYIYH0xJLU7NTUgtQimCwT B6dUA2OO5/rF9s9rj0Z4ZZ33Lt7RZCLZuq0m78qttofWd1R7lx/d8Sh8LtvMfxsnBYWLPpq+ 9IE51/znltxTvW7a2VVuXLTsTa3anLqDZYvvVc+NVqn9k61/YcoVDs9v158L9c7hqEnd/VXw l19TXu6BJcWKPq9+y714xpm6v9Wjdcm+VIuIPM3jNgVKLMUZiYZazEXFiQBkK4k4TAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNIsWRmVeSWpSXmKPExsVy+t/xu7rzpcvjDQ6d5bdY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DLmLo+t6CPo+LMzJ9sDYxP2LoYOTkkBEwk Nh9tZ+9i5OIQEljKKLF77X8ghwMoISWxcm46RI2wxJ9rXWwQNU8ZJfa27mQFSbAJOEr0Lz3B CpIQEdjPJHHpwn0WEIdZ4DCjxOV165hAqoQFgiU6vnezgNgsAqoSva1XmUA28ApYSzRtqIPY IC/Rvnw72EWcAjYSJxdtA7OFgEpaP84FW8YrIChxcuYTFpBWZgF1ifXzhEDC/AJaEmuaroNN ZwYa07x1NvMERqFZSDpmIXTMQlK1gJF5FaNIamlxbnpusZFecWJucWleul5yfu4mRmBEbjv2 c8sOxq53wYcYBTgYlXh4BQ6UxguxJpYVV+YeYpTgYFYS4XU6ezpOiDclsbIqtSg/vqg0J7X4 EKMp0JcTmaVEk/OBySKvJN7Q1NDcwtLQ3Njc2MxCSZy3Q+BgjJBAemJJanZqakFqEUwfEwen VAPjqsLzn6/Jevet6HJ+yzF/avxVnrCKKT/+G9SVmTxML2b8+ufVLCfvZKNrzclfy3YujdXw Xv/R/V/v1YUFNzlX82vLbvnF/3iJU+ieuFV/HTniF7Vq7N/JlDS9QIll7sNdFuv65GRbFiy4 dUqwdUcXt13U49iw00LP50WuOsabxfdyWXG5odpLJZbijERDLeai4kQAd2m5jt4CAAA= X-CMS-MailID: 20201002122255eucas1p21976a8ba0566564b79a9dd6f62cd4caf X-Msg-Generator: CA X-RootMTR: 20201002122255eucas1p21976a8ba0566564b79a9dd6f62cd4caf X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122255eucas1p21976a8ba0566564b79a9dd6f62cd4caf References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Make sure the cur_speed value used in s3c64xx_enable_datapath() to configure DMA channel and in s3c64xx_wait_for_*() to calculate the transfer timeout is set to the actual value of (half) the clock speed. Don't change non-CMU case, because no frequency calculation errors have been reported. Reviewed-by: Krzysztof Kozlowski Suggested-by: Tomasz Figa Signed-off-by: Łukasz Stelmach --- drivers/spi/spi-s3c64xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index f85f40fd608c..0bd3e230350c 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -626,6 +626,7 @@ static int s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd) ret = clk_set_rate(sdd->src_clk, sdd->cur_speed * 2); if (ret) return ret; + sdd->cur_speed = clk_get_rate(sdd->src_clk) / 2; } else { /* Configure Clock */ val = readl(regs + S3C64XX_SPI_CLK_CFG); From patchwork Fri Oct 2 12:22:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813249 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 22550139A for ; Fri, 2 Oct 2020 12:23:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F26FD206DB for ; Fri, 2 Oct 2020 12:23:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="qz+vef36" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726029AbgJBMXE (ORCPT ); Fri, 2 Oct 2020 08:23:04 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:55012 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387903AbgJBMW6 (ORCPT ); Fri, 2 Oct 2020 08:22:58 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122256euoutp013c6bdf0f9393a5e55e5162b4c6bae653~6LFiaLndT0520905209euoutp018 for ; Fri, 2 Oct 2020 12:22:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20201002122256euoutp013c6bdf0f9393a5e55e5162b4c6bae653~6LFiaLndT0520905209euoutp018 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641376; bh=7LtCdh3X+5TnFv/x7HOdoPIHebaOi5pA9zfppmeDtdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qz+vef36m73sPBaSm5dUcO/aI655hvK7kedOYruQZGXSs36zJBVkEHQT7EWszIFGA gxAYAS8MEjTDtRLey5btgpyENxkwrIcg5GBArsyGdBgkbjainsICXHW8RDtO/jXgC9 MjmfbNIbXRpbmDgDcDlN9nk3Zp+Ea2NodQXUXVZM= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20201002122256eucas1p12e5bf98482976c654647738ab239202b~6LFiD4kQb3160631606eucas1p15; Fri, 2 Oct 2020 12:22:56 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id D9.8F.06318.F9B177F5; Fri, 2 Oct 2020 13:22:56 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20201002122255eucas1p2cec6d9cdac111d6f2dc628c7865f7bd5~6LFhoMk3s1906319063eucas1p2f; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20201002122255eusmtrp2f67b56444dfc2817397a3c9c19eaa9f0~6LFhninyB0251002510eusmtrp2V; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) X-AuditID: cbfec7f5-371ff700000018ae-f3-5f771b9f9d33 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id E3.C0.06017.F9B177F5; Fri, 2 Oct 2020 13:22:55 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20201002122255eusmtip124cc2afa490630643fd094aded4aca84~6LFhbCGOi0741307413eusmtip1A; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 8/9] spi: spi-s3c64xx: Increase transfer timeout Date: Fri, 2 Oct 2020 14:22:42 +0200 Message-Id: <20201002122243.26849-9-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDKsWRmVeSWpSXmKPExsWy7djPc7oLpMvjDSY1slks/vGcyWLjjPWs FlMfPmGz6H/8mtni/PkN7BY3D61gtNj0+BqrxeVdc9gsZpzfx2TR+PEmu8XaI3fZLVbt+sPo wONxfcknZo+ds+6ye2xa1cnmsXlJvUffllWMHp83yQWwRXHZpKTmZJalFunbJXBlfDh4lqng M0fF/v1PGRsYZ7J3MXJySAiYSKxb+Iipi5GLQ0hgBaPEzkWXoJwvjBKvbyxlh3A+M0p8fPua Caal8ew3VojEckaJqzsaoKqeM0r09l9nBqliE3CU6F96AqxKRGA7k8TEz+dZQBxmgaOMEpsf XAVyODiEBZwlFj4qAGlgEVCV2PFwFyuIzStgLTH1/D5GiHXyEu3Lt7OB2JwCNhInF21jg6gR lDg58wkLiM0voCWxpuk6mM0MVN+8dTYzyC4JgXvsEucnzGeGGOQicbF9AdRQYYlXx7dAg0BG 4v/O+Uwg90gI1EtMnmQG0dvDKLFtzg8WiBpriTvnfrGB1DALaEqs36UPEXaUuHGwjRWilU/i xltBiBP4JCZtm84MEeaV6GgTgqhWkVjXvwdqoJRE76sVjBMYlWYheWYWkgdmIexawMi8ilE8 tbQ4Nz212DgvtVyvODG3uDQvXS85P3cTIzBNnf53/OsOxn1/kg4xCnAwKvHwZhwqjRdiTSwr rsw9xCjBwawkwut09nScEG9KYmVValF+fFFpTmrxIUZpDhYlcV7jRS9jhQTSE0tSs1NTC1KL YLJMHJxSDYxpZz0yd0S0du4MK6o/+SO0ZMPduRXG/Q5bDh/+t2mG16LEDc6B366JW0j+Xxo6 c2lv5Sb77wFbDqZXT37FcGJtXEeP+wEOXtaUrrf7j4qaz/Zva5V/Uf2bR4HvzZ90Az/Pp2uv azy15uB7ujI6vTEyN+mgpvx6gbKiyzVe6//3KhrHrPkb+UuJpTgj0VCLuag4EQBSuxjqTwMA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsVy+t/xu7rzpcvjDc5/ULFY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DL+HDwLFPBZ46K/fufMjYwzmTvYuTkkBAw kWg8+421i5GLQ0hgKaPEhh27WLoYOYASUhIr56ZD1AhL/LnWxQZR85RR4s/U02DNbAKOEv1L T4A1iwjsZ5K4dOE+C4jDLHCYUeLyunVMIJOEBZwlFj4qAGlgEVCV2PFwFyuIzStgLTH1/D5G iA3yEu3Lt7OB2JwCNhInF20Ds4WAalo/zoWqF5Q4OfMJ2HHMAuoS6+cJgYT5BbQk1jRdZwGx mYHGNG+dzTyBUWgWko5ZCB2zkFQtYGRexSiSWlqcm55bbKRXnJhbXJqXrpecn7uJERiT2479 3LKDsetd8CFGAQ5GJR5egQOl8UKsiWXFlbmHGCU4mJVEeJ3Ono4T4k1JrKxKLcqPLyrNSS0+ xGgK9OZEZinR5HxgusgriTc0NTS3sDQ0NzY3NrNQEuftEDgYIySQnliSmp2aWpBaBNPHxMEp 1cDYaFtzduvJZSvLf1X9qvrEy/nYx8DTJUn2jEGld8nGudOSD+79+2GRpP8t555zFS6Hlp1Q mB5R/UDxeGiK9KEjF+6JXZdqrMx6N4fzDDfHNq/jzo8aVjBqdu/9r7jV07eDO2Xe2il5mpZy rb3f7ASEmrz0ZX30bkw/ILp0zp7NF//uPbnY5Q+vEktxRqKhFnNRcSIAtLk2Jd8CAAA= X-CMS-MailID: 20201002122255eucas1p2cec6d9cdac111d6f2dc628c7865f7bd5 X-Msg-Generator: CA X-RootMTR: 20201002122255eucas1p2cec6d9cdac111d6f2dc628c7865f7bd5 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122255eucas1p2cec6d9cdac111d6f2dc628c7865f7bd5 References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org Increase timeout by 30 ms for some wiggle room and set the minimum value to 100 ms. This ensures a non-zero value for short transfers which may take less than 1 ms. The timeout value does not affect performance because it is used with a completion. Similar formula is used in other drivers e.g. sun4i, sun6i. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Łukasz Stelmach --- drivers/spi/spi-s3c64xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 0bd3e230350c..9f728a7c59a1 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -473,7 +473,8 @@ static int s3c64xx_wait_for_dma(struct s3c64xx_spi_driver_data *sdd, /* millisecs to xfer 'len' bytes @ 'cur_speed' */ ms = xfer->len * 8 * 1000 / sdd->cur_speed; - ms += 10; /* some tolerance */ + ms += 30; /* some tolerance */ + ms = max(ms, 100); /* minimum timeout */ val = msecs_to_jiffies(ms) + 10; val = wait_for_completion_timeout(&sdd->xfer_completion, val); From patchwork Fri Oct 2 12:22:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lukasz Stelmach X-Patchwork-Id: 11813275 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BEAFC174A for ; Fri, 2 Oct 2020 12:23:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A3D5720665 for ; Fri, 2 Oct 2020 12:23:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="LOEBdClY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387957AbgJBMXS (ORCPT ); Fri, 2 Oct 2020 08:23:18 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:54178 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387919AbgJBMXB (ORCPT ); Fri, 2 Oct 2020 08:23:01 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20201002122256euoutp02144c5bfb05ddaab0c7b9d61a6823a939~6LFiu-lTz2196421964euoutp02N for ; Fri, 2 Oct 2020 12:22:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20201002122256euoutp02144c5bfb05ddaab0c7b9d61a6823a939~6LFiu-lTz2196421964euoutp02N DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1601641376; bh=f/KuQfJ1RwS6nqmPWEc337gr7kbEjJQjnrujYNmhICE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LOEBdClYP4EjGghx1LWWF+Cy44x8vKEwvhOQypAODifhUZKjEQk2Gl0fvaqpH+TBy WBfLXfmbUVslK9O9DKH1FjrwEoiHPua8Z1ia16Uzmo+fPpHbEMMjA/AUwFxAhdh9fM vsWYsTklM6K84wWJ9Pl9XHUKE6fyGIVA5gT9dcWY= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20201002122256eucas1p2298f0dce69266f0ef85a610aedb7199b~6LFiRm4B-1010210102eucas1p2K; Fri, 2 Oct 2020 12:22:56 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id F5.42.06456.0AB177F5; Fri, 2 Oct 2020 13:22:56 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20201002122256eucas1p10093b3619fbe5f96ae351920329d1626~6LFh7A0NO0998409984eucas1p1D; Fri, 2 Oct 2020 12:22:56 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20201002122256eusmtrp1825b3cb0ad387e0924d5cb6303447670~6LFh6VMjH1376413764eusmtrp1O; Fri, 2 Oct 2020 12:22:56 +0000 (GMT) X-AuditID: cbfec7f2-7efff70000001938-9f-5f771ba0f4f7 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id F1.CD.06314.F9B177F5; Fri, 2 Oct 2020 13:22:55 +0100 (BST) Received: from localhost (unknown [106.120.51.46]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20201002122255eusmtip27ea039f48d8ac51da319a2d6cd605682~6LFhvw5MM1355513555eusmtip2Y; Fri, 2 Oct 2020 12:22:55 +0000 (GMT) From: =?utf-8?q?=C5=81ukasz_Stelmach?= To: Kukjin Kim , Krzysztof Kozlowski , Tomasz Figa , Andi Shyti , Mark Brown , linux-spi@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , =?utf-8?q?Bart=C5=82omiej_?= =?utf-8?q?=C5=BBo=C5=82nierkiewicz?= , =?utf-8?q?=C5=81ukasz_Stelmach?= Subject: [PATCH v3 9/9] spi: spi-s3c64xx: Turn on interrupts upon resume Date: Fri, 2 Oct 2020 14:22:43 +0200 Message-Id: <20201002122243.26849-10-l.stelmach@samsung.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201002122243.26849-1-l.stelmach@samsung.com> MIME-Version: 1.0 Organization: Samsung R&D Institute Poland X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLKsWRmVeSWpSXmKPExsWy7djPc7oLpMvjDRbtF7RY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi+KySUnNySxLLdK3S+DKuLF0PVPB K7aKzkurWBsYn7N2MXJySAiYSDw7+pm5i5GLQ0hgBaPEvX2voZwvjBIn77axQDifGSV2nZjH BNMy7fYHqKrljBIndu9jg3CeM0rsX/OJGaSKTcBRon/pCVaQhIjAdiaJiZ/Pg81iFjjKKLH5 wVUWkCphAQ+J3qYPYHNZBFQlWhdMAuvmFbCROPpnFtQ+eYn25dvZQGxOoPjJRdvYIGoEJU7O fAI2h19AS2JN03UwmxmovnnrbLD7JATusUs82PKIGWKQi0T/121QQ4UlXh3fwg5hy0icntwD 1MwBZNdLTJ5kBtHbwyixbc4PFogaa4k7536xgdQwC2hKrN+lDxF2lOhYMI0RopVP4sZbQYgT +CQmbZvODBHmlehoE4KoVpFY178HaqCURO+rFYwTGJVmIXlmFpIHZiHsWsDIvIpRPLW0ODc9 tdgwL7Vcrzgxt7g0L10vOT93EyMwUZ3+d/zTDsavl5IOMQpwMCrx8GYcKo0XYk0sK67MPcQo wcGsJMLrdPZ0nBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFe40UvY4UE0hNLUrNTUwtSi2CyTByc Ug2M+p1zO7Y4CTWbsJ+L/iH26aff7AXMzVkhe7OYsg0mW2Uff3lGSZuliHO6wfXF+7Se3e/w 7r86RXCLmlhA3OKlm/VvR97avGj6m0fVP4zD0tNvpX2rL379midTv+7AjNID8+Nl757XaOm4 t+NmnvH0gFsvW16zdh4tVlvaafCse9uRWN2++dGvlFiKMxINtZiLihMBKnO7blADAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsVy+t/xe7rzpcvjDS5PsLJY/OM5k8XGGetZ LaY+fMJm0f/4NbPF+fMb2C1uHlrBaLHp8TVWi8u75rBZzDi/j8mi8eNNdou1R+6yW6za9YfR gcfj+pJPzB47Z91l99i0qpPNY/OSeo++LasYPT5vkgtgi9KzKcovLUlVyMgvLrFVija0MNIz tLTQMzKx1DM0No+1MjJV0rezSUnNySxLLdK3S9DLuLF0PVPBK7aKzkurWBsYn7N2MXJySAiY SEy7/YG5i5GLQ0hgKaPEjmuzmLoYOYASUhIr56ZD1AhL/LnWxQZiCwk8ZZRYNpkZxGYTcJTo X3qCFaRXRGA/k8SlC/dZQBxmgcOMEpfXrWMCqRIW8JDobfoAZrMIqEq0LpgE1s0rYCNx9M8s JogN8hLty7eDbeAEip9ctA1qm7VE68e5rBD1ghInZz5hATmOWUBdYv08IZAwv4CWxJqm6ywg NjPQmOats5knMArNQtIxC6FjFpKqBYzMqxhFUkuLc9Nziw31ihNzi0vz0vWS83M3MQJjctux n5t3MF7aGHyIUYCDUYmHV+BAabwQa2JZcWXuIUYJDmYlEV6ns6fjhHhTEiurUovy44tKc1KL DzGaAr05kVlKNDkfmC7ySuINTQ3NLSwNzY3Njc0slMR5OwQOxggJpCeWpGanphakFsH0MXFw SjUwLrz79yR/3dvKd895BL736XXwR52+zRMonuhet+/owhOn2EQNXVXbvzCsnPi0rE5/+rmo ecr/NsleanwWqxjFEKm0xnaBsFdSVf6KLUky5+wNuk2KvSI5qll/ZGhFP9wXrCPWpB5T/rw9 QoiDx7nlS0NHbOAuSUvz69vnX0zJKdT7sb/xY6cSS3FGoqEWc1FxIgBUrg4f3wIAAA== X-CMS-MailID: 20201002122256eucas1p10093b3619fbe5f96ae351920329d1626 X-Msg-Generator: CA X-RootMTR: 20201002122256eucas1p10093b3619fbe5f96ae351920329d1626 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20201002122256eucas1p10093b3619fbe5f96ae351920329d1626 References: <20201002122243.26849-1-l.stelmach@samsung.com> Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org s3c64xx_spi_hwinit() disables interrupts. In s3c64xx_spi_probe() after calling s3c64xx_spi_hwinit() they are enabled with the following call. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Łukasz Stelmach --- drivers/spi/spi-s3c64xx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 9f728a7c59a1..dfa7c91e13aa 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1378,6 +1378,10 @@ static int s3c64xx_spi_runtime_resume(struct device *dev) s3c64xx_spi_hwinit(sdd); + writel(S3C64XX_SPI_INT_RX_OVERRUN_EN | S3C64XX_SPI_INT_RX_UNDERRUN_EN | + S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN, + sdd->regs + S3C64XX_SPI_INT_EN); + return 0; err_disable_src_clk: