Commit 9c7fde71 authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: use %pa to print pci bar size 



PCI bar size is resource_size_t so we should use %pa to make it work
correctly on all architectures.

Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 0407c155

drivers/misc/habanalabs/gaudi/gaudi.c

+11 −14
Original line number Diff line number Diff line
@@ -801,6 +801,7 @@ static int gaudi_early_init(struct hl_device *hdev) 
{

	struct asic_fixed_properties *prop = &hdev->asic_prop;

	struct pci_dev *pdev = hdev->pdev;

	resource_size_t pci_bar_size;

	u32 fw_boot_status;

	int rc;
@@ -811,24 +812,20 @@ static int gaudi_early_init(struct hl_device *hdev) 
	}



	/* Check BAR sizes */

	if (pci_resource_len(pdev, SRAM_BAR_ID) != SRAM_BAR_SIZE) {

		dev_err(hdev->dev,

			"Not " HL_NAME "? BAR %d size %llu, expecting %llu\n",

			SRAM_BAR_ID,

			(unsigned long long) pci_resource_len(pdev,

							SRAM_BAR_ID),

			SRAM_BAR_SIZE);

	pci_bar_size = pci_resource_len(pdev, SRAM_BAR_ID);



	if (pci_bar_size != SRAM_BAR_SIZE) {

		dev_err(hdev->dev, "Not " HL_NAME "? BAR %d size %pa, expecting %llu\n",

			SRAM_BAR_ID, &pci_bar_size, SRAM_BAR_SIZE);

		rc = -ENODEV;

		goto free_queue_props;

	}



	if (pci_resource_len(pdev, CFG_BAR_ID) != CFG_BAR_SIZE) {

		dev_err(hdev->dev,

			"Not " HL_NAME "? BAR %d size %llu, expecting %llu\n",

			CFG_BAR_ID,

			(unsigned long long) pci_resource_len(pdev,

								CFG_BAR_ID),

			CFG_BAR_SIZE);

	pci_bar_size = pci_resource_len(pdev, CFG_BAR_ID);



	if (pci_bar_size != CFG_BAR_SIZE) {

		dev_err(hdev->dev, "Not " HL_NAME "? BAR %d size %pa, expecting %llu\n",

			CFG_BAR_ID, &pci_bar_size, CFG_BAR_SIZE);

		rc = -ENODEV;

		goto free_queue_props;

	}

drivers/misc/habanalabs/goya/goya.c

+11 −14
Original line number Diff line number Diff line
@@ -608,6 +608,7 @@ static int goya_early_init(struct hl_device *hdev) 
{

	struct asic_fixed_properties *prop = &hdev->asic_prop;

	struct pci_dev *pdev = hdev->pdev;

	resource_size_t pci_bar_size;

	u32 fw_boot_status, val;

	int rc;
@@ -618,24 +619,20 @@ static int goya_early_init(struct hl_device *hdev) 
	}



	/* Check BAR sizes */

	if (pci_resource_len(pdev, SRAM_CFG_BAR_ID) != CFG_BAR_SIZE) {

		dev_err(hdev->dev,

			"Not " HL_NAME "? BAR %d size %llu, expecting %llu\n",

			SRAM_CFG_BAR_ID,

			(unsigned long long) pci_resource_len(pdev,

							SRAM_CFG_BAR_ID),

			CFG_BAR_SIZE);

	pci_bar_size = pci_resource_len(pdev, SRAM_CFG_BAR_ID);



	if (pci_bar_size != CFG_BAR_SIZE) {

		dev_err(hdev->dev, "Not " HL_NAME "? BAR %d size %pa, expecting %llu\n",

			SRAM_CFG_BAR_ID, &pci_bar_size, CFG_BAR_SIZE);

		rc = -ENODEV;

		goto free_queue_props;

	}



	if (pci_resource_len(pdev, MSIX_BAR_ID) != MSIX_BAR_SIZE) {

		dev_err(hdev->dev,

			"Not " HL_NAME "? BAR %d size %llu, expecting %llu\n",

			MSIX_BAR_ID,

			(unsigned long long) pci_resource_len(pdev,

								MSIX_BAR_ID),

			MSIX_BAR_SIZE);

	pci_bar_size = pci_resource_len(pdev, MSIX_BAR_ID);



	if (pci_bar_size != MSIX_BAR_SIZE) {

		dev_err(hdev->dev, "Not " HL_NAME "? BAR %d size %pa, expecting %llu\n",

			MSIX_BAR_ID, &pci_bar_size, MSIX_BAR_SIZE);

		rc = -ENODEV;

		goto free_queue_props;

	}