Commit 6c8e2407 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Jakub Kicinski
Browse files

net: phy: aquantia: switch to crc_itu_t() 



After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/phy/aquantia/aquantia_firmware.c: In function 'aqr_fw_load_memory':
drivers/net/phy/aquantia/aquantia_firmware.c:135:23: error: implicit declaration of function 'crc_ccitt_false'; did you mean 'crc_ccitt_byte'? [-Werror=implicit-function-declaration]
  135 |                 crc = crc_ccitt_false(crc, crc_data, sizeof(crc_data));
      |                       ^~~~~~~~~~~~~~~
      |                       crc_ccitt_byte

Caused by commit e93984eb ("net: phy: aquantia: add firmware load support")
interacting with commit ("lib: crc_ccitt_false() is identical to crc_itu_t()")
from the mm tree.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20231221130946.7ed9a805@canb.auug.org.au


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 63c7234f

drivers/net/phy/aquantia/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config AQUANTIA_PHY

	tristate "Aquantia PHYs"

	select CRC_CCITT

	select CRC_ITU_T

	help

	  Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405

drivers/net/phy/aquantia/aquantia_firmware.c

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <linux/bitfield.h>

#include <linux/of.h>

#include <linux/firmware.h>

#include <linux/crc-ccitt.h>

#include <linux/crc-itu-t.h>

#include <linux/nvmem-consumer.h>



#include <asm/unaligned.h>
@@ -132,7 +132,7 @@ static int aqr_fw_load_memory(struct phy_device *phydev, u32 addr, 
		crc_data[3] = word;



		/* ...calculate CRC as we load data... */

		crc = crc_ccitt_false(crc, crc_data, sizeof(crc_data));

		crc = crc_itu_t(crc, crc_data, sizeof(crc_data));

	}

	/* ...gets CRC from MAILBOX after we have loaded the entire section... */

	up_crc = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_MAILBOX_INTERFACE2);
@@ -164,7 +164,7 @@ static int aqr_fw_boot(struct phy_device *phydev, const u8 *data, size_t size, 
		phydev_err(phydev, "bad firmware CRC in firmware\n");

		return ret;

	}

	calculated_crc = crc_ccitt_false(0, data, size - sizeof(u16));

	calculated_crc = crc_itu_t(0, data, size - sizeof(u16));

	if (read_crc != calculated_crc) {

		phydev_err(phydev, "bad firmware CRC: file 0x%04x calculated 0x%04x\n",

			   read_crc, calculated_crc);