linux - Contrib clone of linux

Age	Commit message (Expand)	Author
2017-05-12	Merge tag 'for-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/...	Linus Torvalds
2017-05-05	Merge tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...	Linus Torvalds
2017-05-01	mailmap: add Sebastian Reichel	Sebastian Reichel
2017-04-13	mailmap: add Martin Kepplinger's email	Martin Kepplinger
2017-04-10	Merge 4.11-rc6 into staging-next	Greg Kroah-Hartman
2017-04-08	mailmap: update Yakir Yang email address	Jeffy Chen
2017-03-06	Merge tag 'iio-for-4.12a' of git://git.kernel.org/pub/scm/linux/kernel/git/ji...	Greg Kroah-Hartman
2017-02-04	mailmap: Change email to new Konsulko email	Matt Ranostay
2017-01-10	mailmap: add codeaurora.org names for nameless email commits	Stephen Boyd
2016-10-15	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	Linus Torvalds
2016-10-07	mailmap: add Johan Hovold	Johan Hovold
2016-10-05	Merge tag 'staging-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...	Linus Torvalds
2016-10-05	mailmap: Canonicalize to Qais' current email address.	Ralf Baechle
2016-09-30	MAINTAINERS: Switch to kernel.org email address for Javi Merino	Javi Merino
2016-09-14	Merge tag 'iio-for-4.9b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic...	Greg Kroah-Hartman
2016-09-08	Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...	Linus Torvalds
2016-09-01	MAINTAINERS: Vladimir has moved	Vladimir Davydov
2016-08-29	mailmap: update Vlad Dogaru email address	Vlad Dogaru
2016-08-17	MAINTAINERS: Switch to kernel.org account for Krzysztof Kozlowski	Krzysztof Kozlowski
2016-08-06	Merge tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mch...	Linus Torvalds
2016-08-04	.mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan	Joe Perches
2016-08-02	mailmap: add Linus Lüssing	Linus Lüssing
2016-07-04	Merge 4.7-rc6 into staging-next	Greg Kroah-Hartman
2016-06-29	Merge tag 'iio-for-4.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic...	Greg Kroah-Hartman
2016-06-24	mailmap: add Boris Brezillon's email	Antoine Tenart
2016-06-24	mailmap: add Antoine Tenart's email	Antoine Tenart
2016-06-15	Update email addresses in MAINTAINERS and .mailmap	Shuah Khan
2016-06-15	Update my main e-mails at the Kernel tree	Mauro Carvalho Chehab
2016-06-11	mailmap: update Matt Ranostay email address	Matt Ranostay
2016-06-11	mailmap: update Adriana Reus email address	Adriana Reus
2016-05-05	mailmap: add John Paul Adrian Glaubitz	Linus Torvalds
2016-04-28	.mailmap: add Frank Rowand	Frank Rowand
2016-04-28	mailmap: fix Krzysztof Kozlowski's misspelled name	Krzysztof Kozlowski
2016-04-01	.mailmap: add Christophe Ricard	Christophe Ricard
2016-01-27	mailmap: redirect inactive address <ao2@amarulasolutions.com>	Antonio Ospite
2015-10-23	mailmap: update Javier Martinez Canillas' email	Javier Martinez Canillas
2015-08-14	.mailmap: Andrey Ryabinin has moved	Andrey Ryabinin
2015-07-17	mailmap: update Sudeep Holla's email id	Sudeep Holla
2015-07-17	Update Viresh Kumar's email address	Viresh Kumar
2015-06-25	mailmap: add rdunlap email auto-correction	Kees Cook
2015-06-25	Mohit Kumar has moved	Pratyush Anand
2015-06-25	Pratyush Anand has moved	Pratyush Anand
2015-04-15	.mailmap: add Ricardo Ribalda	Ricardo Ribalda Delgado
2015-02-05	.mailmap: update Konstantin Khlebnikov's email address	Kim Phillips
2015-01-08	MAINTAINERS: update rydberg's addresses	Henrik Rydberg
2014-12-18	.mailmap: Santosh Shilimkar has moved	Santosh Shilimkar
2014-12-18	.mailmap: update akpm@osdl.org	Andrew Morton
2014-07-30	Josh has moved	Josh Triplett
2014-04-18	Shiraz has moved	Viresh Kumar
2012-06-20	Viresh has moved	Viresh Kumar

