Commit 7957ec80 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Add FRU sysfs nodes only if needed 



Create sysfs nodes for FRU data only if FRU data is available. Move the
logic to FRU specific file.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b0297530

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+3 −68
Original line number Diff line number Diff line
@@ -164,71 +164,6 @@ static DEVICE_ATTR(pcie_replay_count, 0444, 


static void amdgpu_device_get_pcie_info(struct amdgpu_device *adev);



/**

 * DOC: product_name

 *

 * The amdgpu driver provides a sysfs API for reporting the product name

 * for the device

 * The file product_name is used for this and returns the product name

 * as returned from the FRU.

 * NOTE: This is only available for certain server cards

 */



static ssize_t amdgpu_device_get_product_name(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);



	return sysfs_emit(buf, "%s\n", adev->product_name);

}



static DEVICE_ATTR(product_name, 0444,

		amdgpu_device_get_product_name, NULL);



/**

 * DOC: product_number

 *

 * The amdgpu driver provides a sysfs API for reporting the part number

 * for the device

 * The file product_number is used for this and returns the part number

 * as returned from the FRU.

 * NOTE: This is only available for certain server cards

 */



static ssize_t amdgpu_device_get_product_number(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);



	return sysfs_emit(buf, "%s\n", adev->product_number);

}



static DEVICE_ATTR(product_number, 0444,

		amdgpu_device_get_product_number, NULL);



/**

 * DOC: serial_number

 *

 * The amdgpu driver provides a sysfs API for reporting the serial number

 * for the device

 * The file serial_number is used for this and returns the serial number

 * as returned from the FRU.

 * NOTE: This is only available for certain server cards

 */



static ssize_t amdgpu_device_get_serial_number(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);



	return sysfs_emit(buf, "%s\n", adev->serial);

}



static DEVICE_ATTR(serial_number, 0444,

		amdgpu_device_get_serial_number, NULL);



/**

 * amdgpu_device_supports_px - Is the device a dGPU with ATPX power control
@@ -3550,9 +3485,6 @@ static void amdgpu_device_check_iommu_direct_map(struct amdgpu_device *adev) 
}



static const struct attribute *amdgpu_dev_attributes[] = {

	&dev_attr_product_name.attr,

	&dev_attr_product_number.attr,

	&dev_attr_serial_number.attr,

	&dev_attr_pcie_replay_count.attr,

	NULL

};
@@ -3967,6 +3899,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (r)

		dev_err(adev->dev, "Could not create amdgpu device attr\n");



	amdgpu_fru_sysfs_init(adev);



	if (IS_ENABLED(CONFIG_PERF_EVENTS))

		r = amdgpu_pmu_init(adev);

	if (r)
@@ -4086,6 +4020,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
	if (adev->ucode_sysfs_en)

		amdgpu_ucode_sysfs_fini(adev);

	sysfs_remove_files(&adev->dev->kobj, amdgpu_dev_attributes);

	amdgpu_fru_sysfs_fini(adev);



	/* disable ras feature must before hw fini */

	amdgpu_ras_pre_fini(adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c

+89 −0
Original line number Diff line number Diff line
@@ -212,3 +212,92 @@ int amdgpu_fru_get_product_info(struct amdgpu_device *adev) 
	kfree(pia);

	return 0;

}



/**

 * DOC: product_name

 *

 * The amdgpu driver provides a sysfs API for reporting the product name

 * for the device

 * The file product_name is used for this and returns the product name

 * as returned from the FRU.

 * NOTE: This is only available for certain server cards

 */



static ssize_t amdgpu_fru_product_name_show(struct device *dev,

					    struct device_attribute *attr,

					    char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);



	return sysfs_emit(buf, "%s\n", adev->product_name);

}



static DEVICE_ATTR(product_name, 0444, amdgpu_fru_product_name_show, NULL);



/**

 * DOC: product_number

 *

 * The amdgpu driver provides a sysfs API for reporting the part number

 * for the device

 * The file product_number is used for this and returns the part number

 * as returned from the FRU.

 * NOTE: This is only available for certain server cards

 */



static ssize_t amdgpu_fru_product_number_show(struct device *dev,

					      struct device_attribute *attr,

					      char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);



	return sysfs_emit(buf, "%s\n", adev->product_number);

}



static DEVICE_ATTR(product_number, 0444, amdgpu_fru_product_number_show, NULL);



/**

 * DOC: serial_number

 *

 * The amdgpu driver provides a sysfs API for reporting the serial number

 * for the device

 * The file serial_number is used for this and returns the serial number

 * as returned from the FRU.

 * NOTE: This is only available for certain server cards

 */



static ssize_t amdgpu_fru_serial_number_show(struct device *dev,

					     struct device_attribute *attr,

					     char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(ddev);



	return sysfs_emit(buf, "%s\n", adev->serial);

}



static DEVICE_ATTR(serial_number, 0444, amdgpu_fru_serial_number_show, NULL);



static const struct attribute *amdgpu_fru_attributes[] = {

	&dev_attr_product_name.attr,

	&dev_attr_product_number.attr,

	&dev_attr_serial_number.attr,

	NULL

};



int amdgpu_fru_sysfs_init(struct amdgpu_device *adev)

{

	if (!is_fru_eeprom_supported(adev, NULL))

		return 0;



	return sysfs_create_files(&adev->dev->kobj, amdgpu_fru_attributes);

}



void amdgpu_fru_sysfs_fini(struct amdgpu_device *adev)

{

	if (!is_fru_eeprom_supported(adev, NULL))

		return;



	sysfs_remove_files(&adev->dev->kobj, amdgpu_fru_attributes);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h

+2 −0
Original line number Diff line number Diff line
@@ -25,5 +25,7 @@ 
#define __AMDGPU_FRU_EEPROM_H__



int amdgpu_fru_get_product_info(struct amdgpu_device *adev);

int amdgpu_fru_sysfs_init(struct amdgpu_device *adev);

void amdgpu_fru_sysfs_fini(struct amdgpu_device *adev);



#endif  // __AMDGPU_FRU_EEPROM_H__