Message ID | AM6PR03MB382945DD2BDCA2317BFE6F6DFFE99@AM6PR03MB3829.eurprd03.prod.outlook.com |
---|---|
State | Deferred |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=wapice0.onmicrosoft.com header.i=@wapice0.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-wapice0-onmicrosoft-com header.b=n+0sqA9i; 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 4GZYXR5TqCz9sRR for <incoming@patchwork.ozlabs.org>; Wed, 28 Jul 2021 22:54:47 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F0BD082C95; Wed, 28 Jul 2021 14:54:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=wapice.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=wapice0.onmicrosoft.com header.i=@wapice0.onmicrosoft.com header.b="n+0sqA9i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50AFE8348D; Tue, 27 Jul 2021 15:14:51 +0200 (CEST) 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,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1e::626]) (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 137C68317A for <u-boot@lists.denx.de>; Tue, 27 Jul 2021 15:14:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=wapice.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pauli.oikkonen@wapice.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gR+1c8qONSqPuJJHdBuRJ4ikD+3wxA/iOTUPa1/0AVMM3FKOdJtVu17RrWUo4yoNZ2WmyMxrqe80sv0a9dxpafmZx/4YGWvlHZ4rnBI78nsCfoS40eB+HS/Evu749ORnO29Ao/bbq1f1P3FobLRhIl6ikAoAqFNPyhG0NjmGneTqqSqrJdWAaXUELUKNqyB8pGxF+2KZVSA8UBb7CmE6sUsLJKT+davii5Tv6N5NORxWBfUtMw6oQ2FaUyrk87E8cK47ey/MfNAPOlR65EMZg3iUVydVqYPWTx34SNkP6b5P+jHBN3/f/KIEB3XeedYdOumPGyTn1b+WiH8R/Y0Vvw== 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=expbe8PZJmtBL1GIhFCvl4qkZ/iuzzzfZihr43WZscE=; b=HrCjwN5U5yLZPTyTYQfUpBGHrNRE/NiwxEQUELIE84tWfbeFd131v9b6J0K8YQO6TuK5a9L+p8Y68MtETJguPKXXGH4onPOa1ZWhnlZJF5Q+pm2gC8aQAlvVvOtbXeE7gFV4os41iAIeglHz/8NExeS+JY/xU9C1SAJ47/858OOnoarTK0+Ta9KHblQPxZ+zRRwOXUhtvipNDUOTz6OSHS8kvtFWMaFT8NIGCxzUv6WzGihXwXYi0lRUGxA5XrwaQYbWANtwwSkWFOe7ZnpQ6v9MboWld9ev07mBHhnQ80BYnBzQLRqWeItsI6YGUA3CGevo6dvnyEfh+HHme++64A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wapice.com; dmarc=pass action=none header.from=wapice.com; dkim=pass header.d=wapice.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wapice0.onmicrosoft.com; s=selector2-wapice0-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=expbe8PZJmtBL1GIhFCvl4qkZ/iuzzzfZihr43WZscE=; b=n+0sqA9i3opJnudAQY8MjucEEP7idgzgTljhU2EX0G5XiAhRVOFKSShijLs9tSvM0gzSQAa4vTjttZPT/kiqZAU7kkYzNlctklMKNHztVGs2OAyXyZnD8pNCMVPEvXjequDzi0vJpopGAbFQiETlrJHktdShxl1FtjOAk/cftVQ= Received: from AM6PR03MB3829.eurprd03.prod.outlook.com (2603:10a6:20b:21::16) by AM5PR0301MB2434.eurprd03.prod.outlook.com (2603:10a6:203:12::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.17; Tue, 27 Jul 2021 13:14:45 +0000 Received: from AM6PR03MB3829.eurprd03.prod.outlook.com ([fe80::4dcf:d6a1:b987:7882]) by AM6PR03MB3829.eurprd03.prod.outlook.com ([fe80::4dcf:d6a1:b987:7882%6]) with mapi id 15.20.4352.031; Tue, 27 Jul 2021 13:14:45 +0000 From: Pauli Oikkonen <pauli.oikkonen@wapice.com> To: "u-boot@lists.denx.de" <u-boot@lists.denx.de> CC: "jteki@openedev.com" <jteki@openedev.com> Subject: [PATCH] spi: fix xilinx-spi lockup when fifo-size undefined in dtree Thread-Topic: [PATCH] spi: fix xilinx-spi lockup when fifo-size undefined in dtree Thread-Index: AQHXguke4iGeB0Ts/U2U1EWsyt7GmA== Date: Tue, 27 Jul 2021 13:14:44 +0000 Message-ID: <AM6PR03MB382945DD2BDCA2317BFE6F6DFFE99@AM6PR03MB3829.eurprd03.prod.outlook.com> Accept-Language: fi-FI, en-US Content-Language: fi-FI X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=wapice.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 575cced4-d45d-4a77-4d4e-08d9510080b0 x-ms-traffictypediagnostic: AM5PR0301MB2434: x-microsoft-antispam-prvs: <AM5PR0301MB243472533D5B618B91AF7017FFE99@AM5PR0301MB2434.eurprd03.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:6790; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: gS09ysYrh9sNpUiHrEK1x1d5FsT3MV4sGWFPgNiM47oM3PcP9lL/8DhsFV/vAEfSXLW/TGrWNeWXK7vjTuMeAWtysLaVEgyTfmVxgozRAD6o+TU+9NumNfOfAaVyZAPYV2e+9RBlALI2ljPOBlTVPzI6kMQruq1GOWuoRdcBFMdSPhUbo+Rj0M80g+MgUB4d7Hqj4S/n5adFcE0Xsl3JbsF3dM1XNofcx3iKXvb0i022vxMwH34FKOUt4OHFJG62d4zfsLWblkRh/4ou0laXdMbkaZ5NbDtZZm/VX+bu3BU/SLwazev0vFQ7rBaveTRS+1qliX1gpzKlyxKpr+v3xxh7A12yrM5bYJxTCFYFZPSC5vvKIPdm6iy8fRgyTF5IptqRfThlcgaKcq80qmhTXxm42hgGsSk+dT1hmfTx6h59babDNo9B/9T95reK0h+VzfGCWzJfKASBC1LCiyJxceWSoDfHtn23YbuBiysvvIkW3MD5Kc8+0IILkYHB2D9xhE4W/P5S8k/DcIoZEP7dJWE5zPwLl1ym4+mcUbZX5fxeK6tQ0yCpJWEc2oMhSSFmbrLDvs4OAWKp/MtfGdZ0pmgya3AVwHDwkWRCvkGjU5dAhRuTAwHADUhtlDLE9i8D3NIXE7+WRnZ3D4BCRczy83AudS1dfBvq6SMRDQLsMVrRxE3ri/wbE0RDIrHMaudMCWQL5OgcH6I8p4W04Liv/A== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR03MB3829.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(39830400003)(346002)(136003)(396003)(376002)(366004)(52536014)(9686003)(86362001)(4326008)(55016002)(8676002)(33656002)(6506007)(38100700002)(122000001)(6916009)(44832011)(2906002)(66476007)(66556008)(316002)(66946007)(71200400001)(478600001)(5660300002)(91956017)(64756008)(66446008)(8936002)(7696005)(83380400001)(26005)(76116006)(186003)(38070700004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?zajuY9RJuQ5MvvQNNZ0Wmp9?= =?iso-8859-1?q?Mkxsnw1b/VFMo7Sab/mYlJaPRLiCud6JYrB1Wyc5f+iRjjI+syyRVUXDXk1g?= =?iso-8859-1?q?6RjuWsNDHwlHGLoADo1muHz0mH0ghKQnMOvChFkbKx0J+wxyyQgZZg8Ldad+?= =?iso-8859-1?q?A8HS3MvWq3Oq9WUagmvKFdi10XPUuzsNkBBsE8VK/AnYD5OV7Auax69NowoB?= =?iso-8859-1?q?TC7ca7SJo2LBkp/11suEnY2kUhSzu9NkbhiD7M2ItYg2nDP7IhUk4QVMai0A?= =?iso-8859-1?q?f3/6F4rMOV02Z/dbMujVox+bO3s6H/sNg9ktDjKtHYB+lCqeF4v5zy3Vpod4?= =?iso-8859-1?q?KB6lRjZJXOhKZci0bEMHBcXTHmCQQ7vZxI1yfpfex2vmBC4qJqRTvII7zXGH?= =?iso-8859-1?q?OemeKl4XaggkPZxxI+cM4hVZ7rXyTiW69pzMXs89gftQ0Ex4svn7/XZZQwoB?= =?iso-8859-1?q?b6lG08oFgFdAesMT5hDczcZOzsnXY0JRSphiSzQzoFEjomhaMQWkGLFT8RSw?= =?iso-8859-1?q?twvL7tA3yYNzew3NIpSK+WU9OYpiGzu48bKdHf3H0ZCSZi3+X+3b4nKxywG9?= =?iso-8859-1?q?1MtJPh9KPSmVj+QI/AJlfAca3a2LdqPvmo8orfzvyrjoCoQLgB0zROS0rU4V?= =?iso-8859-1?q?5d/5aMeORoalkIxJjKlDOek2oRbSiZtJ/DPAmTcB7g4QKAEnF9PAX3jQQqH6?= =?iso-8859-1?q?KTNmTGYx/M+rjWiw9bBsxEU1a9LEfSEXyS4PBeHD6JQMbL4fETlWKfO+wM9s?= =?iso-8859-1?q?89m2vq5gri9mOdpvFNd1fJF00qSRO/yNUtV1XgD46ssoX9BeAr4C5xB+Q7fq?= =?iso-8859-1?q?Ul+C+4wJOsYtVbvIqCNUVoZ6RDh/wqUVLy3PCFjDn6bT1Uz1d/ZUpkqdDtog?= =?iso-8859-1?q?ugfIj1fwj0Aft/mOnw2smRg5O99dz3Gg/KZEP1xr1JO1HLXg++Z1lGBwh0Hc?= =?iso-8859-1?q?6h4Qb0ktLjx7fWb5O3kPAPitYSxIrHEQxIWqimrsJXNE+8TRqncOUgpVrDUZ?= =?iso-8859-1?q?4HmLQDjlgnMh63E8BxrT/+GiL4sUB1EeT7WLl6+gypuSDBhLA7QFqUBu6fP3?= =?iso-8859-1?q?HZMEllfP/iCAMQDiviKf6oLif9XVklvvUpkEfiWtu9V79KMOJEP+WlsuXFgi?= =?iso-8859-1?q?JdOdkeEjgq8f7jg5cCR4RR5Luo2Uhi74scg0fJIV+UI0DJA99OXO81JylyBe?= =?iso-8859-1?q?BqIhsm25jn1kXVm08z2oFM8BKUDUJSuFY9j9ohhS6nzXJW4em/Z5vj8K/N5H?= =?iso-8859-1?q?bu34+Zx0Iyt6LX7EhYqtzfrv/giR/BYxdKyDmuCM/H0OoLp2a6yohurwF3+K?= =?iso-8859-1?q?VjC3gG9fgArLVDz1ImRSsCruK+lBRxK3yAvtY1V4=3D?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wapice.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM6PR03MB3829.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 575cced4-d45d-4a77-4d4e-08d9510080b0 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Jul 2021 13:14:44.9713 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: e93ae9a2-b103-404e-aa22-611d62f84bcb X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: N0+YnM33natlzvLg1fl1wMil9KxFNoTuPRJmhLUbv46kToDMiQH+rl8clyJc+NZ0veGIE1OqVLs+d79C7Xn5RA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0301MB2434 X-Mailman-Approved-At: Wed, 28 Jul 2021 14:54:29 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
spi: fix xilinx-spi lockup when fifo-size undefined in dtree
|
expand
|
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index b892cdae9b..da0f8b3bb4 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c @@ -110,12 +110,17 @@ struct xilinx_spi_priv { static int xilinx_spi_probe(struct udevice *bus) { + int success; struct xilinx_spi_priv *priv = dev_get_priv(bus); struct xilinx_spi_regs *regs = priv->regs; priv->regs = (struct xilinx_spi_regs *)dev_read_addr(bus); - priv->fifo_depth = dev_read_u32_default(bus, "fifo-size", 0); + success = dev_read_u32(bus, "fifo-size", &priv->fifo_depth); + if (success != 0) { + debug("%s: no fifo-size defined in dtree, using 1\n", __func__); + priv->fifo_depth = 1; + } writel(SPISSR_RESET_VALUE, ®s->srr);
If fifo_depth is 0, the driver will lock up. If fifo-size is not defined in device tree, the driver would use 0 as a default value. This however will cause an infinite loop and a lockup in any read or write. Use 1 as a default FIFO size instead, no FIFO should be zero-length anyway. Signed-off-by: Pauli Oikkonen <pauli.oikkonen@wapice.com> CC: Jagan Teki <jteki@openedev.com> --- drivers/spi/xilinx_spi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)