From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>, Ram Pai <linuxram@us.ibm.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v3 25/27] PCI: Make piix4 quirk to use addon_res
Date: Wed, 13 Mar 2013 16:28:20 -0700 [thread overview]
Message-ID: <1363217302-14383-26-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1363217302-14383-1-git-send-email-yinghai@kernel.org>
After they are put in add-on resources, they will be safely claimed later.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/quirks.c | 93 +++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 77 insertions(+), 16 deletions(-)
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 0369fb6..7e5392c 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -383,14 +383,14 @@ static void quirk_ali7101_acpi(struct pci_dev *dev)
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, quirk_ali7101_acpi);
-static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int port, unsigned int enable)
+static int piix4_read_io(struct pci_dev *dev, struct resource *res, int port)
{
u32 devres;
u32 mask, size, base;
+ struct pci_bus_region bus_region;
pci_read_config_dword(dev, port, &devres);
- if ((devres & enable) != enable)
- return;
+
mask = (devres >> 16) & 15;
base = devres & 0xffff;
size = 16;
@@ -400,23 +400,53 @@ static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int p
break;
size = bit;
}
- /*
- * For now we only print it out. Eventually we'll want to
- * reserve it (at least if it's in the 0x1000+ range), but
- * let's get enough confirmation reports first.
- */
base &= -size;
- dev_info(&dev->dev, "%s PIO at %04x-%04x\n", name, base, base + size - 1);
+
+ bus_region.start = base;
+ bus_region.end = base + size - 1;
+ res->flags |= IORESOURCE_IO;
+ pcibios_bus_to_resource(dev, res, &bus_region);
+ dev_info(&dev->dev, "PIO at %pR\n", res);
+
+ return 0;
}
+static int piix4_write_io(struct pci_dev *dev, struct resource *res, int port)
+{
+ u32 devres;
+ struct pci_bus_region bus_region;
+
+ pcibios_resource_to_bus(dev, &bus_region, res);
-static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int port, unsigned int enable)
+ pci_read_config_dword(dev, port, &devres);
+ devres &= 0xffff0000;
+ devres |= bus_region.start & 0xffff;
+ pci_write_config_dword(dev, port, devres);
+
+ return 0;
+}
+static struct resource_ops piix4_io_ops = {
+ .read = piix4_read_io,
+ .write = piix4_write_io,
+};
+static void piix4_io_quirk(struct pci_dev *dev, char *name, unsigned int port,
+ unsigned int enable)
{
u32 devres;
- u32 mask, size, base;
pci_read_config_dword(dev, port, &devres);
if ((devres & enable) != enable)
return;
+
+ pci_add_dev_addon_resource(dev, port, 0, &piix4_io_ops, name);
+}
+
+static int piix4_read_mem(struct pci_dev *dev, struct resource *res, int port)
+{
+ u32 devres;
+ u32 mask, size, base;
+ struct pci_bus_region bus_region;
+
+ pci_read_config_dword(dev, port, &devres);
base = devres & 0xffff0000;
mask = (devres & 0x3f) << 16;
size = 128 << 16;
@@ -426,12 +456,43 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int
break;
size = bit;
}
- /*
- * For now we only print it out. Eventually we'll want to
- * reserve it, but let's get enough confirmation reports first.
- */
base &= -size;
- dev_info(&dev->dev, "%s MMIO at %04x-%04x\n", name, base, base + size - 1);
+ bus_region.start = base;
+ bus_region.end = base + size - 1;
+ res->flags |= IORESOURCE_MEM;
+ pcibios_bus_to_resource(dev, res, &bus_region);
+ dev_info(&dev->dev, "MMIO at %pR\n", res);
+
+ return 0;
+}
+static int piix4_write_mem(struct pci_dev *dev, struct resource *res, int port)
+{
+ u32 devres;
+ struct pci_bus_region bus_region;
+
+ pcibios_resource_to_bus(dev, &bus_region, res);
+
+ pci_read_config_dword(dev, port, &devres);
+ devres &= 0x0000ffff;
+ devres |= bus_region.start & 0xffff0000;
+ pci_write_config_dword(dev, port, devres);
+
+ return 0;
+}
+static struct resource_ops piix4_mem_ops = {
+ .read = piix4_read_mem,
+ .write = piix4_write_mem,
+};
+static void piix4_mem_quirk(struct pci_dev *dev, char *name, unsigned int port,
+ unsigned int enable)
+{
+ u32 devres;
+
+ pci_read_config_dword(dev, port, &devres);
+ if ((devres & enable) != enable)
+ return;
+
+ pci_add_dev_addon_resource(dev, port, 0, &piix4_mem_ops, name);
}
/*
--
1.7.10.4
next prev parent reply other threads:[~2013-03-13 23:28 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-13 23:27 [PATCH v3 00/27] PCI: Add for_each_pci_resource and addon_res support Yinghai Lu
2013-03-13 23:27 ` [PATCH v3 01/27] PCI: Add pci_dev_resource_n() Yinghai Lu
2013-03-13 23:27 ` [PATCH v3 02/27] PCI: Add pci_dev_resource_idx() helper Yinghai Lu
2013-04-04 22:00 ` Bjorn Helgaas
2013-03-13 23:27 ` [PATCH v3 03/27] PCI: pci resource iterator Yinghai Lu
2013-04-04 22:18 ` Bjorn Helgaas
2013-04-09 4:51 ` Ram Pai
2013-04-10 15:22 ` Bjorn Helgaas
2013-04-25 3:55 ` Ram Pai
2013-04-25 17:22 ` Bjorn Helgaas
2013-04-28 6:08 ` Ram Pai
2013-04-10 16:12 ` Yinghai Lu
2013-03-13 23:27 ` [PATCH v3 04/27] PCI: Add is_pci_*_resource_idx() helpers Yinghai Lu
2013-04-04 22:23 ` Bjorn Helgaas
2013-03-13 23:28 ` [PATCH v3 05/27] PCI: Update pci_resource_start etc to use pci_dev_resource_n() Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 06/27] PCI, x86: Use for_each_pci_resource() with pci_allocate_bridge_resources Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 07/27] PCI, x86: Use for_each_pci_resource() with pci_allocate_dev_resources Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 08/27] PCI: Use for_each_pci_resource() with IOV releated functions Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 09/27] PCI, acpiphp: Use for_each_pci_resource() helper Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 10/27] PCI, pciehp: " Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 11/27] PCI: Use for_each_pci_resource() in pci_enable_dev Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 12/27] PCI: Use for_each_pci_resource() in pci_reassigndev Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 13/27] PCI: Use for_each_pci_resource() with pci bar reassign funcs Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 14/27] PCI: Use for_each_pci_resource() in pci_assign_resource Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 15/27] PCI, x86: Use for_each_pci_resource() with noassign_bars Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 16/27] PCI: Use for_each_pci_resource() in pci_dev_driver() Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 17/27] PCI: Use for_each_pci_resource() in pci resource release Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 18/27] PCI: Use for_each_pci_resource() in pci bases reading Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 19/27] PCI, x86: Use for_each_pci_resource() with mrst Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 20/27] PCI, xen: Use for_each_pci_resource() with xen pci Yinghai Lu
2013-03-15 13:35 ` Konrad Rzeszutek Wilk
2013-03-13 23:28 ` [PATCH v3 21/27] PCI: Add addon_resource support for pci devices Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 22/27] PCI: Add helpers to add addon_resource Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 23/27] PCI: Update pci_resource_bar() to support addon_resource Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 24/27] PCI: Assign/update resource to addon_res Yinghai Lu
2013-03-13 23:28 ` Yinghai Lu [this message]
2013-03-13 23:28 ` [PATCH v3 26/27] PCI: Make quirk_io_region to use addon_res Yinghai Lu
2013-04-04 21:35 ` Bjorn Helgaas
2013-04-10 2:17 ` Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 27/27] 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=1363217302-14383-26-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxram@us.ibm.com \
/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).