From patchwork Thu Jun 14 15:43:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Albert X-Patchwork-Id: 929523 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=flashrom.org (client-ip=80.81.252.135; helo=mail.coreboot.org; envelope-from=flashrom-bounces@flashrom.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Received: from mail.coreboot.org (mail.coreboot.org [80.81.252.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4167HD6t3Kz9rxs for ; Fri, 15 Jun 2018 01:45:12 +1000 (AEST) Received: from [127.0.0.1] (helo=ra.coreboot.org) by mail.coreboot.org with esmtp (Exim 4.86_2) (envelope-from ) id 1fTUSj-0002BH-A4; Thu, 14 Jun 2018 17:47:01 +0200 Received: from mout.gmx.net ([212.227.15.18]) by mail.coreboot.org with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.86_2) (envelope-from ) id 1fTUSV-00029y-MA for flashrom@flashrom.org; Thu, 14 Jun 2018 17:46:59 +0200 Received: from [192.168.2.179] ([77.64.144.119]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LnPSg-1g9hr40yi6-00hgPP for ; Thu, 14 Jun 2018 17:43:28 +0200 To: flashrom@flashrom.org From: Joerg Albert Message-ID: Date: Thu, 14 Jun 2018 17:43:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US X-Provags-ID: V03:K1:J3QZwBsTRK/9YTbl0k3ZTtrzNO8Z7iByw2AEvIdzY1Hp8n7sHoD WmTfFPPRRZAX36YOcp/bm/469kiIExnzEYAomiZqhZvk35ByMah5zTn7h7o04B8uVImxGze PeDRKv3gR8T0TDM3+2x4On+az4Go7ZKoGx/FkObP9UdrX1Li+A4QLq7GrXY87bCfUO+GzTQ 4M2sOhk1P+ux1ZzCwUNyg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Cc3L5r+BEK8=:MhzohV4HbSarWTkhcPnxgu 2TlkZSJ9obqsKBjXuVkycXNIN8q1V2mkWlC9HLB0DAjR5+R2QAScnwmMAqG1BRfMpt5CYyYOr lAM713lH40yZyWwCXaR8lhmjFHxc5VSfzufGeamgBLIBKOy7wFk444hD0ZjZ+i/W4IYMjPcxP 5D0YqTqW+05V2WKMrDs+NJbMolwALnogE380fGaUjUZZPJ6M1lfgyIdDGCnhx9627pjA/b0Af qxS84vSeppLJnRH6kNI4TGFbV9N/q0RQ59GFAChbGtHeGd5AshZ412aFcGv5V7wNDweCJ4FO1 u8pzUZqSZlxrR/A+AIBRGI9WadT7LFPrhhUgNwjqjuRDA2qvY9C0IgvAzBucwqBo8o0XjHtsV xx1yiwyCp11UzGNN6zmDj2wgbEEacALGVuNj6vU0+ezOXYa1lhHWo2XpIG1rBM0450NujZQBp e3q1p9NLeT9/ZmFBVNRakrQIpGocOSys91sqdtcdG9kyQdICx88GKSMbfhkdm55ELoGKkj2bP 7uVtTbXTkzRuHIhoa43kcP5BIK1a10Y/GCnLc1CD4FpWYdLqlpch+g6uLkiUTnfKbEK61UOTs aLo1assaO9x3eorqKwDnEacZvXzqeq/iH5e6Y/fBTiz16sqiD6SDiRtRYY10lD/9MSJJOObgQ lWc5qh1Uz+skXdrigXlkce8OjDc1dh6fDg28Sp9Uy10LoJaedu7lAttG7LWVdaUsiGgYm5i+o 6L2/O1+F2BahpIGNQRbW8F/P/RKuXObbd88a2383hLFhzYo21E59qQbwBouWKzpqo1P9lMmE7 PiAXziT X-Spam-Score: -0.7 (/) Subject: [flashrom] [PATCH] linux_spi: add handling of suffices M and K in spispeed value X-BeenThere: flashrom@flashrom.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: flashrom discussion and development mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: flashrom-bounces@flashrom.org Sender: "flashrom" X-Duff: Orig. Duff, Duff Lite, Duff Dry, Duff Dark, Raspberry Duff, Lady Duff, Red Duff, Tartar Control Duff This patch adds correct handling of the suffices M,m,K,k for the spispeed value (K,k don't change anything). Drop an error for any other suffix. Change-Id: Ideb2295df8e82ccb2bbe2d58a6ee035b2ea602d0 Signed-Off-By: Joerg Albert --- flashrom.8.tmpl | 4 ++++ linux_spi.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index a3528f1..642a697 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -1032,6 +1032,10 @@ Example that sets the frequency to 8 MHz: .sp .B " flashrom \-p linux_spi:dev=/dev/spidevX.Y,spispeed=8000" .sp +or +.sp +.B " flashrom \-p linux_spi:dev=/dev/spidevX.Y,spispeed=8M" +.sp Please note that the linux_spi driver only works on Linux. .SS .BR "mstarddc_spi " programmer diff --git a/linux_spi.c b/linux_spi.c index 3e60492..1f3632b 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -80,6 +80,25 @@ int linux_spi_init(void) free(p); return 1; } + if (strlen(endp) == 1) { + if (toupper(*endp) == 'M') { + speed_hz *= 1000; + } else { + if (toupper(*endp) == 'K') { + ; + } else { + msg_perr("Error: Garbage following 'spispeed' value: %s\n", p); + free(p); + return 1; + } + } + } else { + if (strlen(endp) > 1) { + msg_perr("Error: Garbage following 'spispeed' value: %s\n", p); + free(p); + return 1; + } + } } free(p);