LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: linas@austin.ibm.com (Linas Vepstas)
To: Jeff Garzik <jeff@garzik.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
kou.ishizaki@toshiba.co.jp, arnd@arndb.de,
Jens Osterkamp <jens@de.ibm.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/12] spidernet: spidernet: add support for Celleb
Date: Tue, 20 Feb 2007 16:36:14 -0600 [thread overview]
Message-ID: <20070220223614.GE28895@austin.ibm.com> (raw)
In-Reply-To: <20070220221314.GU923@austin.ibm.com>
From: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
This patch adds or changes some HW specific settings for spider_net on
Celleb.
Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
----
drivers/net/Kconfig | 2 +-
drivers/net/spider_net.c | 8 +++++++-
drivers/net/spider_net.h | 6 ++++--
3 files changed, 12 insertions(+), 4 deletions(-)
Index: linux-2.6.20-git16/drivers/net/Kconfig
===================================================================
--- linux-2.6.20-git16.orig/drivers/net/Kconfig 2007-02-20 14:23:59.000000000 -0600
+++ linux-2.6.20-git16/drivers/net/Kconfig 2007-02-20 15:02:38.000000000 -0600
@@ -2245,7 +2245,7 @@ config BNX2
config SPIDER_NET
tristate "Spider Gigabit Ethernet driver"
- depends on PCI && PPC_IBM_CELL_BLADE
+ depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
select FW_LOADER
help
This driver supports the Gigabit Ethernet chips present on the
Index: linux-2.6.20-git16/drivers/net/spider_net.h
===================================================================
--- linux-2.6.20-git16.orig/drivers/net/spider_net.h 2007-02-20 15:02:32.000000000 -0600
+++ linux-2.6.20-git16/drivers/net/spider_net.h 2007-02-20 15:02:38.000000000 -0600
@@ -1,7 +1,8 @@
/*
- * Network device driver for Cell Processor-Based Blade
+ * Network device driver for Cell Processor-Based Blade and Celleb platform
*
* (C) Copyright IBM Corp. 2005
+ * (C) Copyright 2006 TOSHIBA CORPORATION
*
* Authors : Utz Bacher <utz.bacher@de.ibm.com>
* Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
@@ -184,7 +185,8 @@ extern char spider_net_driver_name[];
/* pause frames: automatic, no upper retransmission count */
/* outside loopback mode: ETOMOD signal dont matter, not connected */
-#define SPIDER_NET_OPMODE_VALUE 0x00000063
+/* ETOMOD signal is brought to PHY reset. bit 2 must be 1 in Celleb */
+#define SPIDER_NET_OPMODE_VALUE 0x00000067
/*#define SPIDER_NET_OPMODE_VALUE 0x001b0062*/
#define SPIDER_NET_LENLMT_VALUE 0x00000908
Index: linux-2.6.20-git16/drivers/net/spider_net.c
===================================================================
--- linux-2.6.20-git16.orig/drivers/net/spider_net.c 2007-02-20 15:02:36.000000000 -0600
+++ linux-2.6.20-git16/drivers/net/spider_net.c 2007-02-20 15:02:38.000000000 -0600
@@ -1,7 +1,8 @@
/*
- * Network device driver for Cell Processor-Based Blade
+ * Network device driver for Cell Processor-Based Blade and Celleb platform
*
* (C) Copyright IBM Corp. 2005
+ * (C) Copyright 2006 TOSHIBA CORPORATION
*
* Authors : Utz Bacher <utz.bacher@de.ibm.com>
* Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
@@ -1605,6 +1606,11 @@ spider_net_init_card(struct spider_net_c
spider_net_write_reg(card, SPIDER_NET_CKRCTRL,
SPIDER_NET_CKRCTRL_RUN_VALUE);
+
+ /* trigger ETOMOD signal */
+ spider_net_write_reg(card, SPIDER_NET_GMACOPEMD,
+ spider_net_read_reg(card, SPIDER_NET_GMACOPEMD) | 0x4);
+
}
/**
next prev parent reply other threads:[~2007-02-20 22:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-20 22:13 [PATCH 0/12]: spidernet updates Linas Vepstas
2007-02-20 22:30 ` [PATCH 1/12]: sungem_phy: support bcm5461 phy, autoneg Linas Vepstas
2007-02-27 9:16 ` Jeff Garzik
2007-02-20 22:32 ` [PATCH 2/12] spidernet: compile break Linas Vepstas
2007-02-20 22:33 ` [PATCH 3/12] spidernet: autoneg support for Celleb Linas Vepstas
2007-02-20 22:34 ` [PATCH 4/12] spidernet: load firmware when open Linas Vepstas
2007-02-20 22:36 ` Linas Vepstas [this message]
2007-02-20 22:37 ` [PATCH 6/12] spidernet: remove txram full logging Linas Vepstas
2007-02-20 22:39 ` [PATCH 7/12] spidernet: move medium variable into card struct Linas Vepstas
2007-02-20 22:40 ` [PATCH 8/12] spidernet: separate hardware state from driver state Linas Vepstas
2007-02-20 22:41 ` [PATCH 9/12]: spidernet: fix racy double-free of skb Linas Vepstas
2007-02-20 22:41 ` [PATCH 10/12]: spidernet: transmit race Linas Vepstas
2007-02-20 22:42 ` [PATCH 11/12] spidernet: janitorial, typos Linas Vepstas
2007-02-20 22:45 ` [PATCH 12/12] spidernet: maintainership Linas Vepstas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070220223614.GE28895@austin.ibm.com \
--to=linas@austin.ibm.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=jeff@garzik.org \
--cc=jens@de.ibm.com \
--cc=kou.ishizaki@toshiba.co.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--subject='Re: [PATCH 5/12] spidernet: spidernet: add support for Celleb' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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).