* [PATCHv3] media/rc: compile rc-cec.c into rc-core
@ 2021-02-26 10:37 Hans Verkuil
2021-02-26 10:43 ` Sean Young
0 siblings, 1 reply; 3+ messages in thread
From: Hans Verkuil @ 2021-02-26 10:37 UTC (permalink / raw)
To: Sean Young; +Cc: Linux Media Mailing List, Hans de Goede
The rc-cec keymap is unusual in that it can't be built as a module,
instead it is registered directly in rc-main.c if CONFIG_MEDIA_CEC_RC
is set. This is because it can be called from drm_dp_cec_set_edid() via
cec_register_adapter() in an asynchronous context, and it is not
allowed to use request_module() to load rc-cec.ko in that case. Trying to
do so results in a 'WARN_ON_ONCE(wait && current_is_async())'.
Since this keymap is only used if CONFIG_MEDIA_CEC_RC is set, we
just compile this keymap into the rc-core module and never as a
separate module.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Fixes: 2c6d1fffa1d9 (drm: add support for DisplayPort CEC-Tunneling-over-AUX)
Reported-by: Hans de Goede <hdegoede@redhat.com>
---
Change since v2:
Move 'extern struct rc_map_list cec_map;' to rc-map.h to fix sparse warning.
Change since v1:
Fix copy-and-paste error: rc_core_exit() called rc_map_register() instead
of rc_map_unregister().
---
drivers/media/rc/Makefile | 1 +
drivers/media/rc/keymaps/Makefile | 1 -
drivers/media/rc/keymaps/rc-cec.c | 28 +++++++++++-----------------
drivers/media/rc/rc-main.c | 6 ++++++
include/media/rc-map.h | 7 +++++++
5 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 5bb2932ab119..ff6a8fc4c38e 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -5,6 +5,7 @@ obj-y += keymaps/
obj-$(CONFIG_RC_CORE) += rc-core.o
rc-core-y := rc-main.o rc-ir-raw.o
rc-core-$(CONFIG_LIRC) += lirc_dev.o
+rc-core-$(CONFIG_MEDIA_CEC_RC) += keymaps/rc-cec.o
rc-core-$(CONFIG_BPF_LIRC_MODE2) += bpf-lirc.o
obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
index b252a1d2ebd6..cc6662e1903f 100644
--- a/drivers/media/rc/keymaps/Makefile
+++ b/drivers/media/rc/keymaps/Makefile
@@ -21,7 +21,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
rc-behold.o \
rc-behold-columbus.o \
rc-budget-ci-old.o \
- rc-cec.o \
rc-cinergy-1400.o \
rc-cinergy.o \
rc-d680-dmb.o \
diff --git a/drivers/media/rc/keymaps/rc-cec.c b/drivers/media/rc/keymaps/rc-cec.c
index 3e3bd11092b4..068e22aeac8c 100644
--- a/drivers/media/rc/keymaps/rc-cec.c
+++ b/drivers/media/rc/keymaps/rc-cec.c
@@ -1,5 +1,15 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/* Keytable for the CEC remote control
+ *
+ * This keymap is unusual in that it can't be built as a module,
+ * instead it is registered directly in rc-main.c if CONFIG_MEDIA_CEC_RC
+ * is set. This is because it can be called from drm_dp_cec_set_edid() via
+ * cec_register_adapter() in an asynchronous context, and it is not
+ * allowed to use request_module() to load rc-cec.ko in that case.
+ *
+ * Since this keymap is only used if CONFIG_MEDIA_CEC_RC is set, we
+ * just compile this keymap into the rc-core module and never as a
+ * separate module.
*
* Copyright (c) 2015 by Kamil Debski
*/
@@ -152,7 +162,7 @@ static struct rc_map_table cec[] = {
/* 0x77-0xff: Reserved */
};
-static struct rc_map_list cec_map = {
+struct rc_map_list cec_map = {
.map = {
.scan = cec,
.size = ARRAY_SIZE(cec),
@@ -160,19 +170,3 @@ static struct rc_map_list cec_map = {
.name = RC_MAP_CEC,
}
};
-
-static int __init init_rc_map_cec(void)
-{
- return rc_map_register(&cec_map);
-}
-
-static void __exit exit_rc_map_cec(void)
-{
- rc_map_unregister(&cec_map);
-}
-
-module_init(init_rc_map_cec);
-module_exit(exit_rc_map_cec);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Kamil Debski");
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 1fd62c1dac76..8e88dc8ea6c5 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -2069,6 +2069,9 @@ static int __init rc_core_init(void)
led_trigger_register_simple("rc-feedback", &led_feedback);
rc_map_register(&empty_map);
+#ifdef CONFIG_MEDIA_CEC_RC
+ rc_map_register(&cec_map);
+#endif
return 0;
}
@@ -2078,6 +2081,9 @@ static void __exit rc_core_exit(void)
lirc_dev_exit();
class_unregister(&rc_class);
led_trigger_unregister_simple(led_feedback);
+#ifdef CONFIG_MEDIA_CEC_RC
+ rc_map_unregister(&cec_map);
+#endif
rc_map_unregister(&empty_map);
}
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 999b750bc6b8..30f138ebab6f 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -175,6 +175,13 @@ struct rc_map_list {
struct rc_map map;
};
+#ifdef CONFIG_MEDIA_CEC_RC
+/*
+ * rc_map_list from rc-cec.c
+ */
+extern struct rc_map_list cec_map;
+#endif
+
/* Routines from rc-map.c */
/**
--
2.30.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCHv3] media/rc: compile rc-cec.c into rc-core
2021-02-26 10:37 [PATCHv3] media/rc: compile rc-cec.c into rc-core Hans Verkuil
@ 2021-02-26 10:43 ` Sean Young
2021-02-26 10:47 ` Hans Verkuil
0 siblings, 1 reply; 3+ messages in thread
From: Sean Young @ 2021-02-26 10:43 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List, Hans de Goede
On Fri, Feb 26, 2021 at 11:37:47AM +0100, Hans Verkuil wrote:
> The rc-cec keymap is unusual in that it can't be built as a module,
> instead it is registered directly in rc-main.c if CONFIG_MEDIA_CEC_RC
> is set. This is because it can be called from drm_dp_cec_set_edid() via
> cec_register_adapter() in an asynchronous context, and it is not
> allowed to use request_module() to load rc-cec.ko in that case. Trying to
> do so results in a 'WARN_ON_ONCE(wait && current_is_async())'.
>
> Since this keymap is only used if CONFIG_MEDIA_CEC_RC is set, we
> just compile this keymap into the rc-core module and never as a
> separate module.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> Fixes: 2c6d1fffa1d9 (drm: add support for DisplayPort CEC-Tunneling-over-AUX)
> Reported-by: Hans de Goede <hdegoede@redhat.com>
> ---
> Change since v2:
> Move 'extern struct rc_map_list cec_map;' to rc-map.h to fix sparse warning.
>
> Change since v1:
> Fix copy-and-paste error: rc_core_exit() called rc_map_register() instead
> of rc_map_unregister().
> ---
> drivers/media/rc/Makefile | 1 +
> drivers/media/rc/keymaps/Makefile | 1 -
> drivers/media/rc/keymaps/rc-cec.c | 28 +++++++++++-----------------
> drivers/media/rc/rc-main.c | 6 ++++++
> include/media/rc-map.h | 7 +++++++
> 5 files changed, 25 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
> index 5bb2932ab119..ff6a8fc4c38e 100644
> --- a/drivers/media/rc/Makefile
> +++ b/drivers/media/rc/Makefile
> @@ -5,6 +5,7 @@ obj-y += keymaps/
> obj-$(CONFIG_RC_CORE) += rc-core.o
> rc-core-y := rc-main.o rc-ir-raw.o
> rc-core-$(CONFIG_LIRC) += lirc_dev.o
> +rc-core-$(CONFIG_MEDIA_CEC_RC) += keymaps/rc-cec.o
> rc-core-$(CONFIG_BPF_LIRC_MODE2) += bpf-lirc.o
> obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
> obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
> diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
> index b252a1d2ebd6..cc6662e1903f 100644
> --- a/drivers/media/rc/keymaps/Makefile
> +++ b/drivers/media/rc/keymaps/Makefile
> @@ -21,7 +21,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
> rc-behold.o \
> rc-behold-columbus.o \
> rc-budget-ci-old.o \
> - rc-cec.o \
> rc-cinergy-1400.o \
> rc-cinergy.o \
> rc-d680-dmb.o \
> diff --git a/drivers/media/rc/keymaps/rc-cec.c b/drivers/media/rc/keymaps/rc-cec.c
> index 3e3bd11092b4..068e22aeac8c 100644
> --- a/drivers/media/rc/keymaps/rc-cec.c
> +++ b/drivers/media/rc/keymaps/rc-cec.c
> @@ -1,5 +1,15 @@
> // SPDX-License-Identifier: GPL-2.0-or-later
> /* Keytable for the CEC remote control
> + *
> + * This keymap is unusual in that it can't be built as a module,
> + * instead it is registered directly in rc-main.c if CONFIG_MEDIA_CEC_RC
> + * is set. This is because it can be called from drm_dp_cec_set_edid() via
> + * cec_register_adapter() in an asynchronous context, and it is not
> + * allowed to use request_module() to load rc-cec.ko in that case.
> + *
> + * Since this keymap is only used if CONFIG_MEDIA_CEC_RC is set, we
> + * just compile this keymap into the rc-core module and never as a
> + * separate module.
> *
> * Copyright (c) 2015 by Kamil Debski
> */
> @@ -152,7 +162,7 @@ static struct rc_map_table cec[] = {
> /* 0x77-0xff: Reserved */
> };
>
> -static struct rc_map_list cec_map = {
> +struct rc_map_list cec_map = {
> .map = {
> .scan = cec,
> .size = ARRAY_SIZE(cec),
> @@ -160,19 +170,3 @@ static struct rc_map_list cec_map = {
> .name = RC_MAP_CEC,
> }
> };
> -
> -static int __init init_rc_map_cec(void)
> -{
> - return rc_map_register(&cec_map);
> -}
> -
> -static void __exit exit_rc_map_cec(void)
> -{
> - rc_map_unregister(&cec_map);
> -}
> -
> -module_init(init_rc_map_cec);
> -module_exit(exit_rc_map_cec);
> -
> -MODULE_LICENSE("GPL");
> -MODULE_AUTHOR("Kamil Debski");
> diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
> index 1fd62c1dac76..8e88dc8ea6c5 100644
> --- a/drivers/media/rc/rc-main.c
> +++ b/drivers/media/rc/rc-main.c
> @@ -2069,6 +2069,9 @@ static int __init rc_core_init(void)
>
> led_trigger_register_simple("rc-feedback", &led_feedback);
> rc_map_register(&empty_map);
> +#ifdef CONFIG_MEDIA_CEC_RC
> + rc_map_register(&cec_map);
> +#endif
>
> return 0;
> }
> @@ -2078,6 +2081,9 @@ static void __exit rc_core_exit(void)
> lirc_dev_exit();
> class_unregister(&rc_class);
> led_trigger_unregister_simple(led_feedback);
> +#ifdef CONFIG_MEDIA_CEC_RC
> + rc_map_unregister(&cec_map);
> +#endif
> rc_map_unregister(&empty_map);
> }
>
> diff --git a/include/media/rc-map.h b/include/media/rc-map.h
> index 999b750bc6b8..30f138ebab6f 100644
> --- a/include/media/rc-map.h
> +++ b/include/media/rc-map.h
> @@ -175,6 +175,13 @@ struct rc_map_list {
> struct rc_map map;
> };
>
> +#ifdef CONFIG_MEDIA_CEC_RC
> +/*
> + * rc_map_list from rc-cec.c
> + */
> +extern struct rc_map_list cec_map;
> +#endif
> +
Maybe this belongs into rc-core-priv.h
Sorry about all the complaints :-/
Sean
> /* Routines from rc-map.c */
>
> /**
> --
> 2.30.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCHv3] media/rc: compile rc-cec.c into rc-core
2021-02-26 10:43 ` Sean Young
@ 2021-02-26 10:47 ` Hans Verkuil
0 siblings, 0 replies; 3+ messages in thread
From: Hans Verkuil @ 2021-02-26 10:47 UTC (permalink / raw)
To: Sean Young; +Cc: Linux Media Mailing List, Hans de Goede
On 26/02/2021 11:43, Sean Young wrote:
> On Fri, Feb 26, 2021 at 11:37:47AM +0100, Hans Verkuil wrote:
>> The rc-cec keymap is unusual in that it can't be built as a module,
>> instead it is registered directly in rc-main.c if CONFIG_MEDIA_CEC_RC
>> is set. This is because it can be called from drm_dp_cec_set_edid() via
>> cec_register_adapter() in an asynchronous context, and it is not
>> allowed to use request_module() to load rc-cec.ko in that case. Trying to
>> do so results in a 'WARN_ON_ONCE(wait && current_is_async())'.
>>
>> Since this keymap is only used if CONFIG_MEDIA_CEC_RC is set, we
>> just compile this keymap into the rc-core module and never as a
>> separate module.
>>
>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>> Fixes: 2c6d1fffa1d9 (drm: add support for DisplayPort CEC-Tunneling-over-AUX)
>> Reported-by: Hans de Goede <hdegoede@redhat.com>
>> ---
>> Change since v2:
>> Move 'extern struct rc_map_list cec_map;' to rc-map.h to fix sparse warning.
>>
>> Change since v1:
>> Fix copy-and-paste error: rc_core_exit() called rc_map_register() instead
>> of rc_map_unregister().
>> ---
>> drivers/media/rc/Makefile | 1 +
>> drivers/media/rc/keymaps/Makefile | 1 -
>> drivers/media/rc/keymaps/rc-cec.c | 28 +++++++++++-----------------
>> drivers/media/rc/rc-main.c | 6 ++++++
>> include/media/rc-map.h | 7 +++++++
>> 5 files changed, 25 insertions(+), 18 deletions(-)
>>
>> diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
>> index 5bb2932ab119..ff6a8fc4c38e 100644
>> --- a/drivers/media/rc/Makefile
>> +++ b/drivers/media/rc/Makefile
>> @@ -5,6 +5,7 @@ obj-y += keymaps/
>> obj-$(CONFIG_RC_CORE) += rc-core.o
>> rc-core-y := rc-main.o rc-ir-raw.o
>> rc-core-$(CONFIG_LIRC) += lirc_dev.o
>> +rc-core-$(CONFIG_MEDIA_CEC_RC) += keymaps/rc-cec.o
>> rc-core-$(CONFIG_BPF_LIRC_MODE2) += bpf-lirc.o
>> obj-$(CONFIG_IR_NEC_DECODER) += ir-nec-decoder.o
>> obj-$(CONFIG_IR_RC5_DECODER) += ir-rc5-decoder.o
>> diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile
>> index b252a1d2ebd6..cc6662e1903f 100644
>> --- a/drivers/media/rc/keymaps/Makefile
>> +++ b/drivers/media/rc/keymaps/Makefile
>> @@ -21,7 +21,6 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
>> rc-behold.o \
>> rc-behold-columbus.o \
>> rc-budget-ci-old.o \
>> - rc-cec.o \
>> rc-cinergy-1400.o \
>> rc-cinergy.o \
>> rc-d680-dmb.o \
>> diff --git a/drivers/media/rc/keymaps/rc-cec.c b/drivers/media/rc/keymaps/rc-cec.c
>> index 3e3bd11092b4..068e22aeac8c 100644
>> --- a/drivers/media/rc/keymaps/rc-cec.c
>> +++ b/drivers/media/rc/keymaps/rc-cec.c
>> @@ -1,5 +1,15 @@
>> // SPDX-License-Identifier: GPL-2.0-or-later
>> /* Keytable for the CEC remote control
>> + *
>> + * This keymap is unusual in that it can't be built as a module,
>> + * instead it is registered directly in rc-main.c if CONFIG_MEDIA_CEC_RC
>> + * is set. This is because it can be called from drm_dp_cec_set_edid() via
>> + * cec_register_adapter() in an asynchronous context, and it is not
>> + * allowed to use request_module() to load rc-cec.ko in that case.
>> + *
>> + * Since this keymap is only used if CONFIG_MEDIA_CEC_RC is set, we
>> + * just compile this keymap into the rc-core module and never as a
>> + * separate module.
>> *
>> * Copyright (c) 2015 by Kamil Debski
>> */
>> @@ -152,7 +162,7 @@ static struct rc_map_table cec[] = {
>> /* 0x77-0xff: Reserved */
>> };
>>
>> -static struct rc_map_list cec_map = {
>> +struct rc_map_list cec_map = {
>> .map = {
>> .scan = cec,
>> .size = ARRAY_SIZE(cec),
>> @@ -160,19 +170,3 @@ static struct rc_map_list cec_map = {
>> .name = RC_MAP_CEC,
>> }
>> };
>> -
>> -static int __init init_rc_map_cec(void)
>> -{
>> - return rc_map_register(&cec_map);
>> -}
>> -
>> -static void __exit exit_rc_map_cec(void)
>> -{
>> - rc_map_unregister(&cec_map);
>> -}
>> -
>> -module_init(init_rc_map_cec);
>> -module_exit(exit_rc_map_cec);
>> -
>> -MODULE_LICENSE("GPL");
>> -MODULE_AUTHOR("Kamil Debski");
>> diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
>> index 1fd62c1dac76..8e88dc8ea6c5 100644
>> --- a/drivers/media/rc/rc-main.c
>> +++ b/drivers/media/rc/rc-main.c
>> @@ -2069,6 +2069,9 @@ static int __init rc_core_init(void)
>>
>> led_trigger_register_simple("rc-feedback", &led_feedback);
>> rc_map_register(&empty_map);
>> +#ifdef CONFIG_MEDIA_CEC_RC
>> + rc_map_register(&cec_map);
>> +#endif
>>
>> return 0;
>> }
>> @@ -2078,6 +2081,9 @@ static void __exit rc_core_exit(void)
>> lirc_dev_exit();
>> class_unregister(&rc_class);
>> led_trigger_unregister_simple(led_feedback);
>> +#ifdef CONFIG_MEDIA_CEC_RC
>> + rc_map_unregister(&cec_map);
>> +#endif
>> rc_map_unregister(&empty_map);
>> }
>>
>> diff --git a/include/media/rc-map.h b/include/media/rc-map.h
>> index 999b750bc6b8..30f138ebab6f 100644
>> --- a/include/media/rc-map.h
>> +++ b/include/media/rc-map.h
>> @@ -175,6 +175,13 @@ struct rc_map_list {
>> struct rc_map map;
>> };
>>
>> +#ifdef CONFIG_MEDIA_CEC_RC
>> +/*
>> + * rc_map_list from rc-cec.c
>> + */
>> +extern struct rc_map_list cec_map;
>> +#endif
>> +
>
> Maybe this belongs into rc-core-priv.h
I tried that first, but then I need to include "../rc-core-priv.h" in
rc-cec.c, which didn't feel quite right either. rc-cec.h really shouldn't
include a private header of rc-core, and having to add '../' isn't very
nice either (and often gives problems with media_build).
If you really want that, let me know and I'll post a v4.
Regards,
Hans
>
> Sorry about all the complaints :-/
>
>
> Sean
>
>> /* Routines from rc-map.c */
>>
>> /**
>> --
>> 2.30.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-26 10:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-26 10:37 [PATCHv3] media/rc: compile rc-cec.c into rc-core Hans Verkuil
2021-02-26 10:43 ` Sean Young
2021-02-26 10:47 ` Hans Verkuil
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.