[PATCH] x86/amd: don't set pv_post_outb_hook when !CONFIG_PV

[PATCH] x86/amd: don't set pv_post_outb_hook when !CONFIG_PV

[Wei Liu]

Obviously it won't exist when PV is disabled.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Based on Roger's "amd/pvh: enable ACPI C1E disable quirk on PVH Dom0".

This is the last patch needed to make CONFIG_PV work.
---
 xen/arch/x86/cpu/amd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 8895c25682..e1fc88bdcf 100644
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -631,7 +631,9 @@ static void init_amd(struct cpuinfo_x86 *c)
 	case 0xf ... 0x17:
 		disable_c1e(NULL);
 		if (acpi_smi_cmd && (acpi_enable_value | acpi_disable_value)) {
+#ifdef CONFIG_PV
 			pv_post_outb_hook = amd_check_disable_c1e;
+#endif
 			amd_acpi_c1e_quirk = true;
 		}
 		break;
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/amd: don't set pv_post_outb_hook when !CONFIG_PV

[Andrew Cooper]

On 08/11/18 14:58, Wei Liu wrote:
> Obviously it won't exist when PV is disabled.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/amd: don't set pv_post_outb_hook when !CONFIG_PV

[Roger Pau Monné]

On Thu, Nov 08, 2018 at 02:58:09PM +0000, Wei Liu wrote:
> Obviously it won't exist when PV is disabled.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/amd: don't set pv_post_outb_hook when !CONFIG_PV

[Jan Beulich]

>>> On 08.11.18 at 15:58, <wei.liu2@citrix.com> wrote:
> --- a/xen/arch/x86/cpu/amd.c
> +++ b/xen/arch/x86/cpu/amd.c
> @@ -631,7 +631,9 @@ static void init_amd(struct cpuinfo_x86 *c)
>  	case 0xf ... 0x17:
>  		disable_c1e(NULL);
>  		if (acpi_smi_cmd && (acpi_enable_value | acpi_disable_value)) {
> +#ifdef CONFIG_PV
>  			pv_post_outb_hook = amd_check_disable_c1e;
> +#endif
>  			amd_acpi_c1e_quirk = true;
>  		}
>  		break;

Hmm, I would have hoped for this to get properly cleaned up,
as outlined in that other thread, if you already touch it. Anyway,
I see you've got the necessary acks, so the subsequent
cleanup patch will just have to delete two more lines.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/amd: don't set pv_post_outb_hook when !CONFIG_PV

[Wei Liu]

On Thu, Nov 08, 2018 at 08:34:35AM -0700, Jan Beulich wrote:
> >>> On 08.11.18 at 15:58, <wei.liu2@citrix.com> wrote:
> > --- a/xen/arch/x86/cpu/amd.c
> > +++ b/xen/arch/x86/cpu/amd.c
> > @@ -631,7 +631,9 @@ static void init_amd(struct cpuinfo_x86 *c)
> >  	case 0xf ... 0x17:
> >  		disable_c1e(NULL);
> >  		if (acpi_smi_cmd && (acpi_enable_value | acpi_disable_value)) {
> > +#ifdef CONFIG_PV
> >  			pv_post_outb_hook = amd_check_disable_c1e;
> > +#endif
> >  			amd_acpi_c1e_quirk = true;
> >  		}
> >  		break;
> 
> Hmm, I would have hoped for this to get properly cleaned up,
> as outlined in that other thread, if you already touch it. Anyway,
> I see you've got the necessary acks, so the subsequent
> cleanup patch will just have to delete two more lines.

Do you mean to switch PV to use the same mechanism as HVM? I don't have
a machine to test this code path at the moment, so it will need to wait
a bit. In the mean time I would like to tick one of the big work items
off of my list.

Wei.

> 
> Jan
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xenproject.org
> https://lists.xenproject.org/mailman/listinfo/xen-devel

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] x86/amd: don't set pv_post_outb_hook when !CONFIG_PV

[Jan Beulich]

>>> On 08.11.18 at 16:38, <wei.liu2@citrix.com> wrote:
> On Thu, Nov 08, 2018 at 08:34:35AM -0700, Jan Beulich wrote:
>> >>> On 08.11.18 at 15:58, <wei.liu2@citrix.com> wrote:
>> > --- a/xen/arch/x86/cpu/amd.c
>> > +++ b/xen/arch/x86/cpu/amd.c
>> > @@ -631,7 +631,9 @@ static void init_amd(struct cpuinfo_x86 *c)
>> >  	case 0xf ... 0x17:
>> >  		disable_c1e(NULL);
>> >  		if (acpi_smi_cmd && (acpi_enable_value | acpi_disable_value)) {
>> > +#ifdef CONFIG_PV
>> >  			pv_post_outb_hook = amd_check_disable_c1e;
>> > +#endif
>> >  			amd_acpi_c1e_quirk = true;
>> >  		}
>> >  		break;
>> 
>> Hmm, I would have hoped for this to get properly cleaned up,
>> as outlined in that other thread, if you already touch it. Anyway,
>> I see you've got the necessary acks, so the subsequent
>> cleanup patch will just have to delete two more lines.
> 
> Do you mean to switch PV to use the same mechanism as HVM?

Yes.

> I don't have
> a machine to test this code path at the moment, so it will need to wait
> a bit. In the mean time I would like to tick one of the big work items
> off of my list.

I didn't mean to keep you from committing it. As said - you have the
necessary ack.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel