Skip to contentSkip to conversation

x86/vsmp: Remove dependency on pv_irq_ops

PATCH Superseded Eial Czerwacki 4 participants 5 messages Nov 5, 2018 x86

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Eial Czerwacki

author
#0 lore raw

PATCH 1/1 x86/vsmp: Remove dependency on pv_irq_ops

vsmp dependency on pv_irq_ops removed some years ago, so now let's clean it up from vsmp_64.c.

In short, "cap & ctl & (1 << 4)" was always returning 0, as such we can remove all the PARAVIRT/PARAVIRT_XXL code handling that.

However, the rest of the code depends on CONFIG_PCI, so fix it accordingly. in addition, rename set_vsmp_pv_ops to set_vsmp_ctl.

Signed-off-by Eial Czerwacki <[email protected]>
Acked-by Shai Fultheim <[email protected]>
Cc Juergen Gross <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 arch/x86/Kconfig          |  1 -
 arch/x86/kernel/vsmp_64.c | 84 ++++-------------------------------------------
 2 files changed, 7 insertions(+), 78 deletions(-)
arch/x86/Kconfig +0 -1
index ba7e346..9d734f3 100644
@@ -525,7 +525,6 @@ config X86_VSMP
 	bool "ScaleMP vSMP"
 	select HYPERVISOR_GUEST
 	select PARAVIRT
-	select PARAVIRT_XXL
 	depends on X86_64 && PCI
 	depends on X86_EXTENDED_PLATFORM
 	depends on SMP
arch/x86/kernel/vsmp_64.c +7 -77

117 lines not on this page · raw message

Signature · 1 line
2.7.4
merge bot
#1 lore raw
x86/vsmp: Remove dependency on pv_irq_ops
Commit-ID:  7f2d7f8190d856949d8aaab55d3902cd10ea1048
Gitweb:     https://git.kernel.org/tip/7f2d7f8190d856949d8aaab55d3902cd10ea1048
Author:     Eial Czerwacki <[email protected]>
AuthorDate: Mon, 5 Nov 2018 10:01:04 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 5 Nov 2018 12:33:47 +0100

x86/vsmp: Remove dependency on pv_irq_ops

vsmp dependency on pv_irq_ops has been removed some years ago, but the code still deals with pv_irq_ops.

In short, "cap & ctl & (1 << 4)" is always returning 0, so all PARAVIRT/PARAVIRT_XXL code related to that can be removed.

However, the rest of the code depends on CONFIG_PCI, so fix it accordingly.

Rename set_vsmp_pv_ops to set_vsmp_ctl as the original name does not make sense anymore.

[ tglx: Minor changelog tweaks ]

Signed-off-by Eial Czerwacki <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Acked-by Shai Fultheim <[email protected]>
Cc Juergen Gross <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here
---
 arch/x86/Kconfig          |  1 -
 arch/x86/kernel/vsmp_64.c | 84 ++++-------------------------------------------
 2 files changed, 7 insertions(+), 78 deletions(-)
arch/x86/Kconfig +0 -1
index ba7e3464ee92..9d734f3c8234 100644
@@ -525,7 +525,6 @@ config X86_VSMP
 	bool "ScaleMP vSMP"
 	select HYPERVISOR_GUEST
 	select PARAVIRT
-	select PARAVIRT_XXL
 	depends on X86_64 && PCI
 	depends on X86_EXTENDED_PLATFORM
 	depends on SMP
arch/x86/kernel/vsmp_64.c +7 -77

117 lines not on this page · raw message

#2 lore raw
Quoted 11 lines · tip-bot for Eial Czerwacki
Commit-ID:  7f2d7f8190d856949d8aaab55d3902cd10ea1048
Gitweb:     https://git.kernel.org/tip/7f2d7f8190d856949d8aaab55d3902cd10ea1048
Author:     Eial Czerwacki <[email protected]>
AuthorDate: Mon, 5 Nov 2018 10:01:04 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 5 Nov 2018 12:33:47 +0100

x86/vsmp: Remove dependency on pv_irq_ops

vsmp dependency on pv_irq_ops has been removed some years ago, but the code still deals with pv_irq_ops.

s/vsmp
/vSMP

Quoted 1 line

+#if defined CONFIG_PCI

I don't think code was ever tested with PCI disabled?

The above typoed sequence of code accidentally evaluates to 'true' regardless of CONFIG_PCI.

Thanks,

Ingo

#3 lore raw
Quoted 18 lines · Ingo Molnar
Quoted 11 lines · tip-bot for Eial Czerwacki
Commit-ID:  7f2d7f8190d856949d8aaab55d3902cd10ea1048
Gitweb:     https://git.kernel.org/tip/7f2d7f8190d856949d8aaab55d3902cd10ea1048
Author:     Eial Czerwacki <[email protected]>
AuthorDate: Mon, 5 Nov 2018 10:01:04 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 5 Nov 2018 12:33:47 +0100

x86/vsmp: Remove dependency on pv_irq_ops

vsmp dependency on pv_irq_ops has been removed some years ago, but the code still deals with pv_irq_ops.

s/vsmp
/vSMP

Quoted 6 lines
Quoted 1 line

+#if defined CONFIG_PCI

I don't think code was ever tested with PCI disabled?

The above typoed sequence of code accidentally evaluates to 'true' regardless of CONFIG_PCI.

Grr. Indeed, missed that

author
#4 lore raw

Greetings,

Quoted 20 lines · Thomas Gleixner
Quoted 18 lines · Ingo Molnar
Quoted 11 lines · tip-bot for Eial Czerwacki
Commit-ID:  7f2d7f8190d856949d8aaab55d3902cd10ea1048
Gitweb:     https://git.kernel.org/tip/7f2d7f8190d856949d8aaab55d3902cd10ea1048
Author:     Eial Czerwacki <[email protected]>
AuthorDate: Mon, 5 Nov 2018 10:01:04 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 5 Nov 2018 12:33:47 +0100

x86/vsmp: Remove dependency on pv_irq_ops

vsmp dependency on pv_irq_ops has been removed some years ago, but the code still deals with pv_irq_ops.

s/vsmp
/vSMP

Quoted 10 lines
Quoted 6 lines
Quoted 1 line

+#if defined CONFIG_PCI

I don't think code was ever tested with PCI disabled?

The above typoed sequence of code accidentally evaluates to 'true' regardless of CONFIG_PCI.

Grr. Indeed, missed that

actually I've tested it with CONFIG_PCI unset but evidently I've managed to mess up the test somehow.
thanks for pointing this out, I'll send a patch that fixes it.

Eial.