Page MenuHomeFreeBSD
Files F105767460

D8966.diff
No OneTemporary
Actions

D8966.diff
View Options

Index: head/sys/dev/sfxge/common/efx.h
===================================================================
--- head/sys/dev/sfxge/common/efx.h
+++ head/sys/dev/sfxge/common/efx.h
@@ -128,11 +128,6 @@
typedef struct efx_nic_s efx_nic_t;
-#define EFX_NIC_FUNC_PRIMARY 0x00000001
-#define EFX_NIC_FUNC_LINKCTRL 0x00000002
-#define EFX_NIC_FUNC_TRUSTED 0x00000004
-
-
extern __checkReturn efx_rc_t
efx_nic_create(
__in efx_family_t family,
@@ -1100,7 +1095,6 @@
unsigned int enc_features;
uint8_t enc_mac_addr[6];
uint8_t enc_port; /* PHY port number */
- uint32_t enc_func_flags;
uint32_t enc_intr_vec_base;
uint32_t enc_intr_limit;
uint32_t enc_evq_limit;
Index: head/sys/dev/sfxge/common/efx_mcdi.c
===================================================================
--- head/sys/dev/sfxge/common/efx_mcdi.c
+++ head/sys/dev/sfxge/common/efx_mcdi.c
@@ -1184,11 +1184,9 @@
__in efx_nic_t *enp,
__in boolean_t attach)
{
- efx_nic_cfg_t *encp = &(enp->en_nic_cfg);
efx_mcdi_req_t req;
uint8_t payload[MAX(MC_CMD_DRV_ATTACH_IN_LEN,
MC_CMD_DRV_ATTACH_EXT_OUT_LEN)];
- uint32_t flags;
efx_rc_t rc;
(void) memset(payload, 0, sizeof (payload));
@@ -1219,36 +1217,8 @@
goto fail2;
}
- if (attach == B_FALSE) {
- flags = 0;
- } else if (enp->en_family == EFX_FAMILY_SIENA) {
- efx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);
-
- /* Create synthetic privileges for Siena functions */
- flags = EFX_NIC_FUNC_LINKCTRL | EFX_NIC_FUNC_TRUSTED;
- if (emip->emi_port == 1)
- flags |= EFX_NIC_FUNC_PRIMARY;
- } else {
- EFX_STATIC_ASSERT(EFX_NIC_FUNC_PRIMARY ==
- (1u << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_PRIMARY));
- EFX_STATIC_ASSERT(EFX_NIC_FUNC_LINKCTRL ==
- (1u << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_LINKCTRL));
- EFX_STATIC_ASSERT(EFX_NIC_FUNC_TRUSTED ==
- (1u << MC_CMD_DRV_ATTACH_EXT_OUT_FLAG_TRUSTED));
-
- /* Save function privilege flags (EF10 and later) */
- if (req.emr_out_length_used < MC_CMD_DRV_ATTACH_EXT_OUT_LEN) {
- rc = EMSGSIZE;
- goto fail3;
- }
- flags = MCDI_OUT_DWORD(req, DRV_ATTACH_EXT_OUT_FUNC_FLAGS);
- }
- encp->enc_func_flags = flags;
-
return (0);
-fail3:
- EFSYS_PROBE(fail3);
fail2:
EFSYS_PROBE(fail2);
fail1:

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 10:05 AM (17 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15540227
Default Alt Text
D8966.diff (2 KB)

Event Timeline