linux-next: manual merge of the net-next tree with the net tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 8964 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/phy/air_en8811h.c

between commit:

  d895767c33781 ("net: phy: air_en8811h: add AN8811HB MCU assert/deassert support")

from the net tree and commits:

  dddfadd75197e ("net: phy: Add Airoha phy library for shared code")
  5226bb6634cdf ("net: phy: air_phy_lib: Factorize BuckPBus register accessors")
  e08f0ea6daf2e ("net: phy: Rename Airoha common BuckPBus register accessors")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/net/phy/air_en8811h.c
index a86129ce693c2,a42898ae41358..0000000000000
--- a/drivers/net/phy/air_en8811h.c
+++ b/drivers/net/phy/air_en8811h.c
@@@ -260,218 -229,6 +245,31 @@@ static const unsigned long en8811h_led_
  					      BIT(TRIGGER_NETDEV_RX)          |
  					      BIT(TRIGGER_NETDEV_TX);
  
- static int air_phy_read_page(struct phy_device *phydev)
- {
- 	return __phy_read(phydev, AIR_EXT_PAGE_ACCESS);
- }
- 
- static int air_phy_write_page(struct phy_device *phydev, int page)
- {
- 	return __phy_write(phydev, AIR_EXT_PAGE_ACCESS, page);
- }
- 
 +static int __air_pbus_reg_write(struct mdio_device *mdiodev,
 +				u32 pbus_reg, u32 pbus_data)
 +{
 +	int ret;
 +
 +	ret = __mdiobus_write(mdiodev->bus, mdiodev->addr, AIR_EXT_PAGE_ACCESS,
 +			      upper_16_bits(pbus_reg));
 +	if (ret < 0)
 +		return ret;
 +
 +	ret = __mdiobus_write(mdiodev->bus, mdiodev->addr, AIR_PBUS_ADDR_HIGH,
 +			      FIELD_GET(AIR_PBUS_REG_ADDR_HIGH_MASK, pbus_reg));
 +	if (ret < 0)
 +		return ret;
 +
 +	ret = __mdiobus_write(mdiodev->bus, mdiodev->addr,
 +			      FIELD_GET(AIR_PBUS_REG_ADDR_LOW_MASK, pbus_reg),
 +			      lower_16_bits(pbus_data));
 +	if (ret < 0)
 +		return ret;
 +
 +	return __mdiobus_write(mdiodev->bus, mdiodev->addr, AIR_PBUS_DATA_HIGH,
 +			       upper_16_bits(pbus_data));
 +}
 +
