renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-26 23:55:40 +08:00
Code

net: dsa: sja1105: Export the sja1105_inhibit_tx function

Browse Source 
This will be used to stop egress traffic in .phylink_mac_link_up.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean 2019-06-08 16:03:43 +03:00 committed by David S. Miller
parent 1fd4a173f0
commit d114fb0416
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/dsa/sja1105/sja1105.h
View File

@ -131,6 +131,8 @@ int sja1105_spi_send_long_packed_buf(const struct sja1105_private *priv,
sja1105_spi_rw_mode_t rw, u64 base_addr, sja1105_spi_rw_mode_t rw, u64 base_addr,
void *packed_buf, u64 buf_len); void *packed_buf, u64 buf_len);
int sja1105_static_config_upload(struct sja1105_private *priv); int sja1105_static_config_upload(struct sja1105_private *priv);
int sja1105_inhibit_tx(const struct sja1105_private *priv,
unsigned long port_bitmap, bool tx_inhibited);
extern struct sja1105_info sja1105e_info; extern struct sja1105_info sja1105e_info;
extern struct sja1105_info sja1105t_info; extern struct sja1105_info sja1105t_info;

14
drivers/net/dsa/sja1105/sja1105_spi.c
View File

@ -285,20 +285,22 @@ static int sja1105_cold_reset(const struct sja1105_private *priv)
return priv->info->reset_cmd(priv, &reset); return priv->info->reset_cmd(priv, &reset);
} }
static int sja1105_inhibit_tx(const struct sja1105_private *priv, int sja1105_inhibit_tx(const struct sja1105_private *priv,
const unsigned long *port_bitmap) unsigned long port_bitmap, bool tx_inhibited)
{ {
const struct sja1105_regs *regs = priv->info->regs; const struct sja1105_regs *regs = priv->info->regs;
u64 inhibit_cmd; u64 inhibit_cmd;
int port, rc; int rc;
rc = sja1105_spi_send_int(priv, SPI_READ, regs->port_control, rc = sja1105_spi_send_int(priv, SPI_READ, regs->port_control,
&inhibit_cmd, SJA1105_SIZE_PORT_CTRL); &inhibit_cmd, SJA1105_SIZE_PORT_CTRL);
if (rc < 0) if (rc < 0)
return rc; return rc;
for_each_set_bit(port, port_bitmap, SJA1105_NUM_PORTS) if (tx_inhibited)
inhibit_cmd |= BIT(port); inhibit_cmd |= port_bitmap;
else
inhibit_cmd &= ~port_bitmap;
return sja1105_spi_send_int(priv, SPI_WRITE, regs->port_control, return sja1105_spi_send_int(priv, SPI_WRITE, regs->port_control,
&inhibit_cmd, SJA1105_SIZE_PORT_CTRL); &inhibit_cmd, SJA1105_SIZE_PORT_CTRL);
@ -415,7 +417,7 @@ int sja1105_static_config_upload(struct sja1105_private *priv)
* Tx on all ports and waiting for current packet to drain. * Tx on all ports and waiting for current packet to drain.
* Otherwise, the PHY will see an unterminated Ethernet packet. * Otherwise, the PHY will see an unterminated Ethernet packet.
*/ */
rc = sja1105_inhibit_tx(priv, &port_bitmap); rc = sja1105_inhibit_tx(priv, port_bitmap, true);
if (rc < 0) { if (rc < 0) {
dev_err(dev, "Failed to inhibit Tx on ports\n"); dev_err(dev, "Failed to inhibit Tx on ports\n");
return -ENXIO; return -ENXIO;