diff options
| author |   Ohad Sharabi <osharabi@habana.ai> | 2021-07-15 15:20:44 +0300 |
|---|---|---|
| committer |   Oded Gabbay <ogabbay@kernel.org> | 2021-09-01 18:38:24 +0300 |
| commit | b9317d513098d0da45ea96deff19058d1d37ae4d (patch) | |
| tree | 286d28c9ef9d1762250eb59654a68e38f0e1734a /drivers/misc | |
| parent | habanalabs: convert PCI BAR offset to u64 (diff) | |
| download | linux-dev-b9317d513098d0da45ea96deff19058d1d37ae4d.tar.xz linux-dev-b9317d513098d0da45ea96deff19058d1d37ae4d.zip | |
habanalabs: make set_pci_regions asic function
In order to better support variants of the same ASIC
the set_pci_regions function is now an ASIC function which
allows each ASIC to implement it internally, thus keeping
all definitions static to the file.
Signed-off-by: Ohad Sharabi <osharabi@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/habanalabs/common/habanalabs.h | 2 | ||||
| -rw-r--r-- | drivers/misc/habanalabs/gaudi/gaudi.c | 5 | ||||
| -rw-r--r-- | drivers/misc/habanalabs/goya/goya.c | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h index 43d938bd320e..7cee08d406ae 100644 --- a/drivers/misc/habanalabs/common/habanalabs.h +++ b/drivers/misc/habanalabs/common/habanalabs.h @@ -1159,6 +1159,7 @@ struct fw_load_mgr { * @init_cpu_scrambler_dram: Enable CPU specific DRAM scrambling * @state_dump_init: initialize constants required for state dump * @get_sob_addr: get SOB base address offset. + * @set_pci_memory_regions: setting properties of PCI memory regions */ struct hl_asic_funcs { int (*early_init)(struct hl_device *hdev); @@ -1287,6 +1288,7 @@ struct hl_asic_funcs { void (*init_cpu_scrambler_dram)(struct hl_device *hdev); void (*state_dump_init)(struct hl_device *hdev); u32 (*get_sob_addr)(struct hl_device *hdev, u32 sob_id); + void (*set_pci_memory_regions)(struct hl_device *hdev); }; diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c index d3bd58404c38..18fec7decb99 100644 --- a/drivers/misc/habanalabs/gaudi/gaudi.c +++ b/drivers/misc/habanalabs/gaudi/gaudi.c @@ -1857,7 +1857,7 @@ static int gaudi_sw_init(struct hl_device *hdev) hdev->supports_staged_submission = true; hdev->supports_wait_for_multi_cs = true; - gaudi_set_pci_memory_regions(hdev); + hdev->asic_funcs->set_pci_memory_regions(hdev); return 0; @@ -9377,7 +9377,8 @@ static const struct hl_asic_funcs gaudi_funcs = { .init_firmware_loader = gaudi_init_firmware_loader, .init_cpu_scrambler_dram = gaudi_init_scrambler_hbm, .state_dump_init = gaudi_state_dump_init, - .get_sob_addr = gaudi_get_sob_addr + .get_sob_addr = gaudi_get_sob_addr, + .set_pci_memory_regions = gaudi_set_pci_memory_regions }; /** diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c index 8d890c7cce08..e690161a07d2 100644 --- a/drivers/misc/habanalabs/goya/goya.c +++ b/drivers/misc/habanalabs/goya/goya.c @@ -962,7 +962,7 @@ static int goya_sw_init(struct hl_device *hdev) hdev->allow_external_soft_reset = true; hdev->supports_wait_for_multi_cs = false; - goya_set_pci_memory_regions(hdev); + hdev->asic_funcs->set_pci_memory_regions(hdev); return 0; @@ -5669,7 +5669,8 @@ static const struct hl_asic_funcs goya_funcs = { .init_firmware_loader = goya_init_firmware_loader, .init_cpu_scrambler_dram = goya_cpu_init_scrambler_dram, .state_dump_init = goya_state_dump_init, - .get_sob_addr = &goya_get_sob_addr + .get_sob_addr = &goya_get_sob_addr, + .set_pci_memory_regions = goya_set_pci_memory_regions, }; /* |