Commit 5762613e authored by Govind Singh's avatar Govind Singh Committed by Kalle Valo
Browse files

ath11k: pci: setup resources 



Add support for setting up pci region and dma mask.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2

Signed-off-by: default avatarGovind Singh <govinds@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1597309466-19688-6-git-send-email-kvalo@codeaurora.org
parent 6e0355af

drivers/net/wireless/ath/ath11k/pci.c

+105 −1
Original line number Diff line number Diff line
@@ -6,9 +6,13 @@ 
#include <linux/module.h>

#include <linux/pci.h>



#include "pci.h"

#include "core.h"

#include "debug.h"



#define ATH11K_PCI_BAR_NUM		0

#define ATH11K_PCI_DMA_MASK		32



#define QCA6390_DEVICE_ID		0x1101



static const struct pci_device_id ath11k_pci_id_table[] = {
@@ -18,11 +22,95 @@ static const struct pci_device_id ath11k_pci_id_table[] = { 


MODULE_DEVICE_TABLE(pci, ath11k_pci_id_table);



static int ath11k_pci_claim(struct ath11k_pci *ab_pci, struct pci_dev *pdev)

{

	struct ath11k_base *ab = ab_pci->ab;

	u16 device_id;

	int ret = 0;



	pci_read_config_word(pdev, PCI_DEVICE_ID, &device_id);

	if (device_id != ab_pci->dev_id)  {

		ath11k_err(ab, "pci device id mismatch: 0x%x 0x%x\n",

			   device_id, ab_pci->dev_id);

		ret = -EIO;

		goto out;

	}



	ret = pci_assign_resource(pdev, ATH11K_PCI_BAR_NUM);

	if (ret) {

		ath11k_err(ab, "failed to assign pci resource: %d\n", ret);

		goto out;

	}



	ret = pci_enable_device(pdev);

	if (ret) {

		ath11k_err(ab, "failed to enable pci device: %d\n", ret);

		goto out;

	}



	ret = pci_request_region(pdev, ATH11K_PCI_BAR_NUM, "ath11k_pci");

	if (ret) {

		ath11k_err(ab, "failed to request pci region: %d\n", ret);

		goto disable_device;

	}



	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(ATH11K_PCI_DMA_MASK));

	if (ret) {

		ath11k_err(ab, "failed to set pci dma mask to %d: %d\n",

			   ATH11K_PCI_DMA_MASK, ret);

		goto release_region;

	}



	ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(ATH11K_PCI_DMA_MASK));

	if (ret) {

		ath11k_err(ab, "failed to set pci consistent dma mask to %d: %d\n",

			   ATH11K_PCI_DMA_MASK, ret);

		goto release_region;

	}



	pci_set_master(pdev);



	ab->mem_len = pci_resource_len(pdev, ATH11K_PCI_BAR_NUM);

	ab->mem = pci_iomap(pdev, ATH11K_PCI_BAR_NUM, 0);

	if (!ab->mem) {

		ath11k_err(ab, "failed to map pci bar %d\n", ATH11K_PCI_BAR_NUM);

		ret = -EIO;

		goto clear_master;

	}



	ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot pci_mem 0x%pK\n", ab->mem);

	return 0;



clear_master:

	pci_clear_master(pdev);

release_region:

	pci_release_region(pdev, ATH11K_PCI_BAR_NUM);

disable_device:

	pci_disable_device(pdev);

out:

	return ret;

}



static void ath11k_pci_free_region(struct ath11k_pci *ab_pci)

{

	struct ath11k_base *ab = ab_pci->ab;

	struct pci_dev *pci_dev = ab_pci->pdev;



	pci_iounmap(pci_dev, ab->mem);

	ab->mem = NULL;

	pci_clear_master(pci_dev);

	pci_release_region(pci_dev, ATH11K_PCI_BAR_NUM);

	if (pci_is_enabled(pci_dev))

		pci_disable_device(pci_dev);

}



static int ath11k_pci_probe(struct pci_dev *pdev,

			    const struct pci_device_id *pci_dev)

{

	struct ath11k_base *ab;

	struct ath11k_pci *ab_pci;

	enum ath11k_hw_rev hw_rev;

	int ret;



	dev_warn(&pdev->dev, "WARNING: ath11k PCI support is experimental!\n");
@@ -36,7 +124,7 @@ static int ath11k_pci_probe(struct pci_dev *pdev, 
		return -ENOTSUPP;

	}



	ab = ath11k_core_alloc(&pdev->dev, 0, ATH11K_BUS_PCI);

	ab = ath11k_core_alloc(&pdev->dev, sizeof(*ab_pci), ATH11K_BUS_PCI);

	if (!ab) {

		dev_err(&pdev->dev, "failed to allocate ath11k base\n");

		return -ENOMEM;
@@ -45,15 +133,31 @@ static int ath11k_pci_probe(struct pci_dev *pdev, 
	ab->dev = &pdev->dev;

	ab->hw_rev = hw_rev;

	pci_set_drvdata(pdev, ab);

	ab_pci = ath11k_pci_priv(ab);

	ab_pci->dev_id = pci_dev->device;

	ab_pci->ab = ab;

	pci_set_drvdata(pdev, ab);



	ret = ath11k_pci_claim(ab_pci, pdev);

	if (ret) {

		ath11k_err(ab, "failed to claim device: %d\n", ret);

		goto err_free_core;

	}



	return 0;



err_free_core:

	ath11k_core_free(ab);

	return ret;

}



static void ath11k_pci_remove(struct pci_dev *pdev)

{

	struct ath11k_base *ab = pci_get_drvdata(pdev);

	struct ath11k_pci *ab_pci = ath11k_pci_priv(ab);



	set_bit(ATH11K_FLAG_UNREGISTERING, &ab->dev_flags);

	ath11k_pci_free_region(ab_pci);

	ath11k_core_free(ab);

}

drivers/net/wireless/ath/ath11k/pci.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause-Clear */

/*

 * Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.

 */



#include "core.h"



struct ath11k_pci {

	struct pci_dev *pdev;

	struct ath11k_base *ab;

	u16 dev_id;

};



static inline struct ath11k_pci *ath11k_pci_priv(struct ath11k_base *ab)

{

	return (struct ath11k_pci *)ab->drv_priv;

}