[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH V5 18/29] pci: factor out the conversion logic f
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] Re: [PATCH V5 18/29] pci: factor out the conversion logic from io port address into pci device. |
Date: |
Sat, 10 Oct 2009 21:41:00 +0200 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Fri, Oct 09, 2009 at 03:28:51PM +0900, Isaku Yamahata wrote:
> factor out the logic which converts io port address into pci device
> and offset in PCI configuration space.
>
> Signed-off-by: Isaku Yamahata <address@hidden>
> ---
> hw/pci.c | 32 ++++++++++++++++++--------------
> 1 files changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/hw/pci.c b/hw/pci.c
> index 33cc476..0021c96 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -654,24 +654,33 @@ void pci_default_write_config(PCIDevice *d, uint32_t
> addr, uint32_t val, int l)
> pci_update_mappings(d);
> }
>
> +static inline PCIDevice *pci_addr_to_dev(PCIBus *bus, uint32_t addr)
> +{
> + uint8_t bus_num = (addr >> 16) & 0xff;
> + uint8_t devfn = (addr >> 8) & 0xff;
> + return pci_find_device(bus, bus_num, PCI_SLOT(devfn), PCI_FUNC(devfn));
> +}
> +
> +static inline int pci_addr_to_config(uint32_t addr)
> +{
> + return addr & 0xff;
> +}
Replace 0xff with (PCI_CONFIG_SPACE - 1)?
> +
> void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
> {
> PCIBus *s = opaque;
> PCIDevice *pci_dev;
> - int config_addr, bus_num;
> + int config_addr;
>
> #if 0
> PCI_DPRINTF("pci_data_write: addr=%08x val=%08x len=%d\n",
> addr, val, len);
> #endif
> - bus_num = (addr >> 16) & 0xff;
> - s = pci_find_bus(s, bus_num);
> - if (!s)
> - return;
> - pci_dev = s->devices[(addr >> 8) & 0xff];
> + pci_dev = pci_addr_to_dev(s, addr);
> if (!pci_dev)
> return;
> config_addr = addr & 0xff;
> + config_addr = pci_addr_to_config(addr);
> PCI_DPRINTF("pci_config_write: %s: addr=%02x val=%08x len=%d\n",
> pci_dev->name, config_addr, val, len);
> pci_dev->config_write(pci_dev, config_addr, val, len);
> @@ -681,16 +690,11 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int
> len)
> {
> PCIBus *s = opaque;
> PCIDevice *pci_dev;
> - int config_addr, bus_num;
> + int config_addr;
> uint32_t val;
>
> - bus_num = (addr >> 16) & 0xff;
> - s = pci_find_bus(s, bus_num);
> - if (!s)
> - goto fail;
> - pci_dev = s->devices[(addr >> 8) & 0xff];
> + pci_dev = pci_addr_to_dev(s, addr);
> if (!pci_dev) {
> - fail:
> switch(len) {
> case 1:
> val = 0xff;
> @@ -705,7 +709,7 @@ uint32_t pci_data_read(void *opaque, uint32_t addr, int
> len)
> }
> goto the_end;
> }
> - config_addr = addr & 0xff;
> + config_addr = pci_addr_to_config(addr);
> val = pci_dev->config_read(pci_dev, config_addr, len);
> PCI_DPRINTF("pci_config_read: %s: addr=%02x val=%08x len=%d\n",
> pci_dev->name, config_addr, val, len);
> --
> 1.6.0.2
- [Qemu-devel] [PATCH V5 15/29] pci: typedef pcibus_t as uint64_t instead of uint32_t., (continued)
[Qemu-devel] [PATCH V5 11/29] pci_host.h: move functions in pci_host.h into .c file., Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 27/29] pci/bridge: don't update bar mapping when bar2-5 is changed., Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 18/29] pci: factor out the conversion logic from io port address into pci device., Isaku Yamahata, 2009/10/09
- [Qemu-devel] Re: [PATCH V5 18/29] pci: factor out the conversion logic from io port address into pci device.,
Michael S. Tsirkin <=
[Qemu-devel] [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), Isaku Yamahata, 2009/10/09
- [Qemu-devel] Re: [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), Michael S. Tsirkin, 2009/10/09
- [Qemu-devel] Re: [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), Isaku Yamahata, 2009/10/13
- [Qemu-devel] Re: [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), Michael S. Tsirkin, 2009/10/13
- Re: [Qemu-devel] Re: [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), Blue Swirl, 2009/10/13
- Re: [Qemu-devel] Re: [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), Michael S. Tsirkin, 2009/10/13
- Re: [Qemu-devel] Re: [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), Blue Swirl, 2009/10/13
[Qemu-devel] Re: [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), Michael S. Tsirkin, 2009/10/09
[Qemu-devel] [PATCH V5 12/29] pci_host: consolidate pci config address access., Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 21/29] pci_host: change the signature of pci_data_{read, write}., Isaku Yamahata, 2009/10/09