Skip to content

Remove fallback to default device open #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Remove fallback to default device open #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 15 additions & 36 deletions src/fastrpc_apps_user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3279,14 +3279,10 @@ static const char *get_domain_name(int domain_id) {
For ADSP, SDSP, MDSP domains:
Open secure device node fist
if no secure device, open actual device node
if still no device, open default node
if failed to open the secure node due to permission,
open default node
For CDSP domain:
Open secure device node fist
If the node does not exist or if no permission, open actual device node
If still no device, open default node
If no permission to access the default node, access thorugh HAL.
If no permission to access the device node, access thorugh HAL.
*/
static int open_device_node(int domain_id) {
int dev = -1, nErr = 0;
Expand All @@ -3307,20 +3303,9 @@ static int open_device_node(int domain_id) {
dev = open(get_domain_name(domain), O_NONBLOCK);
if ((dev < 0) && (errno == ENOENT)) {
FARF(RUNTIME_RPC_HIGH,
"Device node %s open failed for domain %d (errno %s),"
"falling back to node %s \n",
get_domain_name(domain), domain, strerror(errno), DEFAULT_DEVICE);
dev = open(DEFAULT_DEVICE, O_NONBLOCK);
"Device node %s open failed for domain %d (errno %s)\n",
get_domain_name(domain), domain, strerror(errno));
}
} else if ((dev < 0) && (errno == EACCES)) {
// Open the default device node if unable to open the
// secure device node due to permissions
FARF(RUNTIME_RPC_HIGH,
"Device node %s open failed for domain %d (errno %s),"
"falling back to node %s \n",
get_secure_domain_name(domain), domain, strerror(errno),
DEFAULT_DEVICE);
dev = open(DEFAULT_DEVICE, O_NONBLOCK);
}
break;
case CDSP_DOMAIN_ID:
Expand All @@ -3334,27 +3319,21 @@ static int open_device_node(int domain_id) {
get_domain_name(domain));
dev = open(get_domain_name(domain), O_NONBLOCK);
if ((dev < 0) && ((errno == ENOENT) || (errno == EACCES))) {
// Open the default device node if actual device node
// is not present
FARF(RUNTIME_RPC_HIGH,
"Device node %s open failed for domain %d (errno %s),"
"falling back to node %s \n",
get_domain_name(domain), domain, strerror(errno), DEFAULT_DEVICE);
dev = open(DEFAULT_DEVICE, O_NONBLOCK);
"Device node %s open failed for domain %d (errno %s)\n",
get_domain_name(domain), domain, strerror(errno));
#ifndef NO_HAL
if ((dev < 0) && (errno == EACCES)) {
FARF(ALWAYS,
"%s: no access to default device of domain %d, open thru HAL, "
"(sess_id %d)\n",
__func__, domain, sess_id);
VERIFYC(sess_id < NUM_SESSIONS, AEE_EBADITEM);
pthread_mutex_lock(&dsp_client_mut);
if (!dsp_client_instance[sess_id]) {
dsp_client_instance[sess_id] = create_dsp_client_instance();
}
pthread_mutex_unlock(&dsp_client_mut);
dev = open_hal_session(dsp_client_instance[sess_id], domain_id);
FARF(ALWAYS,
"%s: no access to device of domain %d, open thru HAL, "
"(sess_id %d)\n",
__func__, domain, sess_id);
VERIFYC(sess_id < NUM_SESSIONS, AEE_EBADITEM);
pthread_mutex_lock(&dsp_client_mut);
if (!dsp_client_instance[sess_id]) {
dsp_client_instance[sess_id] = create_dsp_client_instance();
}
pthread_mutex_unlock(&dsp_client_mut);
dev = open_hal_session(dsp_client_instance[sess_id], domain_id);
#endif
}
}
Expand Down
Loading