From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: linux-pci@vger.kernel.org, linux-sh@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: [PATCH v4 16/22] pci: pci_config_window move to linux/pci.h
Date: Wed, 29 Jun 2016 22:41:01 +0900 [thread overview]
Message-ID: <1467207667-15768-17-git-send-email-ysato@users.sourceforge.jp> (raw)
In-Reply-To: <1467207667-15768-1-git-send-email-ysato@users.sourceforge.jp>
Chanegs v4
none
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
drivers/pci/ecam.h | 17 +----------------
include/linux/pci.h | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/drivers/pci/ecam.h b/drivers/pci/ecam.h
index 9878beb..f110091 100644
--- a/drivers/pci/ecam.h
+++ b/drivers/pci/ecam.h
@@ -18,6 +18,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
+#include <linux/pci.h>
/*
* struct to hold pci ops and bus shift of the config window
@@ -31,22 +32,6 @@ struct pci_ecam_ops {
struct pci_config_window *);
};
-/*
- * struct to hold the mappings of a config space window. This
- * is expected to be used as sysdata for PCI controllers that
- * use ECAM.
- */
-struct pci_config_window {
- struct resource res;
- struct resource busr;
- void *priv;
- struct pci_ecam_ops *ops;
- union {
- void __iomem *win; /* 64-bit single mapping */
- void __iomem **winp; /* 32-bit per-bus mapping */
- };
-};
-
/* create and free pci_config_window */
struct pci_config_window *pci_ecam_create(struct device *dev,
struct resource *cfgres, struct resource *busr,
diff --git a/include/linux/pci.h b/include/linux/pci.h
index b67e4df..398896f 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2026,6 +2026,24 @@ static inline bool pci_ari_enabled(struct pci_bus *bus)
return bus->self && bus->self->ari_enabled;
}
+/*
+ * struct to hold the mappings of a config space window. This
+ * is expected to be used as sysdata for PCI controllers that
+ * use ECAM.
+ */
+struct pci_ecam_ops;
+
+struct pci_config_window {
+ struct resource res;
+ struct resource busr;
+ void *priv;
+ struct pci_ecam_ops *ops;
+ union {
+ void __iomem *win; /* 64-bit single mapping */
+ void __iomem **winp; /* 32-bit per-bus mapping */
+ };
+};
+
/* provide the legacy pci_dma_* API */
#include <linux/pci-dma-compat.h>
--
2.7.0
next prev parent reply other threads:[~2016-06-29 14:04 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 13:40 [PATCH v4 00/22] sh: LANDISK and R2Dplus convert to device tree Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 01/22] sh: Add sh-specific early_init_dt_reserve_memory_arch Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 02/22] sh: More early unflatten device tree Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 03/22] sh: set preset_lpj Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 04/22] sh: Use P1SEGADDR Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 05/22] sh: command line passing chosen/bootargs in devicetree Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 06/22] sh: FDT address save before bank change Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 07/22] sh: Passing FDT address on zImage Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 08/22] sh: Disable board specific code on device tree mode Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 09/22] sh: Use GENERIC_IOMAP " Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 10/22] sh: Add board specific initialize of of-generic Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 11/22] sh: SH7750/51 CPG Driver Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 12/22] sh: Add PCI host bridge driver for SH7751 Yoshinori Sato
2016-06-29 14:57 ` Arnd Bergmann
2016-06-30 14:52 ` Yoshinori Sato
2016-07-01 1:43 ` Rob Herring
2016-06-29 13:40 ` [PATCH v4 13/22] sh: irqchip: SH7751 IRQCHIP Driver Yoshinori Sato
2016-06-29 13:40 ` [PATCH v4 14/22] sh: SH7751 core dtsi Yoshinori Sato
2016-07-01 8:57 ` Geert Uytterhoeven
2016-07-03 11:34 ` Yoshinori Sato
2016-07-04 7:15 ` Geert Uytterhoeven
2016-07-04 16:12 ` Yoshinori Sato
2016-06-29 13:41 ` [PATCH v4 15/22] sh: Move common PCI stuff to arch/sh/kernel Yoshinori Sato
2016-06-29 13:41 ` Yoshinori Sato [this message]
2016-06-29 13:41 ` [PATCH v4 17/22] pci: PCI_HOST_GENERIC enable for SH Yoshinori Sato
2016-06-29 13:41 ` [PATCH v4 18/22] sh: Add separate DTB build rule Yoshinori Sato
2016-06-29 13:41 ` [PATCH v4 19/22] sh: IO-DATA HDL-U (a,k.a landisk) IRQCHIP driver Yoshinori Sato
2016-06-29 13:43 ` John Paul Adrian Glaubitz
2016-07-01 1:48 ` Rob Herring
2016-07-03 11:36 ` Yoshinori Sato
2016-06-29 13:41 ` [PATCH v4 20/22] sh: IO-DATA HDL-U (a,k.a landisk) DeviceTree Yoshinori Sato
2016-06-29 13:41 ` [PATCH v4 21/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) IRQCHIP Driver Yoshinori Sato
2016-07-01 1:53 ` Rob Herring
2016-07-03 11:35 ` Yoshinori Sato
2016-06-29 13:41 ` [PATCH v4 22/22] sh: Renesas RTS7751R2Dplus (a,k.a R2Dplus) DeviceTree Yoshinori Sato
2016-06-29 14:16 ` Sergei Shtylyov
2016-06-30 14:47 ` Yoshinori Sato
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=1467207667-15768-17-git-send-email-ysato@users.sourceforge.jp \
--to=ysato@users.sourceforge.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-sh@vger.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).