* More updates to bcm63xx support (resend)
From: Maxime Bizon @ 2009-06-01 17:21 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli
[Resend, I forgot to generate an actual patch series and missed one
patch doing so, sorry for the noise]
Hi Ralf,
The following patch series (on top of Florian's latest post) are
mostly trivial fixes & cleanup requested by subsystem maintainers.
Patch 2 and 4 are actual bugfixes.
Florian has some more patches to send to you, I will wait for them to
be folded in the bcm63xx tree and then repost the whole serie.
I only got feedback from USB maintainer, and addressed most of them.
Davem has accidentally dropped the patch from its patchwork, so I
think just resubmitting will do. Nothing from serial & pcmcia.
The ethernet PHY support patch should be dropped, the only feature we
get is IRQ support which after field testing seems to be buggy. Maybe
later.
Is it ok for you if I ask for the patches to go through your tree once
they get acked ?
Thanks !
^ permalink raw reply
* [PATCH 02/10] bcm63xx: use napi_complete instead of __napi_complete
From: Maxime Bizon @ 2009-06-01 17:21 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876918-9905-1-git-send-email-mbizon@freebox.fr>
We're not disabling IRQ, so we must call the irq safe flavour of
napi_complete.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/net/bcm63xx_enet.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index a91f909..20e08ef 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -450,7 +450,7 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)
/* no more packet in rx/tx queue, remove device from poll
* queue */
- __napi_complete(napi);
+ napi_complete(napi);
/* restore rx/tx interrupt */
enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
--
1.6.0.4
^ permalink raw reply related
* [PATCH 01/10] bcm63xx: remove duplicate init fields.
From: Maxime Bizon @ 2009-06-01 17:21 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876918-9905-1-git-send-email-mbizon@freebox.fr>
This patch removes duplicate init fields in resource.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
arch/mips/bcm63xx/dev-enet.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c
index 51c2e5a..188fa66 100644
--- a/arch/mips/bcm63xx/dev-enet.c
+++ b/arch/mips/bcm63xx/dev-enet.c
@@ -42,12 +42,10 @@ static struct resource enet0_res[] = {
},
{
.start = -1, /* filled at runtime */
- .start = IRQ_ENET0_RXDMA,
.flags = IORESOURCE_IRQ,
},
{
.start = -1, /* filled at runtime */
- .start = IRQ_ENET0_TXDMA,
.flags = IORESOURCE_IRQ,
},
};
--
1.6.0.4
^ permalink raw reply related
* [PATCH 03/10] bcm63xx: convert bcm63xx_enet to netdev ops.
From: Maxime Bizon @ 2009-06-01 17:21 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876918-9905-1-git-send-email-mbizon@freebox.fr>
This patch makes bcm63xx_enet driver use netdevice ops.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/net/bcm63xx_enet.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 20e08ef..36324b3 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -1551,6 +1551,19 @@ static void bcm_enet_hw_preinit(struct bcm_enet_priv *priv)
enet_writel(priv, val, ENET_MIBCTL_REG);
}
+static const struct net_device_ops bcm_enet_ops = {
+ .ndo_open = bcm_enet_open,
+ .ndo_stop = bcm_enet_stop,
+ .ndo_start_xmit = bcm_enet_start_xmit,
+ .ndo_get_stats = bcm_enet_get_stats,
+ .ndo_set_mac_address = bcm_enet_set_mac_address,
+ .ndo_set_multicast_list = bcm_enet_set_multicast_list,
+ .ndo_do_ioctl = bcm_enet_ioctl,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ .ndo_poll_controller = bcm_enet_netpoll,
+#endif
+};
+
/*
* allocate netdevice, request register memory and register device.
*/
@@ -1716,17 +1729,8 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev)
enet_writel(priv, 0, ENET_MIB_REG(i));
/* register netdevice */
- dev->open = bcm_enet_open;
- dev->stop = bcm_enet_stop;
- dev->hard_start_xmit = bcm_enet_start_xmit;
- dev->get_stats = bcm_enet_get_stats;
- dev->set_mac_address = bcm_enet_set_mac_address;
- dev->set_multicast_list = bcm_enet_set_multicast_list;
+ dev->netdev_ops = &bcm_enet_ops;
netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16);
- dev->do_ioctl = bcm_enet_ioctl;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = bcm_enet_netpoll;
-#endif
SET_ETHTOOL_OPS(dev, &bcm_enet_ethtool_ops);
--
1.6.0.4
^ permalink raw reply related
* [PATCH 04/10] bcm63xx: limit number of usb port to 1.
From: Maxime Bizon @ 2009-06-01 17:21 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876918-9905-1-git-send-email-mbizon@freebox.fr>
This patch disables the use of more than one USB port. Hardware has
two ports, but one may be shared with USB slave port.
Until we have this information in the platform data, don't use the
second port.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/usb/host/ohci-bcm63xx.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ohci-bcm63xx.c b/drivers/usb/host/ohci-bcm63xx.c
index 08807d9..74f432f 100644
--- a/drivers/usb/host/ohci-bcm63xx.c
+++ b/drivers/usb/host/ohci-bcm63xx.c
@@ -20,6 +20,8 @@ static int __devinit ohci_bcm63xx_start(struct usb_hcd *hcd)
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
int ret;
+ ohci->num_ports = 1;
+
ret = ohci_init(ohci);
if (ret < 0)
return ret;
--
1.6.0.4
^ permalink raw reply related
* [PATCH] bcm63xx: remove duplicate init fields.
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
This patch removes duplicate init fields in resource.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
arch/mips/bcm63xx/dev-enet.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c
index 51c2e5a..188fa66 100644
--- a/arch/mips/bcm63xx/dev-enet.c
+++ b/arch/mips/bcm63xx/dev-enet.c
@@ -42,12 +42,10 @@ static struct resource enet0_res[] = {
},
{
.start = -1, /* filled at runtime */
- .start = IRQ_ENET0_RXDMA,
.flags = IORESOURCE_IRQ,
},
{
.start = -1, /* filled at runtime */
- .start = IRQ_ENET0_TXDMA,
.flags = IORESOURCE_IRQ,
},
};
--
1.6.0.4
^ permalink raw reply related
* [PATCH] bcm63xx: convert bcm63xx_enet to netdev ops.
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
This patch makes bcm63xx_enet driver use netdevice ops.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/net/bcm63xx_enet.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 20e08ef..36324b3 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -1551,6 +1551,19 @@ static void bcm_enet_hw_preinit(struct bcm_enet_priv *priv)
enet_writel(priv, val, ENET_MIBCTL_REG);
}
+static const struct net_device_ops bcm_enet_ops = {
+ .ndo_open = bcm_enet_open,
+ .ndo_stop = bcm_enet_stop,
+ .ndo_start_xmit = bcm_enet_start_xmit,
+ .ndo_get_stats = bcm_enet_get_stats,
+ .ndo_set_mac_address = bcm_enet_set_mac_address,
+ .ndo_set_multicast_list = bcm_enet_set_multicast_list,
+ .ndo_do_ioctl = bcm_enet_ioctl,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+ .ndo_poll_controller = bcm_enet_netpoll,
+#endif
+};
+
/*
* allocate netdevice, request register memory and register device.
*/
@@ -1716,17 +1729,8 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev)
enet_writel(priv, 0, ENET_MIB_REG(i));
/* register netdevice */
- dev->open = bcm_enet_open;
- dev->stop = bcm_enet_stop;
- dev->hard_start_xmit = bcm_enet_start_xmit;
- dev->get_stats = bcm_enet_get_stats;
- dev->set_mac_address = bcm_enet_set_mac_address;
- dev->set_multicast_list = bcm_enet_set_multicast_list;
+ dev->netdev_ops = &bcm_enet_ops;
netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16);
- dev->do_ioctl = bcm_enet_ioctl;
-#ifdef CONFIG_NET_POLL_CONTROLLER
- dev->poll_controller = bcm_enet_netpoll;
-#endif
SET_ETHTOOL_OPS(dev, &bcm_enet_ethtool_ops);
--
1.6.0.4
^ permalink raw reply related
* More updates to bcm63xx support.
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli
Hi Ralf,
The following patch series (on top of Florian's latest post) are
mostly trivial fixes & cleanup requested by subsystem maintainers.
Patch 2 and 4 are actual bugfixes.
Florian has some more patches to send to you, I will wait for them to
be folded in the bcm63xx tree and then repost the whole serie.
I only got feedback from USB maintainer, and addressed most of them.
Davem has accidentally dropped the patch from its patchwork, so I
think just resubmitting will do. Nothing from serial & pcmcia.
The ethernet PHY support patch should be dropped, the only feature we
get is IRQ support which after field testing seems to be buggy. Maybe
later.
Is it ok for you if I ask for the patches to go through your tree once
they get acked ?
Thanks !
^ permalink raw reply
* [PATCH] bcm63xx: clarify meaning of the magical value in ohci-bcm63xx.c
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
USB maintainer asked for clarification of the magic value used during
USB init. Be clear about the source of it.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/usb/host/ohci-bcm63xx.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/host/ohci-bcm63xx.c b/drivers/usb/host/ohci-bcm63xx.c
index d48c8ac..bd66d5a 100644
--- a/drivers/usb/host/ohci-bcm63xx.c
+++ b/drivers/usb/host/ohci-bcm63xx.c
@@ -85,7 +85,9 @@ static int __devinit ohci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
reg &= ~USBH_PRIV_SWAP_OHCI_ENDN_MASK;
reg |= USBH_PRIV_SWAP_OHCI_DATA_MASK;
bcm_rset_writel(RSET_USBH_PRIV, reg, USBH_PRIV_SWAP_REG);
- /* don't ask... */
+ /* the magic value comes for the original vendor BSP
+ * and is needed for USB to work. Datasheet does not
+ * help, so the magic value is used as-is. */
bcm_rset_writel(RSET_USBH_PRIV, 0x1c0020, USBH_PRIV_TEST_REG);
} else
return 0;
--
1.6.0.4
^ permalink raw reply related
* [PATCH] bcm63xx: don't set bus type in ehci-bcm63xx.c
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
The platform code already sets the bus type, so don't do it.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/usb/host/ehci-bcm63xx.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/host/ehci-bcm63xx.c b/drivers/usb/host/ehci-bcm63xx.c
index 0aba0f9..8a62c0a 100644
--- a/drivers/usb/host/ehci-bcm63xx.c
+++ b/drivers/usb/host/ehci-bcm63xx.c
@@ -145,7 +145,6 @@ static struct platform_driver ehci_hcd_bcm63xx_driver = {
.driver = {
.name = "bcm63xx_ehci",
.owner = THIS_MODULE,
- .bus = &platform_bus_type
},
};
--
1.6.0.4
^ permalink raw reply related
* [PATCH] bcm63xx: use platform_get_irq in ehci-bcm63xx.c
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
As requested by USB maintainer, use platform_get_irq instead of
platform_get_resource.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/usb/host/ehci-bcm63xx.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/host/ehci-bcm63xx.c b/drivers/usb/host/ehci-bcm63xx.c
index 2fef571..0aba0f9 100644
--- a/drivers/usb/host/ehci-bcm63xx.c
+++ b/drivers/usb/host/ehci-bcm63xx.c
@@ -62,15 +62,15 @@ static const struct hc_driver ehci_bcm63xx_hc_driver = {
static int __devinit ehci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
{
- struct resource *res_mem, *res_irq;
+ struct resource *res_mem;
struct usb_hcd *hcd;
struct ehci_hcd *ehci;
u32 reg;
- int ret;
+ int ret, irq;
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
- if (!res_mem || !res_irq)
+ irq = platform_get_irq(pdev, 0);;
+ if (!res_mem || irq < 0)
return -ENODEV;
reg = bcm_rset_readl(RSET_USBH_PRIV, USBH_PRIV_SWAP_REG);
@@ -109,7 +109,7 @@ static int __devinit ehci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
ehci->sbrn = 0x20;
- ret = usb_add_hcd(hcd, res_irq->start, IRQF_DISABLED);
+ ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
if (ret)
goto out2;
--
1.6.0.4
^ permalink raw reply related
* [PATCH] bcm63xx: don't set bus type in ohci-bcm63xx.c
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
The platform code already sets the bus type, so don't do it.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/usb/host/ohci-bcm63xx.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/host/ohci-bcm63xx.c b/drivers/usb/host/ohci-bcm63xx.c
index f0e4639..d48c8ac 100644
--- a/drivers/usb/host/ohci-bcm63xx.c
+++ b/drivers/usb/host/ohci-bcm63xx.c
@@ -154,7 +154,6 @@ static struct platform_driver ohci_hcd_bcm63xx_driver = {
.driver = {
.name = "bcm63xx_ohci",
.owner = THIS_MODULE,
- .bus = &platform_bus_type
},
};
--
1.6.0.4
^ permalink raw reply related
* [PATCH] bcm63xx: use platform_get_irq in ohci-bcm63xx.c
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
As requested by USB maintainer, use platform_get_irq instead of
platform_get_resource.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/usb/host/ohci-bcm63xx.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/host/ohci-bcm63xx.c b/drivers/usb/host/ohci-bcm63xx.c
index 74f432f..f0e4639 100644
--- a/drivers/usb/host/ohci-bcm63xx.c
+++ b/drivers/usb/host/ohci-bcm63xx.c
@@ -58,15 +58,15 @@ static const struct hc_driver ohci_bcm63xx_hc_driver = {
static int __devinit ohci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
{
- struct resource *res_mem, *res_irq;
+ struct resource *res_mem;
struct usb_hcd *hcd;
struct ohci_hcd *ohci;
u32 reg;
- int ret;
+ int ret, irq;
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
- if (!res_mem || !res_irq)
+ irq = platform_get_irq(pdev, 0);
+ if (!res_mem || irq < 0)
return -ENODEV;
if (BCMCPU_IS_6348()) {
@@ -114,7 +114,7 @@ static int __devinit ohci_hcd_bcm63xx_drv_probe(struct platform_device *pdev)
OHCI_QUIRK_FRAME_NO;
ohci_hcd_init(ohci);
- ret = usb_add_hcd(hcd, res_irq->start, IRQF_DISABLED);
+ ret = usb_add_hcd(hcd, irq, IRQF_DISABLED);
if (ret)
goto out2;
--
1.6.0.4
^ permalink raw reply related
* [PATCH] bcm63xx: use napi_complete instead of __napi_complete
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
We're not disabling IRQ, so we must call the irq safe flavour of
napi_complete.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/net/bcm63xx_enet.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index a91f909..20e08ef 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -450,7 +450,7 @@ static int bcm_enet_poll(struct napi_struct *napi, int budget)
/* no more packet in rx/tx queue, remove device from poll
* queue */
- __napi_complete(napi);
+ napi_complete(napi);
/* restore rx/tx interrupt */
enet_dma_writel(priv, ENETDMA_IR_PKTDONE_MASK,
--
1.6.0.4
^ permalink raw reply related
* [PATCH] bcm63xx: limit number of usb port to 1.
From: Maxime Bizon @ 2009-06-01 17:08 UTC (permalink / raw)
To: linux-mips, Ralf Baechle; +Cc: Florian Fainelli, Maxime Bizon
In-Reply-To: <1243876095-8987-1-git-send-email-mbizon@freebox.fr>
This patch disables the use of more than one USB port. Hardware has
two ports, but one may be shared with USB slave port.
Until we have this information in the platform data, don't use the
second port.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/usb/host/ohci-bcm63xx.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/host/ohci-bcm63xx.c b/drivers/usb/host/ohci-bcm63xx.c
index 08807d9..74f432f 100644
--- a/drivers/usb/host/ohci-bcm63xx.c
+++ b/drivers/usb/host/ohci-bcm63xx.c
@@ -20,6 +20,8 @@ static int __devinit ohci_bcm63xx_start(struct usb_hcd *hcd)
struct ohci_hcd *ohci = hcd_to_ohci(hcd);
int ret;
+ ohci->num_ports = 1;
+
ret = ohci_init(ohci);
if (ret < 0)
return ret;
--
1.6.0.4
^ permalink raw reply related
* Re: [PATCH 10/10] bcm63xx: compile fixes for bcm63xx_enet.c
From: Florian Fainelli @ 2009-06-01 15:02 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <20090601145552.GI6604@linux-mips.org>
[-- Attachment #1: Type: text/plain, Size: 906 bytes --]
Le Monday 01 June 2009 16:55:52 Ralf Baechle, vous avez écrit :
> On Sun, May 31, 2009 at 08:31:34PM +0200, Florian Fainelli wrote:
> > This patch makes the ethernet driver compile again
> > after commit 908a7a1. netif_rx_schedule became
> > napi_schedule and __netif_rx_complete became
> > __napi_rx_complete.
> >
> > Signed-off-by: Florian Fainelli <florian@openwrt.org>
>
> Folded into the "MIPS: BCM63XX: Add integrated ethernet mac support."
> patch.
Thanks.
>
> You should eventually run this patch by the network maintainers. It's
> a driver patch so I won't merge it upstream unless it's been acked by one
> of the network guys.
Actually Maxime already submitted those patches, without much answer from the
network guys so I guess they just skipped it.
--
Best regards, Florian Fainelli
Email : florian@openwrt.org
http://openwrt.org
-------------------------------
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH 10/10] bcm63xx: compile fixes for bcm63xx_enet.c
From: Ralf Baechle @ 2009-06-01 14:55 UTC (permalink / raw)
To: Florian Fainelli; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <200905312031.35241.florian@openwrt.org>
On Sun, May 31, 2009 at 08:31:34PM +0200, Florian Fainelli wrote:
> This patch makes the ethernet driver compile again
> after commit 908a7a1. netif_rx_schedule became
> napi_schedule and __netif_rx_complete became
> __napi_rx_complete.
>
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
Folded into the "MIPS: BCM63XX: Add integrated ethernet mac support."
patch.
You should eventually run this patch by the network maintainers. It's
a driver patch so I won't merge it upstream unless it's been acked by one
of the network guys.
Thanks,
Ralf
^ permalink raw reply
* Re: [PATCH 09/10] bcm63xx: enable SSB bus support in defconfig
From: Ralf Baechle @ 2009-06-01 14:51 UTC (permalink / raw)
To: Florian Fainelli; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <200905312031.06050.florian@openwrt.org>
Folded into the existing series as well.
Thanks,
Ralf
^ permalink raw reply
* Re: [PATCH 07/10] bcm63xx: fix typo when printing CPU frequency
From: Florian Fainelli @ 2009-06-01 14:50 UTC (permalink / raw)
To: Ralf Baechle; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <20090601144618.GF6604@linux-mips.org>
Le Monday 01 June 2009 16:46:18 Ralf Baechle, vous avez écrit :
> On Sun, May 31, 2009 at 08:29:49PM +0200, Florian Fainelli wrote:
> > This patch corrects the comment about the CPU
> > frequency which is actually printed in Hz and not MHz.
> >
> > Signed-off-by: Florian Fainelli <florian@openwrt.org>
> > ---
> > diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
> > index 0a403dd..410c788 100644
> > --- a/arch/mips/bcm63xx/cpu.c
> > +++ b/arch/mips/bcm63xx/cpu.c
> > @@ -238,7 +238,7 @@ void __init bcm63xx_cpu_init(void)
> >
> > printk(KERN_INFO "Detected Broadcom 0x%04x CPU revision %02x\n",
> > bcm63xx_cpu_id, bcm63xx_cpu_rev);
> > - printk(KERN_INFO "CPU frequency is %u MHz\n",
> > + printk(KERN_INFO "CPU frequency is %u Hz\n",
>
> While technically ok I would suggest to print the number in MHz. Acuracy
> probably doesn't matter so even rounding to whole MHz would be ok.
>
> Want me to apply anyway?
No that is a one-liner I will respin a new one which prints the frequency in
Mhz directly.
--
Best regards, Florian Fainelli
Email : florian@openwrt.org
http://openwrt.org
-------------------------------
^ permalink raw reply
* Re: [PATCH 08/10] bcm63xx: update defconfig with gpiolib
From: Ralf Baechle @ 2009-06-01 14:49 UTC (permalink / raw)
To: Florian Fainelli; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <200905312030.38974.florian@openwrt.org>
On Sun, May 31, 2009 at 08:30:38PM +0200, Florian Fainelli wrote:
Folded into the existing patchset.
Thanks,
Ralf
^ permalink raw reply
* Re: [PATCH 07/10] bcm63xx: fix typo when printing CPU frequency
From: Ralf Baechle @ 2009-06-01 14:46 UTC (permalink / raw)
To: Florian Fainelli; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <200905312029.50326.florian@openwrt.org>
On Sun, May 31, 2009 at 08:29:49PM +0200, Florian Fainelli wrote:
> This patch corrects the comment about the CPU
> frequency which is actually printed in Hz and not MHz.
>
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
> index 0a403dd..410c788 100644
> --- a/arch/mips/bcm63xx/cpu.c
> +++ b/arch/mips/bcm63xx/cpu.c
> @@ -238,7 +238,7 @@ void __init bcm63xx_cpu_init(void)
>
> printk(KERN_INFO "Detected Broadcom 0x%04x CPU revision %02x\n",
> bcm63xx_cpu_id, bcm63xx_cpu_rev);
> - printk(KERN_INFO "CPU frequency is %u MHz\n",
> + printk(KERN_INFO "CPU frequency is %u Hz\n",
While technically ok I would suggest to print the number in MHz. Acuracy
probably doesn't matter so even rounding to whole MHz would be ok.
Want me to apply anyway?
Ralf
^ permalink raw reply
* Re: [PATCH 06/10] bcm63xx: zero initialize mac_addr_used.
From: Ralf Baechle @ 2009-06-01 14:41 UTC (permalink / raw)
To: Florian Fainelli; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <200905312029.07558.florian@openwrt.org>
On Sun, May 31, 2009 at 08:29:07PM +0200, Florian Fainelli wrote:
> This patch initializes mac_addr_used to zero, the checks
> against it later would not work properly.
>
> Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> index 78a40e7..298804a 100644
> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
> +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
> @@ -32,7 +32,7 @@
> #define PFX "board_bcm963xx: "
>
> static struct bcm963xx_nvram nvram;
> -static unsigned int mac_addr_used;
> +static unsigned int mac_addr_used = 0;
Ditto - the variable defaults to zero. Explicit initialization however
will inflate the .data section. Dropped.
Ralf
^ permalink raw reply
* Re: [PATCH 05/10] bcm63xx: dev-enet: initialize shared_device_registered to 0
From: Ralf Baechle @ 2009-06-01 14:41 UTC (permalink / raw)
To: Florian Fainelli; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <200905312028.37498.florian@openwrt.org>
On Sun, May 31, 2009 at 08:28:37PM +0200, Florian Fainelli wrote:
> This patch initialize the shared_device_registered
> variable with 0, actually required for the check
> to be working.
>
> Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c
> index 51c2e5a..0298973 100644
> --- a/arch/mips/bcm63xx/dev-enet.c
> +++ b/arch/mips/bcm63xx/dev-enet.c
> @@ -28,7 +28,7 @@ static struct platform_device bcm63xx_enet_shared_device = {
> .resource = shared_res,
> };
>
> -static int shared_device_registered;
> +static int shared_device_registered = 0;
This is bogus. The variable defaults to zero. Explicit initialization
however will inflate the .data section. Dropped.
Ralf
^ permalink raw reply
* Re: [PATCH 03/10] bcm63xx: add new BCM6358-based board definitions
From: Ralf Baechle @ 2009-06-01 14:30 UTC (permalink / raw)
To: Florian Fainelli; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <200905312026.50533.florian@openwrt.org>
On Sun, May 31, 2009 at 08:26:50PM +0200, Florian Fainelli wrote:
Also folded into the existing series.
Thanks,
Ralf
^ permalink raw reply
* Re: [PATCH 02/10] bcm63xx: add new BCM6348-based board definitions
From: Ralf Baechle @ 2009-06-01 14:29 UTC (permalink / raw)
To: Florian Fainelli; +Cc: linux-mips, Maxime Bizon
In-Reply-To: <200905312026.19705.florian@openwrt.org>
On Sun, May 31, 2009 at 08:26:19PM +0200, Florian Fainelli wrote:
Folded into the existing patchset after removing the bloody trailing
whitespaces added by it.
Thanks,
Ralf
^ 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