Merge tag 'vfio-v5.1-rc1' of git://github.com/awilliam/linux-vfio

Pull VFIO updates from Alex Williamson:

 - Switch mdev to generic UUID API (Andy Shevchenko)

 - Fixup platform reset include paths (Masahiro Yamada)

 - Fix usage of MINORMASK (Chengguang Xu)

 - Remove noise from duplicate spapr table unsets (Alexey Kardashevskiy)

 - Restore device state after PM reset (Alex Williamson)

 - Ensure memory translation enabled for PCI ROM access (Eric Auger)

* tag 'vfio-v5.1-rc1' of git://github.com/awilliam/linux-vfio:
  vfio_pci: Enable memory accesses before calling pci_map_rom
  vfio/pci: Restore device state on PM transition
  vfio/spapr_tce: Skip unsetting already unset table
  samples/vfio-mdev/mtty: expand minor range when registering chrdev region
  samples/vfio-mdev/mdpy: expand minor range when registering chrdev region
  samples/vfio-mdev/mbochs: expand minor range when registering chrdev region
  vfio: expand minor range when registering chrdev region
  vfio: platform: reset: fix up include directives to remove ccflags-y
  vfio-mdev: Switch to use new generic UUID API

3 files changed, 17 insertions, 16 deletions

diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c
index ca7960adf5a3..b038aa9f5a70 100644
--- a/samples/vfio-mdev/mbochs.c
+++ b/samples/vfio-mdev/mbochs.c
@@ -1448,13 +1448,13 @@ static int __init mbochs_dev_init(void)
 {
         int ret = 0;
 
-        ret = alloc_chrdev_region(&mbochs_devt, 0, MINORMASK, MBOCHS_NAME);
+        ret = alloc_chrdev_region(&mbochs_devt, 0, MINORMASK + 1, MBOCHS_NAME);
         if (ret < 0) {
                 pr_err("Error: failed to register mbochs_dev, err: %d\n", ret);
                 return ret;
         }
         cdev_init(&mbochs_cdev, &vd_fops);
-        cdev_add(&mbochs_cdev, mbochs_devt, MINORMASK);
+        cdev_add(&mbochs_cdev, mbochs_devt, MINORMASK + 1);
         pr_info("%s: major %d\n", __func__, MAJOR(mbochs_devt));
 
         mbochs_class = class_create(THIS_MODULE, MBOCHS_CLASS_NAME);
@@ -1483,7 +1483,7 @@ failed2:
         class_destroy(mbochs_class);
 failed1:
         cdev_del(&mbochs_cdev);
-        unregister_chrdev_region(mbochs_devt, MINORMASK);
+        unregister_chrdev_region(mbochs_devt, MINORMASK + 1);
         return ret;
 }
 
@@ -1494,7 +1494,7 @@ static void __exit mbochs_dev_exit(void)
 
         device_unregister(&mbochs_dev);
         cdev_del(&mbochs_cdev);
-        unregister_chrdev_region(mbochs_devt, MINORMASK);
+        unregister_chrdev_region(mbochs_devt, MINORMASK + 1);
         class_destroy(mbochs_class);
         mbochs_class = NULL;
 }
diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c
index 96e7969c473a..cc86bf6566e4 100644
--- a/samples/vfio-mdev/mdpy.c
+++ b/samples/vfio-mdev/mdpy.c
@@ -752,13 +752,13 @@ static int __init mdpy_dev_init(void)
 {
         int ret = 0;
 
-        ret = alloc_chrdev_region(&mdpy_devt, 0, MINORMASK, MDPY_NAME);
+        ret = alloc_chrdev_region(&mdpy_devt, 0, MINORMASK + 1, MDPY_NAME);
         if (ret < 0) {
                 pr_err("Error: failed to register mdpy_dev, err: %d\n", ret);
                 return ret;
         }
         cdev_init(&mdpy_cdev, &vd_fops);
-        cdev_add(&mdpy_cdev, mdpy_devt, MINORMASK);
+        cdev_add(&mdpy_cdev, mdpy_devt, MINORMASK + 1);
         pr_info("%s: major %d\n", __func__, MAJOR(mdpy_devt));
 
         mdpy_class = class_create(THIS_MODULE, MDPY_CLASS_NAME);
@@ -787,7 +787,7 @@ failed2:
         class_destroy(mdpy_class);
 failed1:
         cdev_del(&mdpy_cdev);
-        unregister_chrdev_region(mdpy_devt, MINORMASK);
+        unregister_chrdev_region(mdpy_devt, MINORMASK + 1);
         return ret;
 }
 
