From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3BD9B415F1D for ; Tue, 21 Jul 2026 18:36:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658977; cv=none; b=heOGrNQuNd7wH2x5aUeyVeziC3PQfxTZb25tbTNl6Vckw+6St3CVgdhd5u/N/ABoRn5qtEX+WtKE45iQFfjb7ilpOjgOoAPSzQpORFl2oO6SPMxDem0tRWgINFk1+GaKmZaXrz3gJkMTaAVHdsepsWAvuWlxZmLO1bkMHjzS7jw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658977; c=relaxed/simple; bh=yNFGMUBx9YRHlEWCkZBDDkljN0K2wX3mrwtGbdUXHPY=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=jigl1RaNX9QAFOHlyLwMJc8LaNNcx1IOY7EamRb9LqpP0koxvmUbv7rBoU/s5Nf0yxR2mXrtMxUtfVmNHDb6m986Vw/mt7q2lOpa69/YARk/w9fetTWE+ErcJRRu8BBSUuTXsdEPgoEuSIWLwBMTqqTUvblQ30cOCIplNampxtE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XWUHi+RX; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=lLORarSN; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XWUHi+RX"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="lLORarSN" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784658975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Go1C81ar5fv4t+FHR7Abtxew7sOcjBDPFGnY7kzk9t0=; b=XWUHi+RXrlbsrt8DVLsoxEMq1yToZQ4yAjMkZu+fzXaoQ2ngvNlDGKYw4mQjfpHRRvOA7N Vt26fz5DfzdYY+7aYXhyyet7Fc1Rd2/7OkxyiNUDxjvDz+GXu0wqENK+TpcZRTgIMGIq5S qhlN+MYuXCGcjQIIu6SZ1XOSCa9tM1I= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-547-dl4cz9WdMU2xyb-4DVvVoQ-1; Tue, 21 Jul 2026 14:36:13 -0400 X-MC-Unique: dl4cz9WdMU2xyb-4DVvVoQ-1 X-Mimecast-MFC-AGG-ID: dl4cz9WdMU2xyb-4DVvVoQ_1784658973 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-92e52306621so128178585a.1 for ; Tue, 21 Jul 2026 11:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1784658973; x=1785263773; darn=vger.kernel.org; h=mime-version:user-agent:content-transfer-encoding:content-type :references:in-reply-to:date:cc:to:from:subject:message-id:from:to :cc:subject:date:message-id:reply-to:content-type; bh=Go1C81ar5fv4t+FHR7Abtxew7sOcjBDPFGnY7kzk9t0=; b=lLORarSNM3c7HcWswxoG6WWxtN6THavcURC1aMBs8fMcB0XUNbqOg//w1UTiJjZGqI DUopJKEIrtQI8JVNwEUvE7UdT7rQzKGt0LyGDjJLg4ZTVbi7Mfe5Pg6MU6bdTRF1dfyo JDA15YFd5PolGbdfjaALksHOV6mhGDMr0t3g4dzVvywG7pUwUz+RStYGLTPd0G/QTLWI r1g44ehUUw6NIha15k2avkuQ1RM6u0GKZRb2fHcME7OrSCDNkXI+C3uFs7TKAPRKf1Hf ODQW/6+uoi+fr3RRLPxvNwx4lNkn8ihzhXQnPb94Qh8pP8V15MyWFYologdd2Yv5st1v 4c5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784658973; x=1785263773; h=mime-version:user-agent:content-transfer-encoding:content-type :references:in-reply-to:date:cc:to:from:subject:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Go1C81ar5fv4t+FHR7Abtxew7sOcjBDPFGnY7kzk9t0=; b=MKGjCtybfY7jtOxbp9CLsJkfPqMEiwORKD/4pnNsFOOj9vlmzPh/tW34fp0xk5FCOv NioTo66bvDFublolu2p73+0TlyVUNCClgMXRjARjCRWZvVFslMZk6ejfIoleGKmCcxFv Dd9I6zZ7iQm10iidvNw+9J5CPwFB055l6/KQa3sHigdEcw2HfOwDw6Af8Hh8GtausoL9 PBvRhAHhmG1mHneajBT24PZ4NVLWeJYkbdFEkHG2JJvGnvbvZaAGGRCQ73LwY/HeeyuN B5wyjpjFTac+NCjQ5TMQxxmen+aPwHRC6+c2hktRrC8dNLo3Y01tebFZbHGimb6kQdPn lnUA== X-Forwarded-Encrypted: i=1; AHgh+Rr+cmkiZtQIlMtds8vgO6QzrHf7L1eDlUAwPo0imN9B1IuA9IycfqtLfpxrOgCpGvNtezyM/pqARCSD3E8=@vger.kernel.org X-Gm-Message-State: AOJu0YxKM2zXEgCNDyIWu0jYET7GjB6SaZn42fZ8o6SK00IKA09NJpfJ Zu0YiI7HPm0gPOJ9xnn9J55EG2gPqg4pbx3b6OvJmpacb74zFVVUzcLusWU3mmOsYE+URBerz0H XigiwsgewW+Wfoa+oLGyjJDKWpJd1doirqU73c4EfYxJbKiLrH69U7dUILNQbJ9+z4ePRUEN7ng == X-Gm-Gg: AfdE7cmLYWiXDK1LbCtLtf2jo+J/EEK24AZakVdykR55eGbAqRv7I5idwdSL+i7iXdj Ma4b7wmOi5Gh7f0+joqR+HS6Hxx0kXol+8hX9G2TR9cmyXioE8ukcwm43ij2gHzUJv26Vh3wdB/ HOPUlAPqv/o9hsHSjyRMujZ7sOGLwrKWJiomFlw0TtGdAF9fefKFJD00gwMBsmvc14rGWwv4qa0 m/tJtR93ok4UWTRgrZEge53oRZOHVIU9sRHZuGro9kMHi0njM9R++VPpJvPagQnZX6BwL3YPHJ7 dXzHFRw8kDQcYknQzauVolYwJPTHepyaxP2yP/WAFlR8j0zRDrNWQqzzgpOD/7XxXP7YBpiM X-Received: by 2002:a05:620a:2905:b0:92e:8734:b833 with SMTP id af79cd13be357-930b416d543mr1930903185a.59.1784658972803; Tue, 21 Jul 2026 11:36:12 -0700 (PDT) X-Received: by 2002:a05:620a:2905:b0:92e:8734:b833 with SMTP id af79cd13be357-930b416d543mr1930899885a.59.1784658972324; Tue, 21 Jul 2026 11:36:12 -0700 (PDT) Received: from [192.168.8.4] ([100.0.180.93]) by smtp.gmail.com with ESMTPSA id af79cd13be357-930b52faa8fsm1188355885a.12.2026.07.21.11.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 11:36:11 -0700 (PDT) Message-ID: <78ca5c308ce81465956e839c82e1bba46a9f0686.camel@redhat.com> Subject: Re: [PATCH 3/6] drm/nouveau: add GSP hwmon support From: lyude@redhat.com To: Mohamed Ahmed , linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Mary Guillemard , Milos Tijanic , nouveau@lists.freedesktop.org Date: Tue, 21 Jul 2026 14:36:11 -0400 In-Reply-To: <20260714211429.238355-4-mohamedahmedegypt2001@gmail.com> References: <20260714211429.238355-1-mohamedahmedegypt2001@gmail.com> <20260714211429.238355-4-mohamedahmedegypt2001@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.58.3 (3.58.3-1.fc43) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Wed, 2026-07-15 at 01:14 +0400, Mohamed Ahmed wrote: > +static int > +nouveau_power_read(struct device *dev, u32 attr, int channel, long > *val) > +{ > + struct drm_device *drm_dev =3D dev_get_drvdata(dev); > + struct nouveau_drm *drm =3D nouveau_drm(drm_dev); > + struct nvkm_iccsense *iccsense =3D nvxx_iccsense(drm); > + struct nvkm_device *device =3D drm->nvkm; > + struct nvkm_gsp *gsp =3D device->gsp; > + > + if (nvkm_gsp_rusd(gsp)) > + return nouveau_rusd_power_read(drm_dev, gsp, attr, > channel, val); IMO - let's add braces to this conditional > + else { > + if (!iccsense) > + return -EOPNOTSUPP; > + > + switch (attr) { > + case hwmon_power_input: > + if (drm_dev->switch_power_state !=3D > DRM_SWITCH_POWER_ON) > + return -EINVAL; > + *val =3D nvkm_iccsense_read_all(iccsense); > + break; > + case hwmon_power_max: > + *val =3D iccsense->power_w_max; > + break; > + case hwmon_power_crit: > + *val =3D iccsense->power_w_crit; > + break; > + default: > + return -EOPNOTSUPP; > + } > + > + return 0; > + } > +} > + ... > =C2=A0static int > =C2=A0nouveau_temp_write(struct device *dev, u32 attr, int channel, long > val) > =C2=A0{ > @@ -667,13 +854,39 @@ nouveau_hwmon_init(struct drm_device *dev) > =C2=A0 struct nvkm_iccsense *iccsense =3D nvxx_iccsense(drm); > =C2=A0 struct nvkm_therm *therm =3D nvxx_therm(drm); > =C2=A0 struct nvkm_volt *volt =3D nvxx_volt(drm); > + struct nvkm_device *device =3D drm->nvkm; > + struct nvkm_gsp *gsp =3D device->gsp; > =C2=A0 const struct attribute_group *special_groups[N_ATTR_GROUPS]; > =C2=A0 struct nouveau_hwmon *hwmon; > =C2=A0 struct device *hwmon_dev; > + bool rusd_active =3D false; > =C2=A0 int ret =3D 0; > =C2=A0 int i =3D 0; > =C2=A0 > - if (!iccsense && !therm && !volt) { > + if (nvkm_gsp_rusd(gsp)) { > + /* Per-channel visibility is latched below from live > RUSD > + * section validity, so wait for GSP-RM's first poll > of both > + * requested groups (thermal, power). It is normally > completed > + * long before we get here and this is a last > resort. > + */ > + unsigned long timeout =3D jiffies + > + msecs_to_jiffies(2 * gsp->rusd.poll_ms); > + bool thermal, power; > + > + for (;;) { > + thermal =3D nouveau_rusd_ok(gsp, > NVKM_GSP_RUSD_TEMP_GPU); > + power =3D nouveau_rusd_ok(gsp, > NVKM_GSP_RUSD_POWER_GPU) || > + nouveau_rusd_ok(gsp, > NVKM_GSP_RUSD_POWER_GPU_AVG) || > + nouveau_rusd_ok(gsp, > NVKM_GSP_RUSD_POWER_CAP); > + if ((thermal && power) || > !time_before(jiffies, timeout)) > + break; > + msleep(20); > + } Is it possible to use nvif_msec() here? > + > + rusd_active =3D thermal || power; > + } > + > + if (!iccsense && !therm && !volt && !rusd_active) { > =C2=A0 NV_DEBUG(drm, "Skipping hwmon registration\n"); > =C2=A0 return 0; > =C2=A0 }