[PATCH] platform/x86: toshiba_acpi: Silence logging for some events

[PATCH] platform/x86: toshiba_acpi: Silence logging for some events

[Hans de Goede]

Stop logging unknown event / unknown keycode messages on suspend /
resume on a Toshiba Portege Z830:

1. The Toshiba Portege Z830 sends a 0x8e event when the power button
is pressed, ignore this.

2. The Toshiba Portege Z830 sends a 0xe00 hotkey event on resume from
suspend, ignore this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/platform/x86/toshiba_acpi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 2a5a651235fe..16e941449b14 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -270,6 +270,7 @@ static const struct key_entry toshiba_acpi_keymap[] = {
 	{ KE_KEY, 0xb32, { KEY_NEXTSONG } },
 	{ KE_KEY, 0xb33, { KEY_PLAYPAUSE } },
 	{ KE_KEY, 0xb5a, { KEY_MEDIA } },
+	{ KE_IGNORE, 0x0e00, { KEY_RESERVED } }, /* Wake from sleep */
 	{ KE_IGNORE, 0x1430, { KEY_RESERVED } }, /* Wake from sleep */
 	{ KE_IGNORE, 0x1501, { KEY_RESERVED } }, /* Output changed */
 	{ KE_IGNORE, 0x1502, { KEY_RESERVED } }, /* HDMI plugged/unplugged */
@@ -3553,9 +3554,10 @@ static void toshiba_acpi_notify(struct acpi_device *acpi_dev, u32 event)
 					(dev->kbd_mode == SCI_KBD_MODE_ON) ?
 					LED_FULL : LED_OFF);
 		break;
+	case 0x8e: /* Power button pressed */
+		break;
 	case 0x85: /* Unknown */
 	case 0x8d: /* Unknown */
-	case 0x8e: /* Unknown */
 	case 0x94: /* Unknown */
 	case 0x95: /* Unknown */
 	default:
-- 
2.44.0

Re: [PATCH] platform/x86: toshiba_acpi: Silence logging for some events

[Hans de Goede]

Hi,

On 4/2/24 2:43 PM, Hans de Goede wrote:
> Stop logging unknown event / unknown keycode messages on suspend /
> resume on a Toshiba Portege Z830:
> 
> 1. The Toshiba Portege Z830 sends a 0x8e event when the power button
> is pressed, ignore this.
> 
> 2. The Toshiba Portege Z830 sends a 0xe00 hotkey event on resume from
> suspend, ignore this.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

I've added this to my review-hans (soon to be for-next) branch now.

Regards,

Hans



> ---
>  drivers/platform/x86/toshiba_acpi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
> index 2a5a651235fe..16e941449b14 100644
> --- a/drivers/platform/x86/toshiba_acpi.c
> +++ b/drivers/platform/x86/toshiba_acpi.c
> @@ -270,6 +270,7 @@ static const struct key_entry toshiba_acpi_keymap[] = {
>  	{ KE_KEY, 0xb32, { KEY_NEXTSONG } },
>  	{ KE_KEY, 0xb33, { KEY_PLAYPAUSE } },
>  	{ KE_KEY, 0xb5a, { KEY_MEDIA } },
> +	{ KE_IGNORE, 0x0e00, { KEY_RESERVED } }, /* Wake from sleep */
>  	{ KE_IGNORE, 0x1430, { KEY_RESERVED } }, /* Wake from sleep */
>  	{ KE_IGNORE, 0x1501, { KEY_RESERVED } }, /* Output changed */
>  	{ KE_IGNORE, 0x1502, { KEY_RESERVED } }, /* HDMI plugged/unplugged */
> @@ -3553,9 +3554,10 @@ static void toshiba_acpi_notify(struct acpi_device *acpi_dev, u32 event)
>  					(dev->kbd_mode == SCI_KBD_MODE_ON) ?
>  					LED_FULL : LED_OFF);
>  		break;
> +	case 0x8e: /* Power button pressed */
> +		break;
>  	case 0x85: /* Unknown */
>  	case 0x8d: /* Unknown */
> -	case 0x8e: /* Unknown */
>  	case 0x94: /* Unknown */
>  	case 0x95: /* Unknown */
>  	default:

Re: [PATCH] platform/x86: toshiba_acpi: Silence logging for some events

[Ilpo Järvinen]

On Tue, 02 Apr 2024 14:43:51 +0200, Hans de Goede wrote:

> Stop logging unknown event / unknown keycode messages on suspend /
> resume on a Toshiba Portege Z830:
> 
> 1. The Toshiba Portege Z830 sends a 0x8e event when the power button
> is pressed, ignore this.
> 
> 2. The Toshiba Portege Z830 sends a 0xe00 hotkey event on resume from
> suspend, ignore this.
> 
> [...]


