Commit d7eb50c0 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville

p54: improve eeprom parser

Like other vendors, p54* devices have a checksum for
the EEPROM descriptor data. This patch enhances the
parser code to generate and verify the data fields,
before initializing the radio-chip on the card.

Note:
	If you have to bootstrap an alternative EEPROM image
	for your device and you don't know how to generate a
	valid crc ccitt checksum, you should take a look at:
	http://git.kernel.org/?p=linux/kernel/git/chr/p54tools.git

	The "checksum" utility loads a binary p54 EEPROM blob
	(use the -f switch, to skip the check) and applies
	the correct crc automatically.
Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b9c06659
...@@ -2,6 +2,7 @@ config P54_COMMON ...@@ -2,6 +2,7 @@ config P54_COMMON
tristate "Softmac Prism54 support" tristate "Softmac Prism54 support"
depends on MAC80211 && EXPERIMENTAL depends on MAC80211 && EXPERIMENTAL
select FW_LOADER select FW_LOADER
select CRC_CCITT
---help--- ---help---
This is common code for isl38xx/stlc45xx based modules. This is common code for isl38xx/stlc45xx based modules.
This module does nothing by itself - the USB/PCI/SPI front-ends This module does nothing by itself - the USB/PCI/SPI front-ends
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <net/mac80211.h> #include <net/mac80211.h>
#include <linux/crc-ccitt.h>
#include "p54.h" #include "p54.h"
#include "eeprom.h" #include "eeprom.h"
...@@ -540,6 +541,7 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) ...@@ -540,6 +541,7 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
int err; int err;
u8 *end = (u8 *)eeprom + len; u8 *end = (u8 *)eeprom + len;
u16 synth = 0; u16 synth = 0;
u16 crc16 = ~0;
wrap = (struct eeprom_pda_wrap *) eeprom; wrap = (struct eeprom_pda_wrap *) eeprom;
entry = (void *)wrap->data + le16_to_cpu(wrap->len); entry = (void *)wrap->data + le16_to_cpu(wrap->len);
...@@ -655,16 +657,29 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) ...@@ -655,16 +657,29 @@ int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
} }
break; break;
case PDR_END: case PDR_END:
/* make it overrun */ crc16 = ~crc_ccitt(crc16, (u8 *) entry, sizeof(*entry));
entry_len = len; if (crc16 != le16_to_cpup((__le16 *)entry->data)) {
wiphy_err(dev->wiphy, "eeprom failed checksum "
"test!\n");
err = -ENOMSG;
goto err;
} else {
goto good_eeprom;
}
break; break;
default: default:
break; break;
} }
entry = (void *)entry + (entry_len + 1)*2; crc16 = crc_ccitt(crc16, (u8 *)entry, (entry_len + 1) * 2);
entry = (void *)entry + (entry_len + 1) * 2;
} }
wiphy_err(dev->wiphy, "unexpected end of eeprom data.\n");
err = -ENODATA;
goto err;
good_eeprom:
if (!synth || !priv->iq_autocal || !priv->output_limit || if (!synth || !priv->iq_autocal || !priv->output_limit ||
!priv->curve_data) { !priv->curve_data) {
wiphy_err(dev->wiphy, wiphy_err(dev->wiphy,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment