|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 4/9] vpci/header: Add and remove register handlers dynamically
From: Oleksandr Andrushchenko <oleksandr_andrushchenko@xxxxxxxx>
Add relevant vpci register handlers when assigning PCI device to a domain
and remove those when de-assigning. This allows having different
handlers for different domains, e.g. hwdom and other guests.
Use stubs for guest domains for now.
Signed-off-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@xxxxxxxx>
---
xen/drivers/vpci/header.c | 78 +++++++++++++++++++++++++++++++++++----
xen/drivers/vpci/vpci.c | 4 +-
xen/include/xen/vpci.h | 4 ++
3 files changed, 76 insertions(+), 10 deletions(-)
diff --git a/xen/drivers/vpci/header.c b/xen/drivers/vpci/header.c
index 31bca7a12942..5218b1af247e 100644
--- a/xen/drivers/vpci/header.c
+++ b/xen/drivers/vpci/header.c
@@ -397,6 +397,17 @@ static void bar_write(const struct pci_dev *pdev, unsigned
int reg,
pci_conf_write32(pdev->sbdf, reg, val);
}
+static void guest_bar_write(const struct pci_dev *pdev, unsigned int reg,
+ uint32_t val, void *data)
+{
+}
+
+static uint32_t guest_bar_read(const struct pci_dev *pdev, unsigned int reg,
+ void *data)
+{
+ return 0xffffffff;
+}
+
static void rom_write(const struct pci_dev *pdev, unsigned int reg,
uint32_t val, void *data)
{
@@ -445,14 +456,25 @@ static void rom_write(const struct pci_dev *pdev,
unsigned int reg,
rom->addr = val & PCI_ROM_ADDRESS_MASK;
}
-static int add_bar_handlers(struct pci_dev *pdev)
+static void guest_rom_write(const struct pci_dev *pdev, unsigned int reg,
+ uint32_t val, void *data)
+{
+}
+
+static uint32_t guest_rom_read(const struct pci_dev *pdev, unsigned int reg,
+ void *data)
+{
+ return 0xffffffff;
+}
+
+static int add_bar_handlers(struct pci_dev *pdev, bool is_hwdom)
{
unsigned int i;
struct vpci_header *header = &pdev->vpci->header;
struct vpci_bar *bars = header->bars;
int rc;
- /* Setup a handler for the command register. */
+ /* Setup a handler for the command register: same for hwdom and guests. */
rc = vpci_add_register(pdev->vpci, vpci_hw_read16, cmd_write, PCI_COMMAND,
2, header);
if ( rc )
@@ -475,8 +497,13 @@ static int add_bar_handlers(struct pci_dev *pdev)
rom_reg = PCI_ROM_ADDRESS;
else
rom_reg = PCI_ROM_ADDRESS1;
- rc = vpci_add_register(pdev->vpci, vpci_hw_read32, rom_write,
- rom_reg, 4, &bars[i]);
+ if ( is_hwdom )
+ rc = vpci_add_register(pdev->vpci, vpci_hw_read32, rom_write,
+ rom_reg, 4, &bars[i]);
+ else
+ rc = vpci_add_register(pdev->vpci,
+ guest_rom_read, guest_rom_write,
+ rom_reg, 4, &bars[i]);
if ( rc )
return rc;
}
@@ -485,8 +512,13 @@ static int add_bar_handlers(struct pci_dev *pdev)
uint8_t reg = PCI_BASE_ADDRESS_0 + i * 4;
/* This is either VPCI_BAR_MEM32 or VPCI_BAR_MEM64_{LO|HI}. */
- rc = vpci_add_register(pdev->vpci, vpci_hw_read32, bar_write, reg,
- 4, &bars[i]);
+ if ( is_hwdom )
+ rc = vpci_add_register(pdev->vpci, vpci_hw_read32, bar_write,
+ reg, 4, &bars[i]);
+ else
+ rc = vpci_add_register(pdev->vpci,
+ guest_bar_read, guest_bar_write,
+ reg, 4, &bars[i]);
if ( rc )
return rc;
}
@@ -520,7 +552,7 @@ static int init_bars(struct pci_dev *pdev)
}
if ( pdev->ignore_bars )
- return add_bar_handlers(pdev);
+ return add_bar_handlers(pdev, true);
/* Disable memory decoding before sizing. */
cmd = pci_conf_read16(pdev->sbdf, PCI_COMMAND);
@@ -582,7 +614,7 @@ static int init_bars(struct pci_dev *pdev)
PCI_ROM_ADDRESS_ENABLE;
}
- rc = add_bar_handlers(pdev);
+ rc = add_bar_handlers(pdev, true);
if ( rc )
{
pci_conf_write16(pdev->sbdf, PCI_COMMAND, cmd);
@@ -593,6 +625,36 @@ static int init_bars(struct pci_dev *pdev)
}
REGISTER_VPCI_INIT(init_bars, VPCI_PRIORITY_MIDDLE);
+int vpci_bar_add_handlers(const struct domain *d, struct pci_dev *pdev)
+{
+ int rc;
+
+ /* Remove previously added registers. */
+ vpci_remove_device_registers(pdev);
+
+ /* It only makes sense to add registers for hwdom or guest domain. */
+ if ( d->domain_id >= DOMID_FIRST_RESERVED )
+ return 0;
+
+ if ( is_hardware_domain(d) )
+ rc = add_bar_handlers(pdev, true);
+ else
+ rc = add_bar_handlers(pdev, false);
+
+ if ( rc )
+ gprintk(XENLOG_ERR,
+ "%pp: failed to add BAR handlers for dom%d\n", &pdev->sbdf,
+ d->domain_id);
+ return rc;
+}
+
+int vpci_bar_remove_handlers(const struct domain *d, struct pci_dev *pdev)
+{
+ /* Remove previously added registers. */
+ vpci_remove_device_registers(pdev);
+ return 0;
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/drivers/vpci/vpci.c b/xen/drivers/vpci/vpci.c
index ee0ad63a3c12..4530313f01e7 100644
--- a/xen/drivers/vpci/vpci.c
+++ b/xen/drivers/vpci/vpci.c
@@ -94,7 +94,7 @@ int vpci_assign_device(struct domain *d, struct pci_dev *dev)
if ( !has_vpci(d) || (d->domain_id >= DOMID_FIRST_RESERVED) )
return 0;
- return 0;
+ return vpci_bar_add_handlers(d, dev);
}
/* Notify vPCI that device is de-assigned from guest. */
@@ -104,7 +104,7 @@ int vpci_deassign_device(struct domain *d, struct pci_dev
*dev)
if ( !has_vpci(d) || (d->domain_id >= DOMID_FIRST_RESERVED) )
return 0;
- return 0;
+ return vpci_bar_remove_handlers(d, dev);
}
#endif /* __XEN__ */
diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h
index e7a1a09ab4c9..4aa2941a1081 100644
--- a/xen/include/xen/vpci.h
+++ b/xen/include/xen/vpci.h
@@ -63,6 +63,10 @@ uint32_t vpci_hw_read32(const struct pci_dev *pdev, unsigned
int reg,
*/
bool __must_check vpci_process_pending(struct vcpu *v);
+/* Add/remove BAR handlers for a domain. */
+int vpci_bar_add_handlers(const struct domain *d, struct pci_dev *pdev);
+int vpci_bar_remove_handlers(const struct domain *d, struct pci_dev *pdev);
+
struct vpci {
/* List of vPCI handlers for a device. */
struct list_head handlers;
--
2.25.1
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |