linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, x86 <x86@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH -v2 20/26] PCI: Add addon_resource support for pci_dev
Date: Sun, 18 Mar 2012 22:48:43 -0700	[thread overview]
Message-ID: <1332136129-14010-21-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1332136129-14010-1-git-send-email-yinghai@kernel.org>

Will add addon_resources list in pci_dev, it will be used for resources
other than standard, rom, sriov, bridges.
Some could be same as std reg, but using different register.
Some could have own way to read/write to them.

Kernel using different way to hack those resources like abusing
pci bridge resource spot on non bridge pci device.

With this patch, will treat addon-resource like standard resource with
special ops.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 drivers/pci/probe.c |   18 ++++++++++++++++++
 include/linux/pci.h |   16 ++++++++++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index dfa56fb..6dbad5b 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -82,6 +82,12 @@ struct resource *pci_dev_resource_n(struct pci_dev *dev, int n)
 	if (n < PCI_NUM_RESOURCES)
 		return &dev->resource[n];
 
+	n -= PCI_NUM_RESOURCES;
+	list_for_each_entry(addon_res, &dev->addon_resources, list) {
+		if (n-- == 0)
+			return &addon_res->res;
+	}
+
 	return NULL;
 }
 
@@ -97,6 +103,16 @@ int pci_dev_resource_idx(struct pci_dev *dev, struct resource *res)
 	return -1;
 }
 
+static void pci_release_dev_addon_res(struct pci_dev *dev)
+{
+	struct pci_dev_addon_resource *addon_res, *tmp;
+
+	list_for_each_entry_safe(addon_res, tmp, &dev->addon_resources, list) {
+		list_del(&addon_res->list);
+		kfree(addon_res);
+	}
+}
+
 static u64 pci_size(u64 base, u64 maxbase, u64 mask)
 {
 	u64 size = mask & maxbase;	/* Find the significant bits */
@@ -1288,6 +1304,7 @@ static void pci_release_dev(struct device *dev)
 	pci_dev = to_pci_dev(dev);
 	pci_release_capabilities(pci_dev);
 	pci_release_of_node(pci_dev);
+	pci_release_dev_addon_res(pci_dev);
 	kfree(pci_dev);
 }
 
@@ -1367,6 +1384,7 @@ struct pci_dev *alloc_pci_dev(void)
 		return NULL;
 
 	INIT_LIST_HEAD(&dev->bus_list);
+	INIT_LIST_HEAD(&dev->addon_resources);
 
 	return dev;
 }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index c7a2806..2c8b1a4 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -299,6 +299,7 @@ struct pci_dev {
 	 */
 	unsigned int	irq;
 	struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
+	struct list_head addon_resources; /* addon I/O and memory resource */
 
 	/* These fields are used by common fixups */
 	unsigned int	transparent:1;	/* Transparent PCI bridge */
@@ -347,6 +348,21 @@ struct pci_dev {
 #endif
 };
 
+struct resource_ops {
+	int (*read)(struct pci_dev *dev, struct resource *res, int addr);
+	int (*write)(struct pci_dev *dev, struct resource *res, int addr);
+};
+
+struct pci_dev_addon_resource {
+	struct list_head list;
+	int reg_addr;
+	int size;
+	struct resource res;
+	struct resource_ops *ops;
+};
+#define	to_pci_dev_addon_resource(n)					\
+	container_of(n, struct pci_dev_addon_resource, res)
+
 struct resource *pci_dev_resource_n(struct pci_dev *dev, int n);
 int pci_dev_resource_idx(struct pci_dev *dev, struct resource *res);
 
-- 
1.7.7


  parent reply	other threads:[~2012-03-19  5:49 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-19  5:48 [PATCH -v2 00/26] PCI, x86: Add for_each_res and addon resource support Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 01/26] PCI: Add pci_dev_resource_n() Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 02/26] PCI: Add for_each_resource helpers to make resource loop easier Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 03/26] PCI: Add pci_dev_resource_idx() Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 04/26] PCI: Update pci_resource_start to use pci_dev_resource_n() Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 05/26] x86, PCI: Use for_each_res with pci_allocate_bridge_resources Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 06/26] x86, PCI: Use for_each_res with pci_allocate_dev_resources Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 07/26] PCI: Use for_each_res with IOV releated funcs Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 08/26] PCI, acpiphp: Use for_each_pci_dev_resource helper Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 09/26] PCI, pciehp: " Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 10/26] PCI: Use for_each_pci_dev_resource pci_enable_dev Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 11/26] PCI: Use for_each_pci_dev_resource pci_reassigndev Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 12/26] PCI: Use for_each_res with pci bar reassign funcs Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 13/26] PCI: Use for_each_res pci_assign_resource Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 14/26] PCI: Use for_each_res with noassign_bars Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 15/26] PCI: Use for_each_res pci bases pci_dev_driver() Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 16/26] PCI: Use for_each_res pci release release Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 17/26] PCI: Use for_each_res pci bases reading Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 18/26] PCI: Use for_each_res with mrs Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 19/26] PCI: Use for_each_res with xen pci Yinghai Lu
2012-03-19  5:48 ` Yinghai Lu [this message]
2012-03-19  5:48 ` [PATCH -v2 21/26] PCI: Add helpers for add addon_resource Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 22/26] PCI: Update pci_resource_bar() to support addon_resource Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 23/26] PCI: Make assign/update resource to support addon_res Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 24/26] PCI: Make piix4 quirk to use addon_resource support Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 25/26] PCI: Make quirk_io_region " Yinghai Lu
2012-03-19  5:48 ` [PATCH -v2 26/26] PCI: Use addon_fixed_resource with ati fixed resource Yinghai Lu

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=1332136129-14010-21-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=bhelgaas@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@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).