Add ability to import new asic from script file
PATCH 1/1 Add ability to import new asic from script file
This is meant for NPI support only as publicly released designs can simply add to the static definitions.
This is used by using the --force (-f) option with a filename that has a @ prefixed on, e.g.
umr -O bits -f @demo/npi/newchip -lr gfx10
Will read the file 'newchip' and import the ip/reg/bit definitions and then can proceed as normal producing this output:
[WARNING]: Should use --pci when using create_asic_from_script()
new_chip.gfx10.mmSUPER_SECRET => 0x12345670
new_chip.gfx10.mmSUPER_SECRET.enable[0:0]You will need to use --pci to specify a precise device otherwise it won't be able to talk to it.
Signed-off-by Tom St Denis <[email protected]>
--- demo/npi/new_chip | 2 + src/app/main.c | 1 + src/lib/CMakeLists.txt | 1 + src/lib/create_asic_from_script.c | 286 ++++++++++++++++++++++++++++++++++++++ src/lib/discover.c | 9 +- src/lib/discover_by_name.c | 3 + src/umr.h | 3 + 7 files changed, 304 insertions(+), 1 deletion(-) create mode 100644 demo/npi/new_chip create mode 100644 src/lib/create_asic_from_script.c
demo/npi/new_chip new file +2 -0
@@ -0,0 +1,2 @@ +reg gfx10 mmSUPER_SECRET mmio 0x12345670 +bit gfx10 mmSUPER_SECRET enable 0 0
src/app/main.c +1 -0
@@ -178,6 +178,7 @@ int main(int argc, char **argv)if (i +1 < argc &&sscanf (argv[i+1 ],"%04x:%02x:%02x.%01x" , &options.pci.domain, &options.pci.bus, &options.pci.slot, &options.pci.func ) >=4 ) { + options.use_pci =1 ;// implied by the --pci option ++i; }else {printf ("--pci requires domain:bus:slot.function\n" );
src/lib/CMakeLists.txt +1 -0
@@ -7,6 +7,7 @@ add_library(umrcore STATIC bitfield_print.c close_asic.c create_asic_helper.c + create_asic_from_script.c create_mmio_accel.c discover_by_did.c discover_by_name.c
src/lib/create_asic_from_script.c new file +286 -0
286 lines not on this page · raw message
src/lib/discover.c +8 -1
@@ -101,6 +101,7 @@ struct umr_asic *umr_discover_asic(struct umr_options *options)unsigned did;struct umr_asic *asic;long trydid = options->forcedid; +int busmatch =0 ;// Try to map to instance if we have a specific pci device if (options->pci.domain || options->pci.bus ||
@@ -254,8 +255,14 @@ struct umr_asic *umr_discover_asic(struct umr_options *options) options->pci.func != asic->pci.pdevice->func)) { asic->pci.pdevice =pci_device_next (pci_iter); } + +// indicate we found an exact match for the pci bus/slot +// this is used because NPI use cases won't have names to +// match against in is_did_match() +if (asic->pci.pdevice) + busmatch =1 ; } - }while (asic->pci.pdevice && !(asic->pci.pdevice->vendor_id ==0x1002 &&is_did_match (asic, asic->pci.pdevice->device_id))); + }while (asic->pci.pdevice && !(busmatch || (asic->pci.pdevice->vendor_id ==0x1002 &&is_did_match (asic, asic->pci.pdevice->device_id))));if (!asic->pci.pdevice) {fprintf (stderr,"[ERROR]: Could not find ASIC with DID of %04lx\n" , (unsigned long )asic->did);
src/lib/discover_by_name.c +3 -0
@@ -55,6 +55,9 @@ struct umr_asic *umr_discover_asic_by_name(struct umr_options *options, char *naunsigned x;struct umr_asic *asic, *tmp; +if (name[0 ] =='@' ) +return umr_create_asic_from_script (options, name +1 ); + asic =NULL ;for (x =0 ; x < (sizeof (devices)/sizeof (devices[0 ])); x++)if (!strcmp (devices[x].name, name))
src/umr.h +3 -0
@@ -55,6 +55,8 @@ enum chipfamily {FAMILY_VI ,FAMILY_AI ,FAMILY_RV , + + FAMILY_NPI, // reserves for new devices that are not public yet }; enum regclass {
@@ -428,6 +430,7 @@ struct umr_ip_block *umr_create_bif51(struct umr_options *options);/* asic constructors */ struct umr_asic *umr_create_asic_helper (char *name,int family, ...); +struct umr_asic *umr_create_asic_from_script (struct umr_options *options,char *name);struct umr_asic *umr_create_bonaire (struct umr_options *options);struct umr_asic *umr_create_carrizo (struct umr_options *options);struct umr_asic *umr_create_fiji (struct umr_options *options);
Signature · 6 lines
2.12.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx