mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-05 05:57:08 +07:00
net: emaclite: Do not use microblaze and ppc IO functions
Emaclite can be used on ARM zynq where in_be32/out_be32 IO functions are not present. Use standard __raw_readl/__raw_writel IO functions instead. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3fb99fa7c7
commit
123c1407af
@ -159,34 +159,32 @@ static void xemaclite_enable_interrupts(struct net_local *drvdata)
|
|||||||
u32 reg_data;
|
u32 reg_data;
|
||||||
|
|
||||||
/* Enable the Tx interrupts for the first Buffer */
|
/* Enable the Tx interrupts for the first Buffer */
|
||||||
reg_data = in_be32(drvdata->base_addr + XEL_TSR_OFFSET);
|
reg_data = __raw_readl(drvdata->base_addr + XEL_TSR_OFFSET);
|
||||||
out_be32(drvdata->base_addr + XEL_TSR_OFFSET,
|
__raw_writel(reg_data | XEL_TSR_XMIT_IE_MASK,
|
||||||
reg_data | XEL_TSR_XMIT_IE_MASK);
|
drvdata->base_addr + XEL_TSR_OFFSET);
|
||||||
|
|
||||||
/* Enable the Tx interrupts for the second Buffer if
|
/* Enable the Tx interrupts for the second Buffer if
|
||||||
* configured in HW */
|
* configured in HW */
|
||||||
if (drvdata->tx_ping_pong != 0) {
|
if (drvdata->tx_ping_pong != 0) {
|
||||||
reg_data = in_be32(drvdata->base_addr +
|
reg_data = __raw_readl(drvdata->base_addr +
|
||||||
XEL_BUFFER_OFFSET + XEL_TSR_OFFSET);
|
XEL_BUFFER_OFFSET + XEL_TSR_OFFSET);
|
||||||
out_be32(drvdata->base_addr + XEL_BUFFER_OFFSET +
|
__raw_writel(reg_data | XEL_TSR_XMIT_IE_MASK,
|
||||||
XEL_TSR_OFFSET,
|
drvdata->base_addr + XEL_BUFFER_OFFSET +
|
||||||
reg_data | XEL_TSR_XMIT_IE_MASK);
|
XEL_TSR_OFFSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Enable the Rx interrupts for the first buffer */
|
/* Enable the Rx interrupts for the first buffer */
|
||||||
out_be32(drvdata->base_addr + XEL_RSR_OFFSET,
|
__raw_writel(XEL_RSR_RECV_IE_MASK, drvdata->base_addr + XEL_RSR_OFFSET);
|
||||||
XEL_RSR_RECV_IE_MASK);
|
|
||||||
|
|
||||||
/* Enable the Rx interrupts for the second Buffer if
|
/* Enable the Rx interrupts for the second Buffer if
|
||||||
* configured in HW */
|
* configured in HW */
|
||||||
if (drvdata->rx_ping_pong != 0) {
|
if (drvdata->rx_ping_pong != 0) {
|
||||||
out_be32(drvdata->base_addr + XEL_BUFFER_OFFSET +
|
__raw_writel(XEL_RSR_RECV_IE_MASK, drvdata->base_addr +
|
||||||
XEL_RSR_OFFSET,
|
XEL_BUFFER_OFFSET + XEL_RSR_OFFSET);
|
||||||
XEL_RSR_RECV_IE_MASK);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Enable the Global Interrupt Enable */
|
/* Enable the Global Interrupt Enable */
|
||||||
out_be32(drvdata->base_addr + XEL_GIER_OFFSET, XEL_GIER_GIE_MASK);
|
__raw_writel(XEL_GIER_GIE_MASK, drvdata->base_addr + XEL_GIER_OFFSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -201,37 +199,37 @@ static void xemaclite_disable_interrupts(struct net_local *drvdata)
|
|||||||
u32 reg_data;
|
u32 reg_data;
|
||||||
|
|
||||||
/* Disable the Global Interrupt Enable */
|
/* Disable the Global Interrupt Enable */
|
||||||
out_be32(drvdata->base_addr + XEL_GIER_OFFSET, XEL_GIER_GIE_MASK);
|
__raw_writel(XEL_GIER_GIE_MASK, drvdata->base_addr + XEL_GIER_OFFSET);
|
||||||
|
|
||||||
/* Disable the Tx interrupts for the first buffer */
|
/* Disable the Tx interrupts for the first buffer */
|
||||||
reg_data = in_be32(drvdata->base_addr + XEL_TSR_OFFSET);
|
reg_data = __raw_readl(drvdata->base_addr + XEL_TSR_OFFSET);
|
||||||
out_be32(drvdata->base_addr + XEL_TSR_OFFSET,
|
__raw_writel(reg_data & (~XEL_TSR_XMIT_IE_MASK),
|
||||||
reg_data & (~XEL_TSR_XMIT_IE_MASK));
|
drvdata->base_addr + XEL_TSR_OFFSET);
|
||||||
|
|
||||||
/* Disable the Tx interrupts for the second Buffer
|
/* Disable the Tx interrupts for the second Buffer
|
||||||
* if configured in HW */
|
* if configured in HW */
|
||||||
if (drvdata->tx_ping_pong != 0) {
|
if (drvdata->tx_ping_pong != 0) {
|
||||||
reg_data = in_be32(drvdata->base_addr + XEL_BUFFER_OFFSET +
|
reg_data = __raw_readl(drvdata->base_addr + XEL_BUFFER_OFFSET +
|
||||||
XEL_TSR_OFFSET);
|
XEL_TSR_OFFSET);
|
||||||
out_be32(drvdata->base_addr + XEL_BUFFER_OFFSET +
|
__raw_writel(reg_data & (~XEL_TSR_XMIT_IE_MASK),
|
||||||
XEL_TSR_OFFSET,
|
drvdata->base_addr + XEL_BUFFER_OFFSET +
|
||||||
reg_data & (~XEL_TSR_XMIT_IE_MASK));
|
XEL_TSR_OFFSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Disable the Rx interrupts for the first buffer */
|
/* Disable the Rx interrupts for the first buffer */
|
||||||
reg_data = in_be32(drvdata->base_addr + XEL_RSR_OFFSET);
|
reg_data = __raw_readl(drvdata->base_addr + XEL_RSR_OFFSET);
|
||||||
out_be32(drvdata->base_addr + XEL_RSR_OFFSET,
|
__raw_writel(reg_data & (~XEL_RSR_RECV_IE_MASK),
|
||||||
reg_data & (~XEL_RSR_RECV_IE_MASK));
|
drvdata->base_addr + XEL_RSR_OFFSET);
|
||||||
|
|
||||||
/* Disable the Rx interrupts for the second buffer
|
/* Disable the Rx interrupts for the second buffer
|
||||||
* if configured in HW */
|
* if configured in HW */
|
||||||
if (drvdata->rx_ping_pong != 0) {
|
if (drvdata->rx_ping_pong != 0) {
|
||||||
|
|
||||||
reg_data = in_be32(drvdata->base_addr + XEL_BUFFER_OFFSET +
|
reg_data = __raw_readl(drvdata->base_addr + XEL_BUFFER_OFFSET +
|
||||||
XEL_RSR_OFFSET);
|
XEL_RSR_OFFSET);
|
||||||
out_be32(drvdata->base_addr + XEL_BUFFER_OFFSET +
|
__raw_writel(reg_data & (~XEL_RSR_RECV_IE_MASK),
|
||||||
XEL_RSR_OFFSET,
|
drvdata->base_addr + XEL_BUFFER_OFFSET +
|
||||||
reg_data & (~XEL_RSR_RECV_IE_MASK));
|
XEL_RSR_OFFSET);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -351,7 +349,7 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data,
|
|||||||
byte_count = ETH_FRAME_LEN;
|
byte_count = ETH_FRAME_LEN;
|
||||||
|
|
||||||
/* Check if the expected buffer is available */
|
/* Check if the expected buffer is available */
|
||||||
reg_data = in_be32(addr + XEL_TSR_OFFSET);
|
reg_data = __raw_readl(addr + XEL_TSR_OFFSET);
|
||||||
if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK |
|
if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK |
|
||||||
XEL_TSR_XMIT_ACTIVE_MASK)) == 0) {
|
XEL_TSR_XMIT_ACTIVE_MASK)) == 0) {
|
||||||
|
|
||||||
@ -364,7 +362,7 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data,
|
|||||||
|
|
||||||
addr = (void __iomem __force *)((u32 __force)addr ^
|
addr = (void __iomem __force *)((u32 __force)addr ^
|
||||||
XEL_BUFFER_OFFSET);
|
XEL_BUFFER_OFFSET);
|
||||||
reg_data = in_be32(addr + XEL_TSR_OFFSET);
|
reg_data = __raw_readl(addr + XEL_TSR_OFFSET);
|
||||||
|
|
||||||
if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK |
|
if ((reg_data & (XEL_TSR_XMIT_BUSY_MASK |
|
||||||
XEL_TSR_XMIT_ACTIVE_MASK)) != 0)
|
XEL_TSR_XMIT_ACTIVE_MASK)) != 0)
|
||||||
@ -375,15 +373,16 @@ static int xemaclite_send_data(struct net_local *drvdata, u8 *data,
|
|||||||
/* Write the frame to the buffer */
|
/* Write the frame to the buffer */
|
||||||
xemaclite_aligned_write(data, (u32 __force *) addr, byte_count);
|
xemaclite_aligned_write(data, (u32 __force *) addr, byte_count);
|
||||||
|
|
||||||
out_be32(addr + XEL_TPLR_OFFSET, (byte_count & XEL_TPLR_LENGTH_MASK));
|
__raw_writel((byte_count & XEL_TPLR_LENGTH_MASK),
|
||||||
|
addr + XEL_TPLR_OFFSET);
|
||||||
|
|
||||||
/* Update the Tx Status Register to indicate that there is a
|
/* Update the Tx Status Register to indicate that there is a
|
||||||
* frame to send. Set the XEL_TSR_XMIT_ACTIVE_MASK flag which
|
* frame to send. Set the XEL_TSR_XMIT_ACTIVE_MASK flag which
|
||||||
* is used by the interrupt handler to check whether a frame
|
* is used by the interrupt handler to check whether a frame
|
||||||
* has been transmitted */
|
* has been transmitted */
|
||||||
reg_data = in_be32(addr + XEL_TSR_OFFSET);
|
reg_data = __raw_readl(addr + XEL_TSR_OFFSET);
|
||||||
reg_data |= (XEL_TSR_XMIT_BUSY_MASK | XEL_TSR_XMIT_ACTIVE_MASK);
|
reg_data |= (XEL_TSR_XMIT_BUSY_MASK | XEL_TSR_XMIT_ACTIVE_MASK);
|
||||||
out_be32(addr + XEL_TSR_OFFSET, reg_data);
|
__raw_writel(reg_data, addr + XEL_TSR_OFFSET);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -408,7 +407,7 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data)
|
|||||||
addr = (drvdata->base_addr + drvdata->next_rx_buf_to_use);
|
addr = (drvdata->base_addr + drvdata->next_rx_buf_to_use);
|
||||||
|
|
||||||
/* Verify which buffer has valid data */
|
/* Verify which buffer has valid data */
|
||||||
reg_data = in_be32(addr + XEL_RSR_OFFSET);
|
reg_data = __raw_readl(addr + XEL_RSR_OFFSET);
|
||||||
|
|
||||||
if ((reg_data & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) {
|
if ((reg_data & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) {
|
||||||
if (drvdata->rx_ping_pong != 0)
|
if (drvdata->rx_ping_pong != 0)
|
||||||
@ -425,14 +424,14 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data)
|
|||||||
return 0; /* No data was available */
|
return 0; /* No data was available */
|
||||||
|
|
||||||
/* Verify that buffer has valid data */
|
/* Verify that buffer has valid data */
|
||||||
reg_data = in_be32(addr + XEL_RSR_OFFSET);
|
reg_data = __raw_readl(addr + XEL_RSR_OFFSET);
|
||||||
if ((reg_data & XEL_RSR_RECV_DONE_MASK) !=
|
if ((reg_data & XEL_RSR_RECV_DONE_MASK) !=
|
||||||
XEL_RSR_RECV_DONE_MASK)
|
XEL_RSR_RECV_DONE_MASK)
|
||||||
return 0; /* No data was available */
|
return 0; /* No data was available */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get the protocol type of the ethernet frame that arrived */
|
/* Get the protocol type of the ethernet frame that arrived */
|
||||||
proto_type = ((ntohl(in_be32(addr + XEL_HEADER_OFFSET +
|
proto_type = ((ntohl(__raw_readl(addr + XEL_HEADER_OFFSET +
|
||||||
XEL_RXBUFF_OFFSET)) >> XEL_HEADER_SHIFT) &
|
XEL_RXBUFF_OFFSET)) >> XEL_HEADER_SHIFT) &
|
||||||
XEL_RPLR_LENGTH_MASK);
|
XEL_RPLR_LENGTH_MASK);
|
||||||
|
|
||||||
@ -441,7 +440,7 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data)
|
|||||||
if (proto_type > (ETH_FRAME_LEN + ETH_FCS_LEN)) {
|
if (proto_type > (ETH_FRAME_LEN + ETH_FCS_LEN)) {
|
||||||
|
|
||||||
if (proto_type == ETH_P_IP) {
|
if (proto_type == ETH_P_IP) {
|
||||||
length = ((ntohl(in_be32(addr +
|
length = ((ntohl(__raw_readl(addr +
|
||||||
XEL_HEADER_IP_LENGTH_OFFSET +
|
XEL_HEADER_IP_LENGTH_OFFSET +
|
||||||
XEL_RXBUFF_OFFSET)) >>
|
XEL_RXBUFF_OFFSET)) >>
|
||||||
XEL_HEADER_SHIFT) &
|
XEL_HEADER_SHIFT) &
|
||||||
@ -463,9 +462,9 @@ static u16 xemaclite_recv_data(struct net_local *drvdata, u8 *data)
|
|||||||
data, length);
|
data, length);
|
||||||
|
|
||||||
/* Acknowledge the frame */
|
/* Acknowledge the frame */
|
||||||
reg_data = in_be32(addr + XEL_RSR_OFFSET);
|
reg_data = __raw_readl(addr + XEL_RSR_OFFSET);
|
||||||
reg_data &= ~XEL_RSR_RECV_DONE_MASK;
|
reg_data &= ~XEL_RSR_RECV_DONE_MASK;
|
||||||
out_be32(addr + XEL_RSR_OFFSET, reg_data);
|
__raw_writel(reg_data, addr + XEL_RSR_OFFSET);
|
||||||
|
|
||||||
return length;
|
return length;
|
||||||
}
|
}
|
||||||
@ -492,14 +491,14 @@ static void xemaclite_update_address(struct net_local *drvdata,
|
|||||||
|
|
||||||
xemaclite_aligned_write(address_ptr, (u32 __force *) addr, ETH_ALEN);
|
xemaclite_aligned_write(address_ptr, (u32 __force *) addr, ETH_ALEN);
|
||||||
|
|
||||||
out_be32(addr + XEL_TPLR_OFFSET, ETH_ALEN);
|
__raw_writel(ETH_ALEN, addr + XEL_TPLR_OFFSET);
|
||||||
|
|
||||||
/* Update the MAC address in the EmacLite */
|
/* Update the MAC address in the EmacLite */
|
||||||
reg_data = in_be32(addr + XEL_TSR_OFFSET);
|
reg_data = __raw_readl(addr + XEL_TSR_OFFSET);
|
||||||
out_be32(addr + XEL_TSR_OFFSET, reg_data | XEL_TSR_PROG_MAC_ADDR);
|
__raw_writel(reg_data | XEL_TSR_PROG_MAC_ADDR, addr + XEL_TSR_OFFSET);
|
||||||
|
|
||||||
/* Wait for EmacLite to finish with the MAC address update */
|
/* Wait for EmacLite to finish with the MAC address update */
|
||||||
while ((in_be32(addr + XEL_TSR_OFFSET) &
|
while ((__raw_readl(addr + XEL_TSR_OFFSET) &
|
||||||
XEL_TSR_PROG_MAC_ADDR) != 0)
|
XEL_TSR_PROG_MAC_ADDR) != 0)
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
@ -669,31 +668,32 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)
|
|||||||
u32 tx_status;
|
u32 tx_status;
|
||||||
|
|
||||||
/* Check if there is Rx Data available */
|
/* Check if there is Rx Data available */
|
||||||
if ((in_be32(base_addr + XEL_RSR_OFFSET) & XEL_RSR_RECV_DONE_MASK) ||
|
if ((__raw_readl(base_addr + XEL_RSR_OFFSET) &
|
||||||
(in_be32(base_addr + XEL_BUFFER_OFFSET + XEL_RSR_OFFSET)
|
XEL_RSR_RECV_DONE_MASK) ||
|
||||||
|
(__raw_readl(base_addr + XEL_BUFFER_OFFSET + XEL_RSR_OFFSET)
|
||||||
& XEL_RSR_RECV_DONE_MASK))
|
& XEL_RSR_RECV_DONE_MASK))
|
||||||
|
|
||||||
xemaclite_rx_handler(dev);
|
xemaclite_rx_handler(dev);
|
||||||
|
|
||||||
/* Check if the Transmission for the first buffer is completed */
|
/* Check if the Transmission for the first buffer is completed */
|
||||||
tx_status = in_be32(base_addr + XEL_TSR_OFFSET);
|
tx_status = __raw_readl(base_addr + XEL_TSR_OFFSET);
|
||||||
if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) &&
|
if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) &&
|
||||||
(tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) {
|
(tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) {
|
||||||
|
|
||||||
tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK;
|
tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK;
|
||||||
out_be32(base_addr + XEL_TSR_OFFSET, tx_status);
|
__raw_writel(tx_status, base_addr + XEL_TSR_OFFSET);
|
||||||
|
|
||||||
tx_complete = true;
|
tx_complete = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check if the Transmission for the second buffer is completed */
|
/* Check if the Transmission for the second buffer is completed */
|
||||||
tx_status = in_be32(base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET);
|
tx_status = __raw_readl(base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET);
|
||||||
if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) &&
|
if (((tx_status & XEL_TSR_XMIT_BUSY_MASK) == 0) &&
|
||||||
(tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) {
|
(tx_status & XEL_TSR_XMIT_ACTIVE_MASK) != 0) {
|
||||||
|
|
||||||
tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK;
|
tx_status &= ~XEL_TSR_XMIT_ACTIVE_MASK;
|
||||||
out_be32(base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET,
|
__raw_writel(tx_status, base_addr + XEL_BUFFER_OFFSET +
|
||||||
tx_status);
|
XEL_TSR_OFFSET);
|
||||||
|
|
||||||
tx_complete = true;
|
tx_complete = true;
|
||||||
}
|
}
|
||||||
@ -726,7 +726,7 @@ static int xemaclite_mdio_wait(struct net_local *lp)
|
|||||||
/* wait for the MDIO interface to not be busy or timeout
|
/* wait for the MDIO interface to not be busy or timeout
|
||||||
after some time.
|
after some time.
|
||||||
*/
|
*/
|
||||||
while (in_be32(lp->base_addr + XEL_MDIOCTRL_OFFSET) &
|
while (__raw_readl(lp->base_addr + XEL_MDIOCTRL_OFFSET) &
|
||||||
XEL_MDIOCTRL_MDIOSTS_MASK) {
|
XEL_MDIOCTRL_MDIOSTS_MASK) {
|
||||||
if (end - jiffies <= 0) {
|
if (end - jiffies <= 0) {
|
||||||
WARN_ON(1);
|
WARN_ON(1);
|
||||||
@ -762,17 +762,17 @@ static int xemaclite_mdio_read(struct mii_bus *bus, int phy_id, int reg)
|
|||||||
* MDIO Address register. Set the Status bit in the MDIO Control
|
* MDIO Address register. Set the Status bit in the MDIO Control
|
||||||
* register to start a MDIO read transaction.
|
* register to start a MDIO read transaction.
|
||||||
*/
|
*/
|
||||||
ctrl_reg = in_be32(lp->base_addr + XEL_MDIOCTRL_OFFSET);
|
ctrl_reg = __raw_readl(lp->base_addr + XEL_MDIOCTRL_OFFSET);
|
||||||
out_be32(lp->base_addr + XEL_MDIOADDR_OFFSET,
|
__raw_writel(XEL_MDIOADDR_OP_MASK |
|
||||||
XEL_MDIOADDR_OP_MASK |
|
((phy_id << XEL_MDIOADDR_PHYADR_SHIFT) | reg),
|
||||||
((phy_id << XEL_MDIOADDR_PHYADR_SHIFT) | reg));
|
lp->base_addr + XEL_MDIOADDR_OFFSET);
|
||||||
out_be32(lp->base_addr + XEL_MDIOCTRL_OFFSET,
|
__raw_writel(ctrl_reg | XEL_MDIOCTRL_MDIOSTS_MASK,
|
||||||
ctrl_reg | XEL_MDIOCTRL_MDIOSTS_MASK);
|
lp->base_addr + XEL_MDIOCTRL_OFFSET);
|
||||||
|
|
||||||
if (xemaclite_mdio_wait(lp))
|
if (xemaclite_mdio_wait(lp))
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
|
|
||||||
rc = in_be32(lp->base_addr + XEL_MDIORD_OFFSET);
|
rc = __raw_readl(lp->base_addr + XEL_MDIORD_OFFSET);
|
||||||
|
|
||||||
dev_dbg(&lp->ndev->dev,
|
dev_dbg(&lp->ndev->dev,
|
||||||
"xemaclite_mdio_read(phy_id=%i, reg=%x) == %x\n",
|
"xemaclite_mdio_read(phy_id=%i, reg=%x) == %x\n",
|
||||||
@ -809,13 +809,13 @@ static int xemaclite_mdio_write(struct mii_bus *bus, int phy_id, int reg,
|
|||||||
* Data register. Finally, set the Status bit in the MDIO Control
|
* Data register. Finally, set the Status bit in the MDIO Control
|
||||||
* register to start a MDIO write transaction.
|
* register to start a MDIO write transaction.
|
||||||
*/
|
*/
|
||||||
ctrl_reg = in_be32(lp->base_addr + XEL_MDIOCTRL_OFFSET);
|
ctrl_reg = __raw_readl(lp->base_addr + XEL_MDIOCTRL_OFFSET);
|
||||||
out_be32(lp->base_addr + XEL_MDIOADDR_OFFSET,
|
__raw_writel(~XEL_MDIOADDR_OP_MASK &
|
||||||
~XEL_MDIOADDR_OP_MASK &
|
((phy_id << XEL_MDIOADDR_PHYADR_SHIFT) | reg),
|
||||||
((phy_id << XEL_MDIOADDR_PHYADR_SHIFT) | reg));
|
lp->base_addr + XEL_MDIOADDR_OFFSET);
|
||||||
out_be32(lp->base_addr + XEL_MDIOWR_OFFSET, val);
|
__raw_writel(val, lp->base_addr + XEL_MDIOWR_OFFSET);
|
||||||
out_be32(lp->base_addr + XEL_MDIOCTRL_OFFSET,
|
__raw_writel(ctrl_reg | XEL_MDIOCTRL_MDIOSTS_MASK,
|
||||||
ctrl_reg | XEL_MDIOCTRL_MDIOSTS_MASK);
|
lp->base_addr + XEL_MDIOCTRL_OFFSET);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -872,8 +872,8 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
|
|||||||
/* Enable the MDIO bus by asserting the enable bit in MDIO Control
|
/* Enable the MDIO bus by asserting the enable bit in MDIO Control
|
||||||
* register.
|
* register.
|
||||||
*/
|
*/
|
||||||
out_be32(lp->base_addr + XEL_MDIOCTRL_OFFSET,
|
__raw_writel(XEL_MDIOCTRL_MDIOEN_MASK,
|
||||||
XEL_MDIOCTRL_MDIOEN_MASK);
|
lp->base_addr + XEL_MDIOCTRL_OFFSET);
|
||||||
|
|
||||||
bus = mdiobus_alloc();
|
bus = mdiobus_alloc();
|
||||||
if (!bus) {
|
if (!bus) {
|
||||||
@ -1197,8 +1197,8 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
|
|||||||
dev_warn(dev, "No MAC address found\n");
|
dev_warn(dev, "No MAC address found\n");
|
||||||
|
|
||||||
/* Clear the Tx CSR's in case this is a restart */
|
/* Clear the Tx CSR's in case this is a restart */
|
||||||
out_be32(lp->base_addr + XEL_TSR_OFFSET, 0);
|
__raw_writel(0, lp->base_addr + XEL_TSR_OFFSET);
|
||||||
out_be32(lp->base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET, 0);
|
__raw_writel(0, lp->base_addr + XEL_BUFFER_OFFSET + XEL_TSR_OFFSET);
|
||||||
|
|
||||||
/* Set the MAC address in the EmacLite device */
|
/* Set the MAC address in the EmacLite device */
|
||||||
xemaclite_update_address(lp, ndev->dev_addr);
|
xemaclite_update_address(lp, ndev->dev_addr);
|
||||||
|
Loading…
Reference in New Issue
Block a user