scsi: smartpqi: enhance numa node detection

- set pci_dev->dev to 0 only if the node is NO_NUMA_NODE.
  If not, do not reset the value but retain it.

Reviewed-by: Murthy Bhat <murthy.bhat@microsemi.com>
Reviewed-by: Mahesh Rajashekhara <mahesh.rajashekhara@microsemi.com>
Reviewed-by: Dave Carroll <david.carroll@microsemi.com>
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Sagar Biradar <sagar.biradar@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 273daa2..ed4dd71 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -7130,7 +7130,7 @@ static int pqi_pci_probe(struct pci_dev *pci_dev,
        const struct pci_device_id *id)
 {
        int rc;
-       int node;
+       int node, cp_node;
        struct pqi_ctrl_info *ctrl_info;
 
        pqi_print_ctrl_info(pci_dev, id);
@@ -7148,8 +7148,12 @@ static int pqi_pci_probe(struct pci_dev *pci_dev,
                        "controller device ID matched using wildcards\n");
 
        node = dev_to_node(&pci_dev->dev);
-       if (node == NUMA_NO_NODE)
-               set_dev_node(&pci_dev->dev, 0);
+       if (node == NUMA_NO_NODE) {
+               cp_node = cpu_to_node(0);
+               if (cp_node == NUMA_NO_NODE)
+                       cp_node = 0;
+               set_dev_node(&pci_dev->dev, cp_node);
+       }
 
        ctrl_info = pqi_alloc_ctrl_info(node);
        if (!ctrl_info) {