From patchwork Sat Nov 28 08:11:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407471 X-Patchwork-Delegate: lokeshvutla@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; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=WT/IUk6V; 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CjklX0tmNz9s1l for ; Sat, 28 Nov 2020 19:13:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E887826E2; Sat, 28 Nov 2020 09:13:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.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=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="WT/IUk6V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 167C9826EE; Sat, 28 Nov 2020 09:13:05 +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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::609]) (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 7C4F4826C7 for ; Sat, 28 Nov 2020 09:12:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kTObBbPFoMgOL66fIl7QfBLsomOZo7tEhXW9KRUll13vafvMeUgEP64ba5tqK60lOV15E1AefpM/+0XQCTSqc4R7ZU6AqvQp3b6vbO3w1jiQaoSzlRvmXStcpk+pH6Q6Uaou71ZU5j/L6/EwWPMr+54nB9fygVdgmV3nLi0jq65B3hMaXDh3uiJw+7MffbvXHiPvjuU7rSc6Y+nlS7eXoMNhz22d9w4b6CJeyjqpYT//pUg2OBQUR4N+b6zbSSaCO/SszAPYmBhwEIzaMVcJcPY7Nx+V09brrj0a92b7Xq63QiGG74QOzAF9h5D70kq7cv/Ui//Sg4s9ZdyoQOG1ig== 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=/l9vk0XcAm95r/lALa/1HStNpmBPDR/ODtu9UUqPzRI=; b=I1Uwhfl5gyF4gmHTkVQvpj1C0XM8uZhwKOScciqIvoNKaBiozqZta0FHYKo31Wm/juNzmvzccL4d9lB/I2S7WxoDbvJKK4lQc23pmIcz0UaXMAax9vdz2g814lYHoiuDBdjizYTneUl+kBq5jod73bbjA/FSDiwfRntnA/AHN22VUIQKbbrbxCaepodsLhjtkP3NyTP6KbaOuQIoTBj1brnApivnryM/4YeNJuO3VcL4xXFxYvO055c/GONxfssUXgzKNaPNeq5yBEMASloYGLXummlwZ6H2uZY1HUuXLEc/LAuuv5Ol0/oXhfyY1XQx1snymxjtSb2XAcfgpsz/Lw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/l9vk0XcAm95r/lALa/1HStNpmBPDR/ODtu9UUqPzRI=; b=WT/IUk6V79MMGyWHQZhfuIWsjoDyAugaSFrO1J+h0h4T7VkJhmaNzml4FcVv+ULzidsfXZYwFBIg5HGN6llsplugUfjhOwLYrb3qxtgDK5NxQI98DHhKdhohGO4sV/p6NDpHkEWv69mhpwig8h6U/8ECyTtnIsfjTYmErtmIFrU= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4663.namprd11.prod.outlook.com (2603:10b6:208:26f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20; Sat, 28 Nov 2020 08:12:55 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:12:55 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: Ovidiu Panait , Jagan Teki Subject: [PATCH] spi: ti_qspi: Fix "spi-max-frequency" error path in ti_qspi_ofdata_to_platdata Date: Sat, 28 Nov 2020 10:11:28 +0200 Message-Id: <20201128081128.9669-1-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P194CA0020.EURP194.PROD.OUTLOOK.COM (2603:10a6:800:be::30) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1P194CA0020.EURP194.PROD.OUTLOOK.COM (2603:10a6:800:be::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:12:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c64ed583-c761-425d-f00d-08d89375687c X-MS-TrafficTypeDiagnostic: MN2PR11MB4663: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1284; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EagogxGX5sB9X9FIzXH/V9DJ72103XT+ToDxF/kRzWyeRCiCS/JdQDcYNbo10gG0bvnQzLytIJMCsmBAxUPWMNEikQ0t+pbHJhTAF8pxM/H1GwFW1lNnD9pE64m4KKdhrRaMzj7W5QwC46vqzlSoDz6vAOq52IOWlH799ysc9DBB99YHCozEY7ACcpa6zqknnItNU8k2HdlxNVmy0pu6Xfw8f9W9LaaBzby/vQUqhlSk89SzY+ASa+WTgJN9NlWzhg4gtOr2fSSQm28wSOGmenILPOIDKMcMQ6Nz71vzrPh73yFATaQqJFC/WPsotSPtKUXYhHz8SfnvlXsB/k/4AA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(366004)(346002)(136003)(396003)(39840400004)(83380400001)(5660300002)(2906002)(4326008)(8676002)(2616005)(44832011)(8936002)(478600001)(316002)(54906003)(956004)(6506007)(186003)(16526019)(6666004)(6486002)(26005)(66556008)(66476007)(1076003)(6916009)(36756003)(66946007)(52116002)(86362001)(6512007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rXb5ntqzGZSLDQAtsxJ1AUljS3pfy2TBWNYjRuY5imswc5Yh1cG+IGZx/ZIpkwQDsL7MFg1jdsD7xWhnLWznOj/1o1i1l6LXsQuPtV5fTQmpMD8vTk725BYo0gwmZecfjzbTfVsvdQ18phG3EvCHYH2DGGjOUIEddl7MKlGiQJB22hPP8BLx2yvaGX7N29fi5V9rkCkPtSJX/JqO5g6G3ibdRxbKxBT7oWU+id1ZwnQqU6ZKtoBXTyTHLyy7FTUp+63QsegszNsa1zrWsoD15e9epnF+iCXtskSV+q7PAC7fNd6pvOInTRw8BLYmf0PfMxFdq2135Y+q0hYY1vtiUQ8r8bwhaDV3u0F1ku8uD+hcw4HQuOJWi8NV55KZ6XpIS3OUXZg0ooxC5PQjwjiuB1VPFSmHbnh11jeneHjBOEuyxdIi1x7jOUxlJglFjthcM2/IHYzkQOYw/Tdb47OY/osGjYKxWVpsxTjQaUy+R6uPFxP/LUoHMInHGJhFREPPqrUovkQkCxWmRhFy0vViiq/mE7PuaCzjgQHHPdjBKLJ8f22XE/p9KuDMeM5dSQNpqLimWSPCyNbyAUaHrIY86p29qCu0MOY4HLLsZ/LUowRjtxQU1bWOZS3M8gs/bYmaP9okk276W+tgZ4Ztatukv5V24hnkVLlblLKhFjc1Jzv+UyMGKB+MeCpGdFTT+zYFBJHSK82GgD7XF60s92tYn3jVGbJZPFPIQN4d6U1/M0zvRpkCVziP+dn8nDXdA40ZY3jtAwMgJzIhqChm9ZB5j8JLvmoNX1wScQG8Oio6y0c2JHApsBzpyPNVuJskyitiouIIEdL+w4p+ljLuHcmwagDq8j6XKxvwQ5BuLEWe5yBRoGtHleHgRrKo0rvoe72sZ+mQR1DHP3wu6fjlqyKbX4pG2did8dyLXRCciLoMqhzDXCyoY/RxwtSAeo/m07a3JiAlddQqjHp5GbXQejq2utU2I4Y5tCI5936SM6/Im4s= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: c64ed583-c761-425d-f00d-08d89375687c X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:12:54.9568 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RJOYRR5lHgOuCBaUAcg8uqvvnLj5KboJU3hWXaKFA2pyK061eIem1j2CCJ4bohblZ0fqEuotpQTEFVucwp07c2GMqtToAM0QAmb6uv/VSys= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4663 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.3 at phobos.denx.de X-Virus-Status: Clean struct ti_qspi_priv->max_hz is declared as unsigned int, so the following error path check will always be false, even when "spi-max-frequency" property is invalid/missing: priv->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", -1); if (priv->max_hz < 0) { ... } Replace the fdtdec call with dev_read_u32_default() and use 0 as the default value. Error out if max_hz is zero. Signed-off-by: Ovidiu Panait --- drivers/spi/ti_qspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/ti_qspi.c b/drivers/spi/ti_qspi.c index 5fdbb49442..91be18e0a7 100644 --- a/drivers/spi/ti_qspi.c +++ b/drivers/spi/ti_qspi.c @@ -467,8 +467,8 @@ static int ti_qspi_ofdata_to_platdata(struct udevice *bus) priv->memory_map = map_physmem(mmap_addr, mmap_size, MAP_NOCACHE); priv->mmap_size = mmap_size; - priv->max_hz = fdtdec_get_int(blob, node, "spi-max-frequency", -1); - if (priv->max_hz < 0) { + priv->max_hz = dev_read_u32_default(bus, "spi-max-frequency", 0); + if (!priv->max_hz) { debug("Error: Max frequency missing\n"); return -ENODEV; }