hw/pci-host: Use register definitions from PCI standard
PATCH 1/1 hw/pci-host: Use register definitions from PCI standard
No need to document magic values when the definition names from "standard-headers/linux/pci_regs.h" are self-explicit.
--- hw/pci-host/grackle.c | 2 +- hw/pci-host/raven.c | 6 +++--- hw/pci-host/uninorth.c | 30 +++++++++++------------------- 3 files changed, 15 insertions(+), 23 deletions(-)
hw/pci-host/grackle.c +1 -1
@@ -91,7 +91,7 @@ static void grackle_init(Object *obj)static void grackle_pci_realize (PCIDevice *d,Error **errp) { - d->config[0x09 ] =0x01 ; + d->config[PCI_CLASS_PROG ] =0x01 ; }static void grackle_pci_class_init (ObjectClass *klass,void *data)
hw/pci-host/raven.c +3 -3
@@ -329,9 +329,9 @@ static void raven_realize(PCIDevice *d, Error **errp)char *filename;int bios_size =-1 ; - d->config[0x0C ] =0x08 ;// cache_line_size - d->config[0x0D ] =0x10 ;// latency_timer - d->config[0x34 ] =0x00 ;// capabilities_pointer + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ;memory_region_init_rom_nomigrate (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE , &error_fatal);
hw/pci-host/uninorth.c +11 -19
@@ -277,11 +277,11 @@ static void pci_unin_internal_init(Object *obj)static void unin_main_pci_host_realize (PCIDevice *d,Error **errp) {/* cache_line_size */ - d->config[0x0C ] =0x08 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ;/* latency_timer */ - d->config[0x0D ] =0x10 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ;/* capabilities_pointer */ - d->config[0x34 ] =0x00 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ;/* * Set kMacRISCPCIAddressSelect (0x48) register to indicate PCI
@@ -296,30 +296,22 @@ static void unin_main_pci_host_realize(PCIDevice *d, Error **errp)static void unin_agp_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache_line_size */ - d->config[0x0C ] =0x08 ; -/* latency_timer */ - d->config[0x0D ] =0x10 ; -/* capabilities_pointer -d->config[0x34] = 0x80; */ + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; +/* d->config[PCI_CAPABILITY_LIST] = 0x80; */ }static void u3_agp_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache line size */ - d->config[0x0C ] =0x08 ; -/* latency timer */ - d->config[0x0D ] =0x10 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; }static void unin_internal_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache_line_size */ - d->config[0x0C ] =0x08 ; -/* latency_timer */ - d->config[0x0D ] =0x10 ; -/* capabilities_pointer */ - d->config[0x34 ] =0x00 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ; }static void unin_main_pci_host_class_init (ObjectClass *klass,void *data)
Signature · 1 line
2.38.1
Quoted 46 lines · Philippe Mathieu-Daudé
No need to document magic values when the definition names from "
standard-headers/linux/pci_regs.h" are self-explicit.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
hw/pci-host/grackle.c | 2 +- hw/pci-host/raven.c | 6 +++--- hw/pci-host/uninorth.c | 30 +++++++++++------------------- 3 files changed, 15 insertions(+), 23 deletions(-)hw/pci-host/grackle.c +1
-1@@ -91,7 +91,7 @@ static void grackle_init(Object *obj)static void grackle_pci_realize (PCIDevice *d,Error **errp) { - d->config[0x09 ] =0x01 ; + d->config[PCI_CLASS_PROG ] =0x01 ; }static void grackle_pci_class_init (ObjectClass *klass,void *data)hw/pci-host/raven.c +3
-3@@ -329,9 +329,9 @@ static void raven_realize(PCIDevice *d, Error **errp)char *filename;int bios_size =-1 ; - d->config[0x0C ] =0x08 ;// cache_line_size - d->config[0x0D ] =0x10 ;// latency_timer - d->config[0x34 ] =0x00 ;// capabilities_pointer + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ;memory_region_init_rom_nomigrate (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE , &error_fatal);hw/pci-host/uninorth.c +0
-0@@ -277,11 +277,11 @@ static void pci_unin_internal_init(Object *obj)static void unin_main_pci_host_realize (PCIDevice *d,Error **errp)
hw/pci-host/uninorth.c static void pci_unin_internal_init(Object *obj) · line 284
Quoted 10 lines
hw/pci-host/uninorth.c +3
-3{/* cache_line_size */ - d->config[0x0C ] =0x08 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ;/* latency_timer */ - d->config[0x0D ] =0x10 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ;/* capabilities_pointer */ - d->config[0x34 ] =0x00 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ;
Did you mean to remove the comments here as well?
Regards,
BALATON Zoltan
Quoted 42 lines
hw/pci-host/uninorth.c +8
-16/* * Set kMacRISCPCIAddressSelect (0x48) register to indicate PCI @@ -296,30 +296,22 @@ static void unin_main_pci_host_realize(PCIDevice *d, Error **errp)static void unin_agp_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache_line_size */ - d->config[0x0C ] =0x08 ; -/* latency_timer */ - d->config[0x0D ] =0x10 ; -/* capabilities_pointer -d->config[0x34] = 0x80; */ + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; +/* d->config[PCI_CAPABILITY_LIST] = 0x80; */ }static void u3_agp_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache line size */ - d->config[0x0C ] =0x08 ; -/* latency timer */ - d->config[0x0D ] =0x10 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; }static void unin_internal_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache_line_size */ - d->config[0x0C ] =0x08 ; -/* latency_timer */ - d->config[0x0D ] =0x10 ; -/* capabilities_pointer */ - d->config[0x34 ] =0x00 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ; }static void unin_main_pci_host_class_init (ObjectClass *klass,void *data)
Quoted 22 lines · BALATON Zoltan
Quoted 21 lines · Philippe Mathieu-Daudé
No need to document magic values when the definition names from "
standard-headers/linux/pci_regs.h" are self-explicit.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
hw/pci-host/grackle.c | 2 +- hw/pci-host/raven.c | 6 +++---hw/pci-host/uninorth.c| 30 +++++++++++-------------------3 files changed, 15 insertions(+), 23 deletions(-)hw/pci-host/uninorth.c +1
-1@@ -277,11 +277,11 @@ static void pci_unin_internal_init(Object *obj)static void unin_main_pci_host_realize (PCIDevice *d,Error **errp) { /* cache_line_size */ - d->config[0x0C] = 0x08; + d->config[PCI_CACHE_LINE_SIZE] = 0x08;
Quoted 8 lines
hw/pci-host/uninorth.c static void pci_unin_internal_init(Object *obj) · line 284
Quoted 6 lines
hw/pci-host/uninorth.c +2
-2/* latency_timer */ - d->config[0x0D] = 0x10; + d->config[PCI_LATENCY_TIMER] = 0x10; /* capabilities_pointer */ - d->config[0x34] = 0x00; + d->config[PCI_CAPABILITY_LIST] = 0x00;Did you mean to remove the comments here as well?
Good point, thanks!
Am 5. Januar 2023 16:02:48 UTC schrieb BALATON Zoltan <[email protected]>:
Quoted 51 lines · Philippe Mathieu-Daudé
Quoted 50 lines
No need to document magic values when the definition names from "
standard-headers/linux/pci_regs.h" are self-explicit.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
hw/pci-host/grackle.c | 2 +- hw/pci-host/raven.c | 6 +++--- hw/pci-host/uninorth.c | 30 +++++++++++------------------- 3 files changed, 15 insertions(+), 23 deletions(-)hw/pci-host/grackle.c +1
-1@@ -91,7 +91,7 @@ static void grackle_init(Object *obj)static void grackle_pci_realize (PCIDevice *d,Error **errp) { - d->config[0x09 ] =0x01 ; + d->config[PCI_CLASS_PROG ] =0x01 ; }static void grackle_pci_class_init (ObjectClass *klass,void *data)hw/pci-host/raven.c +3
-3@@ -329,9 +329,9 @@ static void raven_realize(PCIDevice *d, Error **errp)char *filename;int bios_size =-1 ; - d->config[0x0C ] =0x08 ;// cache_line_size - d->config[0x0D ] =0x10 ;// latency_timer - d->config[0x34 ] =0x00 ;// capabilities_pointer + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ;memory_region_init_rom_nomigrate (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE , &error_fatal);hw/pci-host/uninorth.c +1
-1@@ -277,11 +277,11 @@ static void pci_unin_internal_init(Object *obj)static void unin_main_pci_host_realize (PCIDevice *d,Error **errp) {/* cache_line_size */ - d->config[0x0C ] =0x08 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ;
Quoted 8 lines
hw/pci-host/uninorth.c static void pci_unin_internal_init(Object *obj) · line 284
Quoted 6 lines
hw/pci-host/uninorth.c +2
-2/* latency_timer */ - d->config[0x0D ] =0x10 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ;/* capabilities_pointer */ - d->config[0x34 ] =0x00 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ;Did you mean to remove the comments here as well?
Removing the comments makes sense to me since they're redundant to the enums.
Best regards,
Bernhard
Quoted 46 lines
Regards,
BALATON ZoltanQuoted 42 lines
hw/pci-host/uninorth.c +8
-16/* * Set kMacRISCPCIAddressSelect (0x48) register to indicate PCI @@ -296,30 +296,22 @@ static void unin_main_pci_host_realize(PCIDevice *d, Error **errp)static void unin_agp_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache_line_size */ - d->config[0x0C ] =0x08 ; -/* latency_timer */ - d->config[0x0D ] =0x10 ; -/* capabilities_pointer -d->config[0x34] = 0x80; */ + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; +/* d->config[PCI_CAPABILITY_LIST] = 0x80; */ }static void u3_agp_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache line size */ - d->config[0x0C ] =0x08 ; -/* latency timer */ - d->config[0x0D ] =0x10 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; }static void unin_internal_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache_line_size */ - d->config[0x0C ] =0x08 ; -/* latency_timer */ - d->config[0x0D ] =0x10 ; -/* capabilities_pointer */ - d->config[0x34 ] =0x00 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ; }static void unin_main_pci_host_class_init (ObjectClass *klass,void *data)
Quoted 88 lines · Philippe Mathieu-Daudé
No need to document magic values when the definition names from "
standard-headers/linux/pci_regs.h" are self-explicit.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/pci-host/grackle.c | 2 +- hw/pci-host/raven.c | 6 +++--- hw/pci-host/uninorth.c | 30 +++++++++++------------------- 3 files changed, 15 insertions(+), 23 deletions(-)hw/pci-host/grackle.c +1
-1@@ -91,7 +91,7 @@ static void grackle_init(Object *obj)static void grackle_pci_realize (PCIDevice *d,Error **errp) { - d->config[0x09 ] =0x01 ; + d->config[PCI_CLASS_PROG ] =0x01 ; }static void grackle_pci_class_init (ObjectClass *klass,void *data)hw/pci-host/raven.c +3
-3@@ -329,9 +329,9 @@ static void raven_realize(PCIDevice *d, Error **errp)char *filename;int bios_size =-1 ; - d->config[0x0C ] =0x08 ;// cache_line_size - d->config[0x0D ] =0x10 ;// latency_timer - d->config[0x34 ] =0x00 ;// capabilities_pointer + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ;memory_region_init_rom_nomigrate (&s->bios,OBJECT (s),"bios" ,BIOS_SIZE , &error_fatal);hw/pci-host/uninorth.c +8
-15@@ -277,11 +277,11 @@ static void pci_unin_internal_init(Object *obj)static void unin_main_pci_host_realize (PCIDevice *d,Error **errp) {/* cache_line_size */ - d->config[0x0C ] =0x08 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ;/* latency_timer */ - d->config[0x0D ] =0x10 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ;/* capabilities_pointer */ - d->config[0x34 ] =0x00 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ;/* * Set kMacRISCPCIAddressSelect (0x48) register to indicate PCI @@ -296,30 +296,22 @@ static void unin_main_pci_host_realize(PCIDevice *d, Error **errp)static void unin_agp_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache_line_size */ - d->config[0x0C ] =0x08 ; -/* latency_timer */ - d->config[0x0D ] =0x10 ; -/* capabilities_pointer -d->config[0x34] = 0x80; */ + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; +/* d->config[PCI_CAPABILITY_LIST] = 0x80; */ }static void u3_agp_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache line size */ - d->config[0x0C ] =0x08 ; -/* latency timer */ - d->config[0x0D ] =0x10 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; }static void unin_internal_pci_host_realize (PCIDevice *d,Error **errp) { -/* cache_line_size */ - d->config[0x0C ] =0x08 ;
hw/pci-host/uninorth.c static void unin_main_pci_host_realize(PCIDevice *d, Error **errp) · line 317
Quoted 10 lines
hw/pci-host/uninorth.c +3
-4-/* latency_timer */ - d->config[0x0D ] =0x10 ; -/* capabilities_pointer */ - d->config[0x34 ] =0x00 ; + d->config[PCI_CACHE_LINE_SIZE ] =0x08 ; + d->config[PCI_LATENCY_TIMER ] =0x10 ; + d->config[PCI_CAPABILITY_LIST ] =0x00 ; }static void unin_main_pci_host_class_init (ObjectClass *klass,void *data)
ATB,
Mark.