Skip to contentSkip to conversation

driver core: fix e1000e ltr bug

PATCH In review YeeLi 2 participants 8 messages Jun 29, 2021 – Jul 1, 2021

Subsystems (2)
lore
Share & tools
lore

YeeLi

author
#0 lore raw

PATCH 1/1 driver core: fix e1000e ltr bug

In e1000e driver, a PCIe-like device, the max snoop/no-snoop latency is the upper limit.So, directly compare the size of lat_enc and max_ltr_enc is incorrect.

    In 1000Mbps, 0x8b9 < 0x1003, 189440 ns < 3145728 ns, correct.

    In 100Mbps, 0xc3a < 0x1003, 1900544 ns < 3145728 ns, correct.

    In 10Mbps, 0xe40 < 0x1003, 18874368 > 3145728, incorrect.

Decoded the lat_enc and max_ltr_enc before compare them is necessary.

---
 drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 ++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +22 -1
index 590ad110d383..3bff1b570b76 100644
@@ -986,6 +986,27 @@ static s32 e1000_k1_workaround_lpt_lp(struct e1000_hw *hw, bool link)
 	return ret_val;
 }
 
+static u32 convert_e1000e_ltr_scale(u32 val)
+{
+	if (val > 5)
+		return 0;
+
+	return 1U << (5 * val);
+}
+
+static u64 decoded_ltr(u32 val)
+{
+	u64 decoded_latency;
+	u32 value;
+	u32 scale;
+
+	value = val & 0x03FF;
+	scale = (val & 0x1C00) >> 10;
+	decoded_latency = value * convert_e1000e_ltr_scale(scale);
+
+	return decoded_latency;
+}
+
 /**
  *  e1000_platform_pm_pch_lpt - Set platform power management values
  *  @hw: pointer to the HW structure
@@ -1059,7 +1080,7 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
 				     E1000_PCI_LTR_CAP_LPT + 2, &max_nosnoop);
 		max_ltr_enc = max_t(u16, max_snoop, max_nosnoop);
 
-		if (lat_enc > max_ltr_enc)
+		if (decoded_ltr(lat_enc) > decoded_ltr(max_ltr_enc))
 			lat_enc = max_ltr_enc;
 	}
 
Signature · 1 line
2.25.1
#1 lore raw

On 6/29/2021 11:21, YeeLi wrote:
Yeeli,

Quoted 4 lines

In e1000e driver, a PCIe-like device, the max snoop/no-snoop latency is the upper limit.So, directly compare the size of lat_enc and max_ltr_enc is incorrect.

why?

Quoted 6 lines
     In 1000Mbps, 0x8b9 < 0x1003, 189440 ns < 3145728 ns, correct.

     In 100Mbps, 0xc3a < 0x1003, 1900544 ns < 3145728 ns, correct.

     In 10Mbps, 0xe40 < 0x1003, 18874368 > 3145728, incorrect.

Platform LTR encoded is 0x1003 - right. It is meant 1048576ns x 3 = 3145738ns.
Now,
for 1000M: 0x08b9 => 185ns x 1024 = 189440ns (you are correct) for 100M: 0x0c3a => 58ns x 32768 = 1900544ns (correct)
for 10M: 0x0e41 => 577ns x 32768 = 18907136ns (ok?) 18907136ns > 3145738ns, (latency encoded is great than maximum LTR encoded by platform) - so, there is no point to wait more than platform required, and lat_enc=max_ltr_enc. It is expected and we sent right value to the power management controller.
What is the problem you try solve?

Quoted 41 lines

Decoded the lat_enc and max_ltr_enc before compare them is necessary.

---
  drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 ++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/e1000e/ich8lan.c +21 -0
index 590ad110d383..3bff1b570b76 100644
@@ -986,6 +986,27 @@ static s32 e1000_k1_workaround_lpt_lp(struct e1000_hw *hw, bool link)
  	return ret_val;
  }
 
+static u32 convert_e1000e_ltr_scale(u32 val)
+{
+	if (val > 5)
+		return 0;
+
+	return 1U << (5 * val);
+}
+
+static u64 decoded_ltr(u32 val)
+{
+	u64 decoded_latency;
+	u32 value;
+	u32 scale;
+
+	value = val & 0x03FF;
+	scale = (val & 0x1C00) >> 10;
+	decoded_latency = value * convert_e1000e_ltr_scale(scale);
+
+	return decoded_latency;
+}
+
  /**
   *  e1000_platform_pm_pch_lpt - Set platform power management values
   *  @hw: pointer to the HW structure

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) · line 1086

Quoted 8 lines
drivers/net/ethernet/intel/e1000e/ich8lan.c +1 -1
@@ -1059,7 +1080,7 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
  				     E1000_PCI_LTR_CAP_LPT + 2, &max_nosnoop);
  		max_ltr_enc = max_t(u16, max_snoop, max_nosnoop);
 
-		if (lat_enc > max_ltr_enc)
+		if (decoded_ltr(lat_enc) > decoded_ltr(max_ltr_enc))
  			lat_enc = max_ltr_enc;
  	}
 

sasha

author
#2 lore raw

PATCH 1/1 driver core: fix e1000e ltr bug

Yes, 18874368ns > 3145728ns.
But, 0xe40 < 0x1003.

So, the final lat_enc is 0xe40.
(Latency encoded is less than maximum LTR encoded by platform)

Neftin, Sasha <[email protected]> ? 2021?6?29??? 22:49???

Quoted 72 lines · YeeLi

Yeeli,

Quoted 4 lines

In e1000e driver, a PCIe-like device, the max snoop/no-snoop latency is the upper limit.So, directly compare the size of lat_enc and max_ltr_enc is incorrect.

why?

Quoted 6 lines
     In 1000Mbps, 0x8b9 < 0x1003, 189440 ns < 3145728 ns, correct.

     In 100Mbps, 0xc3a < 0x1003, 1900544 ns < 3145728 ns, correct.

     In 10Mbps, 0xe40 < 0x1003, 18874368 > 3145728, incorrect.

Platform LTR encoded is 0x1003 - right. It is meant 1048576ns x 3 = 3145738ns.
Now,
for 1000M: 0x08b9 => 185ns x 1024 = 189440ns (you are correct) for 100M: 0x0c3a => 58ns x 32768 = 1900544ns (correct)
for 10M: 0x0e41 => 577ns x 32768 = 18907136ns (ok?) 18907136ns > 3145738ns, (latency encoded is great than maximum LTR encoded by platform) - so, there is no point to wait more than platform required, and lat_enc=max_ltr_enc. It is expected and we sent right value to the power management controller.
What is the problem you try solve?

Review

Quoted 8 lines

Decoded the lat_enc and max_ltr_enc before compare them is necessary.

---
  drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 ++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/net/ethernet/intel/e1000e/ich8lan.c

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_k1_workaround_lpt_lp(struct

Quoted 4 lines

index 590ad110d383..3bff1b570b76 100644

drivers/net/ethernet/intel/e1000e/ich8lan.c +0 -0
@@ -986,6 +986,27 @@ static s32 e1000_k1_workaround_lpt_lp(struct

e1000_hw *hw, bool link)

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_platform_pm_pch_lpt(struct

Quoted 28 lines
drivers/net/ethernet/intel/e1000e/ich8lan.c +21 -0
      return ret_val;
  }
 
+static u32 convert_e1000e_ltr_scale(u32 val)
+{
+     if (val > 5)
+             return 0;
+
+     return 1U << (5 * val);
+}
+
+static u64 decoded_ltr(u32 val)
+{
+     u64 decoded_latency;
+     u32 value;
+     u32 scale;
+
+     value = val & 0x03FF;
+     scale = (val & 0x1C00) >> 10;
+     decoded_latency = value * convert_e1000e_ltr_scale(scale);
+
+     return decoded_latency;
+}
+
  /**
   *  e1000_platform_pm_pch_lpt - Set platform power management values
   *  @hw: pointer to the HW structure
@@ -1059,7 +1080,7 @@ static s32 e1000_platform_pm_pch_lpt(struct

e1000_hw *hw, bool link)

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_platform_pm_pch_lpt(struct · line 1080

Quoted 1 line
drivers/net/ethernet/intel/e1000e/ich8lan.c +0 -0
                                   E1000_PCI_LTR_CAP_LPT + 2,

&max_nosnoop);

Quoted 2 lines
drivers/net/ethernet/intel/e1000e/ich8lan.c +0 -0
              max_ltr_enc = max_t(u16, max_snoop, max_nosnoop);
 
Quoted 8 lines

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) · line 1086

Quoted 6 lines
drivers/net/ethernet/intel/e1000e/ich8lan.c +1 -1
-             if (lat_enc > max_ltr_enc)
+             if (decoded_ltr(lat_enc) > decoded_ltr(max_ltr_enc))
                      lat_enc = max_ltr_enc;
      }
 

sasha

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20210630/bb954095/attachment-0001.html>

author
#3 lore raw

PATCH 1/1 driver core: fix e1000e ltr bug

*if (lat_enc > max_ltr_enc)*
* lat_enc = max_ltr_enc;*
Does this code mean *Latency* cannot greater than *maximum LTR (by platform)?*
Directly compare lat_enc (Latency encoded) and max_ltr_enc (maximum LTR encoded by platform) is *ok?*

In 10Mbps,
Decoded LTR (calculate): 18874368ns > 3145728ns
Encoded LTR (driver code): 0xe40 (*lat_enc*) < 0x1003 (*max_ltr_enc*), so *end if* and *no lat_enc = max_ltr_enc.*

Yee Li <[email protected]> ?2021?6?30??? ??1:33???

Quoted 90 lines

Yes, 18874368ns > 3145728ns.
But, 0xe40 < 0x1003.

So, the final lat_enc is 0xe40.
(Latency encoded is less than maximum LTR encoded by platform)

Neftin, Sasha <[email protected]> ? 2021?6?29??? 22:49???

Quoted 80 lines · YeeLi

Yeeli,

Quoted 4 lines

In e1000e driver, a PCIe-like device, the max snoop/no-snoop latency is the upper limit.So, directly compare the size of lat_enc and max_ltr_enc is incorrect.

why?

Quoted 6 lines
     In 1000Mbps, 0x8b9 < 0x1003, 189440 ns < 3145728 ns, correct.

     In 100Mbps, 0xc3a < 0x1003, 1900544 ns < 3145728 ns, correct.

     In 10Mbps, 0xe40 < 0x1003, 18874368 > 3145728, incorrect.

Platform LTR encoded is 0x1003 - right. It is meant 1048576ns x 3 = 3145738ns.
Now,
for 1000M: 0x08b9 => 185ns x 1024 = 189440ns (you are correct) for 100M: 0x0c3a => 58ns x 32768 = 1900544ns (correct)
for 10M: 0x0e41 => 577ns x 32768 = 18907136ns (ok?) 18907136ns > 3145738ns, (latency encoded is great than maximum LTR encoded by platform) - so, there is no point to wait more than platform required, and lat_enc=max_ltr_enc. It is expected and we sent right value to the power management controller.
What is the problem you try solve?

Review

Quoted 8 lines

Decoded the lat_enc and max_ltr_enc before compare them is necessary.

---
  drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 ++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/net/ethernet/intel/e1000e/ich8lan.c

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_k1_workaround_lpt_lp(struct

Quoted 4 lines

index 590ad110d383..3bff1b570b76 100644

drivers/net/ethernet/intel/e1000e/ich8lan.c +0 -0
@@ -986,6 +986,27 @@ static s32 e1000_k1_workaround_lpt_lp(struct

e1000_hw *hw, bool link)

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_platform_pm_pch_lpt(struct

Quoted 28 lines
drivers/net/ethernet/intel/e1000e/ich8lan.c +21 -0
      return ret_val;
  }
 
+static u32 convert_e1000e_ltr_scale(u32 val)
+{
+     if (val > 5)
+             return 0;
+
+     return 1U << (5 * val);
+}
+
+static u64 decoded_ltr(u32 val)
+{
+     u64 decoded_latency;
+     u32 value;
+     u32 scale;
+
+     value = val & 0x03FF;
+     scale = (val & 0x1C00) >> 10;
+     decoded_latency = value * convert_e1000e_ltr_scale(scale);
+
+     return decoded_latency;
+}
+
  /**
   *  e1000_platform_pm_pch_lpt - Set platform power management values
   *  @hw: pointer to the HW structure
@@ -1059,7 +1080,7 @@ static s32 e1000_platform_pm_pch_lpt(struct

e1000_hw *hw, bool link)

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_platform_pm_pch_lpt(struct · line 1080

Quoted 1 line
drivers/net/ethernet/intel/e1000e/ich8lan.c +0 -0
                                   E1000_PCI_LTR_CAP_LPT + 2,

&max_nosnoop);

drivers/net/ethernet/intel/e1000e/ich8lan.c static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) · line 1086

Quoted 8 lines
drivers/net/ethernet/intel/e1000e/ich8lan.c +1 -1
              max_ltr_enc = max_t(u16, max_snoop, max_nosnoop);
 
-             if (lat_enc > max_ltr_enc)
+             if (decoded_ltr(lat_enc) > decoded_ltr(max_ltr_enc))
                      lat_enc = max_ltr_enc;
      }
 

sasha

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20210630/bdf6884a/attachment-0001.html>

#4 lore raw
In reply to Yee Li
Quoted 3 lines · Yee Li

Yes, 18874368ns > 3145728ns.
But, 0xe40 < 0x1003.

I got you. I would agree, direct comparison is error-prone. (10M is impacted)
I would suggest do not use convert function. lat_en should rather presented as lat_enc = scale x value:
Introduce two u16 variables, u16 lat_enc_d and u16 max_ltr_enc_d;

lat_enc_d = (lat_enc & 0x0x3ff) x (1U << 5*((max_ltr_enc & 0x1c00) >> 10))

max_ltr_enc_d = (max_ltr_enc & 0x0x3ff) x (1U << 5*((max_ltr_enc & 0x1c00) >> 10))

Then:
if (lat_enc_d > max_ltr_enc_d)

	lat_enc = max_ltr_enc;

what do you think?

Quoted 90 lines

So, the final lat_enc is 0xe40.
(Latency encoded is less than maximum LTR encoded by platform)

Neftin, Sasha <sasha.neftin at intel.com <mailto:[email protected]>> ? 2021?6?29??? 22:49???

    On 6/29/2021 11:21, YeeLi wrote:
    Yeeli,
     > In e1000e driver, a PCIe-like device, the max snoop/no-snoop latency
     > is the upper limit.So, directly compare the size of lat_enc and
     > max_ltr_enc is incorrect.
     >
    why?
     >? ? ? In 1000Mbps, 0x8b9 < 0x1003, 189440 ns < 3145728 ns, correct.
     >
     >? ? ? In 100Mbps, 0xc3a < 0x1003, 1900544 ns < 3145728 ns, correct.
     >
     >? ? ? In 10Mbps, 0xe40 < 0x1003, 18874368 > 3145728, incorrect.
     >
    Platform LTR encoded is 0x1003 - right. It is meant 1048576ns x 3 =
    3145738ns.
    Now,
    for 1000M: 0x08b9 => 185ns x 1024 = 189440ns (you are correct)
    for 100M: 0x0c3a => 58ns x 32768 = 1900544ns (correct)
    for 10M: 0x0e41 => 577ns x 32768 = 18907136ns (ok?)
    18907136ns > 3145738ns, (latency encoded is great than maximum LTR
    encoded by platform) - so, there is no point to wait more than platform
    required, and lat_enc=max_ltr_enc. It is expected and we sent right
    value to the power management controller.
    What is the problem you try solve?

     > Decoded the lat_enc and max_ltr_enc before compare them is necessary.
     >
     > Signed-off-by: YeeLi <[email protected]
    <mailto:[email protected]>>
     > ---
     >? ?drivers/net/ethernet/intel/e1000e/ich8lan.c | 23
    ++++++++++++++++++++-
     >? ?1 file changed, 22 insertions(+), 1 deletion(-)
     >
     > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c
    b/drivers/net/ethernet/intel/e1000e/ich8lan.c
     > index 590ad110d383..3bff1b570b76 100644
     > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
     > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
     > @@ -986,6 +986,27 @@ static s32 e1000_k1_workaround_lpt_lp(struct
    e1000_hw *hw, bool link)
     >? ? ? ?return ret_val;
     >? ?}
     >
     > +static u32 convert_e1000e_ltr_scale(u32 val)
     > +{
     > +? ? ?if (val > 5)
     > +? ? ? ? ? ? ?return 0;
     > +
     > +? ? ?return 1U << (5 * val);
     > +}
     > +
     > +static u64 decoded_ltr(u32 val)
     > +{
     > +? ? ?u64 decoded_latency;
     > +? ? ?u32 value;
     > +? ? ?u32 scale;
     > +
     > +? ? ?value = val & 0x03FF;
     > +? ? ?scale = (val & 0x1C00) >> 10;
     > +? ? ?decoded_latency = value * convert_e1000e_ltr_scale(scale);
     > +
     > +? ? ?return decoded_latency;
     > +}
     > +
     >? ?/**
     >? ? *? e1000_platform_pm_pch_lpt - Set platform power management
    values
     >? ? *? @hw: pointer to the HW structure
     > @@ -1059,7 +1080,7 @@ static s32 e1000_platform_pm_pch_lpt(struct
    e1000_hw *hw, bool link)
     >? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? E1000_PCI_LTR_CAP_LPT + 2,
    &max_nosnoop);
     >? ? ? ? ? ? ? ?max_ltr_enc = max_t(u16, max_snoop, max_nosnoop);
     >
     > -? ? ? ? ? ? ?if (lat_enc > max_ltr_enc)
     > +? ? ? ? ? ? ?if (decoded_ltr(lat_enc) > decoded_ltr(max_ltr_enc))
     >? ? ? ? ? ? ? ? ? ? ? ?lat_enc = max_ltr_enc;
     >? ? ? ?}
     >
     >
    sasha
author
#5 lore raw

PATCH 1/1 driver core: fix e1000e ltr bug

I agree with you.
That's better code.

Neftin, Sasha <[email protected]> ?2021?6?30??? ??2:13???

Quoted 49 lines · Yee Li
Quoted 3 lines

Yes, 18874368ns > 3145728ns.
But, 0xe40 < 0x1003.

I got you. I would agree, direct comparison is error-prone. (10M is impacted)
I would suggest do not use convert function. lat_en should rather presented as lat_enc = scale x value:
Introduce two u16 variables, u16 lat_enc_d and u16 max_ltr_enc_d;

lat_enc_d = (lat_enc & 0x0x3ff) x (1U << 5*((max_ltr_enc & 0x1c00) >> 10))

max_ltr_enc_d = (max_ltr_enc & 0x0x3ff) x (1U << 5*((max_ltr_enc & 0x1c00) >> 10))

Then:
if (lat_enc_d > max_ltr_enc_d)

        lat_enc = max_ltr_enc;

what do you think?

Quoted 10 lines

So, the final lat_enc is 0xe40.
(Latency encoded is less than maximum LTR encoded by platform)

Neftin, Sasha <sasha.neftin at intel.com <mailto:[email protected]>> ? 2021?6?29??? 22:49???

On 6/29/2021 11:21, YeeLi wrote:
Yeeli,
> In e1000e driver, a PCIe-like device, the max snoop/no-snoop

latency

Quoted 10 lines
     > is the upper limit.So, directly compare the size of lat_enc and
     > max_ltr_enc is incorrect.
     >
    why?
     >      In 1000Mbps, 0x8b9 < 0x1003, 189440 ns < 3145728 ns, correct.
     >
     >      In 100Mbps, 0xc3a < 0x1003, 1900544 ns < 3145728 ns, correct.
     >
     >      In 10Mbps, 0xe40 < 0x1003, 18874368 > 3145728, incorrect.
     >
Quoted 8 lines
    Platform LTR encoded is 0x1003 - right. It is meant 1048576ns x 3 =
    3145738ns.
    Now,
    for 1000M: 0x08b9 => 185ns x 1024 = 189440ns (you are correct)
    for 100M: 0x0c3a => 58ns x 32768 = 1900544ns (correct)
    for 10M: 0x0e41 => 577ns x 32768 = 18907136ns (ok?)
    18907136ns > 3145738ns, (latency encoded is great than maximum LTR
    encoded by platform) - so, there is no point to wait more than
Quoted 65 lines

platform

Quoted 5 lines

required, and lat_enc=max_ltr_enc. It is expected and we sent right value to the power management controller.
What is the problem you try solve?

> Decoded the lat_enc and max_ltr_enc before compare them is

necessary.

Quoted 57 lines
     >
     > Signed-off-by: YeeLi <[email protected]
    <mailto:[email protected]>>
     > ---
     >   drivers/net/ethernet/intel/e1000e/ich8lan.c | 23
    ++++++++++++++++++++-
     >   1 file changed, 22 insertions(+), 1 deletion(-)
     >
     > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c
    b/drivers/net/ethernet/intel/e1000e/ich8lan.c
     > index 590ad110d383..3bff1b570b76 100644
     > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
     > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
     > @@ -986,6 +986,27 @@ static s32 e1000_k1_workaround_lpt_lp(struct
    e1000_hw *hw, bool link)
     >       return ret_val;
     >   }
     >
     > +static u32 convert_e1000e_ltr_scale(u32 val)
     > +{
     > +     if (val > 5)
     > +             return 0;
     > +
     > +     return 1U << (5 * val);
     > +}
     > +
     > +static u64 decoded_ltr(u32 val)
     > +{
     > +     u64 decoded_latency;
     > +     u32 value;
     > +     u32 scale;
     > +
     > +     value = val & 0x03FF;
     > +     scale = (val & 0x1C00) >> 10;
     > +     decoded_latency = value * convert_e1000e_ltr_scale(scale);
     > +
     > +     return decoded_latency;
     > +}
     > +
     >   /**
     >    *  e1000_platform_pm_pch_lpt - Set platform power management
    values
     >    *  @hw: pointer to the HW structure
     > @@ -1059,7 +1080,7 @@ static s32 e1000_platform_pm_pch_lpt(struct
    e1000_hw *hw, bool link)
     >                                    E1000_PCI_LTR_CAP_LPT + 2,
    &max_nosnoop);
     >               max_ltr_enc = max_t(u16, max_snoop, max_nosnoop);
     >
     > -             if (lat_enc > max_ltr_enc)
     > +             if (decoded_ltr(lat_enc) > decoded_ltr(max_ltr_enc))
     >                       lat_enc = max_ltr_enc;
     >       }
     >
     >
    sasha

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20210630/f008ad8c/attachment-0001.html>

#6 lore raw
Quoted 2 lines · Yee Li

I agree with you.
That's better code.

Thank Yee-Li for discovering this problem. I would suggest we (intel) will process a patch to address this problem. Can I put you kindly as "Suggested-by"?

Quoted 125 lines

Neftin, Sasha <sasha.neftin at intel.com <mailto:[email protected]>> ?2021?6?30??? ??2:13???

    On 6/29/2021 20:33, Yee Li wrote:
     >
     > Yes, 18874368ns > 3145728ns.
     > But, 0xe40 < 0x1003.
    I got you. I would agree, direct comparison is error-prone. (10M is
    impacted)
    I would suggest do not use convert function. lat_en should rather
    presented as lat_enc = scale x value:
    Introduce two u16 variables, u16 lat_enc_d and u16 max_ltr_enc_d;

    lat_enc_d = (lat_enc & 0x0x3ff) x (1U << 5*((max_ltr_enc & 0x1c00)
     >> 10))

    max_ltr_enc_d = (max_ltr_enc & 0x0x3ff) x (1U << 5*((max_ltr_enc &
    0x1c00) >> 10))

    Then:
    if (lat_enc_d > max_ltr_enc_d)
     ? ? ? ? lat_enc = max_ltr_enc;
    what do you think?

     >
     > So, the final lat_enc is 0xe40.
     > (Latency encoded is less than maximum LTR encoded by platform)
     >
     > Neftin, Sasha <[email protected]
    <mailto:[email protected]> <mailto:[email protected]
    <mailto:[email protected]>>>
     > ? 2021?6?29??? 22:49???
     >
     >? ? ?On 6/29/2021 11:21, YeeLi wrote:
     >? ? ?Yeeli,
     >? ? ? > In e1000e driver, a PCIe-like device, the max
    snoop/no-snoop latency
     >? ? ? > is the upper limit.So, directly compare the size of
    lat_enc and
     >? ? ? > max_ltr_enc is incorrect.
     >? ? ? >
     >? ? ?why?
     >? ? ? >? ? ? In 1000Mbps, 0x8b9 < 0x1003, 189440 ns < 3145728 ns,
    correct.
     >? ? ? >
     >? ? ? >? ? ? In 100Mbps, 0xc3a < 0x1003, 1900544 ns < 3145728 ns,
    correct.
     >? ? ? >
     >? ? ? >? ? ? In 10Mbps, 0xe40 < 0x1003, 18874368 > 3145728, incorrect.
     >? ? ? >
     >? ? ?Platform LTR encoded is 0x1003 - right. It is meant 1048576ns
    x 3 =
     >? ? ?3145738ns.
     >? ? ?Now,
     >? ? ?for 1000M: 0x08b9 => 185ns x 1024 = 189440ns (you are correct)
     >? ? ?for 100M: 0x0c3a => 58ns x 32768 = 1900544ns (correct)
     >? ? ?for 10M: 0x0e41 => 577ns x 32768 = 18907136ns (ok?)
     >? ? ?18907136ns > 3145738ns, (latency encoded is great than
    maximum LTR
     >? ? ?encoded by platform) - so, there is no point to wait more
    than platform
     >? ? ?required, and lat_enc=max_ltr_enc. It is expected and we sent
    right
     >? ? ?value to the power management controller.
     >? ? ?What is the problem you try solve?
     >
     >? ? ? > Decoded the lat_enc and max_ltr_enc before compare them is
    necessary.
     >? ? ? >
     >? ? ? > Signed-off-by: YeeLi <[email protected]
    <mailto:[email protected]>
     >? ? ?<mailto:seven.yi.lee at gmail.com <mailto:[email protected]>>>
     >? ? ? > ---
     >? ? ? >? ?drivers/net/ethernet/intel/e1000e/ich8lan.c | 23
     >? ? ?++++++++++++++++++++-
     >? ? ? >? ?1 file changed, 22 insertions(+), 1 deletion(-)
     >? ? ? >
     >? ? ? > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c
     >? ? ?b/drivers/net/ethernet/intel/e1000e/ich8lan.c
     >? ? ? > index 590ad110d383..3bff1b570b76 100644
     >? ? ? > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
     >? ? ? > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
     >? ? ? > @@ -986,6 +986,27 @@ static s32
    e1000_k1_workaround_lpt_lp(struct
     >? ? ?e1000_hw *hw, bool link)
     >? ? ? >? ? ? ?return ret_val;
     >? ? ? >? ?}
     >? ? ? >
     >? ? ? > +static u32 convert_e1000e_ltr_scale(u32 val)
     >? ? ? > +{
     >? ? ? > +? ? ?if (val > 5)
     >? ? ? > +? ? ? ? ? ? ?return 0;
     >? ? ? > +
     >? ? ? > +? ? ?return 1U << (5 * val);
     >? ? ? > +}
     >? ? ? > +
     >? ? ? > +static u64 decoded_ltr(u32 val)
     >? ? ? > +{
     >? ? ? > +? ? ?u64 decoded_latency;
     >? ? ? > +? ? ?u32 value;
     >? ? ? > +? ? ?u32 scale;
     >? ? ? > +
     >? ? ? > +? ? ?value = val & 0x03FF;
     >? ? ? > +? ? ?scale = (val & 0x1C00) >> 10;
     >? ? ? > +? ? ?decoded_latency = value *
    convert_e1000e_ltr_scale(scale);
     >? ? ? > +
     >? ? ? > +? ? ?return decoded_latency;
     >? ? ? > +}
     >? ? ? > +
     >? ? ? >? ?/**
     >? ? ? >? ? *? e1000_platform_pm_pch_lpt - Set platform power
    management
     >? ? ?values
     >? ? ? >? ? *? @hw: pointer to the HW structure
     >? ? ? > @@ -1059,7 +1080,7 @@ static s32
    e1000_platform_pm_pch_lpt(struct
     >? ? ?e1000_hw *hw, bool link)
     >? ? ? >? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? E1000_PCI_LTR_CAP_LPT + 2,
     >? ? ?&max_nosnoop);
     >? ? ? >? ? ? ? ? ? ? ?max_ltr_enc = max_t(u16, max_snoop,
    max_nosnoop);
     >? ? ? >
     >? ? ? > -? ? ? ? ? ? ?if (lat_enc > max_ltr_enc)
Quoted 9 lines
     >? ? ? > +? ? ? ? ? ? ?if (decoded_ltr(lat_enc) >
    decoded_ltr(max_ltr_enc))
     >? ? ? >? ? ? ? ? ? ? ? ? ? ? ?lat_enc = max_ltr_enc;
     >? ? ? >? ? ? ?}
     >? ? ? >
     >? ? ? >
     >? ? ?sasha
     >

sasha

author
#7 lore raw

PATCH 1/1 driver core: fix e1000e ltr bug

Sure, it's my pleasure.

Neftin, Sasha <[email protected]> ?2021?7?1??? ??4:34???

Quoted 143 lines · Yee Li
Quoted 2 lines

I agree with you.
That's better code.

Thank Yee-Li for discovering this problem. I would suggest we (intel) will process a patch to address this problem. Can I put you kindly as "Suggested-by"?

Quoted 42 lines

Neftin, Sasha <sasha.neftin at intel.com <mailto:[email protected]>> ?2021?6?30??? ??2:13???

    On 6/29/2021 20:33, Yee Li wrote:
     >
     > Yes, 18874368ns > 3145728ns.
     > But, 0xe40 < 0x1003.
    I got you. I would agree, direct comparison is error-prone. (10M is
    impacted)
    I would suggest do not use convert function. lat_en should rather
    presented as lat_enc = scale x value:
    Introduce two u16 variables, u16 lat_enc_d and u16 max_ltr_enc_d;

    lat_enc_d = (lat_enc & 0x0x3ff) x (1U << 5*((max_ltr_enc & 0x1c00)
     >> 10))

    max_ltr_enc_d = (max_ltr_enc & 0x0x3ff) x (1U << 5*((max_ltr_enc &
    0x1c00) >> 10))

    Then:
    if (lat_enc_d > max_ltr_enc_d)
             lat_enc = max_ltr_enc;
    what do you think?

     >
     > So, the final lat_enc is 0xe40.
     > (Latency encoded is less than maximum LTR encoded by platform)
     >
     > Neftin, Sasha <[email protected]
    <mailto:[email protected]> <mailto:[email protected]
    <mailto:[email protected]>>>
     > ? 2021?6?29??? 22:49???
     >
     >     On 6/29/2021 11:21, YeeLi wrote:
     >     Yeeli,
     >      > In e1000e driver, a PCIe-like device, the max
    snoop/no-snoop latency
     >      > is the upper limit.So, directly compare the size of
    lat_enc and
     >      > max_ltr_enc is incorrect.
     >      >
Quoted 8 lines
     >     why?
     >      >      In 1000Mbps, 0x8b9 < 0x1003, 189440 ns < 3145728 ns,
    correct.
     >      >
     >      >      In 100Mbps, 0xc3a < 0x1003, 1900544 ns < 3145728 ns,
    correct.
     >      >
     >      >      In 10Mbps, 0xe40 < 0x1003, 18874368 > 3145728,

incorrect.

Quoted 63 lines
     >      >
     >     Platform LTR encoded is 0x1003 - right. It is meant 1048576ns
    x 3 =
     >     3145738ns.
     >     Now,
     >     for 1000M: 0x08b9 => 185ns x 1024 = 189440ns (you are correct)
     >     for 100M: 0x0c3a => 58ns x 32768 = 1900544ns (correct)
     >     for 10M: 0x0e41 => 577ns x 32768 = 18907136ns (ok?)
     >     18907136ns > 3145738ns, (latency encoded is great than
    maximum LTR
     >     encoded by platform) - so, there is no point to wait more
    than platform
     >     required, and lat_enc=max_ltr_enc. It is expected and we sent
    right
     >     value to the power management controller.
     >     What is the problem you try solve?
     >
     >      > Decoded the lat_enc and max_ltr_enc before compare them is
    necessary.
     >      >
     >      > Signed-off-by: YeeLi <[email protected]
    <mailto:[email protected]>
     >     <mailto:seven.yi.lee at gmail.com <mailto:[email protected]
Quoted 1 line
Quoted 1 line
     >      > ---
     >      >   drivers/net/ethernet/intel/e1000e/ich8lan.c | 23
     >     ++++++++++++++++++++-
     >      >   1 file changed, 22 insertions(+), 1 deletion(-)
     >      >
     >      > diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c
     >     b/drivers/net/ethernet/intel/e1000e/ich8lan.c
     >      > index 590ad110d383..3bff1b570b76 100644
     >      > --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
     >      > +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
     >      > @@ -986,6 +986,27 @@ static s32
    e1000_k1_workaround_lpt_lp(struct
     >     e1000_hw *hw, bool link)
     >      >       return ret_val;
     >      >   }
     >      >
     >      > +static u32 convert_e1000e_ltr_scale(u32 val)
     >      > +{
     >      > +     if (val > 5)
     >      > +             return 0;
     >      > +
     >      > +     return 1U << (5 * val);
     >      > +}
     >      > +
     >      > +static u64 decoded_ltr(u32 val)
     >      > +{
     >      > +     u64 decoded_latency;
     >      > +     u32 value;
     >      > +     u32 scale;
     >      > +
     >      > +     value = val & 0x03FF;
     >      > +     scale = (val & 0x1C00) >> 10;
     >      > +     decoded_latency = value *
    convert_e1000e_ltr_scale(scale);
     >      > +
     >      > +     return decoded_latency;
     >      > +}
     >      > +
     >      >   /**
Quoted 8 lines
     >      >    *  e1000_platform_pm_pch_lpt - Set platform power
    management
     >     values
     >      >    *  @hw: pointer to the HW structure
     >      > @@ -1059,7 +1080,7 @@ static s32
    e1000_platform_pm_pch_lpt(struct
     >     e1000_hw *hw, bool link)
     >      >                                    E1000_PCI_LTR_CAP_LPT +

2,

Quoted 5 lines
     >     &max_nosnoop);
     >      >               max_ltr_enc = max_t(u16, max_snoop,
    max_nosnoop);
     >      >
     >      > -             if (lat_enc > max_ltr_enc)
Quoted 9 lines
     >      > +             if (decoded_ltr(lat_enc) >
    decoded_ltr(max_ltr_enc))
     >      >                       lat_enc = max_ltr_enc;
     >      >       }
     >      >
     >      >
     >     sasha
     >
Quoted 2 lines

sasha

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20210701/d2ac4465/attachment.html>