Commit 7ae845d7 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ethernet-fixes-for-stmmac-driver' 

Joakim Zhang says:

====================
ethernet: fixes for stmmac driver

Fixes for stmmac driver.
---
ChangeLogs:
V1->V2:
	* subject prefix: ethernet: stmmac: -> net: stmmac:
	* use dma_addr_t instead of unsigned int for physical address
	* use cpu_to_le32()
V2->V3:
	* fix the build issue pointed out by kbuild bot.
	* add error handling for stmmac_reinit_rx_buffers() function.
V3->V4:
	* remove patch (net: stmmac: remove redundant null check for ptp clock),
	  reviewer thinks it should target net-next.
V4->V5:
	* use %pad format to print dma_addr_t.
	* extend dwmac4_display_ring() to support all descriptor types.
	* while() -> do-while()
====================

Link: https://lore.kernel.org/r/20210225090114.17562-1-qiangqing.zhang@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0d1bf7a5 9c63faaa

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

+49 −10
Original line number Diff line number Diff line
@@ -402,20 +402,54 @@ static void dwmac4_rd_set_tx_ic(struct dma_desc *p) 
	p->des2 |= cpu_to_le32(TDES2_INTERRUPT_ON_COMPLETION);

}



static void dwmac4_display_ring(void *head, unsigned int size, bool rx)

static void dwmac4_display_ring(void *head, unsigned int size, bool rx,

				dma_addr_t dma_rx_phy, unsigned int desc_size)

{

	struct dma_desc *p = (struct dma_desc *)head;

	dma_addr_t dma_addr;

	int i;



	pr_info("%s descriptor ring:\n", rx ? "RX" : "TX");



	if (desc_size == sizeof(struct dma_desc)) {

		struct dma_desc *p = (struct dma_desc *)head;



		for (i = 0; i < size; i++) {

		pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",

			i, (unsigned int)virt_to_phys(p),

			dma_addr = dma_rx_phy + i * sizeof(*p);

			pr_info("%03d [%pad]: 0x%x 0x%x 0x%x 0x%x\n",

				i, &dma_addr,

				le32_to_cpu(p->des0), le32_to_cpu(p->des1),

				le32_to_cpu(p->des2), le32_to_cpu(p->des3));

			p++;

		}

	} else if (desc_size == sizeof(struct dma_extended_desc)) {

		struct dma_extended_desc *extp = (struct dma_extended_desc *)head;



		for (i = 0; i < size; i++) {

			dma_addr = dma_rx_phy + i * sizeof(*extp);

			pr_info("%03d [%pad]: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",

				i, &dma_addr,

				le32_to_cpu(extp->basic.des0), le32_to_cpu(extp->basic.des1),

				le32_to_cpu(extp->basic.des2), le32_to_cpu(extp->basic.des3),

				le32_to_cpu(extp->des4), le32_to_cpu(extp->des5),

				le32_to_cpu(extp->des6), le32_to_cpu(extp->des7));

			extp++;

		}

	} else if (desc_size == sizeof(struct dma_edesc)) {

		struct dma_edesc *ep = (struct dma_edesc *)head;



		for (i = 0; i < size; i++) {

			dma_addr = dma_rx_phy + i * sizeof(*ep);

			pr_info("%03d [%pad]: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",

				i, &dma_addr,

				le32_to_cpu(ep->des4), le32_to_cpu(ep->des5),

				le32_to_cpu(ep->des6), le32_to_cpu(ep->des7),

				le32_to_cpu(ep->basic.des0), le32_to_cpu(ep->basic.des1),

				le32_to_cpu(ep->basic.des2), le32_to_cpu(ep->basic.des3));

			ep++;

		}

	} else {

		pr_err("unsupported descriptor!");

	}

}



static void dwmac4_set_mss_ctxt(struct dma_desc *p, unsigned int mss)
@@ -499,10 +533,15 @@ static void dwmac4_get_rx_header_len(struct dma_desc *p, unsigned int *len) 
	*len = le32_to_cpu(p->des2) & RDES2_HL;

}



static void dwmac4_set_sec_addr(struct dma_desc *p, dma_addr_t addr)

static void dwmac4_set_sec_addr(struct dma_desc *p, dma_addr_t addr, bool buf2_valid)

