Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f830b1a4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: Add "remove" probe driver for memory hot-remove"

parents 5cac878f 8e3fc589

drivers/base/memory.c

+33 −1
Original line number Diff line number Diff line
@@ -476,7 +476,36 @@ out: 
}



static DEVICE_ATTR(probe, S_IWUSR, NULL, memory_probe_store);

#endif



#ifdef CONFIG_MEMORY_HOTREMOVE

static ssize_t

memory_remove_store(struct device *dev,

		struct device_attribute *attr, const char *buf, size_t count)

{

	u64 phys_addr;

	int nid, ret;

	unsigned long pages_per_block = PAGES_PER_SECTION * sections_per_block;



	ret = kstrtoull(buf, 0, &phys_addr);

	if (ret)

		return ret;



	if (phys_addr & ((pages_per_block << PAGE_SHIFT) - 1))

		return -EINVAL;



	nid = memory_add_physaddr_to_nid(phys_addr);

	ret = lock_device_hotplug_sysfs();

	if (ret)

		return ret;



	remove_memory(nid, phys_addr,

			 MIN_MEMORY_BLOCK_SIZE * sections_per_block);

	unlock_device_hotplug();

	return count;

}

static DEVICE_ATTR(remove, S_IWUSR, NULL, memory_remove_store);

#endif /* CONFIG_MEMORY_HOTREMOVE */

#endif /* CONFIG_ARCH_MEMORY_PROBE */



#ifdef CONFIG_MEMORY_FAILURE

/*
@@ -728,6 +757,9 @@ bool is_memblock_offlined(struct memory_block *mem) 
static struct attribute *memory_root_attrs[] = {

#ifdef CONFIG_ARCH_MEMORY_PROBE

	&dev_attr_probe.attr,

#ifdef CONFIG_MEMORY_HOTREMOVE

	&dev_attr_remove.attr,

#endif

#endif



#ifdef CONFIG_MEMORY_FAILURE