From: Jiang Liu <liuj97@gmail.com>
To: Bjorn Helgaas <bhelgaas@google.com>, Don Dutile <ddutile@redhat.com>
Cc: Jiang Liu <jiang.liu@huawei.com>, Yinghai Lu <yinghai@kernel.org>,
Taku Izumi <izumi.taku@jp.fujitsu.com>,
"Rafael J . Wysocki" <rjw@sisk.pl>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Yijing Wang <wangyijing@huawei.com>,
Keping Chen <chenkeping@huawei.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
Jiang Liu <liuj97@gmail.com>
Subject: [RFC PATCH 04/14] PCI: refine and move pcie_cap_has_*() macros to include/linux/pci.h
Date: Tue, 10 Jul 2012 23:54:05 +0800 [thread overview]
Message-ID: <1341935655-5381-5-git-send-email-jiang.liu@huawei.com> (raw)
In-Reply-To: <1341935655-5381-1-git-send-email-jiang.liu@huawei.com>
In-Reply-To: <CAErSpo70NtEJFaQmDtdTLkSB3fQRNy78juAQO-KbXeceZkunkw@mail.gmail.com>
From: Jiang Liu <jiang.liu@huawei.com>
Move pcie_cap_has_*() macros to include/linux/pci.h, so they can be shared.
Since pcie_flags was introduced, rework these macros to take a struct pci_dev *
and use pcie_flags insead of type and flags.
Signed-off-by: Jiang Liu <liuj97@gmail.com>
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
---
drivers/pci/pci.c | 50 ++++++++++++--------------------------------------
include/linux/pci.h | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 28eb55b..4c6ab70 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -272,15 +272,11 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap)
*/
static int pci_pcie_cap2(struct pci_dev *dev)
{
- u16 flags;
int pos;
pos = pci_pcie_cap(dev);
- if (pos) {
- pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &flags);
- if ((flags & PCI_EXP_FLAGS_VERS) < 2)
- pos = 0;
- }
+ if (pos && !pci_pcie_cap_has_cap2(dev))
+ pos = 0;
return pos;
}
@@ -854,21 +850,6 @@ EXPORT_SYMBOL(pci_choose_state);
#define PCI_EXP_SAVE_REGS 7
-#define pcie_cap_has_devctl(type, flags) 1
-#define pcie_cap_has_lnkctl(type, flags) \
- ((flags & PCI_EXP_FLAGS_VERS) > 1 || \
- (type == PCI_EXP_TYPE_ROOT_PORT || \
- type == PCI_EXP_TYPE_ENDPOINT || \
- type == PCI_EXP_TYPE_LEG_END))
-#define pcie_cap_has_sltctl(type, flags) \
- ((flags & PCI_EXP_FLAGS_VERS) > 1 || \
- ((type == PCI_EXP_TYPE_ROOT_PORT) || \
- (type == PCI_EXP_TYPE_DOWNSTREAM && \
- (flags & PCI_EXP_FLAGS_SLOT))))
-#define pcie_cap_has_rtctl(type, flags) \
- ((flags & PCI_EXP_FLAGS_VERS) > 1 || \
- (type == PCI_EXP_TYPE_ROOT_PORT || \
- type == PCI_EXP_TYPE_RC_EC))
static struct pci_cap_saved_state *pci_find_saved_cap(
struct pci_dev *pci_dev, char cap)
@@ -885,10 +866,9 @@ static struct pci_cap_saved_state *pci_find_saved_cap(
static int pci_save_pcie_state(struct pci_dev *dev)
{
- int type, pos, i = 0;
+ int pos, i = 0;
struct pci_cap_saved_state *save_state;
u16 *cap;
- u16 flags;
pos = pci_pcie_cap(dev);
if (!pos)
@@ -901,16 +881,14 @@ static int pci_save_pcie_state(struct pci_dev *dev)
}
cap = (u16 *)&save_state->cap.data[0];
- pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &flags);
- type = pci_pcie_type(dev);
- if (pcie_cap_has_devctl(type, flags))
+ if (pci_pcie_cap_has_devctl(dev))
pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &cap[i++]);
- if (pcie_cap_has_lnkctl(type, flags))
+ if (pci_pcie_cap_has_lnkctl(dev))
pci_read_config_word(dev, pos + PCI_EXP_LNKCTL, &cap[i++]);
- if (pcie_cap_has_sltctl(type, flags))
+ if (pci_pcie_cap_has_sltctl(dev))
pci_read_config_word(dev, pos + PCI_EXP_SLTCTL, &cap[i++]);
- if (pcie_cap_has_rtctl(type, flags))
+ if (pci_pcie_cap_has_rtctl(dev))
pci_read_config_word(dev, pos + PCI_EXP_RTCTL, &cap[i++]);
pos = pci_pcie_cap2(dev);
@@ -925,10 +903,9 @@ static int pci_save_pcie_state(struct pci_dev *dev)
static void pci_restore_pcie_state(struct pci_dev *dev)
{
- int i = 0, pos, type;
+ int i = 0, pos;
struct pci_cap_saved_state *save_state;
u16 *cap;
- u16 flags;
save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP);
pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
@@ -936,16 +913,13 @@ static void pci_restore_pcie_state(struct pci_dev *dev)
return;
cap = (u16 *)&save_state->cap.data[0];
- pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &flags);
-
- type = pci_pcie_type(dev);
- if (pcie_cap_has_devctl(type, flags))
+ if (pci_pcie_cap_has_devctl(dev))
pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, cap[i++]);
- if (pcie_cap_has_lnkctl(type, flags))
+ if (pci_pcie_cap_has_lnkctl(dev))
pci_write_config_word(dev, pos + PCI_EXP_LNKCTL, cap[i++]);
- if (pcie_cap_has_sltctl(type, flags))
+ if (pci_pcie_cap_has_sltctl(dev))
pci_write_config_word(dev, pos + PCI_EXP_SLTCTL, cap[i++]);
- if (pcie_cap_has_rtctl(type, flags))
+ if (pci_pcie_cap_has_rtctl(dev))
pci_write_config_word(dev, pos + PCI_EXP_RTCTL, cap[i++]);
pos = pci_pcie_cap2(dev);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1837354..346b2d9 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1659,6 +1659,49 @@ static inline int pci_pcie_type(const struct pci_dev *dev)
return (dev->pcie_flags & PCI_EXP_FLAGS_TYPE) >> 4;
}
+static inline int pci_pcie_cap_version(const struct pci_dev *pdev)
+{
+ return pdev->pcie_flags & PCI_EXP_FLAGS_VERS;
+}
+
+static inline int pci_pcie_cap_has_cap2(const struct pci_dev *pdev)
+{
+ return pci_pcie_cap_version(pdev) > 1;
+}
+
+static inline bool pci_pcie_cap_has_devctl(const struct pci_dev *pdev)
+{
+ return true;
+}
+
+static inline bool pci_pcie_cap_has_lnkctl(const struct pci_dev *pdev)
+{
+ int type = pci_pcie_type(pdev);
+
+ return pci_pcie_cap_version(pdev) > 1 ||
+ type == PCI_EXP_TYPE_ROOT_PORT ||
+ type == PCI_EXP_TYPE_ENDPOINT ||
+ type == PCI_EXP_TYPE_LEG_END;
+}
+
+static inline bool pci_pcie_cap_has_sltctl(const struct pci_dev *pdev)
+{
+ int type = pci_pcie_type(pdev);
+
+ return pci_pcie_cap_version(pdev) > 1 ||
+ type == PCI_EXP_TYPE_ROOT_PORT ||
+ (type == PCI_EXP_TYPE_DOWNSTREAM &&
+ pdev->pcie_flags & PCI_EXP_FLAGS_SLOT);
+}
+
+static inline bool pci_pcie_cap_has_rtctl(const struct pci_dev *pdev)
+{
+ int type = pci_pcie_type(pdev);
+
+ return pci_pcie_cap_version(pdev) > 1 ||
+ type == PCI_EXP_TYPE_ROOT_PORT ||
+ type == PCI_EXP_TYPE_RC_EC;
+}
void pci_request_acs(void);
bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags);
--
1.7.9.5
next prev parent reply other threads:[~2012-07-10 15:55 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-04 7:44 [Resend with Ack][PATCH v1] PCI: allow acpiphp to handle PCIe ports without native PCIe hotplug capability Jiang Liu
2012-06-04 8:23 ` Kenji Kaneshige
2012-07-03 4:16 ` Bjorn Helgaas
2012-07-03 15:59 ` Bjorn Helgaas
2012-07-03 19:50 ` Don Dutile
2012-07-04 18:07 ` Bjorn Helgaas
2012-07-09 10:05 ` Jiang Liu
2012-07-09 17:05 ` Bjorn Helgaas
2012-07-04 2:52 ` Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 00/14] improve PCIe capabilities registers handling Jiang Liu
2012-07-10 18:44 ` Bjorn Helgaas
2012-07-10 15:54 ` [RFC PATCH 01/14] PCI: add pcie_flags into struct pci_dev to cache PCIe capabilities register Jiang Liu
2012-07-11 9:01 ` Taku Izumi
2012-07-11 14:27 ` Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 02/14] PCI: introduce pci_pcie_type(dev) to replace pci_dev->pcie_type Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 03/14] PCI: remove unused field pcie_type from struct pci_dev Jiang Liu
2012-07-10 15:54 ` Jiang Liu [this message]
2012-07-10 18:49 ` [RFC PATCH 04/14] PCI: refine and move pcie_cap_has_*() macros to include/linux/pci.h Bjorn Helgaas
2012-07-10 15:54 ` [RFC PATCH 05/14] PCI: add access functions for PCIe capabilities to hide PCIe spec differences Jiang Liu
2012-07-10 18:35 ` Bjorn Helgaas
2012-07-11 3:07 ` Jiang Liu
2012-07-11 3:40 ` Bjorn Helgaas
2012-07-11 6:40 ` Jiang Liu
2012-07-11 17:52 ` Bjorn Helgaas
2012-07-12 2:56 ` Jiang Liu
2012-07-12 20:49 ` Bjorn Helgaas
2012-07-15 16:47 ` Jiang Liu
2012-07-16 17:29 ` Bjorn Helgaas
2012-07-16 18:57 ` Don Dutile
2012-07-17 0:09 ` Jiang Liu
2012-07-17 0:14 ` Bjorn Helgaas
2012-07-10 15:54 ` [RFC PATCH 06/14] PCI: use PCIe cap access functions to simplify PCI core implementation Jiang Liu
2012-07-10 18:35 ` Bjorn Helgaas
2012-07-11 2:49 ` Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 07/14] hotplug/PCI: use PCIe cap access functions to simplify implementation Jiang Liu
2012-07-10 18:35 ` Bjorn Helgaas
2012-07-10 15:54 ` [RFC PATCH 08/14] portdrv/PCI: " Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 09/14] pciehp/PCI: " Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 10/14] PME/PCI: " Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 11/14] AER/PCI: " Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 12/14] ASPM/PCI: " Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 13/14] r8169/PCI: " Jiang Liu
2012-07-10 15:54 ` [RFC PATCH 14/14] qib/PCI: " Jiang Liu
2012-08-15 19:12 ` [Resend with Ack][PATCH v1] PCI: allow acpiphp to handle PCIe ports without native PCIe hotplug capability Bjorn Helgaas
2012-08-16 15:15 ` Jiang Liu
2012-08-22 15:16 ` [PATCH v2] PCI: allow acpiphp to handle PCIe ports w/o " Jiang Liu
2012-09-24 22:10 ` Bjorn Helgaas
2012-09-25 15:16 ` Jiang Liu
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=1341935655-5381-5-git-send-email-jiang.liu@huawei.com \
--to=liuj97@gmail.com \
--cc=bhelgaas@google.com \
--cc=chenkeping@huawei.com \
--cc=ddutile@redhat.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=wangyijing@huawei.com \
--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).