Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 960aee6c authored by Hayes Wang's avatar Hayes Wang Committed by Francois Romieu
Browse files

r8169: support new firmware format. 



The new firmware format adds versioning as firmware for a specific
chipset appears to be subject to change. Current "legacy" format is
still supported.

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
parent 1c361efb

drivers/net/r8169.c

+35 −1
Original line number Diff line number Diff line
@@ -1754,18 +1754,52 @@ static void rtl_writephy_batch(struct rtl8169_private *tp, 
#define PHY_DELAY_MS		0xe0000000

#define PHY_WRITE_ERI_WORD	0xf0000000



struct fw_info {

	u32	magic;

	char	version[RTL_VER_SIZE];

	__le32	fw_start;

	__le32	fw_len;

	u8	chksum;

} __packed;



#define FW_OPCODE_SIZE	sizeof(typeof(*((struct rtl_fw_phy_action *)0)->code))



static bool rtl_fw_format_ok(struct rtl8169_private *tp, struct rtl_fw *rtl_fw)

{

	const struct firmware *fw = rtl_fw->fw;

	struct fw_info *fw_info = (struct fw_info *)fw->data;

	struct rtl_fw_phy_action *pa = &rtl_fw->phy_action;

	char *version = rtl_fw->version;

	bool rc = false;



	if (fw->size < FW_OPCODE_SIZE)

		goto out;

	else {



	if (!fw_info->magic) {

		size_t i, size, start;

		u8 checksum = 0;



		if (fw->size < sizeof(*fw_info))

			goto out;



		for (i = 0; i < fw->size; i++)

			checksum += fw->data[i];

		if (checksum != 0)

			goto out;



		start = le32_to_cpu(fw_info->fw_start);

		if (start > fw->size)

			goto out;



		size = le32_to_cpu(fw_info->fw_len);

		if (size > (fw->size - start) / FW_OPCODE_SIZE)

			goto out;



		memcpy(version, fw_info->version, RTL_VER_SIZE);



		pa->code = (__le32 *)(fw->data + start);

		pa->size = size;

	} else {

		if (fw->size % FW_OPCODE_SIZE)

			goto out;