rpms/kernel/devel linux-2.6-fec_mpc52xx-fix.patch, NONE, 1.1 kernel.spec, 1.250, 1.251

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31826

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fec_mpc52xx-fix.patch 
Log Message:
fix fec_mpc52xx

linux-2.6-fec_mpc52xx-fix.patch:

--- NEW FILE linux-2.6-fec_mpc52xx-fix.patch ---
>From linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org Fri Nov  9 05:31:56 2007
Return-path: <linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Fri, 09 Nov 2007 05:31:56 +0000
Received: from [2001:4bd0:203e::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.68 #1 (Red Hat Linux)) id
	1IqMTE-0007JP-5X for dwmw2 at baythorne.infradead.org; Fri, 09 Nov 2007
	05:31:56 +0000
Received: from ozlabs.org ([203.10.76.45]) by pentafluge.infradead.org with
	esmtps (Exim 4.63 #1 (Red Hat Linux)) id 1IqMTA-0001yo-4d for
	dwmw2 at infradead.org; Fri, 09 Nov 2007 05:31:55 +0000
Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix)
	with ESMTP id 842DEDDF23 for <dwmw2 at infradead.org>; Fri,  9 Nov 2007
	16:31:45 +1100 (EST)
X-Original-To: Linuxppc-dev at ozlabs.org
Delivered-To: Linuxppc-dev at ozlabs.org
Received: from wa-out-1112.google.com (wa-out-1112.google.com
	[209.85.146.180]) by ozlabs.org (Postfix) with ESMTP id 5DCF2DDE1E for
	<Linuxppc-dev at ozlabs.org>; Fri,  9 Nov 2007 16:31:36 +1100 (EST)
Received: by wa-out-1112.google.com with SMTP id m28so532192wag for
	<Linuxppc-dev at ozlabs.org>; Thu, 08 Nov 2007 21:31:35 -0800 (PST)
Received: by 10.114.13.1 with SMTP id 1mr320092wam.1194586295369; Thu, 08
	Nov 2007 21:31:35 -0800 (PST)
Received: by 10.115.54.19 with HTTP; Thu, 8 Nov 2007 21:31:35 -0800 (PST)
Message-ID: <9e4733910711082131v70c4b7bm2b00445b7e62c33f at mail.gmail.com>
Date: Fri, 9 Nov 2007 00:31:35 -0500
From: "Jon Smirl" <jonsmirl at gmail.com>
To: "PowerPC dev list" <Linuxppc-dev at ozlabs.org>,  "Domen Puncer" <domen.puncer at telargo.com>,  "Grant Likely" <grant.likely at secretlab.ca>,  netdev <netdev at vger.kernel.org>
Subject: [PATCH] Fix buglets in mpc5200 FEC code that are corrupting memory.
MIME-Version: 1.0
Content-Disposition: inline
X-BeenThere: linuxppc-dev at ozlabs.org
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev at ozlabs.org>
List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Sender: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
Errors-To: linuxppc-dev-bounces+dwmw2=infradead.org at ozlabs.org
X-Spam-Score: 0.0 (/)
X-Evolution-Source: imap://dwmw2@pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

This is the reason I couldn't get user space started or connect to my
nfs server. Patch is against current linus git.

mpc5200 fec driver is corrupting memory. This patch fixes two bugs
where the wrong skb buffer was being referenced.

Signed-off-by: Jon Smirl <jonsmirl at gmail.com>

---

 drivers/net/fec_mpc52xx.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index a8a0ee2..ddfcc0b 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -422,7 +422,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)

 		rskb = bcom_retrieve_buffer(priv->rx_dmatsk, &status,
 				(struct bcom_bd **)&bd);
-		dma_unmap_single(&dev->dev, bd->skb_pa, skb->len, DMA_FROM_DEVICE);
+		dma_unmap_single(&dev->dev, bd->skb_pa, rskb->len, DMA_FROM_DEVICE);

 		/* Test for errors in received frame */
 		if (status & BCOM_FEC_RX_BD_ERRORS) {
@@ -467,7 +467,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id)
 			bcom_prepare_next_buffer(priv->rx_dmatsk);

 		bd->status = FEC_RX_BUFFER_SIZE;
-		bd->skb_pa = dma_map_single(&dev->dev, rskb->data,
+		bd->skb_pa = dma_map_single(&dev->dev, skb->data,
 				FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);

 		bcom_submit_next_buffer(priv->rx_dmatsk, skb);


-- 
Jon Smirl
jonsmirl at gmail.com
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev at ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- kernel.spec	21 Nov 2007 20:06:41 -0000	1.250
+++ kernel.spec	24 Nov 2007 10:24:23 -0000	1.251
@@ -628,6 +628,7 @@
 Patch1515: linux-2.6-lirc.patch
 Patch1520: linux-2.6-dcdbas-autoload.patch
 Patch1530: linux-2.6-fix-kd.h.patch
+Patch1540: linux-2.6-fec_mpc52xx-fix.patch
 
 #nouveau + drm fixes
 Patch1801: nouveau-drm.patch
@@ -1136,6 +1137,9 @@
 # Fix <linux/kd.h> to work with glibc's <sys/kd.h>
 ApplyPatch linux-2.6-fix-kd.h.patch
 
+# Fix fec_mpc52xx not to corrupt memory
+ApplyPatch linux-2.6-fec_mpc52xx-fix.patch
+
 ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
 
 # ---------- below all scheduled for 2.6.24 -----------------
@@ -1695,6 +1699,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Sat Nov 24 2007 David Woodhouse <dwmw2 at redhat.com>
+- Fix fec_mpc52xx Ethernet driver to use the right skbs
+
 * Wed Nov 21 2007 John W. Linville <linville at redhat.com>
 - Resync wireless bits from upstream