Skip to content

Commit 4907a43

Browse files
committed
Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux
Pull Hyper-V updates from Wei Liu: - a series from Boqun Feng to support page size larger than 4K - a few miscellaneous clean-ups * tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux: hv: clocksource: Add notrace attribute to read_hv_sched_clock_*() functions x86/hyperv: Remove aliases with X64 in their name PCI: hv: Document missing hv_pci_protocol_negotiation() parameter scsi: storvsc: Support PAGE_SIZE larger than 4K Driver: hv: util: Use VMBUS_RING_SIZE() for ringbuffer sizes HID: hyperv: Use VMBUS_RING_SIZE() for ringbuffer sizes Input: hyperv-keyboard: Use VMBUS_RING_SIZE() for ringbuffer sizes hv_netvsc: Use HV_HYP_PAGE_SIZE for Hyper-V communication hv: hyperv.h: Introduce some hvpfn helper functions Drivers: hv: vmbus: Move virt_to_hvpfn() to hyperv header Drivers: hv: Use HV_HYP_PAGE in hv_synic_enable_regs() Drivers: hv: vmbus: Introduce types of GPADL Drivers: hv: vmbus: Move __vmbus_open() Drivers: hv: vmbus: Always use HV_HYP_PAGE_SIZE for gpadl drivers: hv: remove cast from hyperv_die_event
2 parents da9803d + 1f3aed0 commit 4907a43

13 files changed

Lines changed: 449 additions & 231 deletions

File tree

drivers/clocksource/hyperv_timer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ static u64 notrace read_hv_clock_tsc_cs(struct clocksource *arg)
341341
return read_hv_clock_tsc();
342342
}
343343

344-
static u64 read_hv_sched_clock_tsc(void)
344+
static u64 notrace read_hv_sched_clock_tsc(void)
345345
{
346346
return (read_hv_clock_tsc() - hv_sched_clock_offset) *
347347
(NSEC_PER_SEC / HV_CLOCK_HZ);
@@ -404,7 +404,7 @@ static u64 notrace read_hv_clock_msr_cs(struct clocksource *arg)
404404
return read_hv_clock_msr();
405405
}
406406

407-
static u64 read_hv_sched_clock_msr(void)
407+
static u64 notrace read_hv_sched_clock_msr(void)
408408
{
409409
return (read_hv_clock_msr() - hv_sched_clock_offset) *
410410
(NSEC_PER_SEC / HV_CLOCK_HZ);

drivers/hid/hid-hyperv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ struct synthhid_input_report {
104104

105105
#pragma pack(pop)
106106

107-
#define INPUTVSC_SEND_RING_BUFFER_SIZE (40 * 1024)
108-
#define INPUTVSC_RECV_RING_BUFFER_SIZE (40 * 1024)
107+
#define INPUTVSC_SEND_RING_BUFFER_SIZE VMBUS_RING_SIZE(36 * 1024)
108+
#define INPUTVSC_RECV_RING_BUFFER_SIZE VMBUS_RING_SIZE(36 * 1024)
109109

110110

111111
enum pipe_prot_msg_type {

0 commit comments

Comments
 (0)