diff options
author | Sudarsana Kalluru <Sudarsana.Kalluru@qlogic.com> | 2015-10-26 05:02:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-10-27 22:34:50 -0400 |
commit | a2ec6172d29cf3aed92e9db40e83e36329db1dd5 (patch) | |
tree | e7c8c771b40d26fe65586da1cd948bfbf07e7c84 | |
parent | cc875c2e4f34e86c2f562f18b6e917cfcc560bcb (diff) |
qede: Add support for link
This adds basic link functionality to qede - driver still doesn't provide
users with an API to change any link property, but it does request qed to
initialize the link using default configuration, and registers a callback
that allows it to get link notifications.
This patch adds the ability of the driver to set the carrier as active and
to enable traffic as a result of async. link notifications.
Following this patch, driver should be capable of running traffic.
Signed-off-by: Sudarsana Kalluru <Sudarsana.Kalluru@qlogic.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/qlogic/qede/qede_main.c | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index 0351204317e7..890439cbec7e 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c | |||
@@ -87,6 +87,7 @@ static int qede_probe(struct pci_dev *pdev, const struct pci_device_id *id); | |||
87 | static void qede_remove(struct pci_dev *pdev); | 87 | static void qede_remove(struct pci_dev *pdev); |
88 | static int qede_alloc_rx_buffer(struct qede_dev *edev, | 88 | static int qede_alloc_rx_buffer(struct qede_dev *edev, |
89 | struct qede_rx_queue *rxq); | 89 | struct qede_rx_queue *rxq); |
90 | static void qede_link_update(void *dev, struct qed_link_output *link); | ||
90 | 91 | ||
91 | static struct pci_driver qede_pci_driver = { | 92 | static struct pci_driver qede_pci_driver = { |
92 | .name = "qede", | 93 | .name = "qede", |
@@ -95,6 +96,12 @@ static struct pci_driver qede_pci_driver = { | |||
95 | .remove = qede_remove, | 96 | .remove = qede_remove, |
96 | }; | 97 | }; |
97 | 98 | ||
99 | static struct qed_eth_cb_ops qede_ll_ops = { | ||
100 | { | ||
101 | .link_update = qede_link_update, | ||
102 | }, | ||
103 | }; | ||
104 | |||
98 | static int qede_netdev_event(struct notifier_block *this, unsigned long event, | 105 | static int qede_netdev_event(struct notifier_block *this, unsigned long event, |
99 | void *ptr) | 106 | void *ptr) |
100 | { | 107 | { |
@@ -1304,6 +1311,8 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level, | |||
1304 | 1311 | ||
1305 | edev->ops->common->set_id(cdev, edev->ndev->name, DRV_MODULE_VERSION); | 1312 | edev->ops->common->set_id(cdev, edev->ndev->name, DRV_MODULE_VERSION); |
1306 | 1313 | ||
1314 | edev->ops->register_ops(cdev, &qede_ll_ops, edev); | ||
1315 | |||
1307 | INIT_DELAYED_WORK(&edev->sp_task, qede_sp_task); | 1316 | INIT_DELAYED_WORK(&edev->sp_task, qede_sp_task); |
1308 | mutex_init(&edev->qede_lock); | 1317 | mutex_init(&edev->qede_lock); |
1309 | 1318 | ||
@@ -2099,6 +2108,7 @@ enum qede_unload_mode { | |||
2099 | 2108 | ||
2100 | static void qede_unload(struct qede_dev *edev, enum qede_unload_mode mode) | 2109 | static void qede_unload(struct qede_dev *edev, enum qede_unload_mode mode) |
2101 | { | 2110 | { |
2111 | struct qed_link_params link_params; | ||
2102 | int rc; | 2112 | int rc; |
2103 | 2113 | ||
2104 | DP_INFO(edev, "Starting qede unload\n"); | 2114 | DP_INFO(edev, "Starting qede unload\n"); |
@@ -2110,6 +2120,10 @@ static void qede_unload(struct qede_dev *edev, enum qede_unload_mode mode) | |||
2110 | netif_tx_disable(edev->ndev); | 2120 | netif_tx_disable(edev->ndev); |
2111 | netif_carrier_off(edev->ndev); | 2121 | netif_carrier_off(edev->ndev); |
2112 | 2122 | ||
2123 | /* Reset the link */ | ||
2124 | memset(&link_params, 0, sizeof(link_params)); | ||
2125 | link_params.link_up = false; | ||
2126 | edev->ops->common->set_link(edev->cdev, &link_params); | ||
2113 | rc = qede_stop_queues(edev); | 2127 | rc = qede_stop_queues(edev); |
2114 | if (rc) { | 2128 | if (rc) { |
2115 | qede_sync_free_irqs(edev); | 2129 | qede_sync_free_irqs(edev); |
@@ -2140,6 +2154,8 @@ enum qede_load_mode { | |||
2140 | 2154 | ||
2141 | static int qede_load(struct qede_dev *edev, enum qede_load_mode mode) | 2155 | static int qede_load(struct qede_dev *edev, enum qede_load_mode mode) |
2142 | { | 2156 | { |
2157 | struct qed_link_params link_params; | ||
2158 | struct qed_link_output link_output; | ||
2143 | int rc; | 2159 | int rc; |
2144 | 2160 | ||
2145 | DP_INFO(edev, "Starting qede load\n"); | 2161 | DP_INFO(edev, "Starting qede load\n"); |
@@ -2183,6 +2199,17 @@ static int qede_load(struct qede_dev *edev, enum qede_load_mode mode) | |||
2183 | mutex_lock(&edev->qede_lock); | 2199 | mutex_lock(&edev->qede_lock); |
2184 | edev->state = QEDE_STATE_OPEN; | 2200 | edev->state = QEDE_STATE_OPEN; |
2185 | mutex_unlock(&edev->qede_lock); | 2201 | mutex_unlock(&edev->qede_lock); |
2202 | |||
2203 | /* Ask for link-up using current configuration */ | ||
2204 | memset(&link_params, 0, sizeof(link_params)); | ||
2205 | link_params.link_up = true; | ||
2206 | edev->ops->common->set_link(edev->cdev, &link_params); | ||
2207 | |||
2208 | /* Query whether link is already-up */ | ||
2209 | memset(&link_output, 0, sizeof(link_output)); | ||
2210 | edev->ops->common->get_link(edev->cdev, &link_output); | ||
2211 | qede_link_update(edev, &link_output); | ||
2212 | |||
2186 | DP_INFO(edev, "Ending successfully qede load\n"); | 2213 | DP_INFO(edev, "Ending successfully qede load\n"); |
2187 | 2214 | ||
2188 | return 0; | 2215 | return 0; |
@@ -2223,6 +2250,26 @@ static int qede_close(struct net_device *ndev) | |||
2223 | return 0; | 2250 | return 0; |
2224 | } | 2251 | } |
2225 | 2252 | ||
2253 | static void qede_link_update(void *dev, struct qed_link_output *link) | ||
2254 | { | ||
2255 | struct qede_dev *edev = dev; | ||
2256 | |||
2257 | if (!netif_running(edev->ndev)) { | ||
2258 | DP_VERBOSE(edev, NETIF_MSG_LINK, "Interface is not running\n"); | ||
2259 | return; | ||
2260 | } | ||
2261 | |||
2262 | if (link->link_up) { | ||
2263 | DP_NOTICE(edev, "Link is up\n"); | ||
2264 | netif_tx_start_all_queues(edev->ndev); | ||
2265 | netif_carrier_on(edev->ndev); | ||
2266 | } else { | ||
2267 | DP_NOTICE(edev, "Link is down\n"); | ||
2268 | netif_tx_disable(edev->ndev); | ||
2269 | netif_carrier_off(edev->ndev); | ||
2270 | } | ||
2271 | } | ||
2272 | |||
2226 | static int qede_set_mac_addr(struct net_device *ndev, void *p) | 2273 | static int qede_set_mac_addr(struct net_device *ndev, void *p) |
2227 | { | 2274 | { |
2228 | struct qede_dev *edev = netdev_priv(ndev); | 2275 | struct qede_dev *edev = netdev_priv(ndev); |