lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/ps3: Cleanup gelic enums

Browse Source 
Cleanup of the gelic driver enumerations:

 o Add some missing commas.
 o Add an Ether port post fix (PS3 currently only supports PORT_0).
 o Add a new enum gelic_lv1_phy to use when interacting with the PHY.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Geoff Levand
2009-12-01 12:15:53 +00:00
committed by David S. Miller
parent 0dffc83e5b
commit d4d7f1f911
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/ps3_gelic_net.c
View File

@@ -95,11 +95,11 @@ static void gelic_card_get_ether_port_status(struct gelic_card *card,
lv1_net_control(bus_id(card), dev_id(card), lv1_net_control(bus_id(card), dev_id(card),
GELIC_LV1_GET_ETH_PORT_STATUS, GELIC_LV1_GET_ETH_PORT_STATUS,
GELIC_LV1_VLAN_TX_ETHERNET, 0, 0, GELIC_LV1_VLAN_TX_ETHERNET_0, 0, 0,
&card->ether_port_status, &v2); &card->ether_port_status, &v2);
if (inform) { if (inform) {
ether_netdev = card->netdev[GELIC_PORT_ETHERNET]; ether_netdev = card->netdev[GELIC_PORT_ETHERNET_0];
if (card->ether_port_status & GELIC_LV1_ETHER_LINK_UP) if (card->ether_port_status & GELIC_LV1_ETHER_LINK_UP)
netif_carrier_on(ether_netdev); netif_carrier_on(ether_netdev);
else else
@@ -451,14 +451,14 @@ static void gelic_descr_release_tx(struct gelic_card *card,
static void gelic_card_stop_queues(struct gelic_card *card) static void gelic_card_stop_queues(struct gelic_card *card)
{ {
netif_stop_queue(card->netdev[GELIC_PORT_ETHERNET]); netif_stop_queue(card->netdev[GELIC_PORT_ETHERNET_0]);
if (card->netdev[GELIC_PORT_WIRELESS]) if (card->netdev[GELIC_PORT_WIRELESS])
netif_stop_queue(card->netdev[GELIC_PORT_WIRELESS]); netif_stop_queue(card->netdev[GELIC_PORT_WIRELESS]);
} }
static void gelic_card_wake_queues(struct gelic_card *card) static void gelic_card_wake_queues(struct gelic_card *card)
{ {
netif_wake_queue(card->netdev[GELIC_PORT_ETHERNET]); netif_wake_queue(card->netdev[GELIC_PORT_ETHERNET_0]);
if (card->netdev[GELIC_PORT_WIRELESS]) if (card->netdev[GELIC_PORT_WIRELESS])
netif_wake_queue(card->netdev[GELIC_PORT_WIRELESS]); netif_wake_queue(card->netdev[GELIC_PORT_WIRELESS]);
@@ -999,7 +999,7 @@ static int gelic_card_decode_one_descr(struct gelic_card *card)
goto refill; goto refill;
} }
} else } else
netdev = card->netdev[GELIC_PORT_ETHERNET]; netdev = card->netdev[GELIC_PORT_ETHERNET_0];
if ((status == GELIC_DESCR_DMA_RESPONSE_ERROR) || if ((status == GELIC_DESCR_DMA_RESPONSE_ERROR) ||
(status == GELIC_DESCR_DMA_PROTECTION_ERROR) || (status == GELIC_DESCR_DMA_PROTECTION_ERROR) ||
@@ -1369,7 +1369,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work)
{ {
struct gelic_card *card = struct gelic_card *card =
container_of(work, struct gelic_card, tx_timeout_task); container_of(work, struct gelic_card, tx_timeout_task);
struct net_device *netdev = card->netdev[GELIC_PORT_ETHERNET]; struct net_device *netdev = card->netdev[GELIC_PORT_ETHERNET_0];
dev_info(ctodev(card), "%s:Timed out. Restarting... \n", __func__); dev_info(ctodev(card), "%s:Timed out. Restarting... \n", __func__);
@@ -1531,10 +1531,10 @@ static struct gelic_card * __devinit gelic_alloc_card_net(struct net_device **ne
/* gelic_port */ /* gelic_port */
port->netdev = *netdev; port->netdev = *netdev;
port->card = card; port->card = card;
port->type = GELIC_PORT_ETHERNET; port->type = GELIC_PORT_ETHERNET_0;
/* gelic_card */ /* gelic_card */
card->netdev[GELIC_PORT_ETHERNET] = *netdev; card->netdev[GELIC_PORT_ETHERNET_0] = *netdev;
INIT_WORK(&card->tx_timeout_task, gelic_net_tx_timeout_task); INIT_WORK(&card->tx_timeout_task, gelic_net_tx_timeout_task);
init_waitqueue_head(&card->waitq); init_waitqueue_head(&card->waitq);
@@ -1554,9 +1554,9 @@ static void __devinit gelic_card_get_vlan_info(struct gelic_card *card)
int tx; int tx;
int rx; int rx;
} vlan_id_ix[2] = { } vlan_id_ix[2] = {
[GELIC_PORT_ETHERNET] = { [GELIC_PORT_ETHERNET_0] = {
.tx = GELIC_LV1_VLAN_TX_ETHERNET, .tx = GELIC_LV1_VLAN_TX_ETHERNET_0,
.rx = GELIC_LV1_VLAN_RX_ETHERNET .rx = GELIC_LV1_VLAN_RX_ETHERNET_0
}, },
[GELIC_PORT_WIRELESS] = { [GELIC_PORT_WIRELESS] = {
.tx = GELIC_LV1_VLAN_TX_WIRELESS, .tx = GELIC_LV1_VLAN_TX_WIRELESS,
@@ -1601,7 +1601,7 @@ static void __devinit gelic_card_get_vlan_info(struct gelic_card *card)
i, card->vlan[i].tx, card->vlan[i].rx); i, card->vlan[i].tx, card->vlan[i].rx);
} }
if (card->vlan[GELIC_PORT_ETHERNET].tx) { if (card->vlan[GELIC_PORT_ETHERNET_0].tx) {
BUG_ON(!card->vlan[GELIC_PORT_WIRELESS].tx); BUG_ON(!card->vlan[GELIC_PORT_WIRELESS].tx);
card->vlan_required = 1; card->vlan_required = 1;
} else } else
@@ -1790,7 +1790,7 @@ static int ps3_gelic_driver_remove(struct ps3_system_bus_device *dev)
gelic_card_free_chain(card, card->tx_top); gelic_card_free_chain(card, card->tx_top);
gelic_card_free_chain(card, card->rx_top); gelic_card_free_chain(card, card->rx_top);
netdev0 = card->netdev[GELIC_PORT_ETHERNET]; netdev0 = card->netdev[GELIC_PORT_ETHERNET_0];
/* disconnect event port */ /* disconnect event port */
free_irq(card->irq, card); free_irq(card->irq, card);
netdev0->irq = NO_IRQ; netdev0->irq = NO_IRQ;

17
drivers/net/ps3_gelic_net.h
View File

@@ -186,7 +186,7 @@ enum gelic_lv1_net_control_code {
GELIC_LV1_GET_CHANNEL = 6, GELIC_LV1_GET_CHANNEL = 6,
GELIC_LV1_POST_WLAN_CMD = 9, GELIC_LV1_POST_WLAN_CMD = 9,
GELIC_LV1_GET_WLAN_CMD_RESULT = 10, GELIC_LV1_GET_WLAN_CMD_RESULT = 10,
GELIC_LV1_GET_WLAN_EVENT = 11 GELIC_LV1_GET_WLAN_EVENT = 11,
}; };
/* for GELIC_LV1_SET_WOL */ /* for GELIC_LV1_SET_WOL */
@@ -217,23 +217,28 @@ enum gelic_lv1_ether_port_status {
GELIC_LV1_ETHER_SPEED_10 = 0x0000000000000010L, GELIC_LV1_ETHER_SPEED_10 = 0x0000000000000010L,
GELIC_LV1_ETHER_SPEED_100 = 0x0000000000000020L, GELIC_LV1_ETHER_SPEED_100 = 0x0000000000000020L,
GELIC_LV1_ETHER_SPEED_1000 = 0x0000000000000040L, GELIC_LV1_ETHER_SPEED_1000 = 0x0000000000000040L,
GELIC_LV1_ETHER_SPEED_MASK = 0x0000000000000070L GELIC_LV1_ETHER_SPEED_MASK = 0x0000000000000070L,
}; };
enum gelic_lv1_vlan_index { enum gelic_lv1_vlan_index {
/* for outgoing packets */ /* for outgoing packets */
GELIC_LV1_VLAN_TX_ETHERNET = 0x0000000000000002L, GELIC_LV1_VLAN_TX_ETHERNET_0 = 0x0000000000000002L,
GELIC_LV1_VLAN_TX_WIRELESS = 0x0000000000000003L, GELIC_LV1_VLAN_TX_WIRELESS = 0x0000000000000003L,
/* for incoming packets */ /* for incoming packets */
GELIC_LV1_VLAN_RX_ETHERNET = 0x0000000000000012L, GELIC_LV1_VLAN_RX_ETHERNET_0 = 0x0000000000000012L,
GELIC_LV1_VLAN_RX_WIRELESS = 0x0000000000000013L GELIC_LV1_VLAN_RX_WIRELESS = 0x0000000000000013L,
};
enum gelic_lv1_phy {
GELIC_LV1_PHY_ETHERNET_0 = 0x0000000000000002L,
}; };
/* size of hardware part of gelic descriptor */ /* size of hardware part of gelic descriptor */
#define GELIC_DESCR_SIZE (32) #define GELIC_DESCR_SIZE (32)
enum gelic_port_type { enum gelic_port_type {
GELIC_PORT_ETHERNET = 0, GELIC_PORT_ETHERNET_0 = 0,
GELIC_PORT_WIRELESS = 1, GELIC_PORT_WIRELESS = 1,
GELIC_PORT_MAX GELIC_PORT_MAX
}; };