Unverified Commit a59211ee authored by Xi Pardee's avatar Xi Pardee Committed by Ilpo Järvinen
Browse files

platform/x86:intel/pmc: Improve pmc_core_get_lpm_req() 



Minor improvements on pmc_core_get_lpm_req().
1. Move the long comment to be above the function
2. Use %pe to print error pointer
3. Remove unneeded devm_kfree call

These changes improves the code maintainability.

Signed-off-by: default avatarXi Pardee <xi.pardee@linux.intel.com>
Link: https://lore.kernel.org/r/20250425195237.493129-6-xi.pardee@linux.intel.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent 1e245468

drivers/platform/x86/intel/pmc/core.c

+45 −46
Original line number Diff line number Diff line
@@ -1355,40 +1355,9 @@ static u32 pmc_core_find_guid(struct pmc_info *list, const struct pmc_reg_map *m 
	return 0;

}



static int pmc_core_get_lpm_req(struct pmc_dev *pmcdev, struct pmc *pmc, struct pci_dev *pcidev)

{

	struct telem_endpoint *ep;

	const u8 *lpm_indices;

	int num_maps, mode_offset = 0;

	int ret, mode;

	int lpm_size;

	u32 guid;



	lpm_indices = pmc->map->lpm_reg_index;

	num_maps = pmc->map->lpm_num_maps;

	lpm_size = LPM_MAX_NUM_MODES * num_maps;



	guid = pmc_core_find_guid(pmcdev->regmap_list, pmc->map);

	if (!guid)

		return -ENXIO;



	ep = pmt_telem_find_and_register_endpoint(pcidev, guid, 0);

	if (IS_ERR(ep)) {

		dev_dbg(&pmcdev->pdev->dev, "couldn't get telem endpoint %ld",

			PTR_ERR(ep));

		return -EPROBE_DEFER;

	}



	pmc->lpm_req_regs = devm_kzalloc(&pmcdev->pdev->dev,

					 lpm_size * sizeof(u32),

					 GFP_KERNEL);

	if (!pmc->lpm_req_regs) {

		ret = -ENOMEM;

		goto unregister_ep;

	}



/*

	 * PMC Low Power Mode (LPM) table

 * This function retrieves low power mode requirement data from PMC Low

 * Power Mode (LPM) table.

 *

 * In telemetry space, the LPM table contains a 4 byte header followed

 * by 8 consecutive mode blocks (one for each LPM mode). Each block
@@ -1430,6 +1399,37 @@ static int pmc_core_get_lpm_req(struct pmc_dev *pmcdev, struct pmc *pmc, struct 
 * +----+---------------------------------------------------------+

 *

 */

static int pmc_core_get_lpm_req(struct pmc_dev *pmcdev, struct pmc *pmc, struct pci_dev *pcidev)

{

	struct telem_endpoint *ep;

	const u8 *lpm_indices;

	int num_maps, mode_offset = 0;

	int ret, mode;

	int lpm_size;

	u32 guid;



	lpm_indices = pmc->map->lpm_reg_index;

	num_maps = pmc->map->lpm_num_maps;

	lpm_size = LPM_MAX_NUM_MODES * num_maps;



	guid = pmc_core_find_guid(pmcdev->regmap_list, pmc->map);

	if (!guid)

		return -ENXIO;



	ep = pmt_telem_find_and_register_endpoint(pcidev, guid, 0);

	if (IS_ERR(ep)) {

		dev_dbg(&pmcdev->pdev->dev, "couldn't get telem endpoint %pe", ep);

		return -EPROBE_DEFER;

	}



	pmc->lpm_req_regs = devm_kzalloc(&pmcdev->pdev->dev,

					 lpm_size * sizeof(u32),

					 GFP_KERNEL);

	if (!pmc->lpm_req_regs) {

		ret = -ENOMEM;

		goto unregister_ep;

	}



	mode_offset = LPM_HEADER_OFFSET + LPM_MODE_OFFSET;

	pmc_for_each_mode(mode, pmcdev) {

		u32 *req_offset = pmc->lpm_req_regs + (mode * num_maps);
@@ -1442,7 +1442,6 @@ static int pmc_core_get_lpm_req(struct pmc_dev *pmcdev, struct pmc *pmc, struct 
			if (ret) {

				dev_err(&pmcdev->pdev->dev,

					"couldn't read Low Power Mode requirements: %d\n", ret);

				devm_kfree(&pmcdev->pdev->dev, pmc->lpm_req_regs);

				goto unregister_ep;

			}

			++req_offset;