aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch')
-rw-r--r--target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch251
1 files changed, 0 insertions, 251 deletions
diff --git a/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch b/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch
deleted file mode 100644
index 4ca0ded55d..0000000000
--- a/target/linux/generic/pending-4.19/742-net-sfp-add-more-extended-compliance-codes.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From c66a4e76c8554c84e64b9315314576ac403c6641 Mon Sep 17 00:00:00 2001
-From: Russell King <rmk+kernel@armlinux.org.uk>
-Date: Thu, 26 Sep 2019 15:14:18 +0100
-Subject: [PATCH 645/660] net: sfp: add more extended compliance codes
-
-SFF-8024 is used to define various constants re-used in several SFF
-SFP-related specifications. Split these constants from the enum, and
-rename them to indicate that they're defined by SFF-8024.
-
-Add and use updated SFF-8024 extended compliance code definitions for
-10GBASE-T, 5GBASE-T and 2.5GBASE-T modules.
-
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
----
- drivers/net/phy/sfp-bus.c | 60 ++++++++++++++++------------
- drivers/net/phy/sfp.c | 4 +-
- include/linux/sfp.h | 82 ++++++++++++++++++++++++++-------------
- 3 files changed, 93 insertions(+), 53 deletions(-)
-
---- a/drivers/net/phy/sfp-bus.c
-+++ b/drivers/net/phy/sfp-bus.c
-@@ -123,35 +123,35 @@ int sfp_parse_port(struct sfp_bus *bus,
-
- /* port is the physical connector, set this from the connector field. */
- switch (id->base.connector) {
-- case SFP_CONNECTOR_SC:
-- case SFP_CONNECTOR_FIBERJACK:
-- case SFP_CONNECTOR_LC:
-- case SFP_CONNECTOR_MT_RJ:
-- case SFP_CONNECTOR_MU:
-- case SFP_CONNECTOR_OPTICAL_PIGTAIL:
-+ case SFF8024_CONNECTOR_SC:
-+ case SFF8024_CONNECTOR_FIBERJACK:
-+ case SFF8024_CONNECTOR_LC:
-+ case SFF8024_CONNECTOR_MT_RJ:
-+ case SFF8024_CONNECTOR_MU:
-+ case SFF8024_CONNECTOR_OPTICAL_PIGTAIL:
-+ case SFF8024_CONNECTOR_MPO_1X12:
-+ case SFF8024_CONNECTOR_MPO_2X16:
- port = PORT_FIBRE;
- break;
-
-- case SFP_CONNECTOR_RJ45:
-+ case SFF8024_CONNECTOR_RJ45:
- port = PORT_TP;
- break;
-
-- case SFP_CONNECTOR_COPPER_PIGTAIL:
-+ case SFF8024_CONNECTOR_COPPER_PIGTAIL:
- port = PORT_DA;
- break;
-
-- case SFP_CONNECTOR_UNSPEC:
-+ case SFF8024_CONNECTOR_UNSPEC:
- if (id->base.e1000_base_t) {
- port = PORT_TP;
- break;
- }
- /* fallthrough */
-- case SFP_CONNECTOR_SG: /* guess */
-- case SFP_CONNECTOR_MPO_1X12:
-- case SFP_CONNECTOR_MPO_2X16:
-- case SFP_CONNECTOR_HSSDC_II:
-- case SFP_CONNECTOR_NOSEPARATE:
-- case SFP_CONNECTOR_MXC_2X16:
-+ case SFF8024_CONNECTOR_SG: /* guess */
-+ case SFF8024_CONNECTOR_HSSDC_II:
-+ case SFF8024_CONNECTOR_NOSEPARATE:
-+ case SFF8024_CONNECTOR_MXC_2X16:
- port = PORT_OTHER;
- break;
- default:
-@@ -260,22 +260,33 @@ void sfp_parse_support(struct sfp_bus *b
- }
-
- switch (id->base.extended_cc) {
-- case 0x00: /* Unspecified */
-+ case SFF8024_ECC_UNSPEC:
- break;
-- case 0x02: /* 100Gbase-SR4 or 25Gbase-SR */
-+ case SFF8024_ECC_100GBASE_SR4_25GBASE_SR:
- phylink_set(modes, 100000baseSR4_Full);
- phylink_set(modes, 25000baseSR_Full);
- break;
-- case 0x03: /* 100Gbase-LR4 or 25Gbase-LR */
-- case 0x04: /* 100Gbase-ER4 or 25Gbase-ER */
-+ case SFF8024_ECC_100GBASE_LR4_25GBASE_LR:
-+ case SFF8024_ECC_100GBASE_ER4_25GBASE_ER:
- phylink_set(modes, 100000baseLR4_ER4_Full);
- break;
-- case 0x0b: /* 100Gbase-CR4 or 25Gbase-CR CA-L */
-- case 0x0c: /* 25Gbase-CR CA-S */
-- case 0x0d: /* 25Gbase-CR CA-N */
-+ case SFF8024_ECC_100GBASE_CR4:
- phylink_set(modes, 100000baseCR4_Full);
-+ /* fallthrough */
-+ case SFF8024_ECC_25GBASE_CR_S:
-+ case SFF8024_ECC_25GBASE_CR_N:
- phylink_set(modes, 25000baseCR_Full);
- break;
-+ case SFF8024_ECC_10GBASE_T_SFI:
-+ case SFF8024_ECC_10GBASE_T_SR:
-+ phylink_set(modes, 10000baseT_Full);
-+ break;
-+ case SFF8024_ECC_5GBASE_T:
-+ phylink_set(modes, 5000baseT_Full);
-+ break;
-+ case SFF8024_ECC_2_5GBASE_T:
-+ phylink_set(modes, 2500baseT_Full);
-+ break;
- default:
- dev_warn(bus->sfp_dev,
- "Unknown/unsupported extended compliance code: 0x%02x\n",
-@@ -300,7 +311,7 @@ void sfp_parse_support(struct sfp_bus *b
- */
- if (bitmap_empty(modes, __ETHTOOL_LINK_MODE_MASK_NBITS)) {
- /* If the encoding and bit rate allows 1000baseX */
-- if (id->base.encoding == SFP_ENCODING_8B10B && br_nom &&
-+ if (id->base.encoding == SFF8024_ENCODING_8B10B && br_nom &&
- br_min <= 1300 && br_max >= 1200)
- phylink_set(modes, 1000baseX_Full);
- }
-@@ -331,7 +342,8 @@ phy_interface_t sfp_select_interface(str
- phylink_test(link_modes, 10000baseSR_Full) ||
- phylink_test(link_modes, 10000baseLR_Full) ||
- phylink_test(link_modes, 10000baseLRM_Full) ||
-- phylink_test(link_modes, 10000baseER_Full))
-+ phylink_test(link_modes, 10000baseER_Full) ||
-+ phylink_test(link_modes, 10000baseT_Full))
- return PHY_INTERFACE_MODE_10GKR;
-
- if (phylink_test(link_modes, 2500baseX_Full))
---- a/drivers/net/phy/sfp.c
-+++ b/drivers/net/phy/sfp.c
-@@ -240,7 +240,7 @@ struct sfp {
-
- static bool sff_module_supported(const struct sfp_eeprom_id *id)
- {
-- return id->base.phys_id == SFP_PHYS_ID_SFF &&
-+ return id->base.phys_id == SFF8024_ID_SFF_8472 &&
- id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP;
- }
-
-@@ -251,7 +251,7 @@ static const struct sff_data sff_data =
-
- static bool sfp_module_supported(const struct sfp_eeprom_id *id)
- {
-- return id->base.phys_id == SFP_PHYS_ID_SFP &&
-+ return id->base.phys_id == SFF8024_ID_SFP &&
- id->base.phys_ext_id == SFP_PHYS_EXT_ID_SFP;
- }
-
---- a/include/linux/sfp.h
-+++ b/include/linux/sfp.h
-@@ -275,6 +275,61 @@ struct sfp_diag {
- __be16 cal_v_offset;
- } __packed;
-
-+/* SFF8024 defined constants */
-+enum {
-+ SFF8024_ID_UNK = 0x00,
-+ SFF8024_ID_SFF_8472 = 0x02,
-+ SFF8024_ID_SFP = 0x03,
-+ SFF8024_ID_DWDM_SFP = 0x0b,
-+ SFF8024_ID_QSFP_8438 = 0x0c,
-+ SFF8024_ID_QSFP_8436_8636 = 0x0d,
-+ SFF8024_ID_QSFP28_8636 = 0x11,
-+
-+ SFF8024_ENCODING_UNSPEC = 0x00,
-+ SFF8024_ENCODING_8B10B = 0x01,
-+ SFF8024_ENCODING_4B5B = 0x02,
-+ SFF8024_ENCODING_NRZ = 0x03,
-+ SFF8024_ENCODING_8472_MANCHESTER= 0x04,
-+ SFF8024_ENCODING_8472_SONET = 0x05,
-+ SFF8024_ENCODING_8472_64B66B = 0x06,
-+ SFF8024_ENCODING_8436_MANCHESTER= 0x06,
-+ SFF8024_ENCODING_8436_SONET = 0x04,
-+ SFF8024_ENCODING_8436_64B66B = 0x05,
-+ SFF8024_ENCODING_256B257B = 0x07,
-+ SFF8024_ENCODING_PAM4 = 0x08,
-+
-+ SFF8024_CONNECTOR_UNSPEC = 0x00,
-+ /* codes 01-05 not supportable on SFP, but some modules have single SC */
-+ SFF8024_CONNECTOR_SC = 0x01,
-+ SFF8024_CONNECTOR_FIBERJACK = 0x06,
-+ SFF8024_CONNECTOR_LC = 0x07,
-+ SFF8024_CONNECTOR_MT_RJ = 0x08,
-+ SFF8024_CONNECTOR_MU = 0x09,
-+ SFF8024_CONNECTOR_SG = 0x0a,
-+ SFF8024_CONNECTOR_OPTICAL_PIGTAIL= 0x0b,
-+ SFF8024_CONNECTOR_MPO_1X12 = 0x0c,
-+ SFF8024_CONNECTOR_MPO_2X16 = 0x0d,
-+ SFF8024_CONNECTOR_HSSDC_II = 0x20,
-+ SFF8024_CONNECTOR_COPPER_PIGTAIL= 0x21,
-+ SFF8024_CONNECTOR_RJ45 = 0x22,
-+ SFF8024_CONNECTOR_NOSEPARATE = 0x23,
-+ SFF8024_CONNECTOR_MXC_2X16 = 0x24,
-+
-+ SFF8024_ECC_UNSPEC = 0x00,
-+ SFF8024_ECC_100G_25GAUI_C2M_AOC = 0x01,
-+ SFF8024_ECC_100GBASE_SR4_25GBASE_SR = 0x02,
-+ SFF8024_ECC_100GBASE_LR4_25GBASE_LR = 0x03,
-+ SFF8024_ECC_100GBASE_ER4_25GBASE_ER = 0x04,
-+ SFF8024_ECC_100GBASE_SR10 = 0x05,
-+ SFF8024_ECC_100GBASE_CR4 = 0x0b,
-+ SFF8024_ECC_25GBASE_CR_S = 0x0c,
-+ SFF8024_ECC_25GBASE_CR_N = 0x0d,
-+ SFF8024_ECC_10GBASE_T_SFI = 0x16,
-+ SFF8024_ECC_10GBASE_T_SR = 0x1c,
-+ SFF8024_ECC_5GBASE_T = 0x1d,
-+ SFF8024_ECC_2_5GBASE_T = 0x1e,
-+};
-+
- /* SFP EEPROM registers */
- enum {
- SFP_PHYS_ID = 0x00,
-@@ -309,34 +364,7 @@ enum {
- SFP_SFF8472_COMPLIANCE = 0x5e,
- SFP_CC_EXT = 0x5f,
-
-- SFP_PHYS_ID_SFF = 0x02,
-- SFP_PHYS_ID_SFP = 0x03,
- SFP_PHYS_EXT_ID_SFP = 0x04,
-- SFP_CONNECTOR_UNSPEC = 0x00,
-- /* codes 01-05 not supportable on SFP, but some modules have single SC */
-- SFP_CONNECTOR_SC = 0x01,
-- SFP_CONNECTOR_FIBERJACK = 0x06,
-- SFP_CONNECTOR_LC = 0x07,
-- SFP_CONNECTOR_MT_RJ = 0x08,
-- SFP_CONNECTOR_MU = 0x09,
-- SFP_CONNECTOR_SG = 0x0a,
-- SFP_CONNECTOR_OPTICAL_PIGTAIL = 0x0b,
-- SFP_CONNECTOR_MPO_1X12 = 0x0c,
-- SFP_CONNECTOR_MPO_2X16 = 0x0d,
-- SFP_CONNECTOR_HSSDC_II = 0x20,
-- SFP_CONNECTOR_COPPER_PIGTAIL = 0x21,
-- SFP_CONNECTOR_RJ45 = 0x22,
-- SFP_CONNECTOR_NOSEPARATE = 0x23,
-- SFP_CONNECTOR_MXC_2X16 = 0x24,
-- SFP_ENCODING_UNSPEC = 0x00,
-- SFP_ENCODING_8B10B = 0x01,
-- SFP_ENCODING_4B5B = 0x02,
-- SFP_ENCODING_NRZ = 0x03,
-- SFP_ENCODING_8472_MANCHESTER = 0x04,
-- SFP_ENCODING_8472_SONET = 0x05,
-- SFP_ENCODING_8472_64B66B = 0x06,
-- SFP_ENCODING_256B257B = 0x07,
-- SFP_ENCODING_PAM4 = 0x08,
- SFP_OPTIONS_HIGH_POWER_LEVEL = BIT(13),
- SFP_OPTIONS_PAGING_A2 = BIT(12),
- SFP_OPTIONS_RETIMER = BIT(11),
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 17:58:33 +0000