mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
driver: net: xgene: Add support for 2nd 10GbE port
Adding support for the second 10GbE port on APM X-Gene SoC Signed-off-by: Iyappan Subramanian <isubramanian@apm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
7b6ee48d3f
commit
149e9ab495
3 changed files with 19 additions and 5 deletions
|
@ -107,7 +107,8 @@ static void xgene_enet_set_ring_state(struct xgene_enet_desc_ring *ring)
|
||||||
{
|
{
|
||||||
xgene_enet_ring_set_type(ring);
|
xgene_enet_ring_set_type(ring);
|
||||||
|
|
||||||
if (xgene_enet_ring_owner(ring->id) == RING_OWNER_ETH0)
|
if (xgene_enet_ring_owner(ring->id) == RING_OWNER_ETH0 ||
|
||||||
|
xgene_enet_ring_owner(ring->id) == RING_OWNER_ETH1)
|
||||||
xgene_enet_ring_set_recombbuf(ring);
|
xgene_enet_ring_set_recombbuf(ring);
|
||||||
|
|
||||||
xgene_enet_ring_init(ring);
|
xgene_enet_ring_init(ring);
|
||||||
|
|
|
@ -1305,10 +1305,17 @@ static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)
|
||||||
pdata->ring_num = START_RING_NUM_0;
|
pdata->ring_num = START_RING_NUM_0;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
|
if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
|
||||||
|
pdata->cpu_bufnum = XG_START_CPU_BUFNUM_1;
|
||||||
|
pdata->eth_bufnum = XG_START_ETH_BUFNUM_1;
|
||||||
|
pdata->bp_bufnum = XG_START_BP_BUFNUM_1;
|
||||||
|
pdata->ring_num = XG_START_RING_NUM_1;
|
||||||
|
} else {
|
||||||
pdata->cpu_bufnum = START_CPU_BUFNUM_1;
|
pdata->cpu_bufnum = START_CPU_BUFNUM_1;
|
||||||
pdata->eth_bufnum = START_ETH_BUFNUM_1;
|
pdata->eth_bufnum = START_ETH_BUFNUM_1;
|
||||||
pdata->bp_bufnum = START_BP_BUFNUM_1;
|
pdata->bp_bufnum = START_BP_BUFNUM_1;
|
||||||
pdata->ring_num = START_RING_NUM_1;
|
pdata->ring_num = START_RING_NUM_1;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -1478,6 +1485,7 @@ static const struct acpi_device_id xgene_enet_acpi_match[] = {
|
||||||
{ "APMC0D05", XGENE_ENET1},
|
{ "APMC0D05", XGENE_ENET1},
|
||||||
{ "APMC0D30", XGENE_ENET1},
|
{ "APMC0D30", XGENE_ENET1},
|
||||||
{ "APMC0D31", XGENE_ENET1},
|
{ "APMC0D31", XGENE_ENET1},
|
||||||
|
{ "APMC0D3F", XGENE_ENET1},
|
||||||
{ "APMC0D26", XGENE_ENET2},
|
{ "APMC0D26", XGENE_ENET2},
|
||||||
{ "APMC0D25", XGENE_ENET2},
|
{ "APMC0D25", XGENE_ENET2},
|
||||||
{ }
|
{ }
|
||||||
|
|
|
@ -56,6 +56,11 @@
|
||||||
#define START_BP_BUFNUM_1 0x2A
|
#define START_BP_BUFNUM_1 0x2A
|
||||||
#define START_RING_NUM_1 264
|
#define START_RING_NUM_1 264
|
||||||
|
|
||||||
|
#define XG_START_CPU_BUFNUM_1 12
|
||||||
|
#define XG_START_ETH_BUFNUM_1 2
|
||||||
|
#define XG_START_BP_BUFNUM_1 0x22
|
||||||
|
#define XG_START_RING_NUM_1 264
|
||||||
|
|
||||||
#define X2_START_CPU_BUFNUM_0 0
|
#define X2_START_CPU_BUFNUM_0 0
|
||||||
#define X2_START_ETH_BUFNUM_0 0
|
#define X2_START_ETH_BUFNUM_0 0
|
||||||
#define X2_START_BP_BUFNUM_0 0x20
|
#define X2_START_BP_BUFNUM_0 0x20
|
||||||
|
|
Loading…
Reference in a new issue