Commit 40562fe4 authored by Haren Myneni's avatar Haren Myneni Committed by Michael Ellerman
Browse files

powerpc/pseries/vas: Use common names in VAS capability structure 



nr_total/nr_used_credits provides credits usage to user space
via sysfs and the same interface can be used on PowerNV in
future. Changed with proper naming so that applicable on both
pseries and PowerNV.

Signed-off-by: default avatarHaren Myneni <haren@linux.ibm.com>
Reviewed-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/f4313e9f198ee4f8d4fa4d015d8d1873e17851e6.camel@linux.ibm.com
parent 9ef78b62

arch/powerpc/platforms/pseries/vas.c

+5 −5
Original line number Diff line number Diff line
@@ -310,8 +310,8 @@ static struct vas_window *vas_allocate_window(int vas_id, u64 flags, 


	cop_feat_caps = &caps->caps;



	if (atomic_inc_return(&cop_feat_caps->used_lpar_creds) >

			atomic_read(&cop_feat_caps->target_lpar_creds)) {

	if (atomic_inc_return(&cop_feat_caps->nr_used_credits) >

			atomic_read(&cop_feat_caps->nr_total_credits)) {

		pr_err("Credits are not available to allocate window\n");

		rc = -EINVAL;

		goto out;
@@ -385,7 +385,7 @@ static struct vas_window *vas_allocate_window(int vas_id, u64 flags, 
	free_irq_setup(txwin);

	h_deallocate_vas_window(txwin->vas_win.winid);

out:

	atomic_dec(&cop_feat_caps->used_lpar_creds);

	atomic_dec(&cop_feat_caps->nr_used_credits);

	kfree(txwin);

	return ERR_PTR(rc);

}
@@ -445,7 +445,7 @@ static int vas_deallocate_window(struct vas_window *vwin) 
	}



	list_del(&win->win_list);

	atomic_dec(&caps->used_lpar_creds);

	atomic_dec(&caps->nr_used_credits);

	mutex_unlock(&vas_pseries_mutex);



	put_vas_user_win_ref(&vwin->task_ref);
@@ -521,7 +521,7 @@ static int __init get_vas_capabilities(u8 feat, enum vas_cop_feat_type type, 
	}

	caps->max_lpar_creds = be16_to_cpu(hv_caps->max_lpar_creds);

	caps->max_win_creds = be16_to_cpu(hv_caps->max_win_creds);

	atomic_set(&caps->target_lpar_creds,

	atomic_set(&caps->nr_total_credits,

		   be16_to_cpu(hv_caps->target_lpar_creds));

	if (feat == VAS_GZIP_DEF_FEAT) {

		caps->def_lpar_creds = be16_to_cpu(hv_caps->def_lpar_creds);

arch/powerpc/platforms/pseries/vas.h

+2 −3
Original line number Diff line number Diff line
@@ -72,9 +72,8 @@ struct vas_cop_feat_caps { 
	};

	/* Total LPAR available credits. Can be different from max LPAR */

	/* credits due to DLPAR operation */

	atomic_t	target_lpar_creds;

	atomic_t	used_lpar_creds; /* Used credits so far */

	u16		avail_lpar_creds; /* Remaining available credits */

	atomic_t	nr_total_credits;	/* Total credits assigned to LPAR */

	atomic_t	nr_used_credits;	/* Used credits so far */

};



/*