/* * linux/drivers/video/n411.c -- Platform device for N411 EPD kit * * Copyright (C) 2008, Jaya Kumar * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of this archive for * more details. * * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven. * * This driver is written to be used with the Hecuba display controller * board, and tested with the EInk 800x600 display in 1 bit mode. * The interface between Hecuba and the host is TTL based GPIO. The * GPIO requirements are 8 writable data lines and 6 lines for control. * Only 4 of the controls are actually used here but 6 for future use. * The driver requires the IO addresses for data and control GPIO at * load time. It is also possible to use this display with a standard * PC parallel port. * * General notes: * - User must set dio_addr=0xIOADDR cio_addr=0xIOADDR c2io_addr=0xIOADDR * */ #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/string.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/fb.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/list.h> #include <linux/uaccess.h> #include <linux/irq.h> #include <video/hecubafb.h> static unsigned long dio_addr; static unsigned long cio_addr; static unsigned long c2io_addr; static unsigned long splashval; static unsigned int nosplash; static unsigned char ctl; static void n411_set_ctl(struct hecubafb_par *par, unsigned char bit, unsigned char state) { switch (bit) { case HCB_CD_BIT: if (state) ctl &= ~(HCB_CD_BIT); else ctl |= HCB_CD_BIT; break; case HCB_DS_BIT: if (state) ctl &= ~(HCB_DS_BIT); else ctl |= HCB_DS_BIT; break; } outb(ctl, cio_addr); } static unsigned char n411_get_ctl(struct hecubafb_par *par) { return inb(c2io_addr); } static void n411_set_data(struct hecubafb_par *par, unsigned char value) { outb(value, dio_addr); } static void n411_wait_for_ack(struct hecubafb_par *par, int clear) { int timeout; unsigned char tmp; timeout = 500; do { tmp = n411_get_ctl(par); if ((tmp & HCB_ACK_BIT) && (!clear)) return; else if (!(tmp & HCB_ACK_BIT) && (clear)) return; udelay(1); } while (timeout--); printk(KERN_ERR "timed out waiting for ack\n"); } static int n411_init_control(struct hecubafb_par *par) { unsigned char tmp; /* for init, we want the following setup to be set: WUP = lo ACK = hi DS = hi RW = hi CD = lo */ /* write WUP to lo, DS to hi, RW to hi, CD to lo */ ctl = HCB_WUP_BIT | HCB_RW_BIT | HCB_CD_BIT ; n411_set_ctl(par, HCB_DS_BIT, 1); /* check ACK is not lo */ tmp = n411_get_ctl(par); if (tmp & HCB_ACK_BIT) { printk(KERN_ERR "Fail because ACK is already low\n"); return -ENXIO; } return 0; } static int n411_init_board(struct hecubafb_par *par) { int retval; retval = n411_init_control(par); if (retval) return retval; par->send_command(par, APOLLO_INIT_DISPLAY); par->send_data(par, 0x81); /* have to wait while display resets */ udelay(1000); /* if we were told to splash the screen, we just clear it */ if (!nosplash) { par->send_command(par, APOLLO_ERASE_DISPLAY); par->send_data(par, splashval); } return 0; } static struct hecuba_board n411_board = { .owner = THIS_MODULE, .init = n411_init_board, .set_ctl = n411_set_ctl, .set_data = n411_set_data, .wait_for_ack = n411_wait_for_ack, }; static struct platform_device *n411_device; static int __init n411_init(void) { int ret; if (!dio_addr || !cio_addr || !c2io_addr) { printk(KERN_WARNING "no IO addresses supplied\n"); return -EINVAL; } /* request our platform independent driver */ request_module("hecubafb"); n411_device = platform_device_alloc("hecubafb", -1); if (!n411_device) return -ENOMEM; ret = platform_device_add_data(n411_device, &n411_board, sizeof(n411_board)); if (ret) goto put_plat_device; /* this _add binds hecubafb to n411. hecubafb refcounts n411 */ ret = platform_device_add(n411_device); if (ret) goto put_plat_device; return 0; put_plat_device: platform_device_put(n411_device); return ret; } static void __exit n411_exit(void) { platform_device_unregister(n411_device); } module_init(n411_init); module_exit(n411_exit); module_param(nosplash, uint, 0); MODULE_PARM_DESC(nosplash, "Disable doing the splash screen"); module_param(dio_addr, ulong, 0); MODULE_PARM_DESC(dio_addr, "IO address for data, eg: 0x480"); module_param(cio_addr, ulong, 0); MODULE_PARM_DESC(cio_addr, "IO address for control, eg: 0x400"); module_param(c2io_addr, ulong, 0); MODULE_PARM_DESC(c2io_addr, "IO address for secondary control, eg: 0x408"); module_param(splashval, ulong, 0); MODULE_PARM_DESC(splashval, "Splash pattern: 0x00 is black, 0x01 is white"); MODULE_DESCRIPTION("board driver for n411 hecuba/apollo epd kit"); MODULE_AUTHOR("Jaya Kumar"); MODULE_LICENSE("GPL"); te SCTP checksum from conntrack helper, from Davide Caratti. 5) Merge UDPlite conntrack and NAT helpers into UDP, this was mostly a copy&paste from the original helper, from Florian Westphal. 6) Reset netfilter state when duplicating packets, also from Florian. 7) Remove unnecessary check for broadcast in IPv6 in pkttype match and nft_meta, from Liping Zhang. 8) Add missing code to deal with loopback packets from nft_meta when used by the netdev family, also from Liping. 9) Several cleanups on nf_tables, one to remove unnecessary check from the netlink control plane path to add table, set and stateful objects and code consolidation when unregister chain hooks, from Gao Feng. 10) Fix harmless reference counter underflow in IPVS that, however, results in problems with the introduction of the new refcount_t type, from David Windsor. 11) Enable LIBCRC32C from nf_ct_sctp instead of nf_nat_sctp, from Davide Caratti. 12) Missing documentation on nf_tables uapi header, from Liping Zhang. 13) Use rb_entry() helper in xt_connlimit, from Geliang Tang. ==================== Signed-off-by: David S. Miller <davem@davemloft.net> </td></tr> <tr class='logheader'><td><span title='2017-02-03 15:21:21 -0500'>2017-02-03</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi?id=b3c7ef0adadc5768e0baa786213c6bd1ce521a77'>bridge: uapi: add per vlan tunnel info</a></td><td>Roopa Prabhu</td><td>2</td><td><span class='deletions'>-0</span>/<span class='insertions'>+12</span></td></tr> <tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'> New nested netlink attribute to associate tunnel info per vlan. This is used by bridge driver to send tunnel metadata to bridge ports in vlan tunnel mode. This patch also adds new per port flag IFLA_BRPORT_VLAN_TUNNEL to enable vlan tunnel mode. off by default. One example use for this is a vxlan bridging gateway or vtep which maps vlans to vn-segments (or vnis). User can configure per-vlan tunnel information which the bridge driver can use to bridge vlan into the corresponding vn-segment. Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> </td></tr> <tr class='logheader'><td><span title='2017-02-03 15:21:21 -0500'>2017-02-03</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi?id=3ad7a4b141ebd6091494913672d7166d5c2764e4'>vxlan: support fdb and learning in COLLECT_METADATA mode</a></td><td>Roopa Prabhu</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+1</span></td></tr> <tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'> Vxlan COLLECT_METADATA mode today solves the per-vni netdev scalability problem in l3 networks. It expects all forwarding information to be present in dst_metadata. This patch series enhances collect metadata mode to include the case where only vni is present in dst_metadata, and the vxlan driver can then use the rest of the forwarding information datbase to make forwarding decisions. There is no change to default COLLECT_METADATA behaviour. These changes only apply to COLLECT_METADATA when used with the bridging use-case with a special dst_metadata tunnel info flag (eg: where vxlan device is part of a bridge). For all this to work, the vxlan driver will need to now support a single fdb table hashed by mac + vni. This series essentially makes this happen. use-case and workflow: vxlan collect metadata device participates in bridging vlan to vn-segments. Bridge driver above the vxlan device, sends the vni corresponding to the vlan in the dst_metadata. vxlan driver will lookup forwarding database with (mac + vni) for the required remote destination information to forward the packet. Changes introduced by this patch: - allow learning and forwarding database state in vxlan netdev in COLLECT_METADATA mode. Current behaviour is not changed by default. tunnel info flag IP_TUNNEL_INFO_BRIDGE is used to support the new bridge friendly mode. - A single fdb table hashed by (mac, vni) to allow fdb entries with multiple vnis in the same fdb table - rx path already has the vni - tx path expects a vni in the packet with dst_metadata - prior to this series, fdb remote_dsts carried remote vni and the vxlan device carrying the fdb table represented the source vni. With the vxlan device now representing multiple vnis, this patch adds a src vni attribute to the fdb entry. The remote vni already uses NDA_VNI attribute. This patch introduces NDA_SRC_VNI netlink attribute to represent the src vni in a multi vni fdb table. iproute2 example (patched and pruned iproute2 output to just show relevant fdb entries): example shows same host mac learnt on two vni's. before (netdev per vni): $bridge fdb show | grep "00:02:00:00:00:03" 00:02:00:00:00:03 dev vxlan1001 dst 12.0.0.8 self 00:02:00:00:00:03 dev vxlan1000 dst 12.0.0.8 self after this patch with collect metadata in bridged mode (single netdev): $bridge fdb show | grep "00:02:00:00:00:03" 00:02:00:00:00:03 dev vxlan0 src_vni 1001 dst 12.0.0.8 self 00:02:00:00:00:03 dev vxlan0 src_vni 1000 dst 12.0.0.8 self Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> </td></tr> <tr class='logheader'><td><span title='2017-02-03 15:16:46 -0500'>2017-02-03</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi?id=295a6e06d21e1f469c9f38b00125a13b60ad4e7c'>net/sched: act_ife: Change to use ife module</a></td><td>Yotam Gigi</td><td>1</td><td><span class='deletions'>-9</span>/<span class='insertions'>+1</span></td></tr> <tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'> Use the encode/decode functionality from the ife module instead of using implementation inside the act_ife. Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Yotam Gigi <yotamg@mellanox.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Roman Mashak <mrv@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net> </td></tr> <tr class='logheader'><td><span title='2017-02-03 15:16:45 -0500'>2017-02-03</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi?id=1ce8460496c05379c66edc178c3c55ca4e953044'>net: Introduce ife encapsulation module</a></td><td>Yotam Gigi</td><td>2</td><td><span class='deletions'>-0</span>/<span class='insertions'>+19</span></td></tr> <tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'> This module is responsible for the ife encapsulation protocol encode/decode logics. That module can: - ife_encode: encode skb and reserve space for the ife meta header - ife_decode: decode skb and extract the meta header size - ife_tlv_meta_encode - encodes one tlv entry into the reserved ife header space. - ife_tlv_meta_decode - decodes one tlv entry from the packet - ife_tlv_meta_next - advance to the next tlv Reviewed-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: Yotam Gigi <yotamg@mellanox.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: Roman Mashak <mrv@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net> </td></tr> <tr class='logheader'><td><span title='2017-02-02 23:34:19 -0500'>2017-02-02</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi?id=8fe809a992639b2013c0d8da2ba55cdea28a959a'>net: add LINUX_MIB_PFMEMALLOCDROP counter</a></td><td>Eric Dumazet</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+1</span></td></tr> <tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'> Debugging issues caused by pfmemalloc is often tedious. Add a new SNMP counter to more easily diagnose these problems. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Josef Bacik <jbacik@fb.com> Acked-by: Josef Bacik <jbacik@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net> </td></tr> <tr class='logheader'><td><span title='2017-02-02 21:58:02 -0500'>2017-02-02</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi?id=ba94f3088b792b16ea576a256a6030feddc87f24'>unix: add ioctl to open a unix socket file with O_PATH</a></td><td>Andrey Vagin</td><td>1</td><td><span class='deletions'>-0</span>/<span class='insertions'>+2</span></td></tr> <tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'> This ioctl opens a file to which a socket is bound and returns a file descriptor. The caller has to have CAP_NET_ADMIN in the socket network namespace. Currently it is impossible to get a path and a mount point for a socket file. socket_diag reports address, device ID and inode number for unix sockets. An address can contain a relative path or a file may be moved somewhere. And these properties say nothing about a mount namespace and a mount point of a socket file. With the introduced ioctl, we can get a path by reading /proc/self/fd/X and get mnt_id from /proc/self/fdinfo/X. In CRIU we are going to use this ioctl to dump and restore unix socket. Here is an example how it can be used: $ strace -e socket,bind,ioctl ./test /tmp/test_sock socket(AF_UNIX, SOCK_STREAM, 0) = 3 bind(3, {sa_family=AF_UNIX, sun_path="test_sock"}, 11) = 0 ioctl(3, SIOCUNIXFILE, 0) = 4 ^Z $ ss -a | grep test_sock u_str LISTEN 0 1 test_sock 17798 * 0 $ ls -l /proc/760/fd/{3,4} lrwx------ 1 root root 64 Feb 1 09:41 3 -> 'socket:[17798]' l--------- 1 root root 64 Feb 1 09:41 4 -> /tmp/test_sock $ cat /proc/760/fdinfo/4 pos: 0 flags: 012000000 mnt_id: 40 $ cat /proc/self/mountinfo | grep "^40\s" 40 19 0:37 / /tmp rw shared:23 - tmpfs tmpfs rw Signed-off-by: Andrei Vagin <avagin@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> </td></tr> <tr class='logheader'><td><span title='2017-02-02 16:54:00 -0500'>2017-02-02</span></td><td class='logsubject'><a href='/cgit.cgi/linux/net-next.git/commit/include/uapi?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net</a></td><td>David S. Miller</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+3</span></td></tr> <tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'> All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net> </td></tr>