Message ID | 20230407184539.27559-1-brett.creeley@amd.com (mailing list archive) |
---|---|
State | Accepted |
Commit | be690daa224ec41889bf8f293a5bcd8a3ea6a420 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] ionic: Don't overwrite the cyclecounter bitmask | expand |
On Fri, Apr 07, 2023 at 11:45:39AM -0700, Brett Creeley wrote: > The driver was incorrectly overwriting the cyclecounter bitmask, > which was truncating it and not aligning to the hardware mask value. > This isn't causing any issues, but it's wrong. Fix this by not > constraining the cyclecounter/hardware mask. > > Luckily, this seems to cause no issues, which is why this change > doesn't have a fixes tag and isn't being sent to net. However, if > any transformations from time->cycles are needed in the future, > this change will be needed. > > Suggested-by: Allen Hubbe <allen.hubbe@amd.com> > Signed-off-by: Brett Creeley <brett.creeley@amd.com> > Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 7 Apr 2023 11:45:39 -0700 you wrote: > The driver was incorrectly overwriting the cyclecounter bitmask, > which was truncating it and not aligning to the hardware mask value. > This isn't causing any issues, but it's wrong. Fix this by not > constraining the cyclecounter/hardware mask. > > Luckily, this seems to cause no issues, which is why this change > doesn't have a fixes tag and isn't being sent to net. However, if > any transformations from time->cycles are needed in the future, > this change will be needed. > > [...] Here is the summary with links: - [net-next] ionic: Don't overwrite the cyclecounter bitmask https://git.kernel.org/netdev/net-next/c/be690daa224e You are awesome, thank you!
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_phc.c b/drivers/net/ethernet/pensando/ionic/ionic_phc.c index eac2f0e3576e..7505efdff8e9 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_phc.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_phc.c @@ -579,11 +579,10 @@ void ionic_lif_alloc_phc(struct ionic_lif *lif) diff |= diff >> 16; diff |= diff >> 32; - /* constrain to the hardware bitmask, and use this as the bitmask */ + /* constrain to the hardware bitmask */ diff &= phc->cc.mask; - phc->cc.mask = diff; - /* the wrap period is now defined by diff (or phc->cc.mask) + /* the wrap period is now defined by diff * * we will update the time basis at about 1/4 the wrap period, so * should not see a difference of more than +/- diff/4.