[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH V5 10/29] pci: make pci_bar() aware of header ty
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] Re: [PATCH V5 10/29] pci: make pci_bar() aware of header type 1. |
Date: |
Sat, 10 Oct 2009 21:29:16 +0200 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Fri, Oct 09, 2009 at 03:28:43PM +0900, Isaku Yamahata wrote:
> make pci_bar() aware of header type 1. When PCI_ROM_SLOT
> it should return PCI_ROM_ADDRESS1 (!= PCI_ROM_ADDRESS)
>
> Signed-off-by: Isaku Yamahata <address@hidden>
> ---
> hw/pci.c | 18 ++++++++++++------
> hw/pci.h | 3 +++
> 2 files changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/hw/pci.c b/hw/pci.c
> index 755ebad..82c1c3c 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -84,9 +84,15 @@ static const VMStateDescription vmstate_pcibus = {
> }
> };
>
> -static inline int pci_bar(int reg)
> +static int pci_bar(PCIDevice *d, int reg)
> {
> - return reg == PCI_ROM_SLOT ? PCI_ROM_ADDRESS : PCI_BASE_ADDRESS_0 + reg
> * 4;
> + if (reg == PCI_ROM_SLOT) {
> + return (d->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTION)
> + == PCI_HEADER_TYPE_BRIDGE ?
> + PCI_ROM_ADDRESS1 : PCI_ROM_ADDRESS;
> + }
> +
> + return PCI_BASE_ADDRESS_0 + reg * 4;
> }
>
While not critical, I proposed a slightly neater version of
this function. Don't like it?
> static void pci_device_reset(PCIDevice *dev)
> @@ -102,7 +108,7 @@ static void pci_device_reset(PCIDevice *dev)
> if (!dev->io_regions[r].size) {
> continue;
> }
> - pci_set_long(dev->config + pci_bar(r), dev->io_regions[r].type);
> + pci_set_long(dev->config + pci_bar(dev, r), dev->io_regions[r].type);
> }
> pci_update_mappings(dev);
> }
> @@ -472,7 +478,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
> r->map_func = map_func;
>
> wmask = ~(size - 1);
> - addr = pci_bar(region_num);
> + addr = pci_bar(pci_dev, region_num);
> if (region_num == PCI_ROM_SLOT) {
> /* ROM enable bit is writeable */
> wmask |= PCI_ROM_ADDRESS_ENABLE;
> @@ -494,7 +500,7 @@ static void pci_update_mappings(PCIDevice *d)
> if (r->size != 0) {
> if (r->type & PCI_BASE_ADDRESS_SPACE_IO) {
> if (cmd & PCI_COMMAND_IO) {
> - new_addr = pci_get_long(d->config + pci_bar(i));
> + new_addr = pci_get_long(d->config + pci_bar(d, i));
> new_addr = new_addr & ~(r->size - 1);
> last_addr = new_addr + r->size - 1;
> /* NOTE: we have only 64K ioports on PC */
> @@ -507,7 +513,7 @@ static void pci_update_mappings(PCIDevice *d)
> }
> } else {
> if (cmd & PCI_COMMAND_MEMORY) {
> - new_addr = pci_get_long(d->config + pci_bar(i));
> + new_addr = pci_get_long(d->config + pci_bar(d, i));
> /* the ROM slot has a specific enable bit */
> if (i == PCI_ROM_SLOT && !(new_addr &
> PCI_ROM_ADDRESS_ENABLE))
> goto no_mem_map;
> diff --git a/hw/pci.h b/hw/pci.h
> index bbce56b..bd63534 100644
> --- a/hw/pci.h
> +++ b/hw/pci.h
> @@ -153,6 +153,9 @@ typedef struct PCIIORegion {
>
> #define PCI_COMMAND_RESERVED_MASK_HI (PCI_COMMAND_RESERVED >> 8)
>
> +/* Header type 1 (PCI-to-PCI bridges) */
> +#define PCI_ROM_ADDRESS1 0x38 /* Same as PCI_ROM_ADDRESS, but for
> htype 1 */
> +
> /* Size of the standard PCI config header */
> #define PCI_CONFIG_HEADER_SIZE 0x40
> /* Size of the standard PCI config space */
> --
> 1.6.0.2
- [Qemu-devel] [PATCH V5 00/29] pci: various pci clean up and pci express support., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 02/29] pci: introduce constant PCI_NUM_PINS for the number of interrupt pins, 4., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 03/29] pci: use PCI_SLOT() and PCI_FUNC()., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 01/29] pci: fix PCI_DPRINTF() wrt variadic macro., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 10/29] pci: make pci_bar() aware of header type 1., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 04/29] pci: define a constant to represent a unmapped bar and use it., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 29/29] pci/monitor: print out bridge's filtering values and so on., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 14/29] pci: introduce FMT_PCIBUS for printf format for pcibus_t., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 05/29] pci: helper functions to access PCIDevice::config, Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 09/29] pci: clean up of pci_default_read_config., Isaku Yamahata, 2009/10/09
- [Qemu-devel] [PATCH V5 08/29] pci: s/PCI_ADDRESS_SPACE_/PCI_BASE_ADDRESS_SPACE_/ to match pci_regs.h, Isaku Yamahata, 2009/10/09