[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH V5 20/29] pci: move pci host stuff from pci.c to
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] Re: [PATCH V5 20/29] pci: move pci host stuff from pci.c to pci_host.c |
Date: |
Sat, 10 Oct 2009 21:46:05 +0200 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Fri, Oct 09, 2009 at 03:28:53PM +0900, Isaku Yamahata wrote:
> Move pci host stuff from pci.c to pci_host.c.
> And add some comments.
> Later pcie host bridge functions will be defined in pcie_host.c
> not to bloat pci.c.
>
> Signed-off-by: Isaku Yamahata <address@hidden>
So this is good stuff except we do not need
pci_dev_write_config/pci_dev_read_config.
> ---
> hw/pci.c | 34 ++++------------------------------
> hw/pci.h | 4 ++++
> hw/pci_host.c | 34 ++++++++++++++++++++++++++++++++++
> 3 files changed, 42 insertions(+), 30 deletions(-)
>
> diff --git a/hw/pci.c b/hw/pci.c
> index d472b58..99b420f 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -654,8 +654,8 @@ void pci_default_write_config(PCIDevice *d, uint32_t
> addr, uint32_t val, int l)
> pci_update_mappings(d);
> }
>
> -static void pci_dev_write_config(PCIDevice *pci_dev,
> - uint32_t config_addr, uint32_t val, int len)
> +void pci_dev_write_config(PCIDevice *pci_dev,
> + uint32_t config_addr, uint32_t val, int len)
> {
> assert(len == 1 || len == 2 || len == 4);
> if (!pci_dev)
> @@ -666,8 +666,8 @@ static void pci_dev_write_config(PCIDevice *pci_dev,
> pci_dev->config_write(pci_dev, config_addr, val, len);
> }
>
> -static uint32_t pci_dev_read_config(PCIDevice *pci_dev,
> - uint32_t config_addr, int len)
> +uint32_t pci_dev_read_config(PCIDevice *pci_dev,
> + uint32_t config_addr, int len)
> {
> uint32_t val;
>
> @@ -693,32 +693,6 @@ static uint32_t pci_dev_read_config(PCIDevice *pci_dev,
> return val;
> }
>
> -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;
> -}
> -
> -void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
> -{
> - PCIBus *s = opaque;
> - pci_dev_write_config(pci_addr_to_dev(s, addr), pci_addr_to_config(addr),
> - val, len);
> -}
> -
> -uint32_t pci_data_read(void *opaque, uint32_t addr, int len)
> -{
> - PCIBus *s = opaque;
> - return pci_dev_read_config(pci_addr_to_dev(s, addr),
> - pci_addr_to_config(addr), len);
> -}
> -
> /***********************************************************/
> /* generic PCI irq support */
>
> diff --git a/hw/pci.h b/hw/pci.h
> index 3a3838d..7711ed4 100644
> --- a/hw/pci.h
> +++ b/hw/pci.h
> @@ -268,6 +268,10 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char
> *default_model,
> const char *default_devaddr);
> PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
> const char *default_devaddr);
> +void pci_dev_write_config(PCIDevice *pci_dev,
> + uint32_t config_addr, uint32_t val, int len);
> +uint32_t pci_dev_read_config(PCIDevice *pci_dev,
> + uint32_t config_addr, int len);
> void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len);
> uint32_t pci_data_read(void *opaque, uint32_t addr, int len);
> int pci_bus_num(PCIBus *s);
> diff --git a/hw/pci_host.c b/hw/pci_host.c
> index 99416c8..d827b06 100644
> --- a/hw/pci_host.c
> +++ b/hw/pci_host.c
> @@ -32,6 +32,40 @@ do { printf("pci_host_data: " fmt , ## __VA_ARGS__); }
> while (0)
> #define PCI_DPRINTF(fmt, ...)
> #endif
>
> +/*
> + * PCI address
> + * bit 16 - 24: bus number
> + * bit 8 - 15: devfun number
> + * bit 0 - 7: offset in configuration space of a given pci device
> + */
> +
> +/* the helper functio to get a PCIDeice* for a given pci address */
> +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 uint32_t pci_addr_to_config(uint32_t addr)
> +{
> + return addr & 0xff;
> +}
> +
> +void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len)
> +{
> + PCIBus *s = opaque;
> + pci_dev_write_config(pci_addr_to_dev(s, addr), pci_addr_to_config(addr),
> + val, len);
> +}
> +
> +uint32_t pci_data_read(void *opaque, uint32_t addr, int len)
> +{
> + PCIBus *s = opaque;
> + return pci_dev_read_config(pci_addr_to_dev(s, addr),
> + pci_addr_to_config(addr), len);
> +}
> +
> static void pci_host_config_writel(void *opaque, target_phys_addr_t addr,
> uint32_t val)
> {
> --
> 1.6.0.2
- Re: [Qemu-devel] Re: [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn(), (continued)
[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
[Qemu-devel] [PATCH V5 24/29] pci: fix pci_default_write_config(), Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 25/29] pci: add helper functions for pci config write function., Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 20/29] pci: move pci host stuff from pci.c to pci_host.c, Isaku Yamahata, 2009/10/09
- [Qemu-devel] Re: [PATCH V5 20/29] pci: move pci host stuff from pci.c to pci_host.c,
Michael S. Tsirkin <=
[Qemu-devel] [PATCH V5 06/29] pci: use helper functions to access pci config space., Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 19/29] pci: split out ioport address parsing from pci configuration access logic., Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 26/29] pci: use helper function in pci_default_write_config(), Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 13/29] pci: introduce pcibus_t to represent pci bus address/size instead of uint32_t, Isaku Yamahata, 2009/10/09
[Qemu-devel] [PATCH V5 16/29] pci: 64bit bar support., Isaku Yamahata, 2009/10/09