[PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert

[ethan zhao <ethan.zhao@oracle.com>]

[-- Attachment #1: Type: text/plain, Size: 1361 bytes --]

Cleanup the -EINVAL return value handling and add warning message for 
invalid
start,end,addr parameters.

Signed-off-by: ethan.zhao <ethan.zhao@oracle.com>
---
  arch/x86/pci/mmconfig-shared.c |   12 ++++++------
  1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 082e881..37f6c7f 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -700,8 +700,13 @@ int pci_mmconfig_insert(struct device *dev, u16 
seg, u8 start, u8 end,
      if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed)
          return -ENODEV;

-    if (start > end)
+    if (start > end || !addr) {
+        dev_warn(dev, FW_WARN
+                                 "Invalid address to add MMCONFIG"
+                                 "start %02x end %02x addr %pR\n",
+                                  start, end, addr);
          return -EINVAL;
+    }

      mutex_lock(&pci_mmcfg_lock);
      cfg = pci_mmconfig_lookup(seg, start);
@@ -716,11 +721,6 @@ int pci_mmconfig_insert(struct device *dev, u16 
seg, u8 start, u8 end,
          return -EEXIST;
      }

-    if (!addr) {
-        mutex_unlock(&pci_mmcfg_lock);
-        return -EINVAL;
-    }
-
      rc = -EBUSY;
      cfg = pci_mmconfig_alloc(seg, start, end, addr);
      if (cfg == NULL) {
-- 
1.7.1



[-- Attachment #2: 0001-x86-PCI-MMCONFIG-cleanup-and-add-address-warning-to-.patch --]
[-- Type: text/x-patch, Size: 1519 bytes --]

>From 4f7337340c8b3b03fcedfa02ca7b0c3ba4379711 Mon Sep 17 00:00:00 2001
From: ethan.zhao <ethan.zhao@oracle.com>
Date: Fri, 26 Jul 2013 16:25:07 -0400
Subject: [PATCH] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert

Cleanup the -EINVAL return value handling and add warning message for invalid
start,end,addr parameters.

Signed-off-by: ethan.zhao <ethan.zhao@oracle.com>
---
 arch/x86/pci/mmconfig-shared.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 082e881..37f6c7f 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -700,8 +700,13 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
 	if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed)
 		return -ENODEV;
 
-	if (start > end)
+	if (start > end || !addr) {
+		dev_warn(dev, FW_WARN
+                                 "Invalid address to add MMCONFIG"
+                                 "start %02x end %02x addr %pR\n",
+                                  start, end, addr);
 		return -EINVAL;
+	}
 
 	mutex_lock(&pci_mmcfg_lock);
 	cfg = pci_mmconfig_lookup(seg, start);
@@ -716,11 +721,6 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
 		return -EEXIST;
 	}
 
-	if (!addr) {
-		mutex_unlock(&pci_mmcfg_lock);
-		return -EINVAL;
-	}
-
 	rc = -EBUSY;
 	cfg = pci_mmconfig_alloc(seg, start, end, addr);
 	if (cfg == NULL) {
-- 
1.7.1