Commit bd375fee authored by Hristo Venev's avatar Hristo Venev Committed by Christoph Hellwig
Browse files

nvme-pci: add quirk for missing secondary temperature thresholds 



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.

Signed-off-by: default avatarHristo Venev <hristo@venev.name>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1616d6c3

drivers/nvme/host/hwmon.c

+3 −1
Original line number Diff line number Diff line
@@ -163,7 +163,9 @@ 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;

drivers/nvme/host/nvme.h

+5 −0
Original line number Diff line number Diff line
@@ -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),

};



/*

drivers/nvme/host/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -3401,6 +3401,8 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },

	{ PCI_DEVICE(0x2646, 0x2263),   /* KINGSTON A2000 NVMe SSD  */

		.driver_data = NVME_QUIRK_NO_DEEPEST_PS, },

	{ PCI_DEVICE(0x2646, 0x5013),   /* Kingston KC3000, Kingston FURY Renegade */

		.driver_data = NVME_QUIRK_NO_SECONDARY_TEMP_THRESH, },

	{ PCI_DEVICE(0x2646, 0x5018),   /* KINGSTON OM8SFP4xxxxP OS21012 NVMe SSD */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE(0x2646, 0x5016),   /* KINGSTON OM3PGP4xxxxP OS21011 NVMe SSD */