Skip to content

L
linux
Commit 75124116 authored by huangjunxian's avatar huangjunxian Committed by Jakub Kicinski
Browse files
Options

net: ll_temac: fix the format of block comments 

Cleaning some static warnings of block comments.
Signed-off-by: default avatarhuangjunxian <huangjunxian6@hisilicon.com>
Signed-off-by: default avatarHaoyue Xu <xuhaoyue1@hisilicon.com>
Reviewed-by: default avatarHarini Katakam <harini.katakam@amd.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d57aae2e
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 90 deletions
drivers/net/ethernet/xilinx/ll_temac.h
View file @ 75124116
...@@ -21,36 +21,45 @@ ...@@ -21,36 +21,45 @@
/* Configuration options */ /* Configuration options */
/* Accept all incoming packets. /* Accept all incoming packets.
* This option defaults to disabled (cleared) */ * This option defaults to disabled (cleared)
*/
#define XTE_OPTION_PROMISC (1 << 0) #define XTE_OPTION_PROMISC (1 << 0)
/* Jumbo frame support for Tx & Rx. /* Jumbo frame support for Tx & Rx.
* This option defaults to disabled (cleared) */ * This option defaults to disabled (cleared)
*/
#define XTE_OPTION_JUMBO (1 << 1) #define XTE_OPTION_JUMBO (1 << 1)
/* VLAN Rx & Tx frame support. /* VLAN Rx & Tx frame support.
* This option defaults to disabled (cleared) */ * This option defaults to disabled (cleared)
*/
#define XTE_OPTION_VLAN (1 << 2) #define XTE_OPTION_VLAN (1 << 2)
/* Enable recognition of flow control frames on Rx /* Enable recognition of flow control frames on Rx
* This option defaults to enabled (set) */ * This option defaults to enabled (set)
*/
#define XTE_OPTION_FLOW_CONTROL (1 << 4) #define XTE_OPTION_FLOW_CONTROL (1 << 4)
/* Strip FCS and PAD from incoming frames. /* Strip FCS and PAD from incoming frames.
* Note: PAD from VLAN frames is not stripped. * Note: PAD from VLAN frames is not stripped.
* This option defaults to disabled (set) */ * This option defaults to disabled (set)
*/
#define XTE_OPTION_FCS_STRIP (1 << 5) #define XTE_OPTION_FCS_STRIP (1 << 5)
/* Generate FCS field and add PAD automatically for outgoing frames. /* Generate FCS field and add PAD automatically for outgoing frames.
* This option defaults to enabled (set) */ * This option defaults to enabled (set)
*/
#define XTE_OPTION_FCS_INSERT (1 << 6) #define XTE_OPTION_FCS_INSERT (1 << 6)
/* Enable Length/Type error checking for incoming frames. When this option is /* Enable Length/Type error checking for incoming frames. When this option is
set, the MAC will filter frames that have a mismatched type/length field * set, the MAC will filter frames that have a mismatched type/length field
and if XTE_OPTION_REPORT_RXERR is set, the user is notified when these * and if XTE_OPTION_REPORT_RXERR is set, the user is notified when these
types of frames are encountered. When this option is cleared, the MAC will * types of frames are encountered. When this option is cleared, the MAC will
allow these types of frames to be received. * allow these types of frames to be received.
This option defaults to enabled (set) */ * This option defaults to enabled (set)
*/
#define XTE_OPTION_LENTYPE_ERR (1 << 7) #define XTE_OPTION_LENTYPE_ERR (1 << 7)
/* Enable the transmitter. /* Enable the transmitter.
* This option defaults to enabled (set) */ * This option defaults to enabled (set)
*/
#define XTE_OPTION_TXEN (1 << 11) #define XTE_OPTION_TXEN (1 << 11)
/* Enable the receiver /* Enable the receiver
* This option defaults to enabled (set) */ * This option defaults to enabled (set)
*/
#define XTE_OPTION_RXEN (1 << 12) #define XTE_OPTION_RXEN (1 << 12)
/* Default options set when device is initialized or reset */ /* Default options set when device is initialized or reset */
...@@ -68,18 +77,18 @@ This option defaults to enabled (set) */ ...@@ -68,18 +77,18 @@ This option defaults to enabled (set) */
#define TX_TAILDESC_PTR 0x04 /* rw */ #define TX_TAILDESC_PTR 0x04 /* rw */
#define TX_CHNL_CTRL 0x05 /* rw */ #define TX_CHNL_CTRL 0x05 /* rw */
/* /*
0:7 24:31 IRQTimeout * 0:7 24:31 IRQTimeout
8:15 16:23 IRQCount * 8:15 16:23 IRQCount
16:20 11:15 Reserved * 16:20 11:15 Reserved
21 10 0 * 21 10 0
22 9 UseIntOnEnd * 22 9 UseIntOnEnd
23 8 LdIRQCnt * 23 8 LdIRQCnt
24 7 IRQEn * 24 7 IRQEn
25:28 3:6 Reserved * 25:28 3:6 Reserved
29 2 IrqErrEn * 29 2 IrqErrEn
30 1 IrqDlyEn * 30 1 IrqDlyEn
31 0 IrqCoalEn * 31 0 IrqCoalEn
*/ */
#define CHNL_CTRL_IRQ_IOE (1 << 9) #define CHNL_CTRL_IRQ_IOE (1 << 9)
#define CHNL_CTRL_IRQ_EN (1 << 7) #define CHNL_CTRL_IRQ_EN (1 << 7)
#define CHNL_CTRL_IRQ_ERR_EN (1 << 2) #define CHNL_CTRL_IRQ_ERR_EN (1 << 2)
...@@ -87,35 +96,35 @@ This option defaults to enabled (set) */ ...@@ -87,35 +96,35 @@ This option defaults to enabled (set) */
#define CHNL_CTRL_IRQ_COAL_EN (1 << 0) #define CHNL_CTRL_IRQ_COAL_EN (1 << 0)
#define TX_IRQ_REG 0x06 /* rw */ #define TX_IRQ_REG 0x06 /* rw */
/* /*
0:7 24:31 DltTmrValue * 0:7 24:31 DltTmrValue
8:15 16:23 ClscCntrValue * 8:15 16:23 ClscCntrValue
16:17 14:15 Reserved * 16:17 14:15 Reserved
18:21 10:13 ClscCnt * 18:21 10:13 ClscCnt
22:23 8:9 DlyCnt * 22:23 8:9 DlyCnt
24:28 3::7 Reserved * 24:28 3::7 Reserved
29 2 ErrIrq * 29 2 ErrIrq
30 1 DlyIrq * 30 1 DlyIrq
31 0 CoalIrq * 31 0 CoalIrq
*/ */
#define TX_CHNL_STS 0x07 /* r */ #define TX_CHNL_STS 0x07 /* r */
/* /*
0:9 22:31 Reserved * 0:9 22:31 Reserved
10 21 TailPErr * 10 21 TailPErr
11 20 CmpErr * 11 20 CmpErr
12 19 AddrErr * 12 19 AddrErr
13 18 NxtPErr * 13 18 NxtPErr
14 17 CurPErr * 14 17 CurPErr
15 16 BsyWr * 15 16 BsyWr
16:23 8:15 Reserved * 16:23 8:15 Reserved
24 7 Error * 24 7 Error
25 6 IOE * 25 6 IOE
26 5 SOE * 26 5 SOE
27 4 Cmplt * 27 4 Cmplt
28 3 SOP * 28 3 SOP
29 2 EOP * 29 2 EOP
30 1 EngBusy * 30 1 EngBusy
31 0 Reserved * 31 0 Reserved
*/ */
#define RX_NXTDESC_PTR 0x08 /* r */ #define RX_NXTDESC_PTR 0x08 /* r */
#define RX_CURBUF_ADDR 0x09 /* r */ #define RX_CURBUF_ADDR 0x09 /* r */
...@@ -124,17 +133,17 @@ This option defaults to enabled (set) */ ...@@ -124,17 +133,17 @@ This option defaults to enabled (set) */
#define RX_TAILDESC_PTR 0x0c /* rw */ #define RX_TAILDESC_PTR 0x0c /* rw */
#define RX_CHNL_CTRL 0x0d /* rw */ #define RX_CHNL_CTRL 0x0d /* rw */
/* /*
0:7 24:31 IRQTimeout * 0:7 24:31 IRQTimeout
8:15 16:23 IRQCount * 8:15 16:23 IRQCount
16:20 11:15 Reserved * 16:20 11:15 Reserved
21 10 0 * 21 10 0
22 9 UseIntOnEnd * 22 9 UseIntOnEnd
23 8 LdIRQCnt * 23 8 LdIRQCnt
24 7 IRQEn * 24 7 IRQEn
25:28 3:6 Reserved * 25:28 3:6 Reserved
29 2 IrqErrEn * 29 2 IrqErrEn
30 1 IrqDlyEn * 30 1 IrqDlyEn
31 0 IrqCoalEn * 31 0 IrqCoalEn
*/ */
#define RX_IRQ_REG 0x0e /* rw */ #define RX_IRQ_REG 0x0e /* rw */
#define IRQ_COAL (1 << 0) #define IRQ_COAL (1 << 0)
...@@ -142,13 +151,13 @@ This option defaults to enabled (set) */ ...@@ -142,13 +151,13 @@ This option defaults to enabled (set) */
#define IRQ_ERR (1 << 2) #define IRQ_ERR (1 << 2)
#define IRQ_DMAERR (1 << 7) /* this is not documented ??? */ #define IRQ_DMAERR (1 << 7) /* this is not documented ??? */
/* /*
0:7 24:31 DltTmrValue * 0:7 24:31 DltTmrValue
8:15 16:23 ClscCntrValue * 8:15 16:23 ClscCntrValue
16:17 14:15 Reserved * 16:17 14:15 Reserved
18:21 10:13 ClscCnt * 18:21 10:13 ClscCnt
22:23 8:9 DlyCnt * 22:23 8:9 DlyCnt
24:28 3::7 Reserved * 24:28 3::7 Reserved
*/ */
#define RX_CHNL_STS 0x0f /* r */ #define RX_CHNL_STS 0x0f /* r */
#define CHNL_STS_ENGBUSY (1 << 1) #define CHNL_STS_ENGBUSY (1 << 1)
#define CHNL_STS_EOP (1 << 2) #define CHNL_STS_EOP (1 << 2)
...@@ -165,23 +174,23 @@ This option defaults to enabled (set) */ ...@@ -165,23 +174,23 @@ This option defaults to enabled (set) */
#define CHNL_STS_CMPERR (1 << 20) #define CHNL_STS_CMPERR (1 << 20)
#define CHNL_STS_TAILERR (1 << 21) #define CHNL_STS_TAILERR (1 << 21)
/* /*
0:9 22:31 Reserved * 0:9 22:31 Reserved
10 21 TailPErr * 10 21 TailPErr
11 20 CmpErr * 11 20 CmpErr
12 19 AddrErr * 12 19 AddrErr
13 18 NxtPErr * 13 18 NxtPErr
14 17 CurPErr * 14 17 CurPErr
15 16 BsyWr * 15 16 BsyWr
16:23 8:15 Reserved * 16:23 8:15 Reserved
24 7 Error * 24 7 Error
25 6 IOE * 25 6 IOE
26 5 SOE * 26 5 SOE
27 4 Cmplt * 27 4 Cmplt
28 3 SOP * 28 3 SOP
29 2 EOP * 29 2 EOP
30 1 EngBusy * 30 1 EngBusy
31 0 Reserved * 31 0 Reserved
*/ */
#define DMA_CONTROL_REG 0x10 /* rw */ #define DMA_CONTROL_REG 0x10 /* rw */
#define DMA_CONTROL_RST (1 << 0) #define DMA_CONTROL_RST (1 << 0)
......
drivers/net/ethernet/xilinx/ll_temac_main.c
View file @ 75124116
...@@ -430,7 +430,8 @@ static void temac_do_set_mac_address(struct net_device *ndev) ...@@ -430,7 +430,8 @@ static void temac_do_set_mac_address(struct net_device *ndev)
(ndev->dev_addr[2] << 16) | (ndev->dev_addr[2] << 16) |
(ndev->dev_addr[3] << 24)); (ndev->dev_addr[3] << 24));
/* There are reserved bits in EUAW1 /* There are reserved bits in EUAW1
* so don't affect them Set MAC bits [47:32] in EUAW1 */ * so don't affect them Set MAC bits [47:32] in EUAW1
*/
temac_indirect_out32_locked(lp, XTE_UAW1_OFFSET, temac_indirect_out32_locked(lp, XTE_UAW1_OFFSET,
(ndev->dev_addr[4] & 0x000000ff) | (ndev->dev_addr[4] & 0x000000ff) |
(ndev->dev_addr[5] << 8)); (ndev->dev_addr[5] << 8));
...@@ -691,7 +692,8 @@ static void temac_device_reset(struct net_device *ndev) ...@@ -691,7 +692,8 @@ static void temac_device_reset(struct net_device *ndev)
spin_unlock_irqrestore(lp->indirect_lock, flags); spin_unlock_irqrestore(lp->indirect_lock, flags);
/* Sync default options with HW /* Sync default options with HW
* but leave receiver and transmitter disabled. */ * but leave receiver and transmitter disabled.
*/
temac_setoptions(ndev, temac_setoptions(ndev,
lp->options & ~(XTE_OPTION_TXEN | XTE_OPTION_RXEN)); lp->options & ~(XTE_OPTION_TXEN | XTE_OPTION_RXEN));
......
drivers/net/ethernet/xilinx/ll_temac_mdio.c
View file @ 75124116
...@@ -29,7 +29,8 @@ static int temac_mdio_read(struct mii_bus *bus, int phy_id, int reg) ...@@ -29,7 +29,8 @@ static int temac_mdio_read(struct mii_bus *bus, int phy_id, int reg)
/* Write the PHY address to the MIIM Access Initiator register. /* Write the PHY address to the MIIM Access Initiator register.
* When the transfer completes, the PHY register value will appear * When the transfer completes, the PHY register value will appear
* in the LSW0 register */ * in the LSW0 register
*/
spin_lock_irqsave(lp->indirect_lock, flags); spin_lock_irqsave(lp->indirect_lock, flags);
temac_iow(lp, XTE_LSW0_OFFSET, (phy_id << 5) | reg); temac_iow(lp, XTE_LSW0_OFFSET, (phy_id << 5) | reg);
rc = temac_indirect_in32_locked(lp, XTE_MIIMAI_OFFSET); rc = temac_indirect_in32_locked(lp, XTE_MIIMAI_OFFSET);
...@@ -88,7 +89,8 @@ int temac_mdio_setup(struct temac_local *lp, struct platform_device *pdev) ...@@ -88,7 +89,8 @@ int temac_mdio_setup(struct temac_local *lp, struct platform_device *pdev)
} }
/* Enable the MDIO bus by asserting the enable bit and writing /* Enable the MDIO bus by asserting the enable bit and writing
* in the clock config */ * in the clock config
*/
temac_indirect_out32(lp, XTE_MC_OFFSET, 1 << 6 | clk_div); temac_indirect_out32(lp, XTE_MC_OFFSET, 1 << 6 | clk_div);
bus = devm_mdiobus_alloc(&pdev->dev); bus = devm_mdiobus_alloc(&pdev->dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7