{

	p->des2 = cpu_to_le32(lower_32_bits(addr));

	p->des3 = cpu_to_le32(upper_32_bits(addr) | RDES3_BUFFER2_VALID_ADDR);

	p->des3 = cpu_to_le32(upper_32_bits(addr));



	if (buf2_valid)

		p->des3 |= cpu_to_le32(RDES3_BUFFER2_VALID_ADDR);

	else

		p->des3 &= cpu_to_le32(~RDES3_BUFFER2_VALID_ADDR);

}



static void dwmac4_set_tbs(struct dma_edesc *p, u32 sec, u32 nsec)

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

+0 −4
Original line number Diff line number Diff line
@@ -53,10 +53,6 @@ void dwmac4_dma_stop_tx(void __iomem *ioaddr, u32 chan) 


	value &= ~DMA_CONTROL_ST;

	writel(value, ioaddr + DMA_CHAN_TX_CONTROL(chan));



	value = readl(ioaddr + GMAC_CONFIG);

	value &= ~GMAC_CONFIG_TE;

	writel(value, ioaddr + GMAC_CONFIG);

}



void dwmac4_dma_start_rx(void __iomem *ioaddr, u32 chan)

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

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void dwxgmac2_get_rx_header_len(struct dma_desc *p, unsigned int *len) 
		*len = le32_to_cpu(p->des2) & XGMAC_RDES2_HL;

}



static void dwxgmac2_set_sec_addr(struct dma_desc *p, dma_addr_t addr)

static void dwxgmac2_set_sec_addr(struct dma_desc *p, dma_addr_t addr, bool is_valid)

{

	p->des2 = cpu_to_le32(lower_32_bits(addr));

	p->des3 = cpu_to_le32(upper_32_bits(addr));

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

+6 −3
Original line number Diff line number Diff line
@@ -417,19 +417,22 @@ static int enh_desc_get_rx_timestamp_status(void *desc, void *next_desc, 
	}

}



static void enh_desc_display_ring(void *head, unsigned int size, bool rx)

static void enh_desc_display_ring(void *head, unsigned int size, bool rx,

				  dma_addr_t dma_rx_phy, unsigned int desc_size)

{

	struct dma_extended_desc *ep = (struct dma_extended_desc *)head;

	dma_addr_t dma_addr;

	int i;



	pr_info("Extended %s descriptor ring:\n", rx ? "RX" : "TX");



	for (i = 0; i < size; i++) {

		u64 x;

		dma_addr = dma_rx_phy + i * sizeof(*ep);



		x = *(u64 *)ep;

		pr_info("%03d [0x%x]: 0x%x 0x%x 0x%x 0x%x\n",

			i, (unsigned int)virt_to_phys(ep),

		pr_info("%03d [%pad]: 0x%x 0x%x 0x%x 0x%x\n",

			i, &dma_addr,

			(unsigned int)x, (unsigned int)(x >> 32),

			ep->basic.des2, ep->basic.des3);

		ep++;

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

+3 −2
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ struct stmmac_desc_ops { 
	/* get rx timestamp status */

	int (*get_rx_timestamp_status)(void *desc, void *next_desc, u32 ats);

	/* Display ring */

	void (*display_ring)(void *head, unsigned int size, bool rx);

	void (*display_ring)(void *head, unsigned int size, bool rx,

			     dma_addr_t dma_rx_phy, unsigned int desc_size);

	/* set MSS via context descriptor */

	void (*set_mss)(struct dma_desc *p, unsigned int mss);

	/* get descriptor skbuff address */
@@ -91,7 +92,7 @@ struct stmmac_desc_ops { 
	int (*get_rx_hash)(struct dma_desc *p, u32 *hash,

			   enum pkt_hash_types *type);

	void (*get_rx_header_len)(struct dma_desc *p, unsigned int *len);

	void (*set_sec_addr)(struct dma_desc *p, dma_addr_t addr);

	void (*set_sec_addr)(struct dma_desc *p, dma_addr_t addr, bool buf2_valid);

	void (*set_sarc)(struct dma_desc *p, u32 sarc_type);

	void (*set_vlan_tag)(struct dma_desc *p, u16 tag, u16 inner_tag,

			     u32 inner_type);