From patchwork Mon Feb 12 19:38:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Trent Piepho X-Patchwork-Id: 872355 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1236::1; helo=casper.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="HYz2lQ8t"; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LQKCEwUn"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=impinj.onmicrosoft.com header.i=@impinj.onmicrosoft.com header.b="ojlvXvtN"; dkim-atps=neutral Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zgGbg6QHQz9sRm for ; Tue, 13 Feb 2018 06:54:55 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Hkb8B+x8NRzS4+8QzHIA54RJBM1wwmeqZ1nmaHdE+qw=; b=HYz2lQ8tE3752J2ahwZ+zCmmb k6Bcvzv3dFRj0ImWmXKkXLW6nkYXHHARitzqF1jZ80etDSL/zFubKtW+6w3S7hDC4FdPVFnSugILk 9yP7nX+tZebHU3Kdjj84O5O99y3TF1x6mRmThnk5gU/6PYsfSXjjrvi83Y/dHZnrL/cLIGuoyJIsA wU90V4yX3UdgKgPpFG6/D/IktnWR6Wf+Aq5ySWh0UWTjOSZ9jx8mKmznDBzgXjructpMZSG3n4t/v YNLsXylvuK+o1rypRFPCDwLO0rQST3Sk3ZkiUnWVT4Dc1dXJ066WYIE/GpKaiAHwwVL+e6hJnFbcN TnVL6cNUw==; Received: from [198.137.202.133] (helo=bombadil.infradead.org) by casper.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elKBX-0003Hx-7K for incoming-imx@patchwork.ozlabs.org; Mon, 12 Feb 2018 19:54:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Hkb8B+x8NRzS4+8QzHIA54RJBM1wwmeqZ1nmaHdE+qw=; b=LQKCEwUnARmdrL WVhIFxjK2t8EQZBROi2CglLZhkobETiLlfKNOiv2luTFuIvLv4t5i+9phFWepA36Im1Vqh47SV6FL rnw7ElXrN2JmSbcFd8PikspSCES1Ywn1SjGpjp7mqSVMevH5DhFsnoHkjTXOcVyyxvLlqy6n3C1Yu rybS0yAHIb9HSL1n23V+tUqd9qzz1k176BX8fnKU9tXZyFzO7jDqMkwB40xmHBsxsu6xzeCfk/3ad b10155blIgl2GZNEFNgfo6IROLLTsMC/wnjofHAyNJjuUyw6npj7jSF6NHphMJxyufHacd+cestiV uBAEjomuUplVZtqSF+xA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1elKBR-00022l-Ov; Mon, 12 Feb 2018 19:54:37 +0000 Received: from mail-by2nam03on0706.outbound.protection.outlook.com ([2a01:111:f400:fe4a::706] helo=NAM03-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1elKBN-0001lV-MP; Mon, 12 Feb 2018 19:54:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=impinj.onmicrosoft.com; s=selector1-impinj-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=EMbr6Q1DSGpz0V+Roc0+C+322v22Dd3mc6Fq5+njSdI=; b=ojlvXvtN18uzs2Wc2ToH/BTq4B4dDc02AISP6k40pjqOmL58eYdxKS+QKRGa8sNbFU/3XWbna4blZ9v5+BMg945j/suc9vPa1G/JvNQsQim3gyOoW2cSHicJSNVDht0InM+1n8vqs9HnewmWMKwkFIwqxKTybn2CI/iam5XDf38= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=tpiepho@impinj.com; Received: from impinj.com (216.207.205.253) by MWHPR0601MB3754.namprd06.prod.outlook.com (2603:10b6:301:7d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Mon, 12 Feb 2018 19:38:29 +0000 From: Trent Piepho To: linux-spi@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] spi: bcm2835aux: Avoid 64-bit arithmetic in xfer len calc Date: Mon, 12 Feb 2018 11:38:14 -0800 Message-Id: <20180212193814.17644-1-tpiepho@impinj.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <1518463905.25398.281.camel@impinj.com> References: <1518463905.25398.281.camel@impinj.com> MIME-Version: 1.0 X-Originating-IP: [216.207.205.253] X-ClientProxiedBy: MWHPR12CA0071.namprd12.prod.outlook.com (2603:10b6:300:103::33) To MWHPR0601MB3754.namprd06.prod.outlook.com (2603:10b6:301:7d::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ddda1ef-1342-4270-b42a-08d5725031b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:MWHPR0601MB3754; X-Microsoft-Exchange-Diagnostics: 1; MWHPR0601MB3754; 3:/8yQTrU23R4icxY9TNBENiyFyb8Y8gU+W5g8hQtU5FM7ssYOLoh1EARWds/V+4J4Fxq9N8CzBAq2z5UXoOLMOkyIqFsK10hlKeuWdEM/EW6iBVQu637iomf05DhqmK9zluAwfB2Yjl9OkTwVeRSOP379apI0V1qCmHU1XcJcJDwc9J5Hg4Ii9bv2/dG5+NFog5weJ/3Ls39q9X5m0XTgaCwDbJiUSUXiKWXvg6mFYg/jIaWDTWJyTdXKCQjgvjqg; 25:aQXrulIqYB6L+4eVAlZMyfZS6vRoVb8laUPTwMerJpoEsu6ZSQotomA5chmOLQeRT7UR7t3BfQiqU6iPLE81U6NeRVc191/VfkB5bFyre5hBA+X3jPipKTyWP6hDO23v0XgPN8/f6AQfTQzKjIoM06sJirSKe7X6p0JEJV0e7sC1/TNb9ugHQFs+Z7an95yjvqbuRRb//A7wFjOtASZ4lA+nMnNRNm8j0Rp1XRZTyXNXth6M6XyslAh1RfQ2oUqamr/iCydeuuoHYQ970X/ySsKZhKmhyBv5b+Qt77jeLNMNsO5dnxHhrFUnrIT6gG6FWRwlRW5sbg/oHLKyhoNBmQ==; 31:+7nd7EE2rwNDbB34BzrzVR0hRv37Pl3CpF4EUzPy+D4fLvXveddybXEA/aMHOqGJS3SCtY5i815gPd1gJT1EfenQ2SmAvTCwCIB95T7/ubu6977nVsGUDY2edfpmCPlNQxAHTvQnw7THuZtFIF5+GyvXObDKSAdopryWzT0XlEobbP6t30d8k+Djli6Bk5Ssh7BUHE9R+lDUM7p5DNTQogBOuJfurIW/4Z3tdFvo4LQ= X-MS-TrafficTypeDiagnostic: MWHPR0601MB3754: X-Microsoft-Exchange-Diagnostics: 1; MWHPR0601MB3754; 20:GMv0WpafHAhdhaExdlYp6MqBv1RYsUJWIcmDrUjSpqPabks+xAJNpTJxoLXymKOV+VVweZdlb/Jk3tyrThGESb4bSNkz1sI8TPqdlwXMUvlj19CBNBadvuKOipp7iMAyYS/7qQ0gnaNW7fp2VWOzknrppDB0/6jeC9El67o/UsrPfDpmDVbuFAwmR0TFWdAsJ9Vp0zGeW9r1jMiBa8snJC69Y3bkhg1/69JBLgYi0wc3ml5G/5a7HXHeLMoj83OSxcwzLUNy+NwW/cEu/v+lvCQaA+rtNLrTbiW9F6A7YZM20vKMiCU8OZKe+gYvxhDGvInkjv7I9KKR4klC8/sjeaeej1djETCBuLrJzeX34Cwvzt/ih2Q/xhPBD3YcuDH3bA3cZ3mtNXnozCni2cClw3jZhJQLIyScPLkTwAazAgaIN5/CRInGxtYQ60il0W3lXQmShlqvTfbWX5Fl2WlKfUlQS1NirS3InBFfBIu5O5+bPqyAOADAxMdnSH2ESU0I; 4:a17dWkAKfMYi7LOMl0s5az+fdElgel9cMarAmAEme+JDK+VonMepnvb0ldst7RCz710e3ecDf/2Hxvo6msJuNfoD8EsETGyzRezZNPgUqbR/OPk4TJGQu0hRmaTekVzmW7ai5T0z6L7gzCkBv8ot8ocLGs3riGooJFiEu3qdDmLst+dcZUpUIwS/lceZV2cdLjAAugFHGUrC2DTkNTP8fyq0+IhneMOaOtNzHUzU8aZzNORt1hWOmaR9YZDUtV/mic0LehlbtB8D3fSEOU+37g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231101)(2400082)(944501161)(3002001)(10201501046)(6041288)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:MWHPR0601MB3754; BCL:0; PCL:0; RULEID:; SRVR:MWHPR0601MB3754; X-Forefront-PRVS: 0581B5AB35 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(376002)(39380400002)(39840400004)(346002)(366004)(199004)(189003)(6666003)(1076002)(2906002)(68736007)(23676004)(54906003)(86362001)(186003)(53936002)(81166006)(8936002)(59450400001)(50466002)(69596002)(105586002)(26005)(316002)(478600001)(16526019)(81156014)(97736004)(47776003)(50226002)(1857600001)(386003)(66066001)(2950100002)(305945005)(2870700001)(106356001)(25786009)(7736002)(4326008)(7416002)(39060400002)(107886003)(76176011)(5660300001)(8676002)(52116002)(36756003)(6116002)(55016002)(3846002)(21086003)(7696005); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR0601MB3754; H:impinj.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: impinj.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BMWHPR0601MB3754=3B23=3AMN?= =?utf-8?q?hGAPyT0oC3DLIiNkMYKL8IlYrgD2Ii3fQywXe4X6Iy03HAzGcMMixeX4?= =?utf-8?q?fYVu6H3VElMP+CqDDQ/5XqpqofeyK57utHUyN7WQpIxsJdULui+KWVLH?= =?utf-8?q?aJl227PP1oweSqevgU07LKT+J15wIork0ad3YQ8v91/DEA3YcYF/Akml?= =?utf-8?q?Rv2ZNFqnk0wclhVKMD108DFbDMULKsT1cGn6sIjDCwENgUHFumN324VU?= =?utf-8?q?hwuhgtw7c9Ts5Ih1irWQhdZ2Hd/4kWyTKeqrJL4gjhQ18Dl9S/78fhyb?= =?utf-8?q?B5re+ZhJ+0GnulrlDCyJP+ZryLXzCrsQwlXedlYySmHBZcnTidwGUR3u?= =?utf-8?q?c0g8WZgppo2j+X9K6Wf4vFJqMS9H1FtvGYyrVZGvD+XIW/rIMc6xngCY?= =?utf-8?q?I9Zojniz/BLMJWD0PqvDK7ZQuJQ04fTPgcUjQbiB4P9nbZ3sNwYAJUrg?= =?utf-8?q?jHLCsiru+eNWlxdxecZmFOqqa6UOqiBfFeGNZY7enSFAHbXqvesTGZFN?= =?utf-8?q?H4Bm3PYpfSxp6UBr6IkXUydsJed2Xx3gegH5YEDJSEUlL9u/Ox5VgLjO?= =?utf-8?q?JZjSRjfoN6GPAdGBOeNyFj3JKEdWTHBcMpoWuwjd6hFfywVpayNWALYB?= =?utf-8?q?LFgw8GmjfT2/m55Q7sG9jqXjtR9rqIObHuDBK/6PtwhzYNEBot3m6S9M?= =?utf-8?q?g6dfExFbYhRH7pZehWY9LZm6Bhk+L2KgrfAvQpCFyM0eB12yQS+pz+C0?= =?utf-8?q?CJy2upeLUIdD6ixXy05EsuKh/2ZiYNVYJidOqcYXhu/yyGXcV71YxQ91?= =?utf-8?q?RgQR6L+OUY/S5+ydug6YCCyoIZjHX2KhZc+vBwYT3H2KKERTlXkkvslj?= =?utf-8?q?VfT1FjEMoEhxF7wwQ3JBH1bB2n3IZHfYFULw5f0e+PBnDUCVXjIYgueg?= =?utf-8?q?g9t07IqjzRH6sWfas92Sfn6K9NkxrKxp22bEd5UcYn7Qq+ZjcuwnbZE3?= =?utf-8?q?IwpsoGBvsvBnZOnoUEmU+qqU+yg33NY7vrMUHmEVvEHQ370qdiOpbuEB?= =?utf-8?q?gRytXI4NTkvCfxmeqVYQrNjt0hPHZ2Y24lrymfZ2p9QVfqNriAPwOEQU?= =?utf-8?q?m+GIwaFJxcq9FMqBIvCTs+ehL+uZeHvVam4Wnbu6F4cW129TqWTxVjXl?= =?utf-8?q?87k+973vq2wT/nODccou6YEvpC153d9UHnfQeZXBob9iNFzH6+ug01Zh?= =?utf-8?q?YOKAQ9usFGQvalNGnvaa8KSxVekFyfHcD7IeDEEkIZwK+INO+1DsIcSo?= =?utf-8?q?0iweTauxi25+6BAz8FUIByJiI=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR0601MB3754; 6:wFXG0ecm6qZdrEQ91trxpwS6zRzsuzu8ftkFdh9RKZL56SgUaryfd3fJ8fG3r5CV7Id97W2OjXXwS3x5Cfd73MtLC+8ZPEvJUgiH6ubXnhBO7N6j9X3NuVHun612mNgpLp33QcDhpfmQsCBMwdGEKBV1BISD3SeDmqATZj0jd+I0I9q0+xcc4mmRK36KpNA93ktuUZ0rwmFQFCybNvLvRL8ysTEKkuN5PHiBLHyTNifPiBL5JzBGdQ8UJRsMPDvE1gwJrzL7GbiR/9jAHGw5sXny1BY1nbOzmQp6XO6MrVbFNkC2vaQ7Enl8J0YdRfdvb8ACJEQ1CLdYeEvni/BUdR8i+V5wpvIZpSjLryIIyBg=; 5:4Q2G5spW0+6QDDZ65/ZEXi/RJxyUeDSi+D7EXRhTagwX+VkjVoHeaZSDJIfeWWV1Gxp5C1BscewGQH0DaISZEvYscCIMAvi5Kp1FazgyWykkk9+8fBTctsvZIPapfXHCKUjiWsLpwlL9+A+XUM5Mo5iZ7r3pVDcl1JHcc2Ekymo=; 24:q+4j9MbL3ltJQyONBhYlL+Wl6rrEXztx/Dea9PYFxv/ZQwh6HGu79Vv9nDO3kwgKq3Mzpy5QcT1I9XMn78SvWG4vdotTZHa6KPgD9dr69mY=; 7:rSF1WxfFUZUDzhxdPBMLluL7At1ZqIC2n6tDPnZVpWBAE5O48KcIAg0cznl9NDfF8K9sFT+fWxrmp1nKfNLM8osKbLqqpyezrGsjd0VfBwERbhAieYMPKOlfN/Jh3VuVMp7YbXgKuThxi78+5Ap0pMo1UwF6E0aW3gAu7K4Unn7TemUhVkVprhmyXSCq25VlFuULySreUi+RFshgxZl5w8icj/LjLQworqXcf+NVhzG1OpIAl5iCSlMGXPXV24Og SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: impinj.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2018 19:38:29.9059 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ddda1ef-1342-4270-b42a-08d5725031b9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6de70f0f-7357-4529-a415-d8cbb7e93e5e X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR0601MB3754 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fe4a:0:0:0:706 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , Florian Fainelli , Ray Jui , Eric Anholt , Mark Brown , "Gustavo A . R . Silva" , Trent Piepho Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org We want to check for xfers that are over 30 microseconds. Rather than find how many µs a xfer will take, instead find how many bytes can be transferred in 30 µs. The latter must be less than 32 bits (since our clock speed is limited to 32 bits), while the former involves 64 bit quantities and more arithmetic operations. Signed-off-by: Trent Piepho --- drivers/spi/spi-bcm2835aux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-bcm2835aux.c b/drivers/spi/spi-bcm2835aux.c index 7428091d3f5b..1431cb98fe40 100644 --- a/drivers/spi/spi-bcm2835aux.c +++ b/drivers/spi/spi-bcm2835aux.c @@ -321,7 +321,6 @@ static int bcm2835aux_spi_transfer_one(struct spi_master *master, struct bcm2835aux_spi *bs = spi_master_get_devdata(master); unsigned long spi_hz, clk_hz, speed; unsigned long spi_used_hz; - unsigned long long xfer_time_us; /* calculate the registers to handle * @@ -358,20 +357,21 @@ static int bcm2835aux_spi_transfer_one(struct spi_master *master, bs->rx_len = tfr->len; bs->pending = 0; - /* calculate the estimated time in us the transfer runs - * note that there are are 2 idle clocks after each - * chunk getting transferred - in our case the chunk size - * is 3 bytes, so we approximate this by 9 bits/byte + /* Calculate the estimated time in us the transfer runs. Note that + * there are are 2 idle clocks cycles after each chunk getting + * transferred - in our case the chunk size is 3 bytes, so we + * approximate this by 9 cycles/byte. This is used to find the number + * of Hz per byte per polling limit. E.g., we can transfer 1 byte in + * 30 µs per 300,000 Hz of bus clock. */ - xfer_time_us = tfr->len * 9 * 1000000; - do_div(xfer_time_us, spi_used_hz); - +#define HZ_PER_BYTE ((9 * 1000000) / BCM2835_AUX_SPI_POLLING_LIMIT_US) /* run in polling mode for short transfers */ - if (xfer_time_us < BCM2835_AUX_SPI_POLLING_LIMIT_US) + if (tfr->len < spi_used_hz / HZ_PER_BYTE) return bcm2835aux_spi_transfer_one_poll(master, spi, tfr); /* run in interrupt mode for all others */ return bcm2835aux_spi_transfer_one_irq(master, spi, tfr); +#undef HZ_PER_BYTE } static int bcm2835aux_spi_prepare_message(struct spi_master *master,