[Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[Fabrice Bellard]

CVSROOT:	/sources/qemu
Module name:	qemu
Changes by:	Fabrice Bellard <bellard>	06/07/04 11:33:00

Modified files:
	.              : vl.h Makefile.target 
	hw             : pci.c 
Added files:
	hw             : pcnet.c 

Log message:
	pcnet nic support (Antony T Curtis)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemu/vl.h?cvsroot=qemu&r1=1.133&r2=1.134
http://cvs.savannah.gnu.org/viewcvs/qemu/Makefile.target?cvsroot=qemu&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pci.c?cvsroot=qemu&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/qemu/hw/pcnet.c?cvsroot=qemu&rev=1.1

Re: [Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[Fabrice Bellard]

Note: I commited the pcnet patch as some people might be interested by 
it. I was unable to use it with a Knoppix distribution of 2003 so fixes 
are needed.

Fabrice.

Re: [Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[M. Warner Losh]

In message: <44AA530D.10502@bellard.org>
            Fabrice Bellard <fabrice@bellard.org> writes:
: Note: I commited the pcnet patch as some people might be interested by 
: it. I was unable to use it with a Knoppix distribution of 2003 so fixes 
: are needed.

Fabrice,

how is pcnet different than ne2000?  I'd always seen the two used to
mean the same thing...

Warner

Re: [Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[Christian MICHON]

this pcnet patch set breaks mingw/win32 build.
I had to remove it from my latest cvs grab.

On 7/4/06, Fabrice Bellard <fabrice@bellard.org> wrote:
> Note: I commited the pcnet patch as some people might be interested by
> it. I was unable to use it with a Knoppix distribution of 2003 so fixes
> are needed.
>
> Fabrice.
>
>
> _______________________________________________
> Qemu-devel mailing list
> Qemu-devel@nongnu.org
> http://lists.nongnu.org/mailman/listinfo/qemu-devel
>


-- 
Christian

Re: [Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[Paul Jakma]

On Tue, 4 Jul 2006, Fabrice Bellard wrote:

> Note: I commited the pcnet patch as some people might be interested by it. I 
> was unable to use it with a Knoppix distribution of 2003 so fixes are needed.

Hmm, define 'unable to use it'? It seems (on very quick testing) to 
work in Solaris.

regards,
-- 
Paul Jakma	paul@clubi.ie	paul@jakma.org	Key ID: 64A2FF6A
Fortune:
My problem lies in reconciling my gross habits with my net income.
 		-- Errol Flynn

Any man who has $10,000 left when he dies is a failure.
 		-- Errol Flynn

Re: [Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[Paul Jakma]

On Sat, 8 Jul 2006, Paul Jakma wrote:

> Hmm, define 'unable to use it'? It seems (on very quick testing) to work in 
> Solaris.

Spoke too soon, ICMP echos and TCP connects work, but it seems to 
have problems transferring anything substantial.

regards,
-- 
Paul Jakma	paul@clubi.ie	paul@jakma.org	Key ID: 64A2FF6A
Fortune:
This is the ____\b\b\b\bLAST time I take travel suggestions from Ray Bradbury!

Re: [Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[Igor Kovalenko]

[-- Attachment #1.1: Type: text/plain, Size: 358 bytes --]

On 7/8/06, Paul Jakma <paul@jakma.org> wrote:
>
> On Sat, 8 Jul 2006, Paul Jakma wrote:
>
> > Hmm, define 'unable to use it'? It seems (on very quick testing) to work
> in
> > Solaris.
>
> Spoke too soon, ICMP echos and TCP connects work, but it seems to
> have problems transferring anything substantial.
>
>
Try this patch - transfers should start to work

[-- Attachment #1.2: Type: text/html, Size: 642 bytes --]

[-- Attachment #2: pcnet-no-recursive-tx.diff --]
[-- Type: text/x-patch, Size: 1182 bytes --]

Index: hw/pcnet.c
===================================================================
RCS file: /cvsroot/qemu/qemu/hw/pcnet.c,v
retrieving revision 1.2
diff -u -r1.2 pcnet.c
--- hw/pcnet.c	4 Jul 2006 21:42:10 -0000	1.2
+++ hw/pcnet.c	8 Jul 2006 14:44:28 -0000
@@ -57,6 +57,7 @@
     uint64_t timer;
     int xmit_pos, recv_pos;
     uint8_t buffer[4096];
+    int tx_busy;
 };
 
 #ifdef __GNUC__
@@ -659,6 +660,8 @@
     s->csr[114] = 0x0000;
     s->csr[122] = 0x0000;
     s->csr[124] = 0x0000;
+
+    s->tx_busy = 0;
 }
 
 static void pcnet_update_irq(PCNetState *s)
@@ -1104,7 +1107,9 @@
         s->csr[0] &= ~0x0008;
         return;
     }
-    
+
+    s->tx_busy = 1;
+
     txagain:
     if (pcnet_tdte_poll(s)) {
         struct pcnet_TMD tmd;
@@ -1167,6 +1172,8 @@
         if (count--)
           goto txagain;
     }
+
+    s->tx_busy = 0;
 }
 
 static void pcnet_poll(PCNetState *s)
@@ -1177,7 +1184,13 @@
 
     if (CSR_TDMD(s) || 
         (CSR_TXON(s) && !CSR_DPOLL(s) && pcnet_tdte_poll(s)))
+    {
+        /* prevent recursion */
+        if (s->tx_busy)
+            return;
+
         pcnet_transmit(s);
+    }
 }
 
 static void pcnet_poll_timer(void *opaque)

Re: [Qemu-devel] qemu vl.h Makefile.target hw/pci.c hw/pcnet.c

[Paul Jakma]

On Sat, 8 Jul 2006, Igor Kovalenko wrote:

> Try this patch - transfers should start to work

Hmm, no obvious improvement I'm afraid.

regards,
-- 
Paul Jakma	paul@clubi.ie	paul@jakma.org	Key ID: 64A2FF6A
Fortune:
I CAN'T SEE DEAD PEOPLE
I CAN'T SEE DEAD PEOPLE
I CAN'T SEE DEAD PEOPLE
I CAN'T SEE DEAD PEOPLE

  	Bart Simpson on chalkboard in episode BABF05