platform/x86: asus-wmi: corrections to egpu safety check
Luke D. Jones
maintainerv2 cover platform/x86: asus-wmi: corrections to egpu safety check
Changelog:
- v2
- Apply on platform-drivers/for-next and reference correct commit
- Fix an incorrectly name err/result
Luke D. Jones (1):
platform/x86: asus-wmi: corrections to egpu safety check
drivers/platform/x86/asus-wmi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
Signature · 1 line
2.41.0
Luke D. Jones
maintainerPATCH v2 1/1 platform/x86: asus-wmi: corrections to egpu safety check
An incorrect if statement was preventing the enablement of the egpu.
--- drivers/platform/x86/asus-wmi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/platform/x86/asus-wmi.c +7 -8
@@ -726,19 +726,18 @@ static ssize_t egpu_enable_store(struct device *dev,return -EINVAL ; err =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_EGPU_CONNECTED ); -if (err <0 ) -return err; -if (err <1 ) { - err = -ENODEV ; -pr_warn ("Failed to set egpu disable: %d\n" , err); +if (err <0 ) { +pr_warn ("Failed to get egpu connection status: %d\n" , err);return err; }if (asus->gpu_mux_mode_available) { result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_GPU_MUX ); -if (result <0 ) +if (result <0 ) {/* An error here may signal greater failure of GPU handling */ +pr_warn ("Failed to get gpu mux status: %d\n" , err);return result; + }if (!result && enable) { err = -ENODEV ;pr_warn ("Can not enable eGPU when the MUX is in dGPU mode: %d\n" , err);
@@ -748,12 +747,12 @@ static ssize_t egpu_enable_store(struct device *dev, err =asus_wmi_set_devstate (ASUS_WMI_DEVID_EGPU , enable, &result);if (err) { -pr_warn ("Failed to set egpu disable: %d\n" , err); +pr_warn ("Failed to set egpu state: %d\n" , err);return err; }if (result >1 ) { -pr_warn ("Failed to set egpu disable (retval): 0x%x\n" , result); +pr_warn ("Failed to set egpu state (retval): 0x%x\n" , result);return -EIO ; }
Signature · 1 line
2.41.0
Hi Luke,
Quoted 23 lines · Luke D. Jones
An incorrect if statement was preventing the enablement of the egpu.
Fixes d49f4d1a30ac ("platform/x86: asus-wmi: don't allow eGPU switching if eGPU not connected")Signed-off-by Luke D. Jones <[email protected]>--- drivers/platform/x86/asus-wmi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)drivers/platform/x86/asus-wmi.c +1
-5@@ -726,19 +726,18 @@ static ssize_t egpu_enable_store(struct device *dev,return -EINVAL ; err =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_EGPU_CONNECTED ); -if (err <0 ) -return err; -if (err <1 ) { - err = -ENODEV ; -pr_warn ("Failed to set egpu disable: %d\n" , err); +if (err <0 ) {
drivers/platform/x86/asus-wmi.c static ssize_t egpu_enable_store(struct device *dev, · line 738
Quoted 10 lines
drivers/platform/x86/asus-wmi.c +3
-1+pr_warn ("Failed to get egpu connection status: %d\n" , err);return err; }if (asus->gpu_mux_mode_available) { result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_GPU_MUX ); -if (result <0 ) +if (result <0 ) {/* An error here may signal greater failure of GPU handling */ +pr_warn ("Failed to get gpu mux status: %d\n" , err);
The error-code to print here should be result not err, since the error is stored in result.
I've fixed this up while merging this.
Regards,
Hans
Quoted 20 lines
drivers/platform/x86/asus-wmi.c +3
-2return result; + }if (!result && enable) { err = -ENODEV ;pr_warn ("Can not enable eGPU when the MUX is in dGPU mode: %d\n" , err);@@ -748,12 +747,12 @@ static ssize_t egpu_enable_store(struct device *dev, err =asus_wmi_set_devstate (ASUS_WMI_DEVID_EGPU , enable, &result);if (err) { -pr_warn ("Failed to set egpu disable: %d\n" , err); +pr_warn ("Failed to set egpu state: %d\n" , err);return err; }if (result >1 ) { -pr_warn ("Failed to set egpu disable (retval): 0x%x\n" , result); +pr_warn ("Failed to set egpu state (retval): 0x%x\n" , result);return -EIO ; }
Ilpo Järvinen
maintainerQuoted 5 lines · Luke D. Jones
An incorrect if statement was preventing the enablement of the egpu.
Fixes d49f4d1a30ac ("platform/x86: asus-wmi: don't allow eGPU switching if eGPU not connected")Signed-off-by Luke D. Jones <[email protected]>
Please don't leave extra spaces into tags block.
Quoted 9 lines
--- drivers/platform/x86/asus-wmi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)drivers/platform/x86/asus-wmi.c +0
-0
drivers/platform/x86/asus-wmi.c static ssize_t egpu_enable_store(struct device *dev, · line 730
Quoted 10 lines
drivers/platform/x86/asus-wmi.c +2
-5@@ -726,19 +726,18 @@ static ssize_t egpu_enable_store(struct device *dev,return -EINVAL ; err =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_EGPU_CONNECTED ); -if (err <0 ) -return err; -if (err <1 ) { - err = -ENODEV ; -pr_warn ("Failed to set egpu disable: %d\n" , err); +if (err <0 ) { +pr_warn ("Failed to get egpu connection status: %d\n" , err);
So this is the Fixes: part? You should make own patch out of it.
Quoted 20 lines
drivers/platform/x86/asus-wmi.c +3
-2return err; }if (asus->gpu_mux_mode_available) { result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_GPU_MUX ); -if (result <0 ) +if (result <0 ) {/* An error here may signal greater failure of GPU handling */ +pr_warn ("Failed to get gpu mux status: %d\n" , err);return result; + }if (!result && enable) { err = -ENODEV ;pr_warn ("Can not enable eGPU when the MUX is in dGPU mode: %d\n" , err);@@ -748,12 +747,12 @@ static ssize_t egpu_enable_store(struct device *dev, err =asus_wmi_set_devstate (ASUS_WMI_DEVID_EGPU , enable, &result);if (err) { -pr_warn ("Failed to set egpu disable: %d\n" , err);
drivers/platform/x86/asus-wmi.c static ssize_t egpu_enable_store(struct device *dev, · line 758
Quoted 10 lines
drivers/platform/x86/asus-wmi.c +2
-1+pr_warn ("Failed to set egpu state: %d\n" , err);return err; }if (result >1 ) { -pr_warn ("Failed to set egpu disable (retval): 0x%x\n" , result); +pr_warn ("Failed to set egpu state (retval): 0x%x\n" , result);return -EIO ; }
These others are good changes too but just not to be made in the same patch.
Signature · 1 line
i.
Hi All,
Quoted 55 lines · Ilpo Järvinen
Quoted 5 lines · Luke D. Jones
An incorrect if statement was preventing the enablement of the egpu.
Fixes d49f4d1a30ac ("platform/x86: asus-wmi: don't allow eGPU switching if eGPU not connected")Signed-off-by Luke D. Jones <[email protected]>Please don't leave extra spaces into tags block.
Quoted 9 lines
--- drivers/platform/x86/asus-wmi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)drivers/platform/x86/asus-wmi.c +0
-0drivers/platform/x86/asus-wmi.c static ssize_t egpu_enable_store(struct device *dev, · line 730
Quoted 10 lines
drivers/platform/x86/asus-wmi.c +2
-5@@ -726,19 +726,18 @@ static ssize_t egpu_enable_store(struct device *dev,return -EINVAL ; err =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_EGPU_CONNECTED ); -if (err <0 ) -return err; -if (err <1 ) { - err = -ENODEV ; -pr_warn ("Failed to set egpu disable: %d\n" , err); +if (err <0 ) { +pr_warn ("Failed to get egpu connection status: %d\n" , err);So this is the Fixes: part? You should make own patch out of it.
Quoted 23 lines
drivers/platform/x86/asus-wmi.c +4
-2return err; }if (asus->gpu_mux_mode_available) { result =asus_wmi_get_devstate_simple (asus,ASUS_WMI_DEVID_GPU_MUX ); -if (result <0 ) +if (result <0 ) {/* An error here may signal greater failure of GPU handling */ +pr_warn ("Failed to get gpu mux status: %d\n" , err);return result; + }if (!result && enable) { err = -ENODEV ;pr_warn ("Can not enable eGPU when the MUX is in dGPU mode: %d\n" , err);@@ -748,12 +747,12 @@ static ssize_t egpu_enable_store(struct device *dev, err =asus_wmi_set_devstate (ASUS_WMI_DEVID_EGPU , enable, &result);if (err) { -pr_warn ("Failed to set egpu disable: %d\n" , err); +pr_warn ("Failed to set egpu state: %d\n" , err);return err; }
Quoted 10 lines
drivers/platform/x86/asus-wmi.c static ssize_t egpu_enable_store(struct device *dev, · line 758
Quoted 7 lines
drivers/platform/x86/asus-wmi.c +1
-1if (result >1 ) { -pr_warn ("Failed to set egpu disable (retval): 0x%x\n" , result); +pr_warn ("Failed to set egpu state (retval): 0x%x\n" , result);return -EIO ; }These others are good changes too but just not to be made in the same patch.
Ilpo, you are right this should have really been 2 patches.
But the other changes are fixes (correction of wrong error messages) too, which would be good to get out there.
So I've decided to take this as is, so that this can be included in the main pdx86 pull-req for 6.6:
Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans