Commit b45e9d76 authored by YueHaibing's avatar YueHaibing Committed by Michael Ellerman
Browse files

powerpc/pseries/memory-hotplug: Fix return value type of find_aa_index 



The variable 'aa_index' is defined as an unsigned value in
update_lmb_associativity_index(), but find_aa_index() may return -1
when dlpar_clone_property() fails. So change find_aa_index() to return
a bool, which indicates whether 'aa_index' was found or not.

Fixes: c05a5a40 ("powerpc/pseries: Dynamic add entires to associativity lookup array")
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Reviewed-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
[mpe: Tweak changelog, rename is_found to just found]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent b90484ec

arch/powerpc/platforms/pseries/hotplug-memory.c

+28 −33
Original line number Diff line number Diff line
@@ -101,11 +101,12 @@ static struct property *dlpar_clone_property(struct property *prop, 
	return new_prop;

}



static u32 find_aa_index(struct device_node *dr_node,

			 struct property *ala_prop, const u32 *lmb_assoc)

static bool find_aa_index(struct device_node *dr_node,

			 struct property *ala_prop,

			 const u32 *lmb_assoc, u32 *aa_index)

{

	u32 *assoc_arrays;

	u32 aa_index;

	u32 *assoc_arrays, new_prop_size;

	struct property *new_prop;

	int aa_arrays, aa_array_entries, aa_array_sz;

	int i, index;
@@ -121,25 +122,20 @@ static u32 find_aa_index(struct device_node *dr_node, 
	aa_array_entries = be32_to_cpu(assoc_arrays[1]);

	aa_array_sz = aa_array_entries * sizeof(u32);



	aa_index = -1;

	for (i = 0; i < aa_arrays; i++) {

		index = (i * aa_array_entries) + 2;



		if (memcmp(&assoc_arrays[index], &lmb_assoc[1], aa_array_sz))

			continue;



		aa_index = i;

		break;

		*aa_index = i;

		return true;

	}



	if (aa_index == -1) {

		struct property *new_prop;

		u32 new_prop_size;



	new_prop_size = ala_prop->length + aa_array_sz;

	new_prop = dlpar_clone_property(ala_prop, new_prop_size);

	if (!new_prop)

			return -1;

		return false;



	assoc_arrays = new_prop->value;
@@ -157,10 +153,8 @@ static u32 find_aa_index(struct device_node *dr_node, 
	 * number of entries - 1 since we added its associativity

	 * to the end of the lookup array.

	 */

		aa_index = be32_to_cpu(assoc_arrays[0]) - 1;

	}



	return aa_index;

	*aa_index = be32_to_cpu(assoc_arrays[0]) - 1;

	return true;

}



static int update_lmb_associativity_index(struct drmem_lmb *lmb)
@@ -169,6 +163,7 @@ static int update_lmb_associativity_index(struct drmem_lmb *lmb) 
	struct property *ala_prop;

	const u32 *lmb_assoc;

	u32 aa_index;

	bool found;



	parent = of_find_node_by_path("/");

	if (!parent)
@@ -200,11 +195,11 @@ static int update_lmb_associativity_index(struct drmem_lmb *lmb) 
		return -ENODEV;

	}



	aa_index = find_aa_index(dr_node, ala_prop, lmb_assoc);

	found = find_aa_index(dr_node, ala_prop, lmb_assoc, &aa_index);



	dlpar_free_cc_nodes(lmb_node);



	if (aa_index < 0) {

	if (!found) {

		pr_err("Could not find LMB associativity\n");

		return -1;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE