Commit 952fe641 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Xiaochen Shen
Browse files

dmaengine: idxd: Remove usage of the deprecated ida_simple_xx() API 

mainline inclusion
from mainline-v6.8-rc1
commit 1075ee66a8c19bfa375b19c236fd6a22a867f138
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I9TA1S
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1075ee66a8c19bfa375b19c236fd6a22a867f138



--------------------------------

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

This is less verbose.

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_range() is inclusive. Sothis change allows one more device.

MINORMASK is ((1U << MINORBITS) - 1), so allowing MINORMASK as a maximum value
makes sense. It is also consistent with other "ida_.*MINORMASK" and
"ida_*MINOR()" usages.

Intel-SIG: commit 1075ee66a8c1 dmaengine: idxd: Remove usage of the deprecated ida_simple_xx() API.
Incremental backporting patches for DSA/IAA on Intel Xeon platform.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Acked-by: default avatarLijun Pan <lijun.pan@intel.com>
Link: https://lore.kernel.org/r/ac991f5f42112fa782a881d391d447529cbc4a23.1702967302.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarXiaochen Shen <xiaochen.shen@intel.com>
parent 3f8a668a

drivers/dma/idxd/cdev.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void idxd_cdev_dev_release(struct device *dev) 
	struct idxd_wq *wq = idxd_cdev->wq;



	cdev_ctx = &ictx[wq->idxd->data->type];

	ida_simple_remove(&cdev_ctx->minor_ida, idxd_cdev->minor);

	ida_free(&cdev_ctx->minor_ida, idxd_cdev->minor);

	kfree(idxd_cdev);

}
@@ -539,7 +539,7 @@ int idxd_wq_add_cdev(struct idxd_wq *wq) 
	cdev = &idxd_cdev->cdev;

	dev = cdev_dev(idxd_cdev);

	cdev_ctx = &ictx[wq->idxd->data->type];

	minor = ida_simple_get(&cdev_ctx->minor_ida, 0, MINORMASK, GFP_KERNEL);

	minor = ida_alloc_max(&cdev_ctx->minor_ida, MINORMASK, GFP_KERNEL);

	if (minor < 0) {

		kfree(idxd_cdev);

		return minor;