aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/sfxge/common/ef10_impl.h26
-rw-r--r--sys/dev/sfxge/common/ef10_phy.c41
-rw-r--r--sys/dev/sfxge/common/efx_impl.h8
-rw-r--r--sys/dev/sfxge/common/efx_phy.c38
-rw-r--r--sys/dev/sfxge/common/siena_impl.h37
-rw-r--r--sys/dev/sfxge/common/siena_phy.c41
6 files changed, 6 insertions, 185 deletions
diff --git a/sys/dev/sfxge/common/ef10_impl.h b/sys/dev/sfxge/common/ef10_impl.h
index 5985f483d1c0..bd87b120a583 100644
--- a/sys/dev/sfxge/common/ef10_impl.h
+++ b/sys/dev/sfxge/common/ef10_impl.h
@@ -595,32 +595,6 @@ ef10_phy_stats_update(
#endif /* EFSYS_OPT_PHY_STATS */
-#if EFSYS_OPT_PHY_PROPS
-
-#if EFSYS_OPT_NAMES
-
-extern const char *
-ef10_phy_prop_name(
- __in efx_nic_t *enp,
- __in unsigned int id);
-
-#endif /* EFSYS_OPT_NAMES */
-
-extern __checkReturn efx_rc_t
-ef10_phy_prop_get(
- __in efx_nic_t *enp,
- __in unsigned int id,
- __in uint32_t flags,
- __out uint32_t *valp);
-
-extern __checkReturn efx_rc_t
-ef10_phy_prop_set(
- __in efx_nic_t *enp,
- __in unsigned int id,
- __in uint32_t val);
-
-#endif /* EFSYS_OPT_PHY_PROPS */
-
/* TX */
diff --git a/sys/dev/sfxge/common/ef10_phy.c b/sys/dev/sfxge/common/ef10_phy.c
index 9241297e8d51..6fcdc9f5447f 100644
--- a/sys/dev/sfxge/common/ef10_phy.c
+++ b/sys/dev/sfxge/common/ef10_phy.c
@@ -474,45 +474,4 @@ ef10_phy_stats_update(
#endif /* EFSYS_OPT_PHY_STATS */
-#if EFSYS_OPT_PHY_PROPS
-
-#if EFSYS_OPT_NAMES
-
- const char *
-ef10_phy_prop_name(
- __in efx_nic_t *enp,
- __in unsigned int id)
-{
- _NOTE(ARGUNUSED(enp, id))
-
- return (NULL);
-}
-
-#endif /* EFSYS_OPT_NAMES */
-
- __checkReturn efx_rc_t
-ef10_phy_prop_get(
- __in efx_nic_t *enp,
- __in unsigned int id,
- __in uint32_t flags,
- __out uint32_t *valp)
-{
- _NOTE(ARGUNUSED(enp, id, flags, valp))
-
- return (ENOTSUP);
-}
-
- __checkReturn efx_rc_t
-ef10_phy_prop_set(
- __in efx_nic_t *enp,
- __in unsigned int id,
- __in uint32_t val)
-{
- _NOTE(ARGUNUSED(enp, id, val))
-
- return (ENOTSUP);
-}
-
-#endif /* EFSYS_OPT_PHY_PROPS */
-
#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD */
diff --git a/sys/dev/sfxge/common/efx_impl.h b/sys/dev/sfxge/common/efx_impl.h
index 7b538d19678d..ae220c21f0bf 100644
--- a/sys/dev/sfxge/common/efx_impl.h
+++ b/sys/dev/sfxge/common/efx_impl.h
@@ -217,14 +217,6 @@ typedef struct efx_phy_ops_s {
efx_rc_t (*epo_stats_update)(efx_nic_t *, efsys_mem_t *,
uint32_t *);
#endif /* EFSYS_OPT_PHY_STATS */
-#if EFSYS_OPT_PHY_PROPS
-#if EFSYS_OPT_NAMES
- const char *(*epo_prop_name)(efx_nic_t *, unsigned int);
-#endif /* EFSYS_OPT_PHY_PROPS */
- efx_rc_t (*epo_prop_get)(efx_nic_t *, unsigned int, uint32_t,
- uint32_t *);
- efx_rc_t (*epo_prop_set)(efx_nic_t *, unsigned int, uint32_t);
-#endif /* EFSYS_OPT_PHY_PROPS */
#if EFSYS_OPT_BIST
efx_rc_t (*epo_bist_enable_offline)(efx_nic_t *);
efx_rc_t (*epo_bist_start)(efx_nic_t *, efx_bist_type_t);
diff --git a/sys/dev/sfxge/common/efx_phy.c b/sys/dev/sfxge/common/efx_phy.c
index ab60400c0ecf..b993f509b061 100644
--- a/sys/dev/sfxge/common/efx_phy.c
+++ b/sys/dev/sfxge/common/efx_phy.c
@@ -47,13 +47,6 @@ static const efx_phy_ops_t __efx_phy_siena_ops = {
#if EFSYS_OPT_PHY_STATS
siena_phy_stats_update, /* epo_stats_update */
#endif /* EFSYS_OPT_PHY_STATS */
-#if EFSYS_OPT_PHY_PROPS
-#if EFSYS_OPT_NAMES
- siena_phy_prop_name, /* epo_prop_name */
-#endif
- siena_phy_prop_get, /* epo_prop_get */
- siena_phy_prop_set, /* epo_prop_set */
-#endif /* EFSYS_OPT_PHY_PROPS */
#if EFSYS_OPT_BIST
NULL, /* epo_bist_enable_offline */
siena_phy_bist_start, /* epo_bist_start */
@@ -75,13 +68,6 @@ static const efx_phy_ops_t __efx_phy_ef10_ops = {
#if EFSYS_OPT_PHY_STATS
ef10_phy_stats_update, /* epo_stats_update */
#endif /* EFSYS_OPT_PHY_STATS */
-#if EFSYS_OPT_PHY_PROPS
-#if EFSYS_OPT_NAMES
- ef10_phy_prop_name, /* epo_prop_name */
-#endif
- ef10_phy_prop_get, /* epo_prop_get */
- ef10_phy_prop_set, /* epo_prop_set */
-#endif /* EFSYS_OPT_PHY_PROPS */
#if EFSYS_OPT_BIST
/* FIXME: Are these BIST methods appropriate for Medford? */
hunt_bist_enable_offline, /* epo_bist_enable_offline */
@@ -445,13 +431,9 @@ efx_phy_prop_name(
__in efx_nic_t *enp,
__in unsigned int id)
{
- efx_port_t *epp = &(enp->en_port);
- const efx_phy_ops_t *epop = epp->ep_epop;
+ _NOTE(ARGUNUSED(enp, id))
- EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
- EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PROBE);
-
- return (epop->epo_prop_name(enp, id));
+ return (NULL);
}
#endif /* EFSYS_OPT_NAMES */
@@ -462,13 +444,9 @@ efx_phy_prop_get(
__in uint32_t flags,
__out uint32_t *valp)
{
- efx_port_t *epp = &(enp->en_port);
- const efx_phy_ops_t *epop = epp->ep_epop;
+ _NOTE(ARGUNUSED(enp, id, flags, valp))
- EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
- EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT);
-
- return (epop->epo_prop_get(enp, id, flags, valp));
+ return (ENOTSUP);
}
__checkReturn efx_rc_t
@@ -477,13 +455,9 @@ efx_phy_prop_set(
__in unsigned int id,
__in uint32_t val)
{
- efx_port_t *epp = &(enp->en_port);
- const efx_phy_ops_t *epop = epp->ep_epop;
-
- EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
- EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_PORT);
+ _NOTE(ARGUNUSED(enp, id, val))
- return (epop->epo_prop_set(enp, id, val));
+ return (ENOTSUP);
}
#endif /* EFSYS_OPT_PHY_STATS */
diff --git a/sys/dev/sfxge/common/siena_impl.h b/sys/dev/sfxge/common/siena_impl.h
index f9efe581e117..742266d7ebdf 100644
--- a/sys/dev/sfxge/common/siena_impl.h
+++ b/sys/dev/sfxge/common/siena_impl.h
@@ -42,17 +42,6 @@
extern "C" {
#endif
-#if EFSYS_OPT_PHY_PROPS
-
-/* START MKCONFIG GENERATED SienaPhyHeaderPropsBlock a8db1f8eb5106efd */
-typedef enum siena_phy_prop_e {
- SIENA_PHY_NPROPS
-} siena_phy_prop_t;
-
-/* END MKCONFIG GENERATED SienaPhyHeaderPropsBlock */
-
-#endif /* EFSYS_OPT_PHY_PROPS */
-
#define SIENA_NVRAM_CHUNK 0x80
extern __checkReturn efx_rc_t
@@ -360,32 +349,6 @@ siena_phy_stats_update(
#endif /* EFSYS_OPT_PHY_STATS */
-#if EFSYS_OPT_PHY_PROPS
-
-#if EFSYS_OPT_NAMES
-
-extern const char *
-siena_phy_prop_name(
- __in efx_nic_t *enp,
- __in unsigned int id);
-
-#endif /* EFSYS_OPT_NAMES */
-
-extern __checkReturn efx_rc_t
-siena_phy_prop_get(
- __in efx_nic_t *enp,
- __in unsigned int id,
- __in uint32_t flags,
- __out uint32_t *valp);
-
-extern __checkReturn efx_rc_t
-siena_phy_prop_set(
- __in efx_nic_t *enp,
- __in unsigned int id,
- __in uint32_t val);
-
-#endif /* EFSYS_OPT_PHY_PROPS */
-
#if EFSYS_OPT_BIST
extern __checkReturn efx_rc_t
diff --git a/sys/dev/sfxge/common/siena_phy.c b/sys/dev/sfxge/common/siena_phy.c
index 920314a0f4ef..93f56eda7d34 100644
--- a/sys/dev/sfxge/common/siena_phy.c
+++ b/sys/dev/sfxge/common/siena_phy.c
@@ -592,47 +592,6 @@ fail1:
#endif /* EFSYS_OPT_PHY_STATS */
-#if EFSYS_OPT_PHY_PROPS
-
-#if EFSYS_OPT_NAMES
-
-extern const char *
-siena_phy_prop_name(
- __in efx_nic_t *enp,
- __in unsigned int id)
-{
- _NOTE(ARGUNUSED(enp, id))
-
- return (NULL);
-}
-
-#endif /* EFSYS_OPT_NAMES */
-
-extern __checkReturn efx_rc_t
-siena_phy_prop_get(
- __in efx_nic_t *enp,
- __in unsigned int id,
- __in uint32_t flags,
- __out uint32_t *valp)
-{
- _NOTE(ARGUNUSED(enp, id, flags, valp))
-
- return (ENOTSUP);
-}
-
-extern __checkReturn efx_rc_t
-siena_phy_prop_set(
- __in efx_nic_t *enp,
- __in unsigned int id,
- __in uint32_t val)
-{
- _NOTE(ARGUNUSED(enp, id, val))
-
- return (ENOTSUP);
-}
-
-#endif /* EFSYS_OPT_PHY_PROPS */
-
#if EFSYS_OPT_BIST
__checkReturn efx_rc_t
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-28 07:26:46 +0000