netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [git patches] new network drivers for net-next
@ 2008-09-18 16:00 Jeff Garzik
  2008-09-18 16:05 ` other netdev updates (was Re: [git patches] new network drivers for net-next) Jeff Garzik
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Jeff Garzik @ 2008-09-18 16:00 UTC (permalink / raw)
  To: netdev, LKML


Please pull from 'new-drivers' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git new-drivers

to receive the following updates:

 Documentation/networking/LICENSE.qlge |   46 +
 MAINTAINERS                           |   20 +
 drivers/net/Kconfig                   |   39 +
 drivers/net/Makefile                  |    4 +
 drivers/net/atlx/Makefile             |    2 +
 drivers/net/atlx/atl2.c               | 3127 ++++++++++++++++++++++++++
 drivers/net/atlx/atl2.h               |  530 +++++
 drivers/net/enic/Makefile             |    5 +
 drivers/net/enic/cq_desc.h            |   79 +
 drivers/net/enic/cq_enet_desc.h       |  169 ++
 drivers/net/enic/enic.h               |  115 +
 drivers/net/enic/enic_main.c          | 1949 ++++++++++++++++
 drivers/net/enic/enic_res.c           |  370 +++
 drivers/net/enic/enic_res.h           |  151 ++
 drivers/net/enic/rq_enet_desc.h       |   60 +
 drivers/net/enic/vnic_cq.c            |   89 +
 drivers/net/enic/vnic_cq.h            |  113 +
 drivers/net/enic/vnic_dev.c           |  674 ++++++
 drivers/net/enic/vnic_dev.h           |  106 +
 drivers/net/enic/vnic_devcmd.h        |  282 +++
 drivers/net/enic/vnic_enet.h          |   47 +
 drivers/net/enic/vnic_intr.c          |   62 +
 drivers/net/enic/vnic_intr.h          |   92 +
 drivers/net/enic/vnic_nic.h           |   65 +
 drivers/net/enic/vnic_resource.h      |   63 +
 drivers/net/enic/vnic_rq.c            |  199 ++
 drivers/net/enic/vnic_rq.h            |  204 ++
 drivers/net/enic/vnic_rss.h           |   32 +
 drivers/net/enic/vnic_stats.h         |   70 +
 drivers/net/enic/vnic_wq.c            |  184 ++
 drivers/net/enic/vnic_wq.h            |  154 ++
 drivers/net/enic/wq_enet_desc.h       |   98 +
 drivers/net/jme.c                     | 3019 +++++++++++++++++++++++++
 drivers/net/jme.h                     | 1199 ++++++++++
 drivers/net/qlge/Makefile             |    7 +
 drivers/net/qlge/qlge.h               | 1593 +++++++++++++
 drivers/net/qlge/qlge_dbg.c           |  858 +++++++
 drivers/net/qlge/qlge_ethtool.c       |  415 ++++
 drivers/net/qlge/qlge_main.c          | 3954 +++++++++++++++++++++++++++++++++
 drivers/net/qlge/qlge_mpi.c           |  150 ++
 include/linux/pci_ids.h               |    3 +
 41 files changed, 20398 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/networking/LICENSE.qlge
 create mode 100644 drivers/net/atlx/atl2.c
 create mode 100644 drivers/net/atlx/atl2.h
 create mode 100644 drivers/net/enic/Makefile
 create mode 100644 drivers/net/enic/cq_desc.h
 create mode 100644 drivers/net/enic/cq_enet_desc.h
 create mode 100644 drivers/net/enic/enic.h
 create mode 100644 drivers/net/enic/enic_main.c
 create mode 100644 drivers/net/enic/enic_res.c
 create mode 100644 drivers/net/enic/enic_res.h
 create mode 100644 drivers/net/enic/rq_enet_desc.h
 create mode 100644 drivers/net/enic/vnic_cq.c
 create mode 100644 drivers/net/enic/vnic_cq.h
 create mode 100644 drivers/net/enic/vnic_dev.c
 create mode 100644 drivers/net/enic/vnic_dev.h
 create mode 100644 drivers/net/enic/vnic_devcmd.h
 create mode 100644 drivers/net/enic/vnic_enet.h
 create mode 100644 drivers/net/enic/vnic_intr.c
 create mode 100644 drivers/net/enic/vnic_intr.h
 create mode 100644 drivers/net/enic/vnic_nic.h
 create mode 100644 drivers/net/enic/vnic_resource.h
 create mode 100644 drivers/net/enic/vnic_rq.c
 create mode 100644 drivers/net/enic/vnic_rq.h
 create mode 100644 drivers/net/enic/vnic_rss.h
 create mode 100644 drivers/net/enic/vnic_stats.h
 create mode 100644 drivers/net/enic/vnic_wq.c
 create mode 100644 drivers/net/enic/vnic_wq.h
 create mode 100644 drivers/net/enic/wq_enet_desc.h
 create mode 100644 drivers/net/jme.c
 create mode 100644 drivers/net/jme.h
 create mode 100644 drivers/net/qlge/Makefile
 create mode 100644 drivers/net/qlge/qlge.h
 create mode 100644 drivers/net/qlge/qlge_dbg.c
 create mode 100644 drivers/net/qlge/qlge_ethtool.c
 create mode 100644 drivers/net/qlge/qlge_main.c
 create mode 100644 drivers/net/qlge/qlge_mpi.c

Chris Snook (1):
      atl2: add atl2 driver

Guo-Fu Tseng (1):
      jme: JMicron Gigabit Ethernet Driver

Ron Mercer (1):
      qlge: New Qlogic 10Gb Ethernet Driver.

Scott Feldman (1):
      enic: add Cisco 10G Ethernet NIC driver

[patch snipped, for mailing list; see git for patch]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* other netdev updates (was Re: [git patches] new network drivers for net-next)
  2008-09-18 16:00 [git patches] new network drivers for net-next Jeff Garzik
@ 2008-09-18 16:05 ` Jeff Garzik
  2008-09-18 23:42 ` [git patches] new network drivers for net-next David Miller
  2008-09-19 22:53 ` David Miller
  2 siblings, 0 replies; 7+ messages in thread
