Commit 41e8c70e authored by David S. Miller's avatar David S. Miller

Merge branch 'bcm7278'

Florian Fainelli says:

====================
net: dsa: bcm_sf2: Add support for BCM7278

This patch series adds support for the Broadcom BCM7278 integrated switch
which is a successor of the BCM7445 switch. We have a little bit of
register shuffling going on, which is why most of the functional changes
are to deal with that.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b20b564b 039a7b85
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Required properties: Required properties:
- compatible: should be "brcm,bcm7445-switch-v4.0" - compatible: should be "brcm,bcm7445-switch-v4.0" or "brcm,bcm7278-switch-v4.0"
- reg: addresses and length of the register sets for the device, must be 6 - reg: addresses and length of the register sets for the device, must be 6
pairs of register addresses and lengths pairs of register addresses and lengths
- interrupts: interrupts for the devices, must be two interrupts - interrupts: interrupts for the devices, must be two interrupts
...@@ -41,6 +41,13 @@ Optional properties: ...@@ -41,6 +41,13 @@ Optional properties:
Admission Control Block supports reporting the number of packets in-flight in a Admission Control Block supports reporting the number of packets in-flight in a
switch queue switch queue
Port subnodes:
Optional properties:
- brcm,use-bcm-hdr: boolean property, if present, indicates that the switch
port has Broadcom tags enabled (per-packet metadata)
Example: Example:
switch_top@f0b00000 { switch_top@f0b00000 {
...@@ -114,6 +121,7 @@ switch_top@f0b00000 { ...@@ -114,6 +121,7 @@ switch_top@f0b00000 {
port@0 { port@0 {
label = "gphy"; label = "gphy";
reg = <0>; reg = <0>;
brcm,use-bcm-hdr;
}; };
... ...
}; };
......
...@@ -1685,6 +1685,18 @@ static const struct b53_chip_data b53_switch_chips[] = { ...@@ -1685,6 +1685,18 @@ static const struct b53_chip_data b53_switch_chips[] = {
.jumbo_pm_reg = B53_JUMBO_PORT_MASK, .jumbo_pm_reg = B53_JUMBO_PORT_MASK,
.jumbo_size_reg = B53_JUMBO_MAX_SIZE, .jumbo_size_reg = B53_JUMBO_MAX_SIZE,
}, },
{
.chip_id = BCM7278_DEVICE_ID,
.dev_name = "BCM7278",
.vlans = 4096,
.enabled_ports = 0x1ff,
.arl_entries= 4,
.cpu_port = B53_CPU_PORT,
.vta_regs = B53_VTA_REGS,
.duplex_reg = B53_DUPLEX_STAT_GE,
.jumbo_pm_reg = B53_JUMBO_PORT_MASK,
.jumbo_size_reg = B53_JUMBO_MAX_SIZE,
},
}; };
static int b53_switch_init(struct b53_device *dev) static int b53_switch_init(struct b53_device *dev)
......
...@@ -62,6 +62,7 @@ enum { ...@@ -62,6 +62,7 @@ enum {
BCM53019_DEVICE_ID = 0x53019, BCM53019_DEVICE_ID = 0x53019,
BCM58XX_DEVICE_ID = 0x5800, BCM58XX_DEVICE_ID = 0x5800,
BCM7445_DEVICE_ID = 0x7445, BCM7445_DEVICE_ID = 0x7445,
BCM7278_DEVICE_ID = 0x7278,
}; };
#define B53_N_PORTS 9 #define B53_N_PORTS 9
...@@ -179,7 +180,8 @@ static inline int is5301x(struct b53_device *dev) ...@@ -179,7 +180,8 @@ static inline int is5301x(struct b53_device *dev)
static inline int is58xx(struct b53_device *dev) static inline int is58xx(struct b53_device *dev)
{ {
return dev->chip_id == BCM58XX_DEVICE_ID || return dev->chip_id == BCM58XX_DEVICE_ID ||
dev->chip_id == BCM7445_DEVICE_ID; dev->chip_id == BCM7445_DEVICE_ID ||
dev->chip_id == BCM7278_DEVICE_ID;
} }
#define B53_CPU_PORT_25 5 #define B53_CPU_PORT_25 5
......
...@@ -61,30 +61,10 @@ static void bcm_sf2_imp_vlan_setup(struct dsa_switch *ds, int cpu_port) ...@@ -61,30 +61,10 @@ static void bcm_sf2_imp_vlan_setup(struct dsa_switch *ds, int cpu_port)
} }
} }
static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) static void bcm_sf2_brcm_hdr_setup(struct bcm_sf2_priv *priv, int port)
{ {
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
u32 reg, val; u32 reg, val;
/* Enable the port memories */
reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);
reg &= ~P_TXQ_PSM_VDD(port);
core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);
/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */
reg = core_readl(priv, CORE_IMP_CTL);
reg |= (RX_BCST_EN | RX_MCST_EN | RX_UCST_EN);
reg &= ~(RX_DIS | TX_DIS);
core_writel(priv, reg, CORE_IMP_CTL);
/* Enable forwarding */
core_writel(priv, SW_FWDG_EN, CORE_SWMODE);
/* Enable IMP port in dumb mode */
reg = core_readl(priv, CORE_SWITCH_CTRL);
reg |= MII_DUMB_FWDG_EN;
core_writel(priv, reg, CORE_SWITCH_CTRL);
/* Resolve which bit controls the Broadcom tag */ /* Resolve which bit controls the Broadcom tag */
switch (port) { switch (port) {
case 8: case 8:
...@@ -119,11 +99,43 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port) ...@@ -119,11 +99,43 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)
reg = core_readl(priv, CORE_BRCM_HDR_TX_DIS); reg = core_readl(priv, CORE_BRCM_HDR_TX_DIS);
reg &= ~(1 << port); reg &= ~(1 << port);
core_writel(priv, reg, CORE_BRCM_HDR_TX_DIS); core_writel(priv, reg, CORE_BRCM_HDR_TX_DIS);
}
static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)
{
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
u32 reg, offset;
if (priv->type == BCM7445_DEVICE_ID)
offset = CORE_STS_OVERRIDE_IMP;
else
offset = CORE_STS_OVERRIDE_IMP2;
/* Enable the port memories */
reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);
reg &= ~P_TXQ_PSM_VDD(port);
core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);
/* Enable Broadcast, Multicast, Unicast forwarding to IMP port */
reg = core_readl(priv, CORE_IMP_CTL);
reg |= (RX_BCST_EN | RX_MCST_EN | RX_UCST_EN);
reg &= ~(RX_DIS | TX_DIS);
core_writel(priv, reg, CORE_IMP_CTL);
/* Enable forwarding */
core_writel(priv, SW_FWDG_EN, CORE_SWMODE);
/* Enable IMP port in dumb mode */
reg = core_readl(priv, CORE_SWITCH_CTRL);
reg |= MII_DUMB_FWDG_EN;
core_writel(priv, reg, CORE_SWITCH_CTRL);
bcm_sf2_brcm_hdr_setup(priv, port);
/* Force link status for IMP port */ /* Force link status for IMP port */
reg = core_readl(priv, CORE_STS_OVERRIDE_IMP); reg = core_readl(priv, offset);
reg |= (MII_SW_OR | LINK_STS); reg |= (MII_SW_OR | LINK_STS);
core_writel(priv, reg, CORE_STS_OVERRIDE_IMP); core_writel(priv, reg, offset);
} }
static void bcm_sf2_eee_enable_set(struct dsa_switch *ds, int port, bool enable) static void bcm_sf2_eee_enable_set(struct dsa_switch *ds, int port, bool enable)
...@@ -224,6 +236,10 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port, ...@@ -224,6 +236,10 @@ static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,
reg &= ~P_TXQ_PSM_VDD(port); reg &= ~P_TXQ_PSM_VDD(port);
core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL); core_writel(priv, reg, CORE_MEM_PSM_VDD_CTRL);
/* Enable Broadcom tags for that port if requested */
if (priv->brcm_tag_mask & BIT(port))
bcm_sf2_brcm_hdr_setup(priv, port);
/* Clear the Rx and Tx disable bits and set to no spanning tree */ /* Clear the Rx and Tx disable bits and set to no spanning tree */
core_writel(priv, 0, CORE_G_PCTL_PORT(port)); core_writel(priv, 0, CORE_G_PCTL_PORT(port));
...@@ -503,6 +519,9 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv, ...@@ -503,6 +519,9 @@ static void bcm_sf2_identify_ports(struct bcm_sf2_priv *priv,
if (mode == PHY_INTERFACE_MODE_MOCA) if (mode == PHY_INTERFACE_MODE_MOCA)
priv->moca_port = port_num; priv->moca_port = port_num;
if (of_property_read_bool(port, "brcm,use-bcm-hdr"))
priv->brcm_tag_mask |= 1 << port_num;
} }
} }
...@@ -591,7 +610,12 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port, ...@@ -591,7 +610,12 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port,
struct ethtool_eee *p = &priv->port_sts[port].eee; struct ethtool_eee *p = &priv->port_sts[port].eee;
u32 id_mode_dis = 0, port_mode; u32 id_mode_dis = 0, port_mode;
const char *str = NULL; const char *str = NULL;
u32 reg; u32 reg, offset;
if (priv->type == BCM7445_DEVICE_ID)
offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
else
offset = CORE_STS_OVERRIDE_GMIIP2_PORT(port);
switch (phydev->interface) { switch (phydev->interface) {
case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII:
...@@ -662,7 +686,7 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port, ...@@ -662,7 +686,7 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port,
if (phydev->duplex == DUPLEX_FULL) if (phydev->duplex == DUPLEX_FULL)
reg |= DUPLX_MODE; reg |= DUPLX_MODE;
core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port)); core_writel(priv, reg, offset);
if (!phydev->is_pseudo_fixed_link) if (!phydev->is_pseudo_fixed_link)
p->eee_enabled = bcm_sf2_eee_init(ds, port, phydev); p->eee_enabled = bcm_sf2_eee_init(ds, port, phydev);
...@@ -672,9 +696,14 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port, ...@@ -672,9 +696,14 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,
struct fixed_phy_status *status) struct fixed_phy_status *status)
{ {
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
u32 duplex, pause; u32 duplex, pause, offset;
u32 reg; u32 reg;
if (priv->type == BCM7445_DEVICE_ID)
offset = CORE_STS_OVERRIDE_GMIIP_PORT(port);
else
offset = CORE_STS_OVERRIDE_GMIIP2_PORT(port);
duplex = core_readl(priv, CORE_DUPSTS); duplex = core_readl(priv, CORE_DUPSTS);
pause = core_readl(priv, CORE_PAUSESTS); pause = core_readl(priv, CORE_PAUSESTS);
...@@ -703,13 +732,13 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port, ...@@ -703,13 +732,13 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,
status->duplex = !!(duplex & (1 << port)); status->duplex = !!(duplex & (1 << port));
} }
reg = core_readl(priv, CORE_STS_OVERRIDE_GMIIP_PORT(port)); reg = core_readl(priv, offset);
reg |= SW_OVERRIDE; reg |= SW_OVERRIDE;
if (status->link) if (status->link)
reg |= LINK_STS; reg |= LINK_STS;
else else
reg &= ~LINK_STS; reg &= ~LINK_STS;
core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port)); core_writel(priv, reg, offset);
if ((pause & (1 << port)) && if ((pause & (1 << port)) &&
(pause & (1 << (port + PAUSESTS_TX_PAUSE_SHIFT)))) { (pause & (1 << (port + PAUSESTS_TX_PAUSE_SHIFT)))) {
...@@ -1009,10 +1038,74 @@ static const struct dsa_switch_ops bcm_sf2_ops = { ...@@ -1009,10 +1038,74 @@ static const struct dsa_switch_ops bcm_sf2_ops = {
.port_fdb_del = b53_fdb_del, .port_fdb_del = b53_fdb_del,
}; };
struct bcm_sf2_of_data {
u32 type;
const u16 *reg_offsets;
unsigned int core_reg_align;
};
/* Register offsets for the SWITCH_REG_* block */
static const u16 bcm_sf2_7445_reg_offsets[] = {
[REG_SWITCH_CNTRL] = 0x00,
[REG_SWITCH_STATUS] = 0x04,
[REG_DIR_DATA_WRITE] = 0x08,
[REG_DIR_DATA_READ] = 0x0C,
[REG_SWITCH_REVISION] = 0x18,
[REG_PHY_REVISION] = 0x1C,
[REG_SPHY_CNTRL] = 0x2C,
[REG_RGMII_0_CNTRL] = 0x34,
[REG_RGMII_1_CNTRL] = 0x40,
[REG_RGMII_2_CNTRL] = 0x4c,
[REG_LED_0_CNTRL] = 0x90,
[REG_LED_1_CNTRL] = 0x94,
[REG_LED_2_CNTRL] = 0x98,
};
static const struct bcm_sf2_of_data bcm_sf2_7445_data = {
.type = BCM7445_DEVICE_ID,
.core_reg_align = 0,
.reg_offsets = bcm_sf2_7445_reg_offsets,
};
static const u16 bcm_sf2_7278_reg_offsets[] = {
[REG_SWITCH_CNTRL] = 0x00,
[REG_SWITCH_STATUS] = 0x04,
[REG_DIR_DATA_WRITE] = 0x08,
[REG_DIR_DATA_READ] = 0x0c,
[REG_SWITCH_REVISION] = 0x10,
[REG_PHY_REVISION] = 0x14,
[REG_SPHY_CNTRL] = 0x24,
[REG_RGMII_0_CNTRL] = 0xe0,
[REG_RGMII_1_CNTRL] = 0xec,
[REG_RGMII_2_CNTRL] = 0xf8,
[REG_LED_0_CNTRL] = 0x40,
[REG_LED_1_CNTRL] = 0x4c,
[REG_LED_2_CNTRL] = 0x58,
};
static const struct bcm_sf2_of_data bcm_sf2_7278_data = {
.type = BCM7278_DEVICE_ID,
.core_reg_align = 1,
.reg_offsets = bcm_sf2_7278_reg_offsets,
};
static const struct of_device_id bcm_sf2_of_match[] = {
{ .compatible = "brcm,bcm7445-switch-v4.0",
.data = &bcm_sf2_7445_data
},
{ .compatible = "brcm,bcm7278-switch-v4.0",
.data = &bcm_sf2_7278_data
},
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, bcm_sf2_of_match);
static int bcm_sf2_sw_probe(struct platform_device *pdev) static int bcm_sf2_sw_probe(struct platform_device *pdev)
{ {
const char *reg_names[BCM_SF2_REGS_NUM] = BCM_SF2_REGS_NAME; const char *reg_names[BCM_SF2_REGS_NUM] = BCM_SF2_REGS_NAME;
struct device_node *dn = pdev->dev.of_node; struct device_node *dn = pdev->dev.of_node;
const struct of_device_id *of_id = NULL;
const struct bcm_sf2_of_data *data;
struct b53_platform_data *pdata; struct b53_platform_data *pdata;
struct dsa_switch_ops *ops; struct dsa_switch_ops *ops;
struct bcm_sf2_priv *priv; struct bcm_sf2_priv *priv;
...@@ -1040,11 +1133,22 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev) ...@@ -1040,11 +1133,22 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
if (!pdata) if (!pdata)
return -ENOMEM; return -ENOMEM;
of_id = of_match_node(bcm_sf2_of_match, dn);
if (!of_id || !of_id->data)
return -EINVAL;
data = of_id->data;
/* Set SWITCH_REG register offsets and SWITCH_CORE align factor */
priv->type = data->type;
priv->reg_offsets = data->reg_offsets;
priv->core_reg_align = data->core_reg_align;
/* Auto-detection using standard registers will not work, so /* Auto-detection using standard registers will not work, so
* provide an indication of what kind of device we are for * provide an indication of what kind of device we are for
* b53_common to work with * b53_common to work with
*/ */
pdata->chip_id = BCM7445_DEVICE_ID; pdata->chip_id = priv->type;
dev->pdata = pdata; dev->pdata = pdata;
priv->dev = dev; priv->dev = dev;
...@@ -1190,11 +1294,6 @@ static int bcm_sf2_resume(struct device *dev) ...@@ -1190,11 +1294,6 @@ static int bcm_sf2_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(bcm_sf2_pm_ops, static SIMPLE_DEV_PM_OPS(bcm_sf2_pm_ops,
bcm_sf2_suspend, bcm_sf2_resume); bcm_sf2_suspend, bcm_sf2_resume);
static const struct of_device_id bcm_sf2_of_match[] = {
{ .compatible = "brcm,bcm7445-switch-v4.0" },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, bcm_sf2_of_match);
static struct platform_driver bcm_sf2_driver = { static struct platform_driver bcm_sf2_driver = {
.probe = bcm_sf2_sw_probe, .probe = bcm_sf2_sw_probe,
......
...@@ -61,6 +61,11 @@ struct bcm_sf2_priv { ...@@ -61,6 +61,11 @@ struct bcm_sf2_priv {
void __iomem *fcb; void __iomem *fcb;
void __iomem *acb; void __iomem *acb;
/* Register offsets indirection tables */
u32 type;
const u16 *reg_offsets;
unsigned int core_reg_align;
/* spinlock protecting access to the indirect registers */ /* spinlock protecting access to the indirect registers */
spinlock_t indir_lock; spinlock_t indir_lock;
...@@ -95,6 +100,9 @@ struct bcm_sf2_priv { ...@@ -95,6 +100,9 @@ struct bcm_sf2_priv {
struct device_node *master_mii_dn; struct device_node *master_mii_dn;
struct mii_bus *slave_mii_bus; struct mii_bus *slave_mii_bus;
struct mii_bus *master_mii_bus; struct mii_bus *master_mii_bus;
/* Bitmask of ports needing BRCM tags */
unsigned int brcm_tag_mask;
}; };
static inline struct bcm_sf2_priv *bcm_sf2_to_priv(struct dsa_switch *ds) static inline struct bcm_sf2_priv *bcm_sf2_to_priv(struct dsa_switch *ds)
...@@ -104,6 +112,11 @@ static inline struct bcm_sf2_priv *bcm_sf2_to_priv(struct dsa_switch *ds) ...@@ -104,6 +112,11 @@ static inline struct bcm_sf2_priv *bcm_sf2_to_priv(struct dsa_switch *ds)
return dev->priv; return dev->priv;
} }
static inline u32 bcm_sf2_mangle_addr(struct bcm_sf2_priv *priv, u32 off)
{
return off << priv->core_reg_align;
}
#define SF2_IO_MACRO(name) \ #define SF2_IO_MACRO(name) \
static inline u32 name##_readl(struct bcm_sf2_priv *priv, u32 off) \ static inline u32 name##_readl(struct bcm_sf2_priv *priv, u32 off) \
{ \ { \
...@@ -125,7 +138,7 @@ static inline u64 name##_readq(struct bcm_sf2_priv *priv, u32 off) \ ...@@ -125,7 +138,7 @@ static inline u64 name##_readq(struct bcm_sf2_priv *priv, u32 off) \
{ \ { \
u32 indir, dir; \ u32 indir, dir; \
spin_lock(&priv->indir_lock); \ spin_lock(&priv->indir_lock); \
dir = __raw_readl(priv->name + off); \ dir = name##_readl(priv, off); \
indir = reg_readl(priv, REG_DIR_DATA_READ); \ indir = reg_readl(priv, REG_DIR_DATA_READ); \
spin_unlock(&priv->indir_lock); \ spin_unlock(&priv->indir_lock); \
return (u64)indir << 32 | dir; \ return (u64)indir << 32 | dir; \
...@@ -135,7 +148,7 @@ static inline void name##_writeq(struct bcm_sf2_priv *priv, u64 val, \ ...@@ -135,7 +148,7 @@ static inline void name##_writeq(struct bcm_sf2_priv *priv, u64 val, \
{ \ { \
spin_lock(&priv->indir_lock); \ spin_lock(&priv->indir_lock); \
reg_writel(priv, upper_32_bits(val), REG_DIR_DATA_WRITE); \ reg_writel(priv, upper_32_bits(val), REG_DIR_DATA_WRITE); \
__raw_writel(lower_32_bits(val), priv->name + off); \ name##_writel(priv, lower_32_bits(val), off); \
spin_unlock(&priv->indir_lock); \ spin_unlock(&priv->indir_lock); \
} }
...@@ -153,8 +166,28 @@ static inline void intrl2_##which##_mask_set(struct bcm_sf2_priv *priv, \ ...@@ -153,8 +166,28 @@ static inline void intrl2_##which##_mask_set(struct bcm_sf2_priv *priv, \
priv->irq##which##_mask |= (mask); \ priv->irq##which##_mask |= (mask); \
} \ } \
SF2_IO_MACRO(core); static inline u32 core_readl(struct bcm_sf2_priv *priv, u32 off)
SF2_IO_MACRO(reg); {
u32 tmp = bcm_sf2_mangle_addr(priv, off);
return __raw_readl(priv->core + tmp);
}
static inline void core_writel(struct bcm_sf2_priv *priv, u32 val, u32 off)
{
u32 tmp = bcm_sf2_mangle_addr(priv, off);
__raw_writel(val, priv->core + tmp);
}
static inline u32 reg_readl(struct bcm_sf2_priv *priv, u16 off)
{
return __raw_readl(priv->reg + priv->reg_offsets[off]);
}
static inline void reg_writel(struct bcm_sf2_priv *priv, u32 val, u16 off)
{
__raw_writel(val, priv->reg + priv->reg_offsets[off]);
}
SF2_IO64_MACRO(core); SF2_IO64_MACRO(core);
SF2_IO_MACRO(intrl2_0); SF2_IO_MACRO(intrl2_0);
SF2_IO_MACRO(intrl2_1); SF2_IO_MACRO(intrl2_1);
......
...@@ -12,22 +12,36 @@ ...@@ -12,22 +12,36 @@
#define __BCM_SF2_REGS_H #define __BCM_SF2_REGS_H
/* Register set relative to 'REG' */ /* Register set relative to 'REG' */
#define REG_SWITCH_CNTRL 0x00
#define MDIO_MASTER_SEL (1 << 0)
#define REG_SWITCH_STATUS 0x04 enum bcm_sf2_reg_offs {
#define REG_DIR_DATA_WRITE 0x08 REG_SWITCH_CNTRL = 0,
#define REG_DIR_DATA_READ 0x0C REG_SWITCH_STATUS,
REG_DIR_DATA_WRITE,
REG_DIR_DATA_READ,
REG_SWITCH_REVISION,
REG_PHY_REVISION,
REG_SPHY_CNTRL,
REG_RGMII_0_CNTRL,
REG_RGMII_1_CNTRL,
REG_RGMII_2_CNTRL,
REG_LED_0_CNTRL,
REG_LED_1_CNTRL,
REG_LED_2_CNTRL,
REG_SWITCH_REG_MAX,
};
/* Relative to REG_SWITCH_CNTRL */
#define MDIO_MASTER_SEL (1 << 0)
#define REG_SWITCH_REVISION 0x18 /* Relative to REG_SWITCH_REVISION */
#define SF2_REV_MASK 0xffff #define SF2_REV_MASK 0xffff
#define SWITCH_TOP_REV_SHIFT 16 #define SWITCH_TOP_REV_SHIFT 16
#define SWITCH_TOP_REV_MASK 0xffff #define SWITCH_TOP_REV_MASK 0xffff
#define REG_PHY_REVISION 0x1C /* Relative to REG_PHY_REVISION */
#define PHY_REVISION_MASK 0xffff #define PHY_REVISION_MASK 0xffff
#define REG_SPHY_CNTRL 0x2C /* Relative to REG_SPHY_CNTRL */
#define IDDQ_BIAS (1 << 0) #define IDDQ_BIAS (1 << 0)
#define EXT_PWR_DOWN (1 << 1) #define EXT_PWR_DOWN (1 << 1)
#define FORCE_DLL_EN (1 << 2) #define FORCE_DLL_EN (1 << 2)
...@@ -37,13 +51,8 @@ ...@@ -37,13 +51,8 @@
#define PHY_PHYAD_SHIFT 8 #define PHY_PHYAD_SHIFT 8
#define PHY_PHYAD_MASK 0x1F #define PHY_PHYAD_MASK 0x1F
#define REG_RGMII_0_BASE 0x34 #define REG_RGMII_CNTRL_P(x) (REG_RGMII_0_CNTRL + (x))
#define REG_RGMII_CNTRL 0x00
#define REG_RGMII_IB_STATUS 0x04
#define REG_RGMII_RX_CLOCK_DELAY_CNTRL 0x08
#define REG_RGMII_CNTRL_SIZE 0x0C
#define REG_RGMII_CNTRL_P(x) (REG_RGMII_0_BASE + \
((x) * REG_RGMII_CNTRL_SIZE))
/* Relative to REG_RGMII_CNTRL */ /* Relative to REG_RGMII_CNTRL */
#define RGMII_MODE_EN (1 << 0) #define RGMII_MODE_EN (1 << 0)
#define ID_MODE_DIS (1 << 1) #define ID_MODE_DIS (1 << 1)
...@@ -61,8 +70,8 @@ ...@@ -61,8 +70,8 @@
#define LPI_COUNT_SHIFT 9 #define LPI_COUNT_SHIFT 9
#define LPI_COUNT_MASK 0x3F #define LPI_COUNT_MASK 0x3F
#define REG_LED_CNTRL_BASE 0x90 #define REG_LED_CNTRL(x) (REG_LED_0_CNTRL + (x))
#define REG_LED_CNTRL(x) (REG_LED_CNTRL_BASE + (x) * 4)
#define SPDLNK_SRC_SEL (1 << 24) #define SPDLNK_SRC_SEL (1 << 24)
/* Register set relative to 'INTRL2_0' and 'INTRL2_1' */ /* Register set relative to 'INTRL2_0' and 'INTRL2_1' */
...@@ -125,6 +134,9 @@ ...@@ -125,6 +134,9 @@
#define GMII_SPEED_UP_2G (1 << 6) #define GMII_SPEED_UP_2G (1 << 6)
#define MII_SW_OR (1 << 7) #define MII_SW_OR (1 << 7)
/* Alternate layout for e.g: 7278 */
#define CORE_STS_OVERRIDE_IMP2 0x39040
#define CORE_NEW_CTRL 0x00084 #define CORE_NEW_CTRL 0x00084
#define IP_MC (1 << 0) #define IP_MC (1 << 0)
#define OUTRANGEERR_DISCARD (1 << 1) #define OUTRANGEERR_DISCARD (1 << 1)
...@@ -142,6 +154,7 @@ ...@@ -142,6 +154,7 @@
#define SW_LEARN_CNTL(x) (1 << (x)) #define SW_LEARN_CNTL(x) (1 << (x))
#define CORE_STS_OVERRIDE_GMIIP_PORT(x) (0x160 + (x) * 4) #define CORE_STS_OVERRIDE_GMIIP_PORT(x) (0x160 + (x) * 4)
#define CORE_STS_OVERRIDE_GMIIP2_PORT(x) (0x39000 + (x) * 8)
#define LINK_STS (1 << 0) #define LINK_STS (1 << 0)
#define DUPLX_MODE (1 << 1) #define DUPLX_MODE (1 << 1)
#define SPEED_SHIFT 2 #define SPEED_SHIFT 2
......
...@@ -167,6 +167,31 @@ static int bcm7xxx_28nm_e0_plus_afe_config_init(struct phy_device *phydev) ...@@ -167,6 +167,31 @@ static int bcm7xxx_28nm_e0_plus_afe_config_init(struct phy_device *phydev)
return 0; return 0;
} }
static int bcm7xxx_28nm_a0_patch_afe_config_init(struct phy_device *phydev)
{
/* +1 RC_CAL codes for RL centering for both LT and HT conditions */
bcm_phy_write_misc(phydev, AFE_RXCONFIG_2, 0xd003);
/* Cut master bias current by 2% to compensate for RC_CAL offset */
bcm_phy_write_misc(phydev, DSP_TAP10, 0x791b);
/* Improve hybrid leakage */
bcm_phy_write_misc(phydev, AFE_HPF_TRIM_OTHERS, 0x10e3);
/* Change rx_on_tune 8 to 0xf */
bcm_phy_write_misc(phydev, 0x21, 0x2, 0x87f6);
/* Change 100Tx EEE bandwidth */
bcm_phy_write_misc(phydev, 0x22, 0x2, 0x017d);
/* Enable ffe zero detection for Vitesse interoperability */
bcm_phy_write_misc(phydev, 0x26, 0x2, 0x0015);
r_rc_cal_reset(phydev);
return 0;
}
static int bcm7xxx_28nm_config_init(struct phy_device *phydev) static int bcm7xxx_28nm_config_init(struct phy_device *phydev)
{ {
u8 rev = PHY_BRCM_7XXX_REV(phydev->dev_flags); u8 rev = PHY_BRCM_7XXX_REV(phydev->dev_flags);
...@@ -174,6 +199,12 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev) ...@@ -174,6 +199,12 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev)
u8 count; u8 count;
int ret = 0; int ret = 0;
/* Newer devices have moved the revision information back into a
* standard location in MII_PHYS_ID[23]
*/
if (rev == 0)
rev = phydev->phy_id & ~phydev->drv->phy_id_mask;
pr_info_once("%s: %s PHY revision: 0x%02x, patch: %d\n", pr_info_once("%s: %s PHY revision: 0x%02x, patch: %d\n",
phydev_name(phydev), phydev->drv->name, rev, patch); phydev_name(phydev), phydev->drv->name, rev, patch);
...@@ -197,6 +228,9 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev) ...@@ -197,6 +228,9 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev)
case 0x10: case 0x10:
ret = bcm7xxx_28nm_e0_plus_afe_config_init(phydev); ret = bcm7xxx_28nm_e0_plus_afe_config_init(phydev);
break; break;
case 0x01:
ret = bcm7xxx_28nm_a0_patch_afe_config_init(phydev);
break;
default: default:
break; break;
} }
...@@ -416,6 +450,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev) ...@@ -416,6 +450,7 @@ static int bcm7xxx_28nm_probe(struct phy_device *phydev)
static struct phy_driver bcm7xxx_driver[] = { static struct phy_driver bcm7xxx_driver[] = {
BCM7XXX_28NM_GPHY(PHY_ID_BCM7250, "Broadcom BCM7250"), BCM7XXX_28NM_GPHY(PHY_ID_BCM7250, "Broadcom BCM7250"),
BCM7XXX_28NM_GPHY(PHY_ID_BCM7278, "Broadcom BCM7278"),
BCM7XXX_28NM_GPHY(PHY_ID_BCM7364, "Broadcom BCM7364"), BCM7XXX_28NM_GPHY(PHY_ID_BCM7364, "Broadcom BCM7364"),
BCM7XXX_28NM_GPHY(PHY_ID_BCM7366, "Broadcom BCM7366"), BCM7XXX_28NM_GPHY(PHY_ID_BCM7366, "Broadcom BCM7366"),
BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"), BCM7XXX_28NM_GPHY(PHY_ID_BCM7439, "Broadcom BCM7439"),
...@@ -430,6 +465,7 @@ static struct phy_driver bcm7xxx_driver[] = { ...@@ -430,6 +465,7 @@ static struct phy_driver bcm7xxx_driver[] = {
static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = { static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = {
{ PHY_ID_BCM7250, 0xfffffff0, }, { PHY_ID_BCM7250, 0xfffffff0, },
{ PHY_ID_BCM7278, 0xfffffff0, },
{ PHY_ID_BCM7364, 0xfffffff0, }, { PHY_ID_BCM7364, 0xfffffff0, },
{ PHY_ID_BCM7366, 0xfffffff0, }, { PHY_ID_BCM7366, 0xfffffff0, },
{ PHY_ID_BCM7346, 0xfffffff0, }, { PHY_ID_BCM7346, 0xfffffff0, },
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#define PHY_ID_BCM57780 0x03625d90 #define PHY_ID_BCM57780 0x03625d90
#define PHY_ID_BCM7250 0xae025280 #define PHY_ID_BCM7250 0xae025280
#define PHY_ID_BCM7278 0xae0251a0
#define PHY_ID_BCM7364 0xae025260 #define PHY_ID_BCM7364 0xae025260
#define PHY_ID_BCM7366 0x600d8490 #define PHY_ID_BCM7366 0x600d8490
#define PHY_ID_BCM7346 0x600d8650 #define PHY_ID_BCM7346 0x600d8650
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment