[PATCH] bgmac: support Ethernet device on BCM47094 SoC

[PATCH] bgmac: support Ethernet device on BCM47094 SoC

[Rafał Miłecki]

It needs very similar workarounds to the one on BCM4707. It was tested
on D-Link DIR-885L home router.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
 drivers/net/ethernet/broadcom/bgmac.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 230f8e6..99b30a9 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -30,6 +30,7 @@ static inline bool bgmac_is_bcm4707_family(struct bgmac *bgmac)
 {
 	switch (bgmac->core->bus->chipinfo.id) {
 	case BCMA_CHIP_ID_BCM4707:
+	case BCMA_CHIP_ID_BCM47094:
 	case BCMA_CHIP_ID_BCM53018:
 		return true;
 	default:
@@ -1052,8 +1053,9 @@ static void bgmac_chip_reset(struct bgmac *bgmac)
 	    (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188))
 		iost &= ~BGMAC_BCMA_IOST_ATTACHED;
 
-	/* 3GMAC: for BCM4707, only do core reset at bgmac_probe() */
-	if (ci->id != BCMA_CHIP_ID_BCM4707) {
+	/* 3GMAC: for BCM4707 & BCM47094, only do core reset at bgmac_probe() */
+	if (ci->id != BCMA_CHIP_ID_BCM4707 &&
+	    ci->id != BCMA_CHIP_ID_BCM47094) {
 		flags = 0;
 		if (iost & BGMAC_BCMA_IOST_ATTACHED) {
 			flags = BGMAC_BCMA_IOCTL_SW_CLKEN;
-- 
1.8.4.5

Re: [PATCH] bgmac: support Ethernet device on BCM47094 SoC

[David Miller]

From: Rafał Miłecki <zajec5@gmail.com>
Date: Wed, 17 Feb 2016 07:48:28 +0100

> It needs very similar workarounds to the one on BCM4707. It was tested
> on D-Link DIR-885L home router.
> 
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

This patch doesn't apply, I get rejects.

Re: [PATCH] bgmac: support Ethernet device on BCM47094 SoC

[Rafał Miłecki]

On 19 February 2016 at 21:37, David Miller <davem@davemloft.net> wrote:
> From: Rafał Miłecki <zajec5@gmail.com>
> Date: Wed, 17 Feb 2016 07:48:28 +0100
>
>> It needs very similar workarounds to the one on BCM4707. It was tested
>> on D-Link DIR-885L home router.
>>
>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>
> This patch doesn't apply, I get rejects.

I developed it on top of:
547b9ca Merge branch 'ip-sysctl-namespaceify'
I just rebased in on top of origin/master:
76d13b5 hv_netvsc: add software transmit timestamp support
and it did cleanly. I'm using net-next git tree.

Are you applying it to net-next? It way my intention, sorry if I was
supposed to make it more clear. It depends e.g. on some extra patches,
e.g.:
387b75f bgmac: add helper checking for BCM4707 / BCM53018 chip id
61dba73 bcma: add support for BCM47094
so it's for net-next only.

-- 
Rafał

Re: [PATCH] bgmac: support Ethernet device on BCM47094 SoC

[David Miller]

From: Rafał Miłecki <zajec5@gmail.com>
Date: Fri, 19 Feb 2016 22:26:48 +0100

> Are you applying it to net-next? It way my intention, sorry if I was
> supposed to make it more clear.

You are always supposed to specify this explicitly, in the
Subject line, after PATCH, like "[PATCH net-next] bgmac: ..."