diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-11-23 21:59:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:04:13 -0500 |
commit | 2eab17ab880ad8d570d27517e6c9d9fe74adc214 (patch) | |
tree | 17baf30d2ae574defcad6c57782ef0192ef7ab9b | |
parent | afefce66a5c73aef597074b184b83a4df9704afd (diff) |
drivers/net/cxgb3: trim trailing whitespace
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 16 | ||||
-rw-r--r-- | drivers/net/cxgb3/cxgb3_offload.c | 2 | ||||
-rw-r--r-- | drivers/net/cxgb3/firmware_exports.h | 20 | ||||
-rw-r--r-- | drivers/net/cxgb3/t3_hw.c | 14 | ||||
-rw-r--r-- | drivers/net/cxgb3/xgmac.c | 10 |
5 files changed, 31 insertions, 31 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index f24a27bbd307..944423c497d2 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
@@ -719,7 +719,7 @@ static int upgrade_fw(struct adapter *adap) | |||
719 | else | 719 | else |
720 | dev_err(dev, "failed to upgrade to firmware %d.%d.%d\n", | 720 | dev_err(dev, "failed to upgrade to firmware %d.%d.%d\n", |
721 | FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO); | 721 | FW_VERSION_MAJOR, FW_VERSION_MINOR, FW_VERSION_MICRO); |
722 | 722 | ||
723 | return ret; | 723 | return ret; |
724 | } | 724 | } |
725 | 725 | ||
@@ -746,7 +746,7 @@ static int update_tpsram(struct adapter *adap) | |||
746 | struct device *dev = &adap->pdev->dev; | 746 | struct device *dev = &adap->pdev->dev; |
747 | int ret; | 747 | int ret; |
748 | char rev; | 748 | char rev; |
749 | 749 | ||
750 | rev = t3rev2char(adap); | 750 | rev = t3rev2char(adap); |
751 | if (!rev) | 751 | if (!rev) |
752 | return 0; | 752 | return 0; |
@@ -760,10 +760,10 @@ static int update_tpsram(struct adapter *adap) | |||
760 | buf); | 760 | buf); |
761 | return ret; | 761 | return ret; |
762 | } | 762 | } |
763 | 763 | ||
764 | ret = t3_check_tpsram(adap, tpsram->data, tpsram->size); | 764 | ret = t3_check_tpsram(adap, tpsram->data, tpsram->size); |
765 | if (ret) | 765 | if (ret) |
766 | goto release_tpsram; | 766 | goto release_tpsram; |
767 | 767 | ||
768 | ret = t3_set_proto_sram(adap, tpsram->data); | 768 | ret = t3_set_proto_sram(adap, tpsram->data); |
769 | if (ret == 0) | 769 | if (ret == 0) |
@@ -779,7 +779,7 @@ static int update_tpsram(struct adapter *adap) | |||
779 | 779 | ||
780 | release_tpsram: | 780 | release_tpsram: |
781 | release_firmware(tpsram); | 781 | release_firmware(tpsram); |
782 | 782 | ||
783 | return ret; | 783 | return ret; |
784 | } | 784 | } |
785 | 785 | ||
@@ -2144,7 +2144,7 @@ static void cxgb_netpoll(struct net_device *dev) | |||
2144 | for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) { | 2144 | for (qidx = pi->first_qset; qidx < pi->first_qset + pi->nqsets; qidx++) { |
2145 | struct sge_qset *qs = &adapter->sge.qs[qidx]; | 2145 | struct sge_qset *qs = &adapter->sge.qs[qidx]; |
2146 | void *source; | 2146 | void *source; |
2147 | 2147 | ||
2148 | if (adapter->flags & USING_MSIX) | 2148 | if (adapter->flags & USING_MSIX) |
2149 | source = qs; | 2149 | source = qs; |
2150 | else | 2150 | else |
@@ -2339,7 +2339,7 @@ static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev, | |||
2339 | cxgb_close(netdev); | 2339 | cxgb_close(netdev); |
2340 | } | 2340 | } |
2341 | 2341 | ||
2342 | if (is_offload(adapter) && | 2342 | if (is_offload(adapter) && |
2343 | test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)) | 2343 | test_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)) |
2344 | offload_close(&adapter->tdev); | 2344 | offload_close(&adapter->tdev); |
2345 | 2345 | ||
@@ -2613,7 +2613,7 @@ static int __devinit init_one(struct pci_dev *pdev, | |||
2613 | err = -ENODEV; | 2613 | err = -ENODEV; |
2614 | goto out_free_dev; | 2614 | goto out_free_dev; |
2615 | } | 2615 | } |
2616 | 2616 | ||
2617 | /* | 2617 | /* |
2618 | * The card is now ready to go. If any errors occur during device | 2618 | * The card is now ready to go. If any errors occur during device |
2619 | * registration we do not fail the whole card but rather proceed only | 2619 | * registration we do not fail the whole card but rather proceed only |
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c index 7086f763dd9f..7e5892f1a9db 100644 --- a/drivers/net/cxgb3/cxgb3_offload.c +++ b/drivers/net/cxgb3/cxgb3_offload.c | |||
@@ -488,7 +488,7 @@ static void t3_process_tid_release_list(struct work_struct *work) | |||
488 | tid_release_task); | 488 | tid_release_task); |
489 | struct sk_buff *skb; | 489 | struct sk_buff *skb; |
490 | struct t3cdev *tdev = td->dev; | 490 | struct t3cdev *tdev = td->dev; |
491 | 491 | ||
492 | 492 | ||
493 | spin_lock_bh(&td->tid_release_lock); | 493 | spin_lock_bh(&td->tid_release_lock); |
494 | while (td->tid_release_list) { | 494 | while (td->tid_release_list) { |
diff --git a/drivers/net/cxgb3/firmware_exports.h b/drivers/net/cxgb3/firmware_exports.h index 6a835f6a262a..b75ddd8777fe 100644 --- a/drivers/net/cxgb3/firmware_exports.h +++ b/drivers/net/cxgb3/firmware_exports.h | |||
@@ -76,14 +76,14 @@ | |||
76 | #define FW_WROPCODE_MNGT 0x1D | 76 | #define FW_WROPCODE_MNGT 0x1D |
77 | #define FW_MNGTOPCODE_PKTSCHED_SET 0x00 | 77 | #define FW_MNGTOPCODE_PKTSCHED_SET 0x00 |
78 | 78 | ||
79 | /* Maximum size of a WR sent from the host, limited by the SGE. | 79 | /* Maximum size of a WR sent from the host, limited by the SGE. |
80 | * | 80 | * |
81 | * Note: WR coming from ULP or TP are only limited by CIM. | 81 | * Note: WR coming from ULP or TP are only limited by CIM. |
82 | */ | 82 | */ |
83 | #define FW_WR_SIZE 128 | 83 | #define FW_WR_SIZE 128 |
84 | 84 | ||
85 | /* Maximum number of outstanding WRs sent from the host. Value must be | 85 | /* Maximum number of outstanding WRs sent from the host. Value must be |
86 | * programmed in the CTRL/TUNNEL/QP SGE Egress Context and used by | 86 | * programmed in the CTRL/TUNNEL/QP SGE Egress Context and used by |
87 | * offload modules to limit the number of WRs per connection. | 87 | * offload modules to limit the number of WRs per connection. |
88 | */ | 88 | */ |
89 | #define FW_T3_WR_NUM 16 | 89 | #define FW_T3_WR_NUM 16 |
@@ -99,7 +99,7 @@ | |||
99 | * queues must start at SGE Egress Context FW_TUNNEL_SGEEC_START and must | 99 | * queues must start at SGE Egress Context FW_TUNNEL_SGEEC_START and must |
100 | * start at 'TID' (or 'uP Token') FW_TUNNEL_TID_START. | 100 | * start at 'TID' (or 'uP Token') FW_TUNNEL_TID_START. |
101 | * | 101 | * |
102 | * Ingress Traffic (e.g. DMA completion credit) for TUNNEL Queue[i] is sent | 102 | * Ingress Traffic (e.g. DMA completion credit) for TUNNEL Queue[i] is sent |
103 | * to RESP Queue[i]. | 103 | * to RESP Queue[i]. |
104 | */ | 104 | */ |
105 | #define FW_TUNNEL_NUM 8 | 105 | #define FW_TUNNEL_NUM 8 |
@@ -116,10 +116,10 @@ | |||
116 | #define FW_CTRL_SGEEC_START 65528 | 116 | #define FW_CTRL_SGEEC_START 65528 |
117 | #define FW_CTRL_TID_START 65536 | 117 | #define FW_CTRL_TID_START 65536 |
118 | 118 | ||
119 | /* FW_OFLD_NUM corresponds to the number of supported OFFLOAD Queues. These | 119 | /* FW_OFLD_NUM corresponds to the number of supported OFFLOAD Queues. These |
120 | * queues must start at SGE Egress Context FW_OFLD_SGEEC_START. | 120 | * queues must start at SGE Egress Context FW_OFLD_SGEEC_START. |
121 | * | 121 | * |
122 | * Note: the 'uP Token' in the SGE Egress Context fields is irrelevant for | 122 | * Note: the 'uP Token' in the SGE Egress Context fields is irrelevant for |
123 | * OFFLOAD Queues, as the host is responsible for providing the correct TID in | 123 | * OFFLOAD Queues, as the host is responsible for providing the correct TID in |
124 | * every WR. | 124 | * every WR. |
125 | * | 125 | * |
@@ -129,14 +129,14 @@ | |||
129 | #define FW_OFLD_SGEEC_START 0 | 129 | #define FW_OFLD_SGEEC_START 0 |
130 | 130 | ||
131 | /* | 131 | /* |
132 | * | 132 | * |
133 | */ | 133 | */ |
134 | #define FW_RI_NUM 1 | 134 | #define FW_RI_NUM 1 |
135 | #define FW_RI_SGEEC_START 65527 | 135 | #define FW_RI_SGEEC_START 65527 |
136 | #define FW_RI_TID_START 65552 | 136 | #define FW_RI_TID_START 65552 |
137 | 137 | ||
138 | /* | 138 | /* |
139 | * The RX_PKT_TID | 139 | * The RX_PKT_TID |
140 | */ | 140 | */ |
141 | #define FW_RX_PKT_NUM 1 | 141 | #define FW_RX_PKT_NUM 1 |
142 | #define FW_RX_PKT_TID_START 65553 | 142 | #define FW_RX_PKT_TID_START 65553 |
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index fab138100dff..dfdda4735bd8 100644 --- a/drivers/net/cxgb3/t3_hw.c +++ b/drivers/net/cxgb3/t3_hw.c | |||
@@ -865,7 +865,7 @@ int t3_get_tp_version(struct adapter *adapter, u32 *vers) | |||
865 | 1, 1, 5, 1); | 865 | 1, 1, 5, 1); |
866 | if (ret) | 866 | if (ret) |
867 | return ret; | 867 | return ret; |
868 | 868 | ||
869 | *vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1); | 869 | *vers = t3_read_reg(adapter, A_TP_EMBED_OP_FIELD1); |
870 | 870 | ||
871 | return 0; | 871 | return 0; |
@@ -896,7 +896,7 @@ int t3_check_tpsram_version(struct adapter *adapter, int *must_load) | |||
896 | major = G_TP_VERSION_MAJOR(vers); | 896 | major = G_TP_VERSION_MAJOR(vers); |
897 | minor = G_TP_VERSION_MINOR(vers); | 897 | minor = G_TP_VERSION_MINOR(vers); |
898 | 898 | ||
899 | if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) | 899 | if (major == TP_VERSION_MAJOR && minor == TP_VERSION_MINOR) |
900 | return 0; | 900 | return 0; |
901 | 901 | ||
902 | if (major != TP_VERSION_MAJOR) | 902 | if (major != TP_VERSION_MAJOR) |
@@ -913,7 +913,7 @@ int t3_check_tpsram_version(struct adapter *adapter, int *must_load) | |||
913 | } | 913 | } |
914 | 914 | ||
915 | /** | 915 | /** |
916 | * t3_check_tpsram - check if provided protocol SRAM | 916 | * t3_check_tpsram - check if provided protocol SRAM |
917 | * is compatible with this driver | 917 | * is compatible with this driver |
918 | * @adapter: the adapter | 918 | * @adapter: the adapter |
919 | * @tp_sram: the firmware image to write | 919 | * @tp_sram: the firmware image to write |
@@ -2508,7 +2508,7 @@ static void tp_config(struct adapter *adap, const struct tp_params *p) | |||
2508 | t3_set_reg_field(adap, A_TP_PC_CONFIG2, F_CHDRAFULL, 0); | 2508 | t3_set_reg_field(adap, A_TP_PC_CONFIG2, F_CHDRAFULL, 0); |
2509 | t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1080); | 2509 | t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1080); |
2510 | t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1000); | 2510 | t3_write_reg(adap, A_TP_PROXY_FLOW_CNTL, 1000); |
2511 | 2511 | ||
2512 | if (adap->params.rev > 0) { | 2512 | if (adap->params.rev > 0) { |
2513 | tp_wr_indirect(adap, A_TP_EGRESS_CONFIG, F_REWRITEFORCETOSIZE); | 2513 | tp_wr_indirect(adap, A_TP_EGRESS_CONFIG, F_REWRITEFORCETOSIZE); |
2514 | t3_set_reg_field(adap, A_TP_PARA_REG3, F_TXPACEAUTO, | 2514 | t3_set_reg_field(adap, A_TP_PARA_REG3, F_TXPACEAUTO, |
@@ -2835,7 +2835,7 @@ int t3_set_proto_sram(struct adapter *adap, u8 *data) | |||
2835 | t3_write_reg(adap, A_TP_EMBED_OP_FIELD3, cpu_to_be32(*buf++)); | 2835 | t3_write_reg(adap, A_TP_EMBED_OP_FIELD3, cpu_to_be32(*buf++)); |
2836 | t3_write_reg(adap, A_TP_EMBED_OP_FIELD2, cpu_to_be32(*buf++)); | 2836 | t3_write_reg(adap, A_TP_EMBED_OP_FIELD2, cpu_to_be32(*buf++)); |
2837 | t3_write_reg(adap, A_TP_EMBED_OP_FIELD1, cpu_to_be32(*buf++)); | 2837 | t3_write_reg(adap, A_TP_EMBED_OP_FIELD1, cpu_to_be32(*buf++)); |
2838 | 2838 | ||
2839 | t3_write_reg(adap, A_TP_EMBED_OP_FIELD0, i << 1 | 1 << 31); | 2839 | t3_write_reg(adap, A_TP_EMBED_OP_FIELD0, i << 1 | 1 << 31); |
2840 | if (t3_wait_op_done(adap, A_TP_EMBED_OP_FIELD0, 1, 1, 5, 1)) | 2840 | if (t3_wait_op_done(adap, A_TP_EMBED_OP_FIELD0, 1, 1, 5, 1)) |
2841 | return -EIO; | 2841 | return -EIO; |
@@ -3425,13 +3425,13 @@ void early_hw_init(struct adapter *adapter, const struct adapter_info *ai) | |||
3425 | } | 3425 | } |
3426 | 3426 | ||
3427 | /* | 3427 | /* |
3428 | * Reset the adapter. | 3428 | * Reset the adapter. |
3429 | * Older PCIe cards lose their config space during reset, PCI-X | 3429 | * Older PCIe cards lose their config space during reset, PCI-X |
3430 | * ones don't. | 3430 | * ones don't. |
3431 | */ | 3431 | */ |
3432 | static int t3_reset_adapter(struct adapter *adapter) | 3432 | static int t3_reset_adapter(struct adapter *adapter) |
3433 | { | 3433 | { |
3434 | int i, save_and_restore_pcie = | 3434 | int i, save_and_restore_pcie = |
3435 | adapter->params.rev < T3_REV_B2 && is_pcie(adapter); | 3435 | adapter->params.rev < T3_REV_B2 && is_pcie(adapter); |
3436 | uint16_t devid = 0; | 3436 | uint16_t devid = 0; |
3437 | 3437 | ||
diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c index efcf09a709cf..ffdc0a1892bd 100644 --- a/drivers/net/cxgb3/xgmac.c +++ b/drivers/net/cxgb3/xgmac.c | |||
@@ -153,7 +153,7 @@ static int t3b2_mac_reset(struct cmac *mac) | |||
153 | unsigned int oft = mac->offset; | 153 | unsigned int oft = mac->offset; |
154 | u32 val; | 154 | u32 val; |
155 | 155 | ||
156 | if (!macidx(mac)) | 156 | if (!macidx(mac)) |
157 | t3_set_reg_field(adap, A_MPS_CFG, F_PORT0ACTIVE, 0); | 157 | t3_set_reg_field(adap, A_MPS_CFG, F_PORT0ACTIVE, 0); |
158 | else | 158 | else |
159 | t3_set_reg_field(adap, A_MPS_CFG, F_PORT1ACTIVE, 0); | 159 | t3_set_reg_field(adap, A_MPS_CFG, F_PORT1ACTIVE, 0); |
@@ -187,11 +187,11 @@ static int t3b2_mac_reset(struct cmac *mac) | |||
187 | msleep(1); | 187 | msleep(1); |
188 | t3b_pcs_reset(mac); | 188 | t3b_pcs_reset(mac); |
189 | } | 189 | } |
190 | t3_write_reg(adap, A_XGM_RX_CFG + oft, | 190 | t3_write_reg(adap, A_XGM_RX_CFG + oft, |
191 | F_DISPAUSEFRAMES | F_EN1536BFRAMES | | 191 | F_DISPAUSEFRAMES | F_EN1536BFRAMES | |
192 | F_RMFCS | F_ENJUMBO | F_ENHASHMCAST); | 192 | F_RMFCS | F_ENJUMBO | F_ENHASHMCAST); |
193 | 193 | ||
194 | if (!macidx(mac)) | 194 | if (!macidx(mac)) |
195 | t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT0ACTIVE); | 195 | t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT0ACTIVE); |
196 | else | 196 | else |
197 | t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT1ACTIVE); | 197 | t3_set_reg_field(adap, A_MPS_CFG, 0, F_PORT1ACTIVE); |
@@ -336,7 +336,7 @@ int t3_mac_set_mtu(struct cmac *mac, unsigned int mtu) | |||
336 | * Adjust the PAUSE frame watermarks. We always set the LWM, and the | 336 | * Adjust the PAUSE frame watermarks. We always set the LWM, and the |
337 | * HWM only if flow-control is enabled. | 337 | * HWM only if flow-control is enabled. |
338 | */ | 338 | */ |
339 | hwm = max_t(unsigned int, MAC_RXFIFO_SIZE - 3 * mtu, | 339 | hwm = max_t(unsigned int, MAC_RXFIFO_SIZE - 3 * mtu, |
340 | MAC_RXFIFO_SIZE * 38 / 100); | 340 | MAC_RXFIFO_SIZE * 38 / 100); |
341 | hwm = min(hwm, MAC_RXFIFO_SIZE - 8192); | 341 | hwm = min(hwm, MAC_RXFIFO_SIZE - 8192); |
342 | lwm = min(3 * (int)mtu, MAC_RXFIFO_SIZE / 4); | 342 | lwm = min(3 * (int)mtu, MAC_RXFIFO_SIZE / 4); |
@@ -449,7 +449,7 @@ int t3_mac_enable(struct cmac *mac, int which) | |||
449 | struct adapter *adap = mac->adapter; | 449 | struct adapter *adap = mac->adapter; |
450 | unsigned int oft = mac->offset; | 450 | unsigned int oft = mac->offset; |
451 | struct mac_stats *s = &mac->stats; | 451 | struct mac_stats *s = &mac->stats; |
452 | 452 | ||
453 | if (which & MAC_DIRECTION_TX) { | 453 | if (which & MAC_DIRECTION_TX) { |
454 | t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CFG_CH0 + idx); | 454 | t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CFG_CH0 + idx); |
455 | t3_write_reg(adap, A_TP_PIO_DATA, 0xc0ede401); | 455 | t3_write_reg(adap, A_TP_PIO_DATA, 0xc0ede401); |