PCI: hv: Temporary own CPU-number-to-vCPU-number infra

To ease parallel effort to centralize CPU-number-to-vCPU-number conversion,
temporarily stand up own version, file-local hv_tmp_cpu_nr_to_vp_nr().
Once the changes have merged, this work-around can be removed, and the
calls replaced with hv_cpu_number_to_vp_number().

Signed-off-by: Jork Loeser <jloeser@microsoft.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Acked-by: K. Y. Srinivasan <kys@microsoft.com>

diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
index 6e4b02678b7a565ac09acd7434bb6404c0d1fc7b..cf70fbc8e92913cafdb83749f8d30854e6315f9a 100644 (file)
--- a/drivers/pci/host/pci-hyperv.c
+++ b/drivers/pci/host/pci-hyperv.c
@@ -479,6 +479,52 @@ static void put_pcichild(struct hv_pci_dev *hv_pcidev,
 static void get_hvpcibus(struct hv_pcibus_device *hv_pcibus);
 static void put_hvpcibus(struct hv_pcibus_device *hv_pcibus);
 
+
+/*
+ * Temporary CPU to vCPU mapping to address transitioning
+ * vmbus_cpu_number_to_vp_number() being migrated to
+ * hv_cpu_number_to_vp_number() in a separate patch. Once that patch
+ * has been picked up in the main line, remove this code here and use
+ * the official code.
+ */
+static struct hv_tmpcpumap
+{
+       bool initialized;
+       u32 vp_index[NR_CPUS];
+} hv_tmpcpumap;
+
+static void hv_tmpcpumap_init_cpu(void *_unused)
+{
+       int cpu = smp_processor_id();
+       u64 vp_index;
+
+       hv_get_vp_index(vp_index);
+
+       hv_tmpcpumap.vp_index[cpu] = vp_index;
+}
+
+static void hv_tmpcpumap_init(void)
+{
+       if (hv_tmpcpumap.initialized)
+               return;
+
+       memset(hv_tmpcpumap.vp_index, -1, sizeof(hv_tmpcpumap.vp_index));
+       on_each_cpu(hv_tmpcpumap_init_cpu, NULL, true);
+       hv_tmpcpumap.initialized = true;
+}
+
+/**
+ * hv_tmp_cpu_nr_to_vp_nr() - Convert Linux CPU nr to Hyper-V vCPU nr
+ *
+ * Remove once vmbus_cpu_number_to_vp_number() has been converted to
+ * hv_cpu_number_to_vp_number() and replace callers appropriately.
+ */
+static u32 hv_tmp_cpu_nr_to_vp_nr(int cpu)
+{
+       return hv_tmpcpumap.vp_index[cpu];
+}
+
+
 /**
  * devfn_to_wslot() - Convert from Linux PCI slot to Windows
  * @devfn:     The Linux representation of PCI slot
@@ -813,7 +859,7 @@ static void hv_irq_unmask(struct irq_data *data)
        params->vector = cfg->vector;
 
        for_each_cpu_and(cpu, dest, cpu_online_mask)
-               params->vp_mask |= (1ULL << vmbus_cpu_number_to_vp_number(cpu));
+               params->vp_mask |= (1ULL << hv_tmp_cpu_nr_to_vp_nr(cpu));
 
        hv_do_hypercall(HVCALL_RETARGET_INTERRUPT, params, NULL);
 
@@ -908,7 +954,7 @@ static void hv_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
        } else {
                for_each_cpu_and(cpu, affinity, cpu_online_mask) {
                        int_pkt->int_desc.cpu_mask |=
-                               (1ULL << vmbus_cpu_number_to_vp_number(cpu));
+                               (1ULL << hv_tmp_cpu_nr_to_vp_nr(cpu));
                }
        }
 
@@ -2218,6 +2264,8 @@ static int hv_pci_probe(struct hv_device *hdev,
                return -ENOMEM;
        hbus->state = hv_pcibus_init;
 
+       hv_tmpcpumap_init();
+
        /*
         * The PCI bus "domain" is what is called "segment" in ACPI and
         * other specs.  Pull it from the instance ID, to get something