From nobody Mon Dec 27 11:38:14 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 645991917C4C; Mon, 27 Dec 2021 11:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JMwdy66W0z3hNV; Mon, 27 Dec 2021 11:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B22001D2E6; Mon, 27 Dec 2021 11:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BRBcERx024226; Mon, 27 Dec 2021 11:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BRBcERi024225; Mon, 27 Dec 2021 11:38:14 GMT (envelope-from git) Date: Mon, 27 Dec 2021 11:38:14 GMT Message-Id: <202112271138.1BRBcERi024225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: bf206683a865 - stable/13 - amdsbwd: always enable watchdog register decoding List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf206683a865c381f8f6f70bd8a0c0cf840ea940 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640605094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lIlAdGyNu11cVa2ztIMPNMBFfFHaZ7atjKLKuo1qDuw=; b=TJvfgp488WskDT5EB+vf3EFx2Xt1kk/JZsxYpTdROi/ZZe4Yack8etnqIATCtvN/WuwTHE jYOMsAIUFgXL2uViJ9jTp6simkWku3N/YLnbt3d31LdRiCGDUaKsg7zF9+qSxktbtEsbNj tdVxT3+SFZxsfZb7hAb4PHuWa6B5QOjNcajfsCvwYn6TspoB4XKB06g8r4ZhdZheaNT6Zs QqqFCWKS/MtaQbryxaABGk3uqkdQ6PJkfHc/Blg1mUn064CiRxzTMSGoS/LOaGic5kZ5rv Lts/lPDlM1ZF4HtYq4v/+AEBzPFRtTo59lW4+UCT8b9LJqSk8Sb132CHCLe+dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640605094; a=rsa-sha256; cv=none; b=KpOXYz+GtzlGRMJKhZqS63xiXW8C5fzjgZlIv159PkmWvD0i1fUVlzzeaDuUNDCqGSO0Q0 4YuZpqFyGMcIbzzWgsrOxHzV+8Rn5k4xIEbir7U8B7MYU0Yc4zBevVlIgYBb1L2uLhWZdk n5+v05brG0dJjQ4STAVSUJ5F9DE/SM4e2c8sPpEtt51B3R5FFH6r1Qjc/MM56pqmeD5Vlj BqyGlzFLT/ekns/rPLNM0gAAnZgrTxpq5Kxt4MZqfJf2f6S1iR8/ISZJnvn6t5hq2LJ2qK uiS5T6LAxw8ENT0DyUT86ZdV797azmzBlF3tpH0dMRSdm6i23X5ZHk6DwaftRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=bf206683a865c381f8f6f70bd8a0c0cf840ea940 commit bf206683a865c381f8f6f70bd8a0c0cf840ea940 Author: Andriy Gapon AuthorDate: 2020-05-27 10:15:54 +0000 Commit: Andriy Gapon CommitDate: 2021-12-27 11:37:29 +0000 amdsbwd: always enable watchdog register decoding This seems to be required even if the watchdog is accessed via the common MMIO space. Tested on: - Ryzen 3 3200U APU; - Ryzen 7 5800X CPU with X570 chipset. (cherry picked from commit cca0d3bbd8c9f8b50c6940c33704a6c8c464b68f) --- sys/dev/amdsbwd/amdsbwd.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/sys/dev/amdsbwd/amdsbwd.c b/sys/dev/amdsbwd/amdsbwd.c index 452b014d2240..a7ab67f1a8b8 100644 --- a/sys/dev/amdsbwd/amdsbwd.c +++ b/sys/dev/amdsbwd/amdsbwd.c @@ -381,24 +381,23 @@ amdsbwd_probe_fch41(device_t dev, struct resource *pmres, uint32_t *addr) uint8_t val; char buf[36]; + /* + * Enable decoding of watchdog MMIO address. + */ + val = pmio_read(pmres, AMDFCH41_PM_DECODE_EN0); + val |= AMDFCH41_WDT_EN; + pmio_write(pmres, AMDFCH41_PM_DECODE_EN0, val); +#ifdef AMDSBWD_DEBUG + val = pmio_read(pmres, AMDFCH41_PM_DECODE_EN0); + device_printf(dev, "AMDFCH41_PM_DECODE_EN0 value = %#04x\n", val); +#endif + val = pmio_read(pmres, AMDFCH41_PM_ISA_CTRL); if ((val & AMDFCH41_MMIO_EN) != 0) { /* Fixed offset for the watchdog within ACPI MMIO range. */ amdsbwd_verbose_printf(dev, "ACPI MMIO range is enabled\n"); *addr = AMDFCH41_MMIO_ADDR + AMDFCH41_MMIO_WDT_OFF; } else { - /* - * Enable decoding of watchdog MMIO address. - */ - val = pmio_read(pmres, AMDFCH41_PM_DECODE_EN0); - val |= AMDFCH41_WDT_EN; - pmio_write(pmres, AMDFCH41_PM_DECODE_EN0, val); -#ifdef AMDSBWD_DEBUG - val = pmio_read(pmres, AMDFCH41_PM_DECODE_EN0); - device_printf(dev, "AMDFCH41_PM_DECODE_EN0 value = %#04x\n", - val); -#endif - /* Special fixed MMIO range for the watchdog. */ *addr = AMDFCH41_WDT_FIXED_ADDR; }