Thank you for your contribution, it has been applied to my local
review-ilpo branch. Note it will show up in the public
platform-drivers-x86/review-ilpo branch only once I've pushed my
local branch there, which might take a while.

The list of commits applied:
[1/1] platform/x86: toshiba_acpi: Silence logging for some events
      commit: 0dd50b3e2c3d651ea972c97cff1af67870f3deaf

--
 i.

Re: [PATCH] platform/x86: toshiba_acpi: Silence logging for some events

[Hans de Goede]

Hi,

On 4/8/24 5:42 PM, Ilpo Järvinen wrote:
> On Tue, 02 Apr 2024 14:43:51 +0200, Hans de Goede wrote:
> 
>> Stop logging unknown event / unknown keycode messages on suspend /
>> resume on a Toshiba Portege Z830:
>>
>> 1. The Toshiba Portege Z830 sends a 0x8e event when the power button
>> is pressed, ignore this.
>>
>> 2. The Toshiba Portege Z830 sends a 0xe00 hotkey event on resume from
>> suspend, ignore this.
>>
>> [...]
> 
> 
> Thank you for your contribution, it has been applied to my local
> review-ilpo branch. Note it will show up in the public
> platform-drivers-x86/review-ilpo branch only once I've pushed my
> local branch there, which might take a while.
> 
> The list of commits applied:
> [1/1] platform/x86: toshiba_acpi: Silence logging for some events
>       commit: 0dd50b3e2c3d651ea972c97cff1af67870f3deaf

Thanks.

Note I had also applied this to my review-hans branch for for-next,
I'll drop it there.

Regards,

Hans

Re: [PATCH] platform/x86: toshiba_acpi: Silence logging for some events

[Ilpo Järvinen]

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

On Mon, 8 Apr 2024, Hans de Goede wrote:
> On 4/8/24 5:42 PM, Ilpo Järvinen wrote:
> > On Tue, 02 Apr 2024 14:43:51 +0200, Hans de Goede wrote:
> > 
> >> Stop logging unknown event / unknown keycode messages on suspend /
> >> resume on a Toshiba Portege Z830:
> >>
> >> 1. The Toshiba Portege Z830 sends a 0x8e event when the power button
> >> is pressed, ignore this.
> >>
> >> 2. The Toshiba Portege Z830 sends a 0xe00 hotkey event on resume from
> >> suspend, ignore this.
> >>
> >> [...]
> > 
> > 
> > Thank you for your contribution, it has been applied to my local
> > review-ilpo branch. Note it will show up in the public
> > platform-drivers-x86/review-ilpo branch only once I've pushed my
> > local branch there, which might take a while.
> > 
> > The list of commits applied:
> > [1/1] platform/x86: toshiba_acpi: Silence logging for some events
> >       commit: 0dd50b3e2c3d651ea972c97cff1af67870f3deaf
> 
> Thanks.
> 
> Note I had also applied this to my review-hans branch for for-next,
> I'll drop it there.

Okay, I even tried hard to avoid that by checking what you had in 
review-hans branch but we just happened to work nearly at the same time 
so it didn't help.

-- 
 i.

Re: [PATCH] platform/x86: toshiba_acpi: Silence logging for some events

[Hans de Goede]

Hi,

On 4/8/24 6:39 PM, Ilpo Järvinen wrote:
> On Mon, 8 Apr 2024, Hans de Goede wrote:
>> On 4/8/24 5:42 PM, Ilpo Järvinen wrote:
>>> On Tue, 02 Apr 2024 14:43:51 +0200, Hans de Goede wrote:
>>>
>>>> Stop logging unknown event / unknown keycode messages on suspend /
>>>> resume on a Toshiba Portege Z830:
>>>>
>>>> 1. The Toshiba Portege Z830 sends a 0x8e event when the power button
>>>> is pressed, ignore this.
>>>>
>>>> 2. The Toshiba Portege Z830 sends a 0xe00 hotkey event on resume from
>>>> suspend, ignore this.
>>>>
>>>> [...]
>>>
>>>
>>> Thank you for your contribution, it has been applied to my local
>>> review-ilpo branch. Note it will show up in the public
>>> platform-drivers-x86/review-ilpo branch only once I've pushed my
>>> local branch there, which might take a while.
>>>
>>> The list of commits applied:
>>> [1/1] platform/x86: toshiba_acpi: Silence logging for some events
>>>       commit: 0dd50b3e2c3d651ea972c97cff1af67870f3deaf
>>
>> Thanks.
>>
>> Note I had also applied this to my review-hans branch for for-next,
>> I'll drop it there.
> 
> Okay, I even tried hard to avoid that by checking what you had in 
> review-hans branch but we just happened to work nearly at the same time 
> so it didn't help.

Yeah no worries, dropping the patch was almost 0 work.

Regards,

Hans