Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 48564master
Rafał Miłecki
9 years ago
parent
2530640f07
commit
ddc8437f08
@ -0,0 +1,99 @@ |
||||
From 1b49522dc7154751401512977d07ad01e5182c47 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Sat, 30 Jan 2016 00:35:37 +0100
|
||||
Subject: [PATCH] bgmac: add helper checking for BCM4707 / BCM53018 chip id
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Chipsets with BCM4707 / BCM53018 ID require special handling at a few
|
||||
places in the code. It's likely there will be more IDs to check in the
|
||||
future. To simplify it add this trivial helper.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
---
|
||||
drivers/net/ethernet/broadcom/bgmac.c | 29 ++++++++++++++++-------------
|
||||
1 file changed, 16 insertions(+), 13 deletions(-)
|
||||
|
||||
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
||||
@@ -26,6 +26,17 @@ static const struct bcma_device_id bgmac
|
||||
};
|
||||
MODULE_DEVICE_TABLE(bcma, bgmac_bcma_tbl);
|
||||
|
||||
+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_BCM53018:
|
||||
+ return true;
|
||||
+ default:
|
||||
+ return false;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static bool bgmac_wait_value(struct bcma_device *core, u16 reg, u32 mask,
|
||||
u32 value, int timeout)
|
||||
{
|
||||
@@ -982,11 +993,9 @@ static void bgmac_mac_speed(struct bgmac
|
||||
static void bgmac_miiconfig(struct bgmac *bgmac)
|
||||
{
|
||||
struct bcma_device *core = bgmac->core;
|
||||
- struct bcma_chipinfo *ci = &core->bus->chipinfo;
|
||||
u8 imode;
|
||||
|
||||
- if (ci->id == BCMA_CHIP_ID_BCM4707 ||
|
||||
- ci->id == BCMA_CHIP_ID_BCM53018) {
|
||||
+ if (bgmac_is_bcm4707_family(bgmac)) {
|
||||
bcma_awrite32(core, BCMA_IOCTL,
|
||||
bcma_aread32(core, BCMA_IOCTL) | 0x40 |
|
||||
BGMAC_BCMA_IOCTL_SW_CLKEN);
|
||||
@@ -1050,9 +1059,7 @@ static void bgmac_chip_reset(struct bgma
|
||||
}
|
||||
|
||||
/* Request Misc PLL for corerev > 2 */
|
||||
- if (core->id.rev > 2 &&
|
||||
- ci->id != BCMA_CHIP_ID_BCM4707 &&
|
||||
- ci->id != BCMA_CHIP_ID_BCM53018) {
|
||||
+ if (core->id.rev > 2 && !bgmac_is_bcm4707_family(bgmac)) {
|
||||
bgmac_set(bgmac, BCMA_CLKCTLST,
|
||||
BGMAC_BCMA_CLKCTLST_MISC_PLL_REQ);
|
||||
bgmac_wait_value(bgmac->core, BCMA_CLKCTLST,
|
||||
@@ -1188,8 +1195,7 @@ static void bgmac_enable(struct bgmac *b
|
||||
break;
|
||||
}
|
||||
|
||||
- if (ci->id != BCMA_CHIP_ID_BCM4707 &&
|
||||
- ci->id != BCMA_CHIP_ID_BCM53018) {
|
||||
+ if (!bgmac_is_bcm4707_family(bgmac)) {
|
||||
rxq_ctl = bgmac_read(bgmac, BGMAC_RXQ_CTL);
|
||||
rxq_ctl &= ~BGMAC_RXQ_CTL_MDP_MASK;
|
||||
bp_clk = bcma_pmu_get_bus_clock(&bgmac->core->bus->drv_cc) /
|
||||
@@ -1473,8 +1479,7 @@ static int bgmac_mii_register(struct bgm
|
||||
char bus_id[MII_BUS_ID_SIZE + 3];
|
||||
int i, err = 0;
|
||||
|
||||
- if (ci->id == BCMA_CHIP_ID_BCM4707 ||
|
||||
- ci->id == BCMA_CHIP_ID_BCM53018)
|
||||
+ if (bgmac_is_bcm4707_family(bgmac))
|
||||
return bgmac_fixed_phy_register(bgmac);
|
||||
|
||||
mii_bus = mdiobus_alloc();
|
||||
@@ -1545,7 +1550,6 @@ static void bgmac_mii_unregister(struct
|
||||
/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */
|
||||
static int bgmac_probe(struct bcma_device *core)
|
||||
{
|
||||
- struct bcma_chipinfo *ci = &core->bus->chipinfo;
|
||||
struct net_device *net_dev;
|
||||
struct bgmac *bgmac;
|
||||
struct ssb_sprom *sprom = &core->bus->sprom;
|
||||
@@ -1626,8 +1630,7 @@ static int bgmac_probe(struct bcma_devic
|
||||
bgmac_chip_reset(bgmac);
|
||||
|
||||
/* For Northstar, we have to take all GMAC core out of reset */
|
||||
- if (ci->id == BCMA_CHIP_ID_BCM4707 ||
|
||||
- ci->id == BCMA_CHIP_ID_BCM53018) {
|
||||
+ if (bgmac_is_bcm4707_family(bgmac)) {
|
||||
struct bcma_device *ns_core;
|
||||
int ns_gmac;
|
||||
|
||||
@ -0,0 +1,30 @@ |
||||
From 64a1905f49391e41e660dd5d079e2c61d5344920 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Sat, 30 Jan 2016 14:05:37 +0100
|
||||
Subject: [PATCH] bgmac: support Ethernet device on BCM47094 SoC
|
||||
|
||||
It needs very similar workarounds to the one on BCM4707.
|
||||
---
|
||||
drivers/net/ethernet/broadcom/bgmac.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
||||
@@ -30,6 +30,7 @@ static inline bool bgmac_is_bcm4707_fami
|
||||
{
|
||||
switch (bgmac->core->bus->chipinfo.id) {
|
||||
case BCMA_CHIP_ID_BCM4707:
|
||||
+ case BCMA_CHIP_ID_BCM47094:
|
||||
case BCMA_CHIP_ID_BCM53018:
|
||||
return true;
|
||||
default:
|
||||
@@ -1048,7 +1049,8 @@ static void bgmac_chip_reset(struct bgma
|
||||
iost &= ~BGMAC_BCMA_IOST_ATTACHED;
|
||||
|
||||
/* 3GMAC: for BCM4707, only do core reset at bgmac_probe() */
|
||||
- if (ci->id != BCMA_CHIP_ID_BCM4707) {
|
||||
+ 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;
|
||||
Loading…
Reference in new issue