Commit e839a756 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hyperv-fixes-signed-20220912' of... 

Merge tag 'hyperv-fixes-signed-20220912' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux

Pull hyperv fixes from Wei Liu:

 - Fix an error handling issue in DRM driver (Christophe JAILLET)

 - Fix some issues in framebuffer driver (Vitaly Kuznetsov)

 - Two typo fixes (Jason Wang, Shaomin Deng)

 - Drop unnecessary casting in kvp tool (Zhou Jie)

* tag 'hyperv-fixes-signed-20220912' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region
  Drivers: hv: Always reserve framebuffer region for Gen1 VMs
  PCI: Move PCI_VENDOR_ID_MICROSOFT/PCI_DEVICE_ID_HYPERV_VIDEO definitions to pci_ids.h
  tools: hv: kvp: remove unnecessary (void*) conversions
  Drivers: hv: remove duplicate word in a comment
  tools: hv: Remove an extraneous "the"
  drm/hyperv: Fix an error handling path in hyperv_vmbus_probe()
parents 6504d82f f0880e2c

drivers/gpu/drm/hyperv/hyperv_drm_drv.c

+4 −6
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
#define DRIVER_MAJOR 1

#define DRIVER_MINOR 0



#define PCI_VENDOR_ID_MICROSOFT 0x1414

#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353



DEFINE_DRM_GEM_FOPS(hv_fops);



static struct drm_driver hyperv_driver = {
@@ -133,7 +130,6 @@ static int hyperv_vmbus_probe(struct hv_device *hdev, 
	}



	ret = hyperv_setup_vram(hv, hdev);



	if (ret)

		goto err_vmbus_close;
@@ -150,18 +146,20 @@ static int hyperv_vmbus_probe(struct hv_device *hdev, 


	ret = hyperv_mode_config_init(hv);

	if (ret)

		goto err_vmbus_close;

		goto err_free_mmio;



	ret = drm_dev_register(dev, 0);

	if (ret) {

		drm_err(dev, "Failed to register drm driver.\n");

		goto err_vmbus_close;

		goto err_free_mmio;

	}



	drm_fbdev_generic_setup(dev, 0);



	return 0;



err_free_mmio:

	vmbus_free_mmio(hv->mem->start, hv->fb_size);

err_vmbus_close:

	vmbus_close(hdev->channel);

err_hv_set_drv_data:

drivers/hv/hv_fcopy.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void fcopy_send_data(struct work_struct *dummy) 


	/*

	 * The  strings sent from the host are encoded in

	 * in utf16; convert it to utf8 strings.

	 * utf16; convert it to utf8 strings.

	 * The host assures us that the utf16 strings will not exceed

	 * the max lengths specified. We will however, reserve room

	 * for the string terminating character - in the utf16s_utf8s()

drivers/hv/vmbus_drv.c

+41 −15
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/kernel.h>

#include <linux/syscore_ops.h>

#include <linux/dma-map-ops.h>

#include <linux/pci.h>

#include <clocksource/hyperv_timer.h>

#include "hyperv_vmbus.h"
@@ -2262,26 +2263,43 @@ static int vmbus_acpi_remove(struct acpi_device *device) 


static void vmbus_reserve_fb(void)

{

	int size;

	resource_size_t start = 0, size;

	struct pci_dev *pdev;



	if (efi_enabled(EFI_BOOT)) {

		/* Gen2 VM: get FB base from EFI framebuffer */

		start = screen_info.lfb_base;

		size = max_t(__u32, screen_info.lfb_size, 0x800000);

	} else {

		/* Gen1 VM: get FB base from PCI */

		pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT,

				      PCI_DEVICE_ID_HYPERV_VIDEO, NULL);

		if (!pdev)

			return;



		if (pdev->resource[0].flags & IORESOURCE_MEM) {

			start = pci_resource_start(pdev, 0);

			size = pci_resource_len(pdev, 0);

		}



		/*

		 * Release the PCI device so hyperv_drm or hyperv_fb driver can

		 * grab it later.

		 */

		pci_dev_put(pdev);

	}



	if (!start)

		return;



	/*

	 * Make a claim for the frame buffer in the resource tree under the

	 * first node, which will be the one below 4GB.  The length seems to

	 * be underreported, particularly in a Generation 1 VM.  So start out

	 * reserving a larger area and make it smaller until it succeeds.

	 */



	if (screen_info.lfb_base) {

		if (efi_enabled(EFI_BOOT))

			size = max_t(__u32, screen_info.lfb_size, 0x800000);

		else

			size = max_t(__u32, screen_info.lfb_size, 0x4000000);



		for (; !fb_mmio && (size >= 0x100000); size >>= 1) {

			fb_mmio = __request_region(hyperv_mmio,

						   screen_info.lfb_base, size,

						   fb_mmio_name, 0);

		}

	}

	for (; !fb_mmio && (size >= 0x100000); size >>= 1)

		fb_mmio = __request_region(hyperv_mmio, start, size, fb_mmio_name, 0);

}



/**
@@ -2313,7 +2331,7 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, 
			bool fb_overlap_ok)

{

	struct resource *iter, *shadow;

	resource_size_t range_min, range_max, start;

	resource_size_t range_min, range_max, start, end;

	const char *dev_n = dev_name(&device_obj->device);

	int retval;
@@ -2348,6 +2366,14 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, 
		range_max = iter->end;

		start = (range_min + align - 1) & ~(align - 1);

		for (; start + size - 1 <= range_max; start += align) {

			end = start + size - 1;



			/* Skip the whole fb_mmio region if not fb_overlap_ok */

			if (!fb_overlap_ok && fb_mmio &&

			    (((start >= fb_mmio->start) && (start <= fb_mmio->end)) ||

			     ((end >= fb_mmio->start) && (end <= fb_mmio->end))))

				continue;



			shadow = __request_region(iter, start, size, NULL,

						  IORESOURCE_BUSY);

			if (!shadow)

drivers/net/ethernet/microsoft/mana/gdma_main.c

+0 −4
Original line number Diff line number Diff line
@@ -1465,10 +1465,6 @@ static void mana_gd_shutdown(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



#ifndef PCI_VENDOR_ID_MICROSOFT

#define PCI_VENDOR_ID_MICROSOFT 0x1414

#endif



static const struct pci_device_id mana_id_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_PF_DEVICE_ID) },

	{ PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_VF_DEVICE_ID) },

drivers/video/fbdev/hyperv_fb.c

+0 −4
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ 
#define SYNTHVID_DEPTH_WIN8 32

#define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024)



#define PCI_VENDOR_ID_MICROSOFT 0x1414

#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353





enum pipe_msg_type {

	PIPE_MSG_INVALID,

	PIPE_MSG_DATA,