[PATCH 1/5] pci-assign: Clean up assigned_dev_pci_read/write_config

2011-04-28 Thread Jan Kiszka 
Use rages_overlap and proper constants to match the access range against
regions that need special handling. This also fixes yet uncaught
high-byte write access to the command register. Moreover, use more
constants instead of magic numbers.

Signed-off-by: Jan Kiszka jan.kis...@siemens.com
---
 hw/device-assignment.c |   39 +--
 1 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 606d725..3481c93 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -404,13 +404,20 @@ static void assigned_dev_pci_write_config(PCIDevice *d, 
uint32_t address,
 return assigned_device_pci_cap_write_config(d, address, val, len);
 }
 
-if (address == 0x4) {
+if (ranges_overlap(address, len, PCI_COMMAND, 2)) {
 pci_default_write_config(d, address, val, len);
 /* Continue to program the card */
 }
 
-if ((address = 0x10  address = 0x24) || address == 0x30 ||
-address == 0x34 || address == 0x3c || address == 0x3d) {
+/*
+ * Catch access to
+ *  - base address registers
+ *  - ROM base address  capability pointer
+ *  - interrupt line  pin
+ */
+if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
+ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||
+ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) {
 /* used for update-mappings (BAR emulation) */
 pci_default_write_config(d, address, val, len);
 return;
@@ -450,9 +457,20 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, 
uint32_t address,
 return val;
 }
 
-if (address  0x4 || (pci_dev-need_emulate_cmd  address == 0x4) ||
-   (address = 0x10  address = 0x24) || address == 0x30 ||
-address == 0x34 || address == 0x3c || address == 0x3d) {
+/*
+ * Catch access to
+ *  - vendor  device ID
+ *  - command register (if emulation needed)
+ *  - base address registers
+ *  - ROM base address  capability pointer
+ *  - interrupt line  pin
+ */
+if (ranges_overlap(address, len, PCI_VENDOR_ID, 4) ||
+(pci_dev-need_emulate_cmd 
+ ranges_overlap(address, len, PCI_COMMAND, 2)) ||
+ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
+ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||
+ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) {
 val = pci_default_read_config(d, address, len);
 DEBUG((%x.%x): address=%04x val=0x%08x len=%d\n,
   (d-devfn  3)  0x1F, (d-devfn  0x7), address, val, len);
@@ -483,10 +501,11 @@ do_log:
 
 if (!pci_dev-cap.available) {
 /* kill the special capabilities */
-if (address == 4  len == 4)
-val = ~0x10;
-else if (address == 6)
-val = ~0x10;
+if (address == PCI_COMMAND  len == 4) {
+val = ~(PCI_STATUS_CAP_LIST  16);
+} else if (address == PCI_STATUS) {
+val = ~PCI_STATUS_CAP_LIST;
+}
 }
 
 return val;
-- 
1.7.1

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5] pci-assign: Clean up assigned_dev_pci_read/write_config

2011-04-28 Thread Alex Williamson 
On Thu, 2011-04-28 at 10:59 +0200, Jan Kiszka wrote:
 Use rages_overlap and proper constants to match the access range against
  ^ typo - only if you resend

 regions that need special handling. This also fixes yet uncaught
 high-byte write access to the command register. Moreover, use more
 constants instead of magic numbers.
 
 Signed-off-by: Jan Kiszka jan.kis...@siemens.com
 ---
  hw/device-assignment.c |   39 +--
  1 files changed, 29 insertions(+), 10 deletions(-)
 
 diff --git a/hw/device-assignment.c b/hw/device-assignment.c
 index 606d725..3481c93 100644
 --- a/hw/device-assignment.c
 +++ b/hw/device-assignment.c
 @@ -404,13 +404,20 @@ static void assigned_dev_pci_write_config(PCIDevice *d, 
 uint32_t address,
  return assigned_device_pci_cap_write_config(d, address, val, len);
  }
  
 -if (address == 0x4) {
 +if (ranges_overlap(address, len, PCI_COMMAND, 2)) {
  pci_default_write_config(d, address, val, len);
  /* Continue to program the card */
  }
  
 -if ((address = 0x10  address = 0x24) || address == 0x30 ||
 -address == 0x34 || address == 0x3c || address == 0x3d) {
 +/*
 + * Catch access to
 + *  - base address registers
 + *  - ROM base address  capability pointer
 + *  - interrupt line  pin
 + */
 +if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
 +ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||

Should this be 5 bytes instead of 8?  I'm not sure why we'd add catching
these reserved fields, but not those immediately after this range.

 +ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) {
  /* used for update-mappings (BAR emulation) */
  pci_default_write_config(d, address, val, len);
  return;
 @@ -450,9 +457,20 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice 
 *d, uint32_t address,
  return val;
  }
  
 -if (address  0x4 || (pci_dev-need_emulate_cmd  address == 0x4) ||
 - (address = 0x10  address = 0x24) || address == 0x30 ||
 -address == 0x34 || address == 0x3c || address == 0x3d) {
 +/*
 + * Catch access to
 + *  - vendor  device ID
 + *  - command register (if emulation needed)
 + *  - base address registers
 + *  - ROM base address  capability pointer
 + *  - interrupt line  pin
 + */
 +if (ranges_overlap(address, len, PCI_VENDOR_ID, 4) ||
 +(pci_dev-need_emulate_cmd 
 + ranges_overlap(address, len, PCI_COMMAND, 2)) ||
 +ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
 +ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||

Same here.

 +ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) {
  val = pci_default_read_config(d, address, len);
  DEBUG((%x.%x): address=%04x val=0x%08x len=%d\n,
(d-devfn  3)  0x1F, (d-devfn  0x7), address, val, len);
 @@ -483,10 +501,11 @@ do_log:
  
  if (!pci_dev-cap.available) {
  /* kill the special capabilities */
 -if (address == 4  len == 4)
 -val = ~0x10;
 -else if (address == 6)
 -val = ~0x10;
 +if (address == PCI_COMMAND  len == 4) {
 +val = ~(PCI_STATUS_CAP_LIST  16);
 +} else if (address == PCI_STATUS) {
 +val = ~PCI_STATUS_CAP_LIST;
 +}
  }
  
  return val;

Thanks,

Alex

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5] pci-assign: Clean up assigned_dev_pci_read/write_config

2011-04-28 Thread Jan Kiszka 
On 2011-04-28 16:29, Alex Williamson wrote:
 On Thu, 2011-04-28 at 10:59 +0200, Jan Kiszka wrote:
 Use rages_overlap and proper constants to match the access range against
   ^ typo - only if you resend
 
 regions that need special handling. This also fixes yet uncaught
 high-byte write access to the command register. Moreover, use more
 constants instead of magic numbers.

 Signed-off-by: Jan Kiszka jan.kis...@siemens.com
 ---
  hw/device-assignment.c |   39 +--
  1 files changed, 29 insertions(+), 10 deletions(-)

 diff --git a/hw/device-assignment.c b/hw/device-assignment.c
 index 606d725..3481c93 100644
 --- a/hw/device-assignment.c
 +++ b/hw/device-assignment.c
 @@ -404,13 +404,20 @@ static void assigned_dev_pci_write_config(PCIDevice 
 *d, uint32_t address,
  return assigned_device_pci_cap_write_config(d, address, val, len);
  }
  
 -if (address == 0x4) {
 +if (ranges_overlap(address, len, PCI_COMMAND, 2)) {
  pci_default_write_config(d, address, val, len);
  /* Continue to program the card */
  }
  
 -if ((address = 0x10  address = 0x24) || address == 0x30 ||
 -address == 0x34 || address == 0x3c || address == 0x3d) {
 +/*
 + * Catch access to
 + *  - base address registers
 + *  - ROM base address  capability pointer
 + *  - interrupt line  pin
 + */
 +if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
 +ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||
 
 Should this be 5 bytes instead of 8?  I'm not sure why we'd add catching
 these reserved fields, but not those immediately after this range.

Yes, that's asking for clarification: Should we allow direct access to
the complete reserved space or virtualize it? Depending on this, the
proper value should be 5 or 14 (the latter would also save one
ranges_overlap).

Jan

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5] pci-assign: Clean up assigned_dev_pci_read/write_config

2011-04-28 Thread Alex Williamson 
On Thu, 2011-04-28 at 16:46 +0200, Jan Kiszka wrote:
 On 2011-04-28 16:29, Alex Williamson wrote:
  On Thu, 2011-04-28 at 10:59 +0200, Jan Kiszka wrote:
  Use rages_overlap and proper constants to match the access range against
^ typo - only if you resend
  
  regions that need special handling. This also fixes yet uncaught
  high-byte write access to the command register. Moreover, use more
  constants instead of magic numbers.
 
  Signed-off-by: Jan Kiszka jan.kis...@siemens.com
  ---
   hw/device-assignment.c |   39 +--
   1 files changed, 29 insertions(+), 10 deletions(-)
 
  diff --git a/hw/device-assignment.c b/hw/device-assignment.c
  index 606d725..3481c93 100644
  --- a/hw/device-assignment.c
  +++ b/hw/device-assignment.c
  @@ -404,13 +404,20 @@ static void assigned_dev_pci_write_config(PCIDevice 
  *d, uint32_t address,
   return assigned_device_pci_cap_write_config(d, address, val, len);
   }
   
  -if (address == 0x4) {
  +if (ranges_overlap(address, len, PCI_COMMAND, 2)) {
   pci_default_write_config(d, address, val, len);
   /* Continue to program the card */
   }
   
  -if ((address = 0x10  address = 0x24) || address == 0x30 ||
  -address == 0x34 || address == 0x3c || address == 0x3d) {
  +/*
  + * Catch access to
  + *  - base address registers
  + *  - ROM base address  capability pointer
  + *  - interrupt line  pin
  + */
  +if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
  +ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||
  
  Should this be 5 bytes instead of 8?  I'm not sure why we'd add catching
  these reserved fields, but not those immediately after this range.
 
 Yes, that's asking for clarification: Should we allow direct access to
 the complete reserved space or virtualize it? Depending on this, the
 proper value should be 5 or 14 (the latter would also save one
 ranges_overlap).

I vote for 5 here since a cleanup patch shouldn't have behavior changes
hidden in it.  I don't see any great value in virtualizing reserved
bits.  It seems like it could only make things not work if a vendor was
stupid enough to hide something in there.  Thanks,

Alex

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5] pci-assign: Clean up assigned_dev_pci_read/write_config

2011-04-28 Thread Jan Kiszka 
On 2011-04-28 16:54, Alex Williamson wrote:
 On Thu, 2011-04-28 at 16:46 +0200, Jan Kiszka wrote:
 On 2011-04-28 16:29, Alex Williamson wrote:
 On Thu, 2011-04-28 at 10:59 +0200, Jan Kiszka wrote:
 Use rages_overlap and proper constants to match the access range against
   ^ typo - only if you resend

 regions that need special handling. This also fixes yet uncaught
 high-byte write access to the command register. Moreover, use more
 constants instead of magic numbers.

 Signed-off-by: Jan Kiszka jan.kis...@siemens.com
 ---
  hw/device-assignment.c |   39 +--
  1 files changed, 29 insertions(+), 10 deletions(-)

 diff --git a/hw/device-assignment.c b/hw/device-assignment.c
 index 606d725..3481c93 100644
 --- a/hw/device-assignment.c
 +++ b/hw/device-assignment.c
 @@ -404,13 +404,20 @@ static void assigned_dev_pci_write_config(PCIDevice 
 *d, uint32_t address,
  return assigned_device_pci_cap_write_config(d, address, val, len);
  }
  
 -if (address == 0x4) {
 +if (ranges_overlap(address, len, PCI_COMMAND, 2)) {
  pci_default_write_config(d, address, val, len);
  /* Continue to program the card */
  }
  
 -if ((address = 0x10  address = 0x24) || address == 0x30 ||
 -address == 0x34 || address == 0x3c || address == 0x3d) {
 +/*
 + * Catch access to
 + *  - base address registers
 + *  - ROM base address  capability pointer
 + *  - interrupt line  pin
 + */
 +if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
 +ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||

 Should this be 5 bytes instead of 8?  I'm not sure why we'd add catching
 these reserved fields, but not those immediately after this range.

 Yes, that's asking for clarification: Should we allow direct access to
 the complete reserved space or virtualize it? Depending on this, the
 proper value should be 5 or 14 (the latter would also save one
 ranges_overlap).
 
 I vote for 5 here since a cleanup patch shouldn't have behavior changes
 hidden in it.  I don't see any great value in virtualizing reserved
 bits.  It seems like it could only make things not work if a vendor was
 stupid enough to hide something in there.  Thanks,

Yeah, and as we properly restore the config space now, it should be
Mostly Harmless. Will update.

Jan

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5] pci-assign: Clean up assigned_dev_pci_read/write_config

2011-04-28 Thread Jan Kiszka 
On 2011-04-28 16:54, Alex Williamson wrote:
 On Thu, 2011-04-28 at 16:46 +0200, Jan Kiszka wrote:
 On 2011-04-28 16:29, Alex Williamson wrote:
 On Thu, 2011-04-28 at 10:59 +0200, Jan Kiszka wrote:
 Use rages_overlap and proper constants to match the access range against
   ^ typo - only if you resend

 regions that need special handling. This also fixes yet uncaught
 high-byte write access to the command register. Moreover, use more
 constants instead of magic numbers.

 Signed-off-by: Jan Kiszka jan.kis...@siemens.com
 ---
  hw/device-assignment.c |   39 +--
  1 files changed, 29 insertions(+), 10 deletions(-)

 diff --git a/hw/device-assignment.c b/hw/device-assignment.c
 index 606d725..3481c93 100644
 --- a/hw/device-assignment.c
 +++ b/hw/device-assignment.c
 @@ -404,13 +404,20 @@ static void assigned_dev_pci_write_config(PCIDevice 
 *d, uint32_t address,
  return assigned_device_pci_cap_write_config(d, address, val, len);
  }
  
 -if (address == 0x4) {
 +if (ranges_overlap(address, len, PCI_COMMAND, 2)) {
  pci_default_write_config(d, address, val, len);
  /* Continue to program the card */
  }
  
 -if ((address = 0x10  address = 0x24) || address == 0x30 ||
 -address == 0x34 || address == 0x3c || address == 0x3d) {
 +/*
 + * Catch access to
 + *  - base address registers
 + *  - ROM base address  capability pointer
 + *  - interrupt line  pin
 + */
 +if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
 +ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||

 Should this be 5 bytes instead of 8?  I'm not sure why we'd add catching
 these reserved fields, but not those immediately after this range.

 Yes, that's asking for clarification: Should we allow direct access to
 the complete reserved space or virtualize it? Depending on this, the
 proper value should be 5 or 14 (the latter would also save one
 ranges_overlap).
 
 I vote for 5 here since a cleanup patch shouldn't have behavior changes
 hidden in it.  I don't see any great value in virtualizing reserved
 bits.  It seems like it could only make things not work if a vendor was
 stupid enough to hide something in there.  Thanks,

Thinking about this and the other sub-dword matches again, there is a
problem in my approach:

I redirect the complete write to the virtualized space once there is an
overlap. So a dword write at PCI_INTERRUPT_LINE would not touch the real
PCI_MIN_GNT  PCI_MAX_LAT. But writing directly to those without overlap
would. The same applies to our reserved space, though this inconsistency
is not critical here - but still undesirable.

Jan

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/5] pci-assign: Clean up assigned_dev_pci_read/write_config

2010-12-13 Thread Jan Kiszka 
From: Jan Kiszka jan.kis...@siemens.com

Use rages_overlap and proper constants to match the access range against
regions that need special handling. This also fixes yet uncaught
high-byte write access to the command register. Moreover, use more
constants instead of magic numbers.

Signed-off-by: Jan Kiszka jan.kis...@siemens.com
---
 hw/device-assignment.c |   39 +--
 1 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 50c6408..bc3a57b 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -438,13 +438,20 @@ static void assigned_dev_pci_write_config(PCIDevice *d, 
uint32_t address,
 return assigned_device_pci_cap_write_config(d, address, val, len);
 }
 
-if (address == 0x4) {
+if (ranges_overlap(address, len, PCI_COMMAND, 2)) {
 pci_default_write_config(d, address, val, len);
 /* Continue to program the card */
 }
 
-if ((address = 0x10  address = 0x24) || address == 0x30 ||
-address == 0x34 || address == 0x3c || address == 0x3d) {
+/*
+ * Catch access to
+ *  - base address registers
+ *  - ROM base address  capability pointer
+ *  - interrupt line  pin
+ */
+if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
+ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||
+ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) {
 /* used for update-mappings (BAR emulation) */
 pci_default_write_config(d, address, val, len);
 return;
@@ -484,9 +491,20 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, 
uint32_t address,
 return val;
 }
 
-if (address  0x4 || (pci_dev-need_emulate_cmd  address == 0x4) ||
-   (address = 0x10  address = 0x24) || address == 0x30 ||
-address == 0x34 || address == 0x3c || address == 0x3d) {
+/*
+ * Catch access to
+ *  - vendor  device ID
+ *  - command register (if emulation needed)
+ *  - base address registers
+ *  - ROM base address  capability pointer
+ *  - interrupt line  pin
+ */
+if (ranges_overlap(address, len, PCI_VENDOR_ID, 4) ||
+(pci_dev-need_emulate_cmd 
+ ranges_overlap(address, len, PCI_COMMAND, 2)) ||
+ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
+ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||
+ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) {
 val = pci_default_read_config(d, address, len);
 DEBUG((%x.%x): address=%04x val=0x%08x len=%d\n,
   (d-devfn  3)  0x1F, (d-devfn  0x7), address, val, len);
@@ -517,10 +535,11 @@ do_log:
 
 if (!pci_dev-cap.available) {
 /* kill the special capabilities */
-if (address == 4  len == 4)
-val = ~0x10;
-else if (address == 6)
-val = ~0x10;
+if (address == PCI_COMMAND  len == 4) {
+val = ~(PCI_STATUS_CAP_LIST  16);
+} else if (address == PCI_STATUS) {
+val = ~PCI_STATUS_CAP_LIST;
+}
 }
 
 return val;
-- 
1.7.1

--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/5] pci-assign: Clean up assigned_dev_pci_read/write_config

2010-12-13 Thread Alex Williamson 
On Tue, 2010-12-14 at 00:25 +0100, Jan Kiszka wrote:
 From: Jan Kiszka jan.kis...@siemens.com
 
 Use rages_overlap and proper constants to match the access range against
 regions that need special handling. This also fixes yet uncaught
 high-byte write access to the command register. Moreover, use more
 constants instead of magic numbers.
 
 Signed-off-by: Jan Kiszka jan.kis...@siemens.com
 ---
  hw/device-assignment.c |   39 +--
  1 files changed, 29 insertions(+), 10 deletions(-)

A long overdue cleanup, looks good.

Acked-by: Alex Williamson alex.william...@redhat.com

 diff --git a/hw/device-assignment.c b/hw/device-assignment.c
 index 50c6408..bc3a57b 100644
 --- a/hw/device-assignment.c
 +++ b/hw/device-assignment.c
 @@ -438,13 +438,20 @@ static void assigned_dev_pci_write_config(PCIDevice *d, 
 uint32_t address,
  return assigned_device_pci_cap_write_config(d, address, val, len);
  }
  
 -if (address == 0x4) {
 +if (ranges_overlap(address, len, PCI_COMMAND, 2)) {
  pci_default_write_config(d, address, val, len);
  /* Continue to program the card */
  }
  
 -if ((address = 0x10  address = 0x24) || address == 0x30 ||
 -address == 0x34 || address == 0x3c || address == 0x3d) {
 +/*
 + * Catch access to
 + *  - base address registers
 + *  - ROM base address  capability pointer
 + *  - interrupt line  pin
 + */
 +if (ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
 +ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||
 +ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) {
  /* used for update-mappings (BAR emulation) */
  pci_default_write_config(d, address, val, len);
  return;
 @@ -484,9 +491,20 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice 
 *d, uint32_t address,
  return val;
  }
  
 -if (address  0x4 || (pci_dev-need_emulate_cmd  address == 0x4) ||
 - (address = 0x10  address = 0x24) || address == 0x30 ||
 -address == 0x34 || address == 0x3c || address == 0x3d) {
 +/*
 + * Catch access to
 + *  - vendor  device ID
 + *  - command register (if emulation needed)
 + *  - base address registers
 + *  - ROM base address  capability pointer
 + *  - interrupt line  pin
 + */
 +if (ranges_overlap(address, len, PCI_VENDOR_ID, 4) ||
 +(pci_dev-need_emulate_cmd 
 + ranges_overlap(address, len, PCI_COMMAND, 2)) ||
 +ranges_overlap(address, len, PCI_BASE_ADDRESS_0, 24) ||
 +ranges_overlap(address, len, PCI_ROM_ADDRESS, 8) ||
 +ranges_overlap(address, len, PCI_INTERRUPT_LINE, 2)) {
  val = pci_default_read_config(d, address, len);
  DEBUG((%x.%x): address=%04x val=0x%08x len=%d\n,
(d-devfn  3)  0x1F, (d-devfn  0x7), address, val, len);
 @@ -517,10 +535,11 @@ do_log:
  
  if (!pci_dev-cap.available) {
  /* kill the special capabilities */
 -if (address == 4  len == 4)
 -val = ~0x10;
 -else if (address == 6)
 -val = ~0x10;
 +if (address == PCI_COMMAND  len == 4) {
 +val = ~(PCI_STATUS_CAP_LIST  16);
 +} else if (address == PCI_STATUS) {
 +val = ~PCI_STATUS_CAP_LIST;
 +}
  }
  
  return val;



--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html