diff options
| author | Rich Schmitt <B43082@freescale.com> | 2014-10-22 18:29:59 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:35:27 (GMT) |
| commit | 49d038003ed9b132a02c9cfcd565d85b27dfe324 (patch) | |
| tree | cb788aff159f71ba26b18a87a4c2a556d10b272d /drivers/net/ethernet/freescale/fman | |
| parent | cb9d1ef0be2456590c5fb8e26699129caf4909be (diff) | |
| parent | 3844262a023733d888bb388c6e81271058a26ea9 (diff) | |
| download | linux-fsl-qoriq-49d038003ed9b132a02c9cfcd565d85b27dfe324.tar.xz | |
Merge commit '60cce3da4a8393d1e15bf1a9dbe3956a8aaabbaf'
Diffstat (limited to 'drivers/net/ethernet/freescale/fman')
5 files changed, 6 insertions, 11 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port.c b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port.c index 1f3ae53..d2008bf 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port.c +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port.c @@ -3152,8 +3152,9 @@ t_Error FM_PORT_Disable(t_Handle h_FmPort) err = fman_port_disable(&p_FmPort->port); if (err == -EBUSY) { - fman_port_enable(&p_FmPort->port); - RETURN_ERROR(MINOR, E_BUSY, ("%s: can't disable! BMI or QMI is Busy", p_FmPort->name)); + DBG(WARNING, ("%s: BMI or QMI is Busy. Port forced down", + p_FmPort->name)); + err = E_OK; } else if (err != 0) { diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fman_port.c b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fman_port.c index ec261c4..54e796c 100755 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fman_port.c +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fman_port.c @@ -856,8 +856,6 @@ int fman_port_disable(const struct fman_port *port) if (count == 0) { /* Timeout */ - iowrite32be(ioread32be(&port->qmi_regs->fmqm_pnc) | - QMI_PORT_CFG_EN, &port->qmi_regs->fmqm_pnc); failure = TRUE; } } @@ -876,10 +874,6 @@ int fman_port_disable(const struct fman_port *port) if (count == 0) { /* Timeout */ - iowrite32be(ioread32be(&port->qmi_regs->fmqm_pnc) | - QMI_PORT_CFG_EN, &port->qmi_regs->fmqm_pnc); - iowrite32be(ioread32be(bmi_cfg_reg) | BMI_PORT_CFG_EN, - bmi_cfg_reg); failure = TRUE; } diff --git a/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fsl_fman.h b/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fsl_fman.h index aa3ec30..987fe40 100644 --- a/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fsl_fman.h +++ b/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fsl_fman.h @@ -231,7 +231,7 @@ void fm_port_get_buff_layout_ext_params(struct fm_port *port, struct fm_port_par @Cautions Allowed only after the port is binded. *//***************************************************************************/ -int fm_get_tx_port_channel(struct fm_port *port); +uint16_t fm_get_tx_port_channel(struct fm_port *port); /**************************************************************************//** @Function fm_set_tx_port_params diff --git a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c index b9a2097..427de85 100755 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm.c @@ -1331,7 +1331,7 @@ void fm_port_get_buff_layout_ext_params(struct fm_port *port, struct fm_port_par } EXPORT_SYMBOL(fm_port_get_buff_layout_ext_params); -int fm_get_tx_port_channel(struct fm_port *port) +uint16_t fm_get_tx_port_channel(struct fm_port *port) { t_LnxWrpFmPortDev *p_LnxWrpFmPortDev = (t_LnxWrpFmPortDev*)port; diff --git a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_sysfs_fm.h b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_sysfs_fm.h index e6bf83e..137653e 100644 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_sysfs_fm.h +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_sysfs_fm.h @@ -126,7 +126,7 @@ int fm_profile_dump_regs(void *h_pcd, int ppnum, char *buf, int nn); int k, m = n; \ phys_addr_t pa = virt_to_phys(&((st)->phrase)); \ k = snprintf(&buf[m], PAGE_SIZE - m, \ - "0x%010llX: 0x%08x%8s\t%s\n", pa, \ + "0x%010llX: 0x%08x%8s\t%s\n", (unsigned long long) pa, \ ioread32be((uint32_t *)&((st)->phrase)), "", #phrase); \ if (k < 0 || m > PAGE_SIZE - 90) \ FM_DMP_PGSZ_ERR \ |