Mercurial > illumos > illumos-gate
changeset 13546:6d7e5def82fb
1886 intel_nb5000 may erroneously decide DIMMs aren't present
Reviewed by: Garrett D'Amore <garrett@nexenta.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
| author | Richard Lowe <richlowe@richlowe.net> |
|---|---|
| date | Sun, 15 May 2011 23:09:23 +0100 |
| parents | b35304501ec3 |
| children | 7d365d7822b1 |
| files | usr/src/uts/intel/io/intel_nb5000/nb5000.h usr/src/uts/intel/io/intel_nb5000/nb5000_init.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/intel/io/intel_nb5000/nb5000.h Fri Dec 16 15:38:30 2011 +1100 +++ b/usr/src/uts/intel/io/intel_nb5000/nb5000.h Sun May 15 23:09:23 2011 +0100 @@ -68,8 +68,8 @@ #define TLOW_MAX 0x100000000ULL #define MTR_PRESENT(mtr) \ - ((mtr) & (nb_chipset == INTEL_NB_5400 || nb_chipset == INTEL_NB_5100 ? \ - 0x0400 : 0x0100)) + (((mtr) & (nb_chipset == INTEL_NB_5400 || nb_chipset == INTEL_NB_5100) \ + ? 0x0400 : 0x0100) != 0) #define MTR_ETHROTTLE(mtr) \ ((mtr) & (nb_chipset == INTEL_NB_5400 || nb_chipset == INTEL_NB_5100 ? \ ? 0x0200 : 0x0080))
--- a/usr/src/uts/intel/io/intel_nb5000/nb5000_init.c Fri Dec 16 15:38:30 2011 +1100 +++ b/usr/src/uts/intel/io/intel_nb5000/nb5000_init.c Sun May 15 23:09:23 2011 +0100 @@ -389,7 +389,7 @@ return (B_FALSE); rc = (t & 0xf) == SPD_DDR2; } else { - rc = MTR_PRESENT(MTR_RD(channel, dimm)) != 0; + rc = MTR_PRESENT(MTR_RD(channel, dimm)); } return (rc);