net: wangxun: remove redundant kernel log (a75ed689) · Commits · EulixOS / Software / Kernel

drivers/net/ethernet/wangxun/ngbe/ngbe_main.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -678,11 +678,6 @@ static int ngbe_probe(struct pci_dev *pdev,

		pci_set_drvdata(pdev, wx);

		netif_info(wx, probe, netdev,
		"PHY: %s, PBA No: Wang Xun GbE Family Controller\n",
		wx->mac_type == em_mac_type_mdi ? "Internal" : "External");
		netif_info(wx, probe, netdev, "%pM\n", netdev->dev_addr);

		return 0;

		err_register:

drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c

+0 −108

Original line number	Diff line number	Diff line
		@@ -70,114 +70,6 @@ static void txgbe_init_thermal_sensor_thresh(struct wx *wx)
		wr32(wx, WX_TS_DALARM_THRE, 614);
		}

		/**
		* txgbe_read_pba_string - Reads part number string from EEPROM
		* @wx: pointer to hardware structure
		* @pba_num: stores the part number string from the EEPROM
		* @pba_num_size: part number string buffer length
		*
		* Reads the part number string from the EEPROM.
		**/
		int txgbe_read_pba_string(struct wx wx, u8 pba_num, u32 pba_num_size)
		{
		u16 pba_ptr, offset, length, data;
		int ret_val;

		if (!pba_num) {
		wx_err(wx, "PBA string buffer was null\n");
		return -EINVAL;
		}

		ret_val = wx_read_ee_hostif(wx,
		wx->eeprom.sw_region_offset + TXGBE_PBANUM0_PTR,
		&data);
		if (ret_val != 0) {
		wx_err(wx, "NVM Read Error\n");
		return ret_val;
		}

		ret_val = wx_read_ee_hostif(wx,
		wx->eeprom.sw_region_offset + TXGBE_PBANUM1_PTR,
		&pba_ptr);
		if (ret_val != 0) {
		wx_err(wx, "NVM Read Error\n");
		return ret_val;
		}

		/* if data is not ptr guard the PBA must be in legacy format which
		* means pba_ptr is actually our second data word for the PBA number
		* and we can decode it into an ascii string
		*/
		if (data != TXGBE_PBANUM_PTR_GUARD) {
		wx_err(wx, "NVM PBA number is not stored as string\n");

		/* we will need 11 characters to store the PBA */
		if (pba_num_size < 11) {
		wx_err(wx, "PBA string buffer too small\n");
		return -ENOMEM;
		}

		/* extract hex string from data and pba_ptr */
		pba_num[0] = (data >> 12) & 0xF;
		pba_num[1] = (data >> 8) & 0xF;
		pba_num[2] = (data >> 4) & 0xF;
		pba_num[3] = data & 0xF;
		pba_num[4] = (pba_ptr >> 12) & 0xF;
		pba_num[5] = (pba_ptr >> 8) & 0xF;
		pba_num[6] = '-';
		pba_num[7] = 0;
		pba_num[8] = (pba_ptr >> 4) & 0xF;
		pba_num[9] = pba_ptr & 0xF;

		/* put a null character on the end of our string */
		pba_num[10] = '\0';

		/* switch all the data but the '-' to hex char */
		for (offset = 0; offset < 10; offset++) {
		if (pba_num[offset] < 0xA)
		pba_num[offset] += '0';
		else if (pba_num[offset] < 0x10)
		pba_num[offset] += 'A' - 0xA;
		}

		return 0;
		}

		ret_val = wx_read_ee_hostif(wx, pba_ptr, &length);
		if (ret_val != 0) {
		wx_err(wx, "NVM Read Error\n");
		return ret_val;
		}

		if (length == 0xFFFF \|\| length == 0) {
		wx_err(wx, "NVM PBA number section invalid length\n");
		return -EINVAL;
		}

		/* check if pba_num buffer is big enough */
		if (pba_num_size < (((u32)length * 2) - 1)) {
		wx_err(wx, "PBA string buffer too small\n");
		return -ENOMEM;
		}

		/* trim pba length from start of string */
		pba_ptr++;
		length--;

		for (offset = 0; offset < length; offset++) {
		ret_val = wx_read_ee_hostif(wx, pba_ptr + offset, &data);
		if (ret_val != 0) {
		wx_err(wx, "NVM Read Error\n");
		return ret_val;
		}
		pba_num[offset * 2] = (u8)(data >> 8);
		pba_num[(offset * 2) + 1] = (u8)(data & 0xFF);
		}
		pba_num[offset * 2] = '\0';

		return 0;
		}

		/**
		* txgbe_calc_eeprom_checksum - Calculates and returns the checksum
		* @wx: pointer to hardware structure

drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@

		int txgbe_disable_sec_tx_path(struct wx *wx);
		void txgbe_enable_sec_tx_path(struct wx *wx);
		int txgbe_read_pba_string(struct wx wx, u8 pba_num, u32 pba_num_size);
		int txgbe_validate_eeprom_checksum(struct wx wx, u16 checksum_val);
		int txgbe_reset_hw(struct wx *wx);

drivers/net/ethernet/wangxun/txgbe/txgbe_main.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -538,7 +538,6 @@ static int txgbe_probe(struct pci_dev *pdev,
		u16 eeprom_verh = 0, eeprom_verl = 0, offset = 0;
		u16 eeprom_cfg_blkh = 0, eeprom_cfg_blkl = 0;
		u16 build = 0, major = 0, patch = 0;
		u8 part_str[TXGBE_PBANUM_LENGTH];
		u32 etrack_id = 0;

		err = pci_enable_device_mem(pdev);
		@@ -737,13 +736,6 @@ static int txgbe_probe(struct pci_dev *pdev,
		else
		dev_warn(&pdev->dev, "Failed to enumerate PF devices.\n");

		/* First try to read PBA as a string */
		err = txgbe_read_pba_string(wx, part_str, TXGBE_PBANUM_LENGTH);
		if (err)
		strncpy(part_str, "Unknown", TXGBE_PBANUM_LENGTH);

		netif_info(wx, probe, netdev, "%pM\n", netdev->dev_addr);

		return 0;

		err_remove_phy:

drivers/net/ethernet/wangxun/txgbe/txgbe_type.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -88,9 +88,6 @@
		#define TXGBE_XPCS_IDA_ADDR 0x13000
		#define TXGBE_XPCS_IDA_DATA 0x13004

		/* Part Number String Length */
		#define TXGBE_PBANUM_LENGTH 32

		/* Checksum and EEPROM pointers */
		#define TXGBE_EEPROM_LAST_WORD 0x800
		#define TXGBE_EEPROM_CHECKSUM 0x2F
		@@ -98,9 +95,6 @@
		#define TXGBE_EEPROM_VERSION_L 0x1D
		#define TXGBE_EEPROM_VERSION_H 0x1E
		#define TXGBE_ISCSI_BOOT_CONFIG 0x07
		#define TXGBE_PBANUM0_PTR 0x05
		#define TXGBE_PBANUM1_PTR 0x06
		#define TXGBE_PBANUM_PTR_GUARD 0xFAFA

		#define TXGBE_MAX_MSIX_VECTORS 64
		#define TXGBE_MAX_FDIR_INDICES 63