162306a36Sopenharmony_ci// SPDX-License-Identifier: GPL-2.0-or-later 262306a36Sopenharmony_ci/* 362306a36Sopenharmony_ci * ASIX AX88172A based USB 2.0 Ethernet Devices 462306a36Sopenharmony_ci * Copyright (C) 2012 OMICRON electronics GmbH 562306a36Sopenharmony_ci * 662306a36Sopenharmony_ci * Supports external PHYs via phylib. Based on the driver for the 762306a36Sopenharmony_ci * AX88772. Original copyrights follow: 862306a36Sopenharmony_ci * 962306a36Sopenharmony_ci * Copyright (C) 2003-2006 David Hollis <dhollis@davehollis.com> 1062306a36Sopenharmony_ci * Copyright (C) 2005 Phil Chang <pchang23@sbcglobal.net> 1162306a36Sopenharmony_ci * Copyright (C) 2006 James Painter <jamie.painter@iname.com> 1262306a36Sopenharmony_ci * Copyright (c) 2002-2003 TiVo Inc. 1362306a36Sopenharmony_ci */ 1462306a36Sopenharmony_ci 1562306a36Sopenharmony_ci#include "asix.h" 1662306a36Sopenharmony_ci#include <linux/phy.h> 1762306a36Sopenharmony_ci 1862306a36Sopenharmony_cistruct ax88172a_private { 1962306a36Sopenharmony_ci struct mii_bus *mdio; 2062306a36Sopenharmony_ci struct phy_device *phydev; 2162306a36Sopenharmony_ci char phy_name[20]; 2262306a36Sopenharmony_ci u16 phy_addr; 2362306a36Sopenharmony_ci u16 oldmode; 2462306a36Sopenharmony_ci int use_embdphy; 2562306a36Sopenharmony_ci struct asix_rx_fixup_info rx_fixup_info; 2662306a36Sopenharmony_ci}; 2762306a36Sopenharmony_ci 2862306a36Sopenharmony_ci/* set MAC link settings according to information from phylib */ 2962306a36Sopenharmony_cistatic void ax88172a_adjust_link(struct net_device *netdev) 3062306a36Sopenharmony_ci{ 3162306a36Sopenharmony_ci struct phy_device *phydev = netdev->phydev; 3262306a36Sopenharmony_ci struct usbnet *dev = netdev_priv(netdev); 3362306a36Sopenharmony_ci struct ax88172a_private *priv = dev->driver_priv; 3462306a36Sopenharmony_ci u16 mode = 0; 3562306a36Sopenharmony_ci 3662306a36Sopenharmony_ci if (phydev->link) { 3762306a36Sopenharmony_ci mode = AX88772_MEDIUM_DEFAULT; 3862306a36Sopenharmony_ci 3962306a36Sopenharmony_ci if (phydev->duplex == DUPLEX_HALF) 4062306a36Sopenharmony_ci mode &= ~AX_MEDIUM_FD; 4162306a36Sopenharmony_ci 4262306a36Sopenharmony_ci if (phydev->speed != SPEED_100) 4362306a36Sopenharmony_ci mode &= ~AX_MEDIUM_PS; 4462306a36Sopenharmony_ci } 4562306a36Sopenharmony_ci 4662306a36Sopenharmony_ci if (mode != priv->oldmode) { 4762306a36Sopenharmony_ci asix_write_medium_mode(dev, mode, 0); 4862306a36Sopenharmony_ci priv->oldmode = mode; 4962306a36Sopenharmony_ci netdev_dbg(netdev, "speed %u duplex %d, setting mode to 0x%04x\n", 5062306a36Sopenharmony_ci phydev->speed, phydev->duplex, mode); 5162306a36Sopenharmony_ci phy_print_status(phydev); 5262306a36Sopenharmony_ci } 5362306a36Sopenharmony_ci} 5462306a36Sopenharmony_ci 5562306a36Sopenharmony_cistatic void ax88172a_status(struct usbnet *dev, struct urb *urb) 5662306a36Sopenharmony_ci{ 5762306a36Sopenharmony_ci /* link changes are detected by polling the phy */ 5862306a36Sopenharmony_ci} 5962306a36Sopenharmony_ci 6062306a36Sopenharmony_ci/* use phylib infrastructure */ 6162306a36Sopenharmony_cistatic int ax88172a_init_mdio(struct usbnet *dev) 6262306a36Sopenharmony_ci{ 6362306a36Sopenharmony_ci struct ax88172a_private *priv = dev->driver_priv; 6462306a36Sopenharmony_ci int ret; 6562306a36Sopenharmony_ci 6662306a36Sopenharmony_ci priv->mdio = mdiobus_alloc(); 6762306a36Sopenharmony_ci if (!priv->mdio) { 6862306a36Sopenharmony_ci netdev_err(dev->net, "Could not allocate MDIO bus\n"); 6962306a36Sopenharmony_ci return -ENOMEM; 7062306a36Sopenharmony_ci } 7162306a36Sopenharmony_ci 7262306a36Sopenharmony_ci priv->mdio->priv = (void *)dev; 7362306a36Sopenharmony_ci priv->mdio->read = &asix_mdio_bus_read; 7462306a36Sopenharmony_ci priv->mdio->write = &asix_mdio_bus_write; 7562306a36Sopenharmony_ci priv->mdio->name = "Asix MDIO Bus"; 7662306a36Sopenharmony_ci /* mii bus name is usb-<usb bus number>-<usb device number> */ 7762306a36Sopenharmony_ci snprintf(priv->mdio->id, MII_BUS_ID_SIZE, "usb-%03d:%03d", 7862306a36Sopenharmony_ci dev->udev->bus->busnum, dev->udev->devnum); 7962306a36Sopenharmony_ci 8062306a36Sopenharmony_ci ret = mdiobus_register(priv->mdio); 8162306a36Sopenharmony_ci if (ret) { 8262306a36Sopenharmony_ci netdev_err(dev->net, "Could not register MDIO bus\n"); 8362306a36Sopenharmony_ci goto mfree; 8462306a36Sopenharmony_ci } 8562306a36Sopenharmony_ci 8662306a36Sopenharmony_ci netdev_info(dev->net, "registered mdio bus %s\n", priv->mdio->id); 8762306a36Sopenharmony_ci return 0; 8862306a36Sopenharmony_ci 8962306a36Sopenharmony_cimfree: 9062306a36Sopenharmony_ci mdiobus_free(priv->mdio); 9162306a36Sopenharmony_ci return ret; 9262306a36Sopenharmony_ci} 9362306a36Sopenharmony_ci 9462306a36Sopenharmony_cistatic void ax88172a_remove_mdio(struct usbnet *dev) 9562306a36Sopenharmony_ci{ 9662306a36Sopenharmony_ci struct ax88172a_private *priv = dev->driver_priv; 9762306a36Sopenharmony_ci 9862306a36Sopenharmony_ci netdev_info(dev->net, "deregistering mdio bus %s\n", priv->mdio->id); 9962306a36Sopenharmony_ci mdiobus_unregister(priv->mdio); 10062306a36Sopenharmony_ci mdiobus_free(priv->mdio); 10162306a36Sopenharmony_ci} 10262306a36Sopenharmony_ci 10362306a36Sopenharmony_cistatic const struct net_device_ops ax88172a_netdev_ops = { 10462306a36Sopenharmony_ci .ndo_open = usbnet_open, 10562306a36Sopenharmony_ci .ndo_stop = usbnet_stop, 10662306a36Sopenharmony_ci .ndo_start_xmit = usbnet_start_xmit, 10762306a36Sopenharmony_ci .ndo_tx_timeout = usbnet_tx_timeout, 10862306a36Sopenharmony_ci .ndo_change_mtu = usbnet_change_mtu, 10962306a36Sopenharmony_ci .ndo_get_stats64 = dev_get_tstats64, 11062306a36Sopenharmony_ci .ndo_set_mac_address = asix_set_mac_address, 11162306a36Sopenharmony_ci .ndo_validate_addr = eth_validate_addr, 11262306a36Sopenharmony_ci .ndo_eth_ioctl = phy_do_ioctl_running, 11362306a36Sopenharmony_ci .ndo_set_rx_mode = asix_set_multicast, 11462306a36Sopenharmony_ci}; 11562306a36Sopenharmony_ci 11662306a36Sopenharmony_cistatic const struct ethtool_ops ax88172a_ethtool_ops = { 11762306a36Sopenharmony_ci .get_drvinfo = asix_get_drvinfo, 11862306a36Sopenharmony_ci .get_link = usbnet_get_link, 11962306a36Sopenharmony_ci .get_msglevel = usbnet_get_msglevel, 12062306a36Sopenharmony_ci .set_msglevel = usbnet_set_msglevel, 12162306a36Sopenharmony_ci .get_wol = asix_get_wol, 12262306a36Sopenharmony_ci .set_wol = asix_set_wol, 12362306a36Sopenharmony_ci .get_eeprom_len = asix_get_eeprom_len, 12462306a36Sopenharmony_ci .get_eeprom = asix_get_eeprom, 12562306a36Sopenharmony_ci .set_eeprom = asix_set_eeprom, 12662306a36Sopenharmony_ci .nway_reset = phy_ethtool_nway_reset, 12762306a36Sopenharmony_ci .get_link_ksettings = phy_ethtool_get_link_ksettings, 12862306a36Sopenharmony_ci .set_link_ksettings = phy_ethtool_set_link_ksettings, 12962306a36Sopenharmony_ci}; 13062306a36Sopenharmony_ci 13162306a36Sopenharmony_cistatic int ax88172a_reset_phy(struct usbnet *dev, int embd_phy) 13262306a36Sopenharmony_ci{ 13362306a36Sopenharmony_ci int ret; 13462306a36Sopenharmony_ci 13562306a36Sopenharmony_ci ret = asix_sw_reset(dev, AX_SWRESET_IPPD, 0); 13662306a36Sopenharmony_ci if (ret < 0) 13762306a36Sopenharmony_ci goto err; 13862306a36Sopenharmony_ci 13962306a36Sopenharmony_ci msleep(150); 14062306a36Sopenharmony_ci ret = asix_sw_reset(dev, AX_SWRESET_CLEAR, 0); 14162306a36Sopenharmony_ci if (ret < 0) 14262306a36Sopenharmony_ci goto err; 14362306a36Sopenharmony_ci 14462306a36Sopenharmony_ci msleep(150); 14562306a36Sopenharmony_ci 14662306a36Sopenharmony_ci ret = asix_sw_reset(dev, embd_phy ? AX_SWRESET_IPRL : AX_SWRESET_IPPD, 14762306a36Sopenharmony_ci 0); 14862306a36Sopenharmony_ci if (ret < 0) 14962306a36Sopenharmony_ci goto err; 15062306a36Sopenharmony_ci 15162306a36Sopenharmony_ci return 0; 15262306a36Sopenharmony_ci 15362306a36Sopenharmony_cierr: 15462306a36Sopenharmony_ci return ret; 15562306a36Sopenharmony_ci} 15662306a36Sopenharmony_ci 15762306a36Sopenharmony_ci 15862306a36Sopenharmony_cistatic int ax88172a_bind(struct usbnet *dev, struct usb_interface *intf) 15962306a36Sopenharmony_ci{ 16062306a36Sopenharmony_ci int ret; 16162306a36Sopenharmony_ci u8 buf[ETH_ALEN]; 16262306a36Sopenharmony_ci struct ax88172a_private *priv; 16362306a36Sopenharmony_ci 16462306a36Sopenharmony_ci ret = usbnet_get_endpoints(dev, intf); 16562306a36Sopenharmony_ci if (ret) 16662306a36Sopenharmony_ci return ret; 16762306a36Sopenharmony_ci 16862306a36Sopenharmony_ci priv = kzalloc(sizeof(*priv), GFP_KERNEL); 16962306a36Sopenharmony_ci if (!priv) 17062306a36Sopenharmony_ci return -ENOMEM; 17162306a36Sopenharmony_ci 17262306a36Sopenharmony_ci dev->driver_priv = priv; 17362306a36Sopenharmony_ci 17462306a36Sopenharmony_ci /* Get the MAC address */ 17562306a36Sopenharmony_ci ret = asix_read_cmd(dev, AX_CMD_READ_NODE_ID, 0, 0, ETH_ALEN, buf, 0); 17662306a36Sopenharmony_ci if (ret < ETH_ALEN) { 17762306a36Sopenharmony_ci netdev_err(dev->net, "Failed to read MAC address: %d\n", ret); 17862306a36Sopenharmony_ci ret = -EIO; 17962306a36Sopenharmony_ci goto free; 18062306a36Sopenharmony_ci } 18162306a36Sopenharmony_ci eth_hw_addr_set(dev->net, buf); 18262306a36Sopenharmony_ci 18362306a36Sopenharmony_ci dev->net->netdev_ops = &ax88172a_netdev_ops; 18462306a36Sopenharmony_ci dev->net->ethtool_ops = &ax88172a_ethtool_ops; 18562306a36Sopenharmony_ci 18662306a36Sopenharmony_ci /* are we using the internal or the external phy? */ 18762306a36Sopenharmony_ci ret = asix_read_cmd(dev, AX_CMD_SW_PHY_STATUS, 0, 0, 1, buf, 0); 18862306a36Sopenharmony_ci if (ret < 0) { 18962306a36Sopenharmony_ci netdev_err(dev->net, "Failed to read software interface selection register: %d\n", 19062306a36Sopenharmony_ci ret); 19162306a36Sopenharmony_ci goto free; 19262306a36Sopenharmony_ci } 19362306a36Sopenharmony_ci 19462306a36Sopenharmony_ci netdev_dbg(dev->net, "AX_CMD_SW_PHY_STATUS = 0x%02x\n", buf[0]); 19562306a36Sopenharmony_ci switch (buf[0] & AX_PHY_SELECT_MASK) { 19662306a36Sopenharmony_ci case AX_PHY_SELECT_INTERNAL: 19762306a36Sopenharmony_ci netdev_dbg(dev->net, "use internal phy\n"); 19862306a36Sopenharmony_ci priv->use_embdphy = 1; 19962306a36Sopenharmony_ci break; 20062306a36Sopenharmony_ci case AX_PHY_SELECT_EXTERNAL: 20162306a36Sopenharmony_ci netdev_dbg(dev->net, "use external phy\n"); 20262306a36Sopenharmony_ci priv->use_embdphy = 0; 20362306a36Sopenharmony_ci break; 20462306a36Sopenharmony_ci default: 20562306a36Sopenharmony_ci netdev_err(dev->net, "Interface mode not supported by driver\n"); 20662306a36Sopenharmony_ci ret = -ENOTSUPP; 20762306a36Sopenharmony_ci goto free; 20862306a36Sopenharmony_ci } 20962306a36Sopenharmony_ci 21062306a36Sopenharmony_ci ret = asix_read_phy_addr(dev, priv->use_embdphy); 21162306a36Sopenharmony_ci if (ret < 0) 21262306a36Sopenharmony_ci goto free; 21362306a36Sopenharmony_ci 21462306a36Sopenharmony_ci priv->phy_addr = ret; 21562306a36Sopenharmony_ci 21662306a36Sopenharmony_ci ax88172a_reset_phy(dev, priv->use_embdphy); 21762306a36Sopenharmony_ci 21862306a36Sopenharmony_ci /* Asix framing packs multiple eth frames into a 2K usb bulk transfer */ 21962306a36Sopenharmony_ci if (dev->driver_info->flags & FLAG_FRAMING_AX) { 22062306a36Sopenharmony_ci /* hard_mtu is still the default - the device does not support 22162306a36Sopenharmony_ci jumbo eth frames */ 22262306a36Sopenharmony_ci dev->rx_urb_size = 2048; 22362306a36Sopenharmony_ci } 22462306a36Sopenharmony_ci 22562306a36Sopenharmony_ci /* init MDIO bus */ 22662306a36Sopenharmony_ci ret = ax88172a_init_mdio(dev); 22762306a36Sopenharmony_ci if (ret) 22862306a36Sopenharmony_ci goto free; 22962306a36Sopenharmony_ci 23062306a36Sopenharmony_ci return 0; 23162306a36Sopenharmony_ci 23262306a36Sopenharmony_cifree: 23362306a36Sopenharmony_ci kfree(priv); 23462306a36Sopenharmony_ci return ret; 23562306a36Sopenharmony_ci} 23662306a36Sopenharmony_ci 23762306a36Sopenharmony_cistatic int ax88172a_stop(struct usbnet *dev) 23862306a36Sopenharmony_ci{ 23962306a36Sopenharmony_ci struct ax88172a_private *priv = dev->driver_priv; 24062306a36Sopenharmony_ci 24162306a36Sopenharmony_ci netdev_dbg(dev->net, "Stopping interface\n"); 24262306a36Sopenharmony_ci 24362306a36Sopenharmony_ci if (priv->phydev) { 24462306a36Sopenharmony_ci netdev_info(dev->net, "Disconnecting from phy %s\n", 24562306a36Sopenharmony_ci priv->phy_name); 24662306a36Sopenharmony_ci phy_stop(priv->phydev); 24762306a36Sopenharmony_ci phy_disconnect(priv->phydev); 24862306a36Sopenharmony_ci } 24962306a36Sopenharmony_ci 25062306a36Sopenharmony_ci return 0; 25162306a36Sopenharmony_ci} 25262306a36Sopenharmony_ci 25362306a36Sopenharmony_cistatic void ax88172a_unbind(struct usbnet *dev, struct usb_interface *intf) 25462306a36Sopenharmony_ci{ 25562306a36Sopenharmony_ci struct ax88172a_private *priv = dev->driver_priv; 25662306a36Sopenharmony_ci 25762306a36Sopenharmony_ci ax88172a_remove_mdio(dev); 25862306a36Sopenharmony_ci kfree(priv); 25962306a36Sopenharmony_ci} 26062306a36Sopenharmony_ci 26162306a36Sopenharmony_cistatic int ax88172a_reset(struct usbnet *dev) 26262306a36Sopenharmony_ci{ 26362306a36Sopenharmony_ci struct asix_data *data = (struct asix_data *)&dev->data; 26462306a36Sopenharmony_ci struct ax88172a_private *priv = dev->driver_priv; 26562306a36Sopenharmony_ci int ret; 26662306a36Sopenharmony_ci u16 rx_ctl; 26762306a36Sopenharmony_ci 26862306a36Sopenharmony_ci ax88172a_reset_phy(dev, priv->use_embdphy); 26962306a36Sopenharmony_ci 27062306a36Sopenharmony_ci msleep(150); 27162306a36Sopenharmony_ci rx_ctl = asix_read_rx_ctl(dev, 0); 27262306a36Sopenharmony_ci netdev_dbg(dev->net, "RX_CTL is 0x%04x after software reset\n", rx_ctl); 27362306a36Sopenharmony_ci ret = asix_write_rx_ctl(dev, 0x0000, 0); 27462306a36Sopenharmony_ci if (ret < 0) 27562306a36Sopenharmony_ci goto out; 27662306a36Sopenharmony_ci 27762306a36Sopenharmony_ci rx_ctl = asix_read_rx_ctl(dev, 0); 27862306a36Sopenharmony_ci netdev_dbg(dev->net, "RX_CTL is 0x%04x setting to 0x0000\n", rx_ctl); 27962306a36Sopenharmony_ci 28062306a36Sopenharmony_ci msleep(150); 28162306a36Sopenharmony_ci 28262306a36Sopenharmony_ci ret = asix_write_cmd(dev, AX_CMD_WRITE_IPG0, 28362306a36Sopenharmony_ci AX88772_IPG0_DEFAULT | AX88772_IPG1_DEFAULT, 28462306a36Sopenharmony_ci AX88772_IPG2_DEFAULT, 0, NULL, 0); 28562306a36Sopenharmony_ci if (ret < 0) { 28662306a36Sopenharmony_ci netdev_err(dev->net, "Write IPG,IPG1,IPG2 failed: %d\n", ret); 28762306a36Sopenharmony_ci goto out; 28862306a36Sopenharmony_ci } 28962306a36Sopenharmony_ci 29062306a36Sopenharmony_ci /* Rewrite MAC address */ 29162306a36Sopenharmony_ci memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN); 29262306a36Sopenharmony_ci ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN, 29362306a36Sopenharmony_ci data->mac_addr, 0); 29462306a36Sopenharmony_ci if (ret < 0) 29562306a36Sopenharmony_ci goto out; 29662306a36Sopenharmony_ci 29762306a36Sopenharmony_ci /* Set RX_CTL to default values with 2k buffer, and enable cactus */ 29862306a36Sopenharmony_ci ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL, 0); 29962306a36Sopenharmony_ci if (ret < 0) 30062306a36Sopenharmony_ci goto out; 30162306a36Sopenharmony_ci 30262306a36Sopenharmony_ci rx_ctl = asix_read_rx_ctl(dev, 0); 30362306a36Sopenharmony_ci netdev_dbg(dev->net, "RX_CTL is 0x%04x after all initializations\n", 30462306a36Sopenharmony_ci rx_ctl); 30562306a36Sopenharmony_ci 30662306a36Sopenharmony_ci rx_ctl = asix_read_medium_status(dev, 0); 30762306a36Sopenharmony_ci netdev_dbg(dev->net, "Medium Status is 0x%04x after all initializations\n", 30862306a36Sopenharmony_ci rx_ctl); 30962306a36Sopenharmony_ci 31062306a36Sopenharmony_ci /* Connect to PHY */ 31162306a36Sopenharmony_ci snprintf(priv->phy_name, 20, PHY_ID_FMT, 31262306a36Sopenharmony_ci priv->mdio->id, priv->phy_addr); 31362306a36Sopenharmony_ci 31462306a36Sopenharmony_ci priv->phydev = phy_connect(dev->net, priv->phy_name, 31562306a36Sopenharmony_ci &ax88172a_adjust_link, 31662306a36Sopenharmony_ci PHY_INTERFACE_MODE_MII); 31762306a36Sopenharmony_ci if (IS_ERR(priv->phydev)) { 31862306a36Sopenharmony_ci netdev_err(dev->net, "Could not connect to PHY device %s\n", 31962306a36Sopenharmony_ci priv->phy_name); 32062306a36Sopenharmony_ci ret = PTR_ERR(priv->phydev); 32162306a36Sopenharmony_ci goto out; 32262306a36Sopenharmony_ci } 32362306a36Sopenharmony_ci 32462306a36Sopenharmony_ci netdev_info(dev->net, "Connected to phy %s\n", priv->phy_name); 32562306a36Sopenharmony_ci 32662306a36Sopenharmony_ci /* During power-up, the AX88172A set the power down (BMCR_PDOWN) 32762306a36Sopenharmony_ci * bit of the PHY. Bring the PHY up again. 32862306a36Sopenharmony_ci */ 32962306a36Sopenharmony_ci genphy_resume(priv->phydev); 33062306a36Sopenharmony_ci phy_start(priv->phydev); 33162306a36Sopenharmony_ci 33262306a36Sopenharmony_ci return 0; 33362306a36Sopenharmony_ci 33462306a36Sopenharmony_ciout: 33562306a36Sopenharmony_ci return ret; 33662306a36Sopenharmony_ci 33762306a36Sopenharmony_ci} 33862306a36Sopenharmony_ci 33962306a36Sopenharmony_cistatic int ax88172a_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 34062306a36Sopenharmony_ci{ 34162306a36Sopenharmony_ci struct ax88172a_private *dp = dev->driver_priv; 34262306a36Sopenharmony_ci struct asix_rx_fixup_info *rx = &dp->rx_fixup_info; 34362306a36Sopenharmony_ci 34462306a36Sopenharmony_ci return asix_rx_fixup_internal(dev, skb, rx); 34562306a36Sopenharmony_ci} 34662306a36Sopenharmony_ci 34762306a36Sopenharmony_ciconst struct driver_info ax88172a_info = { 34862306a36Sopenharmony_ci .description = "ASIX AX88172A USB 2.0 Ethernet", 34962306a36Sopenharmony_ci .bind = ax88172a_bind, 35062306a36Sopenharmony_ci .reset = ax88172a_reset, 35162306a36Sopenharmony_ci .stop = ax88172a_stop, 35262306a36Sopenharmony_ci .unbind = ax88172a_unbind, 35362306a36Sopenharmony_ci .status = ax88172a_status, 35462306a36Sopenharmony_ci .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | 35562306a36Sopenharmony_ci FLAG_MULTI_PACKET, 35662306a36Sopenharmony_ci .rx_fixup = ax88172a_rx_fixup, 35762306a36Sopenharmony_ci .tx_fixup = asix_tx_fixup, 35862306a36Sopenharmony_ci}; 359