android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: gunyah: Sync with latest "gunyah: Common types and error codes for Gunyah hypercalls"

Browse Source 
Rename gh_remap_error to gh_error_remap to align with Gunyah v13
patches:

https://lore.kernel.org/all/20230509204801.2824351-3-quic_eberman@quicinc.com/

Bug: 279506910
Change-Id: Id3e033108a6a42868dc12a9c20c1a06775418979
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
This commit is contained in:
Elliot Berman 2023-04-17 12:05:59 -07:00 committed by Carlos Llamas
parent 58a642ea08
commit 016d92266e
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mailbox/gunyah-msgq.c
View File

@ -80,7 +80,7 @@ static int gh_msgq_send_data(struct mbox_chan *chan, void *data)
* framework, then no other messages can be sent and nobody will know
* to retry this message.
*/
msgq->last_ret = gh_remap_error(gh_error);
msgq->last_ret = gh_error_remap(gh_error);
/**
* This message was successfully sent, but message queue isn't ready to

7
drivers/virt/gunyah/gunyah_vcpu.c
View File

@ -192,7 +192,6 @@ static int gh_vcpu_run(struct gh_vcpu *vcpu)
gh_error = gh_hypercall_vcpu_run(vcpu->rsc->capid, state_data, &vcpu_run_resp);
if (gh_error == GH_ERROR_OK) {
ret = 0;
switch (vcpu_run_resp.state) {
case GH_VCPU_STATE_READY:
if (need_resched())
@ -238,9 +237,9 @@ static int gh_vcpu_run(struct gh_vcpu *vcpu)
}
} else if (gh_error == GH_ERROR_RETRY) {
schedule();
ret = 0;
} else
ret = gh_remap_error(gh_error);
} else {
ret = gh_error_remap(gh_error);
}
}
out:

4
include/linux/gunyah.h
View File

@ -110,10 +110,10 @@ enum gh_error {
};
/**
* gh_remap_error() - Remap Gunyah hypervisor errors into a Linux error code
* gh_error_remap() - Remap Gunyah hypervisor errors into a Linux error code
* @gh_error: Gunyah hypercall return value
*/
static inline int gh_remap_error(enum gh_error gh_error)
static inline int gh_error_remap(enum gh_error gh_error)
{
switch (gh_error) {
case GH_ERROR_OK: