From nobody Wed Jul 27 00:14:02 2022 X-Original-To: dev-commits-src-all@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 4LsvQg2WHMz4XghK; Wed, 27 Jul 2022 00:14:03 +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 4LsvQg1dr8z3jX1; Wed, 27 Jul 2022 00:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658880843; 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=hVtH16a2eavI0VoboTQ+oHiFqL0u/5/uVnbaqWI2v/U=; b=IfbdUrCHI+ttb1oNFnSvEtB1UVFkWnz+FiHX0VXBWvtXw2ZNTrlLRnx0Nirdp/XoGWPtnN cX+0ggPiwtZ+jkRDYzFSk6vzPPj00NtDd0i6E733WN99P71/WkLPUYO3X5GgESaR80MTcC XsoYFYaZybj8qIRk0bGGhjsVRm/KNgBTy0ox5kl/jaEXTsQ9LYcWTduLu3TX+BbwOceaVX oPW43+2ug9/gr7TvRum8Lgciz0hxIlESY4eWvMpbZP9k16YFCM/HSzlhvt/YjaSw+MCePP H9FcxG3tuKGQpmm8xUTuifM8QN2vnmR+MbcE6dAPN+OLl4hB1F++rWBBlOyHQw== 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 4LsvQg0DdYzx8x; Wed, 27 Jul 2022 00:14:03 +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 26R0E2Wx015312; Wed, 27 Jul 2022 00:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26R0E240015311; Wed, 27 Jul 2022 00:14:02 GMT (envelope-from git) Date: Wed, 27 Jul 2022 00:14:02 GMT Message-Id: <202207270014.26R0E240015311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0aa629f69dbe - stable/13 - arm64, qoriq_therm: fix handling sites on version 1 and 2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0aa629f69dbe9b78aac2c008fdb0e8201b782154 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658880843; 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=hVtH16a2eavI0VoboTQ+oHiFqL0u/5/uVnbaqWI2v/U=; b=Yg8kfyAPQA4yOqPZ0XHNrqn3dobZMlhjW47WaMN2w6vF1rFvHmENdsL0OEhjj3VdROw4PG r6SiYHu4morAKxPkEV+cvmWq+7FFfBDyGWFvyeNJ82FIcEuRd7wjmMATMMRsxxQJpqzdcS j/WV1Cg5AT7q4KeKPyzT2K9OdleP0x8wDv/v1sfcUM7t2jxjUQ7B5m2liqzcbi7z9MR2ZL MuSqrVz9OTikeNOTi+VxFqV1cgJrmdRDoGU2DhhBG50MVyv6TZNIk54EKZhTIe/xgoI1Wh aVi3f/e+5Y1+cSFMOci67U893c/20V5raiJt+nkESCyX1bItbN38kAIavRH/Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658880843; a=rsa-sha256; cv=none; b=iHuE3xVdHH7HODoGsq5OQU8mYAW8ejxdtINJLweAflr/+0wUf/FkjDe+NQ86gWGDvMbwb0 aWOiLWDcASoFKkLv2FVdwdTDTYclKE9oHI7Qb01vWDoX2vSAVnewB0APT3/Omx27c2BdgZ cOK4FX1txPd9E4iKL2FFVCc/SI1fL0KpRdbbh+NKBlea2Qq9DY5KT+IjZThpZdI7wgpQ+F Q4xLb/lhcQ8csFXbAxF+kQJ5zImVetKWqdVl2ooAHvgYgZFIfiErZuSsJLJkChtA08IWRZ 6TdtruoXPsFAeGOKgEvPTmpSViZ0Qmcb612HTbG+rEon8DEAzTGPc4F1bZ4eiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0aa629f69dbe9b78aac2c008fdb0e8201b782154 commit 0aa629f69dbe9b78aac2c008fdb0e8201b782154 Author: Bjoern A. Zeeb AuthorDate: 2022-07-10 13:38:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-07-26 22:41:47 +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). Sponsored by: Traverse Technologies (providing Ten64 HW for testing) Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D35764 (cherry picked from commit fe88072dc69fcd64b42d8512ad214c0fe009ad8e) --- 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 1374a6d96558..c5a79fa3287b 100644 --- a/sys/arm64/qoriq/qoriq_therm.c +++ b/sys/arm64/qoriq/qoriq_therm.c @@ -434,8 +434,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 */ @@ -446,10 +446,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); }