Commit d03c9ae6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-stmmac-further-cleanups' 

Russell King says:

====================
net: stmmac: further cleanups

Yet another bunch of patches cleaning up the stmmac driver.

We start off by cleaning up the formatting for stmmac_mac_finish(). Then
remove a plat_dat->port_node which is redundant, followed by several
descriptor methods that aren't called.

We then remove useless dwmac4 interrupt definitions, and realise that
v4.10 definitions are the same as v4.0, so get rid of those as well.
We also remove the write-only priv->hw->xlgmac member.

Next, we change priv->extend_desc and priv->chain_mode to be a boolean
and document what each of these are doing. Also do the same for
dma_cfg->fixed_burst and dma_cfg->mixed_burst.

Then, move the initialisation of dma_cfg->atds into stmmac_hw_init()
as this is where we have all the dependencies for this known, and
simplify its initialisation. Also comment what this is doing.

Finally, move the check that priv->plat->dma_cfg is present and the
programmable burst limit is set into the driver probe rather than
checking it each time we are just about to reset the dwmac core.
It is unnecessary to keep checking this. This makes a platform glue
driver fail early when it hasn't setup everything that's required
rather than when attempting to bring the netdev up for the first time.
====================

Link: https://patch.msgid.link/aaFpZvuIzOLaNM0m@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents df548e62 07a8531d

drivers/net/ethernet/stmicro/stmmac/common.h

