Commit 4e317f19 authored by Ricardo B. Marliere's avatar Ricardo B. Marliere Committed by Xiaochen Shen
Browse files

dmaengine: idxd: make dsa_bus_type const 

mainline inclusion
from mainline-v6.9-rc1
commit cf497f3585f944ff42cc2c84453569f37a1bd6b9
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=cf497f3585f944ff42cc2c84453569f37a1bd6b9



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

Since commit d492cc25 ("driver core: device.h: make struct
bus_type a const *"), the driver core can properly handle constant
struct bus_type, move the dsa_bus_type variable to be a constant
structure as well, placing it into read-only memory which can not be
modified at runtime.

Intel-SIG: commit cf497f3585f9 dmaengine: idxd: make dsa_bus_type const.
Incremental backporting patches for DSA/IAA on Intel Xeon platform.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Suggested-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatar"Ricardo B. Marliere" <ricardo@marliere.net>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarFenghua Yu <fenghua.yu@intel.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20240213-bus_cleanup-idxd-v1-1-c3e703675387@marliere.net


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

drivers/dma/idxd/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int idxd_bus_uevent(const struct device *dev, struct kobj_uevent_env *env 
	return add_uevent_var(env, "MODALIAS=" IDXD_DEVICES_MODALIAS_FMT, 0);

}



struct bus_type dsa_bus_type = {

const struct bus_type dsa_bus_type = {

	.name = "dsa",

	.match = idxd_config_bus_match,

	.probe = idxd_config_bus_probe,

drivers/dma/idxd/idxd.h

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ static inline void idxd_set_user_intr(struct idxd_device *idxd, bool enable) 
	iowrite32(reg.bits, idxd->reg_base + IDXD_GENCFG_OFFSET);

}



extern struct bus_type dsa_bus_type;

extern const struct bus_type dsa_bus_type;



extern bool support_enqcmd;

extern struct ida idxd_ida;