versatile_pci: convert to symbolic names
PATCH 1/2 versatile_pci: convert to symbolic names
In reply to a message not in the archiveThis converts versatile_pci to use symbolic
constants. Verified by comparing binary to
original one.
Signed-off-by Michael S. Tsirkin <[email protected]>
--- hw/versatile_pci.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-)
hw/versatile_pci.c +10 -7
@@ -147,14 +147,17 @@ static int versatile_pci_host_init(PCIDevice *d)pci_config_set_vendor_id (d->config,PCI_VENDOR_ID_XILINX );/* Both boards have the same device ID. Oh well. */ pci_config_set_device_id (d->config,PCI_DEVICE_ID_XILINX_XC2VP30 ); - d->config[0x04 ] =0x00 ; - d->config[0x05 ] =0x00 ; - d->config[0x06 ] =0x20 ; - d->config[0x07 ] =0x02 ; - d->config[0x08 ] =0x00 ;// revision - d->config[0x09 ] =0x00 ;// programming i/f +/* TODO: no need to clear command */ +pci_set_byte (d->config +PCI_COMMAND ,0x00 ); +pci_set_byte (d->config +PCI_COMMAND +1 ,0x00 ); +/* TODO: convert to set_word */ +pci_set_byte (d->config +PCI_STATUS ,PCI_STATUS_66MHZ ); +pci_set_byte (d->config +PCI_STATUS +1 ,PCI_STATUS_DEVSEL_MEDIUM >>8 ); +/* TODO: no need to clear revision/prog ifc */ +pci_set_byte (d->config +PCI_REVISION_ID ,0x00 ); +pci_set_byte (d->config +PCI_CLASS_PROG ,0x00 );pci_config_set_class (d->config,PCI_CLASS_PROCESSOR_CO ); - d->config[0x0D ] =0x10 ;// latency_timer +pci_set_byte (d->config +PCI_LATENCY_TIMER ,0x10 );return 0 ; }
Signature · 1 line
1.6.6.144.g5c3af
PATCH 2/2 versatile_pci: cleanup
In reply to a message not in the archiveCleanup versatile_pci: no need to re-set fields to zero (pci core sets 0 already), use set_word for status field. Compile-tested only, but seems obvious.
Signed-off-by Michael S. Tsirkin <[email protected]>
--- hw/versatile_pci.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-)
hw/versatile_pci.c +2 -9
@@ -147,15 +147,8 @@ static int versatile_pci_host_init(PCIDevice *d)pci_config_set_vendor_id (d->config,PCI_VENDOR_ID_XILINX );/* Both boards have the same device ID. Oh well. */ pci_config_set_device_id (d->config,PCI_DEVICE_ID_XILINX_XC2VP30 ); -/* TODO: no need to clear command */ -pci_set_byte (d->config +PCI_COMMAND ,0x00 ); -pci_set_byte (d->config +PCI_COMMAND +1 ,0x00 ); -/* TODO: convert to set_word */ -pci_set_byte (d->config +PCI_STATUS ,PCI_STATUS_66MHZ ); -pci_set_byte (d->config +PCI_STATUS +1 ,PCI_STATUS_DEVSEL_MEDIUM >>8 ); -/* TODO: no need to clear revision/prog ifc */ -pci_set_byte (d->config +PCI_REVISION_ID ,0x00 ); -pci_set_byte (d->config +PCI_CLASS_PROG ,0x00 ); +pci_set_word (d->config +PCI_STATUS , +PCI_STATUS_66MHZ |PCI_STATUS_DEVSEL_MEDIUM );pci_config_set_class (d->config,PCI_CLASS_PROCESSOR_CO );pci_set_byte (d->config +PCI_LATENCY_TIMER ,0x10 );return 0 ;
Signature · 1 line
1.6.6.144.g5c3af
Quoted 6 lines · Michael S. Tsirkin
This converts
versatile_pcito use symbolic
constants. Verified by comparing binary to
original one.Signed-off-by Michael S. Tsirkin<[email protected]>
Acked-by Anthony Liguori <[email protected]>
Regards,
Anthony Liguori
Quoted 34 lines
--- hw/versatile_pci.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-)hw/versatile_pci.c +10
-7@@ -147,14 +147,17 @@ static int versatile_pci_host_init(PCIDevice *d)pci_config_set_vendor_id (d->config,PCI_VENDOR_ID_XILINX );/* Both boards have the same device ID. Oh well. */ pci_config_set_device_id (d->config,PCI_DEVICE_ID_XILINX_XC2VP30 ); - d->config[0x04 ] =0x00 ; - d->config[0x05 ] =0x00 ; - d->config[0x06 ] =0x20 ; - d->config[0x07 ] =0x02 ; - d->config[0x08 ] =0x00 ;// revision - d->config[0x09 ] =0x00 ;// programming i/f +/* TODO: no need to clear command */ +pci_set_byte (d->config +PCI_COMMAND ,0x00 ); +pci_set_byte (d->config +PCI_COMMAND +1 ,0x00 ); +/* TODO: convert to set_word */ +pci_set_byte (d->config +PCI_STATUS ,PCI_STATUS_66MHZ ); +pci_set_byte (d->config +PCI_STATUS +1 ,PCI_STATUS_DEVSEL_MEDIUM >>8 ); +/* TODO: no need to clear revision/prog ifc */ +pci_set_byte (d->config +PCI_REVISION_ID ,0x00 ); +pci_set_byte (d->config +PCI_CLASS_PROG ,0x00 );pci_config_set_class (d->config,PCI_CLASS_PROCESSOR_CO ); - d->config[0x0D ] =0x10 ;// latency_timer +pci_set_byte (d->config +PCI_LATENCY_TIMER ,0x10 );return 0 ; }
Re: [Qemu-devel] [PATCH 2/2] versatile_pci: cleanup
In reply to Michael S. TsirkinQuoted 6 lines · Michael S. Tsirkin
Cleanup
versatile_pci: no need to re-set fields to zero (pci core sets 0 already), useset_wordfor status field. Compile-tested only, but seems obvious.Signed-off-by Michael S. Tsirkin<[email protected]>
Acked-by Anthony Liguori <[email protected]>
Regards,
Anthony Liguori
Quoted 27 lines
--- hw/versatile_pci.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-)hw/versatile_pci.c +2
-9@@ -147,15 +147,8 @@ static int versatile_pci_host_init(PCIDevice *d)pci_config_set_vendor_id (d->config,PCI_VENDOR_ID_XILINX );/* Both boards have the same device ID. Oh well. */ pci_config_set_device_id (d->config,PCI_DEVICE_ID_XILINX_XC2VP30 ); -/* TODO: no need to clear command */ -pci_set_byte (d->config +PCI_COMMAND ,0x00 ); -pci_set_byte (d->config +PCI_COMMAND +1 ,0x00 ); -/* TODO: convert to set_word */ -pci_set_byte (d->config +PCI_STATUS ,PCI_STATUS_66MHZ ); -pci_set_byte (d->config +PCI_STATUS +1 ,PCI_STATUS_DEVSEL_MEDIUM >>8 ); -/* TODO: no need to clear revision/prog ifc */ -pci_set_byte (d->config +PCI_REVISION_ID ,0x00 ); -pci_set_byte (d->config +PCI_CLASS_PROG ,0x00 ); +pci_set_word (d->config +PCI_STATUS , +PCI_STATUS_66MHZ |PCI_STATUS_DEVSEL_MEDIUM );pci_config_set_class (d->config,PCI_CLASS_PROCESSOR_CO );pci_set_byte (d->config +PCI_LATENCY_TIMER ,0x10 );return 0 ;