- static int __air_buckpbus_reg_write(struct phy_device *phydev,
- 				    u32 pbus_address, u32 pbus_data)
- {
- 	int ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_MODE, AIR_BPBUS_MODE_ADDR_FIXED);
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_WR_ADDR_HIGH,
- 			  upper_16_bits(pbus_address));
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_WR_ADDR_LOW,
- 			  lower_16_bits(pbus_address));
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_WR_DATA_HIGH,
- 			  upper_16_bits(pbus_data));
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_WR_DATA_LOW,
- 			  lower_16_bits(pbus_data));
- 	if (ret < 0)
- 		return ret;
- 
- 	return 0;
- }
- 
- static int air_buckpbus_reg_write(struct phy_device *phydev,
- 				  u32 pbus_address, u32 pbus_data)
- {
- 	int saved_page;
- 	int ret = 0;
- 
- 	saved_page = phy_select_page(phydev, AIR_PHY_PAGE_EXTENDED_4);
- 
- 	if (saved_page >= 0) {
- 		ret = __air_buckpbus_reg_write(phydev, pbus_address,
- 					       pbus_data);
- 		if (ret < 0)
- 			phydev_err(phydev, "%s 0x%08x failed: %d\n", __func__,
- 				   pbus_address, ret);
- 	}
- 
- 	return phy_restore_page(phydev, saved_page, ret);
- }
- 
- static int __air_buckpbus_reg_read(struct phy_device *phydev,
- 				   u32 pbus_address, u32 *pbus_data)
- {
- 	int pbus_data_low, pbus_data_high;
- 	int ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_MODE, AIR_BPBUS_MODE_ADDR_FIXED);
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_RD_ADDR_HIGH,
- 			  upper_16_bits(pbus_address));
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_RD_ADDR_LOW,
- 			  lower_16_bits(pbus_address));
- 	if (ret < 0)
- 		return ret;
- 
- 	pbus_data_high = __phy_read(phydev, AIR_BPBUS_RD_DATA_HIGH);
- 	if (pbus_data_high < 0)
- 		return pbus_data_high;
- 
- 	pbus_data_low = __phy_read(phydev, AIR_BPBUS_RD_DATA_LOW);
- 	if (pbus_data_low < 0)
- 		return pbus_data_low;
- 
- 	*pbus_data = pbus_data_low | (pbus_data_high << 16);
- 	return 0;
- }
- 
- static int air_buckpbus_reg_read(struct phy_device *phydev,
- 				 u32 pbus_address, u32 *pbus_data)
- {
- 	int saved_page;
- 	int ret = 0;
- 
- 	saved_page = phy_select_page(phydev, AIR_PHY_PAGE_EXTENDED_4);
- 
- 	if (saved_page >= 0) {
- 		ret = __air_buckpbus_reg_read(phydev, pbus_address, pbus_data);
- 		if (ret < 0)
- 			phydev_err(phydev, "%s 0x%08x failed: %d\n", __func__,
- 				   pbus_address, ret);
- 	}
- 
- 	return phy_restore_page(phydev, saved_page, ret);
- }
- 
- static int __air_buckpbus_reg_modify(struct phy_device *phydev,
- 				     u32 pbus_address, u32 mask, u32 set)
- {
- 	int pbus_data_low, pbus_data_high;
- 	u32 pbus_data_old, pbus_data_new;
- 	int ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_MODE, AIR_BPBUS_MODE_ADDR_FIXED);
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_RD_ADDR_HIGH,
- 			  upper_16_bits(pbus_address));
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_RD_ADDR_LOW,
- 			  lower_16_bits(pbus_address));
- 	if (ret < 0)
- 		return ret;
- 
- 	pbus_data_high = __phy_read(phydev, AIR_BPBUS_RD_DATA_HIGH);
- 	if (pbus_data_high < 0)
- 		return pbus_data_high;
- 
- 	pbus_data_low = __phy_read(phydev, AIR_BPBUS_RD_DATA_LOW);
- 	if (pbus_data_low < 0)
- 		return pbus_data_low;
- 
- 	pbus_data_old = pbus_data_low | (pbus_data_high << 16);
- 	pbus_data_new = (pbus_data_old & ~mask) | set;
- 	if (pbus_data_new == pbus_data_old)
- 		return 0;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_WR_ADDR_HIGH,
- 			  upper_16_bits(pbus_address));
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_WR_ADDR_LOW,
- 			  lower_16_bits(pbus_address));
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_WR_DATA_HIGH,
- 			  upper_16_bits(pbus_data_new));
- 	if (ret < 0)
- 		return ret;
- 
- 	ret = __phy_write(phydev, AIR_BPBUS_WR_DATA_LOW,
- 			  lower_16_bits(pbus_data_new));
- 	if (ret < 0)
- 		return ret;
- 
- 	return 0;
- }
- 
- static int air_buckpbus_reg_modify(struct phy_device *phydev,
- 				   u32 pbus_address, u32 mask, u32 set)
- {
- 	int saved_page;
- 	int ret = 0;
- 
- 	saved_page = phy_select_page(phydev, AIR_PHY_PAGE_EXTENDED_4);
- 
- 	if (saved_page >= 0) {
- 		ret = __air_buckpbus_reg_modify(phydev, pbus_address, mask,
- 						set);
- 		if (ret < 0)
- 			phydev_err(phydev, "%s 0x%08x failed: %d\n", __func__,
- 				   pbus_address, ret);
- 	}
- 
- 	return phy_restore_page(phydev, saved_page, ret);
- }
- 
  static int __air_write_buf(struct phy_device *phydev, u32 address,
  			   const struct firmware *fw)
  {
@@@ -664,16 -373,8 +463,16 @@@ static int an8811hb_load_firmware(struc
  {
  	int ret;
  
 +	ret = an8811hb_mcu_assert(phydev);
 +	if (ret < 0)
 +		return ret;
 +
 +	ret = an8811hb_mcu_deassert(phydev);
 +	if (ret < 0)
 +		return ret;
 +
- 	ret = air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
- 				     EN8811H_FW_CTRL_1_START);
+ 	ret = air_phy_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
+ 					 EN8811H_FW_CTRL_1_START);
  	if (ret < 0)
  		return ret;
  
@@@ -760,18 -461,8 +559,18 @@@ static int en8811h_restart_mcu(struct p
  {
  	int ret;
  
 +	if (phy_id_compare_model(phydev->phy_id, AN8811HB_PHY_ID)) {
 +		ret = an8811hb_mcu_assert(phydev);
 +		if (ret < 0)
 +			return ret;
 +
 +		ret = an8811hb_mcu_deassert(phydev);
 +		if (ret < 0)
 +			return ret;
 +	}
 +
- 	ret = air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
- 				     EN8811H_FW_CTRL_1_START);
+ 	ret = air_phy_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
+ 					 EN8811H_FW_CTRL_1_START);
  	if (ret < 0)
  		return ret;
  
@@@ -1324,23 -996,16 +1123,23 @@@ static int an8811hb_probe(struct phy_de
  	/* Co-Clock Output */
  	ret = an8811hb_clk_provider_setup(&phydev->mdio.dev, &priv->hw);
  	if (ret)
 -		return ret;
 +		goto err_dev_create;
  
  	/* Configure led gpio pins as output */
- 	ret = air_buckpbus_reg_modify(phydev, AN8811HB_GPIO_OUTPUT,
- 				      AN8811HB_GPIO_OUTPUT_345,
- 				      AN8811HB_GPIO_OUTPUT_345);
+ 	ret = air_phy_buckpbus_reg_modify(phydev, AN8811HB_GPIO_OUTPUT,
+ 					  AN8811HB_GPIO_OUTPUT_345,
+ 					  AN8811HB_GPIO_OUTPUT_345);
  	if (ret < 0)
 -		return ret;
 +		goto err_dev_create;
  
  	return 0;
 +
 +err_dev_create:
 +	mdio_device_remove(mdiodev);
 +
 +err_dev_free:
 +	mdio_device_free(mdiodev);
 +	return ret;
  }
  
  static int en8811h_probe(struct phy_device *phydev)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]