From: Jeff Garzik @ 2008-09-18 16:05 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, LKML

On Thu, Sep 18, 2008 at 12:00:05PM -0400, Jeff Garzik wrote:
> 
> Please pull from 'new-drivers' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git new-drivers

Also, there is still a net-next batch outstanding to be pulled, which is
totally unrelated to the recently-rejected fixes push:

http://marc.info/?l=linux-netdev&m=122135907115163&w=2

I will have the updated 2.6.27-rc fixes push to you today.

	Jeff




^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [git patches] new network drivers for net-next
  2008-09-18 16:00 [git patches] new network drivers for net-next Jeff Garzik
  2008-09-18 16:05 ` other netdev updates (was Re: [git patches] new network drivers for net-next) Jeff Garzik
@ 2008-09-18 23:42 ` David Miller
  2008-09-18 23:44   ` Jeff Garzik
  2008-09-19 22:53 ` David Miller
  2 siblings, 1 reply; 7+ messages in thread
From: David Miller @ 2008-09-18 23:42 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel

From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 18 Sep 2008 12:00:05 -0400

> Please pull from 'new-drivers' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git new-drivers
> 
> to receive the following updates:

So, new-drivers destined for net-2.6 right?

Just making sure :-)

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [git patches] new network drivers for net-next
  2008-09-18 23:42 ` [git patches] new network drivers for net-next David Miller
@ 2008-09-18 23:44   ` Jeff Garzik
  2008-09-18 23:48     ` David Miller
  0 siblings, 1 reply; 7+ messages in thread
From: Jeff Garzik @ 2008-09-18 23:44 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-kernel

David Miller wrote:
> From: Jeff Garzik <jeff@garzik.org>
> Date: Thu, 18 Sep 2008 12:00:05 -0400
> 
>> Please pull from 'new-drivers' branch of
>> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git new-drivers
>>
>> to receive the following updates:
> 
> So, new-drivers destined for net-2.6 right?
> 
> Just making sure :-)

I based it on top of net-next for 2.6.28, but can easily retarget it for 
net-2.6...

	Jeff




^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [git patches] new network drivers for net-next
  2008-09-18 23:44   ` Jeff Garzik
