Commit b7d85256 authored by Sean Anderson's avatar Sean Anderson Committed by Jakub Kicinski
Browse files

net: fman: Don't pass comm_mode to enable/disable 



mac_priv_s->enable() and ->disable() are always called with
a comm_mode of COMM_MODE_RX_AND_TX. Remove this parameter, and refactor
the macs appropriately.

Signed-off-by: default avatarSean Anderson <sean.anderson@seco.com>
Acked-by: default avatarCamelia Groza <camelia.groza@nxp.com>
Tested-by: default avatarCamelia Groza <camelia.groza@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8585bdad

drivers/net/ethernet/freescale/fman/fman_dtsec.c

+6 −14
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ static void graceful_stop(struct fman_mac *dtsec, enum comm_mode mode) 
	}

}



int dtsec_enable(struct fman_mac *dtsec, enum comm_mode mode)

int dtsec_enable(struct fman_mac *dtsec)

{

	struct dtsec_regs __iomem *regs = dtsec->regs;

	u32 tmp;
@@ -889,20 +889,16 @@ int dtsec_enable(struct fman_mac *dtsec, enum comm_mode mode) 


	/* Enable */

	tmp = ioread32be(&regs->maccfg1);

	if (mode & COMM_MODE_RX)

		tmp |= MACCFG1_RX_EN;

	if (mode & COMM_MODE_TX)

		tmp |= MACCFG1_TX_EN;



	tmp |= MACCFG1_RX_EN | MACCFG1_TX_EN;

	iowrite32be(tmp, &regs->maccfg1);



	/* Graceful start - clear the graceful Rx/Tx stop bit */

	graceful_start(dtsec, mode);

	graceful_start(dtsec, COMM_MODE_RX_AND_TX);



	return 0;

}



int dtsec_disable(struct fman_mac *dtsec, enum comm_mode mode)

int dtsec_disable(struct fman_mac *dtsec)

