Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/50231/?format=api
{ "id": 50231, "url": "https://patches.dpdk.org/api/patches/50231/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1549556983-10896-35-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1549556983-10896-35-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1549556983-10896-35-git-send-email-arybchenko@solarflare.com", "date": "2019-02-07T16:29:39", "name": "[34/38] net/sfc/base: simplify EF10 family conditional code checks", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e6151d8800580b675745481a7a8508657a465696", "submitter": { "id": 607, "url": "https://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1549556983-10896-35-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 3411, "url": "https://patches.dpdk.org/api/series/3411/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=3411", "date": "2019-02-07T16:29:05", "name": "net/sfc: update base driver", "version": 1, "mbox": "https://patches.dpdk.org/series/3411/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/50231/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/50231/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D86441B75E;\n\tThu, 7 Feb 2019 17:31:17 +0100 (CET)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 193031B586\n\tfor <dev@dpdk.org>; Thu, 7 Feb 2019 17:30:39 +0100 (CET)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id\n\t2F836B800AB for <dev@dpdk.org>; Thu, 7 Feb 2019 16:30:38 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Thu, 7 Feb 2019 08:30:32 -0800", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1395.4 via Frontend Transport; Thu, 7 Feb 2019 08:30:32 -0800", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx17GUUJF015389 for <dev@dpdk.org>; Thu, 7 Feb 2019 16:30:30 GMT", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\tC769B1613E4\n\tfor <dev@dpdk.org>; Thu, 7 Feb 2019 16:30:30 +0000 (GMT)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Thu, 7 Feb 2019 16:29:39 +0000", "Message-ID": "<1549556983-10896-35-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1549556983-10896-1-git-send-email-arybchenko@solarflare.com>", "References": "<1549556983-10896-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-TM-AS-Result": "No-2.265200-4.000000-10", "X-TMASE-MatchedRID": "AH+13/h3Btcs8TfQqffEin9NanCUA4VefpfZybTNChph0dYKwYUJ7dno\n\tquRwHY3B09NQNrxIpFaBKux5JGhWj7tw8BKUdyrbi5tintRiuz1T4DtiSkMnWKvM+zzl/BST42W\n\tOuy++C8MVQFY2fphvOSP/ZAaHCwSbwdbU3akH5Awc9jA4mLo8uUH7wsB5444w/uK0hv0lVwknuU\n\tw4pivTsOZisWqu1MIpnCQs5bM5utF/Xgn9EbUCW2RMJLPaSvtWloU71ctjXZRaQ9I+e6XEcAGRV\n\tPpr3xmq6pizmvbqzYiTom51wBxByo3mgF0zSpmjlTsGW3DmpUvTDXgcUlCNo62PbheqHTJcvt1p\n\t+w2DNiobdwvLWESYtSMXIQaAIeGKj+ikqJBaOpTnx2TmxvCbKBe7n4sP3NiQNpa85b21c9CuinG\n\tZkXhQPcAAKG4KW+rCaXYXnPOABMbSuXLpNqOJSVZ4U3MrW+XSfS0Ip2eEHnz3IzXlXlpamPoLR4\n\t+zsDTtCQvlWYtoEBFk4Cc5C32YAUbwXX2nY5q0DleaqvyZ9KDJ0TRfq+mITO+fTmronCwJkG6Gh\n\tpVsbwB1fapMXgt9c91wuN6HvlsWTDi98oLNjEsAA9BapWXaJtG+KyfdrZrRf3e2vVbH8zAprePx\n\tfSjlew==", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--2.265200-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24412.006", "X-MDID": "1549557038-fCvMfsoUGvvC", "Subject": "[dpdk-dev] [PATCH 34/38] net/sfc/base: simplify EF10 family\n\tconditional code checks", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add EFX_OPTS_EF10() which may be used as synonym of any EF10-based\nNIC (i.e. Huntigton, Medford or Medford2 at the time of addition).\n\nSuggested-by: Andy Moreton <amoreton@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_ev.c | 4 +-\n drivers/net/sfc/base/ef10_filter.c | 4 +-\n drivers/net/sfc/base/ef10_intr.c | 4 +-\n drivers/net/sfc/base/ef10_mac.c | 4 +-\n drivers/net/sfc/base/ef10_mcdi.c | 4 +-\n drivers/net/sfc/base/ef10_nic.c | 4 +-\n drivers/net/sfc/base/ef10_nvram.c | 4 +-\n drivers/net/sfc/base/ef10_phy.c | 4 +-\n drivers/net/sfc/base/ef10_rx.c | 4 +-\n drivers/net/sfc/base/ef10_tx.c | 4 +-\n drivers/net/sfc/base/ef10_vpd.c | 4 +-\n drivers/net/sfc/base/efx.h | 8 +--\n drivers/net/sfc/base/efx_bootcfg.c | 4 +-\n drivers/net/sfc/base/efx_check.h | 99 +++++++++++++-----------------\n drivers/net/sfc/base/efx_ev.c | 4 +-\n drivers/net/sfc/base/efx_filter.c | 4 +-\n drivers/net/sfc/base/efx_impl.h | 12 ++--\n drivers/net/sfc/base/efx_intr.c | 4 +-\n drivers/net/sfc/base/efx_mac.c | 4 +-\n drivers/net/sfc/base/efx_mcdi.c | 12 ++--\n drivers/net/sfc/base/efx_mcdi.h | 4 +-\n drivers/net/sfc/base/efx_nvram.c | 4 +-\n drivers/net/sfc/base/efx_phy.c | 4 +-\n drivers/net/sfc/base/efx_rx.c | 4 +-\n drivers/net/sfc/base/efx_sram.c | 8 +--\n drivers/net/sfc/base/efx_vpd.c | 4 +-\n 26 files changed, 105 insertions(+), 118 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_ev.c b/drivers/net/sfc/base/ef10_ev.c\nindex 6868787ed..f590f37f5 100644\n--- a/drivers/net/sfc/base/ef10_ev.c\n+++ b/drivers/net/sfc/base/ef10_ev.c\n@@ -10,7 +10,7 @@\n #include \"mcdi_mon.h\"\n #endif\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n #if EFSYS_OPT_QSTATS\n #define\tEFX_EV_QSTAT_INCR(_eep, _stat)\t\t\t\t\t\\\n@@ -1478,4 +1478,4 @@ ef10_ev_rxlabel_fini(\n #endif\n }\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_filter.c b/drivers/net/sfc/base/ef10_filter.c\nindex afe4064d9..0b3fbf78b 100644\n--- a/drivers/net/sfc/base/ef10_filter.c\n+++ b/drivers/net/sfc/base/ef10_filter.c\n@@ -7,7 +7,7 @@\n #include \"efx.h\"\n #include \"efx_impl.h\"\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n #if EFSYS_OPT_FILTER\n \n@@ -1773,4 +1773,4 @@ ef10_filter_default_rxq_clear(\n \n #endif /* EFSYS_OPT_FILTER */\n \n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_intr.c b/drivers/net/sfc/base/ef10_intr.c\nindex efa157125..b7822a259 100644\n--- a/drivers/net/sfc/base/ef10_intr.c\n+++ b/drivers/net/sfc/base/ef10_intr.c\n@@ -8,7 +8,7 @@\n #include \"efx_impl.h\"\n \n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n \t__checkReturn\tefx_rc_t\n ef10_intr_init(\n@@ -172,4 +172,4 @@ ef10_intr_fini(\n \t_NOTE(ARGUNUSED(enp))\n }\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_mac.c b/drivers/net/sfc/base/ef10_mac.c\nindex 9f10f6f79..28dba9290 100644\n--- a/drivers/net/sfc/base/ef10_mac.c\n+++ b/drivers/net/sfc/base/ef10_mac.c\n@@ -8,7 +8,7 @@\n #include \"efx_impl.h\"\n \n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n \t__checkReturn\tefx_rc_t\n ef10_mac_poll(\n@@ -1041,4 +1041,4 @@ ef10_mac_stats_update(\n \n #endif\t/* EFSYS_OPT_MAC_STATS */\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_mcdi.c b/drivers/net/sfc/base/ef10_mcdi.c\nindex 8a3fc3b46..574879425 100644\n--- a/drivers/net/sfc/base/ef10_mcdi.c\n+++ b/drivers/net/sfc/base/ef10_mcdi.c\n@@ -8,7 +8,7 @@\n #include \"efx_impl.h\"\n \n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n #if EFSYS_OPT_MCDI\n \n@@ -322,4 +322,4 @@ ef10_mcdi_feature_supported(\n \n #endif\t/* EFSYS_OPT_MCDI */\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c\nindex 6ba2fe3b9..8c17f4a75 100644\n--- a/drivers/net/sfc/base/ef10_nic.c\n+++ b/drivers/net/sfc/base/ef10_nic.c\n@@ -10,7 +10,7 @@\n #include \"mcdi_mon.h\"\n #endif\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n #include \"ef10_tlv_layout.h\"\n \n@@ -2571,4 +2571,4 @@ efx_mcdi_set_nic_global(\n \n #endif\t/* EFSYS_OPT_FW_SUBVARIANT_AWARE */\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_nvram.c b/drivers/net/sfc/base/ef10_nvram.c\nindex d54f7df02..2aed42131 100644\n--- a/drivers/net/sfc/base/ef10_nvram.c\n+++ b/drivers/net/sfc/base/ef10_nvram.c\n@@ -7,7 +7,7 @@\n #include \"efx.h\"\n #include \"efx_impl.h\"\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n #if EFSYS_OPT_VPD || EFSYS_OPT_NVRAM\n \n@@ -2487,4 +2487,4 @@ ef10_nvram_partn_rw_finish(\n \n #endif\t/* EFSYS_OPT_NVRAM */\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_phy.c b/drivers/net/sfc/base/ef10_phy.c\nindex 84ccdde5d..737c52e10 100644\n--- a/drivers/net/sfc/base/ef10_phy.c\n+++ b/drivers/net/sfc/base/ef10_phy.c\n@@ -7,7 +7,7 @@\n #include \"efx.h\"\n #include \"efx_impl.h\"\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n static\t\t\tvoid\n mcdi_phy_decode_cap(\n@@ -755,4 +755,4 @@ ef10_bist_stop(\n \n #endif\t/* EFSYS_OPT_BIST */\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c\nindex c060d2e4d..27514c1cb 100644\n--- a/drivers/net/sfc/base/ef10_rx.c\n+++ b/drivers/net/sfc/base/ef10_rx.c\n@@ -8,7 +8,7 @@\n #include \"efx_impl.h\"\n \n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n \n static\t__checkReturn\tefx_rc_t\n@@ -1225,4 +1225,4 @@ ef10_rx_fini(\n #endif /* EFSYS_OPT_RX_SCALE */\n }\n \n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_tx.c b/drivers/net/sfc/base/ef10_tx.c\nindex 82be77f13..6a908167b 100644\n--- a/drivers/net/sfc/base/ef10_tx.c\n+++ b/drivers/net/sfc/base/ef10_tx.c\n@@ -8,7 +8,7 @@\n #include \"efx_impl.h\"\n \n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n #if EFSYS_OPT_QSTATS\n #define\tEFX_TX_QSTAT_INCR(_etp, _stat)\t\t\t\t\t\\\n@@ -769,4 +769,4 @@ ef10_tx_qstats_update(\n \n #endif /* EFSYS_OPT_QSTATS */\n \n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\ndiff --git a/drivers/net/sfc/base/ef10_vpd.c b/drivers/net/sfc/base/ef10_vpd.c\nindex 097fe1d4e..b21861bb0 100644\n--- a/drivers/net/sfc/base/ef10_vpd.c\n+++ b/drivers/net/sfc/base/ef10_vpd.c\n@@ -10,7 +10,7 @@\n \n #if EFSYS_OPT_VPD\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n #include \"ef10_tlv_layout.h\"\n \n@@ -445,6 +445,6 @@ ef10_vpd_fini(\n \t}\n }\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n #endif\t/* EFSYS_OPT_VPD */\ndiff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h\nindex 2cd2c36c3..293a0e254 100644\n--- a/drivers/net/sfc/base/efx.h\n+++ b/drivers/net/sfc/base/efx.h\n@@ -209,8 +209,8 @@ efx_nic_check_pcie_link_speed(\n \n #if EFSYS_OPT_MCDI\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n-/* Huntington and Medford require MCDIv2 commands */\n+#if EFX_OPTS_EF10()\n+/* EF10 architecture NICs require MCDIv2 commands */\n #define\tWITH_MCDI_V2 1\n #endif\n \n@@ -1329,11 +1329,11 @@ typedef struct efx_nic_cfg_s {\n #if EFSYS_OPT_BIST\n \tuint32_t\t\tenc_bist_mask;\n #endif\t/* EFSYS_OPT_BIST */\n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \tuint32_t\t\tenc_pf;\n \tuint32_t\t\tenc_vf;\n \tuint32_t\t\tenc_privilege_mask;\n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\n \tboolean_t\t\tenc_bug26807_workaround;\n \tboolean_t\t\tenc_bug35388_workaround;\n \tboolean_t\t\tenc_bug41750_workaround;\ndiff --git a/drivers/net/sfc/base/efx_bootcfg.c b/drivers/net/sfc/base/efx_bootcfg.c\nindex 3b0401e89..73d779ec7 100644\n--- a/drivers/net/sfc/base/efx_bootcfg.c\n+++ b/drivers/net/sfc/base/efx_bootcfg.c\n@@ -847,7 +847,7 @@ efx_bootcfg_read(\n \t\tgoto fail1;\n \t}\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \tsector_number = enp->en_nic_cfg.enc_pf;\n #else\n \tsector_number = 0;\n@@ -1000,7 +1000,7 @@ efx_bootcfg_write(\n \tefx_rc_t rc;\n \tuint32_t sector_number;\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \tsector_number = enp->en_nic_cfg.enc_pf;\n #else\n \tsector_number = 0;\ndiff --git a/drivers/net/sfc/base/efx_check.h b/drivers/net/sfc/base/efx_check.h\nindex ef5eadc62..4800f772b 100644\n--- a/drivers/net/sfc/base/efx_check.h\n+++ b/drivers/net/sfc/base/efx_check.h\n@@ -17,6 +17,10 @@\n * from client code (and do not reappear in merges from other branches).\n */\n \n+/* Check family options for EF10 architecture controllers. */\n+#define\tEFX_OPTS_EF10()\t\\\n+\t(EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n+\n #ifdef EFSYS_OPT_FALCON\n # error \"FALCON is obsolete and is not supported.\"\n #endif\n@@ -30,9 +34,8 @@\n \n #if EFSYS_OPT_CHECK_REG\n /* Verify chip implements accessed registers */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"CHECK_REG requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"CHECK_REG requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_CHECK_REG */\n \n@@ -45,17 +48,15 @@\n \n #if EFSYS_OPT_DIAG\n /* Support diagnostic hardware tests */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"DIAG requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"DIAG requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_DIAG */\n \n #if EFSYS_OPT_EV_PREFETCH\n /* Support optimized EVQ data access */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"EV_PREFETCH requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"EV_PREFETCH requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_EV_PREFETCH */\n \n@@ -65,23 +66,21 @@\n \n #if EFSYS_OPT_FILTER\n /* Support hardware packet filters */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"FILTER requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"FILTER requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_FILTER */\n \n-#if (EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n+#if EFX_OPTS_EF10()\n # if !EFSYS_OPT_FILTER\n-# error \"HUNTINGTON or MEDFORD or MEDFORD2 requires FILTER\"\n+# error \"EF10 arch requires FILTER\"\n # endif\n-#endif /* EFSYS_OPT_HUNTINGTON */\n+#endif /* EFX_OPTS_EF10() */\n \n #if EFSYS_OPT_LOOPBACK\n /* Support hardware loopback modes */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"LOOPBACK requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"LOOPBACK requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_LOOPBACK */\n \n@@ -95,24 +94,21 @@\n \n #if EFSYS_OPT_MAC_STATS\n /* Support MAC statistics */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"MAC_STATS requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"MAC_STATS requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_MAC_STATS */\n \n #if EFSYS_OPT_MCDI\n /* Support management controller messages */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"MCDI requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"MCDI requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_MCDI */\n \n-#if (EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n+#if (EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n # if !EFSYS_OPT_MCDI\n-# error \"SIENA or HUNTINGTON or MEDFORD or MEDFORD2 requires MCDI\"\n+# error \"EF10 arch or SIENA requires MCDI\"\n # endif\n #endif\n \n@@ -152,17 +148,15 @@\n \n #if EFSYS_OPT_MON_STATS\n /* Support monitor statistics (voltage/temperature) */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"MON_STATS requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"MON_STATS requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_MON_STATS */\n \n #if EFSYS_OPT_MON_MCDI\n /* Support Monitor via mcdi */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"MON_MCDI requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"MON_MCDI requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_MON_MCDI*/\n \n@@ -176,9 +170,8 @@\n \n #if EFSYS_OPT_NVRAM\n /* Support non volatile configuration */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"NVRAM requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"NVRAM requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_NVRAM */\n \n@@ -218,9 +211,8 @@\n \n #if EFSYS_OPT_PHY_LED_CONTROL\n /* Support for PHY LED control */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"PHY_LED_CONTROL requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"PHY_LED_CONTROL requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_PHY_LED_CONTROL */\n \n@@ -265,9 +257,8 @@\n \n #if EFSYS_OPT_QSTATS\n /* Support EVQ/RXQ/TXQ statistics */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"QSTATS requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"QSTATS requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_QSTATS */\n \n@@ -277,17 +268,15 @@\n \n #if EFSYS_OPT_RX_SCALE\n /* Support receive scaling (RSS) */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"RX_SCALE requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"RX_SCALE requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_RX_SCALE */\n \n #if EFSYS_OPT_RX_SCATTER\n /* Support receive scatter DMA */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"RX_SCATTER requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"RX_SCATTER requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_RX_SCATTER */\n \n@@ -297,9 +286,8 @@\n \n #if EFSYS_OPT_VPD\n /* Support PCI Vital Product Data (VPD) */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"VPD requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"VPD requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_VPD */\n \n@@ -313,9 +301,8 @@\n \n #if EFSYS_OPT_BIST\n /* Support BIST */\n-# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || \\\n-\tEFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"BIST requires SIENA or HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !(EFX_OPTS_EF10() || EFSYS_OPT_SIENA)\n+# error \"BIST requires EF10 arch or SIENA\"\n # endif\n #endif /* EFSYS_OPT_BIST */\n \n@@ -338,8 +325,8 @@\n \n #if EFSYS_OPT_RX_PACKED_STREAM\n /* Support packed stream mode */\n-# if !(EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n-# error \"PACKED_STREAM requires HUNTINGTON or MEDFORD or MEDFORD2\"\n+# if !EFX_OPTS_EF10()\n+# error \"PACKED_STREAM requires EF10 arch\"\n # endif\n #endif\n \ndiff --git a/drivers/net/sfc/base/efx_ev.c b/drivers/net/sfc/base/efx_ev.c\nindex ada6db3d9..69224cbc5 100644\n--- a/drivers/net/sfc/base/efx_ev.c\n+++ b/drivers/net/sfc/base/efx_ev.c\n@@ -91,7 +91,7 @@ static const efx_ev_ops_t\t__efx_ev_siena_ops = {\n };\n #endif /* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n static const efx_ev_ops_t\t__efx_ev_ef10_ops = {\n \tef10_ev_init,\t\t\t\t/* eevo_init */\n \tef10_ev_fini,\t\t\t\t/* eevo_fini */\n@@ -104,7 +104,7 @@ static const efx_ev_ops_t\t__efx_ev_ef10_ops = {\n \tef10_ev_qstats_update,\t\t\t/* eevo_qstats_update */\n #endif\n };\n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\n \n \n \t__checkReturn\tefx_rc_t\ndiff --git a/drivers/net/sfc/base/efx_filter.c b/drivers/net/sfc/base/efx_filter.c\nindex a7523b38b..7efb38064 100644\n--- a/drivers/net/sfc/base/efx_filter.c\n+++ b/drivers/net/sfc/base/efx_filter.c\n@@ -56,7 +56,7 @@ static const efx_filter_ops_t\t__efx_filter_siena_ops = {\n };\n #endif /* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n static const efx_filter_ops_t\t__efx_filter_ef10_ops = {\n \tef10_filter_init,\t\t/* efo_init */\n \tef10_filter_fini,\t\t/* efo_fini */\n@@ -66,7 +66,7 @@ static const efx_filter_ops_t\t__efx_filter_ef10_ops = {\n \tef10_filter_supported_filters,\t/* efo_supported_filters */\n \tef10_filter_reconfigure,\t/* efo_reconfigure */\n };\n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\n \n \t__checkReturn\tefx_rc_t\n efx_filter_insert(\ndiff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h\nindex 70e05232c..748d45a3b 100644\n--- a/drivers/net/sfc/base/efx_impl.h\n+++ b/drivers/net/sfc/base/efx_impl.h\n@@ -33,9 +33,9 @@\n #include \"medford2_impl.h\"\n #endif\t/* EFSYS_OPT_MEDFORD2 */\n \n-#if (EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n+#if EFX_OPTS_EF10()\n #include \"ef10_impl.h\"\n-#endif\t/* (EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2) */\n+#endif\t/* EFX_OPTS_EF10() */\n \n #ifdef\t__cplusplus\n extern \"C\" {\n@@ -431,9 +431,9 @@ typedef struct efx_filter_s {\n #if EFSYS_OPT_SIENA\n \tsiena_filter_t\t\t*ef_siena_filter;\n #endif /* EFSYS_OPT_SIENA */\n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \tef10_filter_table_t\t*ef_ef10_filter_table;\n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\n } efx_filter_t;\n \n #if EFSYS_OPT_SIENA\n@@ -717,7 +717,7 @@ struct efx_nic_s {\n #endif\t/* EFSYS_OPT_SIENA */\n \t\tint\tenu_unused;\n \t} en_u;\n-#if (EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2)\n+#if EFX_OPTS_EF10()\n \tunion en_arch {\n \t\tstruct {\n \t\t\tint\t\t\tena_vi_base;\n@@ -738,7 +738,7 @@ struct efx_nic_s {\n \t\t\tsize_t\t\t\tena_wc_mem_map_size;\n \t\t} ef10;\n \t} en_arch;\n-#endif\t/* (EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2) */\n+#endif\t/* EFX_OPTS_EF10() */\n };\n \n \ndiff --git a/drivers/net/sfc/base/efx_intr.c b/drivers/net/sfc/base/efx_intr.c\nindex 4c68b1091..5f0119b5d 100644\n--- a/drivers/net/sfc/base/efx_intr.c\n+++ b/drivers/net/sfc/base/efx_intr.c\n@@ -75,7 +75,7 @@ static const efx_intr_ops_t\t__efx_intr_siena_ops = {\n };\n #endif\t/* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n static const efx_intr_ops_t\t__efx_intr_ef10_ops = {\n \tef10_intr_init,\t\t\t/* eio_init */\n \tef10_intr_enable,\t\t/* eio_enable */\n@@ -87,7 +87,7 @@ static const efx_intr_ops_t\t__efx_intr_ef10_ops = {\n \tef10_intr_fatal,\t\t/* eio_fatal */\n \tef10_intr_fini,\t\t\t/* eio_fini */\n };\n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \t__checkReturn\tefx_rc_t\n efx_intr_init(\ndiff --git a/drivers/net/sfc/base/efx_mac.c b/drivers/net/sfc/base/efx_mac.c\nindex 57436b95a..673bc4f4e 100644\n--- a/drivers/net/sfc/base/efx_mac.c\n+++ b/drivers/net/sfc/base/efx_mac.c\n@@ -39,7 +39,7 @@ static const efx_mac_ops_t\t__efx_mac_siena_ops = {\n };\n #endif\t/* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n static const efx_mac_ops_t\t__efx_mac_ef10_ops = {\n \tef10_mac_poll,\t\t\t\t/* emo_poll */\n \tef10_mac_up,\t\t\t\t/* emo_up */\n@@ -62,7 +62,7 @@ static const efx_mac_ops_t\t__efx_mac_ef10_ops = {\n \tef10_mac_stats_update\t\t\t/* emo_stats_update */\n #endif\t/* EFSYS_OPT_MAC_STATS */\n };\n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \t__checkReturn\t\t\tefx_rc_t\n efx_mac_pdu_set(\ndiff --git a/drivers/net/sfc/base/efx_mcdi.c b/drivers/net/sfc/base/efx_mcdi.c\nindex c896aa0bf..adc2eb8e8 100644\n--- a/drivers/net/sfc/base/efx_mcdi.c\n+++ b/drivers/net/sfc/base/efx_mcdi.c\n@@ -45,7 +45,7 @@ static const efx_mcdi_ops_t\t__efx_mcdi_siena_ops = {\n \n #endif\t/* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n static const efx_mcdi_ops_t\t__efx_mcdi_ef10_ops = {\n \tef10_mcdi_init,\t\t\t/* emco_init */\n@@ -58,7 +58,7 @@ static const efx_mcdi_ops_t\t__efx_mcdi_ef10_ops = {\n \tef10_mcdi_get_timeout,\t\t/* emco_get_timeout */\n };\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \n \n@@ -1642,7 +1642,7 @@ efx_mcdi_mac_spoofing_supported(\n \n #if EFSYS_OPT_BIST\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n /*\n * Enter bist offline mode. This is a fw mode which puts the NIC into a state\n * where memory BIST tests can be run and not much else can interfere or happen.\n@@ -1678,7 +1678,7 @@ efx_mcdi_bist_enable_offline(\n \n \treturn (rc);\n }\n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\n \n \t__checkReturn\t\tefx_rc_t\n efx_mcdi_bist_start(\n@@ -1961,7 +1961,7 @@ efx_mcdi_mac_stats_periodic(\n \n #endif\t/* EFSYS_OPT_MAC_STATS */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n /*\n * This function returns the pf and vf number of a function. If it is a pf the\n@@ -2058,7 +2058,7 @@ efx_mcdi_privilege_mask(\n \treturn (rc);\n }\n \n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\n \n \t__checkReturn\t\tefx_rc_t\n efx_mcdi_set_workaround(\ndiff --git a/drivers/net/sfc/base/efx_mcdi.h b/drivers/net/sfc/base/efx_mcdi.h\nindex b8c199dd3..a9e025537 100644\n--- a/drivers/net/sfc/base/efx_mcdi.h\n+++ b/drivers/net/sfc/base/efx_mcdi.h\n@@ -170,11 +170,11 @@ efx_mcdi_mac_spoofing_supported(\n \n \n #if EFSYS_OPT_BIST\n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n extern\t__checkReturn\t\tefx_rc_t\n efx_mcdi_bist_enable_offline(\n \t__in\t\t\tefx_nic_t *enp);\n-#endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif /* EFX_OPTS_EF10() */\n extern\t__checkReturn\t\tefx_rc_t\n efx_mcdi_bist_start(\n \t__in\t\t\tefx_nic_t *enp,\ndiff --git a/drivers/net/sfc/base/efx_nvram.c b/drivers/net/sfc/base/efx_nvram.c\nindex 5296c59b8..5c611c366 100644\n--- a/drivers/net/sfc/base/efx_nvram.c\n+++ b/drivers/net/sfc/base/efx_nvram.c\n@@ -30,7 +30,7 @@ static const efx_nvram_ops_t\t__efx_nvram_siena_ops = {\n \n #endif\t/* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n static const efx_nvram_ops_t\t__efx_nvram_ef10_ops = {\n #if EFSYS_OPT_DIAG\n@@ -49,7 +49,7 @@ static const efx_nvram_ops_t\t__efx_nvram_ef10_ops = {\n \tef10_nvram_buffer_validate,\t/* envo_buffer_validate */\n };\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \t__checkReturn\tefx_rc_t\n efx_nvram_init(\ndiff --git a/drivers/net/sfc/base/efx_phy.c b/drivers/net/sfc/base/efx_phy.c\nindex 36a7bbd3d..e3c6aa9f3 100644\n--- a/drivers/net/sfc/base/efx_phy.c\n+++ b/drivers/net/sfc/base/efx_phy.c\n@@ -28,7 +28,7 @@ static const efx_phy_ops_t\t__efx_phy_siena_ops = {\n };\n #endif\t/* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n static const efx_phy_ops_t\t__efx_phy_ef10_ops = {\n \tef10_phy_power,\t\t\t/* epo_power */\n \tNULL,\t\t\t\t/* epo_reset */\n@@ -46,7 +46,7 @@ static const efx_phy_ops_t\t__efx_phy_ef10_ops = {\n \tef10_bist_stop,\t\t\t/* epo_bist_stop */\n #endif\t/* EFSYS_OPT_BIST */\n };\n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \t__checkReturn\tefx_rc_t\n efx_phy_probe(\ndiff --git a/drivers/net/sfc/base/efx_rx.c b/drivers/net/sfc/base/efx_rx.c\nindex 49c304c0b..26999a92f 100644\n--- a/drivers/net/sfc/base/efx_rx.c\n+++ b/drivers/net/sfc/base/efx_rx.c\n@@ -151,7 +151,7 @@ static const efx_rx_ops_t __efx_rx_siena_ops = {\n };\n #endif\t/* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n static const efx_rx_ops_t __efx_rx_ef10_ops = {\n \tef10_rx_init,\t\t\t\t/* erxo_init */\n \tef10_rx_fini,\t\t\t\t/* erxo_fini */\n@@ -178,7 +178,7 @@ static const efx_rx_ops_t __efx_rx_ef10_ops = {\n \tef10_rx_qcreate,\t\t\t/* erxo_qcreate */\n \tef10_rx_qdestroy,\t\t\t/* erxo_qdestroy */\n };\n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \n \t__checkReturn\tefx_rc_t\ndiff --git a/drivers/net/sfc/base/efx_sram.c b/drivers/net/sfc/base/efx_sram.c\nindex 7851ff133..de0612edd 100644\n--- a/drivers/net/sfc/base/efx_sram.c\n+++ b/drivers/net/sfc/base/efx_sram.c\n@@ -25,7 +25,7 @@ efx_sram_buf_tbl_set(\n \tEFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);\n \tEFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_NIC);\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \tif (enp->en_family == EFX_FAMILY_HUNTINGTON ||\n \t enp->en_family == EFX_FAMILY_MEDFORD ||\n \t enp->en_family == EFX_FAMILY_MEDFORD2) {\n@@ -40,7 +40,7 @@ efx_sram_buf_tbl_set(\n \n \t\treturn (0);\n \t}\n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \tif (stop >= EFX_BUF_TBL_SIZE) {\n \t\trc = EFBIG;\n@@ -148,7 +148,7 @@ efx_sram_buf_tbl_clear(\n \tEFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);\n \tEFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_NIC);\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \tif (enp->en_family == EFX_FAMILY_HUNTINGTON ||\n \t enp->en_family == EFX_FAMILY_MEDFORD ||\n \t enp->en_family == EFX_FAMILY_MEDFORD2) {\n@@ -163,7 +163,7 @@ efx_sram_buf_tbl_clear(\n \n \t\treturn;\n \t}\n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \tEFSYS_ASSERT3U(stop, <, EFX_BUF_TBL_SIZE);\n \ndiff --git a/drivers/net/sfc/base/efx_vpd.c b/drivers/net/sfc/base/efx_vpd.c\nindex 6d783d742..826752177 100644\n--- a/drivers/net/sfc/base/efx_vpd.c\n+++ b/drivers/net/sfc/base/efx_vpd.c\n@@ -44,7 +44,7 @@ static const efx_vpd_ops_t\t__efx_vpd_siena_ops = {\n \n #endif\t/* EFSYS_OPT_SIENA */\n \n-#if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n+#if EFX_OPTS_EF10()\n \n static const efx_vpd_ops_t\t__efx_vpd_ef10_ops = {\n \tef10_vpd_init,\t\t/* evpdo_init */\n@@ -59,7 +59,7 @@ static const efx_vpd_ops_t\t__efx_vpd_ef10_ops = {\n \tef10_vpd_fini,\t\t/* evpdo_fini */\n };\n \n-#endif\t/* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n+#endif\t/* EFX_OPTS_EF10() */\n \n \t__checkReturn\t\tefx_rc_t\n efx_vpd_init(\n", "prefixes": [ "34/38" ] }