@ 2008-09-18 23:48     ` David Miller
  0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2008-09-18 23:48 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel

From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 18 Sep 2008 19:44:09 -0400

> David Miller wrote:
> > So, new-drivers destined for net-2.6 right?
> > Just making sure :-)
> 
> I based it on top of net-next for 2.6.28, but can easily retarget it for net-2.6...

Since I really want to concentrate on killing as many regression list
network driver entries as possible, I'd much rather:

1) You concentrate on building that net-2.6 bug fix tree for me

2) I pull these new drivers into net-next-2.6 for now and we can
   think about putting these into net-2.6 for a subsequent push
   to Linus, rather than the current one.

Sound good to you?

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [git patches] new network drivers for net-next
  2008-09-18 16:00 [git patches] new network drivers for net-next Jeff Garzik
  2008-09-18 16:05 ` other netdev updates (was Re: [git patches] new network drivers for net-next) Jeff Garzik
  2008-09-18 23:42 ` [git patches] new network drivers for net-next David Miller
@ 2008-09-19 22:53 ` David Miller
  2008-09-20  2:28   ` Herton Ronaldo Krzesinski
  2 siblings, 1 reply; 7+ messages in thread
From: David Miller @ 2008-09-19 22:53 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel

From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 18 Sep 2008 12:00:05 -0400

> 
> Please pull from 'new-drivers' branch of
> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git new-drivers
> 
> to receive the following updates:

Pulled, thanks Jeff.

I'll push this to net-next-2.6 after a quick build sanity test.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [git patches] new network drivers for net-next
  2008-09-19 22:53 ` David Miller
@ 2008-09-20  2:28   ` Herton Ronaldo Krzesinski
  0 siblings, 0 replies; 7+ messages in thread
From: Herton Ronaldo Krzesinski @ 2008-09-20  2:28 UTC (permalink / raw)
  To: David Miller; +Cc: jeff, netdev, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]

On Friday 19 September 2008 19:53:42 David Miller wrote:
> From: Jeff Garzik <jeff@garzik.org>
> Date: Thu, 18 Sep 2008 12:00:05 -0400
> 
> > 
> > Please pull from 'new-drivers' branch of
> > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git new-drivers
> > 
> > to receive the following updates:
> 
> Pulled, thanks Jeff.
> 
> I'll push this to net-next-2.6 after a quick build sanity test.

Hi,

with new enic driver I get the following build error on i386 (config attached):
  CC [M]  drivers/net/enic/vnic_cq.o
drivers/net/enic/vnic_cq.c: In function 'vnic_cq_init':
drivers/net/enic/vnic_cq.c:65: error: implicit declaration of function 'writeq'
make[2]: *** [drivers/net/enic/vnic_cq.o] Error 1
make[1]: *** [drivers/net/enic] Error 2
make: *** [_module_drivers/net] Error 2

Something like patch below (borrowed from net/s2io.h, ok to use it?) fixes it:

--- linux-2.6.27/drivers/net/enic/vnic_dev.h.orig	2008-09-19 13:57:43.000000000 -0300
+++ linux-2.6.27/drivers/net/enic/vnic_dev.h	2008-09-19 14:00:57.000000000 -0300
@@ -23,6 +23,26 @@
 #include "vnic_resource.h"
 #include "vnic_devcmd.h"
 
+#include <linux/io.h>
+#ifndef readq
+static inline u64 readq(void __iomem *addr)
+{
+	u64 ret = 0;
+	ret = readl(addr + 4);
+	ret <<= 32;
+	ret |= readl(addr);
+
+	return ret;
+}
+#endif
+#ifndef writeq
+static inline void writeq(u64 val, void __iomem *addr)
+{
+	writel((u32) (val), addr);
+	writel((u32) (val >> 32), (addr + 4));
+}
+#endif
+
 #ifndef VNIC_PADDR_TARGET
 #define VNIC_PADDR_TARGET	0x0000000000000000ULL
 #endif


-- 
[]'s
Herton

[-- Attachment #2: config-enic.gz --]
[-- Type: application/x-gzip, Size: 24450 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-09-20  2:28 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-18 16:00 [git patches] new network drivers for net-next Jeff Garzik
2008-09-18 16:05 ` other netdev updates (was Re: [git patches] new network drivers for net-next) Jeff Garzik
2008-09-18 23:42 ` [git patches] new network drivers for net-next David Miller
2008-09-18 23:44   ` Jeff Garzik
2008-09-18 23:48     ` David Miller
2008-09-19 22:53 ` David Miller
2008-09-20  2:28   ` Herton Ronaldo Krzesinski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).