On Mon, Sep 07, 2020 at 06:03:00PM -0500, Jordan Hargrave wrote:
> This code fixes the pci device union for accessing PCI config space >= 0x40
>
> Running pcidump -xxx in a virtual machine would return garbage data due to
> union overlap
>
Thanks, looks good from my perspective.
-ml
> On Mon, Sep 07, 2020 at 05:52:55PM -0500, Jordan Hargrave wrote:
> > Index: pci.h
> > ===================================================================
> > RCS file: /cvs/src/usr.sbin/vmd/pci.h,v
> > retrieving revision 1.7
> > diff -u -p -u -r1.7 pci.h
> > --- pci.h 17 Sep 2017 23:07:56 -0000 1.7
> > +++ pci.h 7 Sep 2020 22:48:09 -0000
> > @@ -32,43 +32,44 @@ typedef int (*pci_iobar_fn_t)(int dir, u
> > void *, uint8_t);
> > typedef int (*pci_mmiobar_fn_t)(int dir, uint32_t ofs, uint32_t *data);
> >
> > -union pci_dev {
> > - uint32_t pd_cfg_space[PCI_CONFIG_SPACE_SIZE / 4];
> >
> > - struct {
> > - uint16_t pd_vid;
> > - uint16_t pd_did;
> > - uint16_t pd_cmd;
> > - uint16_t pd_status;
> > - uint8_t pd_rev;
> > - uint8_t pd_prog_if;
> > - uint8_t pd_subclass;
> > - uint8_t pd_class;
> > - uint8_t pd_cache_size;
> > - uint8_t pd_lat_timer;
> > - uint8_t pd_header_type;
> > - uint8_t pd_bist;
> > - uint32_t pd_bar[PCI_MAX_BARS];
> > - uint32_t pd_cardbus_cis;
> > - uint16_t pd_subsys_vid;
> > - uint16_t pd_subsys_id;
> > - uint32_t pd_exp_rom_addr;
> > - uint8_t pd_cap;
> > - uint32_t pd_reserved0 : 24;
> > - uint32_t pd_reserved1;
> > - uint8_t pd_irq;
> > - uint8_t pd_int;
> > - uint8_t pd_min_grant;
> > - uint8_t pd_max_grant;
> > +struct pci_dev {
> > + union {
> > + uint32_t pd_cfg_space[PCI_CONFIG_SPACE_SIZE / 4];
> > + struct {
> > + uint16_t pd_vid;
> > + uint16_t pd_did;
> > + uint16_t pd_cmd;
> > + uint16_t pd_status;
> > + uint8_t pd_rev;
> > + uint8_t pd_prog_if;
> > + uint8_t pd_subclass;
> > + uint8_t pd_class;
> > + uint8_t pd_cache_size;
> > + uint8_t pd_lat_timer;
> > + uint8_t pd_header_type;
> > + uint8_t pd_bist;
> > + uint32_t pd_bar[PCI_MAX_BARS];
> > + uint32_t pd_cardbus_cis;
> > + uint16_t pd_subsys_vid;
> > + uint16_t pd_subsys_id;
> > + uint32_t pd_exp_rom_addr;
> > + uint8_t pd_cap;
> > + uint32_t pd_reserved0 : 24;
> > + uint32_t pd_reserved1;
> > + uint8_t pd_irq;
> > + uint8_t pd_int;
> > + uint8_t pd_min_grant;
> > + uint8_t pd_max_grant;
> > + } __packed;
> > + };
> > + uint8_t pd_bar_ct;
> > + pci_cs_fn_t pd_csfunc;
> >
> > - uint8_t pd_bar_ct;
> > - pci_cs_fn_t pd_csfunc;
> > -
> > - uint8_t pd_bartype[PCI_MAX_BARS];
> > - uint32_t pd_barsize[PCI_MAX_BARS];
> > - void *pd_barfunc[PCI_MAX_BARS];
> > - void *pd_bar_cookie[PCI_MAX_BARS];
> > - } __packed;
> > + uint8_t pd_bartype[PCI_MAX_BARS];
> > + uint32_t pd_barsize[PCI_MAX_BARS];
> > + void *pd_barfunc[PCI_MAX_BARS];
> > + void *pd_bar_cookie[PCI_MAX_BARS];
> > };
> >
> > struct pci {
> > @@ -79,7 +80,7 @@ struct pci {
> > uint32_t pci_addr_reg;
> > uint32_t pci_data_reg;
> >
> > - union pci_dev pci_devices[PCI_CONFIG_MAX_DEV];
> > + struct pci_dev pci_devices[PCI_CONFIG_MAX_DEV];
> > };
> >
> > void pci_handle_address_reg(struct vm_run_params *);
> >
>
