From 6847319e76291edfc7f048f9829fc9c1f695d59a Mon Sep 17 00:00:00 2001 From: mihirpat1 <112018033+mihirpat1@users.noreply.github.com> Date: Thu, 16 Mar 2023 16:38:17 -0700 Subject: [PATCH] Read ID register for optoe1 to find pageable bit in optoe driver (#308) * Fixes for emmc unreliability (#270) * Read ID register to find pageable bit in optoe driver Signed-off-by: Mihir Patel * Modified comment in code to make it QSFP specific * Changed QSFP+ to QSFP28 in comment * Added performance stats related to EEPROM read --------- Signed-off-by: Mihir Patel Co-authored-by: Samuel Angebault Co-authored-by: Prince George <45705344+prgeor@users.noreply.github.com> --- ...river-support-optoe-oneaddr-pageable.patch | 64 +++++++++++++++++++ patch/series | 1 + 2 files changed, 65 insertions(+) create mode 100644 patch/driver-support-optoe-oneaddr-pageable.patch diff --git a/patch/driver-support-optoe-oneaddr-pageable.patch b/patch/driver-support-optoe-oneaddr-pageable.patch new file mode 100644 index 000000000000..8e8696e3a8de --- /dev/null +++ b/patch/driver-support-optoe-oneaddr-pageable.patch @@ -0,0 +1,64 @@ +From cb4523bb02cb6228e3e8e5f3333e6af9a1b15466 Mon Sep 17 00:00:00 2001 +From: Mihir Patel +Date: Fri, 10 Mar 2023 06:52:27 +0000 +Subject: [PATCH] Read ID register to find pageable bit in optoe driver + +The current optoe driver looks at bit 2 for all optoe1 +(dev_class as ONE_ADDR) transceivers to detect if it's pageable or not. +However, for QSFP28 w/ CMIS optics, some platforms use it as optoe1 +and not optoe3. With CMIS, the pageable bit has now changed to bit 7 for +the same register. This causes incorrect behavior when the driver checks +for pageability on QSFP28 w/ CMIS transceiver and hence, we need to +read the transceiver ID to see if the transceiver is CMIS based and then +find the relevant pageable bit. + +Test result summary +Tested the changes on a switch with a 100G CMIS and non-CMIS transceiver + +No significant time difference is seen related to EEPROM read after adding +the current changes. Below stats were taken for a 100G CMIS based +transceiver with making it as optoe3 v/s optoe1 + +Test stats (average time taken after 3 dumps) +Time to dump first 4096B from EEPROM with transceiver as optoe3 - 914ms +Time to dump first 4096B from EEPROM with transceiver as optoe1 - 911ms + +Signed-off-by: Mihir Patel +--- + drivers/misc/eeprom/optoe.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/drivers/misc/eeprom/optoe.c b/drivers/misc/eeprom/optoe.c +index 62294392c..f34bfe88b 100644 +--- a/drivers/misc/eeprom/optoe.c ++++ b/drivers/misc/eeprom/optoe.c +@@ -630,7 +630,25 @@ static ssize_t optoe_page_legal(struct optoe_data *optoe, + return status; /* error out (no module?) */ + + if (optoe->dev_class == ONE_ADDR) { +- not_pageable = QSFP_NOT_PAGEABLE; ++ u8 idRegVal; ++ ++ status = optoe_eeprom_read(optoe, client, &idRegVal, ++ OPTOE_ID_REG, 1); ++ if (status < 0) ++ return status; /* error out (no module?) */ ++ ++ /* ++ * For QSFP28 with CMIS optic, if userspace has dev_class as ONE_ADDR, ++ * the driver looks at the incorrect bit to find if it is pageable. ++ * Below check ensures we read the appropriate bit for such QSFP28 CMIS ++ * compliant optics with dev_class as ONE_ADDR ++ * The ID values below are based on the SFF-8024 spec (Page 0, byte 0) ++ * for CMIS optics ++ */ ++ if (idRegVal == 0x18 || idRegVal == 0x19 || idRegVal == 0x1e) ++ not_pageable = CMIS_NOT_PAGEABLE; ++ else ++ not_pageable = QSFP_NOT_PAGEABLE; + } else { + not_pageable = CMIS_NOT_PAGEABLE; + } +-- +2.25.1 + diff --git a/patch/series b/patch/series index 44b34064d770..e86f8589fdc6 100755 --- a/patch/series +++ b/patch/series @@ -30,6 +30,7 @@ driver-support-optoe-chunk-offset-fix.patch driver-support-optoe-QSFP_DD.patch driver-support-optoe-write-max.patch driver-support-optoe-twoaddr-a2h-access.patch +driver-support-optoe-oneaddr-pageable.patch driver-net-tg3-add-param-short-preamble-and-reset.patch 0004-dt-bindings-hwmon-Add-missing-documentation-for-lm75.patch 0005-dt-bindings-hwmon-Add-tmp75b-to-lm75.txt.patch