{

	struct dtsec_regs __iomem *regs = dtsec->regs;

	u32 tmp;
@@ -911,14 +907,10 @@ int dtsec_disable(struct fman_mac *dtsec, enum comm_mode mode) 
		return -EINVAL;



	/* Graceful stop - Assert the graceful Rx/Tx stop bit */

	graceful_stop(dtsec, mode);

	graceful_stop(dtsec, COMM_MODE_RX_AND_TX);



	tmp = ioread32be(&regs->maccfg1);

	if (mode & COMM_MODE_RX)

		tmp &= ~MACCFG1_RX_EN;

	if (mode & COMM_MODE_TX)

		tmp &= ~MACCFG1_TX_EN;



	tmp &= ~(MACCFG1_RX_EN | MACCFG1_TX_EN);

	iowrite32be(tmp, &regs->maccfg1);



	return 0;

drivers/net/ethernet/freescale/fman/fman_dtsec.h

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ int dtsec_adjust_link(struct fman_mac *dtsec, 
int dtsec_restart_autoneg(struct fman_mac *dtsec);

int dtsec_cfg_max_frame_len(struct fman_mac *dtsec, u16 new_val);

int dtsec_cfg_pad_and_crc(struct fman_mac *dtsec, bool new_val);

int dtsec_enable(struct fman_mac *dtsec, enum comm_mode mode);

int dtsec_disable(struct fman_mac *dtsec, enum comm_mode mode);

int dtsec_enable(struct fman_mac *dtsec);

int dtsec_disable(struct fman_mac *dtsec);

int dtsec_init(struct fman_mac *dtsec);

int dtsec_free(struct fman_mac *dtsec);

int dtsec_accept_rx_pause_frames(struct fman_mac *dtsec, bool en);

drivers/net/ethernet/freescale/fman/fman_memac.c

+4 −12
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ static bool is_init_done(struct memac_cfg *memac_drv_params) 
	return false;

}



int memac_enable(struct fman_mac *memac, enum comm_mode mode)

int memac_enable(struct fman_mac *memac)

{

	struct memac_regs __iomem *regs = memac->regs;

	u32 tmp;
@@ -694,17 +694,13 @@ int memac_enable(struct fman_mac *memac, enum comm_mode mode) 
		return -EINVAL;



	tmp = ioread32be(&regs->command_config);

	if (mode & COMM_MODE_RX)

		tmp |= CMD_CFG_RX_EN;

	if (mode & COMM_MODE_TX)

		tmp |= CMD_CFG_TX_EN;



	tmp |= CMD_CFG_RX_EN | CMD_CFG_TX_EN;

	iowrite32be(tmp, &regs->command_config);



	return 0;

}



int memac_disable(struct fman_mac *memac, enum comm_mode mode)

int memac_disable(struct fman_mac *memac)

{

	struct memac_regs __iomem *regs = memac->regs;

	u32 tmp;
@@ -713,11 +709,7 @@ int memac_disable(struct fman_mac *memac, enum comm_mode mode) 
		return -EINVAL;



	tmp = ioread32be(&regs->command_config);

	if (mode & COMM_MODE_RX)

		tmp &= ~CMD_CFG_RX_EN;

	if (mode & COMM_MODE_TX)

		tmp &= ~CMD_CFG_TX_EN;



	tmp &= ~(CMD_CFG_RX_EN | CMD_CFG_TX_EN);

	iowrite32be(tmp, &regs->command_config);



	return 0;

drivers/net/ethernet/freescale/fman/fman_memac.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ int memac_cfg_max_frame_len(struct fman_mac *memac, u16 new_val); 
int memac_cfg_reset_on_init(struct fman_mac *memac, bool enable);

int memac_cfg_fixed_link(struct fman_mac *memac,

			 struct fixed_phy_status *fixed_link);

int memac_enable(struct fman_mac *memac, enum comm_mode mode);

int memac_disable(struct fman_mac *memac, enum comm_mode mode);

int memac_enable(struct fman_mac *memac);

int memac_disable(struct fman_mac *memac);

int memac_init(struct fman_mac *memac);

int memac_free(struct fman_mac *memac);

int memac_accept_rx_pause_frames(struct fman_mac *memac, bool en);

drivers/net/ethernet/freescale/fman/fman_tgec.c

+4 −10
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static bool is_init_done(struct tgec_cfg *cfg) 
	return false;

}



int tgec_enable(struct fman_mac *tgec, enum comm_mode mode)

int tgec_enable(struct fman_mac *tgec)

{

	struct tgec_regs __iomem *regs = tgec->regs;

	u32 tmp;
@@ -401,16 +401,13 @@ int tgec_enable(struct fman_mac *tgec, enum comm_mode mode) 
		return -EINVAL;



	tmp = ioread32be(&regs->command_config);

	if (mode & COMM_MODE_RX)

		tmp |= CMD_CFG_RX_EN;

	if (mode & COMM_MODE_TX)

		tmp |= CMD_CFG_TX_EN;

	tmp |= CMD_CFG_RX_EN | CMD_CFG_TX_EN;

	iowrite32be(tmp, &regs->command_config);



	return 0;

}



int tgec_disable(struct fman_mac *tgec, enum comm_mode mode)

int tgec_disable(struct fman_mac *tgec)

{

	struct tgec_regs __iomem *regs = tgec->regs;

	u32 tmp;
@@ -419,10 +416,7 @@ int tgec_disable(struct fman_mac *tgec, enum comm_mode mode) 
		return -EINVAL;



	tmp = ioread32be(&regs->command_config);

	if (mode & COMM_MODE_RX)

		tmp &= ~CMD_CFG_RX_EN;

	if (mode & COMM_MODE_TX)

		tmp &= ~CMD_CFG_TX_EN;

	tmp &= ~(CMD_CFG_RX_EN | CMD_CFG_TX_EN);

	iowrite32be(tmp, &regs->command_config);



	return 0;