+0 −1
Original line number Diff line number Diff line
@@ -635,7 +635,6 @@ struct mac_device_info { 
	unsigned int mcast_bits_log2;

	unsigned int rx_csum;

	unsigned int pcs;

	unsigned int xlgmac;

	unsigned int num_vlan;

	u32 vlan_filter[32];

	bool vlan_fail_q_en;

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

+1 −3
Original line number Diff line number Diff line
@@ -636,8 +636,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, 


	plat->dma_cfg->pbl = 32;

	plat->dma_cfg->pblx8 = true;

	plat->dma_cfg->fixed_burst = 0;

	plat->dma_cfg->mixed_burst = 0;

	plat->dma_cfg->aal = 0;

	plat->dma_cfg->dche = true;
@@ -1106,7 +1104,7 @@ static int quark_default_data(struct pci_dev *pdev, 


	plat->dma_cfg->pbl = 16;

	plat->dma_cfg->pblx8 = true;

	plat->dma_cfg->fixed_burst = 1;

	plat->dma_cfg->fixed_burst = true;

	/* AXI (TODO) */



	return 0;

drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c

+0 −19
Original line number Diff line number Diff line
@@ -171,16 +171,6 @@ static int dwmac4_wrback_get_rx_status(struct stmmac_extra_stats *x, 
	return ret;

}



static int dwmac4_rd_get_tx_len(struct dma_desc *p)

{

	return (le32_to_cpu(p->des2) & TDES2_BUFFER1_SIZE_MASK);

}



static int dwmac4_get_tx_owner(struct dma_desc *p)

{

	return (le32_to_cpu(p->des3) & TDES3_OWN) >> TDES3_OWN_SHIFT;

}



static void dwmac4_set_tx_owner(struct dma_desc *p)

{

	p->des3 |= cpu_to_le32(TDES3_OWN);
@@ -196,12 +186,6 @@ static void dwmac4_set_rx_owner(struct dma_desc *p, int disable_rx_ic) 
	p->des3 |= cpu_to_le32(flags);

}



static int dwmac4_get_tx_ls(struct dma_desc *p)

{

	return (le32_to_cpu(p->des3) & TDES3_LAST_DESCRIPTOR)

		>> TDES3_LAST_DESCRIPTOR_SHIFT;

}



static u16 dwmac4_wrback_get_rx_vlan_tci(struct dma_desc *p)

{

	return (le32_to_cpu(p->des0) & RDES0_VLAN_TAG_MASK);
@@ -551,11 +535,8 @@ static void dwmac4_set_tbs(struct dma_edesc *p, u32 sec, u32 nsec) 
const struct stmmac_desc_ops dwmac4_desc_ops = {

	.tx_status = dwmac4_wrback_get_tx_status,

	.rx_status = dwmac4_wrback_get_rx_status,

	.get_tx_len = dwmac4_rd_get_tx_len,

	.get_tx_owner = dwmac4_get_tx_owner,

	.set_tx_owner = dwmac4_set_tx_owner,

	.set_rx_owner = dwmac4_set_rx_owner,

	.get_tx_ls = dwmac4_get_tx_ls,

	.get_rx_vlan_tci = dwmac4_wrback_get_rx_vlan_tci,

	.get_rx_vlan_valid = dwmac4_wrback_get_rx_vlan_valid,

	.get_rx_frame_len = dwmac4_wrback_get_rx_frame_len,

drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ const struct stmmac_dma_ops dwmac410_dma_ops = { 
	.dump_regs = dwmac4_dump_dma_regs,

	.dma_rx_mode = dwmac4_dma_rx_chan_op_mode,

	.dma_tx_mode = dwmac4_dma_tx_chan_op_mode,

	.enable_dma_irq = dwmac410_enable_dma_irq,

	.enable_dma_irq = dwmac4_enable_dma_irq,

	.disable_dma_irq = dwmac4_disable_dma_irq,

	.start_tx = dwmac4_dma_start_tx,

	.stop_tx = dwmac4_dma_stop_tx,

drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h

+0 −8
Original line number Diff line number Diff line
@@ -111,8 +111,6 @@ static inline u32 dma_chanx_base_addr(const struct dwmac4_addrs *addrs, 
/* DMA default interrupt mask for 4.00 */

#define DMA_CHAN_INTR_DEFAULT_MASK	(DMA_CHAN_INTR_NORMAL | \

					 DMA_CHAN_INTR_ABNORMAL)

#define DMA_CHAN_INTR_DEFAULT_RX	(DMA_CHAN_INTR_ENA_RIE)

#define DMA_CHAN_INTR_DEFAULT_TX	(DMA_CHAN_INTR_ENA_TIE)



#define DMA_CHAN_INTR_NORMAL_4_10	(DMA_CHAN_INTR_ENA_NIE_4_10 | \

					 DMA_CHAN_INTR_ENA_RIE | \
@@ -123,8 +121,6 @@ static inline u32 dma_chanx_base_addr(const struct dwmac4_addrs *addrs, 
/* DMA default interrupt mask for 4.10a */

#define DMA_CHAN_INTR_DEFAULT_MASK_4_10	(DMA_CHAN_INTR_NORMAL_4_10 | \

					 DMA_CHAN_INTR_ABNORMAL_4_10)

#define DMA_CHAN_INTR_DEFAULT_RX_4_10	(DMA_CHAN_INTR_ENA_RIE)

#define DMA_CHAN_INTR_DEFAULT_TX_4_10	(DMA_CHAN_INTR_ENA_TIE)



#define DMA_CHAN_RX_WATCHDOG(addrs, x)	(dma_chanx_base_addr(addrs, x) + 0x38)

#define DMA_CHAN_SLOT_CTRL_STATUS(addrs, x)	(dma_chanx_base_addr(addrs, x) + 0x3c)
@@ -174,12 +170,8 @@ static inline u32 dma_chanx_base_addr(const struct dwmac4_addrs *addrs, 
int dwmac4_dma_reset(void __iomem *ioaddr);

void dwmac4_enable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,

			   u32 chan, bool rx, bool tx);

void dwmac410_enable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,

			     u32 chan, bool rx, bool tx);

void dwmac4_disable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,

			    u32 chan, bool rx, bool tx);

void dwmac410_disable_dma_irq(struct stmmac_priv *priv, void __iomem *ioaddr,

			      u32 chan, bool rx, bool tx);

void dwmac4_dma_start_tx(struct stmmac_priv *priv, void __iomem *ioaddr,

			 u32 chan);

void dwmac4_dma_stop_tx(struct stmmac_priv *priv, void __iomem *ioaddr,