From: Wolfgang Grandegger <wg-5Yr1BZd7O62+XT7JhA+gdA@public•gmane.org>
To: Kurt Van Dijck <kurt.van.dijck-/BeEPy95v10@public•gmane.org>
Cc: socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public•gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org
Subject: Re: [PATCH net-next-2.6 v2 2/2] can: add driver for Softing card
Date: Wed, 05 Jan 2011 22:02:16 +0100 [thread overview]
Message-ID: <4D24DC58.7090009@grandegger.com> (raw)
In-Reply-To: <20110104150923.GC321-MxZ6Iy/zr/UdbCeoMzGj59i2O/JbrIOy@public.gmane.org>
On 01/04/2011 04:09 PM, Kurt Van Dijck wrote:
> This patch adds the driver that creates a platform:softing device
> from a pcmcia_device
> Note: the Kconfig indicates a dependency on the softing.ko driver,
> but this is purely to make configuration intuitive. This driver will
> work independent, but no CAN network devices appear until softing.ko is
> loaded too.
>
> Signed-off-by: Kurt Van Dijck <kurt.van.dijck-/BeEPy95v10@public•gmane.org>
>
> ---
> drivers/net/can/softing/Kconfig | 13 ++
> drivers/net/can/softing/Makefile | 1 +
> drivers/net/can/softing/softing_cs.c | 361 ++++++++++++++++++++++++++++++++++
> 3 files changed, 375 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/can/softing/Kconfig b/drivers/net/can/softing/Kconfig
> index 072f337..14ebe14 100644
> --- a/drivers/net/can/softing/Kconfig
> +++ b/drivers/net/can/softing/Kconfig
> @@ -14,3 +14,16 @@ config CAN_SOFTING
> controls the 2 busses on the card together.
> As such, some actions (start/stop/busoff recovery) on 1 bus
> must bring down the other bus too temporarily.
> +
> +config CAN_SOFTING_CS
> + tristate "Softing CAN pcmcia cards"
> + depends on PCMCIA
Does it not also depend on CAN_SOFTING?
> + ---help---
> + Support for PCMCIA cards from Softing Gmbh & some cards
> + from Vector Gmbh.
> + You need firmware for these, which you can get at
> + http://developer.berlios.de/projects/socketcan/
> + This version of the driver is written against
> + firmware version 4.6 (softing-fw-4.6-binaries.tar.gz)
> + In order to use the card as CAN device, you need the Softing generic
> + support too.
> diff --git a/drivers/net/can/softing/Makefile b/drivers/net/can/softing/Makefile
> index 7878b7b..5f0f527 100644
> --- a/drivers/net/can/softing/Makefile
> +++ b/drivers/net/can/softing/Makefile
> @@ -1,5 +1,6 @@
>
> softing-y := softing_main.o softing_fw.o
> obj-$(CONFIG_CAN_SOFTING) += softing.o
> +obj-$(CONFIG_CAN_SOFTING_CS) += softing_cs.o
>
> ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
> diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
> new file mode 100644
> index 0000000..cffd4d1
> --- /dev/null
> +++ b/drivers/net/can/softing/softing_cs.c
> @@ -0,0 +1,361 @@
> +/*
> + * drivers/net/can/softing/softing_cs.c
Please remove reduntant information, here and in other files.
> + *
> + * Copyright (C) 2008-2010
> + *
> + * - Kurt Van Dijck, EIA Electronics
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the version 2 of the GNU General Public License
> + * as published by the Free Software Foundation
> + *
> + * 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/kernel.h>
> +
> +#include <pcmcia/cistpl.h>
> +#include <pcmcia/ds.h>
> +
> +#include "softing_platform.h"
> +
> +static int softingcs_index;
> +static spinlock_t softingcs_index_lock;
> +
> +static int softingcs_reset(struct platform_device *pdev, int v);
> +static int softingcs_enable_irq(struct platform_device *pdev, int v);
> +
> +/*
> + * platform_data descriptions
> + */
> +static const struct softing_platform_data softingcs_platform_data[] = {
> +{
> + .name = "CANcard",
> + .manf = 0x0168, .prod = 0x001,
> + .generation = 1,
> + .nbus = 2,
> + .freq = 16, .max_brp = 32, .max_sjw = 4,
> + .dpram_size = 0x0800,
> + .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = softingcs_enable_irq,
> +}, {
> + .name = "CANcard-NEC",
> + .manf = 0x0168, .prod = 0x002,
> + .generation = 1,
> + .nbus = 2,
> + .freq = 16, .max_brp = 32, .max_sjw = 4,
> + .dpram_size = 0x0800,
> + .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = softingcs_enable_irq,
> +}, {
> + .name = "CANcard-SJA",
> + .manf = 0x0168, .prod = 0x004,
> + .generation = 1,
> + .nbus = 2,
> + .freq = 20, .max_brp = 32, .max_sjw = 4,
> + .dpram_size = 0x0800,
> + .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cansja.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = softingcs_enable_irq,
> +}, {
> + .name = "CANcard-2",
> + .manf = 0x0168, .prod = 0x005,
> + .generation = 2,
> + .nbus = 2,
> + .freq = 24, .max_brp = 64, .max_sjw = 4,
> + .dpram_size = 0x1000,
> + .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = 0,
> +}, {
> + .name = "Vector-CANcard",
> + .manf = 0x0168, .prod = 0x081,
> + .generation = 1,
> + .nbus = 2,
> + .freq = 16, .max_brp = 64, .max_sjw = 4,
> + .dpram_size = 0x0800,
> + .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = softingcs_enable_irq,
> +}, {
> + .name = "Vector-CANcard-SJA",
> + .manf = 0x0168, .prod = 0x084,
> + .generation = 1,
> + .nbus = 2,
> + .freq = 20, .max_brp = 32, .max_sjw = 4,
> + .dpram_size = 0x0800,
> + .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cansja.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = softingcs_enable_irq,
> +}, {
> + .name = "Vector-CANcard-2",
> + .manf = 0x0168, .prod = 0x085,
> + .generation = 2,
> + .nbus = 2,
> + .freq = 24, .max_brp = 64, .max_sjw = 4,
> + .dpram_size = 0x1000,
> + .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = 0,
> +}, {
> + .name = "EDICcard-NEC",
> + .manf = 0x0168, .prod = 0x102,
> + .generation = 1,
> + .nbus = 2,
> + .freq = 16, .max_brp = 64, .max_sjw = 4,
> + .dpram_size = 0x0800,
> + .boot = {0x0000, 0x000000, fw_dir "bcard.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cancard.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = softingcs_enable_irq,
> +}, {
> + .name = "EDICcard-2",
> + .manf = 0x0168, .prod = 0x105,
> + .generation = 2,
> + .nbus = 2,
> + .freq = 24, .max_brp = 64, .max_sjw = 4,
> + .dpram_size = 0x1000,
> + .boot = {0x0000, 0x000000, fw_dir "bcard2.bin",},
> + .load = {0x0120, 0x00f600, fw_dir "ldcard2.bin",},
> + .app = {0x0010, 0x0d0000, fw_dir "cancrd2.bin",},
> + .reset = softingcs_reset,
> + .enable_irq = 0,
> +}, {
> + 0, 0,
> +},
> +};
> +
> +MODULE_FIRMWARE(fw_dir "bcard.bin");
> +MODULE_FIRMWARE(fw_dir "ldcard.bin");
> +MODULE_FIRMWARE(fw_dir "cancard.bin");
> +MODULE_FIRMWARE(fw_dir "cansja.bin");
> +
> +MODULE_FIRMWARE(fw_dir "bcard2.bin");
> +MODULE_FIRMWARE(fw_dir "ldcard2.bin");
> +MODULE_FIRMWARE(fw_dir "cancrd2.bin");
> +
> +static const struct softing_platform_data *softingcs_find_platform_data(
> + unsigned int manf, unsigned int prod)
> +{
> + const struct softing_platform_data *lp;
> +
> + for (lp = softingcs_platform_data; lp->manf; ++lp) {
> + if ((lp->manf == manf) && (lp->prod == prod))
> + return lp;
> + }
> + return 0;
> +}
> +
> +/*
> + * platformdata callbacks
> + */
> +static int softingcs_reset(struct platform_device *pdev, int v)
> +{
> + struct pcmcia_device *pcmcia = to_pcmcia_dev(pdev->dev.parent);
> +
> + dev_dbg(&pdev->dev, "pcmcia config [2] %02x\n", v ? 0 : 0x20);
> + return pcmcia_write_config_byte(pcmcia, 2, v ? 0 : 0x20);
> +}
> +
> +static int softingcs_enable_irq(struct platform_device *pdev, int v)
> +{
> + struct pcmcia_device *pcmcia = to_pcmcia_dev(pdev->dev.parent);
> +
> + dev_dbg(&pdev->dev, "pcmcia config [0] %02x\n", v ? 0x60 : 0);
> + return pcmcia_write_config_byte(pcmcia, 0, v ? 0x60 : 0);
> +}
> +
> +/*
> + * pcmcia check
> + */
> +static int softingcs_probe_config(struct pcmcia_device *pcmcia,
> + void *priv_data)
> +{
> + struct softing_platform_data *pdat = priv_data;
> + struct resource *pres;
> + int memspeed = 0;
> +
> + WARN_ON(!pdat);
> + pres = pcmcia->resource[PCMCIA_IOMEM_0];
> + if (resource_size(pres) < 0x1000)
> + return -ERANGE;
> +
> + pres->flags |= WIN_MEMORY_TYPE_CM | WIN_ENABLE;
> + if (pdat->generation < 2) {
> + pres->flags |= WIN_USE_WAIT | WIN_DATA_WIDTH_8;
> + memspeed = 3;
> + } else {
> + pres->flags |= WIN_DATA_WIDTH_16;
> + }
> + return pcmcia_request_window(pcmcia, pres, memspeed);
> +}
> +
> +static void softingcs_remove(struct pcmcia_device *pcmcia)
> +{
> + struct platform_device *pdev = pcmcia->priv;
> +
> + /* free bits */
> + platform_device_unregister(pdev);
> + /* release pcmcia stuff */
> + pcmcia_disable_device(pcmcia);
> +}
> +
> +/*
> + * platform_device wrapper
> + * pdev->resource has 2 entries: io & irq
> + */
> +static void softingcs_pdev_release(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + kfree(pdev);
> +}
> +
> +static int softingcs_probe(struct pcmcia_device *pcmcia)
> +{
> + int ret;
> + struct platform_device *pdev;
> + const struct softing_platform_data *pdat;
> + struct resource *pres;
> + struct dev {
> + struct platform_device pdev;
> + struct resource res[2];
> + } *dev;
> +
> + /* find matching platform_data */
> + pdat = softingcs_find_platform_data(pcmcia->manf_id, pcmcia->card_id);
> + if (!pdat)
> + return -ENOTTY;
> +
> + /* setup pcmcia device */
> + pcmcia->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IOMEM |
> + CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC;
> + ret = pcmcia_loop_config(pcmcia, softingcs_probe_config, (void *)pdat);
> + if (ret)
> + goto pcmcia_failed;
> +
> + ret = pcmcia_enable_device(pcmcia);
> + if (ret < 0)
> + goto pcmcia_failed;
> +
> + pres = pcmcia->resource[PCMCIA_IOMEM_0];
> + if (!pres) {
> + ret = -EBADF;
> + goto pcmcia_bad;
> + }
> +
> + /* create softing platform device */
> + dev = kzalloc(sizeof(*dev), GFP_KERNEL);
> + if (!dev) {
> + ret = -ENOMEM;
> + goto mem_failed;
> + }
> + dev->pdev.resource = dev->res;
> + dev->pdev.num_resources = ARRAY_SIZE(dev->res);
> + dev->pdev.dev.release = softingcs_pdev_release;
> +
> + pdev = &dev->pdev;
> + pdev->dev.platform_data = (void *)pdat;
> + pdev->dev.parent = &pcmcia->dev;
> + pcmcia->priv = pdev;
> +
> + /* platform device resources */
> + pdev->resource[0].flags = IORESOURCE_MEM;
> + pdev->resource[0].start = pres->start;
> + pdev->resource[0].end = pres->end;
> +
> + pdev->resource[1].flags = IORESOURCE_IRQ;
> + pdev->resource[1].start = pcmcia->irq;
> + pdev->resource[1].end = pdev->resource[1].start;
> +
> + /* platform device setup */
> + spin_lock(&softingcs_index_lock);
> + pdev->id = softingcs_index++;
> + spin_unlock(&softingcs_index_lock);
> + pdev->name = "softing";
> + dev_set_name(&pdev->dev, "softingcs.%i", pdev->id);
> + ret = platform_device_register(pdev);
> + if (ret < 0)
> + goto platform_failed;
> +
> + dev_info(&pcmcia->dev, "created %s\n", dev_name(&pdev->dev));
> + return 0;
> +
> +platform_failed:
> + kfree(dev);
> +mem_failed:
> +pcmcia_bad:
> +pcmcia_failed:
> + pcmcia_disable_device(pcmcia);
> + pcmcia->priv = 0;
> + return ret ?: -ENODEV;
> +}
> +
> +static /*const*/ struct pcmcia_device_id softingcs_ids[] = {
> + /* softing */
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0001),
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0002),
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0004),
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0005),
> + /* vector, manufacturer? */
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0081),
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0084),
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0085),
> + /* EDIC */
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0102),
> + PCMCIA_DEVICE_MANF_CARD(0x0168, 0x0105),
> + PCMCIA_DEVICE_NULL,
> +};
> +
> +MODULE_DEVICE_TABLE(pcmcia, softingcs_ids);
> +
> +static struct pcmcia_driver softingcs_driver = {
> + .owner = THIS_MODULE,
> + .name = "softingcs",
> + .id_table = softingcs_ids,
> + .probe = softingcs_probe,
> + .remove = softingcs_remove,
> +};
Also here, I'm missing the usage of __devinit and friends.
> +static int __init softingcs_start(void)
> +{
> + spin_lock_init(&softingcs_index_lock);
> + return pcmcia_register_driver(&softingcs_driver);
> +}
> +
> +static void __exit softingcs_stop(void)
> +{
> + pcmcia_unregister_driver(&softingcs_driver);
> +}
> +
> +module_init(softingcs_start);
> +module_exit(softingcs_stop);
> +
> +MODULE_DESCRIPTION("softing CANcard driver"
> + ", links PCMCIA card to softing driver");
> +MODULE_LICENSE("GPL");
GPL v2 ?
Thanks for your contribution.
Wolfgang.
next prev parent reply other threads:[~2011-01-05 21:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-04 15:05 [PATCH net-next-2.6 v2 0/2] can: add driver for Softing card Kurt Van Dijck
[not found] ` <20110104150513.GA321-MxZ6Iy/zr/UdbCeoMzGj59i2O/JbrIOy@public.gmane.org>
2011-01-04 15:07 ` [PATCH net-next-2.6 v2 1/2] " Kurt Van Dijck
[not found] ` <20110104150759.GB321-MxZ6Iy/zr/UdbCeoMzGj59i2O/JbrIOy@public.gmane.org>
2011-01-05 20:57 ` Wolfgang Grandegger
2011-01-06 15:05 ` Kurt Van Dijck
[not found] ` <20110106150525.GB324-MxZ6Iy/zr/UdbCeoMzGj59i2O/JbrIOy@public.gmane.org>
2011-01-06 16:27 ` Wolfgang Grandegger
[not found] ` <4D25ED70.7000303-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
2011-01-07 12:29 ` Kurt Van Dijck
[not found] ` <4D24DB2C.9040104-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
2011-01-10 13:31 ` Kurt Van Dijck
[not found] ` <20110110133112.GA324-MxZ6Iy/zr/UdbCeoMzGj59i2O/JbrIOy@public.gmane.org>
2011-01-10 13:40 ` Wolfram Sang
[not found] ` <20110110134006.GC31011-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2011-01-10 13:44 ` Kurt Van Dijck
2011-01-10 14:05 ` Wolfgang Grandegger
[not found] ` <4D2B1245.9060303-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
2011-01-10 14:07 ` Wolfgang Grandegger
2011-01-10 14:40 ` Kurt Van Dijck
2011-01-04 15:09 ` [PATCH net-next-2.6 v2 2/2] " Kurt Van Dijck
[not found] ` <20110104150923.GC321-MxZ6Iy/zr/UdbCeoMzGj59i2O/JbrIOy@public.gmane.org>
2011-01-05 21:02 ` Wolfgang Grandegger [this message]
[not found] ` <4D24DC58.7090009-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
2011-01-06 6:26 ` Kurt Van Dijck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D24DC58.7090009@grandegger.com \
--to=wg-5yr1bzd7o62+xt7jha+gda@public$(echo .)gmane.org \
--cc=kurt.van.dijck-/BeEPy95v10@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox