* [PATCH 3/6] e100: Fix iomap mem accesses
From: Auke Kok @ 2008-02-01 16:21 UTC (permalink / raw)
To: jeff; +Cc: netdev
In-Reply-To: <20080201162118.29347.13268.stgit@localhost.localdomain>
From: Jiri Slaby <jirislaby@gmail.com>
writeX functions are not permitted on iomap-ped space change to iowriteX,
also pci_unmap pci_map-ped space on exit (instead of iounmap).
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/e100.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 51cf577..9d42dd8 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1958,7 +1958,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
if(restart_required) {
// ack the rnr?
- writeb(stat_ack_rnr, &nic->csr->scb.stat_ack);
+ iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack);
e100_start_receiver(nic, nic->rx_to_clean);
if(work_done)
(*work_done)++;
@@ -2774,7 +2774,7 @@ static void __devexit e100_remove(struct pci_dev *pdev)
struct nic *nic = netdev_priv(netdev);
unregister_netdev(netdev);
e100_free(nic);
- iounmap(nic->csr);
+ pci_iounmap(pdev, nic->csr);
free_netdev(netdev);
pci_release_regions(pdev);
pci_disable_device(pdev);
^ permalink raw reply related
* [PATCH 5/6] e1000e: tweak irq allocation messages
From: Auke Kok @ 2008-02-01 16:21 UTC (permalink / raw)
To: jeff; +Cc: netdev
In-Reply-To: <20080201162118.29347.13268.stgit@localhost.localdomain>
From: Andy Gospodarek <andy@greyhouse.net>
There's too much noise on systems that don't support MSI. Let's get rid
of a few and make the real error message more specific.
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/e1000e/netdev.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 0a2cb79..f58f017 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -945,11 +945,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
int irq_flags = IRQF_SHARED;
int err;
- err = pci_enable_msi(adapter->pdev);
- if (err) {
- ndev_warn(netdev,
- "Unable to allocate MSI interrupt Error: %d\n", err);
- } else {
+ if (!pci_enable_msi(adapter->pdev)) {
adapter->flags |= FLAG_MSI_ENABLED;
handler = e1000_intr_msi;
irq_flags = 0;
@@ -958,10 +954,12 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
netdev);
if (err) {
+ ndev_err(netdev,
+ "Unable to allocate %s interrupt (return: %d)\n",
+ adapter->flags & FLAG_MSI_ENABLED ? "MSI":"INTx",
+ err);
if (adapter->flags & FLAG_MSI_ENABLED)
pci_disable_msi(adapter->pdev);
- ndev_err(netdev,
- "Unable to allocate interrupt Error: %d\n", err);
}
return err;
^ permalink raw reply related
* [PATCH 6/6] igb: remove unneeded declaration shadowing earlier one
From: Auke Kok @ 2008-02-01 16:21 UTC (permalink / raw)
To: jeff; +Cc: netdev
In-Reply-To: <20080201162118.29347.13268.stgit@localhost.localdomain>
This removes a sparse warning.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/igb/igb_main.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index f3c144d..d4eb8e2 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -438,7 +438,6 @@ static int igb_request_irq(struct igb_adapter *adapter)
if (adapter->msix_entries) {
err = igb_request_msix(adapter);
if (!err) {
- struct e1000_hw *hw = &adapter->hw;
/* enable IAM, auto-mask,
* DO NOT USE EIAME or IAME in legacy mode */
wr32(E1000_IAM, IMS_ENABLE_MASK);
^ permalink raw reply related
* [PATCH 1/6] e1000e: make a function static
From: Auke Kok @ 2008-02-01 16:21 UTC (permalink / raw)
To: jeff; +Cc: netdev
From: Adrian Bunk <bunk@kernel.org>
This patch makes the needlessly global reg_pattern_test_array() static.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/e1000e/ethtool.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 6d9c27f..a2034cf 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -690,8 +690,8 @@ err_setup:
return err;
}
-bool reg_pattern_test_array(struct e1000_adapter *adapter, u64 *data,
- int reg, int offset, u32 mask, u32 write)
+static bool reg_pattern_test_array(struct e1000_adapter *adapter, u64 *data,
+ int reg, int offset, u32 mask, u32 write)
{
int i;
u32 read;
^ permalink raw reply related
* [PATCH 4/6] e100: fix spelling errors
From: Auke Kok @ 2008-02-01 16:21 UTC (permalink / raw)
To: jeff; +Cc: netdev
In-Reply-To: <20080201162118.29347.13268.stgit@localhost.localdomain>
From: Andreas Mohr <andi@lisas.de>
Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/e100.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 9d42dd8..36ba6dc 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -94,7 +94,7 @@
* enabled. 82557 pads with 7Eh, while the later controllers pad
* with 00h.
*
- * IV. Recieve
+ * IV. Receive
*
* The Receive Frame Area (RFA) comprises a ring of Receive Frame
* Descriptors (RFD) + data buffer, thus forming the simplified mode
@@ -120,7 +120,7 @@
* and Rx indication and re-allocation happen in the same context,
* therefore no locking is required. A software-generated interrupt
* is generated from the watchdog to recover from a failed allocation
- * senario where all Rx resources have been indicated and none re-
+ * scenario where all Rx resources have been indicated and none re-
* placed.
*
* V. Miscellaneous
@@ -954,7 +954,7 @@ static void e100_get_defaults(struct nic *nic)
/* Quadwords to DMA into FIFO before starting frame transmit */
nic->tx_threshold = 0xE0;
- /* no interrupt for every tx completion, delay = 256us if not 557*/
+ /* no interrupt for every tx completion, delay = 256us if not 557 */
nic->tx_command = cpu_to_le16(cb_tx | cb_tx_sf |
((nic->mac >= mac_82558_D101_A4) ? cb_cid : cb_i));
@@ -1497,7 +1497,7 @@ static void e100_update_stats(struct nic *nic)
&s->complete;
/* Device's stats reporting may take several microseconds to
- * complete, so where always waiting for results of the
+ * complete, so we're always waiting for results of the
* previous command. */
if(*complete == cpu_to_le32(cuc_dump_reset_complete)) {
@@ -2858,17 +2858,17 @@ static void e100_shutdown(struct pci_dev *pdev)
/**
* e100_io_error_detected - called when PCI error is detected.
* @pdev: Pointer to PCI device
- * @state: The current pci conneection state
+ * @state: The current pci connection state
*/
static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct nic *nic = netdev_priv(netdev);
- /* Similar to calling e100_down(), but avoids adpater I/O. */
+ /* Similar to calling e100_down(), but avoids adapter I/O. */
netdev->stop(netdev);
- /* Detach; put netif into state similar to hotplug unplug. */
+ /* Detach; put netif into a state similar to hotplug unplug. */
napi_enable(&nic->napi);
netif_device_detach(netdev);
pci_disable_device(pdev);
^ permalink raw reply related
* Re: [PATCH] drivers/base: export (un)register_memory_notifier
From: Badari Pulavarty @ 2008-02-01 17:18 UTC (permalink / raw)
To: Jan-Bernd Themann
Cc: linux-kernel, Jan-Bernd Themann, Thomas Klein, Christoph Raisch,
Marcus Eder, netdev, Stefan Roscher
In-Reply-To: <200802011716.32511.ossthema@de.ibm.com>
On Fri, 2008-02-01 at 17:16 +0100, Jan-Bernd Themann wrote:
> Drivers like eHEA need memory notifiers in order to
> update their internal DMA memory map when memory is added
> to or removed from the system.
>
> Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
>
> ---
> Comment: eHEA patches that exploit these functions will follow
>
>
> drivers/base/memory.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/base/memory.c b/drivers/base/memory.c
> index 7ae413f..1e1bd4c 100644
> --- a/drivers/base/memory.c
> +++ b/drivers/base/memory.c
> @@ -52,11 +52,13 @@ int register_memory_notifier(struct notifier_block *nb)
> {
> return blocking_notifier_chain_register(&memory_chain, nb);
> }
> +EXPORT_SYMBOL(register_memory_notifier);
>
> void unregister_memory_notifier(struct notifier_block *nb)
> {
> blocking_notifier_chain_unregister(&memory_chain, nb);
> }
> +EXPORT_SYMBOL(unregister_memory_notifier);
>
> /*
> * register_memory - Setup a sysfs device for a memory block
Is there a reason for not making them EXPORT_SYMBOL_GPL() ?
Otherwise, looks good to me.
I have been planning to send this as part of my next update
with ppc64 arch-specific remove support and generic __remove_pages()
support. If this is blocking your work, lets get this in.
Acked-by: Badari Pulavarty <pbadari@us.ibm.com>
Thanks,
Badari
^ permalink raw reply
* Re: [PATCH] Disable TSO for non standard qdiscs
From: Stephen Hemminger @ 2008-02-01 17:24 UTC (permalink / raw)
To: Andi Kleen
Cc: Waskiewicz Jr, Peter P, Patrick McHardy, Andi Kleen, Glen Turner,
netdev
In-Reply-To: <20080201143421.GB16630@one.firstfloor.org>
On Fri, 1 Feb 2008 15:34:21 +0100
Andi Kleen <andi@firstfloor.org> wrote:
> > The TSO defer logic is based on your congestion window and current
> > window size. So the actual frame sizes hitting your NIC attached to
> > your DSL probably aren't anywhere near 64KB, but probably more in line
> > with whatever your window size is for DSL.
>
> DSL windows can be quite large because a lot of DSL lines have a quite
> long latency due to error correction. And with ADSL2 we have upto 16Mbit
> now.
>
> > I think we're having more of a disagreement of what is considered the
> > "normal case" user. If you are on a slow link, such as a DSL/cable
> > line, your TCP window/congestion window aren't going to be big enough to
> > generate large TSO's, so what is the issue? But disabling TSO, say on a
>
> 64k TSOs are likely even with DSL. Anyways even with smaller TSOs the
> change still makes sense because each increase makes packet scheduling
> less smooth.
>
> -Andi
I wish there was a per-device setting for the max-size of TSO burst.
--
Stephen Hemminger <stephen.hemminger@vyatta.com>
^ permalink raw reply
* [PATCH] [POWERPC][NET][SERIAL] UCCs: replace device-id with cell-index (was: Re: [PATCH] [POWERPC] get rid of `model = "UCC"' in the ucc nodes)
From: Anton Vorontsov @ 2008-02-01 17:33 UTC (permalink / raw)
To: Kumar Gala
Cc: Jeff Garzik, Timur Tabi, Grant Likely, Li Yang, linuxppc-dev,
linux-serial, netdev
In-Reply-To: <72B60725-FB4A-42FA-832D-8FD5434B9042@kernel.crashing.org>
On Fri, Feb 01, 2008 at 09:32:38AM -0600, Kumar Gala wrote:
> On Feb 1, 2008, at 9:01 AM, Anton Vorontsov wrote:
>
> >It isn't used anywhere, so remove it. If we'll ever need something
> >like this, we'll use compatible property instead.
> >
> >Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> >---
> >
> >Rebased on top of recent tree.
> >
> >Documentation/powerpc/booting-without-of.txt | 1 -
> >arch/powerpc/boot/dts/mpc832x_mds.dts | 3 ---
> >arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 --
> >arch/powerpc/boot/dts/mpc836x_mds.dts | 2 --
> >arch/powerpc/boot/dts/mpc8568mds.dts | 2 --
> >5 files changed, 0 insertions(+), 10 deletions(-)
> >
> >diff --git a/Documentation/powerpc/booting-without-of.txt b/
> >Documentation/powerpc/booting-without-of.txt
> >index 410c847..dcf9758 100644
> >--- a/Documentation/powerpc/booting-without-of.txt
> >+++ b/Documentation/powerpc/booting-without-of.txt
> >@@ -1675,7 +1675,6 @@ platforms are moved over to use the flattened-
> >device-tree model.
> > ucc@2000 {
> > device_type = "network";
> > compatible = "ucc_geth";
> >- model = "UCC";
> > device-id = <1>;
>
> can we change device-id to cell-index?
Sure. But let's do this in the separate patch? Because this change
actually touches the code in the two subsystems: net and serial.
I hope everybody will agree to pass it through powerpc tree..?
- - - -
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Subject: [POWERPC][NET][SERIAL] UCCs: replace device-id with cell-index
device-id is worse than cell-index. Probably cell-index isn't
good either, but device-id is worse anyway.
Drivers are modified for backward compatibility's sake.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
Documentation/powerpc/booting-without-of.txt | 4 ++--
arch/powerpc/boot/dts/mpc832x_mds.dts | 4 +---
arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 --
arch/powerpc/boot/dts/mpc836x_mds.dts | 2 --
arch/powerpc/boot/dts/mpc836x_rdk.dts | 12 ++++++------
arch/powerpc/boot/dts/mpc8568mds.dts | 2 --
drivers/net/ucc_geth.c | 8 +++++++-
drivers/net/ucc_geth_mii.c | 11 ++++++++---
drivers/serial/ucc_uart.c | 16 ++++++++++++----
9 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index dcf9758..7b30798 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -1618,7 +1618,7 @@ platforms are moved over to use the flattened-device-tree model.
"bisync", "atm", or "serial".
- compatible : could be "ucc_geth" or "fsl_atm" and so on.
- model : should be "UCC".
- - device-id : the ucc number(1-8), corresponding to UCCx in UM.
+ - cell-index : the ucc number(1-8), corresponding to UCCx in UM.
- reg : Offset and length of the register set for the device
- interrupts : <a b> where a is the interrupt number and b is a
field that represents an encoding of the sense and level
@@ -1675,7 +1675,7 @@ platforms are moved over to use the flattened-device-tree model.
ucc@2000 {
device_type = "network";
compatible = "ucc_geth";
- device-id = <1>;
+ cell-index = <1>;
reg = <2000 200>;
interrupts = <a0 0>;
interrupt-parent = <700>;
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index f8b4a37..539e02f 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -256,7 +256,6 @@
device_type = "network";
compatible = "ucc_geth";
cell-index = <3>;
- device-id = <3>;
reg = <0x2200 0x200>;
interrupts = <34>;
interrupt-parent = <&qeic>;
@@ -271,7 +270,6 @@
device_type = "network";
compatible = "ucc_geth";
cell-index = <4>;
- device-id = <4>;
reg = <0x3200 0x200>;
interrupts = <35>;
interrupt-parent = <&qeic>;
@@ -285,7 +283,7 @@
ucc@2400 {
device_type = "serial";
compatible = "ucc_uart";
- device-id = <5>; /* The UCC number, 1-7*/
+ cell-index = <5>; /* The UCC number, 1-7*/
port-number = <0>; /* Which ttyQEx device */
soft-uart; /* We need Soft-UART */
reg = <0x2400 0x200>;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index ea7fcbf..179c81c 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -209,7 +209,6 @@
device_type = "network";
compatible = "ucc_geth";
cell-index = <2>;
- device-id = <2>;
reg = <0x3000 0x200>;
interrupts = <33>;
interrupt-parent = <&qeic>;
@@ -224,7 +223,6 @@
device_type = "network";
compatible = "ucc_geth";
cell-index = <3>;
- device-id = <3>;
reg = <0x2200 0x200>;
interrupts = <34>;
interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 525423c..8160ff2 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -258,7 +258,6 @@
device_type = "network";
compatible = "ucc_geth";
cell-index = <1>;
- device-id = <1>;
reg = <0x2000 0x200>;
interrupts = <32>;
interrupt-parent = <&qeic>;
@@ -274,7 +273,6 @@
device_type = "network";
compatible = "ucc_geth";
cell-index = <2>;
- device-id = <2>;
reg = <0x3000 0x200>;
interrupts = <33>;
interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index e35200a..cc56338 100644
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -179,7 +179,7 @@
enet0: ucc@2000 {
device_type = "network";
compatible = "ucc_geth";
- device-id = <1>;
+ cell-index = <1>;
reg = <0x2000 0x200>;
interrupts = <32>;
interrupt-parent = <&qeic>;
@@ -194,7 +194,7 @@
enet1: ucc@3000 {
device_type = "network";
compatible = "ucc_geth";
- device-id = <2>;
+ cell-index = <2>;
reg = <0x3000 0x200>;
interrupts = <33>;
interrupt-parent = <&qeic>;
@@ -209,7 +209,7 @@
enet2: ucc@2600 {
device_type = "network";
compatible = "ucc_geth";
- device-id = <7>;
+ cell-index = <7>;
reg = <0x2600 0x200>;
interrupts = <42>;
interrupt-parent = <&qeic>;
@@ -224,7 +224,7 @@
enet3: ucc@3200 {
device_type = "network";
compatible = "ucc_geth";
- device-id = <4>;
+ cell-index = <4>;
reg = <0x3200 0x200>;
interrupts = <35>;
interrupt-parent = <&qeic>;
@@ -271,7 +271,7 @@
device_type = "serial";
compatible = "ucc_uart";
reg = <0x2400 0x200>;
- device-id = <5>;
+ cell-index = <5>;
port-number = <0>;
rx-clock-name = "brg7";
tx-clock-name = "brg8";
@@ -284,7 +284,7 @@
device_type = "serial";
compatible = "ucc_uart";
reg = <0x3400 0x200>;
- device-id = <6>;
+ cell-index = <6>;
port-number = <1>;
rx-clock-name = "brg13";
tx-clock-name = "brg14";
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 66087d5..df4b5e8 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -325,7 +325,6 @@
device_type = "network";
compatible = "ucc_geth";
cell-index = <1>;
- device-id = <1>;
reg = <2000 200>;
interrupts = <20>;
interrupt-parent = <&qeic>;
@@ -341,7 +340,6 @@
device_type = "network";
compatible = "ucc_geth";
cell-index = <2>;
- device-id = <2>;
reg = <3000 200>;
interrupts = <21>;
interrupt-parent = <&qeic>;
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index fba0811..3a68b94 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3852,7 +3852,13 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
ugeth_vdbg("%s: IN", __FUNCTION__);
- prop = of_get_property(np, "device-id", NULL);
+ prop = of_get_property(np, "cell-index", NULL);
+ if (!prop) {
+ prop = of_get_property(np, "device-id", NULL);
+ if (!prop)
+ return -ENODEV;
+ }
+
ucc_num = *prop - 1;
if ((ucc_num < 0) || (ucc_num > 7))
return -ENODEV;
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c
index e3ba14a..e5b17d7 100644
--- a/drivers/net/ucc_geth_mii.c
+++ b/drivers/net/ucc_geth_mii.c
@@ -203,9 +203,14 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma
if ((res.start >= tempres.start) &&
(res.end <= tempres.end)) {
/* set this UCC to be the MII master */
- const u32 *id = of_get_property(tempnp, "device-id", NULL);
- if (id == NULL)
- goto bus_register_fail;
+ const u32 *id;
+
+ id = of_get_property(tempnp, "cell-index", NULL);
+ if (!id) {
+ id = of_get_property(tempnp, "device-id", NULL);
+ if (!id)
+ goto bus_register_fail;
+ }
ucc_set_qe_mux_mii_mng(*id - 1);
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index e0994f0..5e4310c 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -1270,10 +1270,18 @@ static int ucc_uart_probe(struct of_device *ofdev,
/* Get the UCC number (device ID) */
/* UCCs are numbered 1-7 */
- iprop = of_get_property(np, "device-id", NULL);
- if (!iprop || (*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
- dev_err(&ofdev->dev,
- "missing or invalid UCC specified in device tree\n");
+ iprop = of_get_property(np, "cell-index", NULL);
+ if (!iprop) {
+ iprop = of_get_property(np, "device-id", NULL);
+ if (!iprop) {
+ dev_err(&ofdev->dev, "UCC is unspecified in "
+ "device tree\n");
+ return -EINVAL;
+ }
+ }
+
+ if ((*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
+ dev_err(&ofdev->dev, "no support for UCC%u\n", *iprop);
kfree(qe_port);
return -ENODEV;
}
--
1.5.2.2
^ permalink raw reply related
* RE: [Bugme-new] [Bug 9808] New: system hung with htb QoS
From: Brandeburg, Jesse @ 2008-02-01 17:36 UTC (permalink / raw)
To: Andrew Morton, netdev; +Cc: bilias, bugme-daemon, Kok, Auke-jan H
In-Reply-To: <20080124061157.3512a308.akpm@linux-foundation.org>
Andrew Morton wrote:
>> On Thu, 24 Jan 2008 03:03:11 -0800 (PST)
>> bugme-daemon@bugzilla.kernel.org wrote:
>> http://bugzilla.kernel.org/show_bug.cgi?id=9808
>>
>> Summary: system hung with htb QoS
>> Product: Networking
>> Version: 2.5
>> KernelVersion: 2.6.23.9
>> Platform: All
>> OS/Version: Linux
>> Tree: Fedora
>> Status: NEW
>> Severity: normal
>> Priority: P1
>> Component: Netfilter/Iptables
>> AssignedTo:
>> networking_netfilter-iptables@kernel-bugs.osdl.org
>> ReportedBy: bilias@edu.physics.uoc.gr
This user was able to eliminate the tx hang problem with htb QoS by
disabling TSO. We also have some reports of xen hangs when TSO is
enabled as well. Not sure if they are related.
At this point this user has a workaround. We will continue to try to
reproduce here to see if we can root cause the hardware issue, but we
haven't had any luck so far.
^ permalink raw reply
* Re: [PATCH] [POWERPC][NET][SERIAL] UCCs: replace device-id with cell-index
From: Jeff Garzik @ 2008-02-01 17:52 UTC (permalink / raw)
To: avorontsov
Cc: Kumar Gala, Timur Tabi, Grant Likely, Li Yang, linuxppc-dev,
linux-serial, netdev
In-Reply-To: <20080201173331.GA8020@localhost.localdomain>
Anton Vorontsov wrote:
> On Fri, Feb 01, 2008 at 09:32:38AM -0600, Kumar Gala wrote:
>> On Feb 1, 2008, at 9:01 AM, Anton Vorontsov wrote:
>>
>>> It isn't used anywhere, so remove it. If we'll ever need something
>>> like this, we'll use compatible property instead.
>>>
>>> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
>>> ---
>>>
>>> Rebased on top of recent tree.
>>>
>>> Documentation/powerpc/booting-without-of.txt | 1 -
>>> arch/powerpc/boot/dts/mpc832x_mds.dts | 3 ---
>>> arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 --
>>> arch/powerpc/boot/dts/mpc836x_mds.dts | 2 --
>>> arch/powerpc/boot/dts/mpc8568mds.dts | 2 --
>>> 5 files changed, 0 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/Documentation/powerpc/booting-without-of.txt b/
>>> Documentation/powerpc/booting-without-of.txt
>>> index 410c847..dcf9758 100644
>>> --- a/Documentation/powerpc/booting-without-of.txt
>>> +++ b/Documentation/powerpc/booting-without-of.txt
>>> @@ -1675,7 +1675,6 @@ platforms are moved over to use the flattened-
>>> device-tree model.
>>> ucc@2000 {
>>> device_type = "network";
>>> compatible = "ucc_geth";
>>> - model = "UCC";
>>> device-id = <1>;
>> can we change device-id to cell-index?
>
> Sure. But let's do this in the separate patch? Because this change
> actually touches the code in the two subsystems: net and serial.
>
> I hope everybody will agree to pass it through powerpc tree..?
>
> - - - -
> From: Anton Vorontsov <avorontsov@ru.mvista.com>
> Subject: [POWERPC][NET][SERIAL] UCCs: replace device-id with cell-index
>
> device-id is worse than cell-index. Probably cell-index isn't
> good either, but device-id is worse anyway.
>
> Drivers are modified for backward compatibility's sake.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
> Documentation/powerpc/booting-without-of.txt | 4 ++--
> arch/powerpc/boot/dts/mpc832x_mds.dts | 4 +---
> arch/powerpc/boot/dts/mpc832x_rdb.dts | 2 --
> arch/powerpc/boot/dts/mpc836x_mds.dts | 2 --
> arch/powerpc/boot/dts/mpc836x_rdk.dts | 12 ++++++------
> arch/powerpc/boot/dts/mpc8568mds.dts | 2 --
> drivers/net/ucc_geth.c | 8 +++++++-
> drivers/net/ucc_geth_mii.c | 11 ++++++++---
> drivers/serial/ucc_uart.c | 16 ++++++++++++----
> 9 files changed, 36 insertions(+), 25 deletions(-)
ACK drivers/net
^ permalink raw reply
* Re: [IPV4 0/9] TRIE performance patches
From: Robert Olsson @ 2008-02-01 18:00 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Robert Olsson, David Miller, netdev
In-Reply-To: <20080123154933.233c4909@deepthought>
Hello, finally got some time to test...
Table w. 214k routes with full rDoS on two intrefaces on 2 x AMD64 processors,
speed 2814.43 MHz. Profiled with CPU_CLK_UNHALTED and rtstat
w/o latest patch fib_trie pathes. Tput ~233 kpps
samples % symbol name
109925 14.4513 fn_trie_lookup
109821 14.4376 ip_route_input
87245 11.4696 rt_intern_hash
31270 4.1109 kmem_cache_alloc
24159 3.1761 dev_queue_xmit
23200 3.0500 neigh_lookup
22464 2.9532 free_block
18412 2.4205 kmem_cache_free
17830 2.3440 dst_destroy
15740 2.0693 fib_get_table
With latest patch fib_patches.(Stephens others) Same throughput
~233 kpps but we see a different profile. Why we don't get any
better better throughput is yet to be understand (the drops in
qdisc could be the cause) more analysis needed
79242 14.3520 ip_route_input
65188 11.8066 fn_trie_lookup
64559 11.6927 rt_intern_hash
22901 4.1477 kmem_cache_alloc
21038 3.8103 check_leaf
16197 2.9335 neigh_lookup
14802 2.6809 free_block
14596 2.6436 ip_rcv_finish
12365 2.2395 fib_validate_source
12048 2.1821 dst_destroy
fib_hash thoughput ~177 kpps
Hard work for fib_hash here as we have many zones.
it can be fast with less zines.
200568 37.8013 fn_hash_lookup
58352 10.9977 ip_route_input
44495 8.3860 rt_intern_hash
12873 2.4262 kmem_cache_alloc
12115 2.2833 rt_may_expire
11691 2.2034 rt_garbage_collect
10821 2.0394 dev_queue_xmit
9999 1.8845 fib_validate_source
8762 1.6514 fib_get_table
8558 1.6129 fib_semantic_match
Cheers
--ro
^ permalink raw reply
* [BUILD FAILURE]2.6.24-git10 section type conflict
From: Sudhir Kumar @ 2008-02-01 18:26 UTC (permalink / raw)
To: linux-kernel; +Cc: sam ravnborg, net-dev-mailing list
Hi All,
I found the following kernel build failure for 2.6.24-git10
on my machine:
CC [M] drivers/scsi/lpfc/lpfc_attr.o
drivers/net/sis190.c:329: error: sis190_pci_tbl causes a section type
conflict
make[2]: *** [drivers/net/sis190.o] Error 1
make[1]: *** [drivers/net] Error 2
make[1]: *** Waiting for unfinished jobs....
CC [M] drivers/scsi/lpfc/lpfc_vport.o
machine info:
[root@x330d ~]# uname -a
Linux x330d.in.ibm.com 2.6.24-rc8 #1 SMP Thu Jan 31 16:46:34 NPT 2008
i686 i686 i386 GNU/Linux
Thanks
Sudhir Kumar
Linux Technology Centre
Bangalore
^ permalink raw reply
* Re: [patch 0/7] s390: ctc patches for 2.6.25
From: Jeff Garzik @ 2008-02-01 18:30 UTC (permalink / raw)
To: Ursula Braun; +Cc: netdev, linux-s390
In-Reply-To: <20080201145128.462823000@linux.vnet.ibm.com>
This patchset breaks git-bisect, by creating interim unbuildable states...
^ permalink raw reply
* Re: [BUILD FAILURE]2.6.24-git10 section type conflict
From: Sam Ravnborg @ 2008-02-01 18:34 UTC (permalink / raw)
To: Sudhir Kumar; +Cc: linux-kernel, net-dev-mailing list
In-Reply-To: <20080201182627.GB14251@in.ibm.com>
On Fri, Feb 01, 2008 at 11:56:27PM +0530, Sudhir Kumar wrote:
> Hi All,
> I found the following kernel build failure for 2.6.24-git10
> on my machine:
>
> CC [M] drivers/scsi/lpfc/lpfc_attr.o
> drivers/net/sis190.c:329: error: sis190_pci_tbl causes a section type
> conflict
> make[2]: *** [drivers/net/sis190.o] Error 1
> make[1]: *** [drivers/net] Error 2
> make[1]: *** Waiting for unfinished jobs....
> CC [M] drivers/scsi/lpfc/lpfc_vport.o
Known issue with fix already pushed upstream.
A workaround is to delete __devinitdata from the
corresponding .c (sis190.c) file.
Sam
^ permalink raw reply
* Re: [PATCH 1/5] ehea: fix ehea.h checkpatch complaints
From: Jeff Garzik @ 2008-02-01 18:40 UTC (permalink / raw)
To: Doug Maxey
Cc: Jeff Garzik, Jan-Bernd Themann, Paul Mackerras, netdev,
Linux PowerPC List
In-Reply-To: <1201832451-23634-2-git-send-email-dwm@austin.ibm.com>
Doug Maxey wrote:
> Cc: Jan-Bernd Themann <themann@de.ibm.com>
> Signed-off-by: Doug Maxey <dwm@austin.ibm.com>
> ---
> drivers/net/ehea/ehea.h | 3 +++
> drivers/net/ehea/ehea_hw.h | 8 ++++----
> 2 files changed, 7 insertions(+), 4 deletions(-)
applied 1-5
^ permalink raw reply
* Re: [PATCH for 2.6.25 1/2] [NET] ucc_geth: fix module removal
From: Jeff Garzik @ 2008-02-01 18:40 UTC (permalink / raw)
To: Anton Vorontsov; +Cc: Li Yang, netdev, linuxppc-dev
In-Reply-To: <20080201132248.GA1790@localhost.localdomain>
Anton Vorontsov wrote:
> - uccf should be set to NULL to not double-free memory on
> subsequent calls;
> - ind_hash_q and group_hash_q lists should be initialized in the
> probe() function, instead of struct_init() (called by open()),
> otherwise there will be an oops if ucc_geth_driver removed
> prior 'ifconfig ethX up';
> - add unregister_netdev();
> - reorder geth_remove() steps.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
>
> Hi Li,
>
> You kinda promised that these two patches would hit 2.6.25... ;-)
>
> I've rebased the patches so they apply cleanly on the current tree.
>
> Thanks,
>
> drivers/net/ucc_geth.c | 17 ++++++++++-------
> 1 files changed, 10 insertions(+), 7 deletions(-)
applied 1-2
^ permalink raw reply
* Re: [PATCH] ehea: fix sysfs link compile problem
From: Jeff Garzik @ 2008-02-01 18:40 UTC (permalink / raw)
To: Jan-Bernd Themann
Cc: Christoph Raisch, Jan-Bernd Themann, linux-kernel, linux-ppc,
Marcus Eder, Thomas Klein, Stefan Roscher, netdev
In-Reply-To: <200802011537.42578.ossthema@de.ibm.com>
Jan-Bernd Themann wrote:
> Due to changes in the struct device_driver there is no direct
> access to its kobj any longer. The kobj was used to create
> sysfs links between eHEA ethernet devices and the driver.
> This patch removes the affected sysfs links to resolve
> the build problems.
>
> Signed-off-by: Jan-Bernd Themann <themann@de.ibm.com>
>
>
> ---
> drivers/net/ehea/ehea_main.c | 37 -------------------------------------
> 1 files changed, 0 insertions(+), 37 deletions(-)
applied
^ permalink raw reply
* Re: [PATCH] macb: Fix section mismatch and shrink runtime footprint
From: Jeff Garzik @ 2008-02-01 18:40 UTC (permalink / raw)
To: Haavard Skinnemoen; +Cc: netdev, David Brownell
In-Reply-To: <1201781422-30181-1-git-send-email-hskinnemoen@atmel.com>
Haavard Skinnemoen wrote:
> macb devices are only found integrated on SoCs, so they can't be
> hotplugged. Thus, the probe() and exit() functions can be __init and
> __exit, respectively. By using platform_driver_probe() instead of
> platform_driver_register(), there won't be any references to the
> discarded probe() function after the driver has loaded.
>
> This also fixes a section mismatch due to macb_probe(), defined as
> __devinit, calling macb_get_hwaddr, defined as __init.
>
> Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
> ---
> drivers/net/macb.c | 9 ++++-----
> 1 files changed, 4 insertions(+), 5 deletions(-)
applied
^ permalink raw reply
* Re: NET: AX88796 use dev_dbg() instead of printk()
From: Jeff Garzik @ 2008-02-01 18:41 UTC (permalink / raw)
To: Ben Dooks; +Cc: netdev, davem, jgarzik
In-Reply-To: <20080131112531.187305225@fluff.org.uk>
applied
^ permalink raw reply
* Re: [2.6 patch] via-rhine.c:rhine_hw_init() must be __devinit
From: Jeff Garzik @ 2008-02-01 18:41 UTC (permalink / raw)
To: Adrian Bunk; +Cc: rl, netdev, linux-kernel
In-Reply-To: <20080130200205.GI29368@does.not.exist>
applied the net driver portion of these patches...
^ permalink raw reply
* Re: rtl8150: use default MTU of 1500
From: Jeff Garzik @ 2008-02-01 18:41 UTC (permalink / raw)
To: Lennert Buytenhek; +Cc: netdev, Petko Manolov
In-Reply-To: <20080130193742.GA13631@xi.wantstofly.org>
Lennert Buytenhek wrote:
> The RTL8150 driver uses an MTU of 1540 by default, which causes a
> bunch of problems -- it prevents booting from NFS root, for one.
>
> Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
> Cc: Petko Manolov <petkan@nucleusys.com>
>
> --- linux-2.6.24-git7.orig/drivers/net/usb/rtl8150.c 2008-01-24 23:58:37.000000000 +0100
> +++ linux-2.6.24-git7/drivers/net/usb/rtl8150.c 2008-01-30 20:29:00.000000000 +0100
> @@ -925,9 +925,8 @@
> netdev->hard_start_xmit = rtl8150_start_xmit;
> netdev->set_multicast_list = rtl8150_set_multicast;
> netdev->set_mac_address = rtl8150_set_mac_address;
> netdev->get_stats = rtl8150_netdev_stats;
> - netdev->mtu = RTL8150_MTU;
> SET_ETHTOOL_OPS(netdev, &ops);
> dev->intr_interval = 100; /* 100ms */
>
> if (!alloc_all_urbs(dev)) {
applied
^ permalink raw reply
* Re: [PATCH 2.6.24] e1000e: add new wakeup cababilities
From: Jeff Garzik @ 2008-02-01 18:41 UTC (permalink / raw)
To: Mitch Williams; +Cc: netdev, davem
In-Reply-To: <1201639382.11148.8.camel@strongmad.jf.intel.com>
Mitch Williams wrote:
> Ethtool supports wake-on-ARP and wake-on-link, and so does the hardware
> supported by e1000e. This patch just introduces the two.
>
> Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
applied
^ permalink raw reply
* Re: [PATCH] PHYLIB: Add BCM5482 PHY support
From: Jeff Garzik @ 2008-02-01 18:41 UTC (permalink / raw)
To: Nate Case; +Cc: Andy Fleming, netdev
In-Reply-To: <1201623540.12444.121.camel@localhost.localdomain>
Nate Case wrote:
> This Broadcom PHY is similar to other bcm54xx devices.
>
> Signed-off-by: Nate Case <ncase@xes-inc.com>
> ---
> drivers/net/phy/broadcom.c | 20 ++++++++++++++++++++
> 1 files changed, 20 insertions(+), 0 deletions(-)
applied
^ permalink raw reply
* Re: [Patch 2.6.24 1/3]S2io: Support for vlan_rx_kill_vid entry point
From: Jeff Garzik @ 2008-02-01 18:42 UTC (permalink / raw)
To: Sreenivasa Honnur; +Cc: netdev, support
In-Reply-To: <Pine.GSO.4.10.10801241312010.3800-100000@guinness>
Sreenivasa Honnur wrote:
> - Added s2io_vlan_rx_kill_vid entry point function for unregistering vlan.
> - Fix to aggregate vlan packets. IP offset is incremented by
> 4 bytes if the packet contains vlan header.
>
> Signed-off-by: Surjit Reang <surjit.reang@neterion.com>
> Signed-off-by: Ramkrishna Vepa <ram.vepa@neterion.com>
applied 1-2, patch #3 failed to apply
^ permalink raw reply
* Re: [PATCH 1/3] pasemi_mac: Add support for changing mac address
From: Jeff Garzik @ 2008-02-01 18:42 UTC (permalink / raw)
To: Olof Johansson; +Cc: netdev
In-Reply-To: <20080123195619.GB32380@lixom.net>
Olof Johansson wrote:
> Straightforward. It used to be hardcoded and impossible to override
> with ifconfig.
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
applied 1-3
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox