Bug#1100153: linux: hangs on resume from suspend or hibernation with 6.12-6.13 on ThinkPad X1 Carbon Gen 10

[Salvatore Bonaccorso <carnil@debian.org>]

Hi Brian,

On Mon, Mar 31, 2025 at 05:47:16PM +0200, Uwe Kleine-König wrote:
> Hello brian,
> 
> On Sat, Mar 15, 2025 at 10:35:37PM +0000, brian m. carlson wrote:
> > On 2025-03-15 at 15:11:07, Salvatore Bonaccorso wrote:
> > > Okay that is already great, thank you for the time.
> > > 
> > > Now the next would in this case be ideally to bisect mainline between
> > > v6.10 and v6.11-rc4 to identify the commit. On each step to build a
> > > deb package for the kernel are hilighted at:
> > > https://wiki.debian.org/DebianKernel/GitBisect
> > 
> > These directions were very helpful in compiling a kernel.
> > Unfortunately, it led to some unusual results.
> > 
> > The first step in the bisect was to try the merge base, which was 6.10,
> > which was bad, at which point Git refused to continue because the
> > problem had been fixed on the v6.10 branch.
> 
> Can you try a vanilla 6.10.12 to confirm that there was a fix on the
> v6.10.x branch? If so, it would be interesting to know which commit
> fixed the issue for you. You can bisect that; I'd recommend something
> like
> 
> 	git bisect start --term-new=fine --term-old=broken v6.10.12 v6.10
> 
> to reduce the confusion.
> 
> > So I thought I'd try Debian's 6.9.2, which worked.  Then I tried
> > upstream 6.9, which also failed.  To verify, I tried upstream 6.9.2,
> > which failed as well.
> 
> Huh, this is surprising. Can you try to import the Debian patchstack
> from 6.9.2 onto 6.9.2 and bisect in that one to find the fixing commit?
> 
> > Note that I used `make oldddefconfig` with Debian's config to configure
> > the kernel, stepping back from v6.11-rc4, so it's nearly identical to
> > the Debian kernel (it's not signed and it doesn't have debug info, but
> > otherwise it should be pretty much the same.  In all cases, the tooling
> > is whatever's in Debian unstable at the moment.
> 
> Using `make oldddefconfig` is unstable when going up and down in the git
> history. A more suiteable approach is:
> 
> 	cp .config arch/x86/configs/brian_defconfig
> 
> and then use `make brian_defconfig` instead of `make oldconfig` in each
> step.
> 
> > My conclusion is thus that Debian includes some patch in the 6.9 and
> > 6.10 series that fixes suspend and hibernate, but that patch is not
> > included in 6.11 and newer.
> 
> I look forward to your test results. Your findings are really strange.

Did you had a chance to do further investigation here?

Regards,
Salvatore