From: ethan.kernel@gmail.com
To: bhelgaas@google.com, yinghai@kernel.org, jbarnes@virtuousgeek.org
Cc: linux-kernel@vger.kernel.org, jiang.liu@huawei.com,
linux-pci@vger.kernel.org, joe.jin@oracle.com,
"ethan.zhao" <ethan.zhao@oracle.com>
Subject: [PATCH V2] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert
Date: Sat, 27 Jul 2013 15:32:38 -0400 [thread overview]
Message-ID: <1374953558-4704-1-git-send-email-ethan.kernel@gmail.com> (raw)
Cleanup the -EINVAL return value handling and add warning message for invalid
start,end,addr parameters.
V2: Corrected code style and tested for Linux v 3.11-rc2
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_INFO
+ "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
next reply other threads:[~2013-07-27 19:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-27 19:32 ethan.kernel [this message]
2013-07-28 3:09 ` [PATCH V2] x86/PCI: MMCONFIG: cleanup and add address warning to pci_mmconfig_insert Mark D Rustad
2013-07-28 3:29 ` ethan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374953558-4704-1-git-send-email-ethan.kernel@gmail.com \
--to=ethan.kernel@gmail.com \
--cc=bhelgaas@google.com \
--cc=ethan.zhao@oracle.com \
--cc=jbarnes@virtuousgeek.org \
--cc=jiang.liu@huawei.com \
--cc=joe.jin@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).