git.openwrt.org Git - openwrt/staging/linusw.git/blob

   1 From d55a52ccf8f80cdf51af2c5c6e56c825f98c4f85 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   3 Date: Thu, 2 Apr 2015 09:13:49 +0200
   4 Subject: [PATCH] MIPS: BCM47xx: Add generic function filling SPROM entries
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Handling many SPROM revisions became messy, we have tons of functions
  10 specific to various revision groups which are quite hard to track.
  11 For years there is yet another revision 11 asking for support, but
  12 adding it in current the form would make things even worse.
  13 To resolve this problem let's add new function with table-like entries
  14 that will contain revision bitmask for every SPROM variable.
  15
  16 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  17 Cc: linux-mips@linux-mips.org
  18 Cc: Hauke Mehrtens <hauke@hauke-m.de>
  19 Cc: Jonas Gorski <jonas.gorski@gmail.com>
  20 Patchwork: https://patchwork.linux-mips.org/patch/9659/
  21 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  22 ---
  23  arch/mips/bcm47xx/sprom.c | 32 +++++++++++++++++++++++++++++---
  24  1 file changed, 29 insertions(+), 3 deletions(-)
  25
  26 diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
  27 index 5d32afc..77790c9 100644
  28 --- a/arch/mips/bcm47xx/sprom.c
  29 +++ b/arch/mips/bcm47xx/sprom.c
  30 @@ -180,6 +180,33 @@ static void nvram_read_alpha2(const char *prefix, const char *name,
  31         memcpy(val, buf, 2);
  32  }
  33
  34 +/* This is one-function-only macro, it uses local "sprom" variable! */
  35 +#define ENTRY(_revmask, _type, _prefix, _name, _val, _allset, _fallback) \
  36 +       if (_revmask & BIT(sprom->revision)) \
  37 +               nvram_read_ ## _type(_prefix, NULL, _name, &sprom->_val, \
  38 +                                    _allset, _fallback)
  39 +/*
  40 + * Special version of filling function that can be safely called for any SPROM
  41 + * revision. For every NVRAM to SPROM mapping it contains bitmask of revisions
  42 + * for which the mapping is valid.
  43 + * It obviously requires some hexadecimal/bitmasks knowledge, but allows
  44 + * writing cleaner code (easy revisions handling).
  45 + * Note that while SPROM revision 0 was never used, we still keep BIT(0)
  46 + * reserved for it, just to keep numbering sane.
  47 + */
  48 +static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom,
  49 +                                   const char *prefix, bool fallback)
  50 +{
  51 +       const char *pre = prefix;
  52 +       bool fb = fallback;
  53 +
  54 +       ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
  55 +       ENTRY(0xfffffffe, u16, pre, "boardnum", board_num, 0, fb);
  56 +
  57 +       /* TODO: Move more mappings here */
  58 +}
  59 +#undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
  60 +
  61  static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
  62                                         const char *prefix, bool fallback)
  63  {
  64 @@ -714,9 +741,6 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
  65  static void bcm47xx_fill_board_data(struct ssb_sprom *sprom, const char *prefix,
  66                                     bool fallback)
  67  {
  68 -       nvram_read_u16(prefix, NULL, "boardrev", &sprom->board_rev, 0, true);
  69 -       nvram_read_u16(prefix, NULL, "boardnum", &sprom->board_num, 0,
  70 -                      fallback);
  71         nvram_read_u16(prefix, NULL, "boardtype", &sprom->board_type, 0, true);
  72         nvram_read_u32_2(prefix, "boardflags", &sprom->boardflags_lo,
  73                          &sprom->boardflags_hi, fallback);
  74 @@ -787,6 +811,8 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
  75                 bcm47xx_fill_sprom_r12389(sprom, prefix, fallback);
  76                 bcm47xx_fill_sprom_r1(sprom, prefix, fallback);
  77         }
  78 +
  79 +       bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
  80  }
  81
  82  #ifdef CONFIG_BCM47XX_SSB
  83 --
  84 1.8.4.5
  85