Commit 682eefba authored by Xingang Wang's avatar Xingang Wang Committed by Zheng Zengkai
Browse files

arm64/mpam: remove __init macro to support driver probe 

ascend inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4L735


CVE: NA

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

To support device tree boot for arm64 mpam, the __init macro might be
used by the dts driver. This remove the necessary __init macro for the
related functions.

Signed-off-by: default avatarXingang Wang <wangxingang5@huawei.com>
Reviewed-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 20287a73

arch/arm64/include/asm/resctrl.h

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ int resctrl_update_groups_config(struct rdtgroup *rdtgrp); 


#define RESCTRL_MAX_CLOSID 32



int __init resctrl_group_init(void);

int resctrl_group_init(void);



void post_resctrl_mount(void);

arch/arm64/kernel/mpam/mpam_device.c

+7 −7
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static void mpam_disable_irqs(void) 
 * Scheduled by mpam_discovery_complete() once all devices have been created.

 * Also scheduled when new devices are probed when new CPUs come online.

 */

static void __init mpam_enable(struct work_struct *work)

static void mpam_enable(struct work_struct *work)

{

	int err;

	unsigned long flags;
@@ -761,7 +761,7 @@ static struct mpam_class * __init mpam_class_get(u8 level_idx, 
 * class/component structures may be allocated.

 * Returns the new device, or an ERR_PTR().

 */

struct mpam_device * __init

struct mpam_device *

__mpam_device_create(u8 level_idx, enum mpam_class_types type,

			int component_id, const struct cpumask *fw_affinity,

			phys_addr_t hwpage_address)
@@ -810,7 +810,7 @@ __mpam_device_create(u8 level_idx, enum mpam_class_types type, 
	return dev;

}



void __init mpam_device_set_error_irq(struct mpam_device *dev, u32 irq,

void mpam_device_set_error_irq(struct mpam_device *dev, u32 irq,

					u32 flags)

{

	unsigned long irq_save_flags;
@@ -821,7 +821,7 @@ void __init mpam_device_set_error_irq(struct mpam_device *dev, u32 irq, 
	spin_unlock_irqrestore(&dev->lock, irq_save_flags);

}



void __init mpam_device_set_overflow_irq(struct mpam_device *dev, u32 irq,

void mpam_device_set_overflow_irq(struct mpam_device *dev, u32 irq,

					u32 flags)

{

	unsigned long irq_save_flags;
@@ -864,7 +864,7 @@ static inline u16 mpam_cpu_max_pmg(void) 
/*

 * prepare for initializing devices.

 */

int __init mpam_discovery_start(void)

int mpam_discovery_start(void)

{

	if (!mpam_cpus_have_feature())

		return -EOPNOTSUPP;
@@ -1094,7 +1094,7 @@ static int mpam_cpu_offline(unsigned int cpu) 
	return 0;

}



int __init mpam_discovery_complete(void)

int mpam_discovery_complete(void)

{

	int ret = 0;
@@ -1111,7 +1111,7 @@ int __init mpam_discovery_complete(void) 
	return ret;

}



void __init mpam_discovery_failed(void)

void mpam_discovery_failed(void)

{

	struct mpam_class *class, *tmp;

arch/arm64/kernel/mpam/mpam_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ int mpam_resctrl_setup(void); 
struct raw_resctrl_resource *

mpam_get_raw_resctrl_resource(u32 level);



int __init mpam_resctrl_init(void);

int mpam_resctrl_init(void);



int mpam_resctrl_set_default_cpu(unsigned int cpu);

void mpam_resctrl_clear_default_cpu(unsigned int cpu);

arch/arm64/kernel/mpam/mpam_resctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -2167,7 +2167,7 @@ static int __init mpam_setup(char *str) 
}

__setup("mpam", mpam_setup);



int __init mpam_resctrl_init(void)

int mpam_resctrl_init(void)

{

	mpam_init_padding();

fs/resctrlfs.c

+1 −1
Original line number Diff line number Diff line
@@ -1156,7 +1156,7 @@ static int __init resctrl_group_setup_root(void) 
 *

 * Return: 0 on success or -errno

 */

int __init resctrl_group_init(void)

int resctrl_group_init(void)

{

	int ret = 0;