From patchwork Mon Nov 11 08:08:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Keller X-Patchwork-Id: 13870355 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7B31416726E; Mon, 11 Nov 2024 08:08:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731312541; cv=none; b=iLCRgXzj8Lp3n6u/uDoSWjmsAPufLMzUtBlfeEGYKXDxBI8EgBHN81bmMk71Inpdjgxsn4q3UkbHFhZv9wtl36CJ0kZ6KJluCzA2H39QAGW4SifHJrQ4k7qOQHirj5tInmh15sFNci+7BOluABB7jIegvZCgXq5ZOphuTkzOphU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731312541; c=relaxed/simple; bh=3SYvWsFEqn0R64HY4qsiPphPXHioQn9J326+af3bmOY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DbFhejBjVZQWyjWhwWMrQ2ld2/+PRG4fyKc3c3xPjIae8wuofeftergSe2usl+L7HQGLc9qz3HlzSCIEHPqgeaexjUtKoNyG56wjJOY/9o4zwjYmQKdqGKrYLcJ5oGpZ0dtmv2MEh4PuXd4usP/rC+Sfbaw3LQVvBts9WC1N9uc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=h8oQtTUa; arc=none smtp.client-ip=192.198.163.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="h8oQtTUa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731312539; x=1762848539; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=3SYvWsFEqn0R64HY4qsiPphPXHioQn9J326+af3bmOY=; b=h8oQtTUaPafkZJfUurpXdGIYv/c1WSTWLezFbWlKtvwL7ZYxZJTCtMRH oMslvtf4y6gViNUXe3lzyvS03xQsMZkP8l5+wnYFQJxijDSUhmrF1Q2Bj BKq2FQmAvXuPAFXuLx9LGcXqpT0aQYuIqb6zy3MfD+XH4ruV+RfxXpvU5 1hkB5ZyycjaUVYZ631hkAUFIlRY7sTCBpIlA6EdB2gtMbyMMrvpjq1qNa /dy4c2StxevyoGo3FbLTTdYisyeSOjDvJ8VZ5Omo8U1EGUS8kzaeDjQUg 8Jcc++yt4LzwEzOKZmCZCetKRHhc/Njjp+oJHw58SFAhcrIo6gMi22885 g==; X-CSE-ConnectionGUID: st5RcjavRuCmOevoQM1fVQ== X-CSE-MsgGUID: wLBFZtKGSfueZ5HtvLiBnQ== X-IronPort-AV: E=McAfee;i="6700,10204,11252"; a="41723261" X-IronPort-AV: E=Sophos;i="6.12,144,1728975600"; d="scan'208";a="41723261" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2024 00:08:55 -0800 X-CSE-ConnectionGUID: GCffl02cReGikM/cKHrWPw== X-CSE-MsgGUID: NPs4Riz2TwiqlTc2MpMhSQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,144,1728975600"; d="scan'208";a="91323678" Received: from jekeller-desk.jf.intel.com ([10.166.241.20]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2024 00:08:55 -0800 From: Jacob Keller Date: Mon, 11 Nov 2024 00:08:49 -0800 Subject: [PATCH net-next v5 8/9] ice: move prefetch enable to ice_setup_rx_ctx Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241111-packing-pack-fields-and-ice-implementation-v5-8-80c07349e6b7@intel.com> References: <20241111-packing-pack-fields-and-ice-implementation-v5-0-80c07349e6b7@intel.com> In-Reply-To: <20241111-packing-pack-fields-and-ice-implementation-v5-0-80c07349e6b7@intel.com> To: Vladimir Oltean , Andrew Morton , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Tony Nguyen , Przemek Kitszel , Masahiro Yamada , netdev Cc: linux-kbuild@vger.kernel.org, Jacob Keller X-Mailer: b4 0.14.1 X-Patchwork-Delegate: kuba@kernel.org The ice_write_rxq_ctx() function is responsible for programming the Rx Queue context into hardware. It receives the configuration in unpacked form via the ice_rlan_ctx structure. This function unconditionally modifies the context to set the prefetch enable bit. This was done by commit c31a5c25bb19 ("ice: Always set prefena when configuring an Rx queue"). Setting this bit makes sense, since prefetching descriptors is almost always the preferred behavior. However, the ice_write_rxq_ctx() function is not the place that actually defines the queue context. We initialize the Rx Queue context in ice_setup_rx_ctx(). It is surprising to have the Rx queue context changed by a function who's responsibility is to program the given context to hardware. Following the principle of least surprise, move the setting of the prefetch enable bit out of ice_write_rxq_ctx() and into the ice_setup_rx_ctx(). Signed-off-by: Jacob Keller Reviewed-by: Przemek Kitszel --- drivers/net/ethernet/intel/ice/ice_base.c | 3 +++ drivers/net/ethernet/intel/ice/ice_common.c | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c index 0a325dec804e..f1fbba19e4e4 100644 --- a/drivers/net/ethernet/intel/ice/ice_base.c +++ b/drivers/net/ethernet/intel/ice/ice_base.c @@ -453,6 +453,9 @@ static int ice_setup_rx_ctx(struct ice_rx_ring *ring) /* Rx queue threshold in units of 64 */ rlan_ctx.lrxqthresh = 1; + /* Enable descriptor prefetch */ + rlan_ctx.prefena = 1; + /* PF acts as uplink for switchdev; set flex descriptor with src_vsi * metadata and flags to allow redirecting to PR netdev */ diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index a743aede7f59..e31d0ed55dff 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -1430,14 +1430,13 @@ static void ice_pack_rxq_ctx(const struct ice_rlan_ctx *ctx, } /** - * ice_write_rxq_ctx + * ice_write_rxq_ctx - Write Rx Queue context to hardware * @hw: pointer to the hardware structure * @rlan_ctx: pointer to the rxq context * @rxq_index: the index of the Rx queue * - * Converts rxq context from sparse to dense structure and then writes - * it to HW register space and enables the hardware to prefetch descriptors - * instead of only fetching them on demand + * Pack the sparse Rx Queue context into dense hardware format and write it + * into the HW register space. */ int ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx, u32 rxq_index) @@ -1447,8 +1446,6 @@ int ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx, if (!rlan_ctx) return -EINVAL; - rlan_ctx->prefena = 1; - ice_pack_rxq_ctx(rlan_ctx, &buf); return ice_copy_rxq_ctx_to_hw(hw, &buf, rxq_index);