Browse Source

powerpc/powernv: convert OPAL codes returned by sysparam calls

The opal_{get,set}_param calls return internal error codes which need
to be translated in errnos in Linux.

Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Cédric Le Goater 10 years ago
parent
commit
14aae78f08

+ 8 - 4
arch/powerpc/platforms/powernv/opal-sysparam.c

@@ -55,8 +55,10 @@ static ssize_t opal_get_sys_param(u32 param_id, u32 length, void *buffer)
 	}
 	}
 
 
 	ret = opal_get_param(token, param_id, (u64)buffer, length);
 	ret = opal_get_param(token, param_id, (u64)buffer, length);
-	if (ret != OPAL_ASYNC_COMPLETION)
+	if (ret != OPAL_ASYNC_COMPLETION) {
+		ret = opal_error_code(ret);
 		goto out_token;
 		goto out_token;
+	}
 
 
 	ret = opal_async_wait_response(token, &msg);
 	ret = opal_async_wait_response(token, &msg);
 	if (ret) {
 	if (ret) {
@@ -65,7 +67,7 @@ static ssize_t opal_get_sys_param(u32 param_id, u32 length, void *buffer)
 		goto out_token;
 		goto out_token;
 	}
 	}
 
 
-	ret = be64_to_cpu(msg.params[1]);
+	ret = opal_error_code(be64_to_cpu(msg.params[1]));
 
 
 out_token:
 out_token:
 	opal_async_release_token(token);
 	opal_async_release_token(token);
@@ -89,8 +91,10 @@ static int opal_set_sys_param(u32 param_id, u32 length, void *buffer)
 
 
 	ret = opal_set_param(token, param_id, (u64)buffer, length);
 	ret = opal_set_param(token, param_id, (u64)buffer, length);
 
 
-	if (ret != OPAL_ASYNC_COMPLETION)
+	if (ret != OPAL_ASYNC_COMPLETION) {
+		ret = opal_error_code(ret);
 		goto out_token;
 		goto out_token;
+	}
 
 
 	ret = opal_async_wait_response(token, &msg);
 	ret = opal_async_wait_response(token, &msg);
 	if (ret) {
 	if (ret) {
@@ -99,7 +103,7 @@ static int opal_set_sys_param(u32 param_id, u32 length, void *buffer)
 		goto out_token;
 		goto out_token;
 	}
 	}
 
 
-	ret = be64_to_cpu(msg.params[1]);
+	ret = opal_error_code(be64_to_cpu(msg.params[1]));
 
 
 out_token:
 out_token:
 	opal_async_release_token(token);
 	opal_async_release_token(token);

+ 1 - 0
arch/powerpc/platforms/powernv/opal.c

@@ -830,6 +830,7 @@ int opal_error_code(int rc)
 	case OPAL_ASYNC_COMPLETION:	return -EINPROGRESS;
 	case OPAL_ASYNC_COMPLETION:	return -EINPROGRESS;
 	case OPAL_BUSY_EVENT:		return -EBUSY;
 	case OPAL_BUSY_EVENT:		return -EBUSY;
 	case OPAL_NO_MEM:		return -ENOMEM;
 	case OPAL_NO_MEM:		return -ENOMEM;
+	case OPAL_PERMISSION:		return -EPERM;
 
 
 	case OPAL_UNSUPPORTED:		return -EIO;
 	case OPAL_UNSUPPORTED:		return -EIO;
 	case OPAL_HARDWARE:		return -EIO;
 	case OPAL_HARDWARE:		return -EIO;