| Message ID | 20200203050313.69247-2-boqun.feng@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: hv: Generify pci-hyperv.c | expand |
On Mon, Feb 03, 2020 at 01:03:11PM +0800, Boqun Feng wrote: > Currently HVCALL_RETARGET_INTERRUPT and HV_PARTITION_ID_SELF are defined > in pci-hyperv.c. However, similar to other hypercall related definitions > , it makes more sense to put them in the tlfs header file. Nit: please keep the comma attached to the previous word - even if that means you need to move the word with it to the next line to maintain line limits. > > Besides, these definitions are arch-dependent, so for the support of > virtual PCI on non-x86 archs in the future, move them into arch-specific > tlfs header file. > > Signed-off-by: Boqun Feng (Microsoft) <boqun.feng@gmail.com> > --- > arch/x86/include/asm/hyperv-tlfs.h | 3 +++ > drivers/pci/controller/pci-hyperv.c | 6 ------ > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h > index 5f10f7f2098d..739bd89226a5 100644 > --- a/arch/x86/include/asm/hyperv-tlfs.h > +++ b/arch/x86/include/asm/hyperv-tlfs.h > @@ -376,6 +376,7 @@ struct hv_tsc_emulation_status { > #define HVCALL_SEND_IPI_EX 0x0015 > #define HVCALL_POST_MESSAGE 0x005c > #define HVCALL_SIGNAL_EVENT 0x005d > +#define HVCALL_RETARGET_INTERRUPT 0x007e > #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af > #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0 > > @@ -405,6 +406,8 @@ enum HV_GENERIC_SET_FORMAT { > HV_GENERIC_SET_ALL, > }; > > +#define HV_PARTITION_ID_SELF ((u64)-1) > + > #define HV_HYPERCALL_RESULT_MASK GENMASK_ULL(15, 0) > #define HV_HYPERCALL_FAST_BIT BIT(16) > #define HV_HYPERCALL_VARHEAD_OFFSET 17 > diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c > index 9977abff92fc..aacfcc90d929 100644 > --- a/drivers/pci/controller/pci-hyperv.c > +++ b/drivers/pci/controller/pci-hyperv.c > @@ -406,12 +406,6 @@ struct pci_eject_response { > > static int pci_ring_size = (4 * PAGE_SIZE); > > -/* > - * Definitions or interrupt steering hypercall. > - */ > -#define HV_PARTITION_ID_SELF ((u64)-1) > -#define HVCALL_RETARGET_INTERRUPT 0x7e > - Reviewed-by: Andrew Murray <amurray@thegoodpenguin.co.uk> > struct hv_interrupt_entry { > u32 source; /* 1 for MSI(-X) */ > u32 reserved1; > -- > 2.24.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Mon, Feb 03, 2020 at 09:25:25AM +0000, Andrew Murray wrote: > On Mon, Feb 03, 2020 at 01:03:11PM +0800, Boqun Feng wrote: > > Currently HVCALL_RETARGET_INTERRUPT and HV_PARTITION_ID_SELF are defined > > in pci-hyperv.c. However, similar to other hypercall related definitions > > , it makes more sense to put them in the tlfs header file. > > Nit: please keep the comma attached to the previous word - even if that > means you need to move the word with it to the next line to maintain line > limits. > > > > > Besides, these definitions are arch-dependent, so for the support of > > virtual PCI on non-x86 archs in the future, move them into arch-specific > > tlfs header file. > > > > Signed-off-by: Boqun Feng (Microsoft) <boqun.feng@gmail.com> > > --- > > arch/x86/include/asm/hyperv-tlfs.h | 3 +++ > > drivers/pci/controller/pci-hyperv.c | 6 ------ > > 2 files changed, 3 insertions(+), 6 deletions(-) > > > > diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h > > index 5f10f7f2098d..739bd89226a5 100644 > > --- a/arch/x86/include/asm/hyperv-tlfs.h > > +++ b/arch/x86/include/asm/hyperv-tlfs.h > > @@ -376,6 +376,7 @@ struct hv_tsc_emulation_status { > > #define HVCALL_SEND_IPI_EX 0x0015 > > #define HVCALL_POST_MESSAGE 0x005c > > #define HVCALL_SIGNAL_EVENT 0x005d > > +#define HVCALL_RETARGET_INTERRUPT 0x007e > > #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af > > #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0 > > > > @@ -405,6 +406,8 @@ enum HV_GENERIC_SET_FORMAT { > > HV_GENERIC_SET_ALL, > > }; > > > > +#define HV_PARTITION_ID_SELF ((u64)-1) > > + > > #define HV_HYPERCALL_RESULT_MASK GENMASK_ULL(15, 0) > > #define HV_HYPERCALL_FAST_BIT BIT(16) > > #define HV_HYPERCALL_VARHEAD_OFFSET 17 > > diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c > > index 9977abff92fc..aacfcc90d929 100644 > > --- a/drivers/pci/controller/pci-hyperv.c > > +++ b/drivers/pci/controller/pci-hyperv.c > > @@ -406,12 +406,6 @@ struct pci_eject_response { > > > > static int pci_ring_size = (4 * PAGE_SIZE); > > > > -/* > > - * Definitions or interrupt steering hypercall. > > - */ > > -#define HV_PARTITION_ID_SELF ((u64)-1) > > -#define HVCALL_RETARGET_INTERRUPT 0x7e > > - > > Reviewed-by: Andrew Murray <amurray@thegoodpenguin.co.uk> > Thanks! I will fix the comma thing and add your Reviewed-by in next version. Regards, Boqun > > struct hv_interrupt_entry { > > u32 source; /* 1 for MSI(-X) */ > > u32 reserved1; > > -- > > 2.24.1 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h index 5f10f7f2098d..739bd89226a5 100644 --- a/arch/x86/include/asm/hyperv-tlfs.h +++ b/arch/x86/include/asm/hyperv-tlfs.h @@ -376,6 +376,7 @@ struct hv_tsc_emulation_status { #define HVCALL_SEND_IPI_EX 0x0015 #define HVCALL_POST_MESSAGE 0x005c #define HVCALL_SIGNAL_EVENT 0x005d +#define HVCALL_RETARGET_INTERRUPT 0x007e #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0 @@ -405,6 +406,8 @@ enum HV_GENERIC_SET_FORMAT { HV_GENERIC_SET_ALL, }; +#define HV_PARTITION_ID_SELF ((u64)-1) + #define HV_HYPERCALL_RESULT_MASK GENMASK_ULL(15, 0) #define HV_HYPERCALL_FAST_BIT BIT(16) #define HV_HYPERCALL_VARHEAD_OFFSET 17 diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index 9977abff92fc..aacfcc90d929 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -406,12 +406,6 @@ struct pci_eject_response { static int pci_ring_size = (4 * PAGE_SIZE); -/* - * Definitions or interrupt steering hypercall. - */ -#define HV_PARTITION_ID_SELF ((u64)-1) -#define HVCALL_RETARGET_INTERRUPT 0x7e - struct hv_interrupt_entry { u32 source; /* 1 for MSI(-X) */ u32 reserved1;
Currently HVCALL_RETARGET_INTERRUPT and HV_PARTITION_ID_SELF are defined in pci-hyperv.c. However, similar to other hypercall related definitions , it makes more sense to put them in the tlfs header file. Besides, these definitions are arch-dependent, so for the support of virtual PCI on non-x86 archs in the future, move them into arch-specific tlfs header file. Signed-off-by: Boqun Feng (Microsoft) <boqun.feng@gmail.com> --- arch/x86/include/asm/hyperv-tlfs.h | 3 +++ drivers/pci/controller/pci-hyperv.c | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-)