Frédéric Pierret
6 years ago
parent
b24683da20
commit
c138013c75
@ -1,94 +0,0 @@
|
||||
From 63e708f826bb21470155d37b103a75d8a9e25b18 Mon Sep 17 00:00:00 2001
|
||||
From: Prarit Bhargava <prarit@redhat.com>
|
||||
Date: Wed, 7 Feb 2018 18:49:23 -0500
|
||||
Subject: [PATCH] x86/xen: Calculate __max_logical_packages on PV domains
|
||||
|
||||
The kernel panics on PV domains because native_smp_cpus_done() is
|
||||
only called for HVM domains.
|
||||
|
||||
Calculate __max_logical_packages for PV domains.
|
||||
|
||||
Fixes: b4c0a7326f5d ("x86/smpboot: Fix __max_logical_packages estimate")
|
||||
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
|
||||
Tested-and-reported-by: Simon Gaiser <simon@invisiblethingslab.com>
|
||||
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: Ingo Molnar <mingo@redhat.com>
|
||||
Cc: "H. Peter Anvin" <hpa@zytor.com>
|
||||
Cc: x86@kernel.org
|
||||
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
||||
Cc: Juergen Gross <jgross@suse.com>
|
||||
Cc: Dou Liyang <douly.fnst@cn.fujitsu.com>
|
||||
Cc: Prarit Bhargava <prarit@redhat.com>
|
||||
Cc: Kate Stewart <kstewart@linuxfoundation.org>
|
||||
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Cc: Andy Lutomirski <luto@kernel.org>
|
||||
Cc: Andi Kleen <ak@linux.intel.com>
|
||||
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
|
||||
Cc: xen-devel@lists.xenproject.org
|
||||
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
||||
Signed-off-by: Juergen Gross <jgross@suse.com>
|
||||
---
|
||||
arch/x86/include/asm/smp.h | 1 +
|
||||
arch/x86/kernel/smpboot.c | 10 ++++++++--
|
||||
arch/x86/xen/smp.c | 2 ++
|
||||
3 files changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
|
||||
index 461f53d27708..a4189762b266 100644
|
||||
--- a/arch/x86/include/asm/smp.h
|
||||
+++ b/arch/x86/include/asm/smp.h
|
||||
@@ -129,6 +129,7 @@ static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)
|
||||
void cpu_disable_common(void);
|
||||
void native_smp_prepare_boot_cpu(void);
|
||||
void native_smp_prepare_cpus(unsigned int max_cpus);
|
||||
+void calculate_max_logical_packages(void);
|
||||
void native_smp_cpus_done(unsigned int max_cpus);
|
||||
void common_cpu_up(unsigned int cpunum, struct task_struct *tidle);
|
||||
int native_cpu_up(unsigned int cpunum, struct task_struct *tidle);
|
||||
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
|
||||
index cfc61e1d45e2..9eee25d07586 100644
|
||||
--- a/arch/x86/kernel/smpboot.c
|
||||
+++ b/arch/x86/kernel/smpboot.c
|
||||
@@ -1281,11 +1281,10 @@ void __init native_smp_prepare_boot_cpu(void)
|
||||
cpu_set_state_online(me);
|
||||
}
|
||||
|
||||
-void __init native_smp_cpus_done(unsigned int max_cpus)
|
||||
+void __init calculate_max_logical_packages(void)
|
||||
{
|
||||
int ncpus;
|
||||
|
||||
- pr_debug("Boot done\n");
|
||||
/*
|
||||
* Today neither Intel nor AMD support heterogenous systems so
|
||||
* extrapolate the boot cpu's data to all packages.
|
||||
@@ -1293,6 +1292,13 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
|
||||
ncpus = cpu_data(0).booted_cores * topology_max_smt_threads();
|
||||
__max_logical_packages = DIV_ROUND_UP(nr_cpu_ids, ncpus);
|
||||
pr_info("Max logical packages: %u\n", __max_logical_packages);
|
||||
+}
|
||||
+
|
||||
+void __init native_smp_cpus_done(unsigned int max_cpus)
|
||||
+{
|
||||
+ pr_debug("Boot done\n");
|
||||
+
|
||||
+ calculate_max_logical_packages();
|
||||
|
||||
if (x86_has_numa_in_package)
|
||||
set_sched_topology(x86_numa_in_package_topology);
|
||||
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
|
||||
index 77c959cf81e7..7a43b2ae19f1 100644
|
||||
--- a/arch/x86/xen/smp.c
|
||||
+++ b/arch/x86/xen/smp.c
|
||||
@@ -122,6 +122,8 @@ void __init xen_smp_cpus_done(unsigned int max_cpus)
|
||||
|
||||
if (xen_hvm_domain())
|
||||
native_smp_cpus_done(max_cpus);
|
||||
+ else
|
||||
+ calculate_max_logical_packages();
|
||||
|
||||
if (xen_have_vcpu_info_placement)
|
||||
return;
|
||||
--
|
||||
2.16.1
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From patchwork Mon Oct 16 14:48:55 2017
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: Input: synaptics - add Intertouch support on X1 Carbon 6th and X280
|
||||
From: Aaron Ma <aaron.ma@canonical.com>
|
||||
X-Patchwork-Id: 10008513
|
||||
Message-Id: <1508165335-16738-1-git-send-email-aaron.ma@canonical.com>
|
||||
To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
|
||||
dmitry.torokhov@gmail.com, aaron.ma@canonical.com
|
||||
Date: Mon, 16 Oct 2017 22:48:55 +0800
|
||||
|
||||
Synaptics devices reported it has Intertouch support,
|
||||
and it fails via PS/2 as following logs:
|
||||
|
||||
psmouse serio2: Failed to reset mouse on synaptics-pt/serio0
|
||||
psmouse serio2: Failed to enable mouse on synaptics-pt/serio0
|
||||
|
||||
Set these new devices to use SMBus to fix this issue,
|
||||
then they report SMBus version 3 is using,
|
||||
patch: https://patchwork.kernel.org/patch/9989547/ enabled SMBus ver 3 and
|
||||
makes synaptics devices work fine on SMBus mode.
|
||||
|
||||
Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
|
||||
---
|
||||
drivers/input/mouse/synaptics.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
|
||||
index 5af0b7d200bc..da3a5e40e80c 100644
|
||||
--- a/drivers/input/mouse/synaptics.c
|
||||
+++ b/drivers/input/mouse/synaptics.c
|
||||
@@ -173,6 +173,8 @@ static const char * const smbus_pnp_ids[] = {
|
||||
"LEN004a", /* W541 */
|
||||
"LEN0073", /* X1 Carbon 5 */
|
||||
"LEN200f", /* T450s */
|
||||
+ "LEN0092", /* X1 Carbon 6 */
|
||||
+ "LEN0096", /* X280 */
|
||||
"LEN2018", /* T460p */
|
||||
NULL
|
||||
};
|
||||
@ -1,28 +0,0 @@
|
||||
From patchwork Fri Oct 6 14:06:30 2017
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [v2,2/2] Input: synaptics - Lenovo X1 Carbon 5 should use SMBUS/RMI
|
||||
From: Yiannis Marangos <yiannis.marangos@gmail.com>
|
||||
X-Patchwork-Id: 9989549
|
||||
Message-Id: <20171006140630.6398-3-yiannis.marangos@gmail.com>
|
||||
To: linux-input@vger.kernel.org
|
||||
Cc: Yiannis Marangos <yiannis.marangos@gmail.com>
|
||||
Date: Fri, 6 Oct 2017 17:06:30 +0300
|
||||
|
||||
---
|
||||
drivers/input/mouse/synaptics.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
|
||||
index 5af0b7d200bc..eecb8872c1a5 100644
|
||||
--- a/drivers/input/mouse/synaptics.c
|
||||
+++ b/drivers/input/mouse/synaptics.c
|
||||
@@ -172,6 +172,7 @@ static const char * const smbus_pnp_ids[] = {
|
||||
"LEN0048", /* X1 Carbon 3 */
|
||||
"LEN0046", /* X250 */
|
||||
"LEN004a", /* W541 */
|
||||
+ "LEN0073", /* X1 Carbon 5 */
|
||||
"LEN200f", /* T450s */
|
||||
"LEN2018", /* T460p */
|
||||
NULL
|
||||
Loading…
Reference in new issue