OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

habanalabs: ASIC_AUTO_DETECT enum value is redundant 

This patch removes the enum value of ASIC_AUTO_DETECT because we can use
the validity of the pdev variable to know whether we have a real device or
a simulator. For a real device, we detect the asic type from the device ID
while for a simulator, the simulator code calls create_hdev() with the
specified ASIC type.

Set ASIC_INVALID as the first option in the enum to make sure that no
other enum value will receive the value 0 (which indicates a non-existing
entry in the simulator array).

Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
This commit is contained in:
Oded Gabbay 2019-04-04 14:33:34 +03:00
parent bedd14425d
commit 295938406c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/misc/habanalabs/habanalabs.h
View File

@ -390,14 +390,12 @@ struct hl_eq {
/** /**
* enum hl_asic_type - supported ASIC types. * enum hl_asic_type - supported ASIC types.
* @ASIC_AUTO_DETECT: ASIC type will be automatically set.
* @ASIC_GOYA: Goya device.
* @ASIC_INVALID: Invalid ASIC type. * @ASIC_INVALID: Invalid ASIC type.
* @ASIC_GOYA: Goya device.
*/ */
enum hl_asic_type { enum hl_asic_type {
ASIC_AUTO_DETECT, ASIC_INVALID,
ASIC_GOYA, ASIC_GOYA
ASIC_INVALID
}; };
struct hl_cs_parser; struct hl_cs_parser;

4
drivers/misc/habanalabs/habanalabs_drv.c
View File

@ -218,7 +218,7 @@ int create_hdev(struct hl_device **dev, struct pci_dev *pdev,
hdev->disabled = true; hdev->disabled = true;
hdev->pdev = pdev; /* can be NULL in case of simulator device */ hdev->pdev = pdev; /* can be NULL in case of simulator device */
if (asic_type == ASIC_AUTO_DETECT) { if (pdev) {
hdev->asic_type = get_asic_type(pdev->device); hdev->asic_type = get_asic_type(pdev->device);
if (hdev->asic_type == ASIC_INVALID) { if (hdev->asic_type == ASIC_INVALID) {
dev_err(&pdev->dev, "Unsupported ASIC\n"); dev_err(&pdev->dev, "Unsupported ASIC\n");
@ -337,7 +337,7 @@ static int hl_pci_probe(struct pci_dev *pdev,
" device found [%04x:%04x] (rev %x)\n", " device found [%04x:%04x] (rev %x)\n",
(int)pdev->vendor, (int)pdev->device, (int)pdev->revision); (int)pdev->vendor, (int)pdev->device, (int)pdev->revision);
rc = create_hdev(&hdev, pdev, ASIC_AUTO_DETECT, -1); rc = create_hdev(&hdev, pdev, ASIC_INVALID, -1);
if (rc) if (rc)
return rc; return rc;