Author: juhosg Date: 2015-04-07 22:03:35 +0200 (Tue, 07 Apr 2015) New Revision: 45297
Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.h trunk/target/linux/ar71xx/mikrotik/config-default trunk/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch Log: ar71xx: routerboot: add support for extended radio data On newer Mikrotik boards, the radio calibration data is stored differently and uses LZO compression instead of RLE. Update the RouterBOOT helper code to support the new format. Signed-off-by: Gabor Juhos <[email protected]> Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c 2015-04-07 20:03:24 UTC (rev 45296) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.c 2015-04-07 20:03:35 UTC (rev 45297) @@ -15,11 +15,13 @@ #include <linux/errno.h> #include <linux/routerboot.h> #include <linux/rle.h> +#include <linux/lzo.h> #include "routerboot.h" #define RB_BLOCK_SIZE 0x1000 #define RB_ART_SIZE 0x10000 +#define RB_MAGIC_ERD 0x00455244 /* extended radio data */ static struct rb_info rb_info; @@ -63,6 +65,7 @@ u8 **tag_data, u16 *tag_len) { uint32_t magic; + bool align = false; int ret; if (buflen < 4) @@ -70,6 +73,9 @@ magic = get_u32(buf); switch (magic) { + case RB_MAGIC_ERD: + align = true; + /* fall trough */ case RB_MAGIC_HARD: /* skip magic value */ buf += 4; @@ -121,6 +127,9 @@ break; } + if (align) + len = (len + 3) / 4; + buf += len; buflen -= len; } @@ -168,13 +177,16 @@ return get_u32(tag); } -__init void * -rb_get_wlan_data(void) +static void * __init +__rb_get_wlan_data(u16 id) { u16 tag_len; u8 *tag; void *buf; int err; + u32 magic; + size_t src_done; + size_t dst_done; err = rb_find_hard_cfg_tag(RB_ID_WLAN_DATA, &tag, &tag_len); if (err) { @@ -188,11 +200,38 @@ goto err; } - err = rle_decode((char *) tag, tag_len, buf, RB_ART_SIZE, - NULL, NULL); - if (err) { - pr_err("unable to decode calibration data\n"); - goto err_free; + magic = get_u32(tag); + if (magic == RB_MAGIC_ERD) { + u8 *erd_data; + u16 erd_len; + + if (id == 0) + goto err_free; + + err = routerboot_find_tag(tag, tag_len, id, + &erd_data, &erd_len); + if (err) { + pr_err("no ERD data found for id %u\n", id); + goto err_free; + } + + dst_done = RB_ART_SIZE; + err = lzo1x_decompress_safe(erd_data, erd_len, buf, &dst_done); + if (err) { + pr_err("unable to decompress calibration data %d\n", + err); + goto err_free; + } + } else { + if (id != 0) + goto err_free; + + err = rle_decode((char *) tag, tag_len, buf, RB_ART_SIZE, + &src_done, &dst_done); + if (err) { + pr_err("unable to decode calibration data\n"); + goto err_free; + } } return buf; @@ -203,6 +242,18 @@ return NULL; } +__init void * +rb_get_wlan_data(void) +{ + return __rb_get_wlan_data(0); +} + +__init void * +rb_get_ext_wlan_data(u16 id) +{ + return __rb_get_wlan_data(id); +} + __init const struct rb_info * rb_init_info(void *data, unsigned int size) { Modified: trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.h =================================================================== --- trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.h 2015-04-07 20:03:24 UTC (rev 45296) +++ trunk/target/linux/ar71xx/files/arch/mips/ath79/routerboot.h 2015-04-07 20:03:35 UTC (rev 45297) @@ -24,6 +24,7 @@ #ifdef CONFIG_ATH79_ROUTERBOOT const struct rb_info *rb_init_info(void *data, unsigned int size); void *rb_get_wlan_data(void); +void *rb_get_ext_wlan_data(u16 id); int routerboot_find_tag(u8 *buf, unsigned int buflen, u16 tag_id, u8 **tag_data, u16 *tag_len); @@ -40,6 +41,11 @@ return NULL; } +static inline void *rb_get_wlan_data(u16 id) +{ + return NULL; +} + static inline int routerboot_find_tag(u8 *buf, unsigned int buflen, u16 tag_id, u8 **tag_data, u16 *tag_len) Modified: trunk/target/linux/ar71xx/mikrotik/config-default =================================================================== --- trunk/target/linux/ar71xx/mikrotik/config-default 2015-04-07 20:03:24 UTC (rev 45296) +++ trunk/target/linux/ar71xx/mikrotik/config-default 2015-04-07 20:03:35 UTC (rev 45297) @@ -124,6 +124,7 @@ CONFIG_GPIO_LATCH=y # CONFIG_JFFS2_FS is not set CONFIG_LEDS_RB750=y +CONFIG_LZO_DECOMPRESS=y CONFIG_MDIO_BITBANG=y CONFIG_MDIO_GPIO=y # CONFIG_MTD_CFI is not set Modified: trunk/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch =================================================================== --- trunk/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch 2015-04-07 20:03:24 UTC (rev 45296) +++ trunk/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch 2015-04-07 20:03:35 UTC (rev 45297) @@ -1379,11 +1379,12 @@ def_bool n config ATH79_DEV_GPIO_BUTTONS -@@ -154,6 +1226,10 @@ config ATH79_PCI_ATH9K_FIXUP +@@ -154,6 +1226,11 @@ config ATH79_PCI_ATH9K_FIXUP def_bool n config ATH79_ROUTERBOOT + select RLE_DECOMPRESS ++ select LZO_DECOMPRESS + def_bool n + +config PCI_AR724X _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
