Commit 1b3d6ecd authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'bnxt_en-driver-updates' 

Michael Chan says:

====================
bnxt_en: Driver updates

This patchset adds .get_module_eeprom_by_page() support and adds
an NVRAM resize step to allow larger firmware images to be flashed
to older firmware.
====================

Link: https://lore.kernel.org/r/1666334243-23866-1-git-send-email-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 96917bb3 45034224

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+1 −0
Original line number Diff line number Diff line
@@ -2116,6 +2116,7 @@ struct bnxt { 
#define BNXT_PHY_FL_NO_FCS		PORT_PHY_QCAPS_RESP_FLAGS_NO_FCS

#define BNXT_PHY_FL_NO_PAUSE		(PORT_PHY_QCAPS_RESP_FLAGS2_PAUSE_UNSUPPORTED << 8)

#define BNXT_PHY_FL_NO_PFC		(PORT_PHY_QCAPS_RESP_FLAGS2_PFC_UNSUPPORTED << 8)

#define BNXT_PHY_FL_BANK_SEL		(PORT_PHY_QCAPS_RESP_FLAGS2_BANK_ADDR_SUPPORTED << 8)



	u8			num_tests;

	struct bnxt_test_info	*test_info;

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+102 −7
Original line number Diff line number Diff line
@@ -2514,6 +2514,7 @@ static int bnxt_flash_firmware_from_file(struct net_device *dev, 
#define MSG_INTERNAL_ERR "PKG install error : Internal error"

#define MSG_NO_PKG_UPDATE_AREA_ERR "PKG update area not created in nvram"

#define MSG_NO_SPACE_ERR "PKG insufficient update area in nvram"

#define MSG_RESIZE_UPDATE_ERR "Resize UPDATE entry error"

#define MSG_ANTI_ROLLBACK_ERR "HWRM_NVM_INSTALL_UPDATE failure due to Anti-rollback detected"

#define MSG_GENERIC_FAILURE_ERR "HWRM_NVM_INSTALL_UPDATE failure"
@@ -2564,6 +2565,32 @@ static int nvm_update_err_to_stderr(struct net_device *dev, u8 result, 
#define BNXT_NVM_MORE_FLAG	(cpu_to_le16(NVM_MODIFY_REQ_FLAGS_BATCH_MODE))

#define BNXT_NVM_LAST_FLAG	(cpu_to_le16(NVM_MODIFY_REQ_FLAGS_BATCH_LAST))



static int bnxt_resize_update_entry(struct net_device *dev, size_t fw_size,

				    struct netlink_ext_ack *extack)

{

	u32 item_len;

	int rc;



	rc = bnxt_find_nvram_item(dev, BNX_DIR_TYPE_UPDATE,

				  BNX_DIR_ORDINAL_FIRST, BNX_DIR_EXT_NONE, NULL,

				  &item_len, NULL);

	if (rc) {

		BNXT_NVM_ERR_MSG(dev, extack, MSG_NO_PKG_UPDATE_AREA_ERR);

		return rc;

	}



	if (fw_size > item_len) {

		rc = bnxt_flash_nvram(dev, BNX_DIR_TYPE_UPDATE,

				      BNX_DIR_ORDINAL_FIRST, 0, 1,

				      round_up(fw_size, 4096), NULL, 0);

		if (rc) {

			BNXT_NVM_ERR_MSG(dev, extack, MSG_RESIZE_UPDATE_ERR);

			return rc;

		}

	}

	return 0;

}



int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware *fw,

				   u32 install_type, struct netlink_ext_ack *extack)

{
@@ -2580,6 +2607,11 @@ int bnxt_flash_package_from_fw_obj(struct net_device *dev, const struct firmware 
	u16 index;

	int rc;



	/* resize before flashing larger image than available space */

	rc = bnxt_resize_update_entry(dev, fw->size, extack);

	if (rc)

		return rc;



	bnxt_hwrm_fw_set_time(bp);



	rc = hwrm_req_init(bp, modify, HWRM_NVM_MODIFY);
@@ -3146,8 +3178,9 @@ static int bnxt_get_eee(struct net_device *dev, struct ethtool_eee *edata) 
}



static int bnxt_read_sfp_module_eeprom_info(struct bnxt *bp, u16 i2c_addr,

					    u16 page_number, u16 start_addr,

					    u16 data_length, u8 *buf)

					    u16 page_number, u8 bank,

					    u16 start_addr, u16 data_length,

					    u8 *buf)

{

	struct hwrm_port_phy_i2c_read_output *output;

	struct hwrm_port_phy_i2c_read_input *req;
@@ -3168,8 +3201,13 @@ static int bnxt_read_sfp_module_eeprom_info(struct bnxt *bp, u16 i2c_addr, 
		data_length -= xfer_size;

		req->page_offset = cpu_to_le16(start_addr + byte_offset);

		req->data_length = xfer_size;

		req->enables = cpu_to_le32(start_addr + byte_offset ?

				 PORT_PHY_I2C_READ_REQ_ENABLES_PAGE_OFFSET : 0);

		req->enables =

			cpu_to_le32((start_addr + byte_offset ?

				     PORT_PHY_I2C_READ_REQ_ENABLES_PAGE_OFFSET :

				     0) |

				    (bank ?

				     PORT_PHY_I2C_READ_REQ_ENABLES_BANK_NUMBER :

				     0));

		rc = hwrm_req_send(bp, req);

		if (!rc)

			memcpy(buf + byte_offset, output->data, xfer_size);
@@ -3199,7 +3237,7 @@ static int bnxt_get_module_info(struct net_device *dev, 
	if (bp->hwrm_spec_code < 0x10202)

		return -EOPNOTSUPP;



	rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0,

	rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0, 0,

					      SFF_DIAG_SUPPORT_OFFSET + 1,

					      data);

	if (!rc) {
@@ -3244,7 +3282,7 @@ static int bnxt_get_module_eeprom(struct net_device *dev, 
	if (start < ETH_MODULE_SFF_8436_LEN) {

		if (start + eeprom->len > ETH_MODULE_SFF_8436_LEN)

			length = ETH_MODULE_SFF_8436_LEN - start;

		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0,

		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0,

						      start, length, data);

		if (rc)

			return rc;
@@ -3256,12 +3294,68 @@ static int bnxt_get_module_eeprom(struct net_device *dev, 
	/* Read A2 portion of the EEPROM */

	if (length) {

		start -= ETH_MODULE_SFF_8436_LEN;

		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 0,

		rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 0, 0,

						      start, length, data);

	}

	return rc;

}



static int bnxt_get_module_status(struct bnxt *bp, struct netlink_ext_ack *extack)

{

	if (bp->link_info.module_status <=

	    PORT_PHY_QCFG_RESP_MODULE_STATUS_WARNINGMSG)

		return 0;



	switch (bp->link_info.module_status) {

	case PORT_PHY_QCFG_RESP_MODULE_STATUS_PWRDOWN:

		NL_SET_ERR_MSG_MOD(extack, "Transceiver module is powering down");

		break;

	case PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTINSERTED:

		NL_SET_ERR_MSG_MOD(extack, "Transceiver module not inserted");

		break;

	case PORT_PHY_QCFG_RESP_MODULE_STATUS_CURRENTFAULT:

		NL_SET_ERR_MSG_MOD(extack, "Transceiver module disabled due to current fault");

		break;

	default:

		NL_SET_ERR_MSG_MOD(extack, "Unknown error");

		break;

	}

	return -EINVAL;

}



static int bnxt_get_module_eeprom_by_page(struct net_device *dev,

					  const struct ethtool_module_eeprom *page_data,

					  struct netlink_ext_ack *extack)

{

	struct bnxt *bp = netdev_priv(dev);

	int rc;



	rc = bnxt_get_module_status(bp, extack);

	if (rc)

		return rc;



	if (bp->hwrm_spec_code < 0x10202) {

		NL_SET_ERR_MSG_MOD(extack, "Firmware version too old");

		return -EINVAL;

	}



	if (page_data->bank && !(bp->phy_flags & BNXT_PHY_FL_BANK_SEL)) {

		NL_SET_ERR_MSG_MOD(extack, "Firmware not capable for bank selection");

		return -EINVAL;

	}



	rc = bnxt_read_sfp_module_eeprom_info(bp, page_data->i2c_address << 1,

					      page_data->page, page_data->bank,

					      page_data->offset,

					      page_data->length,

					      page_data->data);

	if (rc) {

		NL_SET_ERR_MSG_MOD(extack, "Module`s eeprom read failed");

		return rc;

	}

	return page_data->length;

}



static int bnxt_nway_reset(struct net_device *dev)

{

	int rc = 0;
@@ -4071,6 +4165,7 @@ const struct ethtool_ops bnxt_ethtool_ops = { 
	.set_eee		= bnxt_set_eee,

	.get_module_info	= bnxt_get_module_info,

	.get_module_eeprom	= bnxt_get_module_eeprom,

	.get_module_eeprom_by_page = bnxt_get_module_eeprom_by_page,

	.nway_reset		= bnxt_nway_reset,

	.set_phys_id		= bnxt_set_phys_id,

	.self_test		= bnxt_self_test,

drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h

+169 −65

File changed.

Preview size limit exceeded, changes collapsed.