From nobody Mon Jul 18 11:53:56 2022 X-Original-To: dev-commits-src-main@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 4LmgNN33Lyz4X8Jj; Mon, 18 Jul 2022 11:53:56 +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 4LmgNN2YBsz3SxM; Mon, 18 Jul 2022 11:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658145236; 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=NJ0mrQr3zukWtlifqZ9kRfHRtDlIplmXRSm9VV7dUo8=; b=LrNubOMIDepC8FdbtM9/nZmY/WNS9OSd1R9END5YjOTCaZFtx+KlTtV67lzhiZ1ugYAY4i CGfoH4ERRve8HbbCeg7aixt5AM9IwcSxZdUJSb3hfZFTV2Hc+2Svyi+nO1RIQDFn9pb5VI JTNllKDjvTXN8HEAoszQfzNp6681dY2eYEKee0t0xIKha9h42dLHAzjTiVXtCqD8fOe4KH bbxulhIz0ZtIBk/Qi8yGUicWB7C3d+1/brVQ2sIQwT33HVQRuXA2tukw5lC0SIIJJeWM1d RRUcToguSyQDAgQ8Mwj/EGxX2PH0Iq0qkRZVwEZSBivPk2+yhhgywB1+zntMng== 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 4LmgNN1Zwdzf1S; Mon, 18 Jul 2022 11:53:56 +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 26IBru1r007741; Mon, 18 Jul 2022 11:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26IBru2b007740; Mon, 18 Jul 2022 11:53:56 GMT (envelope-from git) Date: Mon, 18 Jul 2022 11:53:56 GMT Message-Id: <202207181153.26IBru2b007740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fe88072dc69f - main - arm64, qoriq_therm: fix handling sites on version 1 and 2 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe88072dc69fcd64b42d8512ad214c0fe009ad8e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658145236; 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=NJ0mrQr3zukWtlifqZ9kRfHRtDlIplmXRSm9VV7dUo8=; b=IcKqNCPal66tFpCd0sh1YsDKeXbJ9wmaqPeK9dZqUWJSEzVjRLxADmR4C8JVBvklmNNawI 00degRtqrf+UBshXhkerRO6L6Vl/SFDwKoYZyY7G9WkBrXl2h4vZPM7cELss0cn1FiAd7+ MurhNhUklBm5mqlkEJyrHCAZlI0YdYNmYCKQv9bkbxr1v8VNhJ3mTZgQZojxo4Uu4gJYwL dwvHBKyX0lPfUZDJejgoyS82i7qwidGqsbQt6/Evum/Pbubx7w1F2AkZLGGfiX4dFdkIGu GyQHWyVEuJzM7BeU2EpKZ4kcTUvOWikNerZ4xH/67k5iSusQQBSBo0hWqtyRWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658145236; a=rsa-sha256; cv=none; b=DNgro/K0cgs31gDua/9J3STJkNYmw4oLHKHk7FgUB/QNmbZIPDQ57ON5xDWOnjTZRGyUGd 543DGCwVQ2JINiYmV7EB9cFH94jHXSyLgGbGGX0D6d/hDZqy347kJxJ2rX34dYnLZhys8F GmBl8yuaeX4StNazWCn0qxcUCXdr9NnlgMGtIen6UVV9DkxxeB49RGtRxwNKPNMt0IuB6o NLAC5yGEpYbbYt4bEomlP9JUBEEQMW2jj2dYSkHwRcXYuvr1+kU7VuiDOH8mn5hzlyG5gH lEL/mYuPq496WI1EoBBN/Zq11XtDo/qsEhiE1fyd1zH4j29pT80vW3cdqv2ayw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fe88072dc69fcd64b42d8512ad214c0fe009ad8e commit fe88072dc69fcd64b42d8512ad214c0fe009ad8e Author: Bjoern A. Zeeb AuthorDate: 2022-07-10 13:38:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-07-18 11:51:03 +0000 arm64, qoriq_therm: fix handling sites on version 1 and 2 For version 2 extend the TMUV2_TMSAR() write loop over all site_ids registered for a particular SoC and actually use the site_id rather than always just the first [0] (which for the LX2080 would be a problem given there is no site0). Later, while version 2 adds the SITEs to enable to TMSR in bits 0.., version 1 (e.g., LS1028, LS1046, LS1088) add MSITEs to TMR bits 16..31 or rather 15..0(16-). Adjust the loops to only enable the site_ids listed for the particular SoC for monitoring. This now also deals with sparse site_ids (not starting at 0, or not being contiguous). MFC after: 1 week Sponsored by: Traverse Technologies (providing Ten64 HW for testing) Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D35764 --- sys/arm64/qoriq/qoriq_therm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/arm64/qoriq/qoriq_therm.c b/sys/arm64/qoriq/qoriq_therm.c index f0c1dc1775eb..52c699f3812c 100644 --- a/sys/arm64/qoriq/qoriq_therm.c +++ b/sys/arm64/qoriq/qoriq_therm.c @@ -435,8 +435,8 @@ qoriq_therm_attach(device_t dev) WR4(sc, TMUV2_TMTMIR, 0x0F); /* disable */ /* these registers are not of settings is not in TRM */ WR4(sc, TMUV2_TEUMR(0), 0x51009c00); - for (int i = 0; i < 7; i++) - WR4(sc, TMUV2_TMSAR(0), 0xE); + for (int i = 0; i < sc->ntsensors; i++) + WR4(sc, TMUV2_TMSAR(sc->tsensors[i].site_id), 0xE); } /* prepare calibration tables */ @@ -447,10 +447,14 @@ qoriq_therm_attach(device_t dev) goto fail; } /* start monitoring */ - sites = (1U << sc->ntsensors) - 1; + sites = 0; if (sc->ver == 1) { + for (int i = 0; i < sc->ntsensors; i++) + sites |= 1 << (15 - sc->tsensors[i].site_id); WR4(sc, TMU_TMR, 0x8C000000 | sites); } else { + for (int i = 0; i < sc->ntsensors; i++) + sites |= 1 << sc->tsensors[i].site_id; WR4(sc, TMUV2_TMSR, sites); WR4(sc, TMU_TMR, 0x83000000); }