From: Mattijs Korpershoek <mkorpershoek@baylibre.com>
To: Huacai Chen <chenhuacai@loongson.cn>,
Arnd Bergmann <arnd@arndb.de>,
Huacai Chen <chenhuacai@kernel.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: loongarch@lists.linux.dev, linux-arch@vger.kernel.org,
Xuefeng Li <lixuefeng@loongson.cn>, Guo Ren <guoren@kernel.org>,
Xuerui Wang <kernel@xen0n.name>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Huacai Chen <chenhuacai@loongson.cn>
Subject: Re: [PATCH 2/2] Input: i8042: Add LoongArch support in i8042-acpipnpio.h
Date: Thu, 22 Sep 2022 10:32:33 +0200 [thread overview]
Message-ID: <87a66rhkri.fsf@baylibre.com> (raw)
In-Reply-To: <20220917064020.1639709-2-chenhuacai@loongson.cn>
On Sat, Sep 17, 2022 at 14:40, Huacai Chen <chenhuacai@loongson.cn> wrote:
> LoongArch uses ACPI and nearly the same as X86/IA64 for 8042. So modify
> i8042-acpipnpio.h slightly and enable it for LoongArch in i8042.h. Then
> i8042 driver can work well under the ACPI firmware with PNP typed key-
> board and mouse configured in DSDT.
>
> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
I would have split the pr_info() move in its own patch since it seems
like a "valid fix" on its own, but i'm probably too pedantic about this.
So, please take my:
Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
> ---
> drivers/input/serio/i8042-acpipnpio.h | 8 ++++++--
> drivers/input/serio/i8042.h | 2 +-
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/serio/i8042-acpipnpio.h b/drivers/input/serio/i8042-acpipnpio.h
> index d14b9fb59d6c..c22151f180bb 100644
> --- a/drivers/input/serio/i8042-acpipnpio.h
> +++ b/drivers/input/serio/i8042-acpipnpio.h
> @@ -2,6 +2,7 @@
> #ifndef _I8042_ACPIPNPIO_H
> #define _I8042_ACPIPNPIO_H
>
> +#include <linux/acpi.h>
>
> #ifdef CONFIG_X86
> #include <asm/x86_init.h>
> @@ -1449,16 +1450,19 @@ static int __init i8042_pnp_init(void)
>
> if (!i8042_pnp_kbd_devices && !i8042_pnp_aux_devices) {
> i8042_pnp_exit();
> + pr_info("PNP: No PS/2 controller found.\n");
> #if defined(__ia64__)
> return -ENODEV;
> +#elif defined(__loongarch__)
> + if (acpi_disabled == 0)
> + return -ENODEV;
> #else
> - pr_info("PNP: No PS/2 controller found.\n");
> if (x86_platform.legacy.i8042 !=
> X86_LEGACY_I8042_EXPECTED_PRESENT)
> return -ENODEV;
> +#endif
> pr_info("Probing ports directly.\n");
> return 0;
> -#endif
> }
>
> if (i8042_pnp_kbd_devices)
> diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
> index bf2592fa9a78..adb5173372d3 100644
> --- a/drivers/input/serio/i8042.h
> +++ b/drivers/input/serio/i8042.h
> @@ -19,7 +19,7 @@
> #include "i8042-snirm.h"
> #elif defined(CONFIG_SPARC)
> #include "i8042-sparcio.h"
> -#elif defined(CONFIG_X86) || defined(CONFIG_IA64)
> +#elif defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_LOONGARCH)
> #include "i8042-acpipnpio.h"
> #else
> #include "i8042-io.h"
> --
> 2.31.1
next prev parent reply other threads:[~2022-09-22 8:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-17 6:40 [PATCH 1/2] Input: i8042: Rename i8042-x86ia64io.h to i8042-acpipnpio.h Huacai Chen
2022-09-17 6:40 ` [PATCH 2/2] Input: i8042: Add LoongArch support in i8042-acpipnpio.h Huacai Chen
2022-09-22 8:32 ` Mattijs Korpershoek [this message]
2022-09-30 2:41 ` Huacai Chen
2022-10-01 22:05 ` Dmitry Torokhov
2022-09-22 8:04 ` [PATCH 1/2] Input: i8042: Rename i8042-x86ia64io.h to i8042-acpipnpio.h Mattijs Korpershoek
2022-10-01 22:11 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a66rhkri.fsf@baylibre.com \
--to=mkorpershoek@baylibre.com \
--cc=arnd@arndb.de \
--cc=chenhuacai@kernel.org \
--cc=chenhuacai@loongson.cn \
--cc=dmitry.torokhov@gmail.com \
--cc=guoren@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=kernel@xen0n.name \
--cc=linux-arch@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
--cc=loongarch@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).