. and now onto removing obsolete function declerations.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
drivers/xen/pcifront/Makefile | 2 +-
drivers/xen/pcifront/pci_op.c | 560 -----------------------------------------
drivers/xen/pcifront/xenbus.c | 548 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 549 insertions(+), 561 deletions(-)
delete mode 100644 drivers/xen/pcifront/pci_op.c
diff --git a/drivers/xen/pcifront/Makefile b/drivers/xen/pcifront/Makefile
index 1f8fa9d..d49136e 100644
--- a/drivers/xen/pcifront/Makefile
+++ b/drivers/xen/pcifront/Makefile
@@ -1,6 +1,6 @@
obj-y += pcifront.o
-pcifront-y := pci_op.o xenbus.o
+pcifront-y := xenbus.o
ifeq ($(CONFIG_XEN_PCIDEV_FE_DEBUG),y)
EXTRA_CFLAGS += -DDEBUG
diff --git a/drivers/xen/pcifront/pci_op.c b/drivers/xen/pcifront/pci_op.c
deleted file mode 100644
index e2bea86..0000000
--- a/drivers/xen/pcifront/pci_op.c
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
- * PCI Frontend Operations - Communicates with frontend
- *
- * Author: Ryan Wilson <hap9@xxxxxxxxxxxxxx>
- */
-#include <linux/module.h>
-#include <linux/version.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/spinlock.h>
-#include <asm/bitops.h>
-#include <linux/time.h>
-#include <xen/events.h>
-#include "pcifront.h"
-
-static int verbose_request = 0;
-module_param(verbose_request, int, 0644);
-
-
-static int errno_to_pcibios_err(int errno)
-{
- switch (errno) {
- case XEN_PCI_ERR_success:
- return PCIBIOS_SUCCESSFUL;
-
- case XEN_PCI_ERR_dev_not_found:
- return PCIBIOS_DEVICE_NOT_FOUND;
-
- case XEN_PCI_ERR_invalid_offset:
- case XEN_PCI_ERR_op_failed:
- return PCIBIOS_BAD_REGISTER_NUMBER;
-
- case XEN_PCI_ERR_not_implemented:
- return PCIBIOS_FUNC_NOT_SUPPORTED;
-
- case XEN_PCI_ERR_access_denied:
- return PCIBIOS_SET_FAILED;
- }
- return errno;
-}
-
-static inline void schedule_pcifront_aer_op(struct pcifront_device *pdev)
-{
- if (test_bit(_XEN_PCIB_active, (unsigned long *)&pdev->sh_info->flags)
- && !test_and_set_bit(_PDEVB_op_active, &pdev->flags)) {
- dev_dbg(&pdev->xdev->dev, "schedule aer frontend job\n");
- schedule_work(&pdev->op_work);
- }
-}
-
-static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op)
-{
- int err = 0;
- struct xen_pci_op *active_op = &pdev->sh_info->op;
- unsigned long irq_flags;
- evtchn_port_t port = pdev->evtchn;
- unsigned irq = pdev->irq;
- s64 ns, ns_timeout;
- struct timeval tv;
-
- spin_lock_irqsave(&pdev->sh_info_lock, irq_flags);
-
- memcpy(active_op, op, sizeof(struct xen_pci_op));
-
- /* Go */
- wmb();
- set_bit(_XEN_PCIF_active, (unsigned long *)&pdev->sh_info->flags);
- notify_remote_via_evtchn(port);
-
- /*
- * We set a poll timeout of 3 seconds but give up on return after
- * 2 seconds. It is better to time out too late rather than too early
- * (in the latter case we end up continually re-executing poll() with a
- * timeout in the past). 1s difference gives plenty of slack for error.
- */
- do_gettimeofday(&tv);
- ns_timeout = timeval_to_ns(&tv) + 2 * (s64)NSEC_PER_SEC;
-
- xen_clear_irq_pending(irq);
-
- while (test_bit(_XEN_PCIF_active,
- (unsigned long *)&pdev->sh_info->flags)) {
- xen_poll_irq_timeout(irq, jiffies + 3*HZ);
- xen_clear_irq_pending(irq);
- do_gettimeofday(&tv);
- ns = timeval_to_ns(&tv);
- if (ns > ns_timeout) {
- dev_err(&pdev->xdev->dev,
- "pciback not responding!!!\n");
- clear_bit(_XEN_PCIF_active,
- (unsigned long *)&pdev->sh_info->flags);
- err = XEN_PCI_ERR_dev_not_found;
- goto out;
- }
- }
-
- /*
- * We might lose backend service request since we
- * reuse same evtchn with pci_conf backend response. So re-schedule
- * aer pcifront service.
- */
- if (test_bit(_XEN_PCIB_active,
- (unsigned long*)&pdev->sh_info->flags)) {
- dev_err(&pdev->xdev->dev,
- "schedule aer pcifront service\n");
- schedule_pcifront_aer_op(pdev);
- }
-
- memcpy(op, active_op, sizeof(struct xen_pci_op));
-
- err = op->err;
- out:
- spin_unlock_irqrestore(&pdev->sh_info_lock, irq_flags);
- return err;
-}
-
-/* Access to this function is spinlocked in drivers/pci/access.c */
-static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,
- int where, int size, u32 * val)
-{
- int err = 0;
- struct xen_pci_op op = {
- .cmd = XEN_PCI_OP_conf_read,
- .domain = pci_domain_nr(bus),
- .bus = bus->number,
- .devfn = devfn,
- .offset = where,
- .size = size,
- };
- struct pcifront_sd *sd = bus->sysdata;
- struct pcifront_device *pdev = pcifront_get_pdev(sd);
-
- if (verbose_request)
- dev_info(&pdev->xdev->dev,
- "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n",
- pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
- PCI_FUNC(devfn), where, size);
-
- err = do_pci_op(pdev, &op);
-
- if (likely(!err)) {
- if (verbose_request)
- dev_info(&pdev->xdev->dev, "read got back value %x\n",
- op.value);
-
- *val = op.value;
- } else if (err == -ENODEV) {
- /* No device here, pretend that it just returned 0 */
- err = 0;
- *val = 0;
- }
-
- return errno_to_pcibios_err(err);
-}
-
-/* Access to this function is spinlocked in drivers/pci/access.c */
-static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn,
- int where, int size, u32 val)
-{
- struct xen_pci_op op = {
- .cmd = XEN_PCI_OP_conf_write,
- .domain = pci_domain_nr(bus),
- .bus = bus->number,
- .devfn = devfn,
- .offset = where,
- .size = size,
- .value = val,
- };
- struct pcifront_sd *sd = bus->sysdata;
- struct pcifront_device *pdev = pcifront_get_pdev(sd);
-
- if (verbose_request)
- dev_info(&pdev->xdev->dev,
- "write dev=%04x:%02x:%02x.%01x - "
- "offset %x size %d val %x\n",
- pci_domain_nr(bus), bus->number,
- PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
-
- return errno_to_pcibios_err(do_pci_op(pdev, &op));
-}
-
-struct pci_ops pcifront_bus_ops = {
- .read = pcifront_bus_read,
- .write = pcifront_bus_write,
-};
-
-#ifdef CONFIG_PCI_MSI
-int pci_frontend_enable_msix(struct pci_dev *dev,
- struct msix_entry *entries,
- int nvec)
-{
- int err;
- int i;
- struct xen_pci_op op = {
- .cmd = XEN_PCI_OP_enable_msix,
- .domain = pci_domain_nr(dev->bus),
- .bus = dev->bus->number,
- .devfn = dev->devfn,
- .value = nvec,
- };
- struct pcifront_sd *sd = dev->bus->sysdata;
- struct pcifront_device *pdev = pcifront_get_pdev(sd);
-
- if (nvec > SH_INFO_MAX_VEC) {
- printk("too much vector for pci frontend%x\n", nvec);
- return -EINVAL;
- }
-
- for (i = 0; i < nvec; i++) {
- op.msix_entries[i].entry = entries[i].entry;
- op.msix_entries[i].vector = entries[i].vector;
- }
-
- err = do_pci_op(pdev, &op);
-
- if (!err) {
- if (!op.value) {
- /* we get the result */
- for ( i = 0; i < nvec; i++)
- entries[i].vector = op.msix_entries[i].vector;
- return 0;
- }
- else {
- printk("enable msix get value %x\n", op.value);
- return op.value;
- }
- }
- else {
- printk("enable msix get err %x\n", err);
- return err;
- }
-}
-
-void pci_frontend_disable_msix(struct pci_dev* dev)
-{
- int err;
- struct xen_pci_op op = {
- .cmd = XEN_PCI_OP_disable_msix,
- .domain = pci_domain_nr(dev->bus),
- .bus = dev->bus->number,
- .devfn = dev->devfn,
- };
- struct pcifront_sd *sd = dev->bus->sysdata;
- struct pcifront_device *pdev = pcifront_get_pdev(sd);
-
- err = do_pci_op(pdev, &op);
-
- /* What should do for error ? */
- if (err)
- printk("pci_disable_msix get err %x\n", err);
-}
-
-int pci_frontend_enable_msi(struct pci_dev *dev)
-{
- int err;
- struct xen_pci_op op = {
- .cmd = XEN_PCI_OP_enable_msi,
- .domain = pci_domain_nr(dev->bus),
- .bus = dev->bus->number,
- .devfn = dev->devfn,
- };
- struct pcifront_sd *sd = dev->bus->sysdata;
- struct pcifront_device *pdev = pcifront_get_pdev(sd);
-
- err = do_pci_op(pdev, &op);
- if (likely(!err)) {
- dev->irq = op.value;
- }
- else {
- printk("pci frontend enable msi failed for dev %x:%x \n",
- op.bus, op.devfn);
- err = -EINVAL;
- }
- return err;
-}
-
-void pci_frontend_disable_msi(struct pci_dev* dev)
-{
- int err;
- struct xen_pci_op op = {
- .cmd = XEN_PCI_OP_disable_msi,
- .domain = pci_domain_nr(dev->bus),
- .bus = dev->bus->number,
- .devfn = dev->devfn,
- };
- struct pcifront_sd *sd = dev->bus->sysdata;
- struct pcifront_device *pdev = pcifront_get_pdev(sd);
-
- err = do_pci_op(pdev, &op);
- if (err == XEN_PCI_ERR_dev_not_found) {
- /* XXX No response from backend, what shall we do? */
- printk("get no response from backend for disable MSI\n");
- return;
- }
- if (likely(!err))
- dev->irq = op.value;
- else
- /* how can pciback notify us fail? */
- printk("get fake response frombackend \n");
-}
-#endif /* CONFIG_PCI_MSI */
-
-/* Claim resources for the PCI frontend as-is, backend won't allow changes */
-static int pcifront_claim_resource(struct pci_dev *dev, void *data)
-{
- struct pcifront_device *pdev = data;
- int i;
- struct resource *r;
-
- for (i = 0; i < PCI_NUM_RESOURCES; i++) {
- r = &dev->resource[i];
-
- if (!r->parent && r->start && r->flags) {
- dev_dbg(&pdev->xdev->dev, "claiming resource %s/%d\n",
- pci_name(dev), i);
- pci_claim_resource(dev, i);
- }
- }
-
- return 0;
-}
-
-int __devinit pcifront_scan_root(struct pcifront_device *pdev,
- unsigned int domain, unsigned int bus)
-{
- struct pci_bus *b;
- struct pcifront_sd *sd = NULL;
- struct pci_bus_entry *bus_entry = NULL;
- int err = 0;
-
-#ifndef CONFIG_PCI_DOMAINS
- if (domain != 0) {
- dev_err(&pdev->xdev->dev,
- "PCI Root in non-zero PCI Domain! domain=%d\n", domain);
- dev_err(&pdev->xdev->dev,
- "Please compile with CONFIG_PCI_DOMAINS\n");
- err = -EINVAL;
- goto err_out;
- }
-#endif
-
- dev_info(&pdev->xdev->dev, "Creating PCI Frontend Bus %04x:%02x\n",
- domain, bus);
-
- bus_entry = kmalloc(sizeof(*bus_entry), GFP_KERNEL);
- sd = kmalloc(sizeof(*sd), GFP_KERNEL);
- if (!bus_entry || !sd) {
- err = -ENOMEM;
- goto err_out;
- }
- pcifront_init_sd(sd, domain, bus, pdev);
-
- b = pci_scan_bus_parented(&pdev->xdev->dev, bus,
- &pcifront_bus_ops, sd);
- if (!b) {
- dev_err(&pdev->xdev->dev,
- "Error creating PCI Frontend Bus!\n");
- err = -ENOMEM;
- goto err_out;
- }
-
- pcifront_setup_root_resources(b, sd);
- bus_entry->bus = b;
-
- list_add(&bus_entry->list, &pdev->root_buses);
-
- /* Claim resources before going "live" with our devices */
- pci_walk_bus(b, pcifront_claim_resource, pdev);
-
- pci_bus_add_devices(b);
-
- return 0;
-
- err_out:
- kfree(bus_entry);
- kfree(sd);
-
- return err;
-}
-
-int __devinit pcifront_rescan_root(struct pcifront_device *pdev,
- unsigned int domain, unsigned int bus)
-{
- struct pci_bus *b;
- struct pci_dev *d;
- unsigned int devfn;
- int err;
-
-#ifndef CONFIG_PCI_DOMAINS
- if (domain != 0) {
- dev_err(&pdev->xdev->dev,
- "PCI Root in non-zero PCI Domain! domain=%d\n", domain);
- dev_err(&pdev->xdev->dev,
- "Please compile with CONFIG_PCI_DOMAINS\n");
- return -EINVAL;
- }
-#endif
-
- dev_info(&pdev->xdev->dev, "Rescanning PCI Frontend Bus %04x:%02x\n",
- domain, bus);
-
- b = pci_find_bus(domain, bus);
- if(!b)
- /* If the bus is unknown, create it. */
- return pcifront_scan_root(pdev, domain, bus);
-
- /* Rescan the bus for newly attached functions and add.
- * We omit handling of PCI bridge attachment because pciback prevents
- * bridges from being exported.
- */
- for (devfn = 0; devfn < 0x100; devfn++) {
- d = pci_get_slot(b, devfn);
- if(d) {
- /* Device is already known. */
- pci_dev_put(d);
- continue;
- }
-
- d = pci_scan_single_device(b, devfn);
- if (d) {
- dev_info(&pdev->xdev->dev, "New device on "
- "%04x:%02x:%02x.%02x found.\n", domain, bus,
- PCI_SLOT(devfn), PCI_FUNC(devfn));
- err = pci_bus_add_device(d);
- if (err) {
- dev_err(&pdev->xdev->dev, "Failed to add "
- " device to bus.\n");
- return err;
- }
-
- }
- }
-
- return 0;
-}
-
-static void free_root_bus_devs(struct pci_bus *bus)
-{
- struct pci_dev *dev;
-
- while (!list_empty(&bus->devices)) {
- dev = container_of(bus->devices.next, struct pci_dev,
- bus_list);
- dev_dbg(&dev->dev, "removing device\n");
- pci_remove_bus_device(dev);
- }
-}
-
-void pcifront_free_roots(struct pcifront_device *pdev)
-{
- struct pci_bus_entry *bus_entry, *t;
-
- dev_dbg(&pdev->xdev->dev, "cleaning up root buses\n");
-
- list_for_each_entry_safe(bus_entry, t, &pdev->root_buses, list) {
- list_del(&bus_entry->list);
-
- free_root_bus_devs(bus_entry->bus);
-
- kfree(bus_entry->bus->sysdata);
-
- device_unregister(bus_entry->bus->bridge);
- pci_remove_bus(bus_entry->bus);
-
- kfree(bus_entry);
- }
-}
-
-static pci_ers_result_t pcifront_common_process( int cmd, struct
pcifront_device *pdev,
- pci_channel_state_t state)
-{
- pci_ers_result_t result;
- struct pci_driver *pdrv;
- int bus = pdev->sh_info->aer_op.bus;
- int devfn = pdev->sh_info->aer_op.devfn;
- struct pci_dev *pcidev;
- int flag = 0;
-
- dev_dbg(&pdev->xdev->dev,
- "pcifront AER process: cmd %x (bus:%x, devfn%x)",
- cmd, bus, devfn);
- result = PCI_ERS_RESULT_NONE;
-
- pcidev = pci_get_bus_and_slot(bus, devfn);
- if (!pcidev || !pcidev->driver){
- dev_err(&pcidev->dev,
- "device or driver is NULL\n");
- return result;
- }
- pdrv = pcidev->driver;
-
- if (get_driver(&pdrv->driver)) {
- if (pdrv->err_handler && pdrv->err_handler->error_detected) {
- dev_dbg(&pcidev->dev,
- "trying to call AER service\n");
- if (pcidev) {
- flag = 1;
- switch(cmd) {
- case XEN_PCI_OP_aer_detected:
- result =
pdrv->err_handler->error_detected(pcidev, state);
- break;
- case XEN_PCI_OP_aer_mmio:
- result =
pdrv->err_handler->mmio_enabled(pcidev);
- break;
- case XEN_PCI_OP_aer_slotreset:
- result =
pdrv->err_handler->slot_reset(pcidev);
- break;
- case XEN_PCI_OP_aer_resume:
- pdrv->err_handler->resume(pcidev);
- break;
- default:
- dev_err(&pdev->xdev->dev,
- "bad request in aer recovery
operation!\n");
-
- }
- }
- }
- put_driver(&pdrv->driver);
- }
- if (!flag)
- result = PCI_ERS_RESULT_NONE;
-
- return result;
-}
-
-
-void pcifront_do_aer(struct work_struct *data)
-{
- struct pcifront_device *pdev = container_of(data, struct
pcifront_device, op_work);
- int cmd = pdev->sh_info->aer_op.cmd;
- pci_channel_state_t state =
- (pci_channel_state_t)pdev->sh_info->aer_op.err;
-
- /*If a pci_conf op is in progress,
- we have to wait until it is done before service aer op*/
- dev_dbg(&pdev->xdev->dev,
- "pcifront service aer bus %x devfn %x\n",
pdev->sh_info->aer_op.bus,
- pdev->sh_info->aer_op.devfn);
-
- pdev->sh_info->aer_op.err = pcifront_common_process(cmd, pdev, state);
-
- wmb();
- clear_bit(_XEN_PCIB_active, (unsigned long*)&pdev->sh_info->flags);
- notify_remote_via_evtchn(pdev->evtchn);
-
- /*in case of we lost an aer request in four lines time_window*/
- smp_mb__before_clear_bit();
- clear_bit( _PDEVB_op_active, &pdev->flags);
- smp_mb__after_clear_bit();
-
- schedule_pcifront_aer_op(pdev);
-
-}
-
-irqreturn_t pcifront_handler_aer(int irq, void *dev)
-{
- struct pcifront_device *pdev = dev;
- schedule_pcifront_aer_op(pdev);
- return IRQ_HANDLED;
-}
diff --git a/drivers/xen/pcifront/xenbus.c b/drivers/xen/pcifront/xenbus.c
index 56ad256..62e0008 100644
--- a/drivers/xen/pcifront/xenbus.c
+++ b/drivers/xen/pcifront/xenbus.c
@@ -17,6 +17,9 @@
#include <linux/interrupt.h>
#include <asm/atomic.h>
#include <linux/workqueue.h>
+#include <asm/bitops.h>
+#include <linux/time.h>
+
#ifndef __init_refok
@@ -90,6 +93,551 @@ irqreturn_t pcifront_handler_aer(int irq, void *dev);
DEFINE_SPINLOCK(pcifront_dev_lock);
static struct pcifront_device *pcifront_dev = NULL;
+static int verbose_request = 0;
+module_param(verbose_request, int, 0644);
+
+
+static int errno_to_pcibios_err(int errno)
+{
+ switch (errno) {
+ case XEN_PCI_ERR_success:
+ return PCIBIOS_SUCCESSFUL;
+
+ case XEN_PCI_ERR_dev_not_found:
+ return PCIBIOS_DEVICE_NOT_FOUND;
+
+ case XEN_PCI_ERR_invalid_offset:
+ case XEN_PCI_ERR_op_failed:
+ return PCIBIOS_BAD_REGISTER_NUMBER;
+
+ case XEN_PCI_ERR_not_implemented:
+ return PCIBIOS_FUNC_NOT_SUPPORTED;
+
+ case XEN_PCI_ERR_access_denied:
+ return PCIBIOS_SET_FAILED;
+ }
+ return errno;
+}
+
+static inline void schedule_pcifront_aer_op(struct pcifront_device *pdev)
+{
+ if (test_bit(_XEN_PCIB_active, (unsigned long *)&pdev->sh_info->flags)
+ && !test_and_set_bit(_PDEVB_op_active, &pdev->flags)) {
+ dev_dbg(&pdev->xdev->dev, "schedule aer frontend job\n");
+ schedule_work(&pdev->op_work);
+ }
+}
+
+static int do_pci_op(struct pcifront_device *pdev, struct xen_pci_op *op)
+{
+ int err = 0;
+ struct xen_pci_op *active_op = &pdev->sh_info->op;
+ unsigned long irq_flags;
+ evtchn_port_t port = pdev->evtchn;
+ unsigned irq = pdev->irq;
+ s64 ns, ns_timeout;
+ struct timeval tv;
+
+ spin_lock_irqsave(&pdev->sh_info_lock, irq_flags);
+
+ memcpy(active_op, op, sizeof(struct xen_pci_op));
+
+ /* Go */
+ wmb();
+ set_bit(_XEN_PCIF_active, (unsigned long *)&pdev->sh_info->flags);
+ notify_remote_via_evtchn(port);
+
+ /*
+ * We set a poll timeout of 3 seconds but give up on return after
+ * 2 seconds. It is better to time out too late rather than too early
+ * (in the latter case we end up continually re-executing poll() with a
+ * timeout in the past). 1s difference gives plenty of slack for error.
+ */
+ do_gettimeofday(&tv);
+ ns_timeout = timeval_to_ns(&tv) + 2 * (s64)NSEC_PER_SEC;
+
+ xen_clear_irq_pending(irq);
+
+ while (test_bit(_XEN_PCIF_active,
+ (unsigned long *)&pdev->sh_info->flags)) {
+ xen_poll_irq_timeout(irq, jiffies + 3*HZ);
+ xen_clear_irq_pending(irq);
+ do_gettimeofday(&tv);
+ ns = timeval_to_ns(&tv);
+ if (ns > ns_timeout) {
+ dev_err(&pdev->xdev->dev,
+ "pciback not responding!!!\n");
+ clear_bit(_XEN_PCIF_active,
+ (unsigned long *)&pdev->sh_info->flags);
+ err = XEN_PCI_ERR_dev_not_found;
+ goto out;
+ }
+ }
+
+ /*
+ * We might lose backend service request since we
+ * reuse same evtchn with pci_conf backend response. So re-schedule
+ * aer pcifront service.
+ */
+ if (test_bit(_XEN_PCIB_active,
+ (unsigned long*)&pdev->sh_info->flags)) {
+ dev_err(&pdev->xdev->dev,
+ "schedule aer pcifront service\n");
+ schedule_pcifront_aer_op(pdev);
+ }
+
+ memcpy(op, active_op, sizeof(struct xen_pci_op));
+
+ err = op->err;
+ out:
+ spin_unlock_irqrestore(&pdev->sh_info_lock, irq_flags);
+ return err;
+}
+
+/* Access to this function is spinlocked in drivers/pci/access.c */
+static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,
+ int where, int size, u32 * val)
+{
+ int err = 0;
+ struct xen_pci_op op = {
+ .cmd = XEN_PCI_OP_conf_read,
+ .domain = pci_domain_nr(bus),
+ .bus = bus->number,
+ .devfn = devfn,
+ .offset = where,
+ .size = size,
+ };
+ struct pcifront_sd *sd = bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
+ if (verbose_request)
+ dev_info(&pdev->xdev->dev,
+ "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n",
+ pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
+ PCI_FUNC(devfn), where, size);
+
+ err = do_pci_op(pdev, &op);
+
+ if (likely(!err)) {
+ if (verbose_request)
+ dev_info(&pdev->xdev->dev, "read got back value %x\n",
+ op.value);
+
+ *val = op.value;
+ } else if (err == -ENODEV) {
+ /* No device here, pretend that it just returned 0 */
+ err = 0;
+ *val = 0;
+ }
+
+ return errno_to_pcibios_err(err);
+}
+
+/* Access to this function is spinlocked in drivers/pci/access.c */
+static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn,
+ int where, int size, u32 val)
+{
+ struct xen_pci_op op = {
+ .cmd = XEN_PCI_OP_conf_write,
+ .domain = pci_domain_nr(bus),
+ .bus = bus->number,
+ .devfn = devfn,
+ .offset = where,
+ .size = size,
+ .value = val,
+ };
+ struct pcifront_sd *sd = bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
+ if (verbose_request)
+ dev_info(&pdev->xdev->dev,
+ "write dev=%04x:%02x:%02x.%01x - "
+ "offset %x size %d val %x\n",
+ pci_domain_nr(bus), bus->number,
+ PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
+
+ return errno_to_pcibios_err(do_pci_op(pdev, &op));
+}
+
+struct pci_ops pcifront_bus_ops = {
+ .read = pcifront_bus_read,
+ .write = pcifront_bus_write,
+};
+
+#ifdef CONFIG_PCI_MSI
+int pci_frontend_enable_msix(struct pci_dev *dev,
+ struct msix_entry *entries,
+ int nvec)
+{
+ int err;
+ int i;
+ struct xen_pci_op op = {
+ .cmd = XEN_PCI_OP_enable_msix,
+ .domain = pci_domain_nr(dev->bus),
+ .bus = dev->bus->number,
+ .devfn = dev->devfn,
+ .value = nvec,
+ };
+ struct pcifront_sd *sd = dev->bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
+ if (nvec > SH_INFO_MAX_VEC) {
+ printk("too much vector for pci frontend%x\n", nvec);
+ return -EINVAL;
+ }
+
+ for (i = 0; i < nvec; i++) {
+ op.msix_entries[i].entry = entries[i].entry;
+ op.msix_entries[i].vector = entries[i].vector;
+ }
+
+ err = do_pci_op(pdev, &op);
+
+ if (!err) {
+ if (!op.value) {
+ /* we get the result */
+ for ( i = 0; i < nvec; i++)
+ entries[i].vector = op.msix_entries[i].vector;
+ return 0;
+ }
+ else {
+ printk("enable msix get value %x\n", op.value);
+ return op.value;
+ }
+ }
+ else {
+ printk("enable msix get err %x\n", err);
+ return err;
+ }
+}
+
+void pci_frontend_disable_msix(struct pci_dev* dev)
+{
+ int err;
+ struct xen_pci_op op = {
+ .cmd = XEN_PCI_OP_disable_msix,
+ .domain = pci_domain_nr(dev->bus),
+ .bus = dev->bus->number,
+ .devfn = dev->devfn,
+ };
+ struct pcifront_sd *sd = dev->bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
+ err = do_pci_op(pdev, &op);
+
+ /* What should do for error ? */
+ if (err)
+ printk("pci_disable_msix get err %x\n", err);
+}
+
+int pci_frontend_enable_msi(struct pci_dev *dev)
+{
+ int err;
+ struct xen_pci_op op = {
+ .cmd = XEN_PCI_OP_enable_msi,
+ .domain = pci_domain_nr(dev->bus),
+ .bus = dev->bus->number,
+ .devfn = dev->devfn,
+ };
+ struct pcifront_sd *sd = dev->bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
+ err = do_pci_op(pdev, &op);
+ if (likely(!err)) {
+ dev->irq = op.value;
+ }
+ else {
+ printk("pci frontend enable msi failed for dev %x:%x \n",
+ op.bus, op.devfn);
+ err = -EINVAL;
+ }
+ return err;
+}
+
+void pci_frontend_disable_msi(struct pci_dev* dev)
+{
+ int err;
+ struct xen_pci_op op = {
+ .cmd = XEN_PCI_OP_disable_msi,
+ .domain = pci_domain_nr(dev->bus),
+ .bus = dev->bus->number,
+ .devfn = dev->devfn,
+ };
+ struct pcifront_sd *sd = dev->bus->sysdata;
+ struct pcifront_device *pdev = pcifront_get_pdev(sd);
+
+ err = do_pci_op(pdev, &op);
+ if (err == XEN_PCI_ERR_dev_not_found) {
+ /* XXX No response from backend, what shall we do? */
+ printk("get no response from backend for disable MSI\n");
+ return;
+ }
+ if (likely(!err))
+ dev->irq = op.value;
+ else
+ /* how can pciback notify us fail? */
+ printk("get fake response frombackend \n");
+}
+#endif /* CONFIG_PCI_MSI */
+
+/* Claim resources for the PCI frontend as-is, backend won't allow changes */
+static int pcifront_claim_resource(struct pci_dev *dev, void *data)
+{
+ struct pcifront_device *pdev = data;
+ int i;
+ struct resource *r;
+
+ for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+ r = &dev->resource[i];
+
+ if (!r->parent && r->start && r->flags) {
+ dev_dbg(&pdev->xdev->dev, "claiming resource %s/%d\n",
+ pci_name(dev), i);
+ pci_claim_resource(dev, i);
+ }
+ }
+
+ return 0;
+}
+
+int __devinit pcifront_scan_root(struct pcifront_device *pdev,
+ unsigned int domain, unsigned int bus)
+{
+ struct pci_bus *b;
+ struct pcifront_sd *sd = NULL;
+ struct pci_bus_entry *bus_entry = NULL;
+ int err = 0;
+
+#ifndef CONFIG_PCI_DOMAINS
+ if (domain != 0) {
+ dev_err(&pdev->xdev->dev,
+ "PCI Root in non-zero PCI Domain! domain=%d\n", domain);
+ dev_err(&pdev->xdev->dev,
+ "Please compile with CONFIG_PCI_DOMAINS\n");
+ err = -EINVAL;
+ goto err_out;
+ }
+#endif
+
+ dev_info(&pdev->xdev->dev, "Creating PCI Frontend Bus %04x:%02x\n",
+ domain, bus);
+
+ bus_entry = kmalloc(sizeof(*bus_entry), GFP_KERNEL);
+ sd = kmalloc(sizeof(*sd), GFP_KERNEL);
+ if (!bus_entry || !sd) {
+ err = -ENOMEM;
+ goto err_out;
+ }
+ pcifront_init_sd(sd, domain, bus, pdev);
+
+ b = pci_scan_bus_parented(&pdev->xdev->dev, bus,
+ &pcifront_bus_ops, sd);
+ if (!b) {
+ dev_err(&pdev->xdev->dev,
+ "Error creating PCI Frontend Bus!\n");
+ err = -ENOMEM;
+ goto err_out;
+ }
+
+ pcifront_setup_root_resources(b, sd);
+ bus_entry->bus = b;
+
+ list_add(&bus_entry->list, &pdev->root_buses);
+
+ /* Claim resources before going "live" with our devices */
+ pci_walk_bus(b, pcifront_claim_resource, pdev);
+
+ pci_bus_add_devices(b);
+
+ return 0;
+
+ err_out:
+ kfree(bus_entry);
+ kfree(sd);
+
+ return err;
+}
+
+int __devinit pcifront_rescan_root(struct pcifront_device *pdev,
+ unsigned int domain, unsigned int bus)
+{
+ struct pci_bus *b;
+ struct pci_dev *d;
+ unsigned int devfn;
+ int err;
+
+#ifndef CONFIG_PCI_DOMAINS
+ if (domain != 0) {
+ dev_err(&pdev->xdev->dev,
+ "PCI Root in non-zero PCI Domain! domain=%d\n", domain);
+ dev_err(&pdev->xdev->dev,
+ "Please compile with CONFIG_PCI_DOMAINS\n");
+ return -EINVAL;
+ }
+#endif
+
+ dev_info(&pdev->xdev->dev, "Rescanning PCI Frontend Bus %04x:%02x\n",
+ domain, bus);
+
+ b = pci_find_bus(domain, bus);
+ if(!b)
+ /* If the bus is unknown, create it. */
+ return pcifront_scan_root(pdev, domain, bus);
+
+ /* Rescan the bus for newly attached functions and add.
+ * We omit handling of PCI bridge attachment because pciback prevents
+ * bridges from being exported.
+ */
+ for (devfn = 0; devfn < 0x100; devfn++) {
+ d = pci_get_slot(b, devfn);
+ if(d) {
+ /* Device is already known. */
+ pci_dev_put(d);
+ continue;
+ }
+
+ d = pci_scan_single_device(b, devfn);
+ if (d) {
+ dev_info(&pdev->xdev->dev, "New device on "
+ "%04x:%02x:%02x.%02x found.\n", domain, bus,
+ PCI_SLOT(devfn), PCI_FUNC(devfn));
+ err = pci_bus_add_device(d);
+ if (err) {
+ dev_err(&pdev->xdev->dev, "Failed to add "
+ " device to bus.\n");
+ return err;
+ }
+
+ }
+ }
+
+ return 0;
+}
+
+static void free_root_bus_devs(struct pci_bus *bus)
+{
+ struct pci_dev *dev;
+
+ while (!list_empty(&bus->devices)) {
+ dev = container_of(bus->devices.next, struct pci_dev,
+ bus_list);
+ dev_dbg(&dev->dev, "removing device\n");
+ pci_remove_bus_device(dev);
+ }
+}
+
+void pcifront_free_roots(struct pcifront_device *pdev)
+{
+ struct pci_bus_entry *bus_entry, *t;
+
+ dev_dbg(&pdev->xdev->dev, "cleaning up root buses\n");
+
+ list_for_each_entry_safe(bus_entry, t, &pdev->root_buses, list) {
+ list_del(&bus_entry->list);
+
+ free_root_bus_devs(bus_entry->bus);
+
+ kfree(bus_entry->bus->sysdata);
+
+ device_unregister(bus_entry->bus->bridge);
+ pci_remove_bus(bus_entry->bus);
+
+ kfree(bus_entry);
+ }
+}
+
+static pci_ers_result_t pcifront_common_process( int cmd, struct
pcifront_device *pdev,
+ pci_channel_state_t state)
+{
+ pci_ers_result_t result;
+ struct pci_driver *pdrv;
+ int bus = pdev->sh_info->aer_op.bus;
+ int devfn = pdev->sh_info->aer_op.devfn;
+ struct pci_dev *pcidev;
+ int flag = 0;
+
+ dev_dbg(&pdev->xdev->dev,
+ "pcifront AER process: cmd %x (bus:%x, devfn%x)",
+ cmd, bus, devfn);
+ result = PCI_ERS_RESULT_NONE;
+
+ pcidev = pci_get_bus_and_slot(bus, devfn);
+ if (!pcidev || !pcidev->driver){
+ dev_err(&pcidev->dev,
+ "device or driver is NULL\n");
+ return result;
+ }
+ pdrv = pcidev->driver;
+
+ if (get_driver(&pdrv->driver)) {
+ if (pdrv->err_handler && pdrv->err_handler->error_detected) {
+ dev_dbg(&pcidev->dev,
+ "trying to call AER service\n");
+ if (pcidev) {
+ flag = 1;
+ switch(cmd) {
+ case XEN_PCI_OP_aer_detected:
+ result =
pdrv->err_handler->error_detected(pcidev, state);
+ break;
+ case XEN_PCI_OP_aer_mmio:
+ result =
pdrv->err_handler->mmio_enabled(pcidev);
+ break;
+ case XEN_PCI_OP_aer_slotreset:
+ result =
pdrv->err_handler->slot_reset(pcidev);
+ break;
+ case XEN_PCI_OP_aer_resume:
+ pdrv->err_handler->resume(pcidev);
+ break;
+ default:
+ dev_err(&pdev->xdev->dev,
+ "bad request in aer recovery
operation!\n");
+
+ }
+ }
+ }
+ put_driver(&pdrv->driver);
+ }
+ if (!flag)
+ result = PCI_ERS_RESULT_NONE;
+
+ return result;
+}
+
+
+void pcifront_do_aer(struct work_struct *data)
+{
+ struct pcifront_device *pdev = container_of(data, struct
pcifront_device, op_work);
+ int cmd = pdev->sh_info->aer_op.cmd;
+ pci_channel_state_t state =
+ (pci_channel_state_t)pdev->sh_info->aer_op.err;
+
+ /*If a pci_conf op is in progress,
+ we have to wait until it is done before service aer op*/
+ dev_dbg(&pdev->xdev->dev,
+ "pcifront service aer bus %x devfn %x\n",
pdev->sh_info->aer_op.bus,
+ pdev->sh_info->aer_op.devfn);
+
+ pdev->sh_info->aer_op.err = pcifront_common_process(cmd, pdev, state);
+
+ wmb();
+ clear_bit(_XEN_PCIB_active, (unsigned long*)&pdev->sh_info->flags);
+ notify_remote_via_evtchn(pdev->evtchn);
+
+ /*in case of we lost an aer request in four lines time_window*/
+ smp_mb__before_clear_bit();
+ clear_bit( _PDEVB_op_active, &pdev->flags);
+ smp_mb__after_clear_bit();
+
+ schedule_pcifront_aer_op(pdev);
+
+}
+
+irqreturn_t pcifront_handler_aer(int irq, void *dev)
+{
+ struct pcifront_device *pdev = dev;
+ schedule_pcifront_aer_op(pdev);
+ return IRQ_HANDLED;
+}
int pcifront_connect(struct pcifront_device *pdev)
{
int err = 0;
--
1.6.2.5
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home