From owner-freebsd-current@FreeBSD.ORG Mon Feb 16 21:19:36 2015 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D52F7D0; Mon, 16 Feb 2015 21:19:36 +0000 (UTC) Received: from mail-qg0-x233.google.com (mail-qg0-x233.google.com [IPv6:2607:f8b0:400d:c04::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C1C3617B; Mon, 16 Feb 2015 21:19:35 +0000 (UTC) Received: by mail-qg0-f51.google.com with SMTP id z60so25162848qgd.10; Mon, 16 Feb 2015 13:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=lJt6ZiMb2JdtcBCtWCyAvgGWn2DqXVOAJtUK7bQkTII=; b=bzfLWV9iKrUwU48CnT5vwJNRybWSugnOHjYpv6+HUigKJyduUY1GKF/2s+m85Ud0GV JGPP7mN0BtBUdhGOrvUayOwlRMXInDRWsDYqseGNLQEbbeJ/8i9roHi2drRpBVbgQ/i9 mD93iTK66Ox7Zw+tF1DgN+Y+mcRy9EoC1AVw4dWKo/uXb2efWu9dvunWDZVOkfWoKdC4 4A4+EEXzzzPp0+QUbQql8izJOvsihzDRlO9xb1JzXti5a7ynYq8bZwDG6Ct7jkctM8BY w5Eq21HXgqJFTNl0pV77r8Z3cGLPwzzpLVdr/9wV95Hxra+0QxbKy9t5W8GvLMvRwVu/ p9+A== MIME-Version: 1.0 X-Received: by 10.140.95.179 with SMTP id i48mr193690qge.4.1424121574730; Mon, 16 Feb 2015 13:19:34 -0800 (PST) Received: by 10.140.27.138 with HTTP; Mon, 16 Feb 2015 13:19:34 -0800 (PST) In-Reply-To: <20150216095035.GG34251@kib.kiev.ua> References: <20150215151141.GB34251@kib.kiev.ua> <20150215185955.GC34251@kib.kiev.ua> <20150216095035.GG34251@kib.kiev.ua> Date: Mon, 16 Feb 2015 22:19:34 +0100 Message-ID: Subject: Re: Suspend/resume on i915 stop working between r278348 and r278741. From: "Ranjan1018 ." <214748mv@gmail.com> To: Konstantin Belousov Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: Adrian Chadd , FreeBSD CURRENT X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2015 21:19:36 -0000 2015-02-16 10:50 GMT+01:00 Konstantin Belousov : > On Sun, Feb 15, 2015 at 08:43:55PM +0100, Ranjan1018 . wrote: > > 2015-02-15 19:59 GMT+01:00 Konstantin Belousov : > > > > > On Sun, Feb 15, 2015 at 07:45:44PM +0100, Ranjan1018 . wrote: > > > > > > > > Unfortunately does not work for me. Tested with r278803. > > > > > > Does your machine resume if you boot with hw.x2apic_enable set to 0 > > > from the loader prompt ? > > > > Yes. I have added to it to loader.conf > > $ cat /boot/loader.conf | grep x2apic_enable > > hw.x2apic_enable=0 > > > > Confirm that x2apic is disabled after tunable > > > frobbing, with sysctl hw.apic.x2apic_mode. > > > > > $ sysctl hw.apic.x2apic_mode > > hw.apic.x2apic_mode: 0 > > And, does your machine resumed successfully with the tunable set ? > Yes. > > Below is the patch which seemingly worked for Gleb. > You should not set the tunable to test it properly. > > diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c > index 13c3d43..b767691 100644 > --- a/sys/amd64/amd64/mp_machdep.c > +++ b/sys/amd64/amd64/mp_machdep.c > @@ -1507,6 +1507,7 @@ cpususpend_handler(void) > vmm_resume_p(); > > /* Resume MCA and local APIC */ > + lapic_xapic_mode(); > mca_resume(); > lapic_setup(0); > > diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c > index 32b9540..a80de54 100644 > --- a/sys/i386/i386/mp_machdep.c > +++ b/sys/i386/i386/mp_machdep.c > @@ -1555,6 +1555,7 @@ cpususpend_handler(void) > cpu_ops.cpu_resume(); > > /* Resume MCA and local APIC */ > + lapic_xapic_mode(); > mca_resume(); > lapic_setup(0); > > diff --git a/sys/x86/acpica/acpi_wakeup.c b/sys/x86/acpica/acpi_wakeup.c > index 74522be..e652419 100644 > --- a/sys/x86/acpica/acpi_wakeup.c > +++ b/sys/x86/acpica/acpi_wakeup.c > @@ -270,6 +270,7 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, > int sleep_result, > initializecpu(); > PCPU_SET(switchtime, 0); > PCPU_SET(switchticks, ticks); > + lapic_xapic_mode(); > #ifdef SMP > if (!CPU_EMPTY(&suspcpus)) > acpi_wakeup_cpus(sc); > diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c > index 1809fa6..1b66674 100644 > --- a/sys/x86/x86/local_apic.c > +++ b/sys/x86/x86/local_apic.c > @@ -527,7 +527,6 @@ native_lapic_xapic_mode(void) > saveintr = intr_disable(); > if (x2apic_mode) > native_lapic_enable_x2apic(); > - native_lapic_disable(); > intr_restore(saveintr); > } > > Thank you Konstantin, it works for me too! I have commented 'hw.x2apic_enable=0' in /boot/loader.conf $ cat /boot/loader.conf | grep x2apic_enable #hw.x2apic_enable=0 the 2xapic result enabled $ sysctl hw.apic.x2apic_mode hw.apic.x2apic_mode: 1 and suspend/resume works again. Regards Maurizio