Patch "hwmon: (occ) Fix P10 VRM temp sensors" has been added to the 5.14-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    hwmon: (occ) Fix P10 VRM temp sensors

to the 5.14-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     hwmon-occ-fix-p10-vrm-temp-sensors.patch
and it can be found in the queue-5.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 77aad0c4b35f1f8fa15cd2583254889c74d578e3
Author: Eddie James <eajames@xxxxxxxxxxxxx>
Date:   Wed Sep 29 10:36:04 2021 -0500

    hwmon: (occ) Fix P10 VRM temp sensors
    
    [ Upstream commit ffa2600044979aff4bd6238edb9af815a47d7c32 ]
    
    The P10 (temp sensor version 0x10) doesn't do the same VRM status
    reporting that was used on P9. It just reports the temperature, so
    drop the check for VRM fru type in the sysfs show function, and don't
    set the name to "alarm".
    
    Fixes: db4919ec86 ("hwmon: (occ) Add new temperature sensor type")
    Signed-off-by: Eddie James <eajames@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20210929153604.14968-1-eajames@xxxxxxxxxxxxx
    Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c
index 0d68a78be980..ae664613289c 100644
--- a/drivers/hwmon/occ/common.c
+++ b/drivers/hwmon/occ/common.c
@@ -340,18 +340,11 @@ static ssize_t occ_show_temp_10(struct device *dev,
 		if (val == OCC_TEMP_SENSOR_FAULT)
 			return -EREMOTEIO;
 
-		/*
-		 * VRM doesn't return temperature, only alarm bit. This
-		 * attribute maps to tempX_alarm instead of tempX_input for
-		 * VRM
-		 */
-		if (temp->fru_type != OCC_FRU_TYPE_VRM) {
-			/* sensor not ready */
-			if (val == 0)
-				return -EAGAIN;
+		/* sensor not ready */
+		if (val == 0)
+			return -EAGAIN;
 
-			val *= 1000;
-		}
+		val *= 1000;
 		break;
 	case 2:
 		val = temp->fru_type;
@@ -886,7 +879,7 @@ static int occ_setup_sensor_attrs(struct occ *occ)
 					     0, i);
 		attr++;
 
-		if (sensors->temp.version > 1 &&
+		if (sensors->temp.version == 2 &&
 		    temp->fru_type == OCC_FRU_TYPE_VRM) {
 			snprintf(attr->name, sizeof(attr->name),
 				 "temp%d_alarm", s);