@@ -798,7 +798,7 @@ static void __exit mdpy_dev_exit(void)
 
         device_unregister(&mdpy_dev);
         cdev_del(&mdpy_cdev);
-        unregister_chrdev_region(mdpy_devt, MINORMASK);
+        unregister_chrdev_region(mdpy_devt, MINORMASK + 1);
         class_destroy(mdpy_class);
         mdpy_class = NULL;
 }
diff --git a/samples/vfio-mdev/mtty.c b/samples/vfio-mdev/mtty.c
index f6732aa16bb1..1c77c370c92f 100644
--- a/samples/vfio-mdev/mtty.c
+++ b/samples/vfio-mdev/mtty.c
@@ -156,15 +156,15 @@ static const struct file_operations vd_fops = {
 
 /* function prototypes */
 
-static int mtty_trigger_interrupt(uuid_le uuid);
+static int mtty_trigger_interrupt(const guid_t *uuid);
 
 /* Helper functions */
-static struct mdev_state *find_mdev_state_by_uuid(uuid_le uuid)
+static struct mdev_state *find_mdev_state_by_uuid(const guid_t *uuid)
 {
         struct mdev_state *mds;
 
         list_for_each_entry(mds, &mdev_devices_list, next) {
-                if (uuid_le_cmp(mdev_uuid(mds->mdev), uuid) == 0)
+                if (guid_equal(mdev_uuid(mds->mdev), uuid))
                         return mds;
         }
 
@@ -1032,7 +1032,7 @@ static int mtty_set_irqs(struct mdev_device *mdev, uint32_t flags,
         return ret;
 }
 
-static int mtty_trigger_interrupt(uuid_le uuid)
+static int mtty_trigger_interrupt(const guid_t *uuid)
 {
         int ret = -1;
         struct mdev_state *mdev_state;
@@ -1442,7 +1442,8 @@ static int __init mtty_dev_init(void)
 
         idr_init(&mtty_dev.vd_idr);
 
-        ret = alloc_chrdev_region(&mtty_dev.vd_devt, 0, MINORMASK, MTTY_NAME);
+        ret = alloc_chrdev_region(&mtty_dev.vd_devt, 0, MINORMASK + 1,
+                                  MTTY_NAME);
 
         if (ret < 0) {
                 pr_err("Error: failed to register mtty_dev, err:%d\n", ret);
@@ -1450,7 +1451,7 @@ static int __init mtty_dev_init(void)
         }
 
         cdev_init(&mtty_dev.vd_cdev, &vd_fops);
-        cdev_add(&mtty_dev.vd_cdev, mtty_dev.vd_devt, MINORMASK);
+        cdev_add(&mtty_dev.vd_cdev, mtty_dev.vd_devt, MINORMASK + 1);
 
         pr_info("major_number:%d\n", MAJOR(mtty_dev.vd_devt));
 
@@ -1487,7 +1488,7 @@ failed2:
 
 failed1:
         cdev_del(&mtty_dev.vd_cdev);
-        unregister_chrdev_region(mtty_dev.vd_devt, MINORMASK);
+        unregister_chrdev_region(mtty_dev.vd_devt, MINORMASK + 1);
 
 all_done:
         return ret;
@@ -1501,7 +1502,7 @@ static void __exit mtty_dev_exit(void)
         device_unregister(&mtty_dev.dev);
         idr_destroy(&mtty_dev.vd_idr);
         cdev_del(&mtty_dev.vd_cdev);
-        unregister_chrdev_region(mtty_dev.vd_devt, MINORMASK);
+        unregister_chrdev_region(mtty_dev.vd_devt, MINORMASK + 1);
         class_destroy(mtty_dev.vd_class);
         mtty_dev.vd_class = NULL;
         pr_info("mtty_dev: Unloaded!\n");