rtcan_mem - CAN driver for memory mapped SJA1000 controllers
PATCH 1/1 rtcan_mem - CAN driver for memory mapped SJA1000 controllers
Hi,
attached you will find a patch that adds support for memory mapped SJA1000 CAN controllers as they often can be found on embedded boards. The driver is based on the rtmen_isa driver.
The driver has been tested on esd's embedded PowerPC boards with AMCC PPC405 CPUs.
Thanks to Jan for giving me some introduction to Xenomai during a nightly session last friday.
There's one thing a I am not very satisfied with :-) Why passing half of the external clock frequency to the module. Because of compatiblity reasons I kept this behavior of the clock paramter from the ISA driver.
Matthias
drivers/can/sja1000/Kconfig +10 -0
@@ -13,6 +13,16 @@ int "Maximum number of ISA devices" default 4 +config XENO_DRIVERS_RTCAN_SJA1000_MEM + depends on XENO_DRIVERS_RTCAN_SJA1000 + tristate "Memory mapped controllers" + default n + +config XENO_DRIVERS_RTCAN_SJA1000_MEM_MAX_DEV + depends on XENO_DRIVERS_RTCAN_SJA1000_MEM + int "Maximum number of memory mapped controllers" + default 4 + config XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI depends on XENO_DRIVERS_RTCAN_SJA1000 tristate "PEAK PCI Card"
drivers/can/sja1000/rtcan_mem.c +206 -0
206 lines not on this page · raw message
drivers/can/sja1000/Makefile +7 -0
@@ -8,11 +8,13 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o xeno_rtcan_sja1000-y := rtcan_sja1000.o rtcan_sja1000_proc.o xeno_rtcan_peak_pci-y := rtcan_peak_pci.o xeno_rtcan_peak_dng-y := rtcan_peak_dng.o xeno_rtcan_isa-y := rtcan_isa.o +xeno_rtcan_mem-y := rtcan_mem.o else
@@ -24,6 +26,7 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o list-multi := xeno_rtcan_sja1000.o
@@ -31,6 +34,7 @@ xeno_rtcan_peak_pci-objs := rtcan_peak_pci.o xeno_rtcan_peak_dng-objs := rtcan_peak_dng.o xeno_rtcan_isa-objs := rtcan_isa.o +xeno_rtcan_mem-objs := rtcan_mem.o export-objs := $(xeno_rtcan_sja1000-objs)
@@ -49,4 +53,7 @@ xeno_rtcan_isa.o: $(xeno_rtcan_isa-objs) $(LD) -r -o $@ $(xeno_rtcan_isa-objs) + +xeno_rtcan_mem.o: $(xeno_rtcan_mem-objs) + $(LD) -r -o $@ $(xeno_rtcan_mem-objs) endif
Quoted 5 lines · Matthias Fuchs
Hi,
attached you will find a patch that adds support for memory mapped SJA1000 CAN controllers as they often can be found on embedded boards. The driver is based on the
rtmen_isadriver.
Thanks for your patch! Below are only cleanup comments, not all directed to you as some of them originate back to the rtcan_isa driver.
Quoted 10 lines
The driver has been tested on esd's embedded PowerPC boards with AMCC PPC405 CPUs.
Thanks to Jan for giving me some introduction to Xenomai during a nightly session last friday.
There's one thing a I am not very satisfied with :-) Why passing half of the external clock frequency to the module. Because of compatiblity reasons I kept this behavior of the clock paramter from the ISA driver.
Wolfgang promised to rework this. I was also already about hacking some can_sys_clock = clock[idx]/2 patch, but hesitated when I noticed that the output in rtcan_raw_dev.c will print half of the provided frequency then. Some smart documentation concept for those frequencies is required first.
Quoted 67 lines
Matthias
------------------------------------------------------------------------
Index: ksrc/drivers/can/sja1000/Kconfig
===================================================================drivers/can/sja1000/Kconfig +10
-0@@ -13,6 +13,16 @@ int "Maximum number of ISA devices" default 4 +config XENO_DRIVERS_RTCAN_SJA1000_MEM + depends on XENO_DRIVERS_RTCAN_SJA1000 + tristate "Memory mapped controllers" + default n + +config XENO_DRIVERS_RTCAN_SJA1000_MEM_MAX_DEV + depends on XENO_DRIVERS_RTCAN_SJA1000_MEM + int "Maximum number of memory mapped controllers" + default 4 + config XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI depends on XENO_DRIVERS_RTCAN_SJA1000 tristate "PEAK PCI Card"Index:
ksrc/drivers/can/sja1000/rtcan_mem.c
===================================================================drivers/can/sja1000/rtcan_mem.c +35
-0@@ -0,0 +1,206 @@ +/* +* Copyright (C) 2006 Matthias Fuchs <[email protected]>, +* Jan Kiszka <[email protected]> +* +* RTCAN driver for memory mapped SJA1000 CAN controller +* This code has been tested on esd's CPCI405/EPPC405 PPC405 systems. +* +* This driver is derived from the rtcan-isa driver by +* Wolfgang Grandegger and Sebastian Smolorz. +* +* Copyright (C) 2006 Wolfgang Grandegger <[email protected]> +* Copyright (C) 2005, 2006 Sebastian Smolorz +* <[email protected]> +* +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by +* the Free Software Foundation; eitherer version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software Foundation, +* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include <linux/module.h> +#include <linux/ioport.h> +#include <linux/delay.h> + +#include <rtdm/rtdm_driver.h>
drivers/can/sja1000/rtcan_mem.c line 45
Quoted 10 lines
drivers/can/sja1000/rtcan_mem.c +10
-0+ +#include <rtdm/rtcan.h> +#include <rtcan_dev.h> +#include <rtcan_raw.h> +#include <rtcan_internal.h> +#include <rtcan_sja1000.h> +#include <rtcan_sja1000_regs.h> + +#define RTCAN_DEV_NAME "rtcan%d" +#define RTCAN_DRV_NAME "sja1000-mem"
You don't use RTCAN_DRV_NAME, so we can kill it.
But this line triggered an idea about a new naming scheme for our CAN drivers (the shorter, the better):
xeno_can (core)
xeno_can_virt (virtual CAN bus)
xeno_sja1000 (SJA1000 core)xeno_sja1000_port (or _io)xeno_sja1000_memxeno_sja1000_pci (generalised peak_pci if feasible)xeno_sja1000_peakdng (Peak parport dongle)
xeno_mscan
Moreover, file and CONFIG names should be shortened. I see no need for rtcan-prefixes if the file reside in the drivers/can folder, or for XENO_DRIVER_RTCAN when XENO already expresses "RT" (=>XENO_DRIVER_CAN).
drivers/can/sja1000/rtcan_mem.c line 51
Quoted 6 lines
drivers/can/sja1000/rtcan_mem.c +6
-0+ +#ifdef CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEVS +#define RTCAN_MEM_MAX_DEV CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEV +#else +#define RTCAN_MEM_MAX_DEV 2 +#endif
This #ifdef is redundant (but copy&paste for rtcan_isa): there should be no undefined CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEVS if this driver is enabled for compilation.
Quoted 108 lines
drivers/can/sja1000/rtcan_mem.c +108
-0+ +static char *mem_board_name ="mem mapped" ; + +MODULE_AUTHOR ("Matthias Fuchs <[email protected]>" ); +MODULE_DESCRIPTION ("RTCAN driver for memory mapped SJA1000 controller" ); +MODULE_SUPPORTED_DEVICE ("mem mapped" ); +MODULE_LICENSE ("GPL" ); + +static u32 mem[RTCAN_MEM_MAX_DEV ]; +static int irq[RTCAN_MEM_MAX_DEV ]; +static u32 clock[RTCAN_MEM_MAX_DEV ]; +static u8 ocr[RTCAN_MEM_MAX_DEV ]; +static u8 cdr[RTCAN_MEM_MAX_DEV ]; + +compat_module_int_param_array (mem,RTCAN_MEM_MAX_DEV ); +compat_module_int_param_array (irq,RTCAN_MEM_MAX_DEV ); +compat_module_int_param_array (clock,RTCAN_MEM_MAX_DEV ); +compat_module_byte_param_array (ocr,RTCAN_MEM_MAX_DEV ); +compat_module_byte_param_array (cdr,RTCAN_MEM_MAX_DEV ); + +MODULE_PARM_DESC (mem,"The io-memory address" ); +MODULE_PARM_DESC (irq,"The interrupt number" ); +MODULE_PARM_DESC (clock,"CAN system clock frequency (default 8 MHz)" ); +MODULE_PARM_DESC (ocr,"Value of output control register (default 0x1a)" ); +MODULE_PARM_DESC (cdr,"Value of clock divider register (default 0xc8" ); + +#define RTCAN_MEM_RANGE 0x80 + +struct rtcan_mem +{ +u8 *mem; +}; + +static struct rtcan_device *rtcan_mem_devs[RTCAN_MEM_MAX_DEV ]; + +static u8 rtcan_mem_readreg (struct rtcan_device *dev,int reg) +{ +struct rtcan_mem *board = (struct rtcan_mem *)dev->board_priv; +return readb (board->mem + reg); +} + +static void rtcan_mem_writereg (struct rtcan_device *dev,int reg,u8 val) +{ +struct rtcan_mem *board = (struct rtcan_mem *)dev->board_priv; +writeb (val, board->mem + reg); +} + +int __init rtcan_mem_init_one (int idx) +{ +struct rtcan_device *dev; +struct rtcan_sja1000 *chip; +struct rtcan_mem *board; +int ret; + +if ((dev =rtcan_dev_alloc (sizeof (struct rtcan_sja1000 ), +sizeof (struct rtcan_mem ))) ==NULL ) +return -ENOMEM ; + + chip = (struct rtcan_sja1000 *)dev->priv; + board = (struct rtcan_mem *)dev->board_priv; + + dev->board_name = mem_board_name; + + chip->irq_num = irq[idx]; + chip->irq_flags =RTDM_IRQTYPE_SHARED ; + chip->read_reg = rtcan_mem_readreg; + chip->write_reg = rtcan_mem_writereg; + +/* ioremap io memory */ +if (!(board->mem = (u8 *)ioremap (mem[idx],RTCAN_MEM_RANGE ))) { + ret = -EBUSY ; + goto out_dev_free; + } + +/* Clock frequency in Hz */ +if (clock[idx]) + dev->can_sys_clock = clock[idx]; +else + dev->can_sys_clock =8000000 ;/* 16/2 MHz */ + +/* Output control register */ +if (ocr[idx]) + chip->ocr = ocr[idx]; +else + chip->ocr =SJA_OCR_MODE_NORMAL |SJA_OCR_TX0_PUSHPULL ; + +if (cdr[idx]) + chip->cdr = cdr[idx]; +else + chip->cdr =SJA_CDR_CAN_MODE |SJA_CDR_CLK_OFF |SJA_CDR_CBP ; + +strncpy (dev->name,RTCAN_DEV_NAME ,IFNAMSIZ ); + + ret =rtcan_sja1000_register (dev); +if (ret) { +printk (KERN_ERR "ERROR %d while trying to register SJA1000 device!\n" , + ret); + goto out_free_region; + } + + rtcan_mem_devs[idx] = dev; +return 0 ; + + out_free_region: +iounmap (board->mem); + + out_dev_free: +rtcan_dev_free (dev);
drivers/can/sja1000/rtcan_mem.c line 169
Quoted 10 lines
drivers/can/sja1000/rtcan_mem.c +10
-0+ +return ret; +} + +/** Init module */ +static int __init rtcan_mem_init (void ) +{ +int i; +int ret; +int done =0 ;
Not nicely formatted. BTW, as this is new code to be included, we should take the chance and convert it to kernel style right from the beginning. :)
Quoted 73 lines
drivers/can/sja1000/rtcan_mem.c +37
-0+for (i =0 ; + i <RTCAN_MEM_MAX_DEV && mem[i] !=0 ; + i++) { + +if ((ret =rtcan_mem_init_one (i) !=0 )) { +return ret; + } + done++; + } +if (done) +return 0 ; +printk (KERN_ERR "ERROR! No devices specified! " +"Use mem=<base_addr1>[,...] irq=<irq1>[,...]\n" ); + +return -EINVAL ; +} + + +/** Cleanup module */ +static void __exit rtcan_mem_exit(void) +{ +int i; +struct rtcan_device *dev; +u8 *mem; + +for (i =0 ; i <RTCAN_MEM_MAX_DEV ; i++) { + dev = rtcan_mem_devs[i]; +if (!dev) +continue ; + mem = ((struct rtcan_mem *)dev->board_priv)->mem; +rtcan_sja1000_unregister (dev); +iounmap (mem); + } +} + +module_init (rtcan_mem_init); +module_exit (rtcan_mem_exit);Index: ksrc/drivers/can/sja1000/Makefile
===================================================================drivers/can/sja1000/Makefile +4
-0@@ -8,11 +8,13 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o xeno_rtcan_sja1000-y := rtcan_sja1000.o rtcan_sja1000_proc.o xeno_rtcan_peak_pci-y := rtcan_peak_pci.o xeno_rtcan_peak_dng-y := rtcan_peak_dng.o xeno_rtcan_isa-y := rtcan_isa.o +xeno_rtcan_mem-y := rtcan_mem.o else@@ -24,6 +26,7 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o list-multi := xeno_rtcan_sja1000.o@@ -31,6 +34,7 @@ xeno_rtcan_peak_pci-objs := rtcan_peak_pci.o xeno_rtcan_peak_dng-objs := rtcan_peak_dng.o xeno_rtcan_isa-objs := rtcan_isa.o +xeno_rtcan_mem-objs := rtcan_mem.o export-objs := $(xeno_rtcan_sja1000-objs)
drivers/can/sja1000/Makefile line 59
Quoted 7 lines
drivers/can/sja1000/Makefile +3
-0@@ -49,4 +53,7 @@ xeno_rtcan_isa.o: $(xeno_rtcan_isa-objs) $(LD) -r -o $@ $(xeno_rtcan_isa-objs) + +xeno_rtcan_mem.o: $(xeno_rtcan_mem-objs) + $(LD) -r -o $@ $(xeno_rtcan_mem-objs) endif
Patch for scripts/Modules.frag is missing (=> built-in compilation under 2.4) - just like for rtcan_isa... :-/
Jan
Hi Matthias,
Quoted 3 lines · Matthias Fuchs
Hi,
attached you will find a patch that adds support for memory mapped SJA1000 CAN controllers as they often can be found on embedded boards. The driver is based on the
rtmen_isadriver.
What about using request_mem_region()? While looking to the driver I now realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver else a mem driver.
Quoted 5 lines
The driver has been tested on esd's embedded PowerPC boards with AMCC PPC405 CPUs.
Thanks to Jan for giving me some introduction to Xenomai during a nightly session last friday.
There's one thing a I am not very satisfied with :-) Why passing half of the external clock frequency to the module. Because of compatiblity reasons I kept this behavior of the clock paramter from the ISA driver.
The attached patch fixes this and replaces the module parameter "isa" with "io". I also tend to rename the driver into rtcan_io instead rtcan_isa if we keep it.
Wolfgang.
Quoted 283 lines
Matthias
------------------------------------------------------------------------
Index: ksrc/drivers/can/sja1000/Kconfig
===================================================================drivers/can/sja1000/Kconfig +10
-0@@ -13,6 +13,16 @@ int "Maximum number of ISA devices" default 4 +config XENO_DRIVERS_RTCAN_SJA1000_MEM + depends on XENO_DRIVERS_RTCAN_SJA1000 + tristate "Memory mapped controllers" + default n + +config XENO_DRIVERS_RTCAN_SJA1000_MEM_MAX_DEV + depends on XENO_DRIVERS_RTCAN_SJA1000_MEM + int "Maximum number of memory mapped controllers" + default 4 + config XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI depends on XENO_DRIVERS_RTCAN_SJA1000 tristate "PEAK PCI Card"Index:
ksrc/drivers/can/sja1000/rtcan_mem.c
===================================================================drivers/can/sja1000/rtcan_mem.c +206
-0@@ -0,0 +1,206 @@ +/* +* Copyright (C) 2006 Matthias Fuchs <[email protected]>, +* Jan Kiszka <[email protected]> +* +* RTCAN driver for memory mapped SJA1000 CAN controller +* This code has been tested on esd's CPCI405/EPPC405 PPC405 systems. +* +* This driver is derived from the rtcan-isa driver by +* Wolfgang Grandegger and Sebastian Smolorz. +* +* Copyright (C) 2006 Wolfgang Grandegger <[email protected]> +* Copyright (C) 2005, 2006 Sebastian Smolorz +* <[email protected]> +* +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by +* the Free Software Foundation; eitherer version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software Foundation, +* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include <linux/module.h> +#include <linux/ioport.h> +#include <linux/delay.h> + +#include <rtdm/rtdm_driver.h> + +#include <rtdm/rtcan.h> +#include <rtcan_dev.h> +#include <rtcan_raw.h> +#include <rtcan_internal.h> +#include <rtcan_sja1000.h> +#include <rtcan_sja1000_regs.h> + +#define RTCAN_DEV_NAME "rtcan%d" +#define RTCAN_DRV_NAME "sja1000-mem" + +#ifdef CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEVS +#define RTCAN_MEM_MAX_DEV CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEV +#else +#define RTCAN_MEM_MAX_DEV 2 +#endif + +static char *mem_board_name ="mem mapped" ; + +MODULE_AUTHOR ("Matthias Fuchs <[email protected]>" ); +MODULE_DESCRIPTION ("RTCAN driver for memory mapped SJA1000 controller" ); +MODULE_SUPPORTED_DEVICE ("mem mapped" ); +MODULE_LICENSE ("GPL" ); + +static u32 mem[RTCAN_MEM_MAX_DEV ]; +static int irq[RTCAN_MEM_MAX_DEV ]; +static u32 clock[RTCAN_MEM_MAX_DEV ]; +static u8 ocr[RTCAN_MEM_MAX_DEV ]; +static u8 cdr[RTCAN_MEM_MAX_DEV ]; + +compat_module_int_param_array (mem,RTCAN_MEM_MAX_DEV ); +compat_module_int_param_array (irq,RTCAN_MEM_MAX_DEV ); +compat_module_int_param_array (clock,RTCAN_MEM_MAX_DEV ); +compat_module_byte_param_array (ocr,RTCAN_MEM_MAX_DEV ); +compat_module_byte_param_array (cdr,RTCAN_MEM_MAX_DEV ); + +MODULE_PARM_DESC (mem,"The io-memory address" ); +MODULE_PARM_DESC (irq,"The interrupt number" ); +MODULE_PARM_DESC (clock,"CAN system clock frequency (default 8 MHz)" ); +MODULE_PARM_DESC (ocr,"Value of output control register (default 0x1a)" ); +MODULE_PARM_DESC (cdr,"Value of clock divider register (default 0xc8" ); + +#define RTCAN_MEM_RANGE 0x80 + +struct rtcan_mem +{ +u8 *mem; +}; + +static struct rtcan_device *rtcan_mem_devs[RTCAN_MEM_MAX_DEV ]; + +static u8 rtcan_mem_readreg (struct rtcan_device *dev,int reg) +{ +struct rtcan_mem *board = (struct rtcan_mem *)dev->board_priv; +return readb (board->mem + reg); +} + +static void rtcan_mem_writereg (struct rtcan_device *dev,int reg,u8 val) +{ +struct rtcan_mem *board = (struct rtcan_mem *)dev->board_priv; +writeb (val, board->mem + reg); +} + +int __init rtcan_mem_init_one (int idx) +{ +struct rtcan_device *dev; +struct rtcan_sja1000 *chip; +struct rtcan_mem *board; +int ret; + +if ((dev =rtcan_dev_alloc (sizeof (struct rtcan_sja1000 ), +sizeof (struct rtcan_mem ))) ==NULL ) +return -ENOMEM ; + + chip = (struct rtcan_sja1000 *)dev->priv; + board = (struct rtcan_mem *)dev->board_priv; + + dev->board_name = mem_board_name; + + chip->irq_num = irq[idx]; + chip->irq_flags =RTDM_IRQTYPE_SHARED ; + chip->read_reg = rtcan_mem_readreg; + chip->write_reg = rtcan_mem_writereg; + +/* ioremap io memory */ +if (!(board->mem = (u8 *)ioremap (mem[idx],RTCAN_MEM_RANGE ))) { + ret = -EBUSY ; + goto out_dev_free; + } + +/* Clock frequency in Hz */ +if (clock[idx]) + dev->can_sys_clock = clock[idx]; +else + dev->can_sys_clock =8000000 ;/* 16/2 MHz */ + +/* Output control register */ +if (ocr[idx]) + chip->ocr = ocr[idx]; +else + chip->ocr =SJA_OCR_MODE_NORMAL |SJA_OCR_TX0_PUSHPULL ; + +if (cdr[idx]) + chip->cdr = cdr[idx]; +else + chip->cdr =SJA_CDR_CAN_MODE |SJA_CDR_CLK_OFF |SJA_CDR_CBP ; + +strncpy (dev->name,RTCAN_DEV_NAME ,IFNAMSIZ ); + + ret =rtcan_sja1000_register (dev); +if (ret) { +printk (KERN_ERR "ERROR %d while trying to register SJA1000 device!\n" , + ret); + goto out_free_region; + } + + rtcan_mem_devs[idx] = dev; +return 0 ; + + out_free_region: +iounmap (board->mem); + + out_dev_free: +rtcan_dev_free (dev); + +return ret; +} + +/** Init module */ +static int __init rtcan_mem_init (void ) +{ +int i; +int ret; +int done =0 ; +for (i =0 ; + i <RTCAN_MEM_MAX_DEV && mem[i] !=0 ; + i++) { + +if ((ret =rtcan_mem_init_one (i) !=0 )) { +return ret; + } + done++; + } +if (done) +return 0 ; +printk (KERN_ERR "ERROR! No devices specified! " +"Use mem=<base_addr1>[,...] irq=<irq1>[,...]\n" ); + +return -EINVAL ; +} + + +/** Cleanup module */ +static void __exit rtcan_mem_exit(void) +{ +int i; +struct rtcan_device *dev; +u8 *mem; + +for (i =0 ; i <RTCAN_MEM_MAX_DEV ; i++) { + dev = rtcan_mem_devs[i]; +if (!dev) +continue ; + mem = ((struct rtcan_mem *)dev->board_priv)->mem; +rtcan_sja1000_unregister (dev); +iounmap (mem); + } +} + +module_init (rtcan_mem_init); +module_exit (rtcan_mem_exit);Index: ksrc/drivers/can/sja1000/Makefile
===================================================================drivers/can/sja1000/Makefile +7
-1@@ -8,11 +8,13 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o xeno_rtcan_sja1000-y := rtcan_sja1000.o rtcan_sja1000_proc.o xeno_rtcan_peak_pci-y := rtcan_peak_pci.o xeno_rtcan_peak_dng-y := rtcan_peak_dng.o xeno_rtcan_isa-y := rtcan_isa.o +xeno_rtcan_mem-y := rtcan_mem.o else@@ -24,6 +26,7 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o list-multi := xeno_rtcan_sja1000.o@@ -31,6 +34,7 @@ xeno_rtcan_peak_pci-objs := rtcan_peak_pci.o xeno_rtcan_peak_dng-objs := rtcan_peak_dng.o xeno_rtcan_isa-objs := rtcan_isa.o +xeno_rtcan_mem-objs := rtcan_mem.o export-objs := $(xeno_rtcan_sja1000-objs)@@ -49,4 +53,7 @@ xeno_rtcan_isa.o: $(xeno_rtcan_isa-objs) $(LD) -r -o $@ $(xeno_rtcan_isa-objs) + +xeno_rtcan_mem.o: $(xeno_rtcan_mem-objs) + $(LD) -r -o $@ $(xeno_rtcan_mem-objs) endif ------------------------------------------------------------------------
Quoted 4 lines
_______________________________________________
Xenomai-core mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-core
+ diff -u xenomai/ksrc/drivers/can/sja1000/rtcan_isa.c.CANCLK xenomai/ksrc/drivers/can/sja1000/rtcan_isa.c
ksrc/drivers/can/sja1000/rtcan_isa.c renamed from ksrc/drivers/can/sja1000/rtcan_isa.c.CANCLK +15 -16
@@ -49,21 +49,21 @@MODULE_SUPPORTED_DEVICE ("ISA board" );MODULE_LICENSE ("GPL" ); -static u16 isa[RTCAN_ISA_MAX_DEV ]; +static u16 io[RTCAN_ISA_MAX_DEV ];static int irq[RTCAN_ISA_MAX_DEV ];static u32 clock[RTCAN_ISA_MAX_DEV ];static u8 ocr[RTCAN_ISA_MAX_DEV ];static u8 cdr[RTCAN_ISA_MAX_DEV ]; -compat_module_short_param_array (isa,RTCAN_ISA_MAX_DEV ); +compat_module_short_param_array (io,RTCAN_ISA_MAX_DEV );compat_module_int_param_array (irq,RTCAN_ISA_MAX_DEV );compat_module_int_param_array (clock,RTCAN_ISA_MAX_DEV );compat_module_byte_param_array (ocr,RTCAN_ISA_MAX_DEV );compat_module_byte_param_array (cdr,RTCAN_ISA_MAX_DEV ); -MODULE_PARM_DESC (isa,"The io-port address" ); +MODULE_PARM_DESC (io,"The io-port address" );MODULE_PARM_DESC (irq,"The interrupt number" ); -MODULE_PARM_DESC (clock,"CAN system clock frequency (default 8 MHz)" ); +MODULE_PARM_DESC (clock,"External clock frequency (default 16 MHz)" );MODULE_PARM_DESC (ocr,"Value of output control register (default 0x1a)" );MODULE_PARM_DESC (cdr,"Value of clock divider register (default 0xc8" );
@@ -71,7 +71,7 @@struct rtcan_isa { -u16 isa; +u16 io; };static struct rtcan_device *rtcan_isa_devs[RTCAN_ISA_MAX_DEV ];
@@ -79,13 +79,13 @@static u8 rtcan_isa_readreg (struct rtcan_device *dev,int port) {struct rtcan_isa *board = (struct rtcan_isa *)dev->board_priv; -return inb (board->isa + port); +return inb (board->io + port); }static void rtcan_isa_writereg (struct rtcan_device *dev,int port,u8 val) {struct rtcan_isa *board = (struct rtcan_isa *)dev->board_priv; -outb (val, board->isa + port); +outb (val, board->io + port); }
@@ -105,7 +105,7 @@ dev->board_name = isa_board_name; - board->isa = isa[idx]; + board->io = io[idx]; chip->irq_num = irq[idx]; chip->irq_flags =RTDM_IRQTYPE_SHARED |RTDM_IRQTYPE_EDGE ;
@@ -114,14 +114,14 @@ chip->write_reg = rtcan_isa_writereg;/* Check and request I/O ports */ -if (!request_region (board->isa,RTCAN_ISA_PORT_SIZE ,RTCAN_DRV_NAME )) { +if (!request_region (board->io,RTCAN_ISA_PORT_SIZE ,RTCAN_DRV_NAME )) { ret = -EBUSY ; goto out_dev_free; }/* Clock frequency in Hz */ if (clock[idx]) - dev->can_sys_clock = clock[idx]; + dev->can_sys_clock = clock[idx] /2 ;else dev->can_sys_clock =8000000 ;/* 16/2 MHz */
@@ -149,7 +149,7 @@return 0 ; out_free_region: -release_region (board->isa,RTCAN_ISA_PORT_SIZE ); +release_region (board->io,RTCAN_ISA_PORT_SIZE ); out_dev_free:rtcan_dev_free (dev);
@@ -160,11 +160,10 @@/** Init module */ static int __init rtcan_isa_init (void ) { -int i; -int ret; -int done =0 ; +int i, ret, done; +for (i =0 ; - i <RTCAN_ISA_MAX_DEV && isa[i] !=0 ; + i <RTCAN_ISA_MAX_DEV && io[i] !=0 ; i++) {if ((ret =rtcan_isa_init_one (i) !=0 )) {
@@ -175,7 +174,7 @@if (done)return 0 ;printk (KERN_ERR "ERROR! No devices specified! " -"Use isa=<port1>[,...] irq=<irq1>[,...]\n" ); +"Use io=<port1>[,...] irq=<irq1>[,...]\n" );return -EINVAL ; }
Quoted 10 lines · Wolfgang Grandegger
Hi Matthias,
Quoted 5 lines · Matthias Fuchs
Hi,
attached you will find a patch that adds support for memory mapped SJA1000 CAN controllers as they often can be found on embedded boards. The driver is based on the
rtmen_isadriver.What about using
request_mem_region()?
(and this would also give RTCAN_DRV_NAME some sense again :))
Quoted 4 lines
While looking to the driver I now
realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver else a mem driver.
And provide two sets of readreg/writereg? What about differences in chip->irq_flags, are they always like io=edge, mem=level? What about defaults for CDR and OCR? Are the arbitrary anyway or do they correlate somehow to the access type?
When we do not find answers right now (maybe in other Linux CAN stacks?), we may postpone the merge and keep is separated until more hardware pops up with more use-cases.
Quoted 11 lines
Quoted 10 lines
The driver has been tested on esd's embedded PowerPC boards with AMCC PPC405 CPUs.
Thanks to Jan for giving me some introduction to Xenomai during a nightly session last friday.
There's one thing a I am not very satisfied with :-) Why passing half of the external clock frequency to the module. Because of compatiblity reasons I kept this behavior of the clock paramter from the ISA driver.
Quoted 6 lines
The attached patch fixes this and replaces the module parameter "isa" with "io". I also tend to rename the driver into
rtcan_ioinsteadrtcan_isaif we keep it.Wolfgang.
Jan
Quoted 11 lines · Jan Kiszka
Quoted 9 lines · Wolfgang Grandegger
Hi Matthias,
Quoted 5 lines · Matthias Fuchs
Hi,
attached you will find a patch that adds support for memory mapped SJA1000 CAN controllers as they often can be found on embedded boards. The driver is based on the
rtmen_isadriver.What about using
request_mem_region()?
Quoted 8 lines
(and this would also give
RTCAN_DRV_NAMEsome sense again :))Quoted 4 lines
While looking to the driver I now
realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver else a mem driver.And provide two sets of readreg/writereg? What about differences in
Yes.
Quoted 3 lines
chip->irq_flags, are they always like io=edge, mem=level? What about defaults for CDR and OCR? Are the arbitrary anyway or do they correlate somehow to the access type?
Another module parameter for the irq_flags makes sense, indeed. OCR and CDR do not affect the access type. It more defines some electrical characteristics.
/* Output control register */
enum SJA1000_PELI_OCR {
SJA_OCR_MODE_BIPHASE = 0,
SJA_OCR_MODE_TEST = 1,
SJA_OCR_MODE_NORMAL = 2,
SJA_OCR_MODE_CLOCK = 3,
SJA_OCR_TX0_INVERT = 1<<2,
SJA_OCR_TX0_PULLDOWN = 1<<3,
SJA_OCR_TX0_PULLUP = 2<<3,
SJA_OCR_TX0_PUSHPULL = 3<<3,
SJA_OCR_TX1_INVERT = 1<<5,
SJA_OCR_TX1_PULLDOWN = 1<<6,
SJA_OCR_TX1_PULLUP = 2<<6,
SJA_OCR_TX1_PUSHPULL = 3<<6
};enum SJA1000_PELI_CDR {
SJA_CDR_CLK_OFF = 1<<3, /* Clock off (CLKOUT pin) */
SJA_CDR_CBP = 1<<6, /* CAN input comparator bypass */
SJA_CDR_CAN_MODE = 1<<7 /* CAN mode: 1 = PeliCAN */
};Quoted 3 lines
When we do not find answers right now (maybe in other Linux CAN stacks?), we may postpone the merge and keep is separated until more hardware pops up with more use-cases.
No hurry, of course.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
The driver has been tested on esd's embedded PowerPC boards with AMCC PPC405 CPUs.
Thanks to Jan for giving me some introduction to Xenomai during a nightly session last friday.
There's one thing a I am not very satisfied with :-) Why passing half of the external clock frequency to the module. Because of compatiblity reasons I kept this behavior of the clock paramter from the ISA driver.
Quoted 8 lines
Quoted 6 lines
The attached patch fixes this and replaces the module parameter "isa" with "io". I also tend to rename the driver into
rtcan_ioinsteadrtcan_isaif we keep it.Wolfgang.
Jan
Wolfgang.
Hi Wolfgang,
Quoted 1 line · Wolfgang Grandegger
What about using
request_mem_region()? While looking to the driver I now
... will be added, of course.
Quoted 3 lines
realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver else a mem driver.
Yes, that's possible. We can also decide on the used module parameter (mem or io) what is to do. Passing both results in an error.
You are right that its duplicated code. But the driver is very simple. It nearly does nothing but mapping, implementing register access callbacks, registering and cleanup when unloading. But the driver differs in all these points from the isa/io colleague. I like shot an simple drivers, so that you do not have to care about breaking the isa/io part when modifying the mem part.
Quoted 2 lines
Quoted 2 lines
There's one thing a I am not very satisfied with :-) Why passing half of
the
Quoted 6 lines
Quoted 2 lines
external clock frequency to the module. Because of compatiblity reasons I kept this behavior of the clock paramter from the ISA driver.
The attached patch fixes this and replaces the module parameter "isa" with "io". I also tend to rename the driver into
rtcan_ioinsteadrtcan_isaif we keep it.
Sounds good.
Matthias
Quoted 9 lines · Matthias Fuchs
Hi Wolfgang,
Quoted 1 line · Wolfgang Grandegger
What about using
request_mem_region()? While looking to the driver I now... will be added, of course.
Quoted 2 lines
realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver else a mem driver.
Yes, that's possible. We can also decide on the used module parameter (mem or io) what is to do. Passing both results in an error.
Quoted 7 lines
You are right that its duplicated code. But the driver is very simple. It nearly does nothing but mapping, implementing register access callbacks, registering and cleanup when unloading. But the driver differs in all these points from the isa/io colleague. I like shot an simple drivers, so that you do not have to care about breaking the isa/io part when modifying the mem part.
Quoted 1 line
Quoted 1 line
There's one thing a I am not very satisfied with :-) Why passing half of
the
Quoted 2 lines
Quoted 1 line
external clock frequency to the module. Because of compatiblity reasons I kept this behavior of the clock paramter from the ISA driver.
The attached patch fixes this and replaces the module parameter "isa" with "io". I also tend to rename the driver into
rtcan_ioinsteadrtcan_isaif we keep it.Sounds good.
Jan, could you apply this patch to avoid further confusion? The real CAN clock frequency listed also in the proc file system is half of the oscillator clock. Some more doc might help to avoid further confusion.
Wolfgang.
Quoted 25 lines · Wolfgang Grandegger
Quoted 24 lines · Matthias Fuchs
Hi Wolfgang,
Quoted 1 line · Wolfgang Grandegger
What about using
request_mem_region()? While looking to the driver I now... will be added, of course.
Quoted 4 lines
realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver
else a mem driver.Yes, that's possible. We can also decide on the used module parameter (mem or io) what is to do. Passing both results in an error.
You are right that its duplicated code. But the driver is very simple. It nearly does nothing but mapping, implementing register access callbacks, registering and cleanup when unloading. But the driver differs in all these points from the isa/io colleague. I like shot an simple drivers, so that you do not have to care about breaking the isa/io part when modifying the mem part.
Quoted 2 lines
Quoted 2 lines
There's one thing a I am not very satisfied with :-) Why passing half of
the
Quoted 2 lines
Quoted 2 lines
external clock frequency to the module. Because of compatiblity reasons I kept this behavior of the clock paramter from the ISA driver.
Quoted 9 lines
Quoted 4 lines
Quoted 3 lines
The attached patch fixes this and replaces the module parameter "isa" with "io". I also tend to rename the driver into
rtcan_ioinsteadrtcan_isaif we keep it.Sounds good.
Jan, could you apply this patch to avoid further confusion? The real CAN clock frequency listed also in the proc file system is half of the oscillator clock. Some more doc might help to avoid further confusion.
Done (with minor modification to avoid compiler warning).
Jan
Hi,
here's the 2nd try:
- updated external clock frequency handling
- use request_mem_region() before remapping memory
- renamed local variable mem to vmem in clean loop because it shadowed a module parameter
Now it's on you to decide if we should merge and/or rename. I wouldn't merge because of my former arguments. But do not care about me:-)
Matthias
Quoted 5 lines · Wolfgang Grandegger
Hi Matthias,
Quoted 2 lines · Matthias Fuchs
Hi,
Quoted 9 lines
Quoted 3 lines
attached you will find a patch that adds support for memory mapped SJA1000 CAN controllers as they often can be found on embedded boards. The driver is based on the
rtmen_isadriver.What about using
request_mem_region()? While looking to the driver I now realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver else a mem driver.
drivers/can/sja1000/Kconfig +10 -0
@@ -13,6 +13,16 @@ int "Maximum number of ISA devices" default 4 +config XENO_DRIVERS_RTCAN_SJA1000_MEM + depends on XENO_DRIVERS_RTCAN_SJA1000 + tristate "Memory mapped controllers" + default n + +config XENO_DRIVERS_RTCAN_SJA1000_MEM_MAX_DEV + depends on XENO_DRIVERS_RTCAN_SJA1000_MEM + int "Maximum number of memory mapped controllers" + default 4 + config XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI depends on XENO_DRIVERS_RTCAN_SJA1000 tristate "PEAK PCI Card"
drivers/can/sja1000/rtcan_mem.c +213 -0
213 lines not on this page · raw message
drivers/can/sja1000/Makefile +7 -0
@@ -8,11 +8,13 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o xeno_rtcan_sja1000-y := rtcan_sja1000.o rtcan_sja1000_proc.o xeno_rtcan_peak_pci-y := rtcan_peak_pci.o xeno_rtcan_peak_dng-y := rtcan_peak_dng.o xeno_rtcan_isa-y := rtcan_isa.o +xeno_rtcan_mem-y := rtcan_mem.o else
@@ -24,6 +26,7 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o list-multi := xeno_rtcan_sja1000.o
@@ -31,6 +34,7 @@ xeno_rtcan_peak_pci-objs := rtcan_peak_pci.o xeno_rtcan_peak_dng-objs := rtcan_peak_dng.o xeno_rtcan_isa-objs := rtcan_isa.o +xeno_rtcan_mem-objs := rtcan_mem.o export-objs := $(xeno_rtcan_sja1000-objs)
@@ -49,4 +53,7 @@ xeno_rtcan_isa.o: $(xeno_rtcan_isa-objs) $(LD) -r -o $@ $(xeno_rtcan_isa-objs) + +xeno_rtcan_mem.o: $(xeno_rtcan_mem-objs) + $(LD) -r -o $@ $(xeno_rtcan_mem-objs) endif
Quoted 7 lines · Matthias Fuchs
Hi,
here's the 2nd try:
- updated external clock frequency handling
- userequest_mem_region()before remapping memory
- renamed local variable mem to vmem in clean loop because it shadowed a module parameter
I have one more comment, sorry. I think you should use:
volatile void __iomem *vmem;
and the cleanup in case of error is not OK. See below.
Quoted 1 line
Now it's on you to decide if we should merge and/or rename. I wouldn't merge because of my former arguments. But do not care about me:-)
Fine for me for the time being.
Quoted 1 line
Matthias
Wolfgang
Quoted 163 lines · Wolfgang Grandegger
Quoted 162 lines
Hi Matthias,
Quoted 5 lines · Matthias Fuchs
Hi,
attached you will find a patch that adds support for memory mapped SJA1000 CAN controllers as they often can be found on embedded boards. The driver is based on the
rtmen_isadriver.What about using
request_mem_region()? While looking to the driver I now realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver else a mem driver.------------------------------------------------------------------------
Index: ksrc/drivers/can/sja1000/Kconfig
===================================================================drivers/can/sja1000/Kconfig +10
-0@@ -13,6 +13,16 @@ int "Maximum number of ISA devices" default 4 +config XENO_DRIVERS_RTCAN_SJA1000_MEM + depends on XENO_DRIVERS_RTCAN_SJA1000 + tristate "Memory mapped controllers" + default n + +config XENO_DRIVERS_RTCAN_SJA1000_MEM_MAX_DEV + depends on XENO_DRIVERS_RTCAN_SJA1000_MEM + int "Maximum number of memory mapped controllers" + default 4 + config XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI depends on XENO_DRIVERS_RTCAN_SJA1000 tristate "PEAK PCI Card"Index:
ksrc/drivers/can/sja1000/rtcan_mem.c
===================================================================drivers/can/sja1000/rtcan_mem.c +120
-0@@ -0,0 +1,213 @@ +/* +* Copyright (C) 2006 Matthias Fuchs <[email protected]>, +* Jan Kiszka <[email protected]> +* +* RTCAN driver for memory mapped SJA1000 CAN controller +* This code has been tested on esd's CPCI405/EPPC405 PPC405 systems. +* +* This driver is derived from the rtcan-isa driver by +* Wolfgang Grandegger and Sebastian Smolorz. +* +* Copyright (C) 2006 Wolfgang Grandegger <[email protected]> +* Copyright (C) 2005, 2006 Sebastian Smolorz +* <[email protected]> +* +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by +* the Free Software Foundation; eitherer version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software Foundation, +* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + +#include <linux/module.h> +#include <linux/ioport.h> +#include <linux/delay.h> + +#include <rtdm/rtdm_driver.h> + +#include <rtdm/rtcan.h> +#include <rtcan_dev.h> +#include <rtcan_raw.h> +#include <rtcan_internal.h> +#include <rtcan_sja1000.h> +#include <rtcan_sja1000_regs.h> + +#define RTCAN_DEV_NAME "rtcan%d" +#define RTCAN_DRV_NAME "sja1000-mem" + +#ifdef CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEVS +#define RTCAN_MEM_MAX_DEV CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEV +#else +#define RTCAN_MEM_MAX_DEV 2 +#endif + +static char *mem_board_name ="mem mapped" ; + +MODULE_AUTHOR ("Matthias Fuchs <[email protected]>" ); +MODULE_DESCRIPTION ("RTCAN driver for memory mapped SJA1000 controller" ); +MODULE_SUPPORTED_DEVICE ("mem mapped" ); +MODULE_LICENSE ("GPL" ); + +static u32 mem[RTCAN_MEM_MAX_DEV ]; +static int irq[RTCAN_MEM_MAX_DEV ]; +static u32 clock[RTCAN_MEM_MAX_DEV ]; +static u8 ocr[RTCAN_MEM_MAX_DEV ]; +static u8 cdr[RTCAN_MEM_MAX_DEV ]; + +compat_module_int_param_array (mem,RTCAN_MEM_MAX_DEV ); +compat_module_int_param_array (irq,RTCAN_MEM_MAX_DEV ); +compat_module_int_param_array (clock,RTCAN_MEM_MAX_DEV ); +compat_module_byte_param_array (ocr,RTCAN_MEM_MAX_DEV ); +compat_module_byte_param_array (cdr,RTCAN_MEM_MAX_DEV ); + +MODULE_PARM_DESC (mem,"The io-memory address" ); +MODULE_PARM_DESC (irq,"The interrupt number" ); +MODULE_PARM_DESC (clock,"External clock frequency (default 16 MHz)" ); +MODULE_PARM_DESC (ocr,"Value of output control register (default 0x1a)" ); +MODULE_PARM_DESC (cdr,"Value of clock divider register (default 0xc8" ); + +#define RTCAN_MEM_RANGE 0x80 + +struct rtcan_mem +{ +u8 *vmem; +}; + +static struct rtcan_device *rtcan_mem_devs[RTCAN_MEM_MAX_DEV ]; + +static u8 rtcan_mem_readreg (struct rtcan_device *dev,int reg) +{ +struct rtcan_mem *board = (struct rtcan_mem *)dev->board_priv; +return readb (board->vmem + reg); +} + +static void rtcan_mem_writereg (struct rtcan_device *dev,int reg,u8 val) +{ +struct rtcan_mem *board = (struct rtcan_mem *)dev->board_priv; +writeb (val, board->vmem + reg); +} + +int __init rtcan_mem_init_one (int idx) +{ +struct rtcan_device *dev; +struct rtcan_sja1000 *chip; +struct rtcan_mem *board; +int ret; + +if ((dev =rtcan_dev_alloc (sizeof (struct rtcan_sja1000 ), +sizeof (struct rtcan_mem ))) ==NULL ) +return -ENOMEM ; + + chip = (struct rtcan_sja1000 *)dev->priv; + board = (struct rtcan_mem *)dev->board_priv; + + dev->board_name = mem_board_name; + + chip->irq_num = irq[idx]; + chip->irq_flags =RTDM_IRQTYPE_SHARED ; + chip->read_reg = rtcan_mem_readreg; + chip->write_reg = rtcan_mem_writereg; + +if (!request_mem_region (mem[idx],RTCAN_MEM_RANGE ,RTCAN_DRV_NAME )) {
Quoted 8 lines
drivers/can/sja1000/rtcan_mem.c line 128
Quoted 8 lines
drivers/can/sja1000/rtcan_mem.c +8
-0+ ret = -EBUSY ; + goto out_dev_free; + } + +/* ioremap io memory */ +if (!(board->vmem = (u8 *)ioremap (mem[idx],RTCAN_MEM_RANGE ))) { +release_mem_region (mem[idx],RTCAN_MEM_RANGE ); + ret = -EBUSY ;
goto out_release_mem;
Quoted 17 lines
Quoted 17 lines
drivers/can/sja1000/rtcan_mem.c +17
-0+ } + +/* Clock frequency in Hz */ +if (clock[idx]) + dev->can_sys_clock = clock[idx] /2 ; +else + dev->can_sys_clock =8000000 ;/* 16/2 MHz */ + +/* Output control register */ +if (ocr[idx]) + chip->ocr = ocr[idx]; +else + chip->ocr =SJA_OCR_MODE_NORMAL |SJA_OCR_TX0_PUSHPULL ; + +if (cdr[idx]) + chip->cdr = cdr[idx]; +else
Quoted 8 lines
drivers/can/sja1000/rtcan_mem.c line 154
Quoted 8 lines
drivers/can/sja1000/rtcan_mem.c +8
-0+ chip->cdr =SJA_CDR_CAN_MODE |SJA_CDR_CLK_OFF |SJA_CDR_CBP ; + +strncpy (dev->name,RTCAN_DEV_NAME ,IFNAMSIZ ); + + ret =rtcan_sja1000_register (dev); +if (ret) { +printk (KERN_ERR "ERROR %d while trying to register SJA1000 device!\n" , + ret);
goto out_iounmap;
Quoted 7 lines
drivers/can/sja1000/rtcan_mem.c line 162
Quoted 7 lines
drivers/can/sja1000/rtcan_mem.c +7
-0+ } + + rtcan_mem_devs[idx] = dev; +return 0 ; + + out_iounmap: +iounmap (board->vmem);
out_release_mem: release_mem_region(mem[idx], RTCAN_MEM_RANGE);
Quoted 93 lines
Quoted 93 lines
drivers/can/sja1000/rtcan_mem.c +51
-0+ + out_dev_free: +rtcan_dev_free (dev); + +return ret; +} + +/** Init module */ +static int __init rtcan_mem_init (void ) +{ +int i; +int ret; +int done =0 ; +for (i =0 ; + i <RTCAN_MEM_MAX_DEV && mem[i] !=0 ; + i++) { + +if ((ret =rtcan_mem_init_one (i) !=0 )) { +return ret; + } + done++; + } +if (done) +return 0 ; +printk (KERN_ERR "ERROR! No devices specified! " +"Use mem=<base_addr1>[,...] irq=<irq1>[,...]\n" ); + +return -EINVAL ; +} + + +/** Cleanup module */ +static void __exit rtcan_mem_exit(void) +{ +int i; +struct rtcan_device *dev; +u8 *vmem; + +for (i =0 ; i <RTCAN_MEM_MAX_DEV ; i++) { + dev = rtcan_mem_devs[i]; +if (!dev) +continue ; + vmem = ((struct rtcan_mem *)dev->board_priv)->vmem; +rtcan_sja1000_unregister (dev); +iounmap (vmem); +release_mem_region (mem[i],RTCAN_MEM_RANGE ); + } +} + +module_init (rtcan_mem_init); +module_exit (rtcan_mem_exit);Index: ksrc/drivers/can/sja1000/Makefile
===================================================================drivers/can/sja1000/Makefile +7
-0@@ -8,11 +8,13 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o xeno_rtcan_sja1000-y := rtcan_sja1000.o rtcan_sja1000_proc.o xeno_rtcan_peak_pci-y := rtcan_peak_pci.o xeno_rtcan_peak_dng-y := rtcan_peak_dng.o xeno_rtcan_isa-y := rtcan_isa.o +xeno_rtcan_mem-y := rtcan_mem.o else@@ -24,6 +26,7 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o list-multi := xeno_rtcan_sja1000.o@@ -31,6 +34,7 @@ xeno_rtcan_peak_pci-objs := rtcan_peak_pci.o xeno_rtcan_peak_dng-objs := rtcan_peak_dng.o xeno_rtcan_isa-objs := rtcan_isa.o +xeno_rtcan_mem-objs := rtcan_mem.o export-objs := $(xeno_rtcan_sja1000-objs)@@ -49,4 +53,7 @@ xeno_rtcan_isa.o: $(xeno_rtcan_isa-objs) $(LD) -r -o $@ $(xeno_rtcan_isa-objs) + +xeno_rtcan_mem.o: $(xeno_rtcan_mem-objs) + $(LD) -r -o $@ $(xeno_rtcan_mem-objs) endif
Quoted 10 lines · Wolfgang Grandegger
Quoted 8 lines · Matthias Fuchs
Hi,
here's the 2nd try:
- updated external clock frequency handling
- userequest_mem_region()before remapping memory
- renamed local variable mem to vmem in clean loop because it shadowed a
module parameter
Quoted 5 lines
I have one more comment, sorry. I think you should use:
volatile void __iomem *vmem;and the cleanup in case of error is not OK. See below.
Could someone post a new, full patch so that I don't mess anything up on the way into SVN?
Thanks,
Jan
Quoted 9 lines · Wolfgang Grandegger
Quoted 7 lines · Matthias Fuchs
Hi,
here's the 2nd try:
- updated external clock frequency handling
- userequest_mem_region()before remapping memory
- renamed local variable mem to vmem in clean loop because it shadowed a module parameter
Quoted 3 lines
I have one more comment, sorry. I think you should use:
volatile void __iomem *vmem;
__iomem is available since kernel version 2.4.28 and it is defined for documentation only. But the xenomai readme names the Denx 2.4.25'based tree as the 2.4 refererence. And that tree also defines __iomem.
So, objection allowed.
Quoted 1 line
and the cleanup in case of error is not OK. See below.
Fixed.
New patch attached.
Matthias
Quoted 314 lines
Quoted 3 lines
Now it's on you to decide if we should merge and/or rename. I wouldn't merge because of my former arguments. But do not care about me:-)
Fine for me for the time being.
Quoted 1 line
Matthias
Wolfgang
Quoted 165 lines · Wolfgang Grandegger
Quoted 164 lines
Hi Matthias,
Quoted 5 lines · Matthias Fuchs
Hi,
attached you will find a patch that adds support for memory mapped SJA1000 CAN controllers as they often can be found on embedded boards. The driver is based on the
rtmen_isadriver.What about using
request_mem_region()? While looking to the driver I now realize, that it's mainly duplicated code. Does it not make more sense to make a combined io/mem driver. If io address < 32K it's an io driver else a mem driver.------------------------------------------------------------------------
Index: ksrc/drivers/can/sja1000/Kconfig
===================================================================drivers/can/sja1000/Kconfig +10
-0@@ -13,6 +13,16 @@ int "Maximum number of ISA devices" default 4 +config XENO_DRIVERS_RTCAN_SJA1000_MEM + depends on XENO_DRIVERS_RTCAN_SJA1000 + tristate "Memory mapped controllers" + default n + +config XENO_DRIVERS_RTCAN_SJA1000_MEM_MAX_DEV + depends on XENO_DRIVERS_RTCAN_SJA1000_MEM + int "Maximum number of memory mapped controllers" + default 4 + config XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI depends on XENO_DRIVERS_RTCAN_SJA1000 tristate "PEAK PCI Card"Index:
ksrc/drivers/can/sja1000/rtcan_mem.c
===================================================================drivers/can/sja1000/rtcan_mem.c +2
-0@@ -0,0 +1,213 @@ +/* +* Copyright (C) 2006 Matthias Fuchs <[email protected]>, + * Jan Kiszka
<[email protected]>
+ *
+ * RTCAN driver for memory mapped SJA1000 CAN controller
+ * This code has been tested on esd's CPCI405/EPPC405 PPC405 systems.
+ *
+ * This driver is derived from the rtcan-isa driver by
+ * Wolfgang Grandegger and Sebastian Smolorz.
+ *
+ * Copyright (C) 2006 Wolfgang Grandegger <[email protected]>
+ * Copyright (C) 2005, 2006 Sebastian Smolorz
+ * <[email protected]>
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; eitherer version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */drivers/can/sja1000/rtcan_mem.c +27
-0+ +#include <linux/module.h> +#include <linux/ioport.h> +#include <linux/delay.h> + +#include <rtdm/rtdm_driver.h> + +#include <rtdm/rtcan.h> +#include <rtcan_dev.h> +#include <rtcan_raw.h> +#include <rtcan_internal.h> +#include <rtcan_sja1000.h> +#include <rtcan_sja1000_regs.h> + +#define RTCAN_DEV_NAME "rtcan%d" +#define RTCAN_DRV_NAME "sja1000-mem" + +#ifdef CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEVS +#define RTCAN_MEM_MAX_DEV CONFIG_XENO_DRIVERS_RTCAN_MEM_MAX_DEV +#else +#define RTCAN_MEM_MAX_DEV 2 +#endif + +static char *mem_board_name ="mem mapped" ; + +MODULE_AUTHOR ("Matthias Fuchs <[email protected]>" ); +MODULE_DESCRIPTION("RTCAN driver for memory mapped SJA1000controller"); +MODULE_SUPPORTED_DEVICE("mem mapped");
drivers/can/sja1000/rtcan_mem.c +18
-0+MODULE_LICENSE ("GPL" ); + +static u32 mem[RTCAN_MEM_MAX_DEV ]; +static int irq[RTCAN_MEM_MAX_DEV ]; +static u32 clock[RTCAN_MEM_MAX_DEV ]; +static u8 ocr[RTCAN_MEM_MAX_DEV ]; +static u8 cdr[RTCAN_MEM_MAX_DEV ]; + +compat_module_int_param_array (mem,RTCAN_MEM_MAX_DEV ); +compat_module_int_param_array (irq,RTCAN_MEM_MAX_DEV ); +compat_module_int_param_array (clock,RTCAN_MEM_MAX_DEV ); +compat_module_byte_param_array (ocr,RTCAN_MEM_MAX_DEV ); +compat_module_byte_param_array (cdr,RTCAN_MEM_MAX_DEV ); + +MODULE_PARM_DESC (mem,"The io-memory address" ); +MODULE_PARM_DESC (irq,"The interrupt number" ); +MODULE_PARM_DESC (clock,"External clock frequency (default 16 MHz)" ); +MODULE_PARM_DESC(ocr, "Value of output control register (default
0x1a)"); +MODULE_PARM_DESC(cdr, "Value of clock divider register (default0xc8"); +drivers/can/sja1000/rtcan_mem.c +16
-0+#define RTCAN_MEM_RANGE 0x80 + +struct rtcan_mem +{ +u8 *vmem; +}; + +static struct rtcan_device *rtcan_mem_devs[RTCAN_MEM_MAX_DEV ]; + +static u8 rtcan_mem_readreg (struct rtcan_device *dev,int reg) +{ +struct rtcan_mem *board = (struct rtcan_mem *)dev->board_priv; +return readb (board->vmem + reg); +} + +static void rtcan_mem_writereg(struct rtcan_device *dev, int reg, u8val) +{
drivers/can/sja1000/rtcan_mem.c +26
-0+struct rtcan_mem *board = (struct rtcan_mem *)dev->board_priv; +writeb (val, board->vmem + reg); +} + +int __init rtcan_mem_init_one (int idx) +{ +struct rtcan_device *dev; +struct rtcan_sja1000 *chip; +struct rtcan_mem *board; +int ret; + +if ((dev =rtcan_dev_alloc (sizeof (struct rtcan_sja1000 ), +sizeof (struct rtcan_mem ))) ==NULL ) +return -ENOMEM ; + + chip = (struct rtcan_sja1000 *)dev->priv; + board = (struct rtcan_mem *)dev->board_priv; + + dev->board_name = mem_board_name; + + chip->irq_num = irq[idx]; + chip->irq_flags =RTDM_IRQTYPE_SHARED ; + chip->read_reg = rtcan_mem_readreg; + chip->write_reg = rtcan_mem_writereg; + +if (!request_mem_region (mem[idx],RTCAN_MEM_RANGE ,RTCAN_DRV_NAME ))Quoted 8 lines
drivers/can/sja1000/rtcan_mem.c
Quoted 8 lines
{ + ret =
-EBUSY;drivers/can/sja1000/rtcan_mem.c +7
-0+ goto out_dev_free; + } + +/* ioremap io memory */ +if (!(board->vmem = (u8 *)ioremap (mem[idx],RTCAN_MEM_RANGE ))) { +release_mem_region (mem[idx],RTCAN_MEM_RANGE ); + ret = -EBUSY ;goto out_release_mem;Quoted 17 lines
Quoted 17 lines
drivers/can/sja1000/rtcan_mem.c +17
-0+ } + +/* Clock frequency in Hz */ +if (clock[idx]) + dev->can_sys_clock = clock[idx] /2 ; +else + dev->can_sys_clock =8000000 ;/* 16/2 MHz */ + +/* Output control register */ +if (ocr[idx]) + chip->ocr = ocr[idx]; +else + chip->ocr =SJA_OCR_MODE_NORMAL |SJA_OCR_TX0_PUSHPULL ; + +if (cdr[idx]) + chip->cdr = cdr[idx]; +else Quoted 8 lines
drivers/can/sja1000/rtcan_mem.c
Quoted 8 lines
drivers/can/sja1000/rtcan_mem.c +8
-0+ chip->cdr =SJA_CDR_CAN_MODE |SJA_CDR_CLK_OFF |SJA_CDR_CBP ; + +strncpy (dev->name,RTCAN_DEV_NAME ,IFNAMSIZ ); + + ret =rtcan_sja1000_register (dev); +if (ret) { +printk (KERN_ERR "ERROR %d while trying to register SJA1000 device!\n" , + ret);goto out_iounmap;Quoted 7 lines
drivers/can/sja1000/rtcan_mem.c
Quoted 7 lines
drivers/can/sja1000/rtcan_mem.c +7
-0+ } + + rtcan_mem_devs[idx] = dev; +return 0 ; + + out_iounmap: +iounmap (board->vmem);out_release_mem: release_mem_region(mem[idx], RTCAN_MEM_RANGE);Quoted 89 lines
Quoted 89 lines
drivers/can/sja1000/rtcan_mem.c +51
-0+ + out_dev_free: +rtcan_dev_free (dev); + +return ret; +} + +/** Init module */ +static int __init rtcan_mem_init (void ) +{ +int i; +int ret; +int done =0 ; +for (i =0 ; + i <RTCAN_MEM_MAX_DEV && mem[i] !=0 ; + i++) { + +if ((ret =rtcan_mem_init_one (i) !=0 )) { +return ret; + } + done++; + } +if (done) +return 0 ; +printk (KERN_ERR "ERROR! No devices specified! " +"Use mem=<base_addr1>[,...] irq=<irq1>[,...]\n" ); + +return -EINVAL ; +} + + +/** Cleanup module */ +static void __exit rtcan_mem_exit(void) +{ +int i; +struct rtcan_device *dev; +u8 *vmem; + +for (i =0 ; i <RTCAN_MEM_MAX_DEV ; i++) { + dev = rtcan_mem_devs[i]; +if (!dev) +continue ; + vmem = ((struct rtcan_mem *)dev->board_priv)->vmem; +rtcan_sja1000_unregister (dev); +iounmap (vmem); +release_mem_region (mem[i],RTCAN_MEM_RANGE ); + } +} + +module_init (rtcan_mem_init); +module_exit (rtcan_mem_exit);Index: ksrc/drivers/can/sja1000/Makefile
===================================================================drivers/can/sja1000/Makefile +1
-0@@ -8,11 +8,13 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) +=xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o
xeno_rtcan_sja1000-y := rtcan_sja1000.o rtcan_sja1000_proc.o xeno_rtcan_peak_pci-y := rtcan_peak_pci.o xeno_rtcan_peak_dng-y := rtcan_peak_dng.o xeno_rtcan_isa-y := rtcan_isa.o
drivers/can/sja1000/Makefile +2
-0+xeno_rtcan_mem-y := rtcan_mem.o else@@ -24,6 +26,7 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) +=xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o
list-multi := xeno_rtcan_sja1000.o
drivers/can/sja1000/Makefile +1
-0@@ -31,6 +34,7 @@ xeno_rtcan_peak_pci-objs := rtcan_peak_pci.o xeno_rtcan_peak_dng-objs := rtcan_peak_dng.o xeno_rtcan_isa-objs := rtcan_isa.o +xeno_rtcan_mem-objs := rtcan_mem.o export-objs := $(xeno_rtcan_sja1000-objs)@@ -49,4 +53,7 @@
Quoted 11 lines
Quoted 6 lines
drivers/can/sja1000/Makefile line 59
Quoted 6 lines
drivers/can/sja1000/Makefile +3
-0xeno_rtcan_isa.o: $(xeno_rtcan_isa-objs) $(LD) -r -o $@ $(xeno_rtcan_isa-objs) + +xeno_rtcan_mem.o: $(xeno_rtcan_mem-objs) + $(LD) -r -o $@ $(xeno_rtcan_mem-objs) endif_______________________________________________
Xenomai-core mailing list
[email protected]
https://mail.gna.org/listinfo/xenomai-core
drivers/can/sja1000/Kconfig +10 -0
@@ -13,6 +13,16 @@ int "Maximum number of ISA devices" default 4 +config XENO_DRIVERS_RTCAN_SJA1000_MEM + depends on XENO_DRIVERS_RTCAN_SJA1000 + tristate "Memory mapped controllers" + default n + +config XENO_DRIVERS_RTCAN_SJA1000_MEM_MAX_DEV + depends on XENO_DRIVERS_RTCAN_SJA1000_MEM + int "Maximum number of memory mapped controllers" + default 4 + config XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI depends on XENO_DRIVERS_RTCAN_SJA1000 tristate "PEAK PCI Card"
drivers/can/sja1000/rtcan_mem.c +215 -0
215 lines not on this page · raw message
drivers/can/sja1000/Makefile +7 -0
@@ -8,11 +8,13 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o xeno_rtcan_sja1000-y := rtcan_sja1000.o rtcan_sja1000_proc.o xeno_rtcan_peak_pci-y := rtcan_peak_pci.o xeno_rtcan_peak_dng-y := rtcan_peak_dng.o xeno_rtcan_isa-y := rtcan_isa.o +xeno_rtcan_mem-y := rtcan_mem.o else
@@ -24,6 +26,7 @@ obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_PCI) += xeno_rtcan_peak_pci.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_PEAK_DNG) += xeno_rtcan_peak_dng.o obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_ISA) += xeno_rtcan_isa.o +obj-$(CONFIG_XENO_DRIVERS_RTCAN_SJA1000_MEM) += xeno_rtcan_mem.o list-multi := xeno_rtcan_sja1000.o
@@ -31,6 +34,7 @@ xeno_rtcan_peak_pci-objs := rtcan_peak_pci.o xeno_rtcan_peak_dng-objs := rtcan_peak_dng.o xeno_rtcan_isa-objs := rtcan_isa.o +xeno_rtcan_mem-objs := rtcan_mem.o export-objs := $(xeno_rtcan_sja1000-objs)
@@ -49,4 +53,7 @@ xeno_rtcan_isa.o: $(xeno_rtcan_isa-objs) $(LD) -r -o $@ $(xeno_rtcan_isa-objs) + +xeno_rtcan_mem.o: $(xeno_rtcan_mem-objs) + $(LD) -r -o $@ $(xeno_rtcan_mem-objs) endif
Quoted 9 lines · Matthias Fuchs
Quoted 8 lines · Wolfgang Grandegger
Quoted 7 lines · Matthias Fuchs
Hi,
here's the 2nd try:
- updated external clock frequency handling
- userequest_mem_region()before remapping memory
- renamed local variable mem to vmem in clean loop because it shadowed a module parameter
Quoted 5 lines
Quoted 3 lines
I have one more comment, sorry. I think you should use:
volatile void __iomem *vmem;
__iomemis available since kernel version 2.4.28 and it is defined for documentation only.
I guess it's for sparse (haven't used it yet).
Quoted 8 lines
But the xenomai readme names the Denx 2.4.25'based tree as the 2.4 refererence. And that tree also defines
__iomem. So, objection allowed.Quoted 1 line
and the cleanup in case of error is not OK. See below.
Fixed.
New patch attached.
Ok, thanks again. I just pushed it in with rev. 1598. I reformatted the code to kernel style and fixed another inherited bug of the error roll-back during init. The same happened to rtcan_isa.
Wolfgang, I added the Peak dongle to 2.4 config. Compiles fine, so I assume you simply forgot that one. Also building-in of all CAN driver should work now.
If I broke anything, please complain (I only compile-tested so far).
Uff.
Jan