Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A9D5C07E95 for ; Sun, 4 Jul 2021 19:32:25 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EBCE261289 for ; Sun, 4 Jul 2021 19:32:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBCE261289 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9295882BD2; Sun, 4 Jul 2021 21:32:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rwhXS3Rd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3599E82BC9; Sun, 4 Jul 2021 21:32:16 +0200 (CEST) Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8449682B4E for ; Sun, 4 Jul 2021 21:32:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=marek.vasut@gmail.com Received: by mail-wr1-x432.google.com with SMTP id i94so19349398wri.4 for ; Sun, 04 Jul 2021 12:32:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BpqlQ8+bJakesMXcmhMJhsaiawMjlKcTfY1aKCKjS9s=; b=rwhXS3Rd2k6rFNoVcaraPAFvnlgHY8vCdeGX5zODETwgKYFLZojin96KjymvdQvcKG 3dZyaGzHsvjhRnCLyXCtzHHzyBJOseSltu0BqvzaASX5fmpRpcQv+b2pachGi1nCMlfJ OBsNDcebhUQP93eEY61S5X31xy3KF8JlJdu3uZSmkXlJnE4YgZ89fp2uzGDZROViQS49 B6P3Ya7OlC2D+kWZidLRsQ++Xkj/IXoUX6Ubd3KP8MCi3zondHUprhKrBiJUHplZFWqs Fdo4m+r1zgkNymPRYq9DLBX5vaKY2u4BBbAaoqR7HM0Ur36TyQmwHDvwH8YddprgKxT1 fjLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BpqlQ8+bJakesMXcmhMJhsaiawMjlKcTfY1aKCKjS9s=; b=WHd91kjuVBpQuc2aY2LNhZIjs8ect+aRT2XTYec1P/0aH20Fs8D+RA5yOQNgcy7CP8 yOgViKva01tEhE3DhKwZSx6flfQR50R4HTtuw08NBtxRZO7tOwbdEnbVLq0IV0fiIycH HjCwAKH3P4+q/HpF8QNqEUxA2gfOcA8fpfyIWMI6VM2NqrndDn25zGilPnAFaFgcjTZg 3tmz3mkmGywwvyTIuxwjtPTyBKWuQDGfKrJjyhQBBsgoE1GdAPA0HyhGjJ2n/Rho6dTj XWJPkwhqkGFyJ/iaY946cFpmRBmMwjnkyAQJfJVygY2PZC467YyPMUt2yNTjA/hRU45O VsXQ== X-Gm-Message-State: AOAM530fYB6lbn1o54qOqe93wUffyDYR5s5pzzmZX2KTnX7tEwo9LrwT oiQSNpM7Qt3ywkDWo7CM0XRazAP/UlU= X-Google-Smtp-Source: ABdhPJzChyGiFeyKSdSJ2yFcbjzKvQWwYYQOO8NwUgYyw6jHqnl1HJgZDCbtUIvFuzAgl9JbHh+HWQ== X-Received: by 2002:a5d:608b:: with SMTP id w11mr22198wrt.100.1625427133179; Sun, 04 Jul 2021 12:32:13 -0700 (PDT) Received: from tr.lan (ip-89-176-112-137.net.upcbroadband.cz. [89.176.112.137]) by smtp.gmail.com with ESMTPSA id f18sm10895290wru.53.2021.07.04.12.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 12:32:12 -0700 (PDT) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Marcel Ziswiler , Simon Glass Subject: [PATCH 2/2] board-info: Call sysinfo_detect() before sysinfo_get_str() Date: Sun, 4 Jul 2021 21:32:05 +0200 Message-Id: <20210704193205.84356-2-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210704193205.84356-1-marek.vasut+renesas@gmail.com> References: <20210704193205.84356-1-marek.vasut+renesas@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean The sysinfo_get_str() implementation checks whether the sysinfo was even detected. In U-Boot proper, sysinfo_detect() is not called anywhere but on one specific board. Call sysinfo_detect() before sysinfo_get_str() to make sure the sysinfo is detected and sysinfo_get_str() returns valid value instead of -EPERM. Signed-off-by: Marek Vasut Cc: Marcel Ziswiler Cc: Simon Glass --- common/board_info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/common/board_info.c b/common/board_info.c index 89a29c322c..e0f2d93922 100644 --- a/common/board_info.c +++ b/common/board_info.c @@ -32,10 +32,14 @@ int __weak show_board_info(void) if (IS_ENABLED(CONFIG_SYSINFO)) { /* This might provide more detail */ ret = sysinfo_get(&dev); - if (!ret) - ret = sysinfo_get_str(dev, + if (!ret) { + ret = sysinfo_detect(dev); + if (!ret) { + ret = sysinfo_get_str(dev, SYSINFO_ID_BOARD_MODEL, sizeof(str), str); + } + } } /* Fail back to the main 'model' if available */ -- 2.30.2