diff options
| author | Mandy Lavi <mandy.lavi@freescale.com> | 2013-04-24 07:56:04 (GMT) |
|---|---|---|
| committer | Fleming Andrew-AFLEMING <AFLEMING@freescale.com> | 2013-04-29 20:22:02 (GMT) |
| commit | 5045184a0cc3283bcd30d3bbebff6188d30e9fce (patch) | |
| tree | f47057a56b74a822fe8329767802f4ff59711e3f /drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm_port.c | |
| parent | 56206bd9f58df8e2a1640c523d6f7fa392e580d1 (diff) | |
| download | linux-fsl-qoriq-5045184a0cc3283bcd30d3bbebff6188d30e9fce.tar.xz | |
fmd21 integration
Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com>
Prev fmd integration was fmd19
Diffs from fmd19 to fmd21:
Added kgHashShift to t_FmPcdHashTableParams
Added nonConsistentSp to t_FmPcdManipReassemIpStats
sp - 2 layers separation - for future flib integration
rtc - 2 layers separation - for future flib integration
PFC enhancement (B4 Rev2 FMAN)
API addition (for B4 rev 2): FM_PORT_SetPfcPrioritiesMappingToQmanWQ
File fsl_fman.h renamed to lnxwrp_fsl_fman.h
The name fsl_fman.h has been applied to other fman internal header file
In dpaa_eth:
Due to renaming of fsl_fman.h to lnxwrp_fsl_fman.h
The relevant include lines in some of the files had to change accordingly
Change-Id: I8f25c758963a44a75ca8676aad45f7f96767b0b5
Reviewed-on: http://git.am.freescale.net:8181/2069
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm_port.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm_port.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm_port.c b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm_port.c index f9f3353..00b0da4 100644 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm_port.c +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_fm_port.c @@ -509,39 +509,39 @@ static t_Error CheckNConfigFmPortAdvArgs (t_LnxWrpFmPortDev *p_LnxWrpFmPortDev) return E_OK; uint32_prop = (uint32_t *)of_get_property(port_node, "num-tnums", &lenp); - if (uint32_prop) { + if (uint32_prop) { if (WARN_ON(lenp != sizeof(uint32_t)*2)) RETURN_ERROR(MINOR, E_INVALID_VALUE, NO_MSG); - + portRsrc.num = uint32_prop[0]; portRsrc.extra = uint32_prop[1]; - + if ((err = FM_PORT_ConfigNumOfTasks(p_LnxWrpFmPortDev->h_Dev, &portRsrc)) != E_OK) RETURN_ERROR(MINOR, err, NO_MSG); } - + uint32_prop = (uint32_t *)of_get_property(port_node, "num-dmas", &lenp); - if (uint32_prop) { + if (uint32_prop) { if (WARN_ON(lenp != sizeof(uint32_t)*2)) RETURN_ERROR(MINOR, E_INVALID_VALUE, NO_MSG); - + portRsrc.num = uint32_prop[0]; portRsrc.extra = uint32_prop[1]; - + if ((err = FM_PORT_ConfigNumOfOpenDmas(p_LnxWrpFmPortDev->h_Dev, &portRsrc)) != E_OK) RETURN_ERROR(MINOR, err, NO_MSG); } - + uint32_prop = (uint32_t *)of_get_property(port_node, "fifo_size", &lenp); if (uint32_prop) { if (WARN_ON(lenp != sizeof(uint32_t)*2)) RETURN_ERROR(MINOR, E_INVALID_VALUE, NO_MSG); - + portRsrc.num = uint32_prop[0]; portRsrc.extra = uint32_prop[1]; - + if ((err = FM_PORT_ConfigSizeOfFifo(p_LnxWrpFmPortDev->h_Dev, &portRsrc)) != E_OK) RETURN_ERROR(MINOR, err, NO_MSG); @@ -580,7 +580,7 @@ static t_Error CheckNSetFmPortAdvArgs (t_LnxWrpFmPortDev *p_LnxWrpFmPortDev) uint8_t portId; p_LnxWrpFmDev = ((t_LnxWrpFmDev *)p_LnxWrpFmPortDev->h_LnxWrpFmDev); - + if (WARN_ON(lenp != sizeof(uint32_t)*2)) RETURN_ERROR(MINOR, E_INVALID_VALUE, NO_MSG); @@ -609,7 +609,7 @@ static t_Error CheckNSetFmPortAdvArgs (t_LnxWrpFmPortDev *p_LnxWrpFmPortDev) portId += FM_MAX_NUM_OF_1G_RX_PORTS; portVSPAllocParams.h_FmTxPort = p_LnxWrpFmDev->txPorts[portId].h_Dev; - fmVspParams.liodnOffset = + fmVspParams.liodnOffset = p_LnxWrpFmDev->rxPorts[portId].settings.param.specificParams.rxParams.liodnOffset; memcpy(&fmVspParams.extBufPools, &p_LnxWrpFmPortDev->settings.param.specificParams.rxParams.extBufPools, @@ -1212,7 +1212,6 @@ static int /*__devinit*/ fm_port_probe(struct platform_device *of_dev) p_LnxWrpFmDev->name, p_LnxWrpFmPortDev->id); p_LnxWrpFmPortDev->minor = p_LnxWrpFmPortDev->id + DEV_FM_OH_PORTS_MINOR_BASE; - p_LnxWrpFmPortDev->h_Dev = FM_PCD_GetHcDevH(p_LnxWrpFmDev->h_PcdDev); } else if (p_LnxWrpFmPortDev->settings.param.portType == e_FM_PORT_TYPE_OH_OFFLINE_PARSING) { Sprint(p_LnxWrpFmPortDev->name, "%s-port-oh%d", |