Commit c6275c02 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Jakub Kicinski
Browse files

net: ethernet: ti: am65-cpsw: move free desc queue mode selection in pdata 



In preparation of adding more multi-port K3 CPSW versions move free
descriptor queue mode selection in am65_cpsw_pdata, so it can be selected
basing on DT compatibility property.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Reviewed-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7747d4b7

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+3 −1
Original line number Diff line number Diff line
@@ -1606,7 +1606,6 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common) 
		};

		struct k3_ring_cfg fdqring_cfg = {

			.elm_size = K3_RINGACC_RING_ELSIZE_8,

			.mode = K3_RINGACC_RING_MODE_MESSAGE,

			.flags = K3_RINGACC_RING_SHARED,

		};

		struct k3_udma_glue_rx_flow_cfg rx_flow_cfg = {
@@ -1620,6 +1619,7 @@ static int am65_cpsw_nuss_init_rx_chns(struct am65_cpsw_common *common) 
		rx_flow_cfg.ring_rxfdq0_id = fdqring_id;

		rx_flow_cfg.rx_cfg.size = max_desc_num;

		rx_flow_cfg.rxfdq_cfg.size = max_desc_num;

		rx_flow_cfg.rxfdq_cfg.mode = common->pdata.fdqring_mode;



		ret = k3_udma_glue_rx_flow_init(rx_chn->rx_chn,

						i, &rx_flow_cfg);
@@ -2006,11 +2006,13 @@ static const struct soc_device_attribute am65_cpsw_socinfo[] = { 
static const struct am65_cpsw_pdata am65x_sr1_0 = {

	.quirks = AM65_CPSW_QUIRK_I2027_NO_TX_CSUM,

	.ale_dev_id = "am65x-cpsw2g",

	.fdqring_mode = K3_RINGACC_RING_MODE_MESSAGE,

};



static const struct am65_cpsw_pdata j721e_pdata = {

	.quirks = 0,

	.ale_dev_id = "am65x-cpsw2g",

	.fdqring_mode = K3_RINGACC_RING_MODE_MESSAGE,

};



static const struct of_device_id am65_cpsw_nuss_of_mtable[] = {

drivers/net/ethernet/ti/am65-cpsw-nuss.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/netdevice.h>

#include <linux/phy.h>

#include <linux/platform_device.h>

#include <linux/soc/ti/k3-ringacc.h>

#include "am65-cpsw-qos.h"



struct am65_cpts;
@@ -77,6 +78,7 @@ struct am65_cpsw_rx_chn { 


struct am65_cpsw_pdata {

	u32	quirks;

	enum k3_ring_mode fdqring_mode;

	const char	*ale_dev_id;

};