|
@@ -3073,11 +3073,9 @@ static void
|
3073
|
3073
|
clear_b0_fpga_memories ( struct efab_nic *efab)
|
3074
|
3074
|
{
|
3075
|
3075
|
efab_oword_t blanko, temp;
|
3076
|
|
- efab_dword_t blankd;
|
3077
|
3076
|
int offset;
|
3078
|
3077
|
|
3079
|
3078
|
EFAB_ZERO_OWORD ( blanko );
|
3080
|
|
- EFAB_ZERO_DWORD ( blankd );
|
3081
|
3079
|
|
3082
|
3080
|
/* Clear the address region register */
|
3083
|
3081
|
EFAB_POPULATE_OWORD_4 ( temp,
|
|
@@ -3175,7 +3173,7 @@ static void
|
3175
|
3173
|
falcon_probe_nic_variant ( struct efab_nic *efab, struct pci_device *pci )
|
3176
|
3174
|
{
|
3177
|
3175
|
efab_oword_t altera_build, nic_stat;
|
3178
|
|
- int is_pcie, fpga_version;
|
|
3176
|
+ int fpga_version;
|
3179
|
3177
|
uint8_t revision;
|
3180
|
3178
|
|
3181
|
3179
|
/* PCI revision */
|
|
@@ -3190,16 +3188,13 @@ falcon_probe_nic_variant ( struct efab_nic *efab, struct pci_device *pci )
|
3190
|
3188
|
/* MAC and PCI type */
|
3191
|
3189
|
falcon_read ( efab, &nic_stat, FCN_NIC_STAT_REG );
|
3192
|
3190
|
if ( efab->pci_revision == FALCON_REV_B0 ) {
|
3193
|
|
- is_pcie = 1;
|
3194
|
3191
|
efab->phy_10g = EFAB_OWORD_FIELD ( nic_stat, FCN_STRAP_10G );
|
3195
|
3192
|
}
|
3196
|
3193
|
else if ( efab->is_asic ) {
|
3197
|
|
- is_pcie = EFAB_OWORD_FIELD ( nic_stat, FCN_STRAP_PCIE );
|
3198
|
3194
|
efab->phy_10g = EFAB_OWORD_FIELD ( nic_stat, FCN_STRAP_10G );
|
3199
|
3195
|
}
|
3200
|
3196
|
else {
|
3201
|
3197
|
int minor = EFAB_OWORD_FIELD ( altera_build, FCN_VER_MINOR );
|
3202
|
|
- is_pcie = 0;
|
3203
|
3198
|
efab->phy_10g = ( minor == 0x14 );
|
3204
|
3199
|
}
|
3205
|
3200
|
}
|