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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 4C48FC7EE24 for ; Sat, 3 Jun 2023 18:04:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5D8B9859BF; Sat, 3 Jun 2023 20:03:58 +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="OMew8hCs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 192FC859C4; Sat, 3 Jun 2023 20:03:56 +0200 (CEST) Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) (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 96EE185746 for ; Sat, 3 Jun 2023 20:03:53 +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=cfsworks@gmail.com Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-774924b7c4dso109171339f.1 for ; Sat, 03 Jun 2023 11:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685815432; x=1688407432; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=vgfEfPpKx0C6arpaMUb3sNGlKq+RKoK1VHKGq4OxvEE=; b=OMew8hCswkxPl0eOBiW96QPdIgiYyBM+pgiztBuMt/sGAhoZf88Ex9+p+AV81VR3bB HYcrFJoMrg6io/xXcgxDHQvZIOI3Z0YJV2ORYMealhEJk9Tiky28H/ANMjxcKtzrVrnT LIZWeKzogQBRZ/Oy1gpjfok2tq+JH7D02t0NgsozbatGPSuDJnxnE6ieCeNYhLYgrcuM J9p9eNb4vqM19NZ7sYB1jh9tvrdoaBXzmLDtQ2H4+Y0k7wMIKyOLnTX4j3HuX9fnCCU5 J9eBQbtBgEpOazRY+4D8FsKOZenwKOAyiv+cPkDGeV+dRTt6pu/P6MpGBt/9iSZhnZkP HPHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685815432; x=1688407432; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vgfEfPpKx0C6arpaMUb3sNGlKq+RKoK1VHKGq4OxvEE=; b=cTTMFXxZoDYvNbQO+Hx8/Mft6+an1Qbd7CGv2qPdU87KAYj1y3MggI7Rc/Y54A3LOl E3++UXE2AoZPnY1l2FvZA4ymLnpdDnTunFmib1TCNV4TAIZzKaoleFscR1Siho21fR5I wmagq3FyUewmcOPykdf97XK85CQWixUKMCnk4SIkth4sOIP3A57Turvq3VZEXBkGjE2A lxsFuKfsUlj4CCjkCaU+0Jk83ccAL3K4piK20SbFmKrokw3isHWldBK6e/gX+C6zeURU 9soRiy7QULcToqAkAAi0vXWmF2wqpSzv+kudNJDyJLkunpMZKPO/aM6aAjqwji+6lc/Z +81Q== X-Gm-Message-State: AC+VfDyWvBWnP1997jzKW3kuitW78/ZddEI+FMB/TaRtnul2qIFEw143 XaqDqRrgjq730YcHkiXChXPdgpVK5d4A+4Nd X-Google-Smtp-Source: ACHHUZ5eaiHcwNuypumbULGbjsxY1XSNINjRIneCLvjORPbWshNOZ4qdWZvKm+jPfe9F6uCEyT4faw== X-Received: by 2002:a6b:6b07:0:b0:777:a8f0:1fc5 with SMTP id g7-20020a6b6b07000000b00777a8f01fc5mr587041ioc.5.1685815431952; Sat, 03 Jun 2023 11:03:51 -0700 (PDT) Received: from ?IPV6:2001:470:42c4:101:7b8e:d4b:2487:20d7? ([2001:470:42c4:101:7b8e:d4b:2487:20d7]) by smtp.gmail.com with ESMTPSA id dj6-20020a0566384b8600b004165289bf0csm1055021jab.168.2023.06.03.11.03.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 03 Jun 2023 11:03:51 -0700 (PDT) Message-ID: Date: Sat, 3 Jun 2023 12:03:50 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: [RFC PATCH 08/17] sunxi: introduce NCAT2 generation model Content-Language: en-US To: u-boot@lists.denx.de, Andre Przywara References: <20221206004549.29015-1-andre.przywara@arm.com> <20221206004549.29015-9-andre.przywara@arm.com> From: Sam Edwards In-Reply-To: <20221206004549.29015-9-andre.przywara@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean Hi again Andre, On 12/5/22 17:45, Andre Przywara wrote: > diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c > index b6ffbff883c..3763ec3d2e4 100644 > --- a/arch/arm/mach-sunxi/board.c > +++ b/arch/arm/mach-sunxi/board.c > @@ -177,7 +177,7 @@ static int gpio_init(void) > #error Unsupported console port number. Please fix pin mux settings in board.c > #endif > > -#ifdef CONFIG_SUN50I_GEN_H6 > +#if defined(CONFIG_SUN50I_GEN_H6) || defined(CONFIG_SUNXI_GEN_NCAT2) > /* Update PIO power bias configuration by copy hardware detected value */ > val = readl(SUNXI_PIO_BASE + SUN50I_H6_GPIO_POW_MOD_VAL); > writel(val, SUNXI_PIO_BASE + SUN50I_H6_GPIO_POW_MOD_SEL); > @@ -475,7 +475,7 @@ void reset_cpu(void) > /* sun5i sometimes gets stuck without this */ > writel(WDT_MODE_RESET_EN | WDT_MODE_EN, &wdog->mode); > } > -#elif defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_SUN50I_GEN_H6) > +#elif defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_SUN50I_GEN_H6) || defined(CONFIG_SUNXI_GEN_NCAT2) > #if defined(CONFIG_MACH_SUN50I_H6) > /* WDOG is broken for some H6 rev. use the R_WDOG instead */ > static const struct sunxi_wdog *wdog = It appears that the R528/T113s updated the watchdog slightly from H6 in that it now requires a key (0x16AA << 16) OR'd in all writes to WDOG_SOFT_RST_REG, WDOG_CFG_REG, and WDOG_MODE_REG, or it will ignore those writes. This reset code busywaits indefinitely unless I add that key. It looks like sunxi_wdt.c needs to be updated as well, but I don't know if that's in-scope for this patchset. Cheers, Sam