From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.2 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,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 7327EC433EF for ; Sun, 19 Sep 2021 23:08:14 +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 9D0BC610A3 for ; Sun, 19 Sep 2021 23:08:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9D0BC610A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F97F81BC8; Mon, 20 Sep 2021 01:08:10 +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="ACLo3Wph"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5E74883223; Mon, 20 Sep 2021 01:08:07 +0200 (CEST) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 0F3408048A for ; Mon, 20 Sep 2021 01:08:02 +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=seanga2@gmail.com Received: by mail-qt1-x834.google.com with SMTP id e16so3058783qte.13 for ; Sun, 19 Sep 2021 16:08:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=UcKPwB90HuJYsfRGMXqy9lnApj0pKOPboQ1AcBA9uzI=; b=ACLo3WphGD/r1B9aRxK/42OPKAvFjmoqU1dAQCG/JrZtz6yMoptRStwbD/ePRGWkMb EOPJ2Y05pJ1nlA5bA+y0JdjLptDbTp4SW19yKEOr5wMvneRv0B3rth1S23K2cBokBX9L xXyFXHMpQkvXjJTsQfy2vdr8gOffC8l7aRo4iME05DvKr38A6qnHrLkKe3KhWg/qaEec CDvaE7tTwj972PPVYXVnwkTbUWucumRQqpvMCoWRAm4bhBblmoK00DK39rS4iGevvq4l TioB8ZLYNvAXWh2ao3iNLKKlh6yPVg49ZkAM4pDoAZQoOc0IZMhWlmiEThjcZqN3ZyvP z0iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=UcKPwB90HuJYsfRGMXqy9lnApj0pKOPboQ1AcBA9uzI=; b=w3HA584hNicef2MoDJRia9ivcx8BWtXJpiktPhk8/JQVWY/CIryU/82w9bqqxkgoo0 U32B37gpzxv8cp6RO5DbVSJ3w3gVTucTJSra2MjQ15LxuesV1ux4UZHuK3i97zMymvLc gJU+bTmtZBO3/gaDyyfYeuDX4BRoxXBNCtp7G5z+fjEpszLJLFoD3LLg15dcYieOFVsv 3ukjTv5liFL8TyEWprtHJIAOy64oe/hfpsjk+DgASB8aKhGDVqR30tOllza68Prdbci8 OeLtsKNZSeC5jfNShPqqz2GHw5NFaTKP7tqrLzFFa3gUKhPoAUZmewT9vHcXP2iiYtHr JdbQ== X-Gm-Message-State: AOAM5333rekDIU8Jf4eFD64HHhvdAGlosh1fvI2cvEivjXThps+b8e3+ VaqncIOWwRNOiC3p02gG884= X-Google-Smtp-Source: ABdhPJzCR/T8AxwLZY7rKZj8bsOD1WRdwxNgajGoS4dJiJFXlZaE6h+44e+Zf+q0P98g/YHGdvoOOA== X-Received: by 2002:ac8:404b:: with SMTP id j11mr12537095qtl.140.1632092880571; Sun, 19 Sep 2021 16:08:00 -0700 (PDT) Received: from [192.168.1.201] (pool-108-45-127-224.washdc.fios.verizon.net. [108.45.127.224]) by smtp.googlemail.com with ESMTPSA id m24sm252212qki.40.2021.09.19.16.07.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 19 Sep 2021 16:08:00 -0700 (PDT) Subject: Re: [PATCH] wdt: dw: Fix passing NULL pointer to reset functions To: Simon Glass , u-boot@lists.denx.de Cc: Stefan Roese , Leo Liang , Meng Li , Tom Rini References: <20210911191130.931814-1-seanga2@gmail.com> From: Sean Anderson Message-ID: Date: Sun, 19 Sep 2021 19:07:59 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20210911191130.931814-1-seanga2@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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 Is it possible to get this in 2020.10? Meng's patch breaks boards which use this watchdog. --Sean On 9/11/21 3:11 PM, Sean Anderson wrote: > reset_*_bulk expects a real pointer. > > Fixes: 4f7abafe1c ("driver: watchdog: reset watchdog in designware_wdt_stop() function") > Signed-off-by: Sean Anderson > --- > > drivers/watchdog/designware_wdt.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/watchdog/designware_wdt.c b/drivers/watchdog/designware_wdt.c > index afed81e6c6..cfec29bd15 100644 > --- a/drivers/watchdog/designware_wdt.c > +++ b/drivers/watchdog/designware_wdt.c > @@ -22,7 +22,7 @@ > struct designware_wdt_priv { > void __iomem *base; > unsigned int clk_khz; > - struct reset_ctl_bulk *resets; > + struct reset_ctl_bulk resets; > }; > > /* > @@ -99,11 +99,11 @@ static int designware_wdt_stop(struct udevice *dev) > if (CONFIG_IS_ENABLED(DM_RESET)) { > int ret; > > - ret = reset_assert_bulk(priv->resets); > + ret = reset_assert_bulk(&priv->resets); > if (ret) > return ret; > > - ret = reset_deassert_bulk(priv->resets); > + ret = reset_deassert_bulk(&priv->resets); > if (ret) > return ret; > } > @@ -156,11 +156,11 @@ static int designware_wdt_probe(struct udevice *dev) > #endif > > if (CONFIG_IS_ENABLED(DM_RESET)) { > - ret = reset_get_bulk(dev, priv->resets); > + ret = reset_get_bulk(dev, &priv->resets); > if (ret) > goto err; > > - ret = reset_deassert_bulk(priv->resets); > + ret = reset_deassert_bulk(&priv->resets); > if (ret) > goto err; > } >