admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'txgbe-feat-new-aml-firmware'

Browse Source 
Jiawen Wu says:

====================
TXGBE feat new AML firmware

The firmware of AML devices are redesigned to adapt to more PHY
interfaces. Optimize the driver to be compatible with the new firmware.

v1: https://lore.kernel.org/all/20250928093923.30456-1-jiawenwu@trustnetic.com/
====================

Link: https://patch.msgid.link/20251014061726.36660-1-jiawenwu@trustnetic.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Paolo Abeni
2025-10-16 15:41:38 +02:00
parent 00922eeaca a058de9262
commit ef672e4665
3 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/wangxun/libwx/wx_type.h
View File

@@ -1271,8 +1271,6 @@ struct wx {
/* PHY stuff */
bool notify_down;
int adv_speed;
int adv_duplex;
unsigned int link;
int speed;
int duplex;

54
drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
View File

@@ -19,8 +19,8 @@ void txgbe_gpio_init_aml(struct wx *wx)
{
u32 status;
wr32(wx, WX_GPIO_INTTYPE_LEVEL, TXGBE_GPIOBIT_2 | TXGBE_GPIOBIT_3);
wr32(wx, WX_GPIO_INTEN, TXGBE_GPIOBIT_2 | TXGBE_GPIOBIT_3);
wr32(wx, WX_GPIO_INTTYPE_LEVEL, TXGBE_GPIOBIT_2);
wr32(wx, WX_GPIO_INTEN, TXGBE_GPIOBIT_2);
status = rd32(wx, WX_GPIO_INTSTATUS);
for (int i = 0; i < 6; i++) {
@@ -42,11 +42,6 @@ irqreturn_t txgbe_gpio_irq_handler_aml(int irq, void *data)
wr32(wx, WX_GPIO_EOI, TXGBE_GPIOBIT_2);
wx_service_event_schedule(wx);
}
if (status & TXGBE_GPIOBIT_3) {
set_bit(WX_FLAG_NEED_LINK_CONFIG, wx->flags);
wx_service_event_schedule(wx);
wr32(wx, WX_GPIO_EOI, TXGBE_GPIOBIT_3);
}
wr32(wx, WX_GPIO_INTMASK, 0);
return IRQ_HANDLED;
@@ -96,6 +91,9 @@ static int txgbe_set_phy_link_hostif(struct wx *wx, int speed, int autoneg, int
case SPEED_10000:
buffer.speed = TXGBE_LINK_SPEED_10GB_FULL;
break;
default:
buffer.speed = TXGBE_LINK_SPEED_UNKNOWN;
break;
}
buffer.fec_mode = TXGBE_PHY_FEC_AUTO;
@@ -106,22 +104,21 @@ static int txgbe_set_phy_link_hostif(struct wx *wx, int speed, int autoneg, int
WX_HI_COMMAND_TIMEOUT, true);
}
static void txgbe_get_link_capabilities(struct wx *wx)
static void txgbe_get_link_capabilities(struct wx *wx, int *speed, int *duplex)
{
struct txgbe *txgbe = wx->priv;
if (test_bit(PHY_INTERFACE_MODE_25GBASER, txgbe->sfp_interfaces))
wx->adv_speed = SPEED_25000;
*speed = SPEED_25000;
else if (test_bit(PHY_INTERFACE_MODE_10GBASER, txgbe->sfp_interfaces))
wx->adv_speed = SPEED_10000;
*speed = SPEED_10000;
else
wx->adv_speed = SPEED_UNKNOWN;
*speed = SPEED_UNKNOWN;
wx->adv_duplex = wx->adv_speed == SPEED_UNKNOWN ?
DUPLEX_HALF : DUPLEX_FULL;
*duplex = *speed == SPEED_UNKNOWN ? DUPLEX_HALF : DUPLEX_FULL;
}
static void txgbe_get_phy_link(struct wx *wx, int *speed)
static void txgbe_get_mac_link(struct wx *wx, int *speed)
{
u32 status;
@@ -138,23 +135,11 @@ static void txgbe_get_phy_link(struct wx *wx, int *speed)
int txgbe_set_phy_link(struct wx *wx)
{
int speed, err;
u32 gpio;
int speed, duplex, err;
/* Check RX signal */
gpio = rd32(wx, WX_GPIO_EXT);
if (gpio & TXGBE_GPIOBIT_3)
return -ENODEV;
txgbe_get_link_capabilities(wx, &speed, &duplex);
txgbe_get_link_capabilities(wx);
if (wx->adv_speed == SPEED_UNKNOWN)
return -ENODEV;
txgbe_get_phy_link(wx, &speed);
if (speed == wx->adv_speed)
return 0;
err = txgbe_set_phy_link_hostif(wx, wx->adv_speed, 0, wx->adv_duplex);
err = txgbe_set_phy_link_hostif(wx, speed, 0, duplex);
if (err) {
wx_err(wx, "Failed to setup link\n");
return err;
@@ -230,14 +215,7 @@ int txgbe_identify_sfp(struct wx *wx)
return -ENODEV;
}
err = txgbe_sfp_to_linkmodes(wx, id);
if (err)
return err;
if (gpio & TXGBE_GPIOBIT_3)
set_bit(WX_FLAG_NEED_LINK_CONFIG, wx->flags);
return 0;
return txgbe_sfp_to_linkmodes(wx, id);
}
void txgbe_setup_link(struct wx *wx)
@@ -256,7 +234,7 @@ static void txgbe_get_link_state(struct phylink_config *config,
struct wx *wx = phylink_to_wx(config);
int speed;
txgbe_get_phy_link(wx, &speed);
txgbe_get_mac_link(wx, &speed);
state->link = speed != SPEED_UNKNOWN;
state->speed = speed;
state->duplex = state->link ? DUPLEX_FULL : DUPLEX_UNKNOWN;

5
drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
View File

@@ -314,6 +314,7 @@ void txgbe_up(struct wx *wx);
int txgbe_setup_tc(struct net_device *dev, u8 tc);
void txgbe_do_reset(struct net_device *netdev);
#define TXGBE_LINK_SPEED_UNKNOWN 0
#define TXGBE_LINK_SPEED_10GB_FULL 4
#define TXGBE_LINK_SPEED_25GB_FULL 0x10
@@ -352,7 +353,9 @@ struct txgbe_sfp_id {
u8 vendor_oui0; /* A0H 0x25 */
u8 vendor_oui1; /* A0H 0x26 */
u8 vendor_oui2; /* A0H 0x27 */
u8 reserved[3];
u8 transceiver_type; /* A0H 0x83 */
u8 sff_opt1; /* A0H 0xC0 */
u8 reserved[5];
};
struct txgbe_hic_i2c_read {