head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.100 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.98 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.96 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.94 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.92 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.90 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.88 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.86 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.84 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.82 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.80 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.78 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.76 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.74 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.72 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.70 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.68 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.66 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.64 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.62 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.60 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.58 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.56 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.52 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.32 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.54 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.50 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.48 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.46 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.44 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.42 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.40 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.38 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.36 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.34 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.30 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.28 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.26 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.24 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.22 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.20 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.18 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.16 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.14 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.12 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.10 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.8 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.6 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.4 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.2 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.4.0.32 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.30 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.28 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.26 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.24 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.22 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.20 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.18 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.16 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.14 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.12 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.10 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.8 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.6 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.4 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.3.0.8 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.6 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.4 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.2.0.12 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.10 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.8 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.6 pkgsrc-2008Q1:1.2.0.4 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.2 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.1.0.8 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.6 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.4 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.5 date 2013.12.08.00.35.28; author jakllsch; state Exp; branches; next 1.4; commitid v90ZiqtTn54unggx; 1.4 date 2009.11.24.17.20.40; author jakllsch; state Exp; branches; next 1.3; 1.3 date 2008.11.24.04.06.00; author smb; state Exp; branches; next 1.2; 1.2 date 2007.12.30.18.40.53; author mlelstv; state Exp; branches; next 1.1; 1.1 date 2006.10.24.18.00.06; author smb; state Exp; branches; next ; desc @@ 1.5 log @Update memtest86+ to 5.01. upstream changes: Enhancements in v5.01: New Features Added support for up to 2 TB of RAM on X64 CPUs Added experimental SMT support up to 32 cores (Press F2 to enable at startup) Added complete detection for memory controllers Added Motherboard Manufacturer & Model reporting Added CPU temperature reporting Added enhanced Fail Safe Mode (Press F1 at startup) Added support for Intel "Sandy Bridge-E" CPUs Added support for Intel "Ivy Bridge" CPUs Added preliminary support for Intel "Haswell" CPUs (Core 4th Gen) Added preliminary support for Intel "Haswell-ULT" CPUs Added support for AMD "Kabini" (K16) CPUs Added support for AMD "Bulldozer" CPUs Added support for AMD "Trinity" CPUs Added support for AMD E-/C-/G-/Z- "Bobcat" CPUs Added support for Intel Atom "Pineview" CPUs Added support for Intel Atom "Cedar Trail" CPUs Added SPD detection on most AMD Chipsets Bug Fixes Enforced Coreboot support Optimized run time for faster memory error detection Rewriten lots of memory timings detection cod Corrected bugs, bugs and more bugs (some could remain) @ text @$NetBSD: patch-ab,v 1.4 2009/11/24 17:20:40 jakllsch Exp $ --- test.c.orig 2013-08-10 02:29:44.000000000 +0000 +++ test.c @@@@ -14,7 +14,6 @@@@ #include "stdint.h" #include "cpuid.h" #include "smp.h" -#include extern struct cpu_ident cpu_id; extern volatile int mstr_cpu; @@@@ -29,6 +28,36 @@@@ void rand_seed( unsigned int seed1, unsi ulong rand(int me); void poll_errors(); +static inline void outb(unsigned char value, unsigned short int port) +{ + asm __volatile__ ( + "outb %b0,%w1\n\t" + : :"a" (value), "Nd" (port) + ); +} + +static __inline void outb_p(unsigned char value, unsigned short int port) +{ + asm __volatile__ ( + "outb %b0,%w1\n\t" + "outb %%al,$0x80\n\t" + : : "a" (value), "Nd" (port) + ); +} + +static __inline unsigned char inb_p(unsigned short int port) +{ + unsigned char v; + + asm __volatile__ ( + "inb %w1,%0\n\t" + "outb %%al,$0x80\n\t" + : "=a" (v) + : "Nd" (port) + ); + return v; +} + static inline ulong roundup(ulong value, ulong mask) { return (value + mask) & ~mask; @ 1.4 log @Update memtestplus to 4.00. (With permission from smb@@.) Changes since 2.10: Enhancements in v4.00: * New Features - Major Architectural changes - First pass twice faster (reduced iterations) - Detect DDR2/3 brands and part numbers on Intel DDR2/3 chipsets - Added detection for Intel "Clarkdale" CPU - Added detection for Intel "Gulftown" CPU - Added detection for AMD "Magny-Cours" CPU - Added detection for Intel XMP Memory - Added for CPU w/ 0.5/1.5/3/6/12/16/18/24MB L3 - Added "clean" DMI detection for DDR3/FBDIMM2 - Better detection of Integrated Memory Controllers * Bug Fixes - Corrected detection for Intel "Lynnfield" CPU - Corrected detection for AMD 45nm K10 CPU - Solved crash with AMD Geode LX - Complies with SMBIOS 2.6.1 specs - Fixed compilation issues with gcc 4.2+ - Many others bug fixes Memtest86+ "3.00" was skipped and renamed 4.00 in order to avoid confusion with the original Memtest. Enhancements in v2.11 : - Added support for Intel Core i5 (Lynnfield) CPU - Added support for Intel P55 Southbridge - Added support for Intel PM45/GM45/GM47 Mobile chipset - Added support for Intel GL40/GS45 Mobile chipset - Corrected DDR2/DDR3 detection on Intel x35/x45 - Corrected detection on some Core i7 CPU - Fixed a bug with some AMI BIOS (freeze at startup) - Various bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2008/11/24 04:06:00 smb Exp $ d3 1 a3 1 --- test.c.orig 2009-09-22 00:35:46.000000000 +0000 d5 5 a9 1 @@@@ -11,10 +11,32 @@@@ d11 5 a15 5 #include "test.h" #include "config.h" -#include #include "dmi.h" #include d17 1 a17 2 +static __inline void +pkg_outb (unsigned char value, unsigned short int port) d19 4 a22 1 + __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port)); d25 1 a25 2 +static __inline void +pkg_outb_p (unsigned char value, unsigned short int port) d27 5 a31 2 + __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value), + "Nd" (port)); d34 1 a34 2 +static __inline unsigned char +pkg_inb_p (unsigned short int port) d36 1 a36 1 + unsigned char _v; d38 7 a44 2 + __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; d47 3 a49 28 + extern int segs, bail; extern volatile ulong *p; extern ulong p1, p2; @@@@ -1414,18 +1436,18 @@@@ void beep(unsigned int frequency) unsigned int count = 1193180 / frequency; // Switch on the speaker - outb_p(inb_p(0x61)|3, 0x61); + pkg_outb_p(pkg_inb_p(0x61)|3, 0x61); // Set command for counter 2, 2 byte write - outb_p(0xB6, 0x43); + pkg_outb_p(0xB6, 0x43); // Select desired Hz - outb_p(count & 0xff, 0x42); - outb((count >> 8) & 0xff, 0x42); + pkg_outb_p(count & 0xff, 0x42); + pkg_outb((count >> 8) & 0xff, 0x42); // Block for 100 microseconds sleep(100, 1); // Switch off the speaker - outb(inb_p(0x61)&0xFC, 0x61); + pkg_outb(pkg_inb_p(0x61)&0xFC, 0x61); } @ 1.3 log @Upgrade to 2.10: *** Enhancements in v2.10 : *** * New Features o Added support for Intel Core i7 (Nehalem) CPU o Added support for Intel Atom Processors o Added support for Intel G41/G43/G45 Chipsets o Added support for Intel P43/P45 Chipsets o Added support for Intel US15W (Poulsbo) Chipset o Added support for Intel EP80579 (Tolapai) SoC CPU o Added support for ICH10 Southbridge (SPD/DMI) o Added detection for Intel 5000X o Now fully aware of CPU w/ L3 cache (Core i7 & K10) * Bug Fixes o Added workaround for DDR3 DMI detection o Fixed Intel 5000Z chipset detection o Fixed Memory Frequency on AMD K10 o Fixed cache detection on C7/Isaiah CPU o Fix Memtest86+ not recognized as Linux Kernel Enhancements in v2.01 : * Added support for i945GM/PM/GME & i946PL/GZ * Added support for iGM965/iGL960/iPM965/iGME965/iGLE960 * Added detection for SiS 649/656/671/672 * Added detection for i430MX/i430TX * Added an optional beep mode (pass completed w/o error) * Pass duration 20% reduced * Removed the blinking cursor * Reverted Test #0 to cached * Solved a major bug in Memory Address Errors Reporting * Patched for Intel-Powered Mac * Corrected Intel 3-Series (P35/X38) chipset init * Corrected a bug with SPD Display and ESB6300 * Correct a detection bug on P965/G965 C-Stepping * Solved a incoherency with pass progress indicator * Patched Makefile to compile on x86_64 * Bootable Memtest86+ ISO more compatible Enhancements in v2.00 : * Major Architectures changes * Modulo test now use random pattern for better accuracy * Added Advanced DMI Errors Reporting Mode * Added support for bus ratio changes on Intel Core CPU * Added support for non-integer bus ratio on latest Intel CPU * Added SPD Data Display for all Intel Chipsets (more to come) * Added serial support as a linux boot parameter (Thanks to Michal S.) * Added preliminary support for VIA CN Isaiah CPU * Added preliminary support for Intel Nehalem * Added support for VIA C7/C7-D/C7-M/Eden on Esther Core * Added support for AMD K10 (Phenom) CPU w/ timings detection * Added support for Intel Pentium E w/ 1 MB L2 Cache * Added support for Intel Core 2 45nm (Penryn) * Added support for FSB1333/FSB1600 Intel CPU * Added support for Intel 5400A/5400B w/ timings detection * Added support for Intel Q35/P35/G33/Q33 w/ timings detection * Added support for Intel X38/X48 w/ timings detection * Added preliminary support for Intel 5000P/V/Z * Removed on-fly memory timings change (unstable) * Numerous (really) bug fixes @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- test.c.orig 2008-11-23 21:19:09.000000000 -0500 +++ test.c 2008-11-23 21:22:18.000000000 -0500 @@@@ -11,9 +11,31 @@@@ d11 1 d39 1 a39 1 @@@@ -1407,18 +1429,18 @@@@ @ 1.2 log @Update to Version 1.70. Also rename the package option from memtesplus-* (sic!) to just iso and serialconsole. changes for the new version: - Added new DMI polling feature - Added Support for Core/Core2 Solo/Duo/Quad CPU - Added Support for AMD K8 with DDR2 Memory - Added Support for Intel CPU with 192/384 KB L2 Cache - Added Support for FB-DIMM based memory (DMI) - Added Detection for ALI CyberAladdin-T (M1644) - Added Detection for Turion 64 X2 - Added Detection for AMD K8 with unknown chipsets - Added Support for ATi Radeon xPress 3200 - Added Support for Intel i975X - Added Support for Intel Q965/P965 - Added Support for Intel Q963/Q965 @ text @d1 5 a5 3 --- test.c.orig 2007-01-04 06:43:54.000000000 +0000 +++ test.c 2007-12-08 13:08:18.000000000 +0000 @@@@ -11,9 +11,30 @@@@ d34 2 a35 2 extern int segs, bail, beepmode; d37 2 a38 1 @@@@ -1753,18 +1774,18 @@@@ @ 1.1 log @Add memtest+ 1.65 to pkgsrc, with options for serial console and .iso generation @ text @d1 3 a3 5 $NetBSD$ --- test.c.orig 2005-09-11 14:17:15.000000000 -0400 +++ test.c 2006-10-21 15:35:25.000000000 -0400 @@@@ -11,7 +11,29 @@@@ d8 2 a9 1 + a32 1 d34 2 a35 1 @@@@ -1741,18 +1763,18 @@@@ @