* [PATCH 0/3] xfrm: ESP Traffic Flow Confidentiality padding (v2)
From: Martin Willi @ 2010-12-07 10:29 UTC (permalink / raw)
To: Herbert Xu; +Cc: linux-crypto, netdev
The following patchset adds Traffic Flow Confidentiality padding. The
first patch introduces a new Netlink XFRM attribute to configure TFC via
userspace. Patch two and three implement the padding logic in IPv4 and
IPv6 ESP. Padding is always done using the RFC4303 format an is clamped
to the PMTU.
Changes from v1:
- Always clamp padding length to never exceed PMTU
- Remove XFRM_TFC_PMTU flag, use USHRT_MAX padding length instead
- Remove ESPv2 padding fallback due to the concerns from Herbert
- Keep the existing ESP padlen field, as we don't mangle ESP padding
I've kept the currently unused flags in the XFRM attribute to implement
ESPv2 fallback or other extensions in the future without changing the ABI.
Martin Willi (3):
xfrm: Add Traffic Flow Confidentiality padding XFRM attribute
xfrm: Traffic Flow Confidentiality for IPv4 ESP
xfrm: Traffic Flow Confidentiality for IPv6 ESP
include/linux/xfrm.h | 6 ++++++
include/net/xfrm.h | 1 +
net/ipv4/esp4.c | 33 +++++++++++++++++++++++++--------
net/ipv6/esp6.c | 33 +++++++++++++++++++++++++--------
net/xfrm/xfrm_user.c | 16 ++++++++++++++--
5 files changed, 71 insertions(+), 18 deletions(-)
^ permalink raw reply
* Re: [PATCH net-next-2.6] net: call dev_queue_xmit_nit() after skb_dst_drop()
From: Eric Dumazet @ 2010-12-07 10:30 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <1291706359.2769.17.camel@edumazet-laptop>
Le mardi 07 décembre 2010 à 08:19 +0100, Eric Dumazet a écrit :
> Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit()
> after skb_dst_drop() in dev_hard_start_xmit().
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> ---
> Next patch will perform the sk_run_filter() in dev_queue_xmit_nit(),
> before cloning skb and af_packet rcv() call.
>
> net/core/dev.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 55ff66f..59360ef 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -2025,9 +2025,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
> int rc = NETDEV_TX_OK;
>
> if (likely(!skb->next)) {
> - if (!list_empty(&ptype_all))
> - dev_queue_xmit_nit(skb, dev);
> -
> /*
> * If device doesnt need skb->dst, release it right now while
> * its hot in this cpu cache
> @@ -2037,6 +2034,9 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
>
> skb_orphan_try(skb);
>
> + if (!list_empty(&ptype_all))
> + dev_queue_xmit_nit(skb, dev);
> +
> if (vlan_tx_tag_present(skb) &&
> !(dev->features & NETIF_F_HW_VLAN_TX)) {
> skb = __vlan_put_tag(skb, vlan_tx_tag_get(skb));
>
Hmm, this was wrong, and not what I wanted to do :
in dev_queue_xmit_nit() do following tests :
/* Never send packets back to the socket
* they originated from - MvS (miquels@drinkel.ow.org)
*/
if ((ptype->dev == dev || !ptype->dev) &&
(ptype->af_packet_priv == NULL ||
(struct sock *)ptype->af_packet_priv != skb->sk)) {
struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
So we should not move dev_queue_xmit_nit() after
skb_orphan_try(skb) or the (ptype->af_packet_priv != skb->sk) test
is always true.
Here is V2 of patch :
[PATCH v2 net-next-2.6] net: call dev_queue_xmit_nit() after skb_dst_drop()
Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit()
after skb_dst_drop() in dev_hard_start_xmit().
When queueing a packet into af_packet socket, we drop dst anyway.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
net/core/dev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 55ff66f..58930e4 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2025,9 +2025,6 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
int rc = NETDEV_TX_OK;
if (likely(!skb->next)) {
- if (!list_empty(&ptype_all))
- dev_queue_xmit_nit(skb, dev);
-
/*
* If device doesnt need skb->dst, release it right now while
* its hot in this cpu cache
@@ -2035,6 +2032,9 @@ int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
skb_dst_drop(skb);
+ if (!list_empty(&ptype_all))
+ dev_queue_xmit_nit(skb, dev);
+
skb_orphan_try(skb);
if (vlan_tx_tag_present(skb) &&
^ permalink raw reply related
* Re: [PATCH net-next-2.6 8/17 v2] can: EG20T PCH: Change Copyright and module description
From: Miguel Ojeda @ 2010-12-07 10:34 UTC (permalink / raw)
To: Tomoya MORINAGA
Cc: Marc Kleine-Budde, Wolfgang Grandegger, socketcan-core, netdev,
linux-kernel, qi.wang, yong.y.wang, andrew.chih.howe.khor,
joel.clark, kok.howg.ewe, margie.foster
In-Reply-To: <175BA60FBA444BE6B858D42E7B602A40@hacdom.okisemi.com>
2010/12/7 Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>:
>> In case single destination address is OK, but in case multiple address is
>> set,
>> I can see the following error.
>> Relay access denied
>
> The above was not true.
> It seems in case destination mail domain is external, (except
> "@okisemi.com"),
> this error is occurred.
> In fact, in case multiple address with internal domain,
> it is success to send patch.
>
> Our smtp server may have restriction of something.
>
> It seems I must use mailer "thunderbird" again.
For me, Evolution worked fine (no line wrapping, etc.).
>
> Thanks,
>
> /_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_
> Tomoya Morinaga
> OKI SEMICONDUCTOR CO., LTD.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply
* Re: [PATCH net-next-2.6 8/17 v2] can: EG20T PCH: Change Copyright and module description
From: Marc Kleine-Budde @ 2010-12-07 10:38 UTC (permalink / raw)
To: Tomoya MORINAGA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
netdev-u79uwXL29TY76Z2rM5mHXA, yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w, Wolfgang Grandegger
In-Reply-To: <175BA60FBA444BE6B858D42E7B602A40-c0cKtqp5df7I9507bXv2FdBPR1lH4CV8@public.gmane.org>
[-- Attachment #1.1: Type: text/plain, Size: 916 bytes --]
On 12/07/2010 10:50 AM, Tomoya MORINAGA wrote:
>> In case single destination address is OK, but in case multiple address
>> is set,
>> I can see the following error.
>> Relay access denied
>
> The above was not true.
> It seems in case destination mail domain is external, (except
> "@okisemi.com"),
> this error is occurred.
> In fact, in case multiple address with internal domain,
> it is success to send patch.
>
> Our smtp server may have restriction of something.
>
> It seems I must use mailer "thunderbird" again.
How do you send mail with thunderbord, then? I suppose you use smtp
there, too.
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
[-- Attachment #2: Type: text/plain, Size: 188 bytes --]
_______________________________________________
Socketcan-core mailing list
Socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org
https://lists.berlios.de/mailman/listinfo/socketcan-core
^ permalink raw reply
* Re: NET_NS: unregister_netdevice: waiting for lo to become free (adding ipv6 address to interface)
From: Menil Jean-Philippe @ 2010-12-07 10:40 UTC (permalink / raw)
To: netdev
Cc: Michael Leun, Eric W. Biederman, David Lamparter, Greg KH, davem,
linux-kernel, Alexey Dobriyan, Patrick McHardy
In-Reply-To: <20101206234725.622a2212@xenia.leun.net>
[-- Attachment #1: Type: text/plain, Size: 37426 bytes --]
Le 06/12/2010 23:47, Michael Leun a écrit :
> On Mon, 06 Dec 2010 13:22:00 -0800
> ebiederm@xmission.com (Eric W. Biederman) wrote:
>
>> Menil Jean-Philippe<jean-philippe.menil@univ-nantes.fr> writes:
>>
>>> Le 24/10/2010 15:15, Michael Leun a écrit :
>>>> On Fri, 22 Oct 2010 19:05:32 +0200
>>>> Michael Leun<lkml20100708@newton.leun.net> wrote:
>>>>
>>>>> On Fri, 22 Oct 2010 14:48:58 +0200
>>>>> David Lamparter<equinox@diac24.net> wrote:
>>>>>
>>>>>> On Thu, Oct 21, 2010 at 05:15:32PM +0200, Michael Leun wrote:
>>>>>>> unfortunately the bug described below originally reported in
>>>>>>> 2.6.35-rcX is still there in 2.6.36.
> [...]
>>> curiously, i'm facing a similar problem in 2.6.36.1
>>>
>>> in my container, when i configure ipv6 adress on the interfaces,
>>> everything seems good on the first boot of the host. If i shutdown
>>> my container (lxc), then boot it, i observe the following logs:
>>> Dec 6 17:04:12 suntory.u06.univ-nantes.prive kernel: [ 368.192019]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:04:22 suntory.u06.univ-nantes.prive kernel: [ 378.432018]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:04:32 suntory.u06.univ-nantes.prive kernel: [ 388.672015]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:04:42 suntory.u06.univ-nantes.prive kernel: [ 398.912016]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:04:53 suntory.u06.univ-nantes.prive kernel: [ 409.152016]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:05:03 suntory.u06.univ-nantes.prive kernel: [ 419.392018]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:05:13 suntory.u06.univ-nantes.prive kernel: [ 429.632018]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:05:23 suntory.u06.univ-nantes.prive kernel: [ 439.876016]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:05:34 suntory.u06.univ-nantes.prive kernel: [ 450.116015]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:05:44 suntory.u06.univ-nantes.prive kernel: [ 460.356019]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:05:54 suntory.u06.univ-nantes.prive kernel: [ 470.596020]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:06:04 suntory.u06.univ-nantes.prive kernel: [ 480.836019]
>>> unregister_netdevice: waiting for lo to become free. Usage count = 4
>>> Dec 6 17:06:05 suntory.u06.univ-nantes.prive kernel:
>>> [ 481.468021] INFO: task lxc-start:3805 blocked for more than 120
>>> seconds.
>>>
>>> Then i must reboot the host.
>>> The same on kernel 2.6.34, but everything is good on a 2.6.32
>>>
>>> Some relvant informations about the kernel:
>>> root@suntory:~# cat /boot/config-2.6.36.1-dsiun-1d | grep -i sysfs
>>> # CONFIG_SYSFS_DEPRECATED_V2 is not set
>>> CONFIG_ACPI_SYSFS_POWER=y
>>> # CONFIG_WIRELESS_EXT_SYSFS is not set
>>> CONFIG_ISCSI_BOOT_SYSFS=m
>>> CONFIG_RTC_INTF_SYSFS=y
>>> CONFIG_SYSFS=y
>>> root@suntory:~# cat /boot/config-2.6.36.1-dsiun-1d | grep -i net_ns
>>> CONFIG_NET_NS=y
>>>
>>> Is there anything in my configuration, i must check in order to get
>>> ipv6 working fully in the container?
>>
>> 2.6.37-rc4 is working here. There were problems earlier in the
>> earlier rcs. Can you try that?
>>
>> There have been a couple of different reference counting bugs between
>> 2.6.34 and the present, and I haven't tracked them, just noticed they
>> exist.
>
> Can reproduce the following still on 2.6.36.1, but NOT on 2.6.37-rc4 -
> so indeed seems to be fixed!
>
>
> Putting an ipv6 address on a device seems to be the trigger:
>
> OrigNS> # ip link add type veth
> OrigNS> # ip link set dev veth0 up
> OrigNS> # unshare -n /bin/bash
> NewNS> # echo $$
> <SomePID>
> OrigNS> # ip link set dev veth1 netns<SomePID> # this, of course is
> on a different terminal NewNS> # ip link set dev veth1 up
> NewNS> # ip -6 addr add dev veth1 fd50:dead:beef::1/64
> NewNS> # exit
>
> Yields
>
> kernel: unregister_netdevice: waiting for veth1 to become free. Usage
> count = 3
>
>
Hi,
thanks for the info.
Unfortunately, i have another error with a kernel 2.6.37-rc5, already
related to iov6
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.803477]
------------[ cut here ]------------
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.803554]
WARNING: at net/ipv6/ip6_fib.c:1172 fib6_del+0x3e/0x2ce [ipv6]()
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.803616]
Hardware name: PowerEdge M605
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.803673]
Modules linked in: ipt_MASQUERADE iptable_nat nf_nat ipt_REJECT veth
fuse xt_physdev ip6t_LOG ip6table_filter ip6_tables ipt_LOG xt_multiport
xt_limit xt_tcpudp xt_state iptable_filter ip_tables x_tables
nf_conntrack_tftp nf_conntrack_ftp nf_conntrack_ipv4 nf_defrag_ipv4
8021q bridge stp ext2 mbcache dm_round_robin dm_multipath
nf_conntrack_ipv6 nf_conntrack nf_defrag_ipv6 ipv6 snd_pcm snd_timer snd
soundcore snd_page_alloc tpm_tis tpm psmouse tpm_bios i2c_nforce2 pcspkr
shpchp serio_raw pci_hotplug i2c_core button joydev ghes hed evdev
dcdbas processor thermal_sys xfs exportfs dm_mod btrfs zlib_deflate
crc32c libcrc32c sg sr_mod cdrom usbhid hid usb_storage ses sd_mod
enclosure megaraid_sas lpfc ohci_hcd scsi_transport_fc scsi_tgt scsi_mod
bnx2 ehci_hcd [last unloaded: scsi_wait_scan]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.806871]
Pid: 5, comm: kworker/u:0 Not tainted 2.6.37-rc5-dsiun-1a #2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.806931]
Call Trace:
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.806991]
[<ffffffff81040f56>] ? warn_slowpath_common+0x78/0x8c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807057]
[<ffffffffa02df719>] ? fib6_del+0x3e/0x2ce [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807118]
[<ffffffff812d69c8>] ? schedule+0x79d/0x846
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807182]
[<ffffffffa02df9ed>] ? fib6_clean_node+0x44/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807247]
[<ffffffffa02db04b>] ? fib6_ifdown+0x0/0x21 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807311]
[<ffffffffa02dee56>] ? fib6_walk_continue+0xaa/0x12d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807377]
[<ffffffffa02def2a>] ? fib6_walk+0x51/0xa4 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807441]
[<ffffffffa02df006>] ? fib6_clean_all+0x89/0xb7 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807507]
[<ffffffffa02df9a9>] ? fib6_clean_node+0x0/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807572]
[<ffffffffa02db04b>] ? fib6_ifdown+0x0/0x21 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807636]
[<ffffffffa02de76f>] ? rt6_ifdown+0x26/0x9f [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807700]
[<ffffffffa02d811a>] ? addrconf_ifdown+0x5b/0x441 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807763]
[<ffffffff812d81ba>] ? _raw_write_lock_bh+0xe/0x26
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807827]
[<ffffffffa02d8e94>] ? addrconf_notify+0x6eb/0x78d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807892]
[<ffffffffa02df9a9>] ? fib6_clean_node+0x0/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.807957]
[<ffffffffa02de7fb>] ? fib6_age+0x0/0x68 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808031]
[<ffffffff8105ea16>] ? notifier_call_chain+0x2e/0x5b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808096]
[<ffffffff812544d6>] ? dev_close+0x31/0x35
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808155]
[<ffffffff81254598>] ? rollback_registered_many+0xbe/0x1fa
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808218]
[<ffffffff812546e2>] ? unregister_netdevice_many+0xe/0x62
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808280]
[<ffffffff81254892>] ? default_device_exit_batch+0x9e/0xb0
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808342]
[<ffffffff8124eed8>] ? cleanup_net+0x0/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808401]
[<ffffffff8124efcf>] ? cleanup_net+0xf7/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808461]
[<ffffffff8105752b>] ? process_one_work+0x250/0x3ce
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808521]
[<ffffffff81057a4c>] ? worker_thread+0x1cf/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808582]
[<ffffffff8102f5a5>] ? __wake_up_common+0x41/0x78
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808642]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808701]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808761]
[<ffffffff8105a616>] ? kthread+0x7a/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808822]
[<ffffffff810037a4>] ? kernel_thread_helper+0x4/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808882]
[<ffffffff8105a59c>] ? kthread+0x0/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.808941]
[<ffffffff810037a0>] ? kernel_thread_helper+0x0/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.809001]
---[ end trace 3cbd5a9c87888acb ]---
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.809058]
fib6_clean_node: del failed: rt=ffff88045e923680@ffff88045d52dd00 err=-2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.809061]
------------[ cut here ]------------
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.809123]
WARNING: at net/ipv6/ip6_fib.c:1172 fib6_del+0x3e/0x2ce [ipv6]()
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.809184]
Hardware name: PowerEdge M605
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.809240]
Modules linked in: ipt_MASQUERADE iptable_nat nf_nat ipt_REJECT veth
fuse xt_physdev ip6t_LOG ip6table_filter ip6_tables ipt_LOG xt_multiport
xt_limit xt_tcpudp xt_state iptable_filter ip_tables x_tables
nf_conntrack_tftp nf_conntrack_ftp nf_conntrack_ipv4 nf_defrag_ipv4
8021q bridge stp ext2 mbcache dm_round_robin dm_multipath
nf_conntrack_ipv6 nf_conntrack nf_defrag_ipv6 ipv6 snd_pcm snd_timer snd
soundcore snd_page_alloc tpm_tis tpm psmouse tpm_bios i2c_nforce2 pcspkr
shpchp serio_raw pci_hotplug i2c_core button joydev ghes hed evdev
dcdbas processor thermal_sys xfs exportfs dm_mod btrfs zlib_deflate
crc32c libcrc32c sg sr_mod cdrom usbhid hid usb_storage ses sd_mod
enclosure megaraid_sas lpfc ohci_hcd scsi_transport_fc scsi_tgt scsi_mod
bnx2 ehci_hcd [last unloaded: scsi_wait_scan]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812440]
Pid: 5, comm: kworker/u:0 Tainted: G W 2.6.37-rc5-dsiun-1a #2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812515]
Call Trace:
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812570]
[<ffffffff81040f56>] ? warn_slowpath_common+0x78/0x8c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812635]
[<ffffffffa02df719>] ? fib6_del+0x3e/0x2ce [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812695]
[<ffffffff812d5e6f>] ? printk+0x40/0x49
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812758]
[<ffffffffa02df9ed>] ? fib6_clean_node+0x44/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812823]
[<ffffffffa02db04b>] ? fib6_ifdown+0x0/0x21 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812887]
[<ffffffffa02dee56>] ? fib6_walk_continue+0xaa/0x12d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.812953]
[<ffffffffa02def2a>] ? fib6_walk+0x51/0xa4 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813017]
[<ffffffffa02df006>] ? fib6_clean_all+0x89/0xb7 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813083]
[<ffffffffa02df9a9>] ? fib6_clean_node+0x0/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813147]
[<ffffffffa02db04b>] ? fib6_ifdown+0x0/0x21 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813212]
[<ffffffffa02de76f>] ? rt6_ifdown+0x26/0x9f [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813276]
[<ffffffffa02d811a>] ? addrconf_ifdown+0x5b/0x441 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813337]
[<ffffffff812d81ba>] ? _raw_write_lock_bh+0xe/0x26
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813401]
[<ffffffffa02d8e94>] ? addrconf_notify+0x6eb/0x78d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813467]
[<ffffffffa02df9a9>] ? fib6_clean_node+0x0/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813532]
[<ffffffffa02de7fb>] ? fib6_age+0x0/0x68 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813592]
[<ffffffff8105ea16>] ? notifier_call_chain+0x2e/0x5b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813653]
[<ffffffff812544d6>] ? dev_close+0x31/0x35
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813713]
[<ffffffff81254598>] ? rollback_registered_many+0xbe/0x1fa
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813775]
[<ffffffff812546e2>] ? unregister_netdevice_many+0xe/0x62
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813836]
[<ffffffff81254892>] ? default_device_exit_batch+0x9e/0xb0
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813898]
[<ffffffff8124eed8>] ? cleanup_net+0x0/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.813957]
[<ffffffff8124efcf>] ? cleanup_net+0xf7/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.814017]
[<ffffffff8105752b>] ? process_one_work+0x250/0x3ce
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819101]
[<ffffffff81057a4c>] ? worker_thread+0x1cf/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819161]
[<ffffffff8102f5a5>] ? __wake_up_common+0x41/0x78
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819221]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819281]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819341]
[<ffffffff8105a616>] ? kthread+0x7a/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819400]
[<ffffffff810037a4>] ? kernel_thread_helper+0x4/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819461]
[<ffffffff8105a59c>] ? kthread+0x0/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819519]
[<ffffffff810037a0>] ? kernel_thread_helper+0x0/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819579]
---[ end trace 3cbd5a9c87888acc ]---
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.819636]
fib6_clean_node: del failed: rt=ffff88045e923900@ffff88085dc30380 err=-2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.838291]
------------[ cut here ]------------
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.838360]
WARNING: at net/ipv6/ip6_fib.c:1172 fib6_del+0x3e/0x2ce [ipv6]()
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.838421]
Hardware name: PowerEdge M605
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.838477]
Modules linked in: ipt_MASQUERADE iptable_nat nf_nat ipt_REJECT veth
fuse xt_physdev ip6t_LOG ip6table_filter ip6_tables ipt_LOG xt_multiport
xt_limit xt_tcpudp xt_state iptable_filter ip_tables x_tables
nf_conntrack_tftp nf_conntrack_ftp nf_conntrack_ipv4 nf_defrag_ipv4
8021q bridge stp ext2 mbcache dm_round_robin dm_multipath
nf_conntrack_ipv6 nf_conntrack nf_defrag_ipv6 ipv6 snd_pcm snd_timer snd
soundcore snd_page_alloc tpm_tis tpm psmouse tpm_bios i2c_nforce2 pcspkr
shpchp serio_raw pci_hotplug i2c_core button joydev ghes hed evdev
dcdbas processor thermal_sys xfs exportfs dm_mod btrfs zlib_deflate
crc32c libcrc32c sg sr_mod cdrom usbhid hid usb_storage ses sd_mod
enclosure megaraid_sas lpfc ohci_hcd scsi_transport_fc scsi_tgt scsi_mod
bnx2 ehci_hcd [last unloaded: scsi_wait_scan]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.841677]
Pid: 5, comm: kworker/u:0 Tainted: G W 2.6.37-rc5-dsiun-1a #2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.841752]
Call Trace:
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.841809]
[<ffffffff81040f56>] ? warn_slowpath_common+0x78/0x8c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.841874]
[<ffffffffa02df719>] ? fib6_del+0x3e/0x2ce [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.841936]
[<ffffffff81271900>] ? netlink_broadcast_filtered+0x369/0x399
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842003]
[<ffffffffa02ed4b7>] ? igmp6_group_dropped+0x222/0x231 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842069]
[<ffffffffa02dbc00>] ? __ip6_del_rt+0x47/0x66 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842133]
[<ffffffffa02dbd69>] ? ip6_del_rt+0x2e/0x33 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842197]
[<ffffffffa02d68b0>] ? __ipv6_ifa_notify+0x156/0x19d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842263]
[<ffffffffa02d840e>] ? addrconf_ifdown+0x34f/0x441 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842328]
[<ffffffffa02d8e94>] ? addrconf_notify+0x6eb/0x78d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842390]
[<ffffffff8104d5bd>] ? try_to_del_timer_sync+0xab/0xb4
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842451]
[<ffffffff81249a96>] ? skb_dequeue+0x54/0x5c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842515]
[<ffffffffa02f7d54>] ? ip6mr_device_event+0xa2/0xb3 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842577]
[<ffffffff8105ea16>] ? notifier_call_chain+0x2e/0x5b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842639]
[<ffffffff812545ee>] ? rollback_registered_many+0x114/0x1fa
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842701]
[<ffffffff812546e2>] ? unregister_netdevice_many+0xe/0x62
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842763]
[<ffffffff81254892>] ? default_device_exit_batch+0x9e/0xb0
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842824]
[<ffffffff8124eed8>] ? cleanup_net+0x0/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842883]
[<ffffffff8124efcf>] ? cleanup_net+0xf7/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.842943]
[<ffffffff8105752b>] ? process_one_work+0x250/0x3ce
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843003]
[<ffffffff81057a4c>] ? worker_thread+0x1cf/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843064]
[<ffffffff8102f5a5>] ? __wake_up_common+0x41/0x78
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843124]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843183]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843243]
[<ffffffff8105a616>] ? kthread+0x7a/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843302]
[<ffffffff810037a4>] ? kernel_thread_helper+0x4/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843363]
[<ffffffff8105a59c>] ? kthread+0x0/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843421]
[<ffffffff810037a0>] ? kernel_thread_helper+0x0/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843481]
---[ end trace 3cbd5a9c87888acd ]---
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.843629]
V2002: port 2(dns2-lmb-serv) entering disabled state
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.846285]
------------[ cut here ]------------
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.846352]
WARNING: at net/ipv6/ip6_fib.c:1172 fib6_del+0x3e/0x2ce [ipv6]()
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.846414]
Hardware name: PowerEdge M605
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.846469]
Modules linked in: ipt_MASQUERADE iptable_nat nf_nat ipt_REJECT veth
fuse xt_physdev ip6t_LOG ip6table_filter ip6_tables ipt_LOG xt_multiport
xt_limit xt_tcpudp xt_state iptable_filter ip_tables x_tables
nf_conntrack_tftp nf_conntrack_ftp nf_conntrack_ipv4 nf_defrag_ipv4
8021q bridge stp ext2 mbcache dm_round_robin dm_multipath
nf_conntrack_ipv6 nf_conntrack nf_defrag_ipv6 ipv6 snd_pcm snd_timer snd
soundcore snd_page_alloc tpm_tis tpm psmouse tpm_bios i2c_nforce2 pcspkr
shpchp serio_raw pci_hotplug i2c_core button joydev ghes hed evdev
dcdbas processor thermal_sys xfs exportfs dm_mod btrfs zlib_deflate
crc32c libcrc32c sg sr_mod cdrom usbhid hid usb_storage ses sd_mod
enclosure megaraid_sas lpfc ohci_hcd scsi_transport_fc scsi_tgt scsi_mod
bnx2 ehci_hcd [last unloaded: scsi_wait_scan]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.849680]
Pid: 5, comm: kworker/u:0 Tainted: G W 2.6.37-rc5-dsiun-1a #2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.849755]
Call Trace:
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.849813]
[<ffffffff81040f56>] ? warn_slowpath_common+0x78/0x8c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.849878]
[<ffffffffa02df719>] ? fib6_del+0x3e/0x2ce [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.849940]
[<ffffffff81271900>] ? netlink_broadcast_filtered+0x369/0x399
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850007]
[<ffffffffa02ed4b7>] ? igmp6_group_dropped+0x222/0x231 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850073]
[<ffffffffa02dbc00>] ? __ip6_del_rt+0x47/0x66 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850137]
[<ffffffffa02dbd69>] ? ip6_del_rt+0x2e/0x33 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850201]
[<ffffffffa02d68b0>] ? __ipv6_ifa_notify+0x156/0x19d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850267]
[<ffffffffa02d840e>] ? addrconf_ifdown+0x34f/0x441 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850332]
[<ffffffffa02d8e94>] ? addrconf_notify+0x6eb/0x78d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850395]
[<ffffffff8104d5bd>] ? try_to_del_timer_sync+0xab/0xb4
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850456]
[<ffffffff81249a96>] ? skb_dequeue+0x54/0x5c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850520]
[<ffffffffa02f7d54>] ? ip6mr_device_event+0xa2/0xb3 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850582]
[<ffffffff8105ea16>] ? notifier_call_chain+0x2e/0x5b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850644]
[<ffffffff812545ee>] ? rollback_registered_many+0x114/0x1fa
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850706]
[<ffffffff812546e2>] ? unregister_netdevice_many+0xe/0x62
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850768]
[<ffffffff81254892>] ? default_device_exit_batch+0x9e/0xb0
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850830]
[<ffffffff8124eed8>] ? cleanup_net+0x0/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850889]
[<ffffffff8124efcf>] ? cleanup_net+0xf7/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.850949]
[<ffffffff8105752b>] ? process_one_work+0x250/0x3ce
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851009]
[<ffffffff81057a4c>] ? worker_thread+0x1cf/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851070]
[<ffffffff8102f5a5>] ? __wake_up_common+0x41/0x78
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851130]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851189]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851249]
[<ffffffff8105a616>] ? kthread+0x7a/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851308]
[<ffffffff810037a4>] ? kernel_thread_helper+0x4/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851369]
[<ffffffff8105a59c>] ? kthread+0x0/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851427]
[<ffffffff810037a0>] ? kernel_thread_helper+0x0/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851487]
---[ end trace 3cbd5a9c87888ace ]---
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.851627]
V2003: port 2(dns2-lmb-clus) entering disabled state
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.854386]
------------[ cut here ]------------
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.854455]
WARNING: at net/ipv6/ip6_fib.c:1172 fib6_del+0x3e/0x2ce [ipv6]()
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.854517]
Hardware name: PowerEdge M605
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.854573]
Modules linked in: ipt_MASQUERADE iptable_nat nf_nat ipt_REJECT veth
fuse xt_physdev ip6t_LOG ip6table_filter ip6_tables ipt_LOG xt_multiport
xt_limit xt_tcpudp xt_state iptable_filter ip_tables x_tables
nf_conntrack_tftp nf_conntrack_ftp nf_conntrack_ipv4 nf_defrag_ipv4
8021q bridge stp ext2 mbcache dm_round_robin dm_multipath
nf_conntrack_ipv6 nf_conntrack nf_defrag_ipv6 ipv6 snd_pcm snd_timer snd
soundcore snd_page_alloc tpm_tis tpm psmouse tpm_bios i2c_nforce2 pcspkr
shpchp serio_raw pci_hotplug i2c_core button joydev ghes hed evdev
dcdbas processor thermal_sys xfs exportfs dm_mod btrfs zlib_deflate
crc32c libcrc32c sg sr_mod cdrom usbhid hid usb_storage ses sd_mod
enclosure megaraid_sas lpfc ohci_hcd scsi_transport_fc scsi_tgt scsi_mod
bnx2 ehci_hcd [last unloaded: scsi_wait_scan]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.857801]
Pid: 5, comm: kworker/u:0 Tainted: G W 2.6.37-rc5-dsiun-1a #2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.857876]
Call Trace:
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.857934]
[<ffffffff81040f56>] ? warn_slowpath_common+0x78/0x8c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.857999]
[<ffffffffa02df719>] ? fib6_del+0x3e/0x2ce [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858060]
[<ffffffff811fbe80>] ? extract_buf+0x76/0xc2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858124]
[<ffffffffa02df9ed>] ? fib6_clean_node+0x44/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858189]
[<ffffffffa02db04b>] ? fib6_ifdown+0x0/0x21 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858253]
[<ffffffffa02dee56>] ? fib6_walk_continue+0xaa/0x12d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858319]
[<ffffffffa02def2a>] ? fib6_walk+0x51/0xa4 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858383]
[<ffffffffa02df006>] ? fib6_clean_all+0x89/0xb7 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858449]
[<ffffffffa02df9a9>] ? fib6_clean_node+0x0/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858514]
[<ffffffffa02db04b>] ? fib6_ifdown+0x0/0x21 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858578]
[<ffffffffa02de76f>] ? rt6_ifdown+0x26/0x9f [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858642]
[<ffffffffa02d811a>] ? addrconf_ifdown+0x5b/0x441 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858708]
[<ffffffffa02d8e94>] ? addrconf_notify+0x6eb/0x78d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858770]
[<ffffffff8104d5bd>] ? try_to_del_timer_sync+0xab/0xb4
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858832]
[<ffffffff81249a96>] ? skb_dequeue+0x54/0x5c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858896]
[<ffffffffa02f7d54>] ? ip6mr_device_event+0xa2/0xb3 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.858959]
[<ffffffff8105ea16>] ? notifier_call_chain+0x2e/0x5b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859021]
[<ffffffff812545ee>] ? rollback_registered_many+0x114/0x1fa
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859083]
[<ffffffff812546e2>] ? unregister_netdevice_many+0xe/0x62
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859145]
[<ffffffff81254892>] ? default_device_exit_batch+0x9e/0xb0
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859207]
[<ffffffff8124eed8>] ? cleanup_net+0x0/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859266]
[<ffffffff8124efcf>] ? cleanup_net+0xf7/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859326]
[<ffffffff8105752b>] ? process_one_work+0x250/0x3ce
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859386]
[<ffffffff81057a4c>] ? worker_thread+0x1cf/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859447]
[<ffffffff8102f5a5>] ? __wake_up_common+0x41/0x78
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859507]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859567]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859627]
[<ffffffff8105a616>] ? kthread+0x7a/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859686]
[<ffffffff810037a4>] ? kernel_thread_helper+0x4/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859747]
[<ffffffff8105a59c>] ? kthread+0x0/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859805]
[<ffffffff810037a0>] ? kernel_thread_helper+0x0/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859865]
---[ end trace 3cbd5a9c87888acf ]---
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859923]
fib6_clean_node: del failed: rt=ffff88045e923680@ffff88045d52dd00 err=-2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859925]
------------[ cut here ]------------
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.859987]
WARNING: at net/ipv6/ip6_fib.c:1172 fib6_del+0x3e/0x2ce [ipv6]()
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.860065]
Hardware name: PowerEdge M605
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.860121]
Modules linked in: ipt_MASQUERADE iptable_nat nf_nat ipt_REJECT veth
fuse xt_physdev ip6t_LOG ip6table_filter ip6_tables ipt_LOG xt_multiport
xt_limit xt_tcpudp xt_state iptable_filter ip_tables x_tables
nf_conntrack_tftp nf_conntrack_ftp nf_conntrack_ipv4 nf_defrag_ipv4
8021q bridge stp ext2 mbcache dm_round_robin dm_multipath
nf_conntrack_ipv6 nf_conntrack nf_defrag_ipv6 ipv6 snd_pcm snd_timer snd
soundcore snd_page_alloc tpm_tis tpm psmouse tpm_bios i2c_nforce2 pcspkr
shpchp serio_raw pci_hotplug i2c_core button joydev ghes hed evdev
dcdbas processor thermal_sys xfs exportfs dm_mod btrfs zlib_deflate
crc32c libcrc32c sg sr_mod cdrom usbhid hid usb_storage ses sd_mod
enclosure megaraid_sas lpfc ohci_hcd scsi_transport_fc scsi_tgt scsi_mod
bnx2 ehci_hcd [last unloaded: scsi_wait_scan]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863303]
Pid: 5, comm: kworker/u:0 Tainted: G W 2.6.37-rc5-dsiun-1a #2
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863378]
Call Trace:
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863433]
[<ffffffff81040f56>] ? warn_slowpath_common+0x78/0x8c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863498]
[<ffffffffa02df719>] ? fib6_del+0x3e/0x2ce [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863559]
[<ffffffff812d5e6f>] ? printk+0x40/0x49
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863622]
[<ffffffffa02df9ed>] ? fib6_clean_node+0x44/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863686]
[<ffffffffa02db04b>] ? fib6_ifdown+0x0/0x21 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863751]
[<ffffffffa02dee56>] ? fib6_walk_continue+0xaa/0x12d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863817]
[<ffffffffa02def2a>] ? fib6_walk+0x51/0xa4 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863881]
[<ffffffffa02df006>] ? fib6_clean_all+0x89/0xb7 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.863946]
[<ffffffffa02df9a9>] ? fib6_clean_node+0x0/0x96 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.864046]
[<ffffffffa02db04b>] ? fib6_ifdown+0x0/0x21 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.864112]
[<ffffffffa02de76f>] ? rt6_ifdown+0x26/0x9f [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.864177]
[<ffffffffa02d811a>] ? addrconf_ifdown+0x5b/0x441 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.864242]
[<ffffffffa02d8e94>] ? addrconf_notify+0x6eb/0x78d [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.864303]
[<ffffffff8104d5bd>] ? try_to_del_timer_sync+0xab/0xb4
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.864364]
[<ffffffff81249a96>] ? skb_dequeue+0x54/0x5c
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869452]
[<ffffffffa02f7d54>] ? ip6mr_device_event+0xa2/0xb3 [ipv6]
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869515]
[<ffffffff8105ea16>] ? notifier_call_chain+0x2e/0x5b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869577]
[<ffffffff812545ee>] ? rollback_registered_many+0x114/0x1fa
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869639]
[<ffffffff812546e2>] ? unregister_netdevice_many+0xe/0x62
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869701]
[<ffffffff81254892>] ? default_device_exit_batch+0x9e/0xb0
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869762]
[<ffffffff8124eed8>] ? cleanup_net+0x0/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869821]
[<ffffffff8124efcf>] ? cleanup_net+0xf7/0x190
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869881]
[<ffffffff8105752b>] ? process_one_work+0x250/0x3ce
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.869941]
[<ffffffff81057a4c>] ? worker_thread+0x1cf/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870001]
[<ffffffff8102f5a5>] ? __wake_up_common+0x41/0x78
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870061]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870121]
[<ffffffff8105787d>] ? worker_thread+0x0/0x34b
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870180]
[<ffffffff8105a616>] ? kthread+0x7a/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870239]
[<ffffffff810037a4>] ? kernel_thread_helper+0x4/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870300]
[<ffffffff8105a59c>] ? kthread+0x0/0x82
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870358]
[<ffffffff810037a0>] ? kernel_thread_helper+0x0/0x10
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870418]
---[ end trace 3cbd5a9c87888ad0 ]---
Dec 7 11:36:54 suntory.u06.univ-nantes.prive kernel: [ 1454.870476]
fib6_clean_node: del failed: rt=ffff88045e923900@ffff88085dc30380 err=-2
Dec 7 11:36:59 suntory.u06.univ-nantes.prive kernel: [ 1459.702735]
device dns2-lmb-clus entered promiscuous mode
Dec 7 11:36:59 suntory.u06.univ-nantes.prive kernel: [ 1459.704898]
ADDRCONF(NETDEV_UP): dns2-lmb-clus: link is not ready
Dec 7 11:36:59 suntory.u06.univ-nantes.prive kernel: [ 1459.706711]
device dns2-lmb-serv entered promiscuous mode
Dec 7 11:36:59 suntory.u06.univ-nantes.prive kernel: [ 1459.709079]
ADDRCONF(NETDEV_UP): dns2-lmb-serv: link is not ready
Dec 7 11:37:04 suntory.u06.univ-nantes.prive kernel: [ 1465.152018]
unregister_netdevice: waiting for eth1 to become free. Usage count = 1
Dec 7 11:37:15 suntory.u06.univ-nantes.prive kernel: [ 1475.392020]
unregister_netdevice: waiting for eth1 to become free. Usage count = 1
Dec 7 11:37:25 suntory.u06.univ-nantes.prive kernel: [ 1485.632020]
unregister_netdevice: waiting for eth1 to become free. Usage count = 1
I continue my tests.
thanks for your help.
Regards.
[-- Attachment #2: jean-philippe_menil.vcf --]
[-- Type: text/x-vcard, Size: 377 bytes --]
begin:vcard
fn:Jean-Philippe Menil
n:Menil;Jean-Philippe
org;quoted-printable:Universit=C3=A9 de Nantes;IRTS
adr;quoted-printable:;;2 rue de la Houssini=C3=A8re;Nantes;;44322;France
email;internet:jean-philippe.menil@univ-nantes.fr
title:Reseau
tel;work:02 53 48 49 27
tel;fax:(33)2 51 12 58 60
tel;cell:06 45 38 87 75
url:http://www.cri.univ-nantes.fr
version:2.1
end:vcard
^ permalink raw reply
* Re: [PATCH net-next-2.6 v7 01/24] CAN : Separate interface register fromwhole of register structure.
From: Tomoya MORINAGA @ 2010-12-07 10:51 UTC (permalink / raw)
To: Tomoya MORINAGA, Wolfgang Grandegger,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
In-Reply-To: <4CFE09C5.4030107@dsn.okisemi.com>
Sorry, the latest kernel tree have already updated.
Please ignore v7 patch.
I will release patches as v8 series.
Thanks,
/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_
Tomoya Morinaga
OKI SEMICONDUCTOR CO., LTD.
^ permalink raw reply
* Re: [PATCH net-next-2.6 8/17 v2] can: EG20T PCH: Change Copyright and module description
From: Tomoya MORINAGA @ 2010-12-07 10:56 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
netdev-u79uwXL29TY76Z2rM5mHXA, yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w, Wolfgang Grandegger
In-Reply-To: <4CFE0E8A.8000204@pengutronix.de>
On Tuesday, December 07, 2010 7:38 PM, Marc Kleine-Budde wrote:
> How do you send mail with thunderbord, then? I suppose you use smtp
> there, too.
Yes,
The same SMTP server is used when thunderbird, too.
Thanks,
/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_
Tomoya Morinaga
OKI SEMICONDUCTOR CO., LTD.
----- Original Message -----
From: "Marc Kleine-Budde" <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
To: "Tomoya MORINAGA" <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
Cc: "Wolfgang Grandegger" <wg-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>;
<socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org>; <netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>;
<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>; <qi.wang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>;
<yong.y.wang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>; <andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>;
<joel.clark-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>; <kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>; <margie.foster-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Sent: Tuesday, December 07, 2010 7:38 PM
Subject: Re: [PATCH net-next-2.6 8/17 v2] can: EG20T PCH: Change Copyright
and module description
^ permalink raw reply
* [PATCH net-next-2.6 v8 01/20] CAN : Add flow control processing.
From: Tomoya MORINAGA @ 2010-12-07 11:00 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Currently, there is no flow control processing.
Thus, Add flow control processing as
when there is no empty of tx buffer,
netif_stop_queue is called.
When there is empty buffer, netif_wake_queue is called.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index a9b6a65..f0f1404 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -102,6 +102,10 @@
#define PCH_FIFO_THRESH 16
+/* TxRqst2 show status of MsgObjNo.17~32 */
+#define PCH_TREQ2_TX_MASK (((1 << PCH_TX_OBJ_NUM) - 1) <<\
+ (PCH_RX_OBJ_END - 16))
+
enum pch_ifreg {
PCH_RX_IFREG,
PCH_TX_IFREG,
@@ -871,6 +875,8 @@ MSG_OBJ:
dlc = 8;
stats->tx_bytes += dlc;
stats->tx_packets++;
+ if (int_stat == PCH_TX_OBJ_END)
+ netif_wake_queue(ndev);
}
int_stat = pch_can_int_pending(priv);
@@ -1009,18 +1015,6 @@ static int pch_close(struct net_device *ndev)
return 0;
}
-static int pch_get_msg_obj_sts(struct net_device *ndev, u32 obj_id)
-{
- u32 buffer_status = 0;
- struct pch_can_priv *priv = netdev_priv(ndev);
-
- /* Getting the message object status. */
- buffer_status = (u32) pch_can_get_buffer_status(priv);
-
- return buffer_status & obj_id;
-}
-
-
static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
{
int i, j;
@@ -1031,17 +1025,16 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
if (can_dropped_invalid_skb(ndev, skb))
return NETDEV_TX_OK;
- if (priv->tx_obj == PCH_TX_OBJ_END) { /* Point tail Obj */
- while (pch_get_msg_obj_sts(ndev, (((1 << PCH_TX_OBJ_NUM)-1) <<
- PCH_RX_OBJ_NUM)))
- udelay(500);
+ if (priv->tx_obj == PCH_TX_OBJ_END) {
+ if (ioread32(&priv->regs->treq2) & PCH_TREQ2_TX_MASK)
+ netif_stop_queue(ndev);
- priv->tx_obj = PCH_TX_OBJ_START; /* Point head of Tx Obj ID */
- tx_buffer_avail = priv->tx_obj; /* Point Tail of Tx Obj */
+ tx_buffer_avail = priv->tx_obj;
+ priv->tx_obj = PCH_TX_OBJ_START;
} else {
tx_buffer_avail = priv->tx_obj;
+ priv->tx_obj++;
}
- priv->tx_obj++;
/* Reading the Msg Obj from the Msg RAM to the Interface register. */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[1].cmask);
--
1.6.0.6
^ permalink raw reply related
* Re: [PATCH net-next-2.6 8/17 v2] can: EG20T PCH: Change Copyright and module description
From: Marc Kleine-Budde @ 2010-12-07 11:02 UTC (permalink / raw)
To: Tomoya MORINAGA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
netdev-u79uwXL29TY76Z2rM5mHXA, yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w, Wolfgang Grandegger
In-Reply-To: <CBA434C33CC34AE6BD224B8563771B6C-c0cKtqp5df7I9507bXv2FdBPR1lH4CV8@public.gmane.org>
[-- Attachment #1.1: Type: text/plain, Size: 633 bytes --]
On 12/07/2010 11:56 AM, Tomoya MORINAGA wrote:
> On Tuesday, December 07, 2010 7:38 PM, Marc Kleine-Budde wrote:
>> How do you send mail with thunderbord, then? I suppose you use smtp
>> there, too.
>
> Yes,
> The same SMTP server is used when thunderbird, too.
Then check your settings, e.g. username, ssmtp, TSL, port, passwd.
cheers, Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
[-- Attachment #2: Type: text/plain, Size: 188 bytes --]
_______________________________________________
Socketcan-core mailing list
Socketcan-core-0fE9KPoRgkgATYTw5x5z8w@public.gmane.org
https://lists.berlios.de/mailman/listinfo/socketcan-core
^ permalink raw reply
* [patch] econet: unlock on -EPERM path
From: Dan Carpenter @ 2010-12-07 11:01 UTC (permalink / raw)
To: netdev; +Cc: Phil Blundell, Eric Dumazet, David S. Miller, kernel-janitors
We need to do a mutex_unlock() and a put_dev() before returning.
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 13992e1..f180371 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -661,8 +661,10 @@ static int ec_dev_ioctl(struct socket *sock, unsigned int cmd, void __user *arg)
err = 0;
switch (cmd) {
case SIOCSIFADDR:
- if (!capable(CAP_NET_ADMIN))
- return -EPERM;
+ if (!capable(CAP_NET_ADMIN)) {
+ err = -EPERM;
+ break;
+ }
edev = dev->ec_ptr;
if (edev == NULL) {
^ permalink raw reply related
* [PATCH net-next-2.6 v8 02/20] CAN : Divide poll function
From: Tomoya MORINAGA @ 2010-12-07 11:03 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core, netdev, linux-kernel
Cc: qi.wang, yong.y.wang, andrew.chih.howe.khor, joel.clark,
kok.howg.ewe, margie.foster
To easy to read/understand, divide poll function into two sub-functions.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
---
drivers/net/can/pch_can.c | 71 ++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index f0f1404..0b6d4f4 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -819,72 +819,71 @@ RX_NEXT:
return rcv_pkts;
}
-static int pch_can_rx_poll(struct napi_struct *napi, int quota)
+
+static void pch_can_tx_complete(struct net_device *ndev, u32 int_stat)
{
- struct net_device *ndev = napi->dev;
struct pch_can_priv *priv = netdev_priv(ndev);
struct net_device_stats *stats = &(priv->ndev->stats);
u32 dlc;
+
+ can_get_echo_skb(ndev, int_stat - PCH_RX_OBJ_END - 1);
+ iowrite32(PCH_CMASK_RX_TX_GET | PCH_CMASK_CLRINTPND,
+ &priv->regs->ifregs[1].cmask);
+ pch_can_check_if_busy(&priv->regs->ifregs[1].creq, int_stat);
+ dlc = get_can_dlc(ioread32(&priv->regs->ifregs[1].mcont) &
+ PCH_IF_MCONT_DLC);
+ stats->tx_bytes += dlc;
+ stats->tx_packets++;
+ if (int_stat == PCH_TX_OBJ_END)
+ netif_wake_queue(ndev);
+}
+
+static int pch_can_rx_poll(struct napi_struct *napi, int quota)
+{
+ struct net_device *ndev = napi->dev;
+ struct pch_can_priv *priv = netdev_priv(ndev);
u32 int_stat;
int rcv_pkts = 0;
u32 reg_stat;
int_stat = pch_can_int_pending(priv);
if (!int_stat)
- return 0;
+ goto end;
-INT_STAT:
- if (int_stat == PCH_STATUS_INT) {
+ if ((int_stat == PCH_STATUS_INT) && (quota > 0)) {
reg_stat = ioread32(&priv->regs->stat);
if (reg_stat & (PCH_BUS_OFF | PCH_LEC_ALL)) {
- if ((reg_stat & PCH_LEC_ALL) != PCH_LEC_ALL)
+ if (reg_stat & PCH_BUS_OFF ||
+ (reg_stat & PCH_LEC_ALL) != PCH_LEC_ALL) {
pch_can_error(ndev, reg_stat);
+ quota--;
+ }
}
- if (reg_stat & PCH_TX_OK) {
- iowrite32(PCH_CMASK_RX_TX_GET,
- &priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq,
- ioread32(&priv->regs->intr));
+ if (reg_stat & PCH_TX_OK)
pch_can_bit_clear(&priv->regs->stat, PCH_TX_OK);
- }
if (reg_stat & PCH_RX_OK)
pch_can_bit_clear(&priv->regs->stat, PCH_RX_OK);
int_stat = pch_can_int_pending(priv);
- if (int_stat == PCH_STATUS_INT)
- goto INT_STAT;
}
-MSG_OBJ:
+ if (quota == 0)
+ goto end;
+
if ((int_stat >= PCH_RX_OBJ_START) && (int_stat <= PCH_RX_OBJ_END)) {
- rcv_pkts = pch_can_rx_normal(ndev, int_stat);
- if (rcv_pkts < 0)
- return 0;
+ rcv_pkts += pch_can_rx_normal(ndev, int_stat);
+ quota -= rcv_pkts;
+ if (quota < 0)
+ goto end;
} else if ((int_stat >= PCH_TX_OBJ_START) &&
(int_stat <= PCH_TX_OBJ_END)) {
/* Handle transmission interrupt */
- can_get_echo_skb(ndev, int_stat - PCH_RX_OBJ_END - 1);
- iowrite32(PCH_CMASK_RX_TX_GET | PCH_CMASK_CLRINTPND,
- &priv->regs->ifregs[1].cmask);
- dlc = ioread32(&priv->regs->ifregs[1].mcont) &
- PCH_IF_MCONT_DLC;
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, int_stat);
- if (dlc > 8)
- dlc = 8;
- stats->tx_bytes += dlc;
- stats->tx_packets++;
- if (int_stat == PCH_TX_OBJ_END)
- netif_wake_queue(ndev);
+ pch_can_tx_complete(ndev, int_stat);
}
- int_stat = pch_can_int_pending(priv);
- if (int_stat == PCH_STATUS_INT)
- goto INT_STAT;
- else if (int_stat >= 1 && int_stat <= 32)
- goto MSG_OBJ;
-
+end:
napi_complete(napi);
pch_can_set_int_enables(priv, PCH_CAN_ALL);
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 03/20] CAN : Fix endianness issue.
From: Tomoya MORINAGA @ 2010-12-07 11:03 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
there is endianness issue both Tx and Rx.
Currently, data is set like below.
Register:
MSB--LSB
x x D0 D1
x x D2 D3
x x D4 D5
x x D6 D7
But Data to be sent must be set like below.
Register:
MSB--LSB
x x D1 D0
x x D3 D2
x x D5 D4
x x D7 D6 (x means reserved area.)
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 47 +++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 0b6d4f4..b17ca0c 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -138,10 +138,7 @@ struct pch_can_if_regs {
u32 id1;
u32 id2;
u32 mcont;
- u32 dataa1;
- u32 dataa2;
- u32 datab1;
- u32 datab2;
+ u32 data[4];
u32 rsv[13];
};
@@ -424,10 +421,10 @@ static void pch_can_clear_buffers(struct pch_can_priv *priv)
iowrite32(0x0, &priv->regs->ifregs[0].id1);
iowrite32(0x0, &priv->regs->ifregs[0].id2);
iowrite32(0x0, &priv->regs->ifregs[0].mcont);
- iowrite32(0x0, &priv->regs->ifregs[0].dataa1);
- iowrite32(0x0, &priv->regs->ifregs[0].dataa2);
- iowrite32(0x0, &priv->regs->ifregs[0].datab1);
- iowrite32(0x0, &priv->regs->ifregs[0].datab2);
+ iowrite32(0x0, &priv->regs->ifregs[0].data[0]);
+ iowrite32(0x0, &priv->regs->ifregs[0].data[1]);
+ iowrite32(0x0, &priv->regs->ifregs[0].data[2]);
+ iowrite32(0x0, &priv->regs->ifregs[0].data[3]);
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |
PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
@@ -441,10 +438,10 @@ static void pch_can_clear_buffers(struct pch_can_priv *priv)
iowrite32(0x0, &priv->regs->ifregs[1].id1);
iowrite32(0x0, &priv->regs->ifregs[1].id2);
iowrite32(0x0, &priv->regs->ifregs[1].mcont);
- iowrite32(0x0, &priv->regs->ifregs[1].dataa1);
- iowrite32(0x0, &priv->regs->ifregs[1].dataa2);
- iowrite32(0x0, &priv->regs->ifregs[1].datab1);
- iowrite32(0x0, &priv->regs->ifregs[1].datab2);
+ iowrite32(0x0, &priv->regs->ifregs[1].data[0]);
+ iowrite32(0x0, &priv->regs->ifregs[1].data[1]);
+ iowrite32(0x0, &priv->regs->ifregs[1].data[2]);
+ iowrite32(0x0, &priv->regs->ifregs[1].data[3]);
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |
PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[1].cmask);
@@ -707,12 +704,13 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 int_stat)
canid_t id;
u32 ide;
u32 rtr;
- int i, j, k;
+ int i, k;
int rcv_pkts = 0;
struct sk_buff *skb;
struct can_frame *cf;
struct pch_can_priv *priv = netdev_priv(ndev);
struct net_device_stats *stats = &(priv->ndev->stats);
+ u16 data_reg;
/* Reading the messsage object from the Message RAM */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
@@ -778,12 +776,10 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 int_stat)
((ioread32(&priv->regs->ifregs[0].mcont)) & 0x0f);
}
- for (i = 0, j = 0; i < cf->can_dlc; j++) {
- reg = ioread32(&priv->regs->ifregs[0].dataa1 + j*4);
- cf->data[i++] = cpu_to_le32(reg & 0xff);
- if (i == cf->can_dlc)
- break;
- cf->data[i++] = cpu_to_le32((reg >> 8) & 0xff);
+ for (i = 0; i < cf->can_dlc; i += 2) {
+ data_reg = ioread16(&priv->regs->ifregs[0].data[i / 2]);
+ cf->data[i] = data_reg & 0xff;
+ cf->data[i + 1] = data_reg >> 8;
}
netif_receive_skb(skb);
@@ -1016,10 +1012,10 @@ static int pch_close(struct net_device *ndev)
static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
{
- int i, j;
struct pch_can_priv *priv = netdev_priv(ndev);
struct can_frame *cf = (struct can_frame *)skb->data;
int tx_buffer_avail = 0;
+ int i;
if (can_dropped_invalid_skb(ndev, skb))
return NETDEV_TX_OK;
@@ -1060,13 +1056,10 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
if (cf->can_id & CAN_RTR_FLAG)
pch_can_bit_clear(&priv->regs->ifregs[1].id2, PCH_ID2_DIR);
- for (i = 0, j = 0; i < cf->can_dlc; j++) {
- iowrite32(le32_to_cpu(cf->data[i++]),
- (&priv->regs->ifregs[1].dataa1) + j*4);
- if (i == cf->can_dlc)
- break;
- iowrite32(le32_to_cpu(cf->data[i++] << 8),
- (&priv->regs->ifregs[1].dataa1) + j*4);
+ /* Copy data to register */
+ for (i = 0; i < cf->can_dlc; i += 2) {
+ iowrite16(cf->data[i] | (cf->data[i + 1] << 8),
+ &priv->regs->ifregs[1].data[i / 2]);
}
can_put_echo_skb(skb, ndev, tx_buffer_avail - PCH_RX_OBJ_END - 1);
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 04/20] CAN : Improve rx processing.
From: Tomoya MORINAGA @ 2010-12-07 11:04 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Replace complex "goto" to "do~while".
For easy to read/understand, it divides a rx function into some functions.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 160 +++++++++++++++++++++++----------------------
1 files changed, 83 insertions(+), 77 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index b17ca0c..d646fbc 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -698,120 +698,126 @@ static irqreturn_t pch_can_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static int pch_can_rx_normal(struct net_device *ndev, u32 int_stat)
+static void pch_fifo_thresh(struct pch_can_priv *priv, int obj_id)
+{
+ if (obj_id < PCH_FIFO_THRESH) {
+ iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL |
+ PCH_CMASK_ARB, &priv->regs->ifregs[0].cmask);
+
+ /* Clearing the Dir bit. */
+ pch_can_bit_clear(&priv->regs->ifregs[0].id2, PCH_ID2_DIR);
+
+ /* Clearing NewDat & IntPnd */
+ pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
+ PCH_IF_MCONT_INTPND);
+ pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_id);
+ } else if (obj_id > PCH_FIFO_THRESH) {
+ pch_can_int_clr(priv, obj_id);
+ } else if (obj_id == PCH_FIFO_THRESH) {
+ int cnt;
+ for (cnt = 0; cnt < PCH_FIFO_THRESH; cnt++)
+ pch_can_int_clr(priv, cnt + 1);
+ }
+}
+
+static void pch_can_rx_msg_lost(struct net_device *ndev, int obj_id)
+{
+ struct pch_can_priv *priv = netdev_priv(ndev);
+ struct net_device_stats *stats = &(priv->ndev->stats);
+ struct sk_buff *skb;
+ struct can_frame *cf;
+
+ netdev_dbg(priv->ndev, "Msg Obj is overwritten.\n");
+ pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
+ PCH_IF_MCONT_MSGLOST);
+ iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
+ &priv->regs->ifregs[0].cmask);
+ pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_id);
+
+ skb = alloc_can_err_skb(ndev, &cf);
+ if (!skb)
+ return;
+
+ cf->can_id |= CAN_ERR_CRTL;
+ cf->data[1] = CAN_ERR_CRTL_RX_OVERFLOW;
+ stats->rx_over_errors++;
+ stats->rx_errors++;
+
+ netif_receive_skb(skb);
+}
+
+static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota)
{
u32 reg;
canid_t id;
- u32 ide;
- u32 rtr;
- int i, k;
int rcv_pkts = 0;
struct sk_buff *skb;
struct can_frame *cf;
struct pch_can_priv *priv = netdev_priv(ndev);
struct net_device_stats *stats = &(priv->ndev->stats);
+ int i;
+ u32 id2;
u16 data_reg;
- /* Reading the messsage object from the Message RAM */
- iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, int_stat);
+ do {
+ /* Reading the messsage object from the Message RAM */
+ iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
+ pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_num);
- /* Reading the MCONT register. */
- reg = ioread32(&priv->regs->ifregs[0].mcont);
- reg &= 0xffff;
+ /* Reading the MCONT register. */
+ reg = ioread32(&priv->regs->ifregs[0].mcont);
+
+ if (reg & PCH_IF_MCONT_EOB)
+ break;
- for (k = int_stat; !(reg & PCH_IF_MCONT_EOB); k++) {
/* If MsgLost bit set. */
if (reg & PCH_IF_MCONT_MSGLOST) {
- dev_err(&priv->ndev->dev, "Msg Obj is overwritten.\n");
- pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
- PCH_IF_MCONT_MSGLOST);
- iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
- &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, k);
-
- skb = alloc_can_err_skb(ndev, &cf);
- if (!skb)
- return -ENOMEM;
-
- priv->can.can_stats.error_passive++;
- priv->can.state = CAN_STATE_ERROR_PASSIVE;
- cf->can_id |= CAN_ERR_CRTL;
- cf->data[1] |= CAN_ERR_CRTL_RX_OVERFLOW;
- cf->data[2] |= CAN_ERR_PROT_OVERLOAD;
- stats->rx_packets++;
- stats->rx_bytes += cf->can_dlc;
-
- netif_receive_skb(skb);
+ pch_can_rx_msg_lost(ndev, obj_num);
rcv_pkts++;
- goto RX_NEXT;
+ quota--;
+ obj_num++;
+ continue;
+ } else if (!(reg & PCH_IF_MCONT_NEWDAT)) {
+ obj_num++;
+ continue;
}
- if (!(reg & PCH_IF_MCONT_NEWDAT))
- goto RX_NEXT;
skb = alloc_can_skb(priv->ndev, &cf);
if (!skb)
return -ENOMEM;
/* Get Received data */
- ide = ((ioread32(&priv->regs->ifregs[0].id2)) & PCH_ID2_XTD) >>
- 14;
- if (ide) {
+ id2 = ioread32(&priv->regs->ifregs[0].id2);
+ if (id2 & PCH_ID2_XTD) {
id = (ioread32(&priv->regs->ifregs[0].id1) & 0xffff);
- id |= (((ioread32(&priv->regs->ifregs[0].id2)) &
- 0x1fff) << 16);
- cf->can_id = (id & CAN_EFF_MASK) | CAN_EFF_FLAG;
+ id |= (((id2) & 0x1fff) << 16);
+ cf->can_id = id | CAN_EFF_FLAG;
} else {
- id = (((ioread32(&priv->regs->ifregs[0].id2)) &
- (CAN_SFF_MASK << 2)) >> 2);
- cf->can_id = (id & CAN_SFF_MASK);
+ id = (id2 >> 2) & CAN_SFF_MASK;
+ cf->can_id = id;
}
- rtr = (ioread32(&priv->regs->ifregs[0].id2) & PCH_ID2_DIR);
- if (rtr) {
- cf->can_dlc = 0;
+ if (id2 & PCH_ID2_DIR)
cf->can_id |= CAN_RTR_FLAG;
- } else {
- cf->can_dlc =
- ((ioread32(&priv->regs->ifregs[0].mcont)) & 0x0f);
- }
+
+ cf->can_dlc = get_can_dlc((ioread32(&priv->regs->
+ ifregs[0].mcont)) & 0xF);
for (i = 0; i < cf->can_dlc; i += 2) {
data_reg = ioread16(&priv->regs->ifregs[0].data[i / 2]);
- cf->data[i] = data_reg & 0xff;
+ cf->data[i] = data_reg;
cf->data[i + 1] = data_reg >> 8;
}
netif_receive_skb(skb);
rcv_pkts++;
stats->rx_packets++;
+ quota--;
stats->rx_bytes += cf->can_dlc;
- if (k < PCH_FIFO_THRESH) {
- iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL |
- PCH_CMASK_ARB, &priv->regs->ifregs[0].cmask);
-
- /* Clearing the Dir bit. */
- pch_can_bit_clear(&priv->regs->ifregs[0].id2,
- PCH_ID2_DIR);
-
- /* Clearing NewDat & IntPnd */
- pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
- PCH_IF_MCONT_INTPND);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, k);
- } else if (k > PCH_FIFO_THRESH) {
- pch_can_int_clr(priv, k);
- } else if (k == PCH_FIFO_THRESH) {
- int cnt;
- for (cnt = 0; cnt < PCH_FIFO_THRESH; cnt++)
- pch_can_int_clr(priv, cnt+1);
- }
-RX_NEXT:
- /* Reading the messsage object from the Message RAM */
- iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, k);
- reg = ioread32(&priv->regs->ifregs[0].mcont);
- }
+ pch_fifo_thresh(priv, obj_num);
+ obj_num++;
+ } while (quota > 0);
return rcv_pkts;
}
@@ -869,7 +875,7 @@ static int pch_can_rx_poll(struct napi_struct *napi, int quota)
goto end;
if ((int_stat >= PCH_RX_OBJ_START) && (int_stat <= PCH_RX_OBJ_END)) {
- rcv_pkts += pch_can_rx_normal(ndev, int_stat);
+ rcv_pkts += pch_can_rx_normal(ndev, int_stat, quota);
quota -= rcv_pkts;
if (quota < 0)
goto end;
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 05/20] CAN : Fix warnings
From: Tomoya MORINAGA @ 2010-12-07 11:04 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Currently, in case CONFIG_PM is disabled, compiler outputs warnings.
Move six functions which are used only CONFIG_PM is enabled,
into "#ifdef CONFIG_PM" area.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 146 ++++++++++++++++++++++----------------------
1 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index d646fbc..5fc99cb 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -245,23 +245,6 @@ static void pch_can_set_optmode(struct pch_can_priv *priv)
iowrite32(reg_val, &priv->regs->opt);
}
-static void pch_can_set_int_custom(struct pch_can_priv *priv)
-{
- /* Clearing the IE, SIE and EIE bits of Can control register. */
- pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_IE_SIE_EIE);
-
- /* Appropriately setting them. */
- pch_can_bit_set(&priv->regs->cont,
- ((priv->int_enables & PCH_MSK_CTRL_IE_SIE_EIE) << 1));
-}
-
-/* This function retrieves interrupt enabled for the CAN device. */
-static void pch_can_get_int_enables(struct pch_can_priv *priv, u32 *enables)
-{
- /* Obtaining the status of IE, SIE and EIE interrupt bits. */
- *enables = ((ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1);
-}
-
static void pch_can_set_int_enables(struct pch_can_priv *priv,
enum pch_can_mode interrupt_no)
{
@@ -355,61 +338,11 @@ static void pch_can_set_tx_all(struct pch_can_priv *priv, u32 set)
pch_can_set_rxtx(priv, i, set, PCH_TX_IFREG);
}
-static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
- enum pch_ifreg dir)
-{
- u32 ie, enable;
-
- if (dir)
- ie = PCH_IF_MCONT_RXIE;
- else
- ie = PCH_IF_MCONT_TXIE;
-
- iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
-
- if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) &&
- ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) {
- enable = 1;
- } else {
- enable = 0;
- }
- return enable;
-}
-
static int pch_can_int_pending(struct pch_can_priv *priv)
{
return ioread32(&priv->regs->intr) & 0xffff;
}
-static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,
- u32 buffer_num, u32 set)
-{
- iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
- iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
- &priv->regs->ifregs[0].cmask);
- if (set == PCH_ENABLE)
- pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
- PCH_IF_MCONT_EOB);
- else
- pch_can_bit_set(&priv->regs->ifregs[0].mcont, PCH_IF_MCONT_EOB);
-
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
-}
-
-static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv,
- u32 buffer_num, u32 *link)
-{
- iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
-
- if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)
- *link = PCH_DISABLE;
- else
- *link = PCH_ENABLE;
-}
-
static void pch_can_clear_buffers(struct pch_can_priv *priv)
{
int i;
@@ -583,12 +516,6 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
}
}
-static int pch_can_get_buffer_status(struct pch_can_priv *priv)
-{
- return (ioread32(&priv->regs->treq1) & 0xffff) |
- ((ioread32(&priv->regs->treq2) & 0xffff) << 16);
-}
-
static void pch_can_reset(struct pch_can_priv *priv)
{
/* write to sw reset register */
@@ -1109,6 +1036,79 @@ static void __devexit pch_can_remove(struct pci_dev *pdev)
}
#ifdef CONFIG_PM
+static void pch_can_set_int_custom(struct pch_can_priv *priv)
+{
+ /* Clearing the IE, SIE and EIE bits of Can control register. */
+ pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_IE_SIE_EIE);
+
+ /* Appropriately setting them. */
+ pch_can_bit_set(&priv->regs->cont,
+ ((priv->int_enables & PCH_MSK_CTRL_IE_SIE_EIE) << 1));
+}
+
+/* This function retrieves interrupt enabled for the CAN device. */
+static void pch_can_get_int_enables(struct pch_can_priv *priv, u32 *enables)
+{
+ /* Obtaining the status of IE, SIE and EIE interrupt bits. */
+ *enables = ((ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1);
+}
+
+static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
+ enum pch_ifreg dir)
+{
+ u32 ie, enable;
+
+ if (dir)
+ ie = PCH_IF_MCONT_RXIE;
+ else
+ ie = PCH_IF_MCONT_TXIE;
+
+ iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
+ pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
+
+ if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) &&
+ ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) {
+ enable = 1;
+ } else {
+ enable = 0;
+ }
+ return enable;
+}
+
+static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,
+ u32 buffer_num, u32 set)
+{
+ iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
+ pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+ iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
+ &priv->regs->ifregs[0].cmask);
+ if (set == PCH_ENABLE)
+ pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
+ PCH_IF_MCONT_EOB);
+ else
+ pch_can_bit_set(&priv->regs->ifregs[0].mcont, PCH_IF_MCONT_EOB);
+
+ pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+}
+
+static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv,
+ u32 buffer_num, u32 *link)
+{
+ iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
+ pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+
+ if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)
+ *link = PCH_DISABLE;
+ else
+ *link = PCH_ENABLE;
+}
+
+static int pch_can_get_buffer_status(struct pch_can_priv *priv)
+{
+ return (ioread32(&priv->regs->treq1) & 0xffff) |
+ ((ioread32(&priv->regs->treq2) & 0xffff) << 16);
+}
+
static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
{
int i; /* Counter variable. */
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 06/20] CAN : Rename function/macro name
From: Tomoya MORINAGA @ 2010-12-07 11:05 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
For easy to read/understand, Rename function/macro name.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 176 ++++++++++++++++++++-------------------------
1 files changed, 77 insertions(+), 99 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 5fc99cb..dd9ce16 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -32,8 +32,6 @@
#include <linux/can/dev.h>
#include <linux/can/error.h>
-#define PCH_ENABLE 1 /* The enable flag */
-#define PCH_DISABLE 0 /* The disable flag */
#define PCH_CTRL_INIT BIT(0) /* The INIT bit of CANCONT register. */
#define PCH_CTRL_IE BIT(1) /* The IE bit of CAN control register */
#define PCH_CTRL_IE_SIE_EIE (BIT(3) | BIT(2) | BIT(1))
@@ -78,11 +76,12 @@
#define PCH_BUS_OFF BIT(7)
/* bit position of certain controller bits. */
-#define PCH_BIT_BRP 0
-#define PCH_BIT_SJW 6
-#define PCH_BIT_TSEG1 8
-#define PCH_BIT_TSEG2 12
-#define PCH_BIT_BRPE_BRPE 6
+#define PCH_BIT_BRP_SHIFT 0
+#define PCH_BIT_SJW_SHIFT 6
+#define PCH_BIT_TSEG1_SHIFT 8
+#define PCH_BIT_TSEG2_SHIFT 12
+#define PCH_BIT_BRPE_BRPE_SHIFT 6
+
#define PCH_MSK_BITT_BRP 0x3f
#define PCH_MSK_BRPE_BRPE 0x3c0
#define PCH_MSK_CTRL_IE_SIE_EIE 0x07
@@ -170,19 +169,16 @@ struct pch_can_regs {
struct pch_can_priv {
struct can_priv can;
- unsigned int can_num;
struct pci_dev *dev;
- int tx_enable[PCH_TX_OBJ_END];
- int rx_enable[PCH_TX_OBJ_END];
- int rx_link[PCH_TX_OBJ_END];
- unsigned int int_enables;
- unsigned int int_stat;
+ u32 tx_enable[PCH_TX_OBJ_END];
+ u32 rx_enable[PCH_TX_OBJ_END];
+ u32 rx_link[PCH_TX_OBJ_END];
+ u32 int_enables;
struct net_device *ndev;
- unsigned int msg_obj[PCH_TX_OBJ_END];
struct pch_can_regs __iomem *regs;
struct napi_struct napi;
- unsigned int tx_obj; /* Point next Tx Obj index */
- unsigned int use_msi;
+ int tx_obj; /* Point next Tx Obj index */
+ int use_msi;
};
static struct can_bittiming_const pch_can_bittiming_const = {
@@ -245,14 +241,27 @@ static void pch_can_set_optmode(struct pch_can_priv *priv)
iowrite32(reg_val, &priv->regs->opt);
}
+static void pch_can_rw_msg_obj(void __iomem *creq_addr, u32 num)
+{
+ int counter = PCH_COUNTER_LIMIT;
+ u32 ifx_creq;
+
+ iowrite32(num, creq_addr);
+ while (counter) {
+ ifx_creq = ioread32(creq_addr) & PCH_IF_CREQ_BUSY;
+ if (!ifx_creq)
+ break;
+ counter--;
+ udelay(1);
+ }
+ if (!counter)
+ pr_err("%s:IF1 BUSY Flag is set forever.\n", __func__);
+}
+
static void pch_can_set_int_enables(struct pch_can_priv *priv,
enum pch_can_mode interrupt_no)
{
switch (interrupt_no) {
- case PCH_CAN_ENABLE:
- pch_can_bit_set(&priv->regs->cont, PCH_CTRL_IE);
- break;
-
case PCH_CAN_DISABLE:
pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_IE);
break;
@@ -271,25 +280,8 @@ static void pch_can_set_int_enables(struct pch_can_priv *priv,
}
}
-static void pch_can_check_if_busy(u32 __iomem *creq_addr, u32 num)
-{
- u32 counter = PCH_COUNTER_LIMIT;
- u32 ifx_creq;
-
- iowrite32(num, creq_addr);
- while (counter) {
- ifx_creq = ioread32(creq_addr) & PCH_IF_CREQ_BUSY;
- if (!ifx_creq)
- break;
- counter--;
- udelay(1);
- }
- if (!counter)
- pr_err("%s:IF1 BUSY Flag is set forever.\n", __func__);
-}
-
static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,
- u32 set, enum pch_ifreg dir)
+ int set, enum pch_ifreg dir)
{
u32 ie;
@@ -300,27 +292,27 @@ static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,
/* Reading the receive buffer data from RAM to Interface1 registers */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
/* Setting the IF1MASK1 register to access MsgVal and RxIE bits */
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[dir].cmask);
- if (set == PCH_ENABLE) {
+ if (set) {
/* Setting the MsgVal and RxIE bits */
pch_can_bit_set(&priv->regs->ifregs[dir].mcont, ie);
pch_can_bit_set(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL);
- } else if (set == PCH_DISABLE) {
+ } else {
/* Resetting the MsgVal and RxIE bits */
pch_can_bit_clear(&priv->regs->ifregs[dir].mcont, ie);
pch_can_bit_clear(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL);
}
- pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
}
-static void pch_can_set_rx_all(struct pch_can_priv *priv, u32 set)
+static void pch_can_set_rx_all(struct pch_can_priv *priv, int set)
{
int i;
@@ -329,7 +321,7 @@ static void pch_can_set_rx_all(struct pch_can_priv *priv, u32 set)
pch_can_set_rxtx(priv, i, set, PCH_RX_IFREG);
}
-static void pch_can_set_tx_all(struct pch_can_priv *priv, u32 set)
+static void pch_can_set_tx_all(struct pch_can_priv *priv, int set)
{
int i;
@@ -338,16 +330,16 @@ static void pch_can_set_tx_all(struct pch_can_priv *priv, u32 set)
pch_can_set_rxtx(priv, i, set, PCH_TX_IFREG);
}
-static int pch_can_int_pending(struct pch_can_priv *priv)
+static u32 pch_can_int_pending(struct pch_can_priv *priv)
{
return ioread32(&priv->regs->intr) & 0xffff;
}
-static void pch_can_clear_buffers(struct pch_can_priv *priv)
+static void pch_can_clear_if_buffers(struct pch_can_priv *priv)
{
- int i;
+ int i; /* Msg Obj ID (1~32) */
- for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
+ for (i = PCH_RX_OBJ_START; i <= PCH_TX_OBJ_END; i++) {
iowrite32(PCH_CMASK_RX_TX_SET, &priv->regs->ifregs[0].cmask);
iowrite32(0xffff, &priv->regs->ifregs[0].mask1);
iowrite32(0xffff, &priv->regs->ifregs[0].mask2);
@@ -361,24 +353,7 @@ static void pch_can_clear_buffers(struct pch_can_priv *priv)
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |
PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, i);
- }
-
- for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++) {
- iowrite32(PCH_CMASK_RX_TX_SET, &priv->regs->ifregs[1].cmask);
- iowrite32(0xffff, &priv->regs->ifregs[1].mask1);
- iowrite32(0xffff, &priv->regs->ifregs[1].mask2);
- iowrite32(0x0, &priv->regs->ifregs[1].id1);
- iowrite32(0x0, &priv->regs->ifregs[1].id2);
- iowrite32(0x0, &priv->regs->ifregs[1].mcont);
- iowrite32(0x0, &priv->regs->ifregs[1].data[0]);
- iowrite32(0x0, &priv->regs->ifregs[1].data[1]);
- iowrite32(0x0, &priv->regs->ifregs[1].data[2]);
- iowrite32(0x0, &priv->regs->ifregs[1].data[3]);
- iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |
- PCH_CMASK_ARB | PCH_CMASK_CTRL,
- &priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i);
}
}
@@ -389,7 +364,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
iowrite32(PCH_CMASK_RX_TX_GET,
&priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i);
iowrite32(0x0, &priv->regs->ifregs[0].id1);
iowrite32(0x0, &priv->regs->ifregs[0].id2);
@@ -403,6 +378,9 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
/* In case FIFO mode, Last EoB of Rx Obj must be 1 */
if (i == PCH_RX_OBJ_END)
pch_can_bit_set(&priv->regs->ifregs[0].mcont,
+ PCH_IF_MCONT_EOB);
+ else
+ pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_EOB);
iowrite32(0, &priv->regs->ifregs[0].mask1);
@@ -414,13 +392,13 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i);
}
for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++) {
iowrite32(PCH_CMASK_RX_TX_GET,
&priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i);
/* Resetting DIR bit for reception */
iowrite32(0x0, &priv->regs->ifregs[1].id1);
@@ -441,7 +419,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i);
}
}
@@ -451,7 +429,7 @@ static void pch_can_init(struct pch_can_priv *priv)
pch_can_set_run_mode(priv, PCH_CAN_STOP);
/* Clearing all the message object buffers. */
- pch_can_clear_buffers(priv);
+ pch_can_clear_if_buffers(priv);
/* Configuring the respective message object as either rx/tx object. */
pch_can_config_rx_tx_buffers(priv);
@@ -496,7 +474,7 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_INTPND);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, mask);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, mask);
} else if ((mask >= PCH_TX_OBJ_START) && (mask <= PCH_TX_OBJ_END)) {
/* Setting CMASK for clearing interrupts for
frame transmission. */
@@ -512,7 +490,7 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
pch_can_bit_clear(&priv->regs->ifregs[1].mcont,
PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_INTPND |
PCH_IF_MCONT_TXRQXT);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, mask);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, mask);
}
}
@@ -637,7 +615,7 @@ static void pch_fifo_thresh(struct pch_can_priv *priv, int obj_id)
/* Clearing NewDat & IntPnd */
pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_INTPND);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_id);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_id);
} else if (obj_id > PCH_FIFO_THRESH) {
pch_can_int_clr(priv, obj_id);
} else if (obj_id == PCH_FIFO_THRESH) {
@@ -659,7 +637,7 @@ static void pch_can_rx_msg_lost(struct net_device *ndev, int obj_id)
PCH_IF_MCONT_MSGLOST);
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_id);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_id);
skb = alloc_can_err_skb(ndev, &cf);
if (!skb)
@@ -689,7 +667,7 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota)
do {
/* Reading the messsage object from the Message RAM */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num);
/* Reading the MCONT register. */
reg = ioread32(&priv->regs->ifregs[0].mcont);
@@ -758,7 +736,7 @@ static void pch_can_tx_complete(struct net_device *ndev, u32 int_stat)
can_get_echo_skb(ndev, int_stat - PCH_RX_OBJ_END - 1);
iowrite32(PCH_CMASK_RX_TX_GET | PCH_CMASK_CLRINTPND,
&priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, int_stat);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, int_stat);
dlc = get_can_dlc(ioread32(&priv->regs->ifregs[1].mcont) &
PCH_IF_MCONT_DLC);
stats->tx_bytes += dlc;
@@ -767,7 +745,7 @@ static void pch_can_tx_complete(struct net_device *ndev, u32 int_stat)
netif_wake_queue(ndev);
}
-static int pch_can_rx_poll(struct napi_struct *napi, int quota)
+static int pch_can_poll(struct napi_struct *napi, int quota)
{
struct net_device *ndev = napi->dev;
struct pch_can_priv *priv = netdev_priv(ndev);
@@ -832,10 +810,10 @@ static int pch_set_bittiming(struct net_device *ndev)
brp = (bt->tq) / (1000000000/PCH_CAN_CLK) - 1;
canbit = brp & PCH_MSK_BITT_BRP;
- canbit |= (bt->sjw - 1) << PCH_BIT_SJW;
- canbit |= (bt->phase_seg1 + bt->prop_seg - 1) << PCH_BIT_TSEG1;
- canbit |= (bt->phase_seg2 - 1) << PCH_BIT_TSEG2;
- bepe = (brp & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE;
+ canbit |= (bt->sjw - 1) << PCH_BIT_SJW_SHIFT;
+ canbit |= (bt->phase_seg1 + bt->prop_seg - 1) << PCH_BIT_TSEG1_SHIFT;
+ canbit |= (bt->phase_seg2 - 1) << PCH_BIT_TSEG2_SHIFT;
+ bepe = (brp & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE_SHIFT;
iowrite32(canbit, &priv->regs->bitt);
iowrite32(bepe, &priv->regs->brpe);
pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_CCE);
@@ -947,7 +925,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
{
struct pch_can_priv *priv = netdev_priv(ndev);
struct can_frame *cf = (struct can_frame *)skb->data;
- int tx_buffer_avail = 0;
+ int tx_obj_no;
int i;
if (can_dropped_invalid_skb(ndev, skb))
@@ -957,16 +935,16 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
if (ioread32(&priv->regs->treq2) & PCH_TREQ2_TX_MASK)
netif_stop_queue(ndev);
- tx_buffer_avail = priv->tx_obj;
+ tx_obj_no = priv->tx_obj;
priv->tx_obj = PCH_TX_OBJ_START;
} else {
- tx_buffer_avail = priv->tx_obj;
+ tx_obj_no = priv->tx_obj;
priv->tx_obj++;
}
/* Reading the Msg Obj from the Msg RAM to the Interface register. */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, tx_buffer_avail);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, tx_obj_no);
/* Setting the CMASK register. */
pch_can_bit_set(&priv->regs->ifregs[1].cmask, PCH_CMASK_ALL);
@@ -995,7 +973,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
&priv->regs->ifregs[1].data[i / 2]);
}
- can_put_echo_skb(skb, ndev, tx_buffer_avail - PCH_RX_OBJ_END - 1);
+ can_put_echo_skb(skb, ndev, tx_obj_no - PCH_RX_OBJ_END - 1);
/* Updating the size of the data. */
pch_can_bit_clear(&priv->regs->ifregs[1].mcont, 0x0f);
@@ -1010,7 +988,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
pch_can_bit_set(&priv->regs->ifregs[1].mcont,
PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_TXRQXT);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, tx_buffer_avail);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, tx_obj_no);
return NETDEV_TX_OK;
}
@@ -1064,7 +1042,7 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
ie = PCH_IF_MCONT_TXIE;
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) &&
((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) {
@@ -1076,37 +1054,37 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
}
static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,
- u32 buffer_num, u32 set)
+ u32 buffer_num, int set)
{
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
- if (set == PCH_ENABLE)
+ if (set)
pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_EOB);
else
pch_can_bit_set(&priv->regs->ifregs[0].mcont, PCH_IF_MCONT_EOB);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
}
static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv,
u32 buffer_num, u32 *link)
{
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)
- *link = PCH_DISABLE;
+ *link = 0;
else
- *link = PCH_ENABLE;
+ *link = 1;
}
static int pch_can_get_buffer_status(struct pch_can_priv *priv)
{
return (ioread32(&priv->regs->treq1) & 0xffff) |
- ((ioread32(&priv->regs->treq2) & 0xffff) << 16);
+ (ioread32(&priv->regs->treq2) << 16);
}
static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
@@ -1114,7 +1092,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
int i; /* Counter variable. */
int retval; /* Return value. */
u32 buf_stat; /* Variable for reading the transmit buffer status. */
- u32 counter = 0xFFFFFF;
+ int counter = PCH_COUNTER_LIMIT;
struct net_device *dev = pci_get_drvdata(pdev);
struct pch_can_priv *priv = netdev_priv(dev);
@@ -1291,7 +1269,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,
ndev->netdev_ops = &pch_can_netdev_ops;
priv->can.clock.freq = PCH_CAN_CLK; /* Hz */
- netif_napi_add(ndev, &priv->napi, pch_can_rx_poll, PCH_RX_OBJ_END);
+ netif_napi_add(ndev, &priv->napi, pch_can_poll, PCH_RX_OBJ_END);
rc = register_candev(ndev);
if (rc) {
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 06/20] CAN : Rename function/macro name
From: Tomoya MORINAGA @ 2010-12-07 11:05 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
For easy to read/understand, Rename function/macro name.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 176 ++++++++++++++++++++-------------------------
1 files changed, 77 insertions(+), 99 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 5fc99cb..dd9ce16 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -32,8 +32,6 @@
#include <linux/can/dev.h>
#include <linux/can/error.h>
-#define PCH_ENABLE 1 /* The enable flag */
-#define PCH_DISABLE 0 /* The disable flag */
#define PCH_CTRL_INIT BIT(0) /* The INIT bit of CANCONT register. */
#define PCH_CTRL_IE BIT(1) /* The IE bit of CAN control register */
#define PCH_CTRL_IE_SIE_EIE (BIT(3) | BIT(2) | BIT(1))
@@ -78,11 +76,12 @@
#define PCH_BUS_OFF BIT(7)
/* bit position of certain controller bits. */
-#define PCH_BIT_BRP 0
-#define PCH_BIT_SJW 6
-#define PCH_BIT_TSEG1 8
-#define PCH_BIT_TSEG2 12
-#define PCH_BIT_BRPE_BRPE 6
+#define PCH_BIT_BRP_SHIFT 0
+#define PCH_BIT_SJW_SHIFT 6
+#define PCH_BIT_TSEG1_SHIFT 8
+#define PCH_BIT_TSEG2_SHIFT 12
+#define PCH_BIT_BRPE_BRPE_SHIFT 6
+
#define PCH_MSK_BITT_BRP 0x3f
#define PCH_MSK_BRPE_BRPE 0x3c0
#define PCH_MSK_CTRL_IE_SIE_EIE 0x07
@@ -170,19 +169,16 @@ struct pch_can_regs {
struct pch_can_priv {
struct can_priv can;
- unsigned int can_num;
struct pci_dev *dev;
- int tx_enable[PCH_TX_OBJ_END];
- int rx_enable[PCH_TX_OBJ_END];
- int rx_link[PCH_TX_OBJ_END];
- unsigned int int_enables;
- unsigned int int_stat;
+ u32 tx_enable[PCH_TX_OBJ_END];
+ u32 rx_enable[PCH_TX_OBJ_END];
+ u32 rx_link[PCH_TX_OBJ_END];
+ u32 int_enables;
struct net_device *ndev;
- unsigned int msg_obj[PCH_TX_OBJ_END];
struct pch_can_regs __iomem *regs;
struct napi_struct napi;
- unsigned int tx_obj; /* Point next Tx Obj index */
- unsigned int use_msi;
+ int tx_obj; /* Point next Tx Obj index */
+ int use_msi;
};
static struct can_bittiming_const pch_can_bittiming_const = {
@@ -245,14 +241,27 @@ static void pch_can_set_optmode(struct pch_can_priv *priv)
iowrite32(reg_val, &priv->regs->opt);
}
+static void pch_can_rw_msg_obj(void __iomem *creq_addr, u32 num)
+{
+ int counter = PCH_COUNTER_LIMIT;
+ u32 ifx_creq;
+
+ iowrite32(num, creq_addr);
+ while (counter) {
+ ifx_creq = ioread32(creq_addr) & PCH_IF_CREQ_BUSY;
+ if (!ifx_creq)
+ break;
+ counter--;
+ udelay(1);
+ }
+ if (!counter)
+ pr_err("%s:IF1 BUSY Flag is set forever.\n", __func__);
+}
+
static void pch_can_set_int_enables(struct pch_can_priv *priv,
enum pch_can_mode interrupt_no)
{
switch (interrupt_no) {
- case PCH_CAN_ENABLE:
- pch_can_bit_set(&priv->regs->cont, PCH_CTRL_IE);
- break;
-
case PCH_CAN_DISABLE:
pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_IE);
break;
@@ -271,25 +280,8 @@ static void pch_can_set_int_enables(struct pch_can_priv *priv,
}
}
-static void pch_can_check_if_busy(u32 __iomem *creq_addr, u32 num)
-{
- u32 counter = PCH_COUNTER_LIMIT;
- u32 ifx_creq;
-
- iowrite32(num, creq_addr);
- while (counter) {
- ifx_creq = ioread32(creq_addr) & PCH_IF_CREQ_BUSY;
- if (!ifx_creq)
- break;
- counter--;
- udelay(1);
- }
- if (!counter)
- pr_err("%s:IF1 BUSY Flag is set forever.\n", __func__);
-}
-
static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,
- u32 set, enum pch_ifreg dir)
+ int set, enum pch_ifreg dir)
{
u32 ie;
@@ -300,27 +292,27 @@ static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,
/* Reading the receive buffer data from RAM to Interface1 registers */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
/* Setting the IF1MASK1 register to access MsgVal and RxIE bits */
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[dir].cmask);
- if (set == PCH_ENABLE) {
+ if (set) {
/* Setting the MsgVal and RxIE bits */
pch_can_bit_set(&priv->regs->ifregs[dir].mcont, ie);
pch_can_bit_set(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL);
- } else if (set == PCH_DISABLE) {
+ } else {
/* Resetting the MsgVal and RxIE bits */
pch_can_bit_clear(&priv->regs->ifregs[dir].mcont, ie);
pch_can_bit_clear(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL);
}
- pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
}
-static void pch_can_set_rx_all(struct pch_can_priv *priv, u32 set)
+static void pch_can_set_rx_all(struct pch_can_priv *priv, int set)
{
int i;
@@ -329,7 +321,7 @@ static void pch_can_set_rx_all(struct pch_can_priv *priv, u32 set)
pch_can_set_rxtx(priv, i, set, PCH_RX_IFREG);
}
-static void pch_can_set_tx_all(struct pch_can_priv *priv, u32 set)
+static void pch_can_set_tx_all(struct pch_can_priv *priv, int set)
{
int i;
@@ -338,16 +330,16 @@ static void pch_can_set_tx_all(struct pch_can_priv *priv, u32 set)
pch_can_set_rxtx(priv, i, set, PCH_TX_IFREG);
}
-static int pch_can_int_pending(struct pch_can_priv *priv)
+static u32 pch_can_int_pending(struct pch_can_priv *priv)
{
return ioread32(&priv->regs->intr) & 0xffff;
}
-static void pch_can_clear_buffers(struct pch_can_priv *priv)
+static void pch_can_clear_if_buffers(struct pch_can_priv *priv)
{
- int i;
+ int i; /* Msg Obj ID (1~32) */
- for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
+ for (i = PCH_RX_OBJ_START; i <= PCH_TX_OBJ_END; i++) {
iowrite32(PCH_CMASK_RX_TX_SET, &priv->regs->ifregs[0].cmask);
iowrite32(0xffff, &priv->regs->ifregs[0].mask1);
iowrite32(0xffff, &priv->regs->ifregs[0].mask2);
@@ -361,24 +353,7 @@ static void pch_can_clear_buffers(struct pch_can_priv *priv)
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |
PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, i);
- }
-
- for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++) {
- iowrite32(PCH_CMASK_RX_TX_SET, &priv->regs->ifregs[1].cmask);
- iowrite32(0xffff, &priv->regs->ifregs[1].mask1);
- iowrite32(0xffff, &priv->regs->ifregs[1].mask2);
- iowrite32(0x0, &priv->regs->ifregs[1].id1);
- iowrite32(0x0, &priv->regs->ifregs[1].id2);
- iowrite32(0x0, &priv->regs->ifregs[1].mcont);
- iowrite32(0x0, &priv->regs->ifregs[1].data[0]);
- iowrite32(0x0, &priv->regs->ifregs[1].data[1]);
- iowrite32(0x0, &priv->regs->ifregs[1].data[2]);
- iowrite32(0x0, &priv->regs->ifregs[1].data[3]);
- iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |
- PCH_CMASK_ARB | PCH_CMASK_CTRL,
- &priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i);
}
}
@@ -389,7 +364,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
iowrite32(PCH_CMASK_RX_TX_GET,
&priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i);
iowrite32(0x0, &priv->regs->ifregs[0].id1);
iowrite32(0x0, &priv->regs->ifregs[0].id2);
@@ -403,6 +378,9 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
/* In case FIFO mode, Last EoB of Rx Obj must be 1 */
if (i == PCH_RX_OBJ_END)
pch_can_bit_set(&priv->regs->ifregs[0].mcont,
+ PCH_IF_MCONT_EOB);
+ else
+ pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_EOB);
iowrite32(0, &priv->regs->ifregs[0].mask1);
@@ -414,13 +392,13 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i);
}
for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++) {
iowrite32(PCH_CMASK_RX_TX_GET,
&priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i);
/* Resetting DIR bit for reception */
iowrite32(0x0, &priv->regs->ifregs[1].id1);
@@ -441,7 +419,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, i);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i);
}
}
@@ -451,7 +429,7 @@ static void pch_can_init(struct pch_can_priv *priv)
pch_can_set_run_mode(priv, PCH_CAN_STOP);
/* Clearing all the message object buffers. */
- pch_can_clear_buffers(priv);
+ pch_can_clear_if_buffers(priv);
/* Configuring the respective message object as either rx/tx object. */
pch_can_config_rx_tx_buffers(priv);
@@ -496,7 +474,7 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_INTPND);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, mask);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, mask);
} else if ((mask >= PCH_TX_OBJ_START) && (mask <= PCH_TX_OBJ_END)) {
/* Setting CMASK for clearing interrupts for
frame transmission. */
@@ -512,7 +490,7 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
pch_can_bit_clear(&priv->regs->ifregs[1].mcont,
PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_INTPND |
PCH_IF_MCONT_TXRQXT);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, mask);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, mask);
}
}
@@ -637,7 +615,7 @@ static void pch_fifo_thresh(struct pch_can_priv *priv, int obj_id)
/* Clearing NewDat & IntPnd */
pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_INTPND);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_id);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_id);
} else if (obj_id > PCH_FIFO_THRESH) {
pch_can_int_clr(priv, obj_id);
} else if (obj_id == PCH_FIFO_THRESH) {
@@ -659,7 +637,7 @@ static void pch_can_rx_msg_lost(struct net_device *ndev, int obj_id)
PCH_IF_MCONT_MSGLOST);
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_id);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_id);
skb = alloc_can_err_skb(ndev, &cf);
if (!skb)
@@ -689,7 +667,7 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota)
do {
/* Reading the messsage object from the Message RAM */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, obj_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, obj_num);
/* Reading the MCONT register. */
reg = ioread32(&priv->regs->ifregs[0].mcont);
@@ -758,7 +736,7 @@ static void pch_can_tx_complete(struct net_device *ndev, u32 int_stat)
can_get_echo_skb(ndev, int_stat - PCH_RX_OBJ_END - 1);
iowrite32(PCH_CMASK_RX_TX_GET | PCH_CMASK_CLRINTPND,
&priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, int_stat);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, int_stat);
dlc = get_can_dlc(ioread32(&priv->regs->ifregs[1].mcont) &
PCH_IF_MCONT_DLC);
stats->tx_bytes += dlc;
@@ -767,7 +745,7 @@ static void pch_can_tx_complete(struct net_device *ndev, u32 int_stat)
netif_wake_queue(ndev);
}
-static int pch_can_rx_poll(struct napi_struct *napi, int quota)
+static int pch_can_poll(struct napi_struct *napi, int quota)
{
struct net_device *ndev = napi->dev;
struct pch_can_priv *priv = netdev_priv(ndev);
@@ -832,10 +810,10 @@ static int pch_set_bittiming(struct net_device *ndev)
brp = (bt->tq) / (1000000000/PCH_CAN_CLK) - 1;
canbit = brp & PCH_MSK_BITT_BRP;
- canbit |= (bt->sjw - 1) << PCH_BIT_SJW;
- canbit |= (bt->phase_seg1 + bt->prop_seg - 1) << PCH_BIT_TSEG1;
- canbit |= (bt->phase_seg2 - 1) << PCH_BIT_TSEG2;
- bepe = (brp & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE;
+ canbit |= (bt->sjw - 1) << PCH_BIT_SJW_SHIFT;
+ canbit |= (bt->phase_seg1 + bt->prop_seg - 1) << PCH_BIT_TSEG1_SHIFT;
+ canbit |= (bt->phase_seg2 - 1) << PCH_BIT_TSEG2_SHIFT;
+ bepe = (brp & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE_SHIFT;
iowrite32(canbit, &priv->regs->bitt);
iowrite32(bepe, &priv->regs->brpe);
pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_CCE);
@@ -947,7 +925,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
{
struct pch_can_priv *priv = netdev_priv(ndev);
struct can_frame *cf = (struct can_frame *)skb->data;
- int tx_buffer_avail = 0;
+ int tx_obj_no;
int i;
if (can_dropped_invalid_skb(ndev, skb))
@@ -957,16 +935,16 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
if (ioread32(&priv->regs->treq2) & PCH_TREQ2_TX_MASK)
netif_stop_queue(ndev);
- tx_buffer_avail = priv->tx_obj;
+ tx_obj_no = priv->tx_obj;
priv->tx_obj = PCH_TX_OBJ_START;
} else {
- tx_buffer_avail = priv->tx_obj;
+ tx_obj_no = priv->tx_obj;
priv->tx_obj++;
}
/* Reading the Msg Obj from the Msg RAM to the Interface register. */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[1].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, tx_buffer_avail);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, tx_obj_no);
/* Setting the CMASK register. */
pch_can_bit_set(&priv->regs->ifregs[1].cmask, PCH_CMASK_ALL);
@@ -995,7 +973,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
&priv->regs->ifregs[1].data[i / 2]);
}
- can_put_echo_skb(skb, ndev, tx_buffer_avail - PCH_RX_OBJ_END - 1);
+ can_put_echo_skb(skb, ndev, tx_obj_no - PCH_RX_OBJ_END - 1);
/* Updating the size of the data. */
pch_can_bit_clear(&priv->regs->ifregs[1].mcont, 0x0f);
@@ -1010,7 +988,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
pch_can_bit_set(&priv->regs->ifregs[1].mcont,
PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_TXRQXT);
- pch_can_check_if_busy(&priv->regs->ifregs[1].creq, tx_buffer_avail);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, tx_obj_no);
return NETDEV_TX_OK;
}
@@ -1064,7 +1042,7 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
ie = PCH_IF_MCONT_TXIE;
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) &&
((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) {
@@ -1076,37 +1054,37 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
}
static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,
- u32 buffer_num, u32 set)
+ u32 buffer_num, int set)
{
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
&priv->regs->ifregs[0].cmask);
- if (set == PCH_ENABLE)
+ if (set)
pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_EOB);
else
pch_can_bit_set(&priv->regs->ifregs[0].mcont, PCH_IF_MCONT_EOB);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
}
static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv,
u32 buffer_num, u32 *link)
{
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
- pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+ pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)
- *link = PCH_DISABLE;
+ *link = 0;
else
- *link = PCH_ENABLE;
+ *link = 1;
}
static int pch_can_get_buffer_status(struct pch_can_priv *priv)
{
return (ioread32(&priv->regs->treq1) & 0xffff) |
- ((ioread32(&priv->regs->treq2) & 0xffff) << 16);
+ (ioread32(&priv->regs->treq2) << 16);
}
static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
@@ -1114,7 +1092,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
int i; /* Counter variable. */
int retval; /* Return value. */
u32 buf_stat; /* Variable for reading the transmit buffer status. */
- u32 counter = 0xFFFFFF;
+ int counter = PCH_COUNTER_LIMIT;
struct net_device *dev = pci_get_drvdata(pdev);
struct pch_can_priv *priv = netdev_priv(dev);
@@ -1291,7 +1269,7 @@ static int __devinit pch_can_probe(struct pci_dev *pdev,
ndev->netdev_ops = &pch_can_netdev_ops;
priv->can.clock.freq = PCH_CAN_CLK; /* Hz */
- netif_napi_add(ndev, &priv->napi, pch_can_rx_poll, PCH_RX_OBJ_END);
+ netif_napi_add(ndev, &priv->napi, pch_can_poll, PCH_RX_OBJ_END);
rc = register_candev(ndev);
if (rc) {
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 07/20] CAN : Change functions type
From: Tomoya MORINAGA @ 2010-12-07 11:06 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Currently, these two functions spec(returned value) is unnatural.
Thus, change the return value's spec
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index dd9ce16..c6c0842 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -1025,10 +1025,10 @@ static void pch_can_set_int_custom(struct pch_can_priv *priv)
}
/* This function retrieves interrupt enabled for the CAN device. */
-static void pch_can_get_int_enables(struct pch_can_priv *priv, u32 *enables)
+static u32 pch_can_get_int_enables(struct pch_can_priv *priv)
{
/* Obtaining the status of IE, SIE and EIE interrupt bits. */
- *enables = ((ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1);
+ return (ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1;
}
static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
@@ -1069,16 +1069,18 @@ static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,
pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
}
-static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv,
- u32 buffer_num, u32 *link)
+static u32 pch_can_get_rx_buffer_link(struct pch_can_priv *priv, u32 buffer_num)
{
+ u32 link;
+
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, buffer_num);
if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)
- *link = 0;
+ link = 0;
else
- *link = 1;
+ link = 1;
+ return link;
}
static int pch_can_get_buffer_status(struct pch_can_priv *priv)
@@ -1115,7 +1117,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
dev_err(&pdev->dev, "%s -> Transmission time out.\n", __func__);
/* Save interrupt configuration and then disable them */
- pch_can_get_int_enables(priv, &(priv->int_enables));
+ priv->int_enables = pch_can_get_int_enables(priv);
pch_can_set_int_enables(priv, PCH_CAN_DISABLE);
/* Save Tx buffer enable state */
@@ -1128,7 +1130,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
/* Save Rx buffer enable state */
for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
priv->rx_enable[i] = pch_can_get_rxtx_ir(priv, i, PCH_RX_IFREG);
- pch_can_get_rx_buffer_link(priv, i, &priv->rx_link[i]);
+ priv->rx_link[i] = pch_can_get_rx_buffer_link(priv, i);
}
/* Disable all Receive buffers */
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 08/20] CAN : Reduce register access
From: Tomoya MORINAGA @ 2010-12-07 11:07 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
For improve tx/rx speed, reduce register access.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 55 +++++++++++++++++---------------------------
1 files changed, 21 insertions(+), 34 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index c6c0842..0acc877 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -372,9 +372,6 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
pch_can_bit_set(&priv->regs->ifregs[0].mcont,
PCH_IF_MCONT_UMASK);
- /* Set FIFO mode set to 0 except last Rx Obj*/
- pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
- PCH_IF_MCONT_EOB);
/* In case FIFO mode, Last EoB of Rx Obj must be 1 */
if (i == PCH_RX_OBJ_END)
pch_can_bit_set(&priv->regs->ifregs[0].mcont,
@@ -402,14 +399,11 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
/* Resetting DIR bit for reception */
iowrite32(0x0, &priv->regs->ifregs[1].id1);
- iowrite32(0x0, &priv->regs->ifregs[1].id2);
- pch_can_bit_set(&priv->regs->ifregs[1].id2, PCH_ID2_DIR);
+ iowrite32(PCH_ID2_DIR, &priv->regs->ifregs[1].id2);
/* Setting EOB bit for transmitter */
- iowrite32(PCH_IF_MCONT_EOB, &priv->regs->ifregs[1].mcont);
-
- pch_can_bit_set(&priv->regs->ifregs[1].mcont,
- PCH_IF_MCONT_UMASK);
+ iowrite32(PCH_IF_MCONT_EOB | PCH_IF_MCONT_UMASK,
+ &priv->regs->ifregs[1].mcont);
iowrite32(0, &priv->regs->ifregs[1].mask1);
pch_can_bit_clear(&priv->regs->ifregs[1].mask2, 0x1fff);
@@ -524,12 +518,12 @@ static void pch_can_error(struct net_device *ndev, u32 status)
dev_err(&ndev->dev, "%s -> Bus Off occurres.\n", __func__);
}
+ errc = ioread32(&priv->regs->errc);
/* Warning interrupt. */
if (status & PCH_EWARN) {
state = CAN_STATE_ERROR_WARNING;
priv->can.can_stats.error_warning++;
cf->can_id |= CAN_ERR_CRTL;
- errc = ioread32(&priv->regs->errc);
if (((errc & PCH_REC) >> 8) > 96)
cf->data[1] |= CAN_ERR_CRTL_RX_WARNING;
if ((errc & PCH_TEC) > 96)
@@ -542,7 +536,6 @@ static void pch_can_error(struct net_device *ndev, u32 status)
priv->can.can_stats.error_passive++;
state = CAN_STATE_ERROR_PASSIVE;
cf->can_id |= CAN_ERR_CRTL;
- errc = ioread32(&priv->regs->errc);
if (((errc & PCH_REC) >> 8) > 127)
cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
if ((errc & PCH_TEC) > 127)
@@ -927,6 +920,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
struct can_frame *cf = (struct can_frame *)skb->data;
int tx_obj_no;
int i;
+ u32 id2;
if (can_dropped_invalid_skb(ndev, skb))
return NETDEV_TX_OK;
@@ -950,22 +944,23 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
pch_can_bit_set(&priv->regs->ifregs[1].cmask, PCH_CMASK_ALL);
/* If ID extended is set. */
- pch_can_bit_clear(&priv->regs->ifregs[1].id1, 0xffff);
- pch_can_bit_clear(&priv->regs->ifregs[1].id2, 0x1fff | PCH_ID2_XTD);
if (cf->can_id & CAN_EFF_FLAG) {
- pch_can_bit_set(&priv->regs->ifregs[1].id1,
- cf->can_id & 0xffff);
- pch_can_bit_set(&priv->regs->ifregs[1].id2,
- ((cf->can_id >> 16) & 0x1fff) | PCH_ID2_XTD);
+ iowrite32(cf->can_id & 0xffff, &priv->regs->ifregs[1].id1);
+ id2 = ((cf->can_id >> 16) & 0x1fff) | PCH_ID2_XTD;
} else {
- pch_can_bit_set(&priv->regs->ifregs[1].id1, 0);
- pch_can_bit_set(&priv->regs->ifregs[1].id2,
- (cf->can_id & CAN_SFF_MASK) << 2);
+ iowrite32(0, &priv->regs->ifregs[1].id1);
+ id2 = (cf->can_id & CAN_SFF_MASK) << 2;
}
+ id2 |= PCH_ID_MSGVAL;
+
/* If remote frame has to be transmitted.. */
if (cf->can_id & CAN_RTR_FLAG)
- pch_can_bit_clear(&priv->regs->ifregs[1].id2, PCH_ID2_DIR);
+ id2 &= ~PCH_ID2_DIR;
+ else
+ id2 |= PCH_ID2_DIR;
+
+ iowrite32(id2, &priv->regs->ifregs[1].id2);
/* Copy data to register */
for (i = 0; i < cf->can_dlc; i += 2) {
@@ -976,17 +971,8 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
can_put_echo_skb(skb, ndev, tx_obj_no - PCH_RX_OBJ_END - 1);
/* Updating the size of the data. */
- pch_can_bit_clear(&priv->regs->ifregs[1].mcont, 0x0f);
- pch_can_bit_set(&priv->regs->ifregs[1].mcont, cf->can_dlc);
-
- /* Clearing IntPend, NewDat & TxRqst */
- pch_can_bit_clear(&priv->regs->ifregs[1].mcont,
- PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_INTPND |
- PCH_IF_MCONT_TXRQXT);
-
- /* Setting NewDat, TxRqst bits */
- pch_can_bit_set(&priv->regs->ifregs[1].mcont,
- PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_TXRQXT);
+ iowrite32(cf->can_dlc | PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_TXRQXT |
+ PCH_IF_MCONT_TXIE, &priv->regs->ifregs[1].mcont);
pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, tx_obj_no);
@@ -1211,9 +1197,10 @@ static int pch_can_get_berr_counter(const struct net_device *dev,
struct can_berr_counter *bec)
{
struct pch_can_priv *priv = netdev_priv(dev);
+ u32 errc = ioread32(&priv->regs->errc);
- bec->txerr = ioread32(&priv->regs->errc) & PCH_TEC;
- bec->rxerr = (ioread32(&priv->regs->errc) & PCH_REC) >> 8;
+ bec->txerr = errc & PCH_TEC;
+ bec->rxerr = (errc & PCH_REC) >> 8;
return 0;
}
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 09/20] CAN : Change Copyright and module description
From: Tomoya MORINAGA @ 2010-12-07 11:07 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Currently, Copyright and module description are not formal.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 0acc877..293be51 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999 - 2010 Intel Corporation.
- * Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD.
+ * Copyright (C) 2010 OKI SEMICONDUCTOR CO., LTD.
*
* 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
@@ -1301,6 +1301,6 @@ static void __exit pch_can_pci_exit(void)
}
module_exit(pch_can_pci_exit);
-MODULE_DESCRIPTION("Controller Area Network Driver");
+MODULE_DESCRIPTION("Intel EG20T PCH CAN(Controller Area Network) Driver");
MODULE_LICENSE("GPL v2");
MODULE_VERSION("0.94");
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 10/20] CAN : Replace netdev_dbg instead of dev_dbg partly
From: Tomoya MORINAGA @ 2010-12-07 11:08 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
For easy to readable, use netdev_dbg instead of dev_dbg partly
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 293be51..0093a01 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -222,7 +222,7 @@ static void pch_can_set_run_mode(struct pch_can_priv *priv,
break;
default:
- dev_err(&priv->ndev->dev, "%s -> Invalid Mode.\n", __func__);
+ netdev_err(priv->ndev, "%s -> Invalid Mode.\n", __func__);
break;
}
}
@@ -275,7 +275,7 @@ static void pch_can_set_int_enables(struct pch_can_priv *priv,
break;
default:
- dev_err(&priv->ndev->dev, "Invalid interrupt number.\n");
+ netdev_err(priv->ndev, "Invalid interrupt number.\n");
break;
}
}
@@ -528,7 +528,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
cf->data[1] |= CAN_ERR_CRTL_RX_WARNING;
if ((errc & PCH_TEC) > 96)
cf->data[1] |= CAN_ERR_CRTL_TX_WARNING;
- dev_warn(&ndev->dev,
+ netdev_dbg(ndev,
"%s -> Error Counter is more than 96.\n", __func__);
}
/* Error passive interrupt. */
@@ -540,7 +540,7 @@ static void pch_can_error(struct net_device *ndev, u32 status)
cf->data[1] |= CAN_ERR_CRTL_RX_PASSIVE;
if ((errc & PCH_TEC) > 127)
cf->data[1] |= CAN_ERR_CRTL_TX_PASSIVE;
- dev_err(&ndev->dev,
+ netdev_dbg(ndev,
"%s -> CAN controller is ERROR PASSIVE .\n", __func__);
}
@@ -859,10 +859,10 @@ static int pch_can_open(struct net_device *ndev)
retval = pci_enable_msi(priv->dev);
if (retval) {
- dev_info(&ndev->dev, "PCH CAN opened without MSI\n");
+ netdev_err(ndev, "PCH CAN opened without MSI\n");
priv->use_msi = 0;
} else {
- dev_info(&ndev->dev, "PCH CAN opened with MSI\n");
+ netdev_err(ndev, "PCH CAN opened with MSI\n");
priv->use_msi = 1;
}
@@ -870,14 +870,14 @@ static int pch_can_open(struct net_device *ndev)
retval = request_irq(priv->dev->irq, pch_can_interrupt, IRQF_SHARED,
ndev->name, ndev);
if (retval) {
- dev_err(&ndev->dev, "request_irq failed.\n");
+ netdev_err(ndev, "request_irq failed.\n");
goto req_irq_err;
}
/* Open common can device */
retval = open_candev(ndev);
if (retval) {
- dev_err(ndev->dev.parent, "open_candev() failed %d\n", retval);
+ netdev_err(ndev, "open_candev() failed %d\n", retval);
goto err_open_candev;
}
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 11/20] CAN : Fix coding rule violation
From: Tomoya MORINAGA @ 2010-12-07 11:08 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Fix coding rule violation.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
Acked-by: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
drivers/net/can/pch_can.c | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 0093a01..da8d37b 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -89,9 +89,11 @@
#define PCH_CAN_CLK 50000000 /* 50MHz */
-/* Define the number of message object.
+/*
+ * Define the number of message object.
* PCH CAN communications are done via Message RAM.
- * The Message RAM consists of 32 message objects. */
+ * The Message RAM consists of 32 message objects.
+ */
#define PCH_RX_OBJ_NUM 26
#define PCH_TX_OBJ_NUM 6
#define PCH_RX_OBJ_START 1
@@ -126,7 +128,7 @@ enum pch_can_mode {
PCH_CAN_ALL,
PCH_CAN_NONE,
PCH_CAN_STOP,
- PCH_CAN_RUN
+ PCH_CAN_RUN,
};
struct pch_can_if_regs {
@@ -290,21 +292,20 @@ static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,
else
ie = PCH_IF_MCONT_RXIE;
- /* Reading the receive buffer data from RAM to Interface1 registers */
+ /* Reading the receive buffer data from RAM to Interface1/2 registers */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
- /* Setting the IF1MASK1 register to access MsgVal and RxIE bits */
+ /* Setting the IF1/2MASK1 register to access MsgVal and RxIE bits */
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_ARB | PCH_CMASK_CTRL,
&priv->regs->ifregs[dir].cmask);
if (set) {
- /* Setting the MsgVal and RxIE bits */
+ /* Setting the MsgVal and RxIE/TxIE bits */
pch_can_bit_set(&priv->regs->ifregs[dir].mcont, ie);
pch_can_bit_set(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL);
-
} else {
- /* Resetting the MsgVal and RxIE bits */
+ /* Clearing the MsgVal and RxIE/TxIE bits */
pch_can_bit_clear(&priv->regs->ifregs[dir].mcont, ie);
pch_can_bit_clear(&priv->regs->ifregs[dir].id2, PCH_ID_MSGVAL);
}
@@ -362,8 +363,7 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
int i;
for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
- iowrite32(PCH_CMASK_RX_TX_GET,
- &priv->regs->ifregs[0].cmask);
+ iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i);
iowrite32(0x0, &priv->regs->ifregs[0].id1);
@@ -385,16 +385,14 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
0x1fff | PCH_MASK2_MDIR_MXTD);
/* Setting CMASK for writing */
- iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |
- PCH_CMASK_ARB | PCH_CMASK_CTRL,
- &priv->regs->ifregs[0].cmask);
+ iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | PCH_CMASK_ARB |
+ PCH_CMASK_CTRL, &priv->regs->ifregs[0].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, i);
}
for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++) {
- iowrite32(PCH_CMASK_RX_TX_GET,
- &priv->regs->ifregs[1].cmask);
+ iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[1].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i);
/* Resetting DIR bit for reception */
@@ -409,9 +407,8 @@ static void pch_can_config_rx_tx_buffers(struct pch_can_priv *priv)
pch_can_bit_clear(&priv->regs->ifregs[1].mask2, 0x1fff);
/* Setting CMASK for writing */
- iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK |
- PCH_CMASK_ARB | PCH_CMASK_CTRL,
- &priv->regs->ifregs[1].cmask);
+ iowrite32(PCH_CMASK_RDWR | PCH_CMASK_MASK | PCH_CMASK_ARB |
+ PCH_CMASK_CTRL, &priv->regs->ifregs[1].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, i);
}
@@ -470,8 +467,9 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
pch_can_rw_msg_obj(&priv->regs->ifregs[0].creq, mask);
} else if ((mask >= PCH_TX_OBJ_START) && (mask <= PCH_TX_OBJ_END)) {
- /* Setting CMASK for clearing interrupts for
- frame transmission. */
+ /*
+ * Setting CMASK for clearing interrupts for frame transmission.
+ */
iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL | PCH_CMASK_ARB,
&priv->regs->ifregs[1].cmask);
@@ -590,7 +588,6 @@ static irqreturn_t pch_can_interrupt(int irq, void *dev_id)
struct pch_can_priv *priv = netdev_priv(ndev);
pch_can_set_int_enables(priv, PCH_CAN_NONE);
-
napi_schedule(&priv->napi);
return IRQ_HANDLED;
@@ -1031,11 +1028,11 @@ static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) &&
- ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) {
+ ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie))
enable = 1;
- } else {
+ else
enable = 0;
- }
+
return enable;
}
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 12/20] CAN : Delete unnecessary/redundant code
From: Tomoya MORINAGA @ 2010-12-07 11:09 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Delete unnecessary/redundant code
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index da8d37b..3540978 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -447,11 +447,6 @@ static void pch_can_release(struct pch_can_priv *priv)
/* This function clears interrupt(s) from the CAN device. */
static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
{
- if (mask == PCH_STATUS_INT) {
- ioread32(&priv->regs->stat);
- return;
- }
-
/* Clear interrupt for transmit object */
if ((mask >= PCH_RX_OBJ_START) && (mask <= PCH_RX_OBJ_END)) {
/* Setting CMASK for clearing the reception interrupts. */
@@ -512,8 +507,6 @@ static void pch_can_error(struct net_device *ndev, u32 status)
state = CAN_STATE_BUS_OFF;
cf->can_id |= CAN_ERR_BUSOFF;
can_bus_off(ndev);
- pch_can_set_run_mode(priv, PCH_CAN_RUN);
- dev_err(&ndev->dev, "%s -> Bus Off occurres.\n", __func__);
}
errc = ioread32(&priv->regs->errc);
@@ -747,7 +740,7 @@ static int pch_can_poll(struct napi_struct *napi, int quota)
if (!int_stat)
goto end;
- if ((int_stat == PCH_STATUS_INT) && (quota > 0)) {
+ if (int_stat == PCH_STATUS_INT) {
reg_stat = ioread32(&priv->regs->stat);
if (reg_stat & (PCH_BUS_OFF | PCH_LEC_ALL)) {
if (reg_stat & PCH_BUS_OFF ||
@@ -933,10 +926,6 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
priv->tx_obj++;
}
- /* Reading the Msg Obj from the Msg RAM to the Interface register. */
- iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[1].cmask);
- pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, tx_obj_no);
-
/* Setting the CMASK register. */
pch_can_bit_set(&priv->regs->ifregs[1].cmask, PCH_CMASK_ALL);
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 13/20] CAN : Fix bit timing calculation issue
From: Tomoya MORINAGA @ 2010-12-07 11:09 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Modify like use calculated value directly passed by CAN core module.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
Acked-by: Marc Kleine-Budde <mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
---
drivers/net/can/pch_can.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 3540978..5a6a0df 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -786,17 +786,15 @@ static int pch_set_bittiming(struct net_device *ndev)
const struct can_bittiming *bt = &priv->can.bittiming;
u32 canbit;
u32 bepe;
- u32 brp;
/* Setting the CCE bit for accessing the Can Timing register. */
pch_can_bit_set(&priv->regs->cont, PCH_CTRL_CCE);
- brp = (bt->tq) / (1000000000/PCH_CAN_CLK) - 1;
- canbit = brp & PCH_MSK_BITT_BRP;
+ canbit = (bt->brp - 1) & PCH_MSK_BITT_BRP;
canbit |= (bt->sjw - 1) << PCH_BIT_SJW_SHIFT;
canbit |= (bt->phase_seg1 + bt->prop_seg - 1) << PCH_BIT_TSEG1_SHIFT;
canbit |= (bt->phase_seg2 - 1) << PCH_BIT_TSEG2_SHIFT;
- bepe = (brp & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE_SHIFT;
+ bepe = ((bt->brp - 1) & PCH_MSK_BRPE_BRPE) >> PCH_BIT_BRPE_BRPE_SHIFT;
iowrite32(canbit, &priv->regs->bitt);
iowrite32(bepe, &priv->regs->brpe);
pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_CCE);
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 14/20] CAN : Fix miss-setting status issue
From: Tomoya MORINAGA @ 2010-12-07 11:09 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Modify miss-setting status issue at suspend.
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 5a6a0df..c500b6d 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -1073,7 +1073,7 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
pch_can_set_run_mode(priv, PCH_CAN_STOP);
/* Indicate that we are aboutto/in suspend */
- priv->can.state = CAN_STATE_SLEEPING;
+ priv->can.state = CAN_STATE_STOPPED;
/* Waiting for all transmission to complete. */
while (counter) {
--
1.6.0.6
^ permalink raw reply related
* [PATCH net-next-2.6 v8 15/20] CAN : Comment optimization
From: Tomoya MORINAGA @ 2010-12-07 11:10 UTC (permalink / raw)
To: Wolfgang Grandegger, socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Cc: andrew.chih.howe.khor-ral2JQCrhuEAvxtiuMwx3w,
qi.wang-ral2JQCrhuEAvxtiuMwx3w,
margie.foster-ral2JQCrhuEAvxtiuMwx3w,
yong.y.wang-ral2JQCrhuEAvxtiuMwx3w,
kok.howg.ewe-ral2JQCrhuEAvxtiuMwx3w,
joel.clark-ral2JQCrhuEAvxtiuMwx3w
Comment optimization
Signed-off-by: Tomoya MORINAGA <tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
---
drivers/net/can/pch_can.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index c500b6d..a1fd3be 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -292,7 +292,7 @@ static void pch_can_set_rxtx(struct pch_can_priv *priv, u32 buff_num,
else
ie = PCH_IF_MCONT_RXIE;
- /* Reading the receive buffer data from RAM to Interface1/2 registers */
+ /* Reading the Msg buffer from Message RAM to IF1/2 registers. */
iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
pch_can_rw_msg_obj(&priv->regs->ifregs[dir].creq, buff_num);
@@ -854,7 +854,7 @@ static int pch_can_open(struct net_device *ndev)
priv->use_msi = 1;
}
- /* Regsitering the interrupt. */
+ /* Regstering the interrupt. */
retval = request_irq(priv->dev->irq, pch_can_interrupt, IRQF_SHARED,
ndev->name, ndev);
if (retval) {
@@ -954,7 +954,7 @@ static netdev_tx_t pch_xmit(struct sk_buff *skb, struct net_device *ndev)
can_put_echo_skb(skb, ndev, tx_obj_no - PCH_RX_OBJ_END - 1);
- /* Updating the size of the data. */
+ /* Set the size of the data. Update if2_mcont */
iowrite32(cf->can_dlc | PCH_IF_MCONT_NEWDAT | PCH_IF_MCONT_TXRQXT |
PCH_IF_MCONT_TXIE, &priv->regs->ifregs[1].mcont);
@@ -1061,8 +1061,8 @@ static int pch_can_get_buffer_status(struct pch_can_priv *priv)
static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
{
- int i; /* Counter variable. */
- int retval; /* Return value. */
+ int i;
+ int retval;
u32 buf_stat; /* Variable for reading the transmit buffer status. */
int counter = PCH_COUNTER_LIMIT;
@@ -1119,8 +1119,8 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
static int pch_can_resume(struct pci_dev *pdev)
{
- int i; /* Counter variable. */
- int retval; /* Return variable. */
+ int i;
+ int retval;
struct net_device *dev = pci_get_drvdata(pdev);
struct pch_can_priv *priv = netdev_priv(dev);
--
1.6.0.6
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox