netdev - RE: [Intel-wired-lan] [PATCH v2 iwl-net 1/4] ice: Fix E825 initialization

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <IA1PR11MB6219ADBE71E91D787660D81292482@IA1PR11MB6219.namprd11.prod.outlook.com>
Date: Sat, 26 Oct 2024 17:16:14 +0000
From: "Nitka, Grzegorz" <grzegorz.nitka@...el.com>
To: "Keller, Jacob E" <jacob.e.keller@...el.com>, "Kolacinski, Karol"
	<karol.kolacinski@...el.com>, "intel-wired-lan@...ts.osuosl.org"
	<intel-wired-lan@...ts.osuosl.org>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>, "Kubalewski, Arkadiusz"
	<arkadiusz.kubalewski@...el.com>, "Nguyen, Anthony L"
	<anthony.l.nguyen@...el.com>, "Kitszel, Przemyslaw"
	<przemyslaw.kitszel@...el.com>
Subject: RE: [Intel-wired-lan] [PATCH v2 iwl-net 1/4] ice: Fix E825
 initialization


> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@...osl.org> On Behalf Of
> Jacob Keller
> Sent: Thursday, October 17, 2024 1:25 AM
> To: Kolacinski, Karol <karol.kolacinski@...el.com>; intel-wired-
> lan@...ts.osuosl.org
> Cc: netdev@...r.kernel.org; Kubalewski, Arkadiusz
> <arkadiusz.kubalewski@...el.com>; Nguyen, Anthony L
> <anthony.l.nguyen@...el.com>; Kitszel, Przemyslaw
> <przemyslaw.kitszel@...el.com>
> Subject: Re: [Intel-wired-lan] [PATCH v2 iwl-net 1/4] ice: Fix E825 initialization
> 
> 
> 
> On 10/10/2024 7:21 AM, Karol Kolacinski wrote:
> > @@ -2686,16 +2687,9 @@ static void ice_ptp_init_phy_e825c(struct
> ice_hw *hw)
> >  	ptp->num_lports = params->num_phys * ptp->ports_per_phy;
> >
> >  	ice_sb_access_ena_eth56g(hw, true);
> > -	for (phy = 0; phy < params->num_phys; phy++) {
> > -		u32 phy_rev;
> > -		int err;
> > -
> > -		err = ice_read_phy_eth56g(hw, phy, PHY_REG_REVISION,
> &phy_rev);
> > -		if (err || phy_rev != PHY_REVISION_ETH56G) {
> > -			ptp->phy_model = ICE_PHY_UNSUP;
> > -			return;
> > -		}
> > -	}
> > +	err = ice_read_phy_eth56g(hw, hw->pf_id, PHY_REG_REVISION,
> &phy_rev);
> > +	if (err || phy_rev != PHY_REVISION_ETH56G)
> > +		ptp->phy_model = ICE_PHY_UNSUP;
> >
> 
> Shouldn't this return like it did above?
> 

You're correct. Also, as you noticed in patch 4/4 of this series, in current
Implementation, where PHY type is derived from mac_type, above checker
seems to be redundant. To be fixed in v3

> >  	ptp->is_2x50g_muxed_topo = ice_is_muxed_topo(hw);
> >  }
> 
> > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
> b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
> > index 0852a34ade91..35141198f261 100644
> > --- a/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
> > +++ b/drivers/net/ethernet/intel/ice/ice_ptp_hw.h
> > @@ -326,7 +326,8 @@ extern const struct ice_vernier_info_e82x
> e822_vernier[NUM_ICE_PTP_LNK_SPD];
> >   */
> >  #define ICE_E810_PLL_FREQ		812500000
> >  #define ICE_PTP_NOMINAL_INCVAL_E810	0x13b13b13bULL
> > -#define E810_OUT_PROP_DELAY_NS 1
> > +#define ICE_E810_OUT_PROP_DELAY_NS	1
> > +#define ICE_E825_SYNC_DELAY		6
> >
> 
> Why is this hunk in this patch?

Looks like some leftover after rebase. To be removed in next version