From patchwork Wed Jul 18 15:16:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 945758 X-Patchwork-Delegate: monstr@monstr.eu 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=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=monstr-eu.20150623.gappssmtp.com header.i=@monstr-eu.20150623.gappssmtp.com header.b="liQNv/yU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41W1DD5vqJz9s3R for ; Thu, 19 Jul 2018 01:25:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6DB98C21EDE; Wed, 18 Jul 2018 15:19:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 556D1C21F06; Wed, 18 Jul 2018 15:17:27 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 656B2C21F16; Wed, 18 Jul 2018 15:17:08 +0000 (UTC) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by lists.denx.de (Postfix) with ESMTPS id C21DFC21EEB for ; Wed, 18 Jul 2018 15:17:04 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id a3-v6so5086240wrt.2 for ; Wed, 18 Jul 2018 08:17:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Zi51GB+nzgHOyoDvjgdoC6IzWbMFiMGjrYpD+aaMIKc=; b=liQNv/yU0MPENth6n3QKqH24pXL97xslUnzp8526RIgK9XLZboBleGsraBoLSgWlph koHgExZT5fIhVdVQj0VlNztqOHMNOxiyBKxHgIbtF+mbr233hhuzhI/w4WJIRhVXL6vU 49yv1Iyi8FGPP+wVxitwm31Xmpi46U8x/ug6Tf/8lc7Enur4Bxe6EefYatOcCk2XKitg OqzT3PYC40f965gN7LJ4Ma87Le+kUwLidERLDQJGWHFanEmaGLkD6wEK3hSIu5XD4yRD Ce6Ud58C917P0YYAfDf2EwxJV+QKxdze1q6qVrRAUP+xvkbzPsbtr/a6Zo1YClaW8PS7 9qwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=Zi51GB+nzgHOyoDvjgdoC6IzWbMFiMGjrYpD+aaMIKc=; b=TkBzDYeP7oW5gfjCZnichOS81aiaw5lD3n/C2vQ/0zJrLpmAkmKKNMOo7/UlFy8OgD DhvVrZEWHto0fAQlgM+cWDu/ffKodaKtQWeijgWjqJGEi68GDWkBKcqMooIqLCIDkLCU Be81RYWiUW7nhYp5c3+PQgU+26di9lLrM9o7Hy7j/HB3XJODejF51bI3vu7IpHNhdIIK 02f5vxEqAQZexKvy9kW9HEPM4foBxgg781dGVMiW/KsQwyOyyhkhgtH0obyp3SgNXcy7 IokOgVTWM4Xy+rLMZQ6+wuorh03tDlL1Yr/a2WeWQPq4B6zxUqYFEPLbmRzWnnR9CQMS aL0Q== X-Gm-Message-State: AOUpUlFtIUvYlycGjmEQU5KN8YppaT2lVqTHTWp7oOJm7jHtnLNAeGvv vck2euU0aIJQgxIMYHvADj0BLrie X-Google-Smtp-Source: AAOMgpdLIYPAseFWZlVIRDg/rOSTTGM7wxIdQovhoD3LtLvINu5waAl51U9IvTYEk1ebYBEJekiUIA== X-Received: by 2002:adf:dc8e:: with SMTP id r14-v6mr4704823wrj.166.1531927024322; Wed, 18 Jul 2018 08:17:04 -0700 (PDT) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id d7-v6sm6980205wro.92.2018.07.18.08.17.03 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 08:17:03 -0700 (PDT) From: Michal Simek To: u-boot@lists.denx.de, Marek Vasut , Simon Glass , Tom Rini Date: Wed, 18 Jul 2018 17:16:43 +0200 Message-Id: <56226d1f5f36a38b480be6b00514d426e67fc9fb.1531926958.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: Subject: [U-Boot] [RFC PATCH 05/15] cmd: fpga: Move parameter checking for loadfs/loads X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" There is no reason to check parameters in separate switch before main one. This patch is simplifying error path and checking parameters right after assignment. Signed-off-by: Michal Simek Reviewed-by: Simon Glass --- cmd/fpga.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/cmd/fpga.c b/cmd/fpga.c index af2f514dca00..48902286f1d5 100644 --- a/cmd/fpga.c +++ b/cmd/fpga.c @@ -123,6 +123,14 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) fpga_fsinfo.interface = argv[6]; fpga_fsinfo.dev_part = argv[7]; fpga_fsinfo.filename = argv[8]; + + /* Blocksize can be zero */ + if (!fpga_fsinfo.interface || !fpga_fsinfo.dev_part || + !fpga_fsinfo.filename) { + puts("ERR: Wrong interface, dev_part or filename\n"); + return CMD_RET_USAGE; + } + argc = 5; break; #endif @@ -136,6 +144,19 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) NULL, 16); fpga_sec_info.encflag = (u8)simple_strtoul(argv[6], NULL, 16); fpga_sec_info.authflag = (u8)simple_strtoul(argv[5], NULL, 16); + + if (fpga_sec_info.authflag >= FPGA_NO_ENC_OR_NO_AUTH && + fpga_sec_info.encflag >= FPGA_NO_ENC_OR_NO_AUTH) { + puts("ERR: Use for NonSecure bitstream\n"); + return CMD_RET_USAGE; + } + + if (fpga_sec_info.encflag == FPGA_ENC_USR_KEY && + !fpga_sec_info.userkey_addr) { + puts("ERR: User key not provided\n"); + return CMD_RET_USAGE; + } + argc = 5; break; #endif @@ -177,29 +198,6 @@ int do_fpga(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) switch (op) { case FPGA_INFO: break; -#if defined(CONFIG_CMD_FPGA_LOADFS) - case FPGA_LOADFS: - /* Blocksize can be zero */ - if (!fpga_fsinfo.interface || !fpga_fsinfo.dev_part || - !fpga_fsinfo.filename) - wrong_parms = 1; - break; -#endif -#if defined(CONFIG_CMD_FPGA_LOAD_SECURE) - case FPGA_LOADS: - if (fpga_sec_info.authflag >= FPGA_NO_ENC_OR_NO_AUTH && - fpga_sec_info.encflag >= FPGA_NO_ENC_OR_NO_AUTH) { - puts("ERR: use for NonSecure bitstream\n"); - wrong_parms = 1; - } - - if (fpga_sec_info.encflag == FPGA_ENC_USR_KEY && - !fpga_sec_info.userkey_addr) { - wrong_parms = 1; - puts("ERR:User key not provided\n"); - } - break; -#endif case FPGA_LOAD: case FPGA_LOADP: case FPGA_LOADB: