[PATCH] nvme-pci: add quirk for missing secondary temperature thresholds

[Guenter Roeck]

On 4/25/23 22:57, Hristo Venev wrote:
> On Tue, 2023-04-25 at 16:39 -0700, Guenter Roeck wrote:
>> On Tue, Apr 25, 2023 at 10:58:54PM +0300, Hristo Venev wrote:
>>> On Kingston KC3000 and Kingston FURY Renegade (both have the same
>>> PCI
>>> IDs) accessing temp3_{min,max} fails with an invalid field error
>>> (note
>>> that there is no problem setting the thresholds for temp1).
>>>
>>> This contradicts the NVM Express Base Specification 2.0b, page 292:
>>>
>>>    The over temperature threshold and under temperature threshold
>>>    features shall be implemented for all implemented temperature
>>> sensors
>>>    (i.e., all Temperature Sensor fields that report a non-zero
>>> value).
>>>
>>> Define NVME_QUIRK_NO_SECONDARY_TEMP_THRESH that disables the
>>> thresholds
>>> for all but the composite temperature and set it for this device.
>>>
>>
>> The description above says that temp3_{min,max} return errors.
>> How about temp2 ? This patch disables that as well, but it is not
>> clear
>> if temp2_{min,max} return errors as well. If temp2 limits work,
>> disabling
>> them would be overkill.
> 
> temp2 doesn't exist. The only temperature sensors on that SSD are temp1
> and temp3.
> 

Interesting. In that case

Reviewed-by: Guenter Roeck <linux at roeck-us.net>

Guenter

>>
>> Thanks,
>> Guenter
>>
>>> Signed-off-by: Hristo Venev <hristo at venev.name>
>>> ---
>>>   drivers/nvme/host/hwmon.c | 3 ++-
>>>   drivers/nvme/host/nvme.h  | 5 +++++
>>>   drivers/nvme/host/pci.c   | 2 ++
>>>   3 files changed, 9 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c
>>> index 9e6e56c20ec9..7a2c4b5e018c 100644
>>> --- a/drivers/nvme/host/hwmon.c
>>> +++ b/drivers/nvme/host/hwmon.c
>>> @@ -163,7 +163,8 @@ static umode_t nvme_hwmon_is_visible(const void
>>> *_data,
>>>          case hwmon_temp_max:
>>>          case hwmon_temp_min:
>>>                  if ((!channel && data->ctrl->wctemp) ||
>>> -                   (channel && data->log->temp_sensor[channel -
>>> 1])) {
>>> +                   (channel && data->log->temp_sensor[channel - 1]
>>> &&
>>> +                    !(data->ctrl->quirks &
>>> NVME_QUIRK_NO_SECONDARY_TEMP_THRESH))) {
>>>                          if (data->ctrl->quirks &
>>>                              NVME_QUIRK_NO_TEMP_THRESH_CHANGE)
>>>                                  return 0444;
>>> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
>>> index bf46f122e9e1..a2d4f59e0535 100644
>>> --- a/drivers/nvme/host/nvme.h
>>> +++ b/drivers/nvme/host/nvme.h
>>> @@ -149,6 +149,11 @@ enum nvme_quirks {
>>>           * Reports garbage in the namespace identifiers (eui64,
>>> nguid, uuid).
>>>           */
>>>          NVME_QUIRK_BOGUS_NID                    = (1 << 18),
>>> +
>>> +       /*
>>> +        * No temperature thresholds for channels other than 0
>>> (Composite).
>>> +        */
>>> +       NVME_QUIRK_NO_SECONDARY_TEMP_THRESH     = (1 << 19),
>>>   };
>>>   
>>>   /*
>>> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
>>> index cd7873de3121..e457ad169dcb 100644
>>> --- a/drivers/nvme/host/pci.c
>>> +++ b/drivers/nvme/host/pci.c
>>> @@ -3416,6 +3416,8 @@ static const struct pci_device_id
>>> nvme_id_table[] = {
>>>                  .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
>>>          { PCI_DEVICE(0x2646, 0x501E),   /* KINGSTON OM3PGP4xxxxQ
>>> OS21011 NVMe SSD */
>>>                  .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },
>>> +       { PCI_DEVICE(0x2646, 0x5013),   /* Kingston KC3000,
>>> Kingston FURY Renegade */
>>> +               .driver_data = NVME_QUIRK_NO_SECONDARY_TEMP_THRESH,
>>> },
>>>          { PCI_DEVICE(0x1f40, 0x1202),   /* Netac Technologies Co.
>>> NV3000 NVMe SSD */
>>>                  .driver_data = NVME_QUIRK_BOGUS_NID, },
>>>          { PCI_DEVICE(0x1f40, 0x5236),   /* Netac Technologies Co.
>>> NV7000 NVMe SSD */
>>> -- 
>>> 2.40.0
>>>
>