From owner-p4-projects@FreeBSD.ORG  Thu Jan 24 10:55:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9ECD116A46E; Thu, 24 Jan 2008 10:55:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64A1816A46C
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 10:55:45 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 58B0713C4E9
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 10:55:45 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0OAtjh2026665
	for <perforce@freebsd.org>; Thu, 24 Jan 2008 10:55:45 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0OAtj9f026662
	for perforce@freebsd.org; Thu, 24 Jan 2008 10:55:45 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 24 Jan 2008 10:55:45 GMT
Message-Id: <200801241055.m0OAtj9f026662@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133996 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Jan 2008 10:55:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=133996

Change 133996 by raj@raj_mimi on 2008/01/24 10:55:33

	TSEC: Handle erroneous RX frames properly. This fix allows to properly
	recycle BDs when a malformed frame arrives (overrun, long, short, CRC
	errors etc.); prior to this an endless condition occured leading to a
	TSEC hang (could be mostly observed on 1Gbps links with not CAT6
	cables, or otherwise flaky connections). Also update (c).

Affected files ...

.. //depot/projects/e500/sys/dev/tsec/if_tsec.c#5 edit

Differences ...

==== //depot/projects/e500/sys/dev/tsec/if_tsec.c#5 (text+ko) ====

@@ -1,7 +1,9 @@
 /*-
- * Copyright (C) 2006, 2007 Semihalf, Piotr Kruszynski <ppk@semihalf.com>
+ * Copyright (C) 2006-2008 Semihalf
  * All rights reserved.
  *
+ * Written by: Piotr Kruszynski <ppk@semihalf.com>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -1363,8 +1365,10 @@
 		if (flags & (TSEC_RXBD_LG | TSEC_RXBD_SH
 				| TSEC_RXBD_NO | TSEC_RXBD_CR
 				| TSEC_RXBD_OV | TSEC_RXBD_TR)) {
-			device_printf(dev, "Unexpected flags in RX frame: "
-					"0x%x\n", flags);
+
+			rx_desc->length = 0;
+			rx_desc->flags = (rx_desc->flags & ~TSEC_RXBD_ZEROONINIT) |
+					  TSEC_RXBD_E | TSEC_RXBD_I;
 			continue;
 		}