On Tue, Apr 27, 2021 at 10:58:07AM +0200, Daniel Vetter wrote: > On Mon, Apr 26, 2021 at 08:18:39PM +0300, Ville Syrjälä wrote: > > On Mon, Apr 26, 2021 at 06:08:59PM +0200, Daniel Vetter wrote: > > > On Thu, Apr 22, 2021 at 04:11:22PM +0300, Ville Syrjälä wrote: > > > > On Thu, Apr 22, 2021 at 11:49:43AM +0200, Daniel Vetter wrote: > > > > > On Wed, Apr 21, 2021 at 06:34:01PM +0300, Ville Syrjala wrote: > > > > > > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > > > > > > > > > > Currently we try to detect a symmetric memory configurations > > > > > > using a magic DCC2_MODIFIED_ENHANCED_DISABLE bit. That bit is > > > > > > either only set on a very specific subset of machines or it > > > > > > just does not exist (it's not mentioned in any public chipset > > > > > > datasheets I've found). As it happens my CL/CTG machines never > > > > > > set said bit, even if I populate the channels with identical > > > > > > sticks. > > > > > > > > > > > > So let's do the L-shaped memory detection the same way as the > > > > > > desktop variants, ie. just look at the DRAM rank boundary > > > > > > registers to see if both channels have an identical size. > > > > > > > > > > > > With this my CL/CTG no longer claim L-shaped memory when I use > > > > > > identical sticks. Also tested with non-matching sticks just to > > > > > > make sure the L-shaped memory is still properly detected. > > > > > > > > > > > > And for completeness let's update the debugfs code to dump > > > > > > the correct set of registers on each platform. > > > > > > > > > > > > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > > > > > > > > > Did you check this with the swapping igt? I have some vague memories of > > > > > bug reports where somehow the machine was acting like it's L-shaped memory > > > > > despite that banks were populated equally. I've iirc tried all kinds of > > > > > tricks to figure it out, all to absolutely no avail. > > > > > > > > Did you have a specific test in mind? I ran a bunch of things > > > > that seemed swizzle related. All passed just fine. > > > > > > gem_tiled_swapping should be the one. It tries to cycle your entire system > > > memory through tiled buffers into swap and out of it. > > > > Passes with symmetric config, fails with L-shaped config (if I hack > > out the L-shape detection of course). So seems pretty solid. > > > > A kernel based self test that looks at the physical address would > > still be nice I suppose. Though depending on the size of your RAM > > sticks figuring out where exactly the switchover from two channels > > to one channels happens probably requires a bit of work due to > > the PCI hole/etc. > > > > Both my cl and ctg report this btw: > > bit6 swizzle for X-tiling = bit9/bit10/bit11 > > bit6 swizzle for Y-tiling = bit9/bit11 > > so unfortunately can't be sure the other swizzle modes would be > > correctly detected. > > I think testing-wise this is as good as it gets. So what do we think about putting this in? Currently this only works by sheer luck more or less. On my machines we have a false positive which is safe now that the pin quirk got fixed, but if some other machines have a false negative then things are not going to go so well. -- Ville Syrjälä Intel
