From patchwork Fri Mar 5 20:12:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1448193 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=6ZjRcEFS; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dsf7C1cKLz9sVS for ; Sat, 6 Mar 2021 07:13:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6C17E8263A; Fri, 5 Mar 2021 21:12:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="6ZjRcEFS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B9CD82016; Fri, 5 Mar 2021 21:12:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::62c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EA4AD80F58 for ; Fri, 5 Mar 2021 21:12:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AplVnW5jS5SU31MVQoS2EZJ7JgxyXIyM36FocKLLm9OLppM1WHgNpGPDJboP4BXpmsA7LYbn5+CqzVlkEx//lpD0EmQoxknpnE6X75EmuntySZN1dGIQXRQOncayWyjKPLO5fdAVClinZJw1nqgrUusgA64OxuUtrilMFT2k2XHmmmafd+Z7mcLmYPtjQYPjlhXgOCS7w9vJ4HfSBV8w9K5E/1h3aAQ7VyfWKQEJSP0QSeUe8zYvqrYkrTJo2R2Uk0ndWFtXEc1UoMzQ+xr4rIpT13E8kyczUJHxPQGsd40anHpx0DaVXuG3rCZ+o0Mbpnq2AMGXLWg05hww7V5zNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8PZAS8COUKTr/a4r0uYMx+zHnrJoL3xA+bPVDA5kDcI=; b=F+RWhifUgHZVO9mhGkYIQaY/rljpmTAhPP8QNm/DJl5kVKQ8edJjkuDMKVMkn5lFYTHC0CN8dZU6Thx5dK5d2FEnt7KzfZKiMW/VS0mvFALWFDHfL3eKs2dPfadHCB5+Hg7rhKnhVl2jtPSyGQWYUja3OVzemhO9CGux8wQR9i1n2c8OrvezTL+V+BQzlvrkPs+ZajvrGheTEPazSDoLgtpZ8sAQeF4kcDFTjjYws9TZR535kfZeJmbvVKi3VZambAs5T/DnPM2HvTBu37w+t19d2hKuW5kIloNG9/U0d+ZD+L1HHsr6ft3ALCcyZhPKO6nZFbQC/XJZeJ6lzdgG+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8PZAS8COUKTr/a4r0uYMx+zHnrJoL3xA+bPVDA5kDcI=; b=6ZjRcEFSnNUgaAtgwADDthSTckiMOGZW5yIVbHTR6NbMgPKPvpVGzMF+0mnsztCB3YEepPc39s1sTcMsA/eqc7GPnqCldAk3U1BbIylMpFKgohSyqI/mnftMHhHqEHZi5+xYlCQQB/WoTAQBddiLKBak0HKCIftR6KltP6o49Tk= Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none;chromium.org; dmarc=none action=none header.from=seco.com; Received: from AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) by AM0PR03MB4338.eurprd03.prod.outlook.com (2603:10a6:208:c3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Fri, 5 Mar 2021 20:12:41 +0000 Received: from AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e]) by AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e%7]) with mapi id 15.20.3890.034; Fri, 5 Mar 2021 20:12:41 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Sean Anderson , Heiko Schocher , Jean-Jacques Hiblot , Patrick Delaunay , Pratyush Yadav Subject: [PATCH v2 1/5] dm: gpio: Fix gpio_get_list_count failing with livetree Date: Fri, 5 Mar 2021 15:12:21 -0500 Message-Id: <20210305201225.3753841-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210305201225.3753841-1-sean.anderson@seco.com> References: <20210305201225.3753841-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) To AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.10 via Frontend Transport; Fri, 5 Mar 2021 20:12:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5a37aa62-f033-4b3a-be94-08d8e0130770 X-MS-TrafficTypeDiagnostic: AM0PR03MB4338: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:121; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GqznCV+BJ02Yt1Fw33hmVIY/rgO++pswrNYpwbKXoKYpjmOGaVcbpHNaqo+L0dIB1YCAg0GG1p1/3FI76hH1gsJotsz/iSkpZUIsVQTjXLczcymPWT6CWArw2Ccs44hpwb4uJSisH0VjEyNuMWEUuCkET+Uf8G1QeY/K32iBGBTLGewBZ3gWakx8O3bH2UExlggOVyoR1cS2Xm9x31GCT+LGU6CqeAT3W0doRNkGEqwfk0YCNcSX8C46oLkrW0f203Iu4+VbHTl8MtrreAtUJ9rwZcx9B+pMErDp47dqnQw+YFHI/WpStZJTbgBXTk9bPaQGnCl+kjN2KVdDpeqtOc0gO3g9283oru3K30Ivz/WqD66gVcYAsEgfd/I5l6s3WOoC1SeMii1atFuoLLxWXMfYwLePwZwTSyVl0G3566X9rfZ/v7I3shTcC6sJ06n9hyIwf96RO0gdItZYBmGwNhp7thInF0CyQ94r8HbG/YmtT3BESDqLEU9sthqlSzkdy3hHTMiEt8ZiVgKEkapUBQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR03MB4514.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(39840400004)(136003)(346002)(396003)(366004)(6512007)(6506007)(66946007)(5660300002)(66556008)(52116002)(8676002)(6666004)(2616005)(83380400001)(16526019)(186003)(36756003)(956004)(1076003)(66476007)(86362001)(44832011)(316002)(26005)(2906002)(4326008)(54906003)(6486002)(8936002)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: BM5HX9qcqUeTFFyCTT46IYgVpE0tM0Q2jEcFal/6Nbi3UXWPmp0S+efopwS0sRW+dpn2nBQf41oSEtTT0JgNrjg1TbtvNpQ6NopfDq0iQmP2OdhN/B8YBdw3IvT+cY10zfQuA7DXiN1Xfm/E9LQaFK3P1JUuuQHyqEdgJ88qA2DUPcl58tqai4Ndbj3BQsa/Bhna0V1ONgeRouxe6A2NZBEsf46wP0Xii65KymQafJhthhEdxiQQrADZsiX5Z0rRsu2LeN8R35MPuE1UsWzHsCZwxs7Xp67z3axMEBdfsgngTyBfcJs1wVaoGx5Pfxkem5PU5ZkSey3W/11EXj5dMBMiyF5fIXjm/rhXwxOEMUWYbP9YNo8NVc3N938nkb4o5h2uRJpRY9Dab6QGpHw66iDxrZnHfKH/u3+ksee4NyLj+1SN6u5DzGFxi4ASFNDoySnaPzhHkooo85/AxpEgqizyXZFUqtWdOAOt1mWG2ym5Fuf7mK8PiyMsGjqGAVaq5Ud9tMDpPd15YuPdcGMAb3P0fODGFjNl0kHN7iXMjXzGMXK5aoOpnw6YD/i3AXG8RrIFARdat6Atbxe8r4XvExUhJBCrqAl1TdocgvqCSEmeaH/EHywmTjeXv8G3GcXH3gCOvfKYWQ2LTzFIX/xTY3ThXoCb1M5LMQ+Pq4ZRb6fDzTeZR3uio2RbpQDYWL7gjNNpAWJdHYtMGY+SouOBy/XyiC0TtrhY3Gg9X970nsrygzUQC8jAffiAJ6tQwJap6+lo2LdAs9pCFSJpa9ZX9yIwpgWM2khGZ9o30V2c2EFUkP3FFbXy+I8Hfmca3lZU5maCqnnrj/GqZSZBo8JXK1N1h2gmuFpTBaGL6D/ZubobtsiLfLA4m9A4zkKVg7wQaSfUISqCpKDKfoQ+VzBDjFihelBtDAqTEybacCQ1m/q6w+tjJ5qg0aSHfZuwobLtuva57xUZmtTQ8EqN2fElt+nKf/yRbR5FWvetp1PjtWlq1lMuggiNQBl3+MpzS0wkzo28opaPFBHwvToxICLyi/QN98+9uQrnFTXWHkrkk5B8I0JAxsW3sdkdjaz5UPe8/jugkimt1bc2HpH5mFmIpVQNCCOpVBQ+p4J3tuuhKywGxt5n+oBSPZYCyYOld3KQEgPr4TF/a55KjnaE2riysIKsg97AVMQo4amJAxUeGCo1prJ0aQ2hrPLBPCF+OgwUoul0fusAdxz74Kicy/LsNb34LY0lRSbS+9G7AlF+35Fix6koLMiukake8yvWjLcheBcfLd0ghIiyD8RAo3EauDA0KYe7nnFVwIeWZWWyoMF9sZtF8iUB+gQiLhb7hGgH X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a37aa62-f033-4b3a-be94-08d8e0130770 X-MS-Exchange-CrossTenant-AuthSource: AM0PR03MB4514.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2021 20:12:40.9183 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vyodijvfc6xOOkAUsjXSueHRAfNYEhL+3CWzKk6H790xN6EO8q46P5GhwD4tVOSFvvcL9V7Wa0ZSzkUBE+xWIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB4338 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.102.4 at phobos.denx.de X-Virus-Status: Clean of_parse_phandle_with_args (called by dev_read_phandle_with_args) does not support getting the length of a phandle list by using the index -1. Instead, use dev_count_phandle_with_args which supports exactly this use-case. Fixes: 8558217153 ("gpio: Convert to use APIs which support live DT") Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v2: - Change Fixes tag to the most recent commit touching these lines drivers/gpio/gpio-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index 8dc647dc9f..8de6fe58a4 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -1214,8 +1214,8 @@ int gpio_get_list_count(struct udevice *dev, const char *list_name) { int ret; - ret = dev_read_phandle_with_args(dev, list_name, "#gpio-cells", 0, -1, - NULL); + ret = dev_count_phandle_with_args(dev, list_name, "#gpio-cells", + -ENOENT); if (ret) { debug("%s: Node '%s', property '%s', GPIO count failed: %d\n", __func__, dev->name, list_name, ret); From patchwork Fri Mar 5 20:12:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1448194 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=u6VR0HYm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dsf7D4llvz9sVS for ; Sat, 6 Mar 2021 07:13:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 645AE826A5; Fri, 5 Mar 2021 21:12:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="u6VR0HYm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 993F381FB4; Fri, 5 Mar 2021 21:12:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20620.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::620]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1850081FB4 for ; Fri, 5 Mar 2021 21:12:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FDlXuYiZLnBPp+sMA+dP/k+Zx6Lw1fxbBRqe+UyxPI2xFLt70oLJiuD5GB5mn/3YrhYrvWhm8R9PMZLwInEANNTQupmJlzoCtG/FGLpaTX8M7HGzy0NQ/m8E+xqRf2yW2Yb6n5gxZZ5WGyGnhPy7NWwV4ZXPKaf4NPZpcXolQtZ8BHGxeZV8p5h9Ho5VkJJi/iA1b0wFsQs7KfRFcxhVTUOrcKnUhef6rIfIjtI4GmIQFvF7IQJTCSyJzKJYDPhRzIUvBhC4E1ybL3zcOp8d5SHSX4fJ39xDQYHrjQ719bzY7x5/UsiFiAhOFQ2X3jEVSj9+JeIH+Bd0vWX9X3V0cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZSRgIahU3mVejC0kgwaTp7H7PoUsXJc2bWk8DRu1Quw=; b=euLOs3AEczpCLVVNDGSBMRF836QU4Pcp/tlpp0gMrLkYxoBj+aSCLnd7Y6Bqc24EIyvgar21e/+PqV0hK/aFTwv/QGT3E+N9WY1RZMn5sdhG/AtGgXUDjbsJb0bkIV/+mP53sx0kwIOZJy7bnsDvVSNqqc7N5YSba7BVS1APRNhQxV8wD0uHVaz1f0t7Y9DMP+ddSfMuqaSAVfZAlq0UjxaV8kT3jY4ZrqolVOyX9Y7fI7CwXpRv9nmmX0sdrlM4nRjdBnopaaZ6ZyHeFjY7PTuxaip9ZSWi0QkLhppAbcmkeLhpBH2OcHjSfM9UMRw+FqEuYfChQo8ifOsQwWC8yg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZSRgIahU3mVejC0kgwaTp7H7PoUsXJc2bWk8DRu1Quw=; b=u6VR0HYmYseuEBZhpvURZl1QbiyoXobe/JwbDP92tV86lw4GCeovv9uAns5rx/klj3R0NhGCKWs7XuvgVDKH7p2jQAt+fxLLJjQIalkhEIdKibu+KHKZNwnVD3asbDSS0C8+AcxV2bjnNJsRPBdxqMIPRpMqUSVIpq+GOsShp5g= Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none;chromium.org; dmarc=none action=none header.from=seco.com; Received: from AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) by AM0PR03MB4338.eurprd03.prod.outlook.com (2603:10a6:208:c3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Fri, 5 Mar 2021 20:12:42 +0000 Received: from AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e]) by AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e%7]) with mapi id 15.20.3890.034; Fri, 5 Mar 2021 20:12:42 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Sean Anderson , Bin Meng Subject: [PATCH v2 2/5] sysinfo: Provide some global/default IDs Date: Fri, 5 Mar 2021 15:12:22 -0500 Message-Id: <20210305201225.3753841-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210305201225.3753841-1-sean.anderson@seco.com> References: <20210305201225.3753841-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) To AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.10 via Frontend Transport; Fri, 5 Mar 2021 20:12:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cce07b88-40de-4438-509b-08d8e013083e X-MS-TrafficTypeDiagnostic: AM0PR03MB4338: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u+tc7p68X2nSLOAPKLaNc1hqSS8jg1/+aIy6U2g9UJuTcALumrNNRjUE84so8A737QCclio667LlfISCV7Mcj4m0BkiwtVqCr9zhSXrxhlfVDQUgtLdDE/ra6qZ/7Q4kn741E6Yvm8JoEYjWcyoUB4ddJgjeLfmJsKBFE++NGtrCbqFwIXI4R+EypCDQLsJ+Tr/kx0j37gBFwRbaz2hEvvCWVHtz4UJQLvgUvkYC9ZlTFkLRiYPgWM4gegxMWRwBG5wqamNhY27Lo6Yu24b1S5fC5ccKY2I8W4Kq7DXcHsFrv/Ni/wJefvOORLXxIDdFHaWuLi/2O1izirnHZyL2dc2rtUiPA2+8lnDAQ8oQ5jpKzfQv21mbebE/z20LmD2ywteqhSdTGvX7MAuD6jXjtxSUuQbESjLnhLQzD7v8IxUE9Uq8Gygh3y1lElmt0CzBGbjWmP8ew/aD42bJZy6okmzrxSJbdhsqxW2WFZ26PLZf5smSxm3vRUuUi+zlxjcwrLjY8Wq3pXh0Cngd36rPfg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR03MB4514.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(39840400004)(136003)(346002)(396003)(366004)(6512007)(6506007)(66946007)(5660300002)(66556008)(52116002)(8676002)(6666004)(2616005)(83380400001)(16526019)(186003)(36756003)(956004)(1076003)(66476007)(86362001)(44832011)(316002)(26005)(2906002)(4326008)(54906003)(6486002)(8936002)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: v2Z+0iHDmQtS/sQimHHhrAwhMoNvu5y7/udVKNoZ01GjUwFe7tqtIrbvfJYTrdQJeGT2VjsXptzKujPzm1ZYQkfXGopK2Y9fbElPFf5YB0QId2FIkq4mSHYQ6jzoY+sXEfqLXlP2kSKRe2jwUeHhkm34ASRUYMQ9V8QLoUQnV1hpk4YmHchxH4j2qB15caYpa2XXYyneJim6lAo+X7FEguhKOmX+Xal/RltCizNELaISSFC/TTq2pFfmnAWMFRX0aOBUNm72V4eKK4u+3MeYSL3ptv3xP8LO3F1afF1EonxlUENp5OxKn4ASmNlrlnOHI4mmoLA9ggpJQKX4fKjYKQlQv7JINVxYw17QPVr9xYucXseXaHcU4I9eyyux2iyVuKaN2U23TPvi9V39zGlwwf/yuP0uBWLw4bxRj6cwh7Yd8yczt6vWt8xp7Ip0Za47/vnEg1CzXUweiooTDNSfTyfd34C2wKyB9XJ3dzoNIVQSZf9XbQqk/nLkXMl9p+IVvYMyXcaz4ZgFVyH3dBbdCBxtNkFCtbvnURanwmeXlOoch3febd6QyM+eNOeqgHfGzTop71Ah2vpp55uYopLsHZTSluB8gEeL+AOlP+s1qUUVeE6HuPm1UuUXkK99cJaCAAACvh/0aPnnaN4gNH8PrtDw2N8NjwPXF4d+R9zVs/AFnrd1oQxcmS5KTKBeSm2OtfBe/HvoiAXR6bzfdG0emjlLHZelTyiCrmx68cX15nKgEH11vLITTgFkPFHJBnt5CzDC0t51HsCIIr0uooXtoPF+ijm9qVSmQF5gSmgBlO6eg1pbGtkW5DZwL5DcqE9ugF1DVGTYIk6EJBG79wfUHV4Mw2cmmi2Bd8HjNh1v3FXuVPu8LwYdpBX8NWiQbHZzXLU7bWpREhSoogvFW0DdzvEP6Htattr78kZN0WohF+1fmqojCyKMJNUHwhYPs4U8D+78z8y/qDqO5kqgEm5xSeHeCMvyKojYA3SZqgaid3A/dVHPAR5d4QLqz4wV8j4jKdwpmZbd04P7a/j/NEmoWwcqqWrjdevs770JHli0UlGqNx4mgxz+gdd07XxcjPKg+pPUmXIBRxXN5SQTKZgdoImZU0HsPO1HCFeZMCSSVsCAJ+fa8ntf211+r76yx0sBzt4YQYqD1SvGysO9hobDGCrqnDG2qdel6HRv81PR/Hl8IeY1VD/3GJyEEf/G5fyVePagKAuV9DtcWiqymdRfGkgrjaKZ7aMhJ25ltdLnLCu+KvSIas2wwqjrXYzg/zh/Kb7/HciK3wVvL19IKUyUZjkO5/lG1H/AypcfP++/o8FKehtz/21xlpv9YLiRGhIt X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: cce07b88-40de-4438-509b-08d8e013083e X-MS-Exchange-CrossTenant-AuthSource: AM0PR03MB4514.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2021 20:12:42.2445 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TJuAYrm8Iq5+nrtKnk486Q3bcaAGrO0YpbijAvjUXKSnCgLmfFJWOINr9anHo9+UnEJgqk0tw26TZ2NxkNdnZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB4338 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.102.4 at phobos.denx.de X-Virus-Status: Clean This adds an ID for a board revision. Existing IDs have been moved above SYSINFO_ID_END to allow for future expansion. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v2: - Set BOARD_HWVERSION to SYSINFO_ID_REVISION, as they represent the same content. - Use enums instead of defines for sysinfo ids drivers/sysinfo/gazerbeam.h | 8 +++++--- drivers/sysinfo/sandbox.h | 2 +- include/sysinfo.h | 13 +++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/sysinfo/gazerbeam.h b/drivers/sysinfo/gazerbeam.h index 171729d203..21514dd122 100644 --- a/drivers/sysinfo/gazerbeam.h +++ b/drivers/sysinfo/gazerbeam.h @@ -5,10 +5,12 @@ * */ +#include + enum { - BOARD_MULTICHANNEL, - BOARD_VARIANT, - BOARD_HWVERSION, + BOARD_HWVERSION = SYSINFO_ID_REVISION, + BOARD_MULTICHANNEL = SYSINFO_ID_END + 1, + BOARD_VARIANT }; enum { diff --git a/drivers/sysinfo/sandbox.h b/drivers/sysinfo/sandbox.h index 2cff494f56..9a67fd2389 100644 --- a/drivers/sysinfo/sandbox.h +++ b/drivers/sysinfo/sandbox.h @@ -5,7 +5,7 @@ */ enum { - BOOL_CALLED_DETECT, + BOOL_CALLED_DETECT = SYSINFO_ID_END + 1, INT_TEST1, INT_TEST2, STR_VACATIONSPOT, diff --git a/include/sysinfo.h b/include/sysinfo.h index c045d316b0..9386bdf49a 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -32,6 +32,19 @@ */ #if CONFIG_IS_ENABLED(SYSINFO) +/** + * enum sysinfo_id - IDs which may be passed to sysinfo accessors + */ +enum sysinfo_id { + /** @SYSINFO_ID_REVISION: Use this ID to access the board revision. */ + SYSINFO_ID_REVISION, + /** + * @SYSINFO_ID_END: The last global sysinfo id. If you need to return + * custom information, use SYSINFO_ID_END+1 as the base offset. + */ + SYSINFO_ID_END = 127, +}; + struct sysinfo_ops { /** * detect() - Run the hardware info detection procedure for this From patchwork Fri Mar 5 20:12:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1448196 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=IYtMKioJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dsf7f4ymPz9sVS for ; Sat, 6 Mar 2021 07:13:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1144682748; Fri, 5 Mar 2021 21:13:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="IYtMKioJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E28AD826CA; Fri, 5 Mar 2021 21:12:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DA3DC826B2 for ; Fri, 5 Mar 2021 21:12:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P6Ye/C080aR9aqCzq6ICuafuI9tlypfyswOC7T9dg+jUK6J8jKNFjaaGRzidjbmcdQe0UcPvoxPzzxdwZHESh6Onnx/KC7meNTzzIr31BRnW+Uno2Q/nLwnGsbGlDYTLOUXltKIrCA92yqOhYgASwQz8yW5u+YTA1+alr5zgmogeSFMHXT03C3DlzrmJQIHeCoUhKkUPoj7HzCyL3HCdpiv4g3iMnfCcdQshYpfIpQIYmHDkE0F+RLvkvJ9R/lAYTbkzJBKBsPVGVCZuoPSSmaWJcAENFz6/R5nYuUn5BOkIIsQ+Ak06JHowMP8aOV16/33I9UfPwcGqkWQNsDmq+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=USqIFY9GkscJJj02o5SwMIL+TorUaFPk8Uo/sS4m7r4=; b=df1lmtMwG9zjhzzixWtp0aZ+gmtcIIkptqlU4xztb+BzOmi3j1BrFNMoxPmUWkaDROOISsqE/wa7qaGGYpXOVvD7N7WX8+Re3yzU4B4T7a+kITwzGnwFeMt+Cni+TybKDINMqKSkz8/drPPSViHJp7MsdzYc4eJLlBQ1Jxxq7o88Duk0eFHwdW0zZqy5yIIafq0exyHNg/qxPA8ekaRXUNZTz8DzOuirLYBLiifNmtXtCVpPeyMWdDCY7Km1CxxtgqcN0p4AVbSIk8enN4wXfFCIgwUS037x8sg0xFaOrnHUeo3Ioj2dxVhCNiGTPi/hyCKtuyCMld+7/uFr8wJPOA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=USqIFY9GkscJJj02o5SwMIL+TorUaFPk8Uo/sS4m7r4=; b=IYtMKioJryIMtfeCeOmkFOlwBADQIYfNkVALxGVNK0aScpgc9zoEn6LatxFJ+Jg0DbamOt2747UqJi2+5zczgemATTaWZ5hbHSo1ml4cOLC3WC17c0t5d16eMTveh+P27Nkm/L6Hy9d/GJ3+tekMUPin7pgUybXbjOWVdglSHm4= Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none;chromium.org; dmarc=none action=none header.from=seco.com; Received: from AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) by AM0PR03MB4338.eurprd03.prod.outlook.com (2603:10a6:208:c3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Fri, 5 Mar 2021 20:12:44 +0000 Received: from AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e]) by AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e%7]) with mapi id 15.20.3890.034; Fri, 5 Mar 2021 20:12:44 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Sean Anderson , Alexandru Gagniuc , Bin Meng , Dario Binacchi , Marek Vasut , Michal Simek , Philippe Reynes , Reuben Dowle , Samuel Holland , Ye Li Subject: [PATCH v2 3/5] sysinfo: Require that sysinfo_detect be called before other methods Date: Fri, 5 Mar 2021 15:12:23 -0500 Message-Id: <20210305201225.3753841-4-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210305201225.3753841-1-sean.anderson@seco.com> References: <20210305201225.3753841-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) To AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.10 via Frontend Transport; Fri, 5 Mar 2021 20:12:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4cf08c4-9237-4557-3206-08d8e0130974 X-MS-TrafficTypeDiagnostic: AM0PR03MB4338: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xmVjiHxkgKZUWtrvTB6RVEM5W9eNZJdqkJHS1eLiZBk41zcstHYhNJT22gHayjTDXIMz+yoySNUauIUNIOcE71zRLWdu11mZPUYH1L3sVwUZkQxk/TOZd/sp7PF15tnFLapQNplc5tM+KOV7bx4y5FTwrZQOM54ElaE6bYdIB0kDf5FnjvelkJqc+wDV1r0PsQONwfNvl0Dr4hAm0hKx1LPYyDR/DfYQgw8REVwA1w0Wl2QAiPewEs2MlXYjmZFuUHE2PqZvAJGCqdZiYc6Jp+RcCMRyR0HPyCbt4/gOY/aZLCJ6IKsFnqfsGIXYve3OqNGpm6+y9U4KXv9+exekl/DXdSCNYr0dOgex7r+P1Ho2KI3PyIlApeL6/2p1ogRLuuD+XFT7V4UUEyNU/x96xvYK6FxJo4Dawer6Tx1Rj+mTmhI6y9A9EjjTTquSBhu4sHZlO1+CfTzHaw/nTxqt9jocpaguJ0LspN47nWgrP5y51uHZoo3S7uGlQSPLPyh3oDQG03gxgIE4bNoOLkV2rg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR03MB4514.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(39840400004)(136003)(346002)(396003)(366004)(6512007)(6506007)(66946007)(5660300002)(66556008)(52116002)(8676002)(6666004)(2616005)(83380400001)(16526019)(7416002)(186003)(36756003)(956004)(1076003)(66476007)(86362001)(44832011)(316002)(26005)(2906002)(4326008)(54906003)(6486002)(8936002)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: GKOr8Co0FT86a6Sz1789T5eG/rafx/Vvzvwi8JUWkT9+PqifZEeJrkEjQ1yl6Du71fEN8bKpI9mPxnPvpnLWB8u2bvsSJMBDa1BD/e0POe/Q069st57XRPb0HPdlnJ8z9q7xtXSojQs6PC6NP+b0fDooShqHzOaAl+/Ih3HEpTFiBgR51T54WJ05hT0WLLifZqehY83UcYQ8LOU3r/EsfZTZIW/gS+vORDeySTnG/VyH2W2GghHvwLscc6FB0h9fQFYNzf7CXJ8d7p6uLMJq/HhDDJmFtBWwxNlzW+TOvBPXDjYeDELYk7Z4JivhyJtxowDOpLLdmDxVw+NqGu0MYFa7OvMK8BZ/U/+QPP054xCefMAPydw4pnPnXC3A1VTg/YGyshJbsFcJXaHUXx/MiFSLVgtlZt+ysx5GMe+L7e90q+rLQYXkq6sKUfAoDnqd+4JzjTO+b0nwI56b6UypfVwqW8fDupAQHxMvm83lRN65vrvTe9jrL6YnOrkGxkfx1PfvdhyWEUqfblsgvHFzkrFvmvzTRlM5dw5PRlPI+rlzTE2ob8dOI/UHRF7TCvz0+k0Rk6gmQf2gKCwzf+K2NaDh2N1nLkEAR96JErDYaiCBeUUjtUGmAce93W4op1vks0GVnTsdrbyYH26TM1QO6yAmiM73FZHaq/RE/s7B9h4QaFyQTvP7j1Tpk1BXkx0bfj0QdARMW2yiMIeTvM8QV9nQXnvddkAV1XP5U05tvPUYsXkXbm1lYYjKpiaU9YXbTwLiSHjfi+z98+c6HtWbcsxN/s5Gbzc2hS6wnYjKPmOOcmxXCIAmtIXkrwDur11miwSVKpfMKzoXNwNkb9H3l7wYTHG2IL5zMBSCSZ/0jJASKbnyW2CtdIuHJ0dwU0W1QTeTb5P8Neys2lOlydFL7ejpGXCeYwzZXEk56ixllWjYRTGrGADSmDfxrX2F5hTvKaMkWcEDd9L5hDHQCmJzKdutmAhnPB+7/UELJzjrDLN7pX/erAHfjJa3RLt4S5BzvMKU6/WVYRVLKGECevApBDhmAKQL0FLqjz4w6XV0M8fyqgjkhT6MphNVKFblz/mqb0nBBbAonUKPqn9AabXGA0W4MxHrGxP2m78mpToMWi3kr+IY+UNQOCtEsPlfq/FWcHY6yraRESMHdGqBT35C3az1/bDDfkgQco9nBqieleNcrdqmrsGgbk4v7eI88WjUNqnHr6foxjbKIaeaps5yd1OsZZ9TypJ8fqw/mxL1xAftkY5vYqKHJMAwCKEv/ON2Delk9qA9NMOhJRxkHgXE/IdgqV8Hrp1tftWEYOuVUPJ8V8+ObBJ03gBRdCPwWd/o X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4cf08c4-9237-4557-3206-08d8e0130974 X-MS-Exchange-CrossTenant-AuthSource: AM0PR03MB4514.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2021 20:12:44.2944 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: T/LIMgO9n1YXCzIWm1NZYmKkssEGbdLkk+HAFGtRvEcNLzjuyxU5mByxlzCiGlHeAXQ08uVZkjiYAaQK08BV/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB4338 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.102.4 at phobos.denx.de X-Virus-Status: Clean This has the uclass enforce calling detect() before other methods. This allows drivers to cache information in detect() and perform (cheaper) retrieval in the other accessors. This also modifies the only instance where this sequencing was not followed. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v2: - Enforce sysinfo detect ordering in uclass. Users must still call sysinfo_detect beforehand. - Modify sysinfo test to check for detect() ordering. common/spl/spl_fit.c | 4 ++++ drivers/sysinfo/sysinfo-uclass.c | 25 ++++++++++++++++++++++++- include/sysinfo.h | 26 +++++++++++++++++--------- test/dm/sysinfo.c | 23 ++++++++++++++--------- 4 files changed, 59 insertions(+), 19 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index a6ad094e91..4d17582af5 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -116,6 +116,10 @@ static int spl_fit_get_image_name(const void *fit, int images, * no string in the property for this index. Check if the * sysinfo-level code can supply one. */ + rc = sysinfo_detect(sysinfo); + if (rc) + return rc; + rc = sysinfo_get_fit_loadable(sysinfo, index - i - 1, type, &str); if (rc && rc != -ENOENT) diff --git a/drivers/sysinfo/sysinfo-uclass.c b/drivers/sysinfo/sysinfo-uclass.c index 6df58fe160..f034ee0870 100644 --- a/drivers/sysinfo/sysinfo-uclass.c +++ b/drivers/sysinfo/sysinfo-uclass.c @@ -15,19 +15,29 @@ int sysinfo_get(struct udevice **devp) int sysinfo_detect(struct udevice *dev) { + int ret; + bool *detected = dev_get_uclass_priv(dev); struct sysinfo_ops *ops = sysinfo_get_ops(dev); if (!ops->detect) return -ENOSYS; - return ops->detect(dev); + ret = ops->detect(dev); + if (!ret) + *detected = true; + + return ret; } int sysinfo_get_fit_loadable(struct udevice *dev, int index, const char *type, const char **strp) { + bool *detected = dev_get_uclass_priv(dev); struct sysinfo_ops *ops = sysinfo_get_ops(dev); + if (!*detected) + return -EPERM; + if (!ops->get_fit_loadable) return -ENOSYS; @@ -36,8 +46,12 @@ int sysinfo_get_fit_loadable(struct udevice *dev, int index, const char *type, int sysinfo_get_bool(struct udevice *dev, int id, bool *val) { + bool *detected = dev_get_uclass_priv(dev); struct sysinfo_ops *ops = sysinfo_get_ops(dev); + if (!*detected) + return -EPERM; + if (!ops->get_bool) return -ENOSYS; @@ -46,8 +60,12 @@ int sysinfo_get_bool(struct udevice *dev, int id, bool *val) int sysinfo_get_int(struct udevice *dev, int id, int *val) { + bool *detected = dev_get_uclass_priv(dev); struct sysinfo_ops *ops = sysinfo_get_ops(dev); + if (!*detected) + return -EPERM; + if (!ops->get_int) return -ENOSYS; @@ -56,8 +74,12 @@ int sysinfo_get_int(struct udevice *dev, int id, int *val) int sysinfo_get_str(struct udevice *dev, int id, size_t size, char *val) { + bool *detected = dev_get_uclass_priv(dev); struct sysinfo_ops *ops = sysinfo_get_ops(dev); + if (!*detected) + return -EPERM; + if (!ops->get_str) return -ENOSYS; @@ -68,4 +90,5 @@ UCLASS_DRIVER(sysinfo) = { .id = UCLASS_SYSINFO, .name = "sysinfo", .post_bind = dm_scan_fdt_dev, + .per_device_auto = sizeof(bool), }; diff --git a/include/sysinfo.h b/include/sysinfo.h index 9386bdf49a..e2aef4abe9 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -54,7 +54,8 @@ struct sysinfo_ops { * This operation might take a long time (e.g. read from EEPROM, * check the presence of a device on a bus etc.), hence this is not * done in the probe() method, but later during operation in this - * dedicated method. + * dedicated method. This method will be called before any other + * methods. * * Return: 0 if OK, -ve on error. */ @@ -98,7 +99,7 @@ struct sysinfo_ops { * get_fit_loadable - Get the name of an image to load from FIT * This function can be used to provide the image names based on runtime * detection. A classic use-case would when DTBOs are used to describe - * additionnal daughter cards. + * additional daughter cards. * * @dev: The sysinfo instance to gather the data. * @index: Index of the image. Starts at 0 and gets incremented @@ -120,6 +121,9 @@ struct sysinfo_ops { * * @dev: The device containing the information * + * This function must be called before any other accessor function for this + * device. + * * Return: 0 if OK, -ve on error. */ int sysinfo_detect(struct udevice *dev); @@ -131,7 +135,8 @@ int sysinfo_detect(struct udevice *dev); * @id: A unique identifier for the bool value to be read. * @val: Pointer to a buffer that receives the value read. * - * Return: 0 if OK, -ve on error. + * Return: 0 if OK, -EPERM if called before sysinfo_detect(), else -ve on + * error. */ int sysinfo_get_bool(struct udevice *dev, int id, bool *val); @@ -142,7 +147,8 @@ int sysinfo_get_bool(struct udevice *dev, int id, bool *val); * @id: A unique identifier for the int value to be read. * @val: Pointer to a buffer that receives the value read. * - * Return: 0 if OK, -ve on error. + * Return: 0 if OK, -EPERM if called before sysinfo_detect(), else -ve on + * error. */ int sysinfo_get_int(struct udevice *dev, int id, int *val); @@ -154,7 +160,8 @@ int sysinfo_get_int(struct udevice *dev, int id, int *val); * @size: The size of the buffer to receive the string data. * @val: Pointer to a buffer that receives the value read. * - * Return: 0 if OK, -ve on error. + * Return: 0 if OK, -EPERM if called before sysinfo_detect(), else -ve on + * error. */ int sysinfo_get_str(struct udevice *dev, int id, size_t size, char *val); @@ -166,7 +173,8 @@ int sysinfo_get_str(struct udevice *dev, int id, size_t size, char *val); * function that returns the unique device. This is especially useful for use * in sysinfo files. * - * Return: 0 if OK, -ve on error. + * Return: 0 if OK, -EPERM if called before sysinfo_detect(), else -ve on + * error. */ int sysinfo_get(struct udevice **devp); @@ -174,7 +182,7 @@ int sysinfo_get(struct udevice **devp); * sysinfo_get_fit_loadable - Get the name of an image to load from FIT * This function can be used to provide the image names based on runtime * detection. A classic use-case would when DTBOs are used to describe - * additionnal daughter cards. + * additional daughter cards. * * @dev: The sysinfo instance to gather the data. * @index: Index of the image. Starts at 0 and gets incremented @@ -183,8 +191,8 @@ int sysinfo_get(struct udevice **devp); * @strp: A pointer to string. Untouched if the function fails * * - * Return: 0 if OK, -ENOENT if no loadable is available else -ve on - * error. + * Return: 0 if OK, -EPERM if called before sysinfo_detect(), -ENOENT if no + * loadable is available else -ve on error. */ int sysinfo_get_fit_loadable(struct udevice *dev, int index, const char *type, const char **strp); diff --git a/test/dm/sysinfo.c b/test/dm/sysinfo.c index 4aaa9e85bc..fd13f6aac5 100644 --- a/test/dm/sysinfo.c +++ b/test/dm/sysinfo.c @@ -24,33 +24,38 @@ static int dm_test_sysinfo(struct unit_test_state *uts) ut_assertok(sysinfo_get(&sysinfo)); ut_assert(sysinfo); - sysinfo_get_bool(sysinfo, BOOL_CALLED_DETECT, &called_detect); + ut_asserteq(-EPERM, sysinfo_get_bool(sysinfo, BOOL_CALLED_DETECT, + &called_detect)); ut_assert(!called_detect); sysinfo_detect(sysinfo); - sysinfo_get_bool(sysinfo, BOOL_CALLED_DETECT, &called_detect); + ut_assertok(sysinfo_get_bool(sysinfo, BOOL_CALLED_DETECT, + &called_detect)); ut_assert(called_detect); - sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), str); + ut_assertok(sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), + str)); ut_assertok(strcmp(str, "R'lyeh")); - sysinfo_get_int(sysinfo, INT_TEST1, &i); + ut_assertok(sysinfo_get_int(sysinfo, INT_TEST1, &i)); ut_asserteq(0, i); - sysinfo_get_int(sysinfo, INT_TEST2, &i); + ut_assertok(sysinfo_get_int(sysinfo, INT_TEST2, &i)); ut_asserteq(100, i); - sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), str); + ut_assertok(sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), + str)); ut_assertok(strcmp(str, "Carcosa")); - sysinfo_get_int(sysinfo, INT_TEST1, &i); + ut_assertok(sysinfo_get_int(sysinfo, INT_TEST1, &i)); ut_asserteq(1, i); - sysinfo_get_int(sysinfo, INT_TEST2, &i); + ut_assertok(sysinfo_get_int(sysinfo, INT_TEST2, &i)); ut_asserteq(99, i); - sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), str); + ut_assertok(sysinfo_get_str(sysinfo, STR_VACATIONSPOT, sizeof(str), + str)); ut_assertok(strcmp(str, "Yuggoth")); return 0; From patchwork Fri Mar 5 20:12:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1448195 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=B51E6hLY; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dsf7R5FDrz9sVS for ; Sat, 6 Mar 2021 07:13:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A1EB7826B2; Fri, 5 Mar 2021 21:12:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="B51E6hLY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6483D82748; Fri, 5 Mar 2021 21:12:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1E442826CA for ; Fri, 5 Mar 2021 21:12:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NIs6QCgbHtNQR87ijH1mZ3VGDoY0DUR2rDQgbACuqweFWhZTnvIw5T56pjzTVdmxKqvQ1aYV9OLRvf9wSM/OKEeLuhMijRVp0S+dGwSjtXsY08CFMy94uSL+L6NpNYrqQV38v9L4xf3B8HnVbafX5L85Ha3TZSaN+ujHJMAwLSbgIP4lmnNQ6cIk1N3d20pvh0YEGv3xTaSZXD1gghRV6aMgIn3bDves+4jWSsNr7/XrvCL9rAkUaUn1Y4GT6vyryLzQ9Bhk2Q3n/VjUxu3sSl/Y6FX1HNt+yMIG0OUZfiWIGRt1W9KHAGUrOpdIiiWacHpTM84uzyu04hnlzOntBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H3AS32LlntJ8An7jB9ZZzuA58Z8CE39loZLmq7PWM20=; b=NKDTYGaQrUhz3fvKeaL/i8h3ZXnLhovyT+2RbXPwHXRs0PnJe+i50p63EzoTQ/jWFuGP0niebhkRaONhXOFRPZb/Wh80vDRWu8v330FAJLky0mvQiRan7VjhPwyrqR3NauQqRYHkL/hCkLyMM3nX9q+VItG/j7K40CCKeYqRj4CZx2JtQ7T2fWN4UqdgI/bUTYOYASRx2i5nN550QK4rmsTxL50lIlBBuS23WiOGDKZyJbVXl2hk8Uywa5/pNdRYuEaJFviznT7TvK+A9kBKULFj2g/mNly2Inj6KwbqWk30whVUwmMIHVoZrNm9lg6SRuK2Zrb3z47cv12fZIkkpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H3AS32LlntJ8An7jB9ZZzuA58Z8CE39loZLmq7PWM20=; b=B51E6hLYR0EySsn9pV8CPEz5DDhWUgpg+nuwZxp8Hpm+ejNiZN8fHxvPP8FVFT6fYpisx7ADlD7xR9CQg1wjZliE/HIuL5v8qhCwnYBVzR+DBdigtIA17NY1ir1OcIhBT30bMFWKX3M4RCZp6KqHrdmrcJVLmi6L4LDTfLQsWpM= Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none;chromium.org; dmarc=none action=none header.from=seco.com; Received: from AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) by AM0PR03MB4338.eurprd03.prod.outlook.com (2603:10a6:208:c3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Fri, 5 Mar 2021 20:12:45 +0000 Received: from AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e]) by AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e%7]) with mapi id 15.20.3890.034; Fri, 5 Mar 2021 20:12:45 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Sean Anderson , Bin Meng Subject: [PATCH v2 4/5] sysinfo: Add gpio-sysinfo driver Date: Fri, 5 Mar 2021 15:12:24 -0500 Message-Id: <20210305201225.3753841-5-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210305201225.3753841-1-sean.anderson@seco.com> References: <20210305201225.3753841-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) To AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.10 via Frontend Transport; Fri, 5 Mar 2021 20:12:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c457a1e7-4724-4dbe-f5f3-08d8e0130a5f X-MS-TrafficTypeDiagnostic: AM0PR03MB4338: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fg+6ykHygq2EFL1M991QSEcYx7qMo7fVnUScK691gDsqvUllMmbUwFCQA88j14L4gh7NRPIPSjG/l0lcBZy7TBW4nvmM4fMBuVEhVK16VP3A47PJ+wlhQUV3jKXXP9nHJon4/xuEOHpYC8+5nX1rBFZ+MBFzgsKNNAPaaGgdZrbRvIzR3IZUlUHqYBnREOudg3M9Gb1znMrcwL/g6au54qfTI8rnBqAF7H0Szpej3TNefGiwaifkSMGsL3JHtK9+QYLHTywVH2Jr6kqLDaL+7Ws+ZR/pWS79XA3tog7g4p2b7y6VD9wAQhpT1E3n0wwcCF3QZcieeUsmsBjoifsvWZ8eodqsDaIFk960OSGW/Eud22zy/5XOc4UGswzw3KWxCsqpHlR/FG5oO35ett6muziBmTrZS5Uv3+lA8tKkcd9yrOBPnvU0YCVVcbbZYKZtMaNFAcPmiw627mmOV4YgkM3VPkJ2DQy0ibWJxFOSQpUsHHVf+cWRPxv9Ozrd23M/3SF9GEivaeT+1NcgU4ro8w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR03MB4514.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(39840400004)(136003)(346002)(396003)(366004)(6512007)(6506007)(66946007)(5660300002)(66556008)(52116002)(8676002)(6666004)(2616005)(83380400001)(16526019)(186003)(36756003)(956004)(1076003)(66476007)(86362001)(44832011)(316002)(26005)(2906002)(4326008)(54906003)(6486002)(8936002)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Sgnw0WVPHLXhMCi/Wlg0wLQvThY5HeY/b7DoLwJn2WnGKgpkwqtv6u256dh9n9aXug0pATvxO3SOuJhzeOblzKw/z7U98ZR6B56LpQo2y3yl3HIpLmCcIeBWScXDUW4ul2gvwoYyZg/3ZtcSUNyUGGZtv49BKB0reU4vNRbG7gY9dkvoA2fGl4ECPw3Gh2joLJSsMSnMbgPoAx8MZ+aG9y5YdHXdQvVaXrCmxBuUxEMMEFAJThjky3erojPsQMR4Zm2B4v3o0dG/Vdz7He1FJl9vUXPmFhqPetsUDguKE9pLnQ6RIB1H20WCdrKEx7so3LeCiW6DNXbrZmV4U57F77ukU3AR1pSB/3EreiqYonteWJe6uqixY4CfNmooAm3athpOja0fIoLOP7JI142wC0r8ojD37EQRpXPVx/ldP41qTWajWgo+G47AQQSoVORxFVf7xo8nwrIAdAmMq5tMTilRlmHpQKe7iJVlWYVhBn7GtorbT9OloMZoweytCIdi3yUjPTcI9w/uCWsURRyQsFbXaRmyhC8mE3RlW71sOMxI/YVpcE68i6l1V4qDm1aGRwfO6W3LnHOHHq9MQtYXMqBSCUspp6VyWxNhUTjt//MIB4H6I5JdvTpeJmJZ1UjWJoMQG3Lcesdrw8v1QtqmUJJTQwN4wHFCvtKSELXEfxC3Wedb+3s7Ffin0ZErWI6/5nE83Vmf0Uji5TH5rwHTpJ1YMYYNLoukdqNJ0OyrIx4/BYsBKAhAj8aHZctvXLk+PJ58HmeN5rfldeT8Ca4q2NnM9629KGDID6pRludSe3XkmDSbB4Jc6QsDlzVrkWmYbSusi2KDWF16cnQzlpYSjjcEoLvzhnUTLIIu/bdtFzYIhJZRZdrMR9jElQLbn+XvhSQX0C6SxkI34aGxlFjGANjv5m1IdkUaCfqB5BtIhBVYFrqJAx6NrYmDE9Qm+EdjtmjXj9DgdYyuc89Eq6OhSLPr2dpI/Y5Najh5cMgGKqi0w57DLmKayJ3rCe9PkQmchOcIkMUG9kBhoXq3Iz5iNBKqeXAUMdyozuXnr939ajI/GSQXd5qYiQL05I5caFGbEzLcxhG+x/nyt2fdwFWcr31rwmZsIckTBxwpSUEiL3qe/JH8+NunShtzZ9O13dv2Q0zDuZ/nnCDBXrp97/K0QJjJZwi+tq5durSIU1xEVROQSPROb9syjzbtQ542WIBu451ocksGdhEuhnH/BxSpVjuZO0hFOEoyF0yxb81D0SWSzC5d+GTQIP5c9HDR4JnGLrHg/bCHz/3OD3M5509EMpcJ/Wz6HR2ZvTWeM/8rK6Q94yHADbPcjxMUVUgx1Lr1 X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: c457a1e7-4724-4dbe-f5f3-08d8e0130a5f X-MS-Exchange-CrossTenant-AuthSource: AM0PR03MB4514.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2021 20:12:45.8305 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vvdlqynWllCXAkCOe8JLcjTHKyM6Xp5BDQ52MCp23RI7+SlhsN3N1QQKLF3ie88zMULyaF5oNa1IBy0xuX+3Iw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB4338 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.102.4 at phobos.denx.de X-Virus-Status: Clean This uses the newly-added dm_gpio_get_values_as_int_base3 function to implement a sysinfo device. The revision map is stored in the device tree. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v2: - Document sysinfo_gpio_priv - Fix unbalanced brace in sysinfo_gpio_get_int - Refactor driver to take advantage of the uclass detect ordering guarantee. - Reorder includes .../sysinfo/gpio-sysinfo.txt | 37 +++++ drivers/sysinfo/Kconfig | 8 + drivers/sysinfo/Makefile | 1 + drivers/sysinfo/gpio.c | 140 ++++++++++++++++++ 4 files changed, 186 insertions(+) create mode 100644 doc/device-tree-bindings/sysinfo/gpio-sysinfo.txt create mode 100644 drivers/sysinfo/gpio.c diff --git a/doc/device-tree-bindings/sysinfo/gpio-sysinfo.txt b/doc/device-tree-bindings/sysinfo/gpio-sysinfo.txt new file mode 100644 index 0000000000..b5739d94e9 --- /dev/null +++ b/doc/device-tree-bindings/sysinfo/gpio-sysinfo.txt @@ -0,0 +1,37 @@ +GPIO-based Sysinfo device + +This binding describes several GPIOs which specify a board revision. Each GPIO +forms a digit in a ternary revision number. This revision is then mapped to a +name using the revisions and names properties. + +Each GPIO may be floating, pulled-up, or pulled-down, mapping to digits 2, 1, +and 0, respectively. The first GPIO forms the least-significant digit of the +revision. For example, consider the property + + gpios = <&gpio 0>, <&gpio 1>, <&gpio 2>; + +If GPIO 0 is pulled-up, GPIO 1 is pulled-down, and GPIO 2 is floating, then the +revision would be + + 0t201 = 2*9 + 0*3 + 1*3 = 19 + +If instead GPIO 0 is floating, GPIO 1 is pulled-up, and GPIO 2 is pulled-down, +then the revision would be + + 0t012 = 0*9 + 1*3 + 2*1 = 5 + +Required properties: +- compatible: should be "gpio-sysinfo". +- gpios: should be a list of gpios forming the revision number, + least-significant-digit first +- revisions: a list of known revisions; any revisions not present will have the + name "unknown" +- names: the name of each revision in revisions + +Example: +sysinfo { + compatible = "gpio-sysinfo"; + gpios = <&gpio_a 15>, <&gpio_a 16>, <&gpio_a 17>; + revisions = <19>, <5>; + names = "rev_a", "foo"; +}; diff --git a/drivers/sysinfo/Kconfig b/drivers/sysinfo/Kconfig index 85c1e81e41..381dcd8844 100644 --- a/drivers/sysinfo/Kconfig +++ b/drivers/sysinfo/Kconfig @@ -30,4 +30,12 @@ config SYSINFO_SMBIOS one which provides a way to specify this SMBIOS information in the devicetree, without needing any board-specific functionality. +config SYSINFO_GPIO + bool "Enable gpio sysinfo driver" + help + Support querying gpios to determine board revision. This uses gpios to + form a ternary number (when they are pulled-up, -down, or floating). + This ternary number is then mapped to a board revision name using + device tree properties. + endif diff --git a/drivers/sysinfo/Makefile b/drivers/sysinfo/Makefile index 6d04fcba1d..d9f708b7ea 100644 --- a/drivers/sysinfo/Makefile +++ b/drivers/sysinfo/Makefile @@ -4,5 +4,6 @@ # Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc obj-y += sysinfo-uclass.o obj-$(CONFIG_SYSINFO_GAZERBEAM) += gazerbeam.o +obj-$(CONFIG_SYSINFO_GPIO) += gpio.o obj-$(CONFIG_SYSINFO_SANDBOX) += sandbox.o obj-$(CONFIG_SYSINFO_SMBIOS) += smbios.o diff --git a/drivers/sysinfo/gpio.c b/drivers/sysinfo/gpio.c new file mode 100644 index 0000000000..6bd1f19f76 --- /dev/null +++ b/drivers/sysinfo/gpio.c @@ -0,0 +1,140 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021 Sean Anderson + */ + +#include +#include +#include +#include +#include +#include + +/** + * struct sysinfo_gpio_priv - GPIO sysinfo private data + * @gpios: List of GPIOs used to detect the revision + * @gpio_num: The number of GPIOs in @gpios + * @revision: The revision as detected from the GPIOs. + */ +struct sysinfo_gpio_priv { + struct gpio_desc *gpios; + int gpio_num, revision; +}; + +static int sysinfo_gpio_detect(struct udevice *dev) +{ + int ret; + struct sysinfo_gpio_priv *priv = dev_get_priv(dev); + + ret = dm_gpio_get_values_as_int_base3(priv->gpios, priv->gpio_num); + if (!ret) + priv->revision = ret; + + return ret; +} + +static int sysinfo_gpio_get_int(struct udevice *dev, int id, int *val) +{ + struct sysinfo_gpio_priv *priv = dev_get_priv(dev); + + switch (id) { + case SYSINFO_ID_REVISION: + *val = priv->revision; + return 0; + default: + return -EINVAL; + }; +} + +static int sysinfo_gpio_get_str(struct udevice *dev, int id, size_t size, char *val) +{ + struct sysinfo_gpio_priv *priv = dev_get_priv(dev); + + switch (id) { + case SYSINFO_ID_REVISION: { + const char *name = NULL; + int i, ret; + u32 revision; + + for (i = 0; i < priv->gpio_num; i++) { + ret = dev_read_u32_index(dev, "revisions", i, + &revision); + if (ret) { + if (ret != -EOVERFLOW) + return ret; + break; + } + + if (revision == priv->revision) { + ret = dev_read_string_index(dev, "names", i, + &name); + if (ret < 0) + return ret; + break; + } + } + if (!name) + name = "unknown"; + + strncpy(val, name, size); + val[size - 1] = '\0'; + return 0; + } default: + return -EINVAL; + }; +} + +static const struct sysinfo_ops sysinfo_gpio_ops = { + .detect = sysinfo_gpio_detect, + .get_int = sysinfo_gpio_get_int, + .get_str = sysinfo_gpio_get_str, +}; + +static int sysinfo_gpio_probe(struct udevice *dev) +{ + int ret; + struct sysinfo_gpio_priv *priv = dev_get_priv(dev); + + priv->gpio_num = gpio_get_list_count(dev, "gpios"); + if (priv->gpio_num < 0) { + dev_err(dev, "could not get gpios length (err = %d)\n", + priv->gpio_num); + return priv->gpio_num; + } + + priv->gpios = calloc(priv->gpio_num, sizeof(*priv->gpios)); + if (!priv->gpios) { + dev_err(dev, "could not allocate memory for %d gpios\n", + priv->gpio_num); + return -ENOMEM; + } + + ret = gpio_request_list_by_name(dev, "gpios", priv->gpios, + priv->gpio_num, GPIOD_IS_IN); + if (ret != priv->gpio_num) { + dev_err(dev, "could not get gpios (err = %d)\n", + priv->gpio_num); + return ret; + } + + if (!dev_read_bool(dev, "revisions") || !dev_read_bool(dev, "names")) { + dev_err(dev, "revisions or names properties missing\n"); + return -ENOENT; + } + + return 0; +} + +static const struct udevice_id sysinfo_gpio_ids[] = { + { .compatible = "gpio-sysinfo" }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(sysinfo_gpio) = { + .name = "sysinfo_gpio", + .id = UCLASS_SYSINFO, + .of_match = sysinfo_gpio_ids, + .ops = &sysinfo_gpio_ops, + .priv_auto = sizeof(struct sysinfo_gpio_priv), + .probe = sysinfo_gpio_probe, +}; From patchwork Fri Mar 5 20:12:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1448197 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-secospa-onmicrosoft-com header.b=QiaBqi7h; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Dsf7r3VLRz9sVS for ; Sat, 6 Mar 2021 07:13:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7B5482794; Fri, 5 Mar 2021 21:13:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=secospa.onmicrosoft.com header.i=@secospa.onmicrosoft.com header.b="QiaBqi7h"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 96C8B82785; Fri, 5 Mar 2021 21:12:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 575B3826F3 for ; Fri, 5 Mar 2021 21:12:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HoE/MRbn+R7VjBOzWhoXX9DXpePbSuDai3vysZRozk4WZdZYaF4/hltVGduZ6Z4z1hVzOVrscPeKOtaNGVI+ta6ly2TgID9PzbinJGo42Ph64CULzl38R1tXGd3Ey7BEZT+4Bh5MlkzAikLZ7oVD32ob7142KqKIXsO5xGA/pfSX5CbiwFLiEL4SJesPPC6MidwK48XXtDOBRd5gep7kJAEPe9VGrLv+miGLp0YVMb6+o11+3+Bl51komhrio2TmrQY+VcnbPNo0M8z8wb9CoE7OnwClQFLN0YYwTI51GrEDaf5PYcm0p76RwEC6bWfNwsR5uodc0H/G9ySo0VhRzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JI5YvBFgeyj03VhB1cUTx/48nd+DrCUC5RgWCJxgKow=; b=aV+M+AaLlJJmezDgOeFxlBKqV/xf1PVXss3LMh8L2mKOjMDcyI6ocA6TObKceEnpyWUFgwCjywUaSGySBcNDaX319I8pZYULg7OGO7ErHnXhTTvbfagltoS+X2qT2andwaoLKP/BeMHNXH/GIkNKzJhXhKH/b0PcrCWAGiGoT8sn+U5JvYP537jYRA9JOiEqyrLiCPzbAbxL2bZmu2tMK56opkyVlyd+eKJDY1JzA0f1wNbGUb5RHDQdc67E8qQ5IYRc5Pv0tN+SnH49R0vuEFP1kufyjujj3IxNu+cuEPBL8/hxXiqWmHYzvw/2x6GI1Xaq5scHuZdWvTinHV3c6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secospa.onmicrosoft.com; s=selector2-secospa-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JI5YvBFgeyj03VhB1cUTx/48nd+DrCUC5RgWCJxgKow=; b=QiaBqi7hxAKqJloWYOw8iOEo69ZsS2jt6DFAeEDaB2fdmqo4+TwV6kYlTADF0Fg4g7Wqg6SD1ELQg6cX6/yWyqGi3C+gHhKLKlYkW+nefENtNGSByJ1N7YqG/dzrgVDD36RWxLNZ/WjcxQklGUCIxngeQKPCMqwXLVTuDM3KNZU= Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none;chromium.org; dmarc=none action=none header.from=seco.com; Received: from AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) by AM0PR03MB4338.eurprd03.prod.outlook.com (2603:10a6:208:c3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Fri, 5 Mar 2021 20:12:47 +0000 Received: from AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e]) by AM0PR03MB4514.eurprd03.prod.outlook.com ([fe80::439:40f3:673f:f32e%7]) with mapi id 15.20.3890.034; Fri, 5 Mar 2021 20:12:47 +0000 From: Sean Anderson To: Simon Glass , u-boot@lists.denx.de Cc: Sean Anderson , Bin Meng , Dario Binacchi , Jean-Jacques Hiblot , Patrick Delaunay , Philippe Reynes , Wolfgang Wallner Subject: [PATCH v2 5/5] test: Add gpio-sysinfo test Date: Fri, 5 Mar 2021 15:12:25 -0500 Message-Id: <20210305201225.3753841-6-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210305201225.3753841-1-sean.anderson@seco.com> References: <20210305201225.3753841-1-sean.anderson@seco.com> X-Originating-IP: [50.195.82.171] X-ClientProxiedBy: BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) To AM0PR03MB4514.eurprd03.prod.outlook.com (2603:10a6:208:d0::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from plantagenet.inhand.com (50.195.82.171) by BL1PR13CA0258.namprd13.prod.outlook.com (2603:10b6:208:2ba::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.10 via Frontend Transport; Fri, 5 Mar 2021 20:12:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f75a1ab6-cdfb-4824-0c80-08d8e0130b87 X-MS-TrafficTypeDiagnostic: AM0PR03MB4338: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:431; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q3L3McJLlQuLPvdqTFUdCTo4V6l06k6As0CLHKU9vQtZcveaWgNkIq+UbWjUP3vF8plCCrflA1gzBDx2YUFv23lzjXK4fdnnV21hxAOoxe3gdtkv/zHOHEVHlEc6mbcCyX4Kw11YLECyFOwTvdvoM5APMYzcJPspUUpu6UpRl6FMBrW/sqM+zIajrR5Y29+pYIMMQvFELzC+rg8A2fCQn/e7JEXjKD2gvG9bjPZVF1kR5UVSKdzPaY2KtX8XLyvuBewfQFY71QOflbxFIl07Jkcex7w01VmdHhaWEGxO2+zj5lUbwXMAyg2f/OKAcTPP+vaK2YUdpkF1N74SXAYwDLajXtgsRdyBsZJddieNN7Zeqcy4rIJwjLp+0M2HvIWKLzS6khdNEuY2GKZoo8FBFmuBW0+dZz3+1sPjqHPeHkqGhdSshTJy6G2zKrbIvY6WlZQRK4cypTfcMSnpL1VwGN+GpHB6P3tLJDx3n3UfgVVocZfUOFZk8tIxP18/6kEz/L1+LsOoCQNa/mu2QDQNYg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR03MB4514.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(39840400004)(136003)(346002)(396003)(366004)(6512007)(6506007)(66946007)(5660300002)(66556008)(52116002)(8676002)(6666004)(2616005)(83380400001)(16526019)(186003)(36756003)(956004)(1076003)(66476007)(86362001)(44832011)(316002)(26005)(2906002)(4326008)(54906003)(6486002)(8936002)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: WZWCif6jMJrhSz5jXJ1Arh5z22hQxrfpNd5jCQB19sTgdRPvt+q8BrDlP2WOavZfSJSJWKjrL8kGNu3fAbF4OdW7bgoGMSaiWYSJnFl55BEA3G6p+9l10Gu+hAzw3tSw+kDO+Oc58jCVRF7k0z13tixQ4LUQOjfKH2d+4fBjmd4yZHSvntw3xZ3DOcHkSRswLjZ9KILMSzTBY7aFWyRQUxAND4BNeZxnD7vltvhKoJogaSIh1sE1JMcJWAT5tv7zC8rviN2exPRWxijGCaUtbg501294t7kt8OYfSaV1vmPL2/hzaR2v9hEOKeo1d5OR6mlxUB1NqNdfuF0M9L+0aAFFUt6Vn1HeBC5QYV0N0IcAJROeXZDYuB3UVZNoqprV6bQ1gpChKbhaidAGMjBsqOhMfxcQVPxmsAT4SppmJMlqSt1Au+IORLMewHpbz0wfwR7wFnWge/H8EcM0VBdWWMgsta/dFrupgdWRE7fjvf+tRidtkxCDh49VdiT47FbCrukT9/vxVxK4UMcWjS7h5APdXAgaYQOjgGuv/ml2i/JrIy3CdW0N529EOjp3BFqKVqeZI84f4m5CuslAjqIiROBD6FvRUc29vvEIqfxIL/O3XaeePSTWF1bzXqppoNm7ENkwZHo+iqSAgEgUBwdKZN6ZWGiiiBPqsWVnFFrF4fo5qQZcZfvBCJmf+SdImUqaOGv8cmWNmNqvJ1cuYOXKXkr6NUZOIrKosZJmjLjddTNHzNcUqY+3xpvHeZuSjCfXTb4lJD4AJ2NfiTkAsuMYHDATPzM8VJ7Dl+uYsltXjmKPqR4vEbBCqSl4f7h1/A3/BfJ6NplbO6TRjnZs8BOQjBrr6HZ+P1NS8R+6GeGy7Y9YqmMhivbkh39N7Cszct9T8xssm4PI794wQJ6Exqkb6XHv+U/uUnSb/tzqiZC6zSU0zW5L9wxCpb+ZjRF63TbckUNudxJa85Hg4xe76HOqAO9chGg+/4vj0GXRF4Dwk2xiM1SfrBBFjat7NO8LOjWKz59Jut+1bYxXulDCvtYM9GPS7/hI+amM8fchLfQ1MOROUylfpccAk62ripWEEgYx6aPjddvWpmC9VgHd/gQYo84pmZsfofhjFcRXXDvKLJZIwRqT1XwaG8OjqfhSBP7TpEnQp+ibLQwGtU3ufMnqW6od46d/c2084vXjALK6pg+1uGeDvWXVjAlikz0txI6w4qBpv0X2qNEqhiRJaMbOArJQcy8X9z54OSeNNiaRkBi15srEqWwelQ2d7Bu5gKdALTSc/p28c9bUYKuqRHfK2nHLoltuKpGK5uqVUsLmxj8FiJX4iuL0O69jzXp5Qgtq X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: f75a1ab6-cdfb-4824-0c80-08d8e0130b87 X-MS-Exchange-CrossTenant-AuthSource: AM0PR03MB4514.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2021 20:12:47.7444 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rNOPX7U5PeCItGZdvS+2HUtt32/QLM+pUX4B7QbsPoW0+pA22FX77GrNrnNOSdRKfHSFZpiDXj+dIAGVo7I5Zg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB4338 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.102.4 at phobos.denx.de X-Virus-Status: Clean This adds a test for the gpio-sysinfo driver. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- Changes in v2: - Reorder includes arch/sandbox/dts/test.dts | 7 ++++ test/dm/Makefile | 1 + test/dm/sysinfo-gpio.c | 69 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 test/dm/sysinfo-gpio.c diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index e95f4631bf..6137061d7a 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -1340,6 +1340,13 @@ compatible = "sandbox,sysinfo-sandbox"; }; + sysinfo-gpio { + compatible = "gpio-sysinfo"; + gpios = <&gpio_a 15>, <&gpio_a 16>, <&gpio_a 17>; + revisions = <19>, <5>; + names = "rev_a", "foo"; + }; + some_regmapped-bus { #address-cells = <0x1>; #size-cells = <0x1>; diff --git a/test/dm/Makefile b/test/dm/Makefile index e70e50f402..2ba81ee76b 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -93,5 +93,6 @@ obj-$(CONFIG_SCMI_FIRMWARE) += scmi.o ifneq ($(CONFIG_PINMUX),) obj-$(CONFIG_PINCONF) += pinmux.o endif +obj-$(CONFIG_SYSINFO_GPIO) += sysinfo-gpio.o endif endif # !SPL diff --git a/test/dm/sysinfo-gpio.c b/test/dm/sysinfo-gpio.c new file mode 100644 index 0000000000..65def9bd67 --- /dev/null +++ b/test/dm/sysinfo-gpio.c @@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021 Sean Anderson + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static int dm_test_sysinfo_gpio(struct unit_test_state *uts) +{ + char buf[64]; + int val; + struct udevice *sysinfo, *gpio; + + ut_assertok(uclass_get_device_by_name(UCLASS_SYSINFO, "sysinfo-gpio", + &sysinfo)); + ut_assertok(uclass_get_device_by_name(UCLASS_GPIO, "base-gpios", &gpio)); + + /* + * Set up pins: pull-up (1), pull-down (0) and floating (2). This should + * result in digits 2 0 1, i.e. 2 * 9 + 1 * 3 = 19 + */ + sandbox_gpio_set_flags(gpio, 15, GPIOD_EXT_PULL_UP); + sandbox_gpio_set_flags(gpio, 16, GPIOD_EXT_PULL_DOWN); + sandbox_gpio_set_flags(gpio, 17, 0); + ut_assertok(sysinfo_detect(sysinfo)); + ut_assertok(sysinfo_get_int(sysinfo, SYSINFO_ID_REVISION, &val)); + ut_asserteq(19, val); + ut_assertok(sysinfo_get_str(sysinfo, SYSINFO_ID_REVISION, sizeof(buf), + buf)); + ut_asserteq_str("rev_a", buf); + + /* + * Set up pins: floating (2), pull-up (1) and pull-down (0). This should + * result in digits 0 1 2, i.e. 1 * 3 + 2 = 5 + */ + sandbox_gpio_set_flags(gpio, 15, 0); + sandbox_gpio_set_flags(gpio, 16, GPIOD_EXT_PULL_UP); + sandbox_gpio_set_flags(gpio, 17, GPIOD_EXT_PULL_DOWN); + ut_assertok(sysinfo_detect(sysinfo)); + ut_assertok(sysinfo_get_int(sysinfo, SYSINFO_ID_REVISION, &val)); + ut_asserteq(5, val); + ut_assertok(sysinfo_get_str(sysinfo, SYSINFO_ID_REVISION, sizeof(buf), + buf)); + ut_asserteq_str("foo", buf); + + /* + * Set up pins: floating (2), pull-up (1) and pull-down (0). This should + * result in digits 1 2 0, i.e. 1 * 9 + 2 * 3 = 15 + */ + sandbox_gpio_set_flags(gpio, 15, GPIOD_EXT_PULL_DOWN); + sandbox_gpio_set_flags(gpio, 16, 0); + sandbox_gpio_set_flags(gpio, 17, GPIOD_EXT_PULL_UP); + ut_assertok(sysinfo_detect(sysinfo)); + ut_assertok(sysinfo_get_int(sysinfo, SYSINFO_ID_REVISION, &val)); + ut_asserteq(15, val); + ut_assertok(sysinfo_get_str(sysinfo, SYSINFO_ID_REVISION, sizeof(buf), + buf)); + ut_asserteq_str("unknown", buf); + + return 0; +} +DM_TEST(dm_test_sysinfo_gpio, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);