rtdm: realtime_core_enabled cleanups
cover rtdm: realtime_core_enabled cleanups
This adds a proper RTDM interface for realtime_core_enabled and also converts existing users to a less invasive - because correctly failing - usage pattern.
Jan
Jan Kiszka (11):
rtdm: Harden key services against invocations with disabled core
rtdm: Introduce rtdm_available()
drivers: Remove unneeded realtime_core_enabled checks drivers/udd: Consolidate over ENOSYS on disabled core drivers/rtipc: Convert to rtdm_available and clean up drivers/analogy: Convert to rtdm_available and clean up drivers/serial: Convert to rtdm_available() and clean up drivers/net: Do not load when the core is not available drivers/gpio: Convert to rtdm_available() and clean up drivers/can: Convert to rtdm_available() and clean up drivers/can: Convert to module_pci_driver
include/cobalt/kernel/rtdm/driver.h | 5 +++++ kernel/cobalt/rtdm/device.c | 2 +- kernel/cobalt/rtdm/drvlib.c | 23 +++++++++++++++++++++++ kernel/drivers/analogy/driver.c | 6 ------ kernel/drivers/analogy/rtdm_interface.c | 7 ++----- kernel/drivers/autotune/autotune.c | 6 ------ kernel/drivers/can/rtcan_module.c | 7 ++----- kernel/drivers/can/rtcan_virt.c | 6 ------ kernel/drivers/can/sja1000/rtcan_adv_pci.c | 17 +---------------- kernel/drivers/can/sja1000/rtcan_ems_pci.c | 17 +---------------- kernel/drivers/can/sja1000/rtcan_esd_pci.c | 17 +---------------- kernel/drivers/can/sja1000/rtcan_isa.c | 6 ------ kernel/drivers/can/sja1000/rtcan_ixxat_pci.c | 18 +----------------- kernel/drivers/can/sja1000/rtcan_mem.c | 6 ------ kernel/drivers/can/sja1000/rtcan_peak_dng.c | 6 ------ kernel/drivers/can/sja1000/rtcan_peak_pci.c | 18 +----------------- kernel/drivers/can/sja1000/rtcan_plx_pci.c | 17 +---------------- kernel/drivers/can/sja1000/rtcan_sja1000.c | 9 +++------ kernel/drivers/gpio/gpio-core.c | 7 ++----- kernel/drivers/gpiopwm/gpiopwm.c | 3 --- kernel/drivers/ipc/rtipc.c | 7 ++----- kernel/drivers/net/stack/rtnet_module.c | 3 +++ kernel/drivers/serial/16550A.c | 7 ++----- kernel/drivers/serial/mpc52xx_uart.c | 7 +++---- kernel/drivers/serial/rt_imx_uart.c | 7 +++---- kernel/drivers/testing/heapcheck.c | 3 --- kernel/drivers/testing/rtdmtest.c | 3 --- kernel/drivers/testing/switchtest.c | 6 ------ kernel/drivers/testing/timerbench.c | 6 ------ kernel/drivers/udd/udd.c | 9 +-------- 30 files changed, 58 insertions(+), 203 deletions(-)
Signature · 1 line
2.16.4
PATCH 1/11 rtdm: Harden key services against invocations with disabled core
From: Jan Kiszka <[email protected]>
We already have check in rtdm_dev_register, but drivers (such as RTnet) may call other services without checking the core state. Then we risk crashes, rather than simple errors.
--- kernel/cobalt/rtdm/device.c | 2 +- kernel/cobalt/rtdm/drvlib.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
kernel/cobalt/rtdm/device.c +1 -1
@@ -380,7 +380,7 @@ static void unregister_driver(struct rtdm_driver *drv)* - -EAGAIN is returned if no registry slot is available (check/raise * CONFIG_XENO_OPT_REGISTRY_NRSLOTS). * -* - -ENOSYS is returned if cobalt is disabled +* - -ENOSYS is returned if the real-time core is disabled. * * - -ENXIO is returned if no valid minor could be assigned *
kernel/cobalt/rtdm/drvlib.c +8 -0
@@ -114,6 +114,9 @@ int rtdm_task_init(rtdm_task_t *task, const char *name,struct xnthread_init_attr iattr;int err; +if (!realtime_core_enabled ()) +return -ENOSYS ; + iattr.name = name; iattr.flags =0 ; iattr.personality = &xenomai_personality;
@@ -1418,6 +1421,8 @@ EXPORT_SYMBOL_GPL(rtdm_mutex_timedlock);* * - -EBUSY is returned if the specified IRQ line is already in use. * +* - -ENOSYS is returned if the real-time core is disabled. +* * @coretags{secondary-only} */ int rtdm_irq_request(rtdm_irq_t *irq_handle, unsigned int irq_no,
@@ -1426,6 +1431,9 @@ int rtdm_irq_request(rtdm_irq_t *irq_handle, unsigned int irq_no, {int err; +if (!realtime_core_enabled ()) +return -ENOSYS ; +if (!XENO_ASSERT (COBALT ,xnsched_root_p ()))return -EPERM ;
Signature · 1 line
2.16.4
PATCH 2/11 rtdm: Introduce rtdm_available()
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This avoids layering violations in RTDM drivers by calling realtime_core_enabled() directly.
--- include/cobalt/kernel/rtdm/driver.h | 5 +++++ kernel/cobalt/rtdm/drvlib.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+)
include/cobalt/kernel/rtdm/driver.h +5 -0
@@ -1297,6 +1297,11 @@ static inline int rtdm_strncpy_from_user(struct rtdm_fd *fd,return cobalt_strncpy_from_user (dst, src, count); } +static inline bool rtdm_available (void ) +{ +return realtime_core_enabled (); +} +static inline int rtdm_rt_capable (struct rtdm_fd *fd) {if (!XENO_ASSERT (COBALT , !xnsched_interrupt_p ()))
kernel/cobalt/rtdm/drvlib.c +15 -0
@@ -2413,6 +2413,21 @@ int rtdm_in_rt_context(void);*/ int rtdm_rt_capable (struct rtdm_fd *fd); +/** +* Test if the real-time core is available +* +* @return True if the real-time is available, false if it is disabled or in +* error state. +* +* @note Drivers should query the core state during initialization if they +* perform hardware setup operations or interact with RTDM services such as +* locks prior to calling an RTDM service that has a built-in state check of +* the real-time core (e.g. rtdm_dev_register() or rtdm_task_init()). +* +* @coretags{unrestricted} +*/ +bool rtdm_available (void ); +#endif /* DOXYGEN_CPP */ /** @} Utility Services */
Signature · 1 line
2.16.4
PATCH 3/11 drivers: Remove unneeded realtime_core_enabled checks
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
It's not a good idea to load a driver module without functionality when the core is not available. Better fail with an error code so that the user gets proper feedback.
In several cases, this makes the existing realtime_core_enabled checks obviously superfluous because rtdm_dev_register already performs it.
--- kernel/drivers/autotune/autotune.c | 6 ------ kernel/drivers/gpiopwm/gpiopwm.c | 3 --- kernel/drivers/testing/heapcheck.c | 3 --- kernel/drivers/testing/rtdmtest.c | 3 --- kernel/drivers/testing/switchtest.c | 6 ------ kernel/drivers/testing/timerbench.c | 6 ------ 6 files changed, 27 deletions(-)
kernel/drivers/autotune/autotune.c +0 -6
@@ -784,17 +784,11 @@ static struct rtdm_device device = {static int __init autotune_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return rtdm_dev_register (&device); } static void __exit autotune_exit(void) { -if (!realtime_core_enabled ()) -return ; -rtdm_dev_unregister (&device); }
kernel/drivers/gpiopwm/gpiopwm.c +0 -3
@@ -272,9 +272,6 @@ static int __init __gpiopwm_init(void) {int i, ret; -if (!realtime_core_enabled ()) -return -ENODEV ; -for (i =0 ; i <ARRAY_SIZE (device); i++) { ret =rtdm_dev_register (device + i);if (ret)
kernel/drivers/testing/heapcheck.c +0 -3
@@ -500,9 +500,6 @@ static struct rtdm_device heapcheck_device = {static int __init heapcheck_init (void ) { -if (!realtime_core_enabled ()) -return -ENODEV ; -return rtdm_dev_register (&heapcheck_device); }
kernel/drivers/testing/rtdmtest.c +0 -3
@@ -265,9 +265,6 @@ static int __init rtdm_test_init(void) {int i, ret; -if (!realtime_core_enabled ()) -return -ENODEV ; -for (i =0 ; i <ARRAY_SIZE (device); i++) { ret =rtdm_dev_register (device + i);if (ret)
kernel/drivers/testing/switchtest.c +0 -6
@@ -738,9 +738,6 @@ static struct rtdm_device device = {int __init __switchtest_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; - fp_features =fp_detect ();return rtdm_dev_register (&device);
@@ -748,9 +745,6 @@ int __init __switchtest_init(void)void __switchtest_exit (void ) { -if (!realtime_core_enabled ()) -return ; -rtdm_dev_unregister (&device); }
kernel/drivers/testing/timerbench.c +0 -6
@@ -517,17 +517,11 @@ static struct rtdm_device device = {static int __init __timerbench_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return rtdm_dev_register (&device); }static void __timerbench_exit (void ) { -if (!realtime_core_enabled ()) -return ; -rtdm_dev_unregister (&device); }
Signature · 1 line
2.16.4
PATCH 4/11 drivers/udd: Consolidate over ENOSYS on disabled core
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Drop the duplicate checks - rtdm_dev_register will already fail. And as udd_register_device fails, there is no point in protecting udd_unregister_device because there will be no device to unregister.
--- kernel/drivers/udd/udd.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
kernel/drivers/udd/udd.c +1 -8
@@ -347,8 +347,7 @@ undo:* * - -EINVAL, if udd_device.device_flags contains invalid flags. * -* - -ENXIO can be received if this service is called while the Cobalt -* kernel is disabled. +* - -ENOSYS, if this service is called while the real-time core is disabled. * * @coretags{secondary-only} */
@@ -360,9 +359,6 @@ int udd_register_device(struct udd_device *udd)struct udd_memregion *rn;int ret, n; -if (!realtime_core_enabled ()) -return -ENXIO ; -if (udd->device_flags &RTDM_PROTOCOL_DEVICE )return -EINVAL ;
@@ -459,9 +455,6 @@ int udd_unregister_device(struct udd_device *udd)struct udd_memregion *rn;int n; -if (!realtime_core_enabled ()) -return -ENXIO ; -rtdm_event_destroy (&ur->pulse);if (udd->irq !=UDD_IRQ_NONE && udd->irq !=UDD_IRQ_CUSTOM )
Signature · 1 line
2.16.4
PATCH 5/11 drivers/rtipc: Convert to rtdm_available and clean up
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Properly fail if the core is not available. This also obsoletes the check on exit.
--- kernel/drivers/ipc/rtipc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
kernel/drivers/ipc/rtipc.c +2 -5
@@ -493,8 +493,8 @@ int __init __rtipc_init(void) {int ret, n; -if (!realtime_core_enabled ()) -return 0 ; +if (!rtdm_available ()) +return -ENOSYS ;for (n =0 ; n <IPCPROTO_MAX ; n++) {if (protocols[n] && protocols[n]->proto_init) {
@@ -511,9 +511,6 @@ void __exit __rtipc_exit(void) {int n; -if (!realtime_core_enabled ()) -return ; -rtdm_dev_unregister (&device);for (n =0 ; n <IPCPROTO_MAX ; n++) {
Signature · 1 line
2.16.4
PATCH 6/11 drivers/analogy: Convert to rtdm_available and clean up
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Properly fail when the core is not available. Remove now obsolete further checks because the functions will not longer be executed in that case.
--- kernel/drivers/analogy/driver.c | 6 ------ kernel/drivers/analogy/rtdm_interface.c | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-)
kernel/drivers/analogy/driver.c +0 -6
@@ -55,9 +55,6 @@ int a4l_lct_drv(char *pin, struct a4l_driver ** pio)int a4l_register_drv (struct a4l_driver * drv) { -if (!realtime_core_enabled ()) -return 0 ; -__a4l_dbg (1 , core_dbg,"board name=%s\n" , drv->board_name);if (a4l_lct_drv (drv->board_name,NULL ) !=0 ) {
@@ -69,9 +66,6 @@ int a4l_register_drv(struct a4l_driver * drv)int a4l_unregister_drv (struct a4l_driver * drv) { -if (!realtime_core_enabled ()) -return 0 ; -__a4l_dbg (1 , core_dbg,"board name=%s\n" , drv->board_name);if (a4l_lct_drv (drv->board_name,NULL ) ==0 ) {
kernel/drivers/analogy/rtdm_interface.c +2 -5
@@ -274,8 +274,8 @@ static int __init a4l_init(void) {int ret; -if (!realtime_core_enabled ()) -return 0 ; +if (!rtdm_available ()) +return -ENOSYS ;/* Initializes the devices */ a4l_init_devs ();
@@ -299,9 +299,6 @@ out_a4l_init: static void __exit a4l_cleanup(void) { -if (!realtime_core_enabled ()) -return ; -/* Removes Analogy proc files */ a4l_cleanup_proc ();
Signature · 1 line
2.16.4
PATCH 7/11 drivers/serial: Convert to rtdm_available() and clean up
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Properly fail if the core is not available. This also obsoletes the check on exit.
--- kernel/drivers/serial/16550A.c | 7 ++----- kernel/drivers/serial/mpc52xx_uart.c | 7 +++---- kernel/drivers/serial/rt_imx_uart.c | 7 +++---- 3 files changed, 8 insertions(+), 13 deletions(-)
kernel/drivers/serial/16550A.c +2 -5
@@ -1103,8 +1103,8 @@ int __init rt_16550_init(void)int err;int i; -if (!realtime_core_enabled ()) -return 0 ; +if (!rtdm_available ()) +return -ENODEV ;rt_16550_pnp_init ();rt_16550_pci_init ();
@@ -1173,9 +1173,6 @@ void rt_16550_exit(void) {int i; -if (!realtime_core_enabled ()) -return ; -for (i =0 ; i <MAX_DEVICES ; i++)if (device[i]) {rtdm_dev_unregister (device[i]);
kernel/drivers/serial/mpc52xx_uart.c +3 -4
@@ -1411,8 +1411,8 @@ static int __init rt_mpc52xx_uart_init(void) {int ret; -if (!realtime_core_enabled ()) -return 0 ; +if (!rtdm_available ()) +return -ENODEV ;printk (KERN_INFO "RTserial: MPC52xx PSC UART driver\n" );
@@ -1431,8 +1431,7 @@ static int __init rt_mpc52xx_uart_init(void) static void __exit rt_mpc52xx_uart_exit(void) { -if (realtime_core_enabled ()) -platform_driver_unregister (&rt_mpc52xx_uart_of_driver); +platform_driver_unregister (&rt_mpc52xx_uart_of_driver); }module_init (rt_mpc52xx_uart_init);
kernel/drivers/serial/rt_imx_uart.c +3 -4
@@ -1656,8 +1656,8 @@ static int __init rt_imx_uart_init(void) {int ret; -if (!realtime_core_enabled ()) -return 0 ; +if (!rtdm_available ()) +return -ENODEV ; ret =platform_driver_register (&rt_imx_uart_driver);if (ret) {
@@ -1670,8 +1670,7 @@ static int __init rt_imx_uart_init(void) static void __exit rt_imx_uart_exit(void) { -if (realtime_core_enabled ()) -platform_driver_unregister (&rt_imx_uart_driver); +platform_driver_unregister (&rt_imx_uart_driver); }module_init (rt_imx_uart_init);
Signature · 1 line
2.16.4
PATCH 8/11 drivers/net: Do not load when the core is not available
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Using the new rtdm_available() interface, this prevents any RTnet module from being loaded when the real-time core is not available.
--- kernel/drivers/net/stack/rtnet_module.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/drivers/net/stack/rtnet_module.c +3 -0
@@ -318,6 +318,9 @@ int __init rtnet_init(void) {int err =0 ; +if (!rtdm_available ()) +return -ENOSYS ; +printk ("\n*** RTnet for Xenomai v" XENO_VERSION_STRING " ***\n\n" );printk ("RTnet: initialising real-time networking\n" );
Signature · 1 line
2.16.4
PATCH 9/11 drivers/gpio: Convert to rtdm_available() and clean up
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Properly fail if the core is not available. This also obsoletes the check on exit.
--- kernel/drivers/gpio/gpio-core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
kernel/drivers/gpio/gpio-core.c +2 -5
@@ -564,8 +564,8 @@ int rtdm_gpiochip_scan_of(struct device_node *from, const char *compat,struct rtdm_gpio_chip *rgc;int ret = -ENODEV , _ret; -if (!realtime_core_enabled ()) -return 0 ; +if (!rtdm_available ()) +return -ENOSYS ;for (;;) { np =of_find_compatible_node (np,NULL , compat);
@@ -622,9 +622,6 @@ void rtdm_gpiochip_remove_of(int type) {struct rtdm_gpio_chip *rgc, *n; -if (!realtime_core_enabled ()) -return ; -mutex_lock (&chip_lock);list_for_each_entry_safe (rgc, n, &rtdm_gpio_chips, next) {
Signature · 1 line
2.16.4
PATCH 10/11 drivers/can: Convert to rtdm_available() and clean up
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Properly fail if the core is not available. Doing this in the central CAN module avoids that we have to check in each and every driver.
--- kernel/drivers/can/rtcan_module.c | 7 ++----- kernel/drivers/can/rtcan_virt.c | 6 ------ kernel/drivers/can/sja1000/rtcan_adv_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_ems_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_esd_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_isa.c | 6 ------ kernel/drivers/can/sja1000/rtcan_ixxat_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_mem.c | 6 ------ kernel/drivers/can/sja1000/rtcan_peak_dng.c | 6 ------ kernel/drivers/can/sja1000/rtcan_peak_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_plx_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_sja1000.c | 9 +++------ 12 files changed, 11 insertions(+), 65 deletions(-)
kernel/drivers/can/rtcan_module.c +2 -5
@@ -415,8 +415,8 @@ int __init rtcan_init(void) {int err =0 ; -if (!realtime_core_enabled ()) -return 0 ; +if (!rtdm_available ()) +return -ENOSYS ; printk("RT-Socket-CAN %d.%d.%d - %s\n", RTCAN_MAJOR_VER, RTCAN_MINOR_VER, RTCAN_BUGFIX_VER,
@@ -437,9 +437,6 @@ int __init rtcan_init(void) void __exit rtcan_exit(void) { -if (!realtime_core_enabled ()) -return ; -rtcan_raw_proto_unregister ();#ifdef CONFIG_PROC_FS rtcan_proc_unregister ();
kernel/drivers/can/rtcan_virt.c +0 -6
@@ -157,9 +157,6 @@ static int __init rtcan_virt_init(void) {int i, err =0 ; -if (!realtime_core_enabled ()) -return 0 ; -for (i =0 ; i < devices; i++) { err =rtcan_virt_init_one (i);if (err) {
@@ -183,9 +180,6 @@ static void __exit rtcan_virt_exit(void)int i;struct rtcan_device *dev; -if (!realtime_core_enabled ()) -return ; -for (i =0 ; i < devices; i++) { dev = rtcan_virt_devs[i];
kernel/drivers/can/sja1000/rtcan_adv_pci.c +1 -5
@@ -357,16 +357,12 @@ static struct pci_driver rtcan_adv_pci_driver = {static int __init rtcan_adv_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&rtcan_adv_pci_driver); } static void __exit rtcan_adv_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&rtcan_adv_pci_driver); +pci_unregister_driver (&rtcan_adv_pci_driver); }module_init (rtcan_adv_pci_init);
kernel/drivers/can/sja1000/rtcan_ems_pci.c +1 -5
@@ -390,16 +390,12 @@ static struct pci_driver ems_pci_driver = {static int __init ems_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&ems_pci_driver); } static void __exit ems_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&ems_pci_driver); +pci_unregister_driver (&ems_pci_driver); }module_init (ems_pci_init);
kernel/drivers/can/sja1000/rtcan_esd_pci.c +1 -5
@@ -342,16 +342,12 @@ static struct pci_driver rtcan_esd_pci_driver = {static int __init rtcan_esd_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&rtcan_esd_pci_driver); } static void __exit rtcan_esd_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&rtcan_esd_pci_driver); +pci_unregister_driver (&rtcan_esd_pci_driver); }module_init (rtcan_esd_pci_init);
kernel/drivers/can/sja1000/rtcan_isa.c +0 -6
@@ -161,9 +161,6 @@ static int __init rtcan_isa_init(void)int i, err;int devices =0 ; -if (!realtime_core_enabled ()) -return 0 ; -for (i =0 ; i <RTCAN_ISA_MAX_DEV && io[i] !=0 ; i++) { err =rtcan_isa_init_one (i);if (err) {
@@ -187,9 +184,6 @@ static void rtcan_isa_exit(void)int i;struct rtcan_device *dev; -if (!realtime_core_enabled ()) -return ; -for (i =0 ; i <RTCAN_ISA_MAX_DEV ; i++) { dev = rtcan_isa_devs[i];if (!dev)
kernel/drivers/can/sja1000/rtcan_ixxat_pci.c +1 -5
@@ -296,17 +296,13 @@ static struct pci_driver rtcan_ixxat_pci_driver = {static int __init rtcan_ixxat_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&rtcan_ixxat_pci_driver); } static void __exit rtcan_ixxat_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&rtcan_ixxat_pci_driver); +pci_unregister_driver (&rtcan_ixxat_pci_driver); }module_init (rtcan_ixxat_pci_init);
kernel/drivers/can/sja1000/rtcan_mem.c +0 -6
@@ -173,9 +173,6 @@ static int __init rtcan_mem_init(void)int i, err;int devices =0 ; -if (!realtime_core_enabled ()) -return 0 ; -for (i =0 ; i <RTCAN_MEM_MAX_DEV && mem[i] !=0 ; i++) { err =rtcan_mem_init_one (i);if (err) {
@@ -200,9 +197,6 @@ static void rtcan_mem_exit(void)struct rtcan_device *dev;volatile void __iomem *vmem; -if (!realtime_core_enabled ()) -return ; -for (i =0 ; i <RTCAN_MEM_MAX_DEV ; i++) { dev = rtcan_mem_devs[i];if (!dev)
kernel/drivers/can/sja1000/rtcan_peak_dng.c +0 -6
@@ -345,9 +345,6 @@ static void rtcan_peak_dng_exit(void)int i;struct rtcan_device *dev; -if (!realtime_core_enabled ()) -return ; -for (i =0 , dev = rtcan_peak_dng_devs[i]; i <RTCAN_PEAK_DNG_MAX_DEV && dev !=NULL ; i++)
@@ -362,9 +359,6 @@ static int __init rtcan_peak_dng_init(void) {int i, ret = -EINVAL , done =0 ; -if (!realtime_core_enabled ()) -return 0 ; -if (pnp_register_driver (&rtcan_peak_dng_pnp_driver) ==0 ) pnp_registered =1 ;
kernel/drivers/can/sja1000/rtcan_peak_pci.c +1 -5
@@ -353,17 +353,13 @@ static struct pci_driver rtcan_peak_pci_driver = {static int __init rtcan_peak_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&rtcan_peak_pci_driver); } static void __exit rtcan_peak_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&rtcan_peak_pci_driver); +pci_unregister_driver (&rtcan_peak_pci_driver); }module_init (rtcan_peak_pci_init);
kernel/drivers/can/sja1000/rtcan_plx_pci.c +1 -5
@@ -596,16 +596,12 @@ static struct pci_driver plx_pci_driver = {static int __init plx_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&plx_pci_driver); } static void __exit plx_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&plx_pci_driver); +pci_unregister_driver (&plx_pci_driver); }module_init (plx_pci_init);
kernel/drivers/can/sja1000/rtcan_sja1000.c +3 -6
@@ -822,17 +822,14 @@ void rtcan_sja1000_unregister(struct rtcan_device *dev)int __init rtcan_sja_init (void ) { -if (realtime_core_enabled ()) -printk ("RTCAN SJA1000 driver initialized\n" ); - -return 0 ; +printk ("RTCAN SJA1000 driver initialized\n" ); +return 0 ; } void __exit rtcan_sja_exit(void) { -if (realtime_core_enabled ()) -printk ("%s removed\n" , sja_ctrl_name); +printk ("%s removed\n" , sja_ctrl_name); }module_init (rtcan_sja_init);
Signature · 1 line
2.16.4
Re: [PATCH 10/11] drivers/can: Convert to rtdm_available() and clean up
Quoted 4 lines · Jan Kiszka via Xenomai
From: Jan Kiszka <[email protected]>
Properly fail if the core is not available. Doing this in the central CAN module avoids that we have to check in each and every driver.
Nah, this pattern does not work if the module is built in. But we can still catch many cases centrally by blocking the registration. Let me try again...
Jan
Quoted 298 lines
Signed-off-by Jan Kiszka <[email protected]>--- kernel/drivers/can/rtcan_module.c | 7 ++----- kernel/drivers/can/rtcan_virt.c | 6 ------ kernel/drivers/can/sja1000/rtcan_adv_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_ems_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_esd_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_isa.c | 6 ------ kernel/drivers/can/sja1000/rtcan_ixxat_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_mem.c | 6 ------ kernel/drivers/can/sja1000/rtcan_peak_dng.c | 6 ------ kernel/drivers/can/sja1000/rtcan_peak_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_plx_pci.c | 6 +----- kernel/drivers/can/sja1000/rtcan_sja1000.c | 9 +++------ 12 files changed, 11 insertions(+), 65 deletions(-)kernel/drivers/can/rtcan_module.c +2
-5@@ -415,8 +415,8 @@ int __init rtcan_init(void) {int err =0 ; -if (!realtime_core_enabled ()) -return 0 ; +if (!rtdm_available ()) +return -ENOSYS ; printk("RT-Socket-CAN %d.%d.%d - %s\n", RTCAN_MAJOR_VER, RTCAN_MINOR_VER, RTCAN_BUGFIX_VER,@@ -437,9 +437,6 @@ int __init rtcan_init(void) void __exit rtcan_exit(void) { -if (!realtime_core_enabled ()) -return ; -rtcan_raw_proto_unregister ();#ifdef CONFIG_PROC_FS rtcan_proc_unregister ();kernel/drivers/can/rtcan_virt.c +0
-6@@ -157,9 +157,6 @@ static int __init rtcan_virt_init(void) {int i, err =0 ; -if (!realtime_core_enabled ()) -return 0 ; -for (i =0 ; i < devices; i++) { err =rtcan_virt_init_one (i);if (err) {@@ -183,9 +180,6 @@ static void __exit rtcan_virt_exit(void)int i;struct rtcan_device *dev; -if (!realtime_core_enabled ()) -return ; -for (i =0 ; i < devices; i++) { dev = rtcan_virt_devs[i];kernel/drivers/can/sja1000/rtcan_adv_pci.c +1
-5@@ -357,16 +357,12 @@ static struct pci_driver rtcan_adv_pci_driver = {static int __init rtcan_adv_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&rtcan_adv_pci_driver); } static void __exit rtcan_adv_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&rtcan_adv_pci_driver); +pci_unregister_driver (&rtcan_adv_pci_driver); }module_init (rtcan_adv_pci_init);kernel/drivers/can/sja1000/rtcan_ems_pci.c +1
-5@@ -390,16 +390,12 @@ static struct pci_driver ems_pci_driver = {static int __init ems_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&ems_pci_driver); } static void __exit ems_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&ems_pci_driver); +pci_unregister_driver (&ems_pci_driver); }module_init (ems_pci_init);kernel/drivers/can/sja1000/rtcan_esd_pci.c +1
-5@@ -342,16 +342,12 @@ static struct pci_driver rtcan_esd_pci_driver = {static int __init rtcan_esd_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&rtcan_esd_pci_driver); } static void __exit rtcan_esd_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&rtcan_esd_pci_driver); +pci_unregister_driver (&rtcan_esd_pci_driver); }module_init (rtcan_esd_pci_init);kernel/drivers/can/sja1000/rtcan_isa.c +0
-6@@ -161,9 +161,6 @@ static int __init rtcan_isa_init(void)int i, err;int devices =0 ; -if (!realtime_core_enabled ()) -return 0 ; -for (i =0 ; i <RTCAN_ISA_MAX_DEV && io[i] !=0 ; i++) { err =rtcan_isa_init_one (i);if (err) {@@ -187,9 +184,6 @@ static void rtcan_isa_exit(void)int i;struct rtcan_device *dev; -if (!realtime_core_enabled ()) -return ; -for (i =0 ; i <RTCAN_ISA_MAX_DEV ; i++) { dev = rtcan_isa_devs[i];if (!dev)kernel/drivers/can/sja1000/rtcan_ixxat_pci.c +1
-5@@ -296,17 +296,13 @@ static struct pci_driver rtcan_ixxat_pci_driver = {static int __init rtcan_ixxat_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&rtcan_ixxat_pci_driver); } static void __exit rtcan_ixxat_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&rtcan_ixxat_pci_driver); +pci_unregister_driver (&rtcan_ixxat_pci_driver); }module_init (rtcan_ixxat_pci_init);kernel/drivers/can/sja1000/rtcan_mem.c +0
-6@@ -173,9 +173,6 @@ static int __init rtcan_mem_init(void)int i, err;int devices =0 ; -if (!realtime_core_enabled ()) -return 0 ; -for (i =0 ; i <RTCAN_MEM_MAX_DEV && mem[i] !=0 ; i++) { err =rtcan_mem_init_one (i);if (err) {@@ -200,9 +197,6 @@ static void rtcan_mem_exit(void)struct rtcan_device *dev;volatile void __iomem *vmem; -if (!realtime_core_enabled ()) -return ; -for (i =0 ; i <RTCAN_MEM_MAX_DEV ; i++) { dev = rtcan_mem_devs[i];if (!dev)kernel/drivers/can/sja1000/rtcan_peak_dng.c +0
-6@@ -345,9 +345,6 @@ static void rtcan_peak_dng_exit(void)int i;struct rtcan_device *dev; -if (!realtime_core_enabled ()) -return ; -for (i =0 , dev = rtcan_peak_dng_devs[i]; i <RTCAN_PEAK_DNG_MAX_DEV && dev !=NULL ; i++)@@ -362,9 +359,6 @@ static int __init rtcan_peak_dng_init(void) {int i, ret = -EINVAL , done =0 ; -if (!realtime_core_enabled ()) -return 0 ; -if (pnp_register_driver (&rtcan_peak_dng_pnp_driver) ==0 ) pnp_registered =1 ;kernel/drivers/can/sja1000/rtcan_peak_pci.c +1
-5@@ -353,17 +353,13 @@ static struct pci_driver rtcan_peak_pci_driver = {static int __init rtcan_peak_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&rtcan_peak_pci_driver); } static void __exit rtcan_peak_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&rtcan_peak_pci_driver); +pci_unregister_driver (&rtcan_peak_pci_driver); }module_init (rtcan_peak_pci_init);kernel/drivers/can/sja1000/rtcan_plx_pci.c +1
-5@@ -596,16 +596,12 @@ static struct pci_driver plx_pci_driver = {static int __init plx_pci_init (void ) { -if (!realtime_core_enabled ()) -return 0 ; -return pci_register_driver (&plx_pci_driver); } static void __exit plx_pci_exit(void) { -if (realtime_core_enabled ()) -pci_unregister_driver (&plx_pci_driver); +pci_unregister_driver (&plx_pci_driver); }module_init (plx_pci_init);kernel/drivers/can/sja1000/rtcan_sja1000.c +3
-6@@ -822,17 +822,14 @@ void rtcan_sja1000_unregister(struct rtcan_device *dev)int __init rtcan_sja_init (void ) { -if (realtime_core_enabled ()) -printk ("RTCAN SJA1000 driver initialized\n" ); - -return 0 ; +printk ("RTCAN SJA1000 driver initialized\n" ); +return 0 ; } void __exit rtcan_sja_exit(void) { -if (realtime_core_enabled ()) -printk ("%s removed\n" , sja_ctrl_name); +printk ("%s removed\n" , sja_ctrl_name); }module_init (rtcan_sja_init);
Signature · 2 lines
Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
PATCH 11/11 drivers/can: Convert to module_pci_driver
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
--- kernel/drivers/can/sja1000/rtcan_adv_pci.c | 13 +------------ kernel/drivers/can/sja1000/rtcan_ems_pci.c | 13 +------------ kernel/drivers/can/sja1000/rtcan_esd_pci.c | 13 +------------ kernel/drivers/can/sja1000/rtcan_ixxat_pci.c | 14 +------------- kernel/drivers/can/sja1000/rtcan_peak_pci.c | 14 +------------- kernel/drivers/can/sja1000/rtcan_plx_pci.c | 13 +------------ 6 files changed, 6 insertions(+), 74 deletions(-)
kernel/drivers/can/sja1000/rtcan_adv_pci.c +1 -12
@@ -355,15 +355,4 @@ static struct pci_driver rtcan_adv_pci_driver = { .remove = adv_pci_remove_one, }; -static int __init rtcan_adv_pci_init (void ) -{ -return pci_register_driver (&rtcan_adv_pci_driver); -} - -static void __exit rtcan_adv_pci_exit(void) -{ -pci_unregister_driver (&rtcan_adv_pci_driver); -} - -module_init (rtcan_adv_pci_init); -module_exit (rtcan_adv_pci_exit); +module_pci_driver (rtcan_adv_pci_driver);
kernel/drivers/can/sja1000/rtcan_ems_pci.c +1 -12
@@ -388,15 +388,4 @@ static struct pci_driver ems_pci_driver = { .remove = ems_pci_del_card, }; -static int __init ems_pci_init (void ) -{ -return pci_register_driver (&ems_pci_driver); -} - -static void __exit ems_pci_exit(void) -{ -pci_unregister_driver (&ems_pci_driver); -} - -module_init (ems_pci_init); -module_exit (ems_pci_exit); +module_pci_driver (ems_pci_driver);
kernel/drivers/can/sja1000/rtcan_esd_pci.c +1 -12
@@ -340,15 +340,4 @@ static struct pci_driver rtcan_esd_pci_driver = { .remove = esd_pci_remove_one, }; -static int __init rtcan_esd_pci_init (void ) -{ -return pci_register_driver (&rtcan_esd_pci_driver); -} - -static void __exit rtcan_esd_pci_exit(void) -{ -pci_unregister_driver (&rtcan_esd_pci_driver); -} - -module_init (rtcan_esd_pci_init); -module_exit (rtcan_esd_pci_exit); +module_pci_driver (rtcan_esd_pci_driver);
kernel/drivers/can/sja1000/rtcan_ixxat_pci.c +1 -13
@@ -294,16 +294,4 @@ static struct pci_driver rtcan_ixxat_pci_driver = { .remove = ixxat_pci_remove_one, }; -static int __init rtcan_ixxat_pci_init (void ) -{ -return pci_register_driver (&rtcan_ixxat_pci_driver); -} - - -static void __exit rtcan_ixxat_pci_exit(void) -{ -pci_unregister_driver (&rtcan_ixxat_pci_driver); -} - -module_init (rtcan_ixxat_pci_init); -module_exit (rtcan_ixxat_pci_exit); +module_pci_driver (rtcan_ixxat_pci_driver);
kernel/drivers/can/sja1000/rtcan_peak_pci.c +1 -13
@@ -351,16 +351,4 @@ static struct pci_driver rtcan_peak_pci_driver = { .remove = peak_pci_remove_one, }; -static int __init rtcan_peak_pci_init (void ) -{ -return pci_register_driver (&rtcan_peak_pci_driver); -} - - -static void __exit rtcan_peak_pci_exit(void) -{ -pci_unregister_driver (&rtcan_peak_pci_driver); -} - -module_init (rtcan_peak_pci_init); -module_exit (rtcan_peak_pci_exit); +module_pci_driver (rtcan_peak_pci_driver);
kernel/drivers/can/sja1000/rtcan_plx_pci.c +1 -12
@@ -594,15 +594,4 @@ static struct pci_driver plx_pci_driver = { .remove = plx_pci_del_card, }; -static int __init plx_pci_init (void ) -{ -return pci_register_driver (&plx_pci_driver); -} - -static void __exit plx_pci_exit(void) -{ -pci_unregister_driver (&plx_pci_driver); -} - -module_init (plx_pci_init); -module_exit (plx_pci_exit); +module_pci_driver (plx_pci_driver);
Signature · 1 line
2.16.4