/* * Amiga Linux/m68k Ariadne Ethernet Driver * * © Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org) * Peter De Schrijver (p2@mind.be) * * --------------------------------------------------------------------------- * * This program is based on * * lance.c: An AMD LANCE ethernet driver for linux. * Written 1993-94 by Donald Becker. * * Am79C960: PCnet(tm)-ISA Single-Chip Ethernet Controller * Advanced Micro Devices * Publication #16907, Rev. B, Amendment/0, May 1994 * * MC68230: Parallel Interface/Timer (PI/T) * Motorola Semiconductors, December, 1983 * * --------------------------------------------------------------------------- * * This file is subject to the terms and conditions of the GNU General Public * License. See the file COPYING in the main directory of the Linux * distribution for more details. * * --------------------------------------------------------------------------- * * The Ariadne is a Zorro-II board made by Village Tronic. It contains: * * - an Am79C960 PCnet-ISA Single-Chip Ethernet Controller with both * 10BASE-2 (thin coax) and 10BASE-T (UTP) connectors * * - an MC68230 Parallel Interface/Timer configured as 2 parallel ports */ #include <linux/module.h> #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/string.h> #include <linux/errno.h> #include <linux/ioport.h> #include <linux/slab.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <linux/interrupt.h> #include <linux/skbuff.h> #include <linux/init.h> #include <linux/zorro.h> #include <linux/bitops.h> #include <asm/amigaints.h> #include <asm/amigahw.h> #include <asm/irq.h> #include "ariadne.h" #ifdef ARIADNE_DEBUG int ariadne_debug = ARIADNE_DEBUG; #else int ariadne_debug = 1; #endif /* * Macros to Fix Endianness problems */ /* Swap the Bytes in a WORD */ #define swapw(x) (((x>>8)&0x00ff)|((x<<8)&0xff00)) /* Get the Low BYTE in a WORD */ #define lowb(x) (x&0xff) /* Get the Swapped High WORD in a LONG */ #define swhighw(x) ((((x)>>8)&0xff00)|(((x)>>24)&0x00ff)) /* Get the Swapped Low WORD in a LONG */ #define swloww(x) ((((x)<<8)&0xff00)|(((x)>>8)&0x00ff)) /* * Transmit/Receive Ring Definitions */ #define TX_RING_SIZE 5 #define RX_RING_SIZE 16 #define PKT_BUF_SIZE 1520 /* * Private Device Data */ struct ariadne_private { volatile struct TDRE *tx_ring[TX_RING_SIZE]; volatile struct RDRE *rx_ring[RX_RING_SIZE]; volatile u_short *tx_buff[TX_RING_SIZE]; volatile u_short *rx_buff[RX_RING_SIZE]; int cur_tx, cur_rx; /* The next free ring entry */ int dirty_tx; /* The ring entries to be free()ed. */ char tx_full; }; /* * Structure Created in the Ariadne's RAM Buffer */ struct lancedata { struct TDRE tx_ring[TX_RING_SIZE]; struct RDRE rx_ring[RX_RING_SIZE]; u_short tx_buff[TX_RING_SIZE][PKT_BUF_SIZE/sizeof(u_short)]; u_short rx_buff[RX_RING_SIZE][PKT_BUF_SIZE/sizeof(u_short)]; }; static int ariadne_open(struct net_device *dev); static void ariadne_init_ring(struct net_device *dev); static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev); static void ariadne_tx_timeout(struct net_device *dev); static int ariadne_rx(struct net_device *dev); static void ariadne_reset(struct net_device *dev); static irqreturn_t ariadne_interrupt(int irq, void *data); static int ariadne_close(struct net_device *dev); static struct net_device_stats *ariadne_get_stats(struct net_device *dev); #ifdef HAVE_MULTICAST static void set_multicast_list(struct net_device *dev); #endif static void memcpyw(volatile u_short *dest, u_short *src, int len) { while (len >= 2) { *(dest++) = *(src++); len -= 2; } if (len == 1) *dest = (*(u_char *)src)<<8; } static int __devinit ariadne_init_one(struct zorro_dev *z, const struct zorro_device_id *ent); static void __devexit ariadne_remove_one(struct zorro_dev *z); static struct zorro_device_id ariadne_zorro_tbl[] __devinitdata = { { ZORRO_PROD_VILLAGE_TRONIC_ARIADNE }, { 0 } }; static struct zorro_driver ariadne_driver = { .name = "ariadne", .id_table = ariadne_zorro_tbl, .probe = ariadne_init_one, .remove = __devexit_p(ariadne_remove_one), }; static int __devinit ariadne_init_one(struct zorro_dev *z, const struct zorro_device_id *ent) { unsigned long board = z->resource.start; unsigned long base_addr = board+ARIADNE_LANCE; unsigned long mem_start = board+ARIADNE_RAM; struct resource *r1, *r2; struct net_device *dev; struct ariadne_private *priv; int err; r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960"); if (!r1) return -EBUSY; r2 = request_mem_region(mem_start, ARIADNE_RAM_SIZE, "RAM"); if (!r2) { release_resource(r1); return -EBUSY; } dev = alloc_etherdev(sizeof(struct ariadne_private)); if (dev == NULL) { release_resource(r1); release_resource(r2); return -ENOMEM; } priv = netdev_priv(dev); r1->name = dev->name; r2->name = dev->name; dev->dev_addr[0] = 0x00; dev->dev_addr[1] = 0x60; dev->dev_addr[2] = 0x30; dev->dev_addr[3] = (z->rom.er_SerialNumber>>16) & 0xff; dev->dev_addr[4] = (z->rom.er_SerialNumber>>8) & 0xff; dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff;