Skip to content

Commit

Permalink
powerpc/powernv/vas: Rename register/unregister functions
Browse files Browse the repository at this point in the history
powerNV and pseries drivers register / unregister to the corresponding
platform specific VAS separately. Then these VAS functions call the
common API with the specific window operations. So rename powerNV VAS
API register/unregister functions.

Signed-off-by: Haren Myneni <haren@linux.ibm.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/9db00d58dbdcb7cfc07a1df95f3d2a9e3e5d746a.camel@linux.ibm.com
  • Loading branch information
Haren Myneni authored and Michael Ellerman committed Jun 20, 2021
1 parent 413d6ed commit 06c6fad
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
3 changes: 3 additions & 0 deletions arch/powerpc/include/asm/vas.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ int vas_paste_crb(struct vas_window *win, int offset, bool re);

void vas_win_paste_addr(struct vas_window *window, u64 *addr,
int *len);
int vas_register_api_powernv(struct module *mod, enum vas_cop_type cop_type,
const char *name);
void vas_unregister_api_powernv(void);

/*
* Register / unregister coprocessor type to VAS API which will be exported
Expand Down
2 changes: 0 additions & 2 deletions arch/powerpc/platforms/book3s/vas-api.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ int vas_register_coproc_api(struct module *mod, enum vas_cop_type cop_type,
unregister_chrdev_region(coproc_device.devt, 1);
return rc;
}
EXPORT_SYMBOL_GPL(vas_register_coproc_api);

void vas_unregister_coproc_api(void)
{
Expand All @@ -275,4 +274,3 @@ void vas_unregister_coproc_api(void)
class_destroy(coproc_device.class);
unregister_chrdev_region(coproc_device.devt, 1);
}
EXPORT_SYMBOL_GPL(vas_unregister_coproc_api);
18 changes: 18 additions & 0 deletions arch/powerpc/platforms/powernv/vas-window.c
Original file line number Diff line number Diff line change
Expand Up @@ -1442,3 +1442,21 @@ struct vas_window *vas_pswid_to_window(struct vas_instance *vinst,

return window;
}

/*
* Supporting only nx-gzip coprocessor type now, but this API code
* extended to other coprocessor types later.
*/
int vas_register_api_powernv(struct module *mod, enum vas_cop_type cop_type,
const char *name)
{

return vas_register_coproc_api(mod, cop_type, name);
}
EXPORT_SYMBOL_GPL(vas_register_api_powernv);

void vas_unregister_api_powernv(void)
{
vas_unregister_coproc_api();
}
EXPORT_SYMBOL_GPL(vas_unregister_api_powernv);
6 changes: 3 additions & 3 deletions drivers/crypto/nx/nx-common-powernv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1092,8 +1092,8 @@ static __init int nx_compress_powernv_init(void)
* normal FIFO priority is assigned for userspace.
* 842 compression is supported only in kernel.
*/
ret = vas_register_coproc_api(THIS_MODULE, VAS_COP_TYPE_GZIP,
"nx-gzip");
ret = vas_register_api_powernv(THIS_MODULE, VAS_COP_TYPE_GZIP,
"nx-gzip");

/*
* GZIP is not supported in kernel right now.
Expand Down Expand Up @@ -1129,7 +1129,7 @@ static void __exit nx_compress_powernv_exit(void)
* use. So delete this API use for GZIP engine.
*/
if (!nx842_ct)
vas_unregister_coproc_api();
vas_unregister_api_powernv();

crypto_unregister_alg(&nx842_powernv_alg);

Expand Down

0 comments on commit 06c6fad

Please sign in to comment.