From: "Michael S. Tsirkin" <mst@redhat.com>
To: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: qemu-devel@nongnu.org
Subject: [Qemu-devel] Re: [PATCH V5 25/29] pci: add helper functions for pci config write function.
Date: Sat, 10 Oct 2009 21:58:39 +0200 [thread overview]
Message-ID: <20091010195839.GH14275@redhat.com> (raw)
In-Reply-To: <1255069742-15724-26-git-send-email-yamahata@valinux.co.jp>
On Fri, Oct 09, 2009 at 03:28:58PM +0900, Isaku Yamahata wrote:
> add helper functions for pci config write function to check
> if its configuration space is changed.
> To detect the change in configuration space, memcpy the original
> value and memcmp with updated value.
> The original value is allocated in PCIDevice because its length
> might be 4K for pci express which is a bit too large for stack.
>
> Those functions will be used later and generic enough for specific
> pci device to use.
>
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> ---
> hw/pci.c | 2 ++
> hw/pci.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 52 insertions(+), 0 deletions(-)
>
> diff --git a/hw/pci.c b/hw/pci.c
> index 8e396b6..ece429f 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -446,6 +446,7 @@ static void pci_config_alloc(PCIDevice *pci_dev)
> pci_dev->cmask = qemu_mallocz(config_size);
> pci_dev->wmask = qemu_mallocz(config_size);
> pci_dev->used = qemu_mallocz(config_size);
> + pci_dev->orig = qemu_mallocz(config_size);
> }
>
> static void pci_config_free(PCIDevice *pci_dev)
> @@ -454,6 +455,7 @@ static void pci_config_free(PCIDevice *pci_dev)
> qemu_free(pci_dev->cmask);
> qemu_free(pci_dev->wmask);
> qemu_free(pci_dev->used);
> + qemu_free(pci_dev->orig);
> }
>
> /* -1 for devfn means auto assign */
> diff --git a/hw/pci.h b/hw/pci.h
> index bfa29c8..2896b0e 100644
> --- a/hw/pci.h
> +++ b/hw/pci.h
> @@ -192,6 +192,9 @@ struct PCIDevice {
> /* Used to allocate config space for capabilities. */
> uint8_t *used;
>
> + /* Used to implement configuration space change */
> + uint8_t *orig;
> +
> /* the following fields are read only */
> PCIBus *bus;
> uint32_t devfn;
> @@ -388,6 +391,53 @@ static inline uint32_t pci_config_size(PCIDevice *d)
> return pci_is_express(d) ? PCIE_CONFIG_SPACE_SIZE : PCI_CONFIG_SPACE_SIZE;
> }
>
> +struct pci_config_update {
> + PCIDevice *d;
> + uint32_t addr;
> + uint32_t val;
> + int len;
> +};
> +
> +static inline void pci_write_config_init(struct pci_config_update *update,
> + PCIDevice *d,
> + uint32_t addr, uint32_t val, int len)
> +{
> + update->d = d;
> + update->addr = addr;
> + update->val = val;
> + update->len = len;
> + memcpy(d->orig, d->config, pci_config_size(d));
> +}
> +
I think this is a bad API, because it is not re-entrant:
If someone calls pci_write_config_init and then default_write_config
which calls pci_write_config_init internally, everything breaks.
What happens if default write onfig will just update regions
on each write into PCI header? That would simplify code very much.
> +static inline void pci_write_config_update(struct pci_config_update *update)
> +{
> + PCIDevice *d = update->d;
> + uint32_t addr = update->addr;
> + uint32_t val = update->val;
> + uint32_t config_size = pci_config_size(d);
> + int i;
> +
> + for(i = 0; i < update->len && addr < config_size; val >>= 8, ++i, ++addr) {
> + uint8_t wmask = d->wmask[addr];
> + d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask);
> + }
> +}
> +
> +/* check if [base, end) in configuration space is changed */
> +static inline int pci_config_changed(const struct pci_config_update *update,
> + uint32_t base, uint32_t end)
> +{
> + return memcmp(update->d->orig + base, update->d->config + base,
> + end - base);
> +}
> +
> +/* for convinience not to type symbol constant twice */
> +static inline int pci_config_changed_with_size(
> + const struct pci_config_update *update, uint32_t base, uint32_t size)
> +{
> + return pci_config_changed(update, base, base + size);
> +}
> +
> /* lsi53c895a.c */
> #define LSI_MAX_DEVS 7
>
> --
> 1.6.0.2
next prev parent reply other threads:[~2009-10-10 20:00 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-09 6:28 [Qemu-devel] [PATCH V5 00/29] pci: various pci clean up and pci express support Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 01/29] pci: fix PCI_DPRINTF() wrt variadic macro Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 02/29] pci: introduce constant PCI_NUM_PINS for the number of interrupt pins, 4 Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 03/29] pci: use PCI_SLOT() and PCI_FUNC() Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 04/29] pci: define a constant to represent a unmapped bar and use it Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 05/29] pci: helper functions to access PCIDevice::config Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 06/29] pci: use helper functions to access pci config space Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 07/29] pci/bridge: clean up of pci_bridge_initfn() Isaku Yamahata
2009-10-09 6:53 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-13 13:20 ` Isaku Yamahata
2009-10-13 14:17 ` Michael S. Tsirkin
2009-10-13 15:12 ` Blue Swirl
2009-10-13 15:26 ` Michael S. Tsirkin
2009-10-13 16:32 ` Blue Swirl
2009-10-09 6:54 ` Michael S. Tsirkin
2009-10-09 6:28 ` [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 6:57 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-13 13:21 ` Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 09/29] pci: clean up of pci_default_read_config Isaku Yamahata
2009-10-09 6:50 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:58 ` Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 10/29] pci: make pci_bar() aware of header type 1 Isaku Yamahata
2009-10-09 7:06 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-10 19:29 ` Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 11/29] pci_host.h: move functions in pci_host.h into .c file Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 12/29] pci_host: consolidate pci config address access Isaku Yamahata
2009-10-09 6:28 ` [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 6:28 ` [Qemu-devel] [PATCH V5 14/29] pci: introduce FMT_PCIBUS for printf format for pcibus_t Isaku Yamahata
2009-10-10 19:32 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 15/29] pci: typedef pcibus_t as uint64_t instead of uint32_t Isaku Yamahata
2009-10-11 10:43 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-13 13:31 ` Isaku Yamahata
2009-10-13 14:39 ` Michael S. Tsirkin
2009-10-14 4:35 ` Isaku Yamahata
2009-10-14 8:55 ` Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 16/29] pci: 64bit bar support Isaku Yamahata
2009-10-10 19:39 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-13 13:52 ` Isaku Yamahata
2009-10-13 15:00 ` Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 17/29] pci: make pci configuration transaction more accurate Isaku Yamahata
2009-10-09 12:52 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 18/29] pci: factor out the conversion logic from io port address into pci device Isaku Yamahata
2009-10-10 19:41 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 19/29] pci: split out ioport address parsing from pci configuration access logic Isaku Yamahata
2009-10-10 19:45 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-13 14:14 ` Isaku Yamahata
2009-10-13 14:49 ` Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 20/29] pci: move pci host stuff from pci.c to pci_host.c Isaku Yamahata
2009-10-10 19:46 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 21/29] pci_host: change the signature of pci_data_{read, write} Isaku Yamahata
2009-10-09 12:02 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 22/29] vmstate: add VMSTATE_ARRAY_POINTER for pointer to array Isaku Yamahata
2009-10-11 10:37 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 23/29] pci: pcie host and mmcfg support Isaku Yamahata
2009-10-11 10:26 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 24/29] pci: fix pci_default_write_config() Isaku Yamahata
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 25/29] pci: add helper functions for pci config write function Isaku Yamahata
2009-10-10 19:58 ` Michael S. Tsirkin [this message]
2009-10-09 6:28 ` [Qemu-devel] [PATCH V5 26/29] pci: use helper function in pci_default_write_config() Isaku Yamahata
2009-10-09 6:29 ` [Qemu-devel] [PATCH V5 27/29] pci/bridge: don't update bar mapping when bar2-5 is changed Isaku Yamahata
2009-10-09 10:35 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-09 6:29 ` [Qemu-devel] [PATCH V5 28/29] pci: initialize pci config headers depending it pci header type Isaku Yamahata
2009-10-09 10:42 ` [Qemu-devel] " Michael S. Tsirkin
2009-10-13 14:31 ` Isaku Yamahata
2009-10-13 14:52 ` Michael S. Tsirkin
2009-10-13 15:06 ` Michael S. Tsirkin
2009-10-09 6:29 ` [Qemu-devel] [PATCH V5 29/29] pci/monitor: print out bridge's filtering values and so on Isaku Yamahata
2009-10-10 20:05 ` [Qemu-devel] " Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091010195839.GH14275@redhat.com \
--to=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=yamahata@valinux.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.