* Re: [PATCH 2/2 v2] MPC52xx FEC: be more conservative when setting MII_SPEED register
From: Wolfgang Denk @ 2009-07-17 12:35 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linuxppc-dev, netdev
In-Reply-To: <20090717094725.GC3150@pengutronix.de>
Dear Wolfram Sang,
In message <20090717094725.GC3150@pengutronix.de> you wrote:
>
> In the probe-function when mdio_speed is set, there is still the old formula
> used. Wouldn't that be better in sync?
Good point. Next version of patch following soon.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
Prof: So the American government went to IBM to come up with a
data encryption standard and they came up with ...
Student: EBCDIC!
^ permalink raw reply
* My new friend
From: jane_agurma @ 2009-07-17 12:45 UTC (permalink / raw)
hello dear friend
how are you today i hope that every things is ok with you as is my pleassure to contact you after viewing your profile at which really interest me in having communication with you if you will have the desire with me so that we can get to know each other better and see what happened in future.
i will be very happy if you can write me through my email for easiest communication and to know all about each other,here is my email(Agurmajane@yahoo.co.uk) will be waiting to hear from you as i wish you all the best for your day.
yours new friend.
Jane
^ permalink raw reply
* [PATCH 2/2 v4] MPC52xx FEC: be more conservative when setting MII_SPEED register
From: Wolfgang Denk @ 2009-07-17 12:59 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Wolfgang Denk, Grant Likely, Kumar Gala, netdev
In-Reply-To: <1247833628-15952-2-git-send-email-wd@denx.de>
This patch adds error checking and prevents clobbering unrelated bits
(reserved bits or the DIS_PREAMBLE bit) when writing the MII_SPEED
register on MPC52xx systems.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: <netdev@vger.kernel.org>
---
v3: - use maximum divider in case MPC512x IPS clock is unknown
v4: - use the same code in the probe-function, too
drivers/net/fec_mpc52xx.c | 25 ++++++++++++++++++++++---
drivers/net/fec_mpc52xx_phy.c | 23 ++++++++++++++++++++---
2 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index cc78633..eed8d2b 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -639,7 +639,7 @@ static void mpc52xx_fec_hw_init(struct net_device *dev)
/* set phy speed.
* this can't be done in phy driver, since it needs to be called
* before fec stuff (even on resume) */
- out_be32(&fec->mii_speed, priv->mdio_speed);
+ clrsetbits_be32(&fec->mii_speed, 0x7E, priv->mdio_speed);
}
/**
@@ -863,7 +863,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
struct mpc52xx_fec_priv *priv = NULL;
struct resource mem;
const u32 *prop;
- int prop_size;
+ int prop_size, clock, speed;
phys_addr_t rx_fifo;
phys_addr_t tx_fifo;
@@ -948,7 +948,26 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
/* Start with safe defaults for link connection */
priv->speed = 100;
priv->duplex = DUPLEX_HALF;
- priv->mdio_speed = ((mpc5xxx_get_bus_frequency(op->node) >> 20) / 5) << 1;
+
+ /* MII speed */
+ clock = mpc5xxx_get_bus_frequency(op->node);
+ if (!clock) {
+ /* Use maximum divider if clock is unknown */
+ dev_err(&op->dev, "could not determine IPB clock\n");
+ clock = 0x3F * 5000000;
+ }
+
+ /*
+ * Scale for a MII clock <= 2.5 MHz
+ * Note that only 6 bits (25:30) are available for MII speed.
+ */
+ speed = (clock + 4999999) / 5000000;
+ if (speed > 0x3F) {
+ speed = 0x3F;
+ dev_err(&op->dev, "MII clock (%d Hz) exceeds max (2.5 MHz)\n",
+ clock / speed);
+ }
+ priv->mdio_speed = speed << 1;
/* The current speed preconfigures the speed of the MII link */
prop = of_get_property(op->node, "current-speed", &prop_size);
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 31e6d62..d3537e1 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -70,7 +70,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
struct mpc52xx_fec_mdio_priv *priv;
struct resource res = {};
int err;
- int i;
+ int i, clock, speed;
bus = mdiobus_alloc();
if (bus == NULL)
@@ -105,8 +105,25 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
dev_set_drvdata(dev, bus);
/* set MII speed */
- out_be32(&priv->regs->mii_speed,
- ((mpc5xxx_get_bus_frequency(of->node) >> 20) / 5) << 1);
+ clock = mpc5xxx_get_bus_frequency(of->node);
+ if (!clock) {
+ /* Use maximum divider if clock is unknown */
+ dev_err(&of->dev, "could not determine IPB clock\n");
+ clock = 0x3F * 5000000;
+ }
+
+ /*
+ * Scale for a MII clock <= 2.5 MHz
+ * Note that only 6 bits (25:30) are available for MII speed.
+ */
+ speed = (clock + 4999999) / 5000000;
+ if (speed > 0x3F) {
+ speed = 0x3F;
+ dev_err(&of->dev, "MII clock (%d Hz) exceeds max (2.5 MHz)\n",
+ clock / speed);
+ }
+
+ clrsetbits_be32(&priv->regs->mii_speed, 0x7E, speed << 1);
err = of_mdiobus_register(bus, np);
if (err)
--
1.6.0.6
^ permalink raw reply related
* Re: [patch 1/3] net: serialize hrtimer callback in sched_cbq
From: Oliver Hartkopp @ 2009-07-17 13:26 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Linus Torvalds, David Miller, tglx, netdev, linux-kernel, kaber
In-Reply-To: <1247832892.15751.35.camel@twins>
Peter Zijlstra wrote:
> On Tue, 2009-07-14 at 09:42 -0700, Linus Torvalds wrote:
>> On Tue, 14 Jul 2009, Peter Zijlstra wrote:
>>> Linus really hated the softirq mode, which is what prompted me to change
>>> that.
>>>
>>> Now, it might be he only hated the particular interface and the
>>> resulting code, but I think to remember he simply thought the whole
>>> thing daft.
>> Yes. And I hated the bugs it had.
>>
>> Don't make something as core as timers any more complicated. Don't take
>> locks in timers and then complain about deadlocks. If your locking is
>> broken, don't make the core timers be idiotically broken.
>>
>> Because it was. The code was a total mess to follow, and had bugs.
>
> How would something like the below work for people?
Would be fine to me.
It reduces the duplicated code as well as private structs for hrtimers &
tasklets. And finally your suggestion preserves the proper separation of the
hrtimers and the tasklets that are used as underlying concepts.
Regards,
Oliver (who wrote net/can/bcm.c)
>
> ---
> include/linux/hrtimer.h | 22 ++++++++++++++++++++--
> kernel/hrtimer.c | 23 ++++++++++++++++++++++-
> 2 files changed, 42 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
> index 4759917..e7559fe 100644
> --- a/include/linux/hrtimer.h
> +++ b/include/linux/hrtimer.h
> @@ -22,6 +22,7 @@
> #include <linux/wait.h>
> #include <linux/percpu.h>
> #include <linux/timer.h>
> +#include <linux/interrupt.h>
>
>
> struct hrtimer_clock_base;
> @@ -91,7 +92,6 @@ enum hrtimer_restart {
> * @function: timer expiry callback function
> * @base: pointer to the timer base (per cpu and per clock)
> * @state: state information (See bit values above)
> - * @cb_entry: list head to enqueue an expired timer into the callback list
> * @start_site: timer statistics field to store the site where the timer
> * was started
> * @start_comm: timer statistics field to store the name of the process which
> @@ -108,7 +108,6 @@ struct hrtimer {
> enum hrtimer_restart (*function)(struct hrtimer *);
> struct hrtimer_clock_base *base;
> unsigned long state;
> - struct list_head cb_entry;
> #ifdef CONFIG_TIMER_STATS
> int start_pid;
> void *start_site;
> @@ -116,6 +115,12 @@ struct hrtimer {
> #endif
> };
>
> +struct hrtimer_softirq {
> + struct hrtimer timer;
> + struct tasklet_struct tasklet;
> + enum hrtimer_restart (*function)(struct hrtimer *);
> +};
> +
> /**
> * struct hrtimer_sleeper - simple sleeper structure
> * @timer: embedded timer structure
> @@ -335,6 +340,19 @@ static inline void hrtimer_init_on_stack(struct hrtimer *timer,
> static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { }
> #endif
>
> +enum hrtimer_restart __hrtimer_softirq_trampoline(struct hrtimer *timer);
> +void __hrtimer_tasklet_trampoline(unsigned long data);
> +
> +static inline void hrtimer_softirq_init(struct hrtimer_softirq *stimer,
> + enum hrtimer_restart (*func)(struct hrtimer *),
> + clockid_t which_clock, enum hrtimer_mode mode)
> +{
> + hrtimer_init(&stimer->timer, which_clock, mode);
> + stimer->timer.function = __hrtimer_softirq_trampoline;
> + tasklet_init(&stimer->tasklet, __hrtimer_tasklet_trampoline, stimer);
> + stimer->function = func;
> +}
> +
> /* Basic timer operations: */
> extern int hrtimer_start(struct hrtimer *timer, ktime_t tim,
> const enum hrtimer_mode mode);
> diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
> index ab5eb70..dae063c 100644
> --- a/kernel/hrtimer.c
> +++ b/kernel/hrtimer.c
> @@ -1098,7 +1098,6 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
> clock_id = CLOCK_MONOTONIC;
>
> timer->base = &cpu_base->clock_base[clock_id];
> - INIT_LIST_HEAD(&timer->cb_entry);
> hrtimer_init_timer_hres(timer);
>
> #ifdef CONFIG_TIMER_STATS
> @@ -1141,6 +1140,28 @@ int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp)
> }
> EXPORT_SYMBOL_GPL(hrtimer_get_res);
>
> +enum hrtimer_restart __hrtimer_softirq_trampoline(struct hrtimer *timer)
> +{
> + struct hrtimer_softirq *stimer =
> + container_of(timer, struct hrtimer_softirq, timer);
> +
> + tasklet_hi_schedule(&timer->tasklet);
> +
> + return HRTIMER_NORESTART;
> +}
> +EXPORT_SYMBOL_GPL(__hrtimer_softirq_trampoline);
> +
> +void __hrtimer_tasklet_trampoline(unsigned long data)
> +{
> + struct hrtimer_softirq *stimer = (void *)data;
> + enum hrtimer_restart restart;
> +
> + restart = stimer->function(&stimer->timer);
> + if (restart != HRTIMER_NORESTART)
> + hrtimer_restart(&stimer->timer);
> +}
> +EXPORT_SYMBOL_GPL(__hrtimer_tasklet_trampoline);
> +
> static void __run_hrtimer(struct hrtimer *timer)
> {
> struct hrtimer_clock_base *base = timer->base;
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH] USB host CDC Phonet network interface driver
From: Oliver Neukum @ 2009-07-17 13:47 UTC (permalink / raw)
To: Rémi Denis-Courmont; +Cc: netdev, linux-usb
In-Reply-To: <1247824566-9141-1-git-send-email-remi.denis-courmont@nokia.com>
Am Freitag, 17. Juli 2009 11:56:06 schrieb Rémi Denis-Courmont:
> + atomic_dec(&pnd->tx_queue);
> + netif_wake_queue(dev);
Now that I think about it this seems to be a race condition.
What makes sure that your are still below the limit when you
wake the queue?
Regards
Oliver
^ permalink raw reply
* Re: [Bugme-new] [Bug 13553] New: When NETCONSOLE is enabled inkernel, computer crashes after 120seconds (approx)
From: Neil Horman @ 2009-07-17 14:15 UTC (permalink / raw)
To: David Hill; +Cc: Andrew Morton, netdev, bugzilla-daemon, bugme-daemon
In-Reply-To: <3D5DEACBE93549EBB6594E165A92758F@delorimier>
On Fri, Jul 17, 2009 at 01:55:44AM -0400, David Hill wrote:
> Hi back,
> Look at bug 13219. I'm not sure the bug is related to NETCONSOLE.
> It may be with the NIC drivers or the tools miidiag/ethtool or anything
> else.
> The behavior of the system is random.
>
> I attached the NMI stack trace ... but for the kdump, I need to read a
> bit more about it and think I'll need to patch the kernel... will I ?
>
> Thanks again,
>
> Dave
>
Neither of the logs you attached in the associated bugs seem to have the NMI
lockup backtrace included. As for a kdump, you won't need to patch the kernel,
no, but depending on what kernel you're using, you may need to build the kernel
with CONFIG_CRASH and CONFIG_KEXEC turned on.
Neil
>
> ----- Original Message ----- From: "David Hill" <hilld@binarystorm.net>
> To: "Neil Horman" <nhorman@tuxdriver.com>; "Andrew Morton"
> <akpm@linux-foundation.org>
> Cc: <netdev@vger.kernel.org>; <bugzilla-daemon@bugzilla.kernel.org>;
> <bugme-daemon@bugzilla.kernel.org>
> Sent: Thursday, July 16, 2009 1:42 AM
> Subject: Re: [Bugme-new] [Bug 13553] New: When NETCONSOLE is enabled
> inkernel, computer crashes after 120seconds (approx)
>
>
>> Will try that in the next few days... sorry for the delay. I was on
>> vacation for the last 2 weeks and thus, out of town :D
>>
>>
>>
>> ----- Original Message ----- From: "Neil Horman"
>> <nhorman@tuxdriver.com>
>> To: "Andrew Morton" <akpm@linux-foundation.org>
>> Cc: <netdev@vger.kernel.org>; <bugzilla-daemon@bugzilla.kernel.org>;
>> <bugme-daemon@bugzilla.kernel.org>; <hilld@binarystorm.net>
>> Sent: Tuesday, June 23, 2009 9:05 PM
>> Subject: Re: [Bugme-new] [Bug 13553] New: When NETCONSOLE is enabled
>> inkernel, computer crashes after 120seconds (approx)
>>
>>
>>> On Tue, Jun 23, 2009 at 02:07:43PM -0700, Andrew Morton wrote:
>>>>
>>>> (switched to email. Please respond via emailed reply-to-all, not
>>>> via the
>>>> bugzilla web interface).
>>>>
>>>> On Wed, 17 Jun 2009 01:55:54 GMT
>>>> bugzilla-daemon@bugzilla.kernel.org wrote:
>>>>
>>>> > http://bugzilla.kernel.org/show_bug.cgi?id=13553
>>>> >
>>>> > Summary: When NETCONSOLE is enabled in kernel,
>>>> computer > crashes
>>>> > after 120seconds (approx)
>>>> > Product: Networking
>>>> > Version: 2.5
>>>> > Kernel Version: 2.6.29.4, 2.6.30
>>>> > Platform: All
>>>> > OS/Version: Linux
>>>> > Tree: Mainline
>>>> > Status: NEW
>>>> > Severity: high
>>>> > Priority: P1
>>>> > Component: Other
>>>> > AssignedTo: acme@ghostprotocols.net
>>>> > ReportedBy: hilld@binarystorm.net
>>>> > Regression: No
>>>> >
>>>> >
>>>>
>>>> > 00:00.0 Host bridge: Intel Corporation 440GX - 82443GX Host bridge
>>>> > 00:01.0 PCI bridge: Intel Corporation 440GX - 82443GX AGP bridge
>>>> > 00:07.0 ISA bridge: Intel Corporation 82371AB/EB/MB PIIX4 ISA (rev 02)
>>>> > 00:07.1 IDE interface: Intel Corporation 82371AB/EB/MB PIIX4 IDE
>>>> (rev > 01)
>>>> > 00:07.2 USB Controller: Intel Corporation 82371AB/EB/MB PIIX4 USB
>>>> (rev > 01)
>>>> > 00:07.3 Bridge: Intel Corporation 82371AB/EB/MB PIIX4 ACPI (rev 02)
>>>> > 00:0b.0 SCSI storage controller: Adaptec AIC-7896U2/7897U2
>>>> > 00:0b.1 SCSI storage controller: Adaptec AIC-7896U2/7897U2
>>>> > 00:0d.0 Ethernet controller: Intel Corporation 82557/8/9/0/1
>>>> Ethernet > Pro 100
>>>> > (rev 08)
>>>> > 00:12.0 Ethernet controller: Realtek Semiconductor Co., Ltd.
>>>> > RTL-8139/8139C/8139C+ (rev 10)
>>>> > 01:00.0 VGA compatible controller: ATI Technologies Inc Rage 128
>>>> RL/VR > AGP
>>>> >
>>>> > ------- Comment #2 From David Hill 2009-06-17 02:55:56 (-) >
>>>> [reply] -------
>>>> >
>>>> > With NETCONSOLE enabled, if I type:
>>>> > ethtool -s eth1 speed 100 duplex full autoneg on
>>>> >
>>>> > the computer freezes with kernel 2.6.29.4 and 2.6.30...
>>>> >
>>>> > I can reproduce it anytime you want.
>>>> >
>>>>
>>>> Interesting. I wonder what the significance is of the 120 seconds. I
>>>> see no such timers in e100.c. Does the networking core have timers on
>>>> such intervals?
>>>>
>>> My guess is the 120 seconds has less to do with the driver, and more
>>> to do with
>>> some other periodic event in the kernel that triggers a message
>>> getting written
>>> to the console, which in turn triggers whatever deadlock it is thats
>>> getting hit
>>> here. I imagine we could diagnose it pretty quick if a stack trace
>>> or vmcore
>>> could be captured on this. David, can you enable the NMI watchdog on
>>> this
>>> system to trigger a panic on the system after a deadlock? Then if
>>> you could
>>> enable a second serial console, or setup kdump to capture a vmcore on
>>> this
>>> system, we should be able to figure out whats going on. My guess is
>>> that in
>>> the e100 driver we're taking a lock in the ethtool set path, then calling
>>> printk, which winds up recursing into the driver, trying to take the
>>> same lock
>>> again. A stack trace will tell us for certain.
>>>
>>> Regards
>>> Neil
>>>
>>>> --
>>>> To unsubscribe from this list: send the line "unsubscribe netdev" in
>>>> the body of a message to majordomo@vger.kernel.org
>>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>>
>>>
>>> --
>>> This message has been scanned for viruses and
>>> dangerous content by MailScanner, and is
>>> believed to be clean.
>>>
>>>
>>>
>>
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
>
^ permalink raw reply
* Re: [PATCH 1/2 v5] fs_enet/mii-fec.c: fix MII speed calculation
From: Grant Likely @ 2009-07-17 14:41 UTC (permalink / raw)
To: Wolfgang Denk; +Cc: linuxppc-dev, Kumar Gala, netdev, David Miller
In-Reply-To: <1247833628-15952-1-git-send-email-wd@denx.de>
On Fri, Jul 17, 2009 at 6:27 AM, Wolfgang Denk<wd@denx.de> wrote:
> The MII speed calculation was based on the CPU clock (ppc_proc_freq),
> but for MPC512x we must use the bus clock instead.
>
> This patch makes it use the correct clock and makes sure we don't
> clobber reserved bits in the MII_SPEED register.
>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: <netdev@vger.kernel.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
David, this isn't a critical bug fix or a regression, so I think it
should be merged for -next.
g.
> ---
> v5: - fix divider so we really use 2.5 MHz (instead of 1.25)
> - use maximum divider in case MPC512x IPS clock is unknown
>
> drivers/net/fs_enet/mii-fec.c | 37 +++++++++++++++++++++++++++++++++----
> 1 files changed, 33 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
> index 75a0999..5176986 100644
> --- a/drivers/net/fs_enet/mii-fec.c
> +++ b/drivers/net/fs_enet/mii-fec.c
> @@ -36,6 +36,7 @@
> #include <asm/pgtable.h>
> #include <asm/irq.h>
> #include <asm/uaccess.h>
> +#include <asm/mpc5xxx.h>
>
> #include "fs_enet.h"
> #include "fec.h"
> @@ -103,11 +104,11 @@ static int fs_enet_fec_mii_reset(struct mii_bus *bus)
> static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
> const struct of_device_id *match)
> {
> - struct device_node *np = NULL;
> struct resource res;
> struct mii_bus *new_bus;
> struct fec_info *fec;
> - int ret = -ENOMEM, i;
> + int (*get_bus_freq)(struct device_node *) = match->data;
> + int ret = -ENOMEM, clock, speed;
>
> new_bus = mdiobus_alloc();
> if (!new_bus)
> @@ -133,13 +134,35 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
> if (!fec->fecp)
> goto out_fec;
>
> - fec->mii_speed = ((ppc_proc_freq + 4999999) / 5000000) << 1;
> + if (get_bus_freq) {
> + clock = get_bus_freq(ofdev->node);
> + if (!clock) {
> + /* Use maximum divider if clock is unknown */
> + dev_warn(&ofdev->dev, "could not determine IPS clock\n");
> + clock = 0x3F * 5000000;
> + }
> + } else
> + clock = ppc_proc_freq;
> +
> + /*
> + * Scale for a MII clock <= 2.5 MHz
> + * Note that only 6 bits (25:30) are available for MII speed.
> + */
> + speed = (clock + 4999999) / 5000000;
> + if (speed > 0x3F) {
> + speed = 0x3F;
> + dev_err(&ofdev->dev,
> + "MII clock (%d Hz) exceeds max (2.5 MHz)\n",
> + clock / speed);
> + }
> +
> + fec->mii_speed = speed << 1;
>
> setbits32(&fec->fecp->fec_r_cntrl, FEC_RCNTRL_MII_MODE);
> setbits32(&fec->fecp->fec_ecntrl, FEC_ECNTRL_PINMUX |
> FEC_ECNTRL_ETHER_EN);
> out_be32(&fec->fecp->fec_ievent, FEC_ENET_MII);
> - out_be32(&fec->fecp->fec_mii_speed, fec->mii_speed);
> + clrsetbits_be32(&fec->fecp->fec_mii_speed, 0x7E, fec->mii_speed);
>
> new_bus->phy_mask = ~0;
> new_bus->irq = kmalloc(sizeof(int) * PHY_MAX_ADDR, GFP_KERNEL);
> @@ -188,6 +211,12 @@ static struct of_device_id fs_enet_mdio_fec_match[] = {
> {
> .compatible = "fsl,pq1-fec-mdio",
> },
> +#if defined(CONFIG_PPC_MPC512x)
> + {
> + .compatible = "fsl,mpc5121-fec-mdio",
> + .data = mpc5xxx_get_bus_frequency,
> + },
> +#endif
> {},
> };
>
> --
> 1.6.0.6
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* [PATCH] MAINTAINERS entry for STRIP driver
From: Ralf Baechle @ 2009-07-17 14:42 UTC (permalink / raw)
To: netdev, David S. Miller
The web server does no longer exist, it's not on archive.org nor does there
seem to be any mirror.
MAINTAINERS | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index e4b1a3d..36300dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5583,7 +5583,6 @@ S: Odd Fixes
F: drivers/net/starfire*
STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
-W: http://mosquitonet.Stanford.EDU/strip.html
S: Orphan
F: drivers/net/wireless/strip.c
F: include/linux/if_strip.h
^ permalink raw reply related
* Re: [PATCH 2/2 v4] MPC52xx FEC: be more conservative when setting MII_SPEED register
From: Grant Likely @ 2009-07-17 14:45 UTC (permalink / raw)
To: Wolfgang Denk; +Cc: linuxppc-dev, Kumar Gala, netdev
In-Reply-To: <1247835545-18650-1-git-send-email-wd@denx.de>
On Fri, Jul 17, 2009 at 6:59 AM, Wolfgang Denk<wd@denx.de> wrote:
> This patch adds error checking and prevents clobbering unrelated bits
> (reserved bits or the DIS_PREAMBLE bit) when writing the MII_SPEED
> register on MPC52xx systems.
>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Kumar Gala <galak@kernel.crashing.org>
> Cc: <netdev@vger.kernel.org>
> ---
> v3: - use maximum divider in case MPC512x IPS clock is unknown
> v4: - use the same code in the probe-function, too
>
> drivers/net/fec_mpc52xx.c | 25 ++++++++++++++++++++++---
> drivers/net/fec_mpc52xx_phy.c | 23 ++++++++++++++++++++---
Blech. now this block of duplicated code I don't like. This is all
one device, so surely the mdio speed can be calculated once and used
for both drivers.... let me think about this for a bit. 'course this
problem is all rolled up in the nastiness of having two drivers
working on the same device. I suspect is was a mistake to split up
all the powerpc ethernet drivers into separate of_platform drivers.
g.
> 2 files changed, 42 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
> index cc78633..eed8d2b 100644
> --- a/drivers/net/fec_mpc52xx.c
> +++ b/drivers/net/fec_mpc52xx.c
> @@ -639,7 +639,7 @@ static void mpc52xx_fec_hw_init(struct net_device *dev)
> /* set phy speed.
> * this can't be done in phy driver, since it needs to be called
> * before fec stuff (even on resume) */
> - out_be32(&fec->mii_speed, priv->mdio_speed);
> + clrsetbits_be32(&fec->mii_speed, 0x7E, priv->mdio_speed);
> }
>
> /**
> @@ -863,7 +863,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
> struct mpc52xx_fec_priv *priv = NULL;
> struct resource mem;
> const u32 *prop;
> - int prop_size;
> + int prop_size, clock, speed;
>
> phys_addr_t rx_fifo;
> phys_addr_t tx_fifo;
> @@ -948,7 +948,26 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
> /* Start with safe defaults for link connection */
> priv->speed = 100;
> priv->duplex = DUPLEX_HALF;
> - priv->mdio_speed = ((mpc5xxx_get_bus_frequency(op->node) >> 20) / 5) << 1;
> +
> + /* MII speed */
> + clock = mpc5xxx_get_bus_frequency(op->node);
> + if (!clock) {
> + /* Use maximum divider if clock is unknown */
> + dev_err(&op->dev, "could not determine IPB clock\n");
> + clock = 0x3F * 5000000;
> + }
> +
> + /*
> + * Scale for a MII clock <= 2.5 MHz
> + * Note that only 6 bits (25:30) are available for MII speed.
> + */
> + speed = (clock + 4999999) / 5000000;
> + if (speed > 0x3F) {
> + speed = 0x3F;
> + dev_err(&op->dev, "MII clock (%d Hz) exceeds max (2.5 MHz)\n",
> + clock / speed);
> + }
> + priv->mdio_speed = speed << 1;
>
> /* The current speed preconfigures the speed of the MII link */
> prop = of_get_property(op->node, "current-speed", &prop_size);
> diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
> index 31e6d62..d3537e1 100644
> --- a/drivers/net/fec_mpc52xx_phy.c
> +++ b/drivers/net/fec_mpc52xx_phy.c
> @@ -70,7 +70,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
> struct mpc52xx_fec_mdio_priv *priv;
> struct resource res = {};
> int err;
> - int i;
> + int i, clock, speed;
>
> bus = mdiobus_alloc();
> if (bus == NULL)
> @@ -105,8 +105,25 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
> dev_set_drvdata(dev, bus);
>
> /* set MII speed */
> - out_be32(&priv->regs->mii_speed,
> - ((mpc5xxx_get_bus_frequency(of->node) >> 20) / 5) << 1);
> + clock = mpc5xxx_get_bus_frequency(of->node);
> + if (!clock) {
> + /* Use maximum divider if clock is unknown */
> + dev_err(&of->dev, "could not determine IPB clock\n");
> + clock = 0x3F * 5000000;
> + }
> +
> + /*
> + * Scale for a MII clock <= 2.5 MHz
> + * Note that only 6 bits (25:30) are available for MII speed.
> + */
> + speed = (clock + 4999999) / 5000000;
> + if (speed > 0x3F) {
> + speed = 0x3F;
> + dev_err(&of->dev, "MII clock (%d Hz) exceeds max (2.5 MHz)\n",
> + clock / speed);
> + }
> +
> + clrsetbits_be32(&priv->regs->mii_speed, 0x7E, speed << 1);
>
> err = of_mdiobus_register(bus, np);
> if (err)
> --
> 1.6.0.6
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply
* Winner!
From: agpq.quebec @ 2009-07-17 14:45 UTC (permalink / raw)
To: info
Nokia has awarded you the sum of 1,000000.00 Pounds fill in
below your
Full Names, Occupation,Home address,Sex, Age, Telephone.
Regards
Mr Daniel Williams.
^ permalink raw reply
* [PATCH] Update Andreas Koensgen's email address
From: Ralf Baechle @ 2009-07-17 14:47 UTC (permalink / raw)
To: linux-kernel, netdev, David S. Miller; +Cc: Andreas Koensgen
The kernel has used a stale email address of Andreas for a few years.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
I've checked with Andreas; he's ok with this update.
diff --git a/CREDITS b/CREDITS
index 2b88fb3..e76d300 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
D: The Linux Support Team Erlangen
N: Andreas Koensgen
-E: ajk@iehk.rwth-aachen.de
+E: ajk@comnets.uni-bremen.de
D: 6pack driver for AX.25
N: Harald Koerfgen
diff --git a/Documentation/networking/6pack.txt b/Documentation/networking/6pack.txt
index d0777a1..8f33942 100644
--- a/Documentation/networking/6pack.txt
+++ b/Documentation/networking/6pack.txt
@@ -1,7 +1,7 @@
This is the 6pack-mini-HOWTO, written by
Andreas Könsgen DG3KQ
-Internet: ajk@iehk.rwth-aachen.de
+Internet: ajk@comnets.uni-bremen.de
AMPR-net: dg3kq@db0pra.ampr.org
AX.25: dg3kq@db0ach.#nrw.deu.eu
diff --git a/MAINTAINERS b/MAINTAINERS
index 18c3f0c..53db744 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -150,7 +150,7 @@ F: drivers/scsi/53c700*
6PACK NETWORK DRIVER FOR AX.25
P: Andreas Koensgen
-M: ajk@iehk.rwth-aachen.de
+M: ajk@comnets.uni-bremen.de
L: linux-hams@vger.kernel.org
S: Maintained
F: drivers/net/hamradio/6pack.c
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 1551600..981ab53 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -3,7 +3,7 @@
* devices like TTY. It interfaces between a raw TTY and the
* kernel's AX.25 protocol layers.
*
- * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de>
+ * Authors: Andreas Könsgen <ajk@comnets.uni-bremen.de>
* Ralf Baechle DL5RB <ralf@linux-mips.org>
*
* Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by
^ permalink raw reply related
* Re: [patch 1/3] net: serialize hrtimer callback in sched_cbq
From: Linus Torvalds @ 2009-07-17 15:44 UTC (permalink / raw)
To: Peter Zijlstra; +Cc: David Miller, tglx, netdev, linux-kernel, kaber
In-Reply-To: <1247832892.15751.35.camel@twins>
On Fri, 17 Jul 2009, Peter Zijlstra wrote:
>
> How would something like the below work for people?
This looks saner.
It was the insanity of having the core timer code know about different
modes that caused all the sily problems.
Having a separate abstraction layer for "I want to get a softirq timeout"
sounds fine, as long as the timer code itself never cares.
That said, I don't think this shoud be a "hrtimer" issue (reflected in
your naming and include file choice). I think this is a softirq or tasklet
(or whatever) issue, and should be named that way.
Why should the timer code (and header files) care about how you can use
tasklets with them? It shouldn't. The timers should be seen as the really
low-level critical code, and the timer code should never need to know
about softirq's or tasklets or whatever.
So I think you shouldmove it to kernel/softirq.c.
Linus
^ permalink raw reply
* [PATCH] media: strncpy does not null terminate string
From: Roel Kluin @ 2009-07-17 15:54 UTC (permalink / raw)
To: zambrano, netdev, Andrew Morton
In-Reply-To: <4A607185.6020302@gmail.com>
strlcpy() will always null terminate the string. Also use the
sizeof(version) to strlcopy() the version string.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index 36d4d37..1f7f015 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1756,15 +1756,15 @@ static void b44_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *inf
struct b44 *bp = netdev_priv(dev);
struct ssb_bus *bus = bp->sdev->bus;
- strncpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
- strncpy(info->version, DRV_MODULE_VERSION, sizeof(info->driver));
+ strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
+ strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
switch (bus->bustype) {
case SSB_BUSTYPE_PCI:
- strncpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info));
+ strlcpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info));
break;
case SSB_BUSTYPE_PCMCIA:
case SSB_BUSTYPE_SSB:
- strncpy(info->bus_info, "SSB", sizeof(info->bus_info));
+ strlcpy(info->bus_info, "SSB", sizeof(info->bus_info));
break;
}
}
^ permalink raw reply related
* Loan Application
From: Jmc Loans @ 2009-07-17 16:14 UTC (permalink / raw)
To: info
We Loan at 3%,Interested person, should contact us via email for more information.
Regards,
Loan Solution.
^ permalink raw reply
* Re: [PATCH 1/2 v5] fs_enet/mii-fec.c: fix MII speed calculation
From: David Miller @ 2009-07-17 16:21 UTC (permalink / raw)
To: grant.likely; +Cc: wd, linuxppc-dev, galak, netdev
In-Reply-To: <fa686aa40907170741n121d3e4cqdfddaf4d23d4d1fc@mail.gmail.com>
From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 17 Jul 2009 08:41:08 -0600
> David, this isn't a critical bug fix or a regression, so I think it
> should be merged for -next.
Ok.
^ permalink raw reply
* Re: [net-next-2.6 PATCH 1/4] ixgbe: Remove legacy descriptor support
From: David Miller @ 2009-07-17 16:47 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, peter.p.waskiewicz.jr
In-Reply-To: <20090717014951.24074.75893.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 16 Jul 2009 18:50:12 -0700
> From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
>
> The ethtool offline test is the only consumer of the legacy descriptors.
> Update that path to only use advanced descriptors, and remove all support
> for legacy descriptors.
>
> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH 2/4] ixgbe: Make sure boolean assignments from bitwise operations done correctly
From: David Miller @ 2009-07-17 16:47 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, peter.p.waskiewicz.jr
In-Reply-To: <20090717015032.24074.41324.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 16 Jul 2009 18:50:32 -0700
> From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
>
> When the link comes up, the driver detects which flow control settings are
> active. This is done using bitwise operations directly from the hardware
> registers, and assumes the proper boolean assignment. Make this an
> explicit boolean value before assignment to the bool.
>
> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH 3/4] ixgbe: Add device support for a new copper 82598 device
From: David Miller @ 2009-07-17 16:48 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, peter.p.waskiewicz.jr
In-Reply-To: <20090717015051.24074.6624.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 16 Jul 2009 18:50:52 -0700
> From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
>
> This adds support for a new copper device for 82598, device id 0x150b.
>
> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [net-next-2.6 PATCH 4/4] ixgbe: Bump version number
From: David Miller @ 2009-07-17 16:48 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, peter.p.waskiewicz.jr
In-Reply-To: <20090717015110.24074.85722.stgit@localhost.localdomain>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Thu, 16 Jul 2009 18:51:11 -0700
> From: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
>
> Keep the version number marching along as updates come in.
>
> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next-2.6] udp: cleanups
From: David Miller @ 2009-07-17 16:48 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <4A6051D8.3080804@gmail.com>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 17 Jul 2009 12:26:32 +0200
> Pure style cleanups.
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2 v5] fs_enet/mii-fec.c: fix MII speed calculation
From: David Miller @ 2009-07-17 16:48 UTC (permalink / raw)
To: grant.likely; +Cc: linuxppc-dev, netdev, wd
In-Reply-To: <fa686aa40907170741n121d3e4cqdfddaf4d23d4d1fc@mail.gmail.com>
From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 17 Jul 2009 08:41:08 -0600
> On Fri, Jul 17, 2009 at 6:27 AM, Wolfgang Denk<wd@denx.de> wrote:
>> The MII speed calculation was based on the CPU clock (ppc_proc_freq),
>> but for MPC512x we must use the bus clock instead.
>>
>> This patch makes it use the correct clock and makes sure we don't
>> clobber reserved bits in the MII_SPEED register.
>>
>> Signed-off-by: Wolfgang Denk <wd@denx.de>
>> Cc: Grant Likely <grant.likely@secretlab.ca>
>> Cc: Kumar Gala <galak@kernel.crashing.org>
>> Cc: <netdev@vger.kernel.org>
>
> Acked-by: Grant Likely <grant.likely@secretlab.ca>
Applied to net-next-2.6
^ permalink raw reply
* Re: [RFC] [PATCH 2/7] crypto: authenc - convert to ahash
From: David Miller @ 2009-07-17 17:03 UTC (permalink / raw)
To: steffen.klassert; +Cc: herbert, linux-crypto, netdev
In-Reply-To: <20090716111747.GR20288@secunet.com>
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Thu, 16 Jul 2009 13:17:47 +0200
> + /*
> + * head must be a scatterlist with two entries.
> + * We remove a potentially set termination bit
> + * on the first enty.
> + */
> + head->page_link &= ~0x02;
> +
> if (chain) {
> head->length += sg->length;
Isn't there some interface to do this, rather than revealing the
implementation details of how the scatter list marking works?
If not, such an interface should be created and used here. Otherwise
any change in that implementation will break this code.
^ permalink raw reply
* Re: [PATCH] MAINTAINERS entry for STRIP driver
From: David Miller @ 2009-07-17 17:07 UTC (permalink / raw)
To: ralf; +Cc: netdev
In-Reply-To: <20090717144228.GA10838@linux-mips.org>
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 17 Jul 2009 15:42:28 +0100
> The web server does no longer exist, it's not on archive.org nor does there
> seem to be any mirror.
Applied.
^ permalink raw reply
* Re: [PATCH] Update Andreas Koensgen's email address
From: David Miller @ 2009-07-17 17:07 UTC (permalink / raw)
To: ralf; +Cc: linux-kernel, netdev, ajk
In-Reply-To: <20090717144719.GA16470@linux-mips.org>
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 17 Jul 2009 15:47:19 +0100
> The kernel has used a stale email address of Andreas for a few years.
>
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> ---
> I've checked with Andreas; he's ok with this update.
APplied.
^ permalink raw reply
* Re: [PATCH net-next-2.6 1/2] virtio-net: Allow UFO feature to be set and advertised.
From: David Miller @ 2009-07-17 17:11 UTC (permalink / raw)
To: rusty; +Cc: sri, herbert, netdev
In-Reply-To: <200907161158.24794.rusty@rustcorp.com.au>
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 16 Jul 2009 11:58:22 +0930
> On Wed, 15 Jul 2009 09:51:02 am Sridhar Samudrala wrote:
>> [PATCH net-next-2.6 1/2] virtio-net: Allow UFO feature to be set
>>
>> - Allow setting UFO on virtio-net and advertise to host.
>>
>> Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
>
> Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Applied to net-next-2.6
^ 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