> -----Original Message----- > From: Zhang, Qi Z > Sent: Wednesday, September 7, 2022 8:05 PM > To: Yang, Qiming <qiming.y...@intel.com> > Cc: dev@dpdk.org; Yang, SteveX <stevex.y...@intel.com> > Subject: RE: [PATCH] net/ice: fix DDP package init > > > > > -----Original Message----- > > From: Zhang, Qi Z <qi.z.zh...@intel.com> > > Sent: Wednesday, September 7, 2022 8:06 PM > > To: Yang, Qiming <qiming.y...@intel.com> > > Cc: dev@dpdk.org; Yang, SteveX <stevex.y...@intel.com>; Zhang, Qi Z > > <qi.z.zh...@intel.com> > > Subject: [PATCH] net/ice: fix DDP package init > > > > ICE_DDP_PKG_SAME_VERSION_ALREADY_LOADED and > > ICE_DDP_PKG_COMPATIBLE_ALREADY_LOADED should not be treated as a > DDP > > package init failure. Use ice_is_init_pkg_successful to check return > > value of ice_copy_and_init_pkg. > > > > Signed-off-by: Qi Zhang <qi.z.zh...@intel.com> > > The patch has been squashed into below patch which has not been merged. > https://patchwork.dpdk.org/project/dpdk/patch/20220815073206.2917968- > 21-qi.z.zh...@intel.com/ There is a miss-operation in dpdk-next-net-intel, the patch actually has not been squashed. At this moment, since the target patch already be merged, a separated fix is required. The good point is the original fix still has defect as a failure of ice_copy_and_init_pkg will not be escalated to the caller and V2 will fix this. > > > --- > > drivers/net/ice/ice_ethdev.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/ice/ice_ethdev.c > > b/drivers/net/ice/ice_ethdev.c index > > fc889420c7..50fe23fdc4 100644 > > --- a/drivers/net/ice/ice_ethdev.c > > +++ b/drivers/net/ice/ice_ethdev.c > > @@ -1836,7 +1836,7 @@ int ice_load_pkg(struct ice_adapter *adapter, > > bool use_dsn, uint64_t dsn) > > PMD_INIT_LOG(DEBUG, "DDP package name: %s", pkg_file); > > > > err = ice_copy_and_init_pkg(hw, buf, bufsz); > > - if (err) { > > + if (!ice_is_init_pkg_successful(err)) { > > PMD_INIT_LOG(ERR, "ice_copy_and_init_hw failed: %d\n", > err); > > goto out; > > } > > @@ -1846,7 +1846,7 @@ int ice_load_pkg(struct ice_adapter *adapter, > > bool use_dsn, uint64_t dsn) > > > > out: > > free(buf); > > - return err; > > + return 0; > > } > > > > static void > > -- > > 2.26.2
