Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5cf1b62 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Switch to new APIs"

parents 0497364c 3f813134

drivers/net/wireless/cnss2/bus.c

+3 −2
Original line number Diff line number Diff line
@@ -154,9 +154,10 @@ int cnss_bus_force_fw_assert_hdlr(struct cnss_plat_data *plat_priv) 
	}

}



void cnss_bus_fw_boot_timeout_hdlr(unsigned long data)

void cnss_bus_fw_boot_timeout_hdlr(struct timer_list *t)

{

	struct cnss_plat_data *plat_priv = (struct cnss_plat_data *)data;

	struct cnss_plat_data *plat_priv =

		from_timer(plat_priv, t, fw_boot_timer);



	if (!plat_priv)

		return;

drivers/net/wireless/cnss2/bus.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ int cnss_bus_load_m3(struct cnss_plat_data *plat_priv); 
int cnss_bus_alloc_fw_mem(struct cnss_plat_data *plat_priv);

u32 cnss_bus_get_wake_irq(struct cnss_plat_data *plat_priv);

int cnss_bus_force_fw_assert_hdlr(struct cnss_plat_data *plat_priv);

void cnss_bus_fw_boot_timeout_hdlr(unsigned long data);

void cnss_bus_fw_boot_timeout_hdlr(struct timer_list *t);

void cnss_bus_collect_dump_info(struct cnss_plat_data *plat_priv,

				bool in_panic);

int cnss_bus_call_driver_probe(struct cnss_plat_data *plat_priv);

drivers/net/wireless/cnss2/main.c

+3 −3
Original line number Diff line number Diff line
@@ -1569,8 +1569,8 @@ static int cnss_misc_init(struct cnss_plat_data *plat_priv) 
{

	int ret;



	setup_timer(&plat_priv->fw_boot_timer, cnss_bus_fw_boot_timeout_hdlr,

		    (unsigned long)plat_priv);

	timer_setup(&plat_priv->fw_boot_timer,

		    cnss_bus_fw_boot_timeout_hdlr, 0);



	register_pm_notifier(&cnss_pm_notifier);
@@ -1609,7 +1609,7 @@ static const struct platform_device_id cnss_platform_id_table[] = { 
	{ .name = "qca6174", .driver_data = QCA6174_DEVICE_ID, },

	{ .name = "qca6290", .driver_data = QCA6290_DEVICE_ID, },

	{ .name = "qca6390", .driver_data = QCA6390_DEVICE_ID, },

	NULL,

	{ },

};



static const struct of_device_id cnss_of_match_table[] = {

drivers/net/wireless/cnss2/pci.c

+7 −7
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv) 


	dev = &pci_priv->pci_dev->dev;



	mapping = arm_iommu_create_mapping(dev->bus,

	mapping = __depr_arm_iommu_create_mapping(dev->bus,

						  pci_priv->smmu_iova_start,

						  pci_priv->smmu_iova_len);

	if (IS_ERR(mapping)) {
@@ -859,7 +859,7 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv) 
		}

	}



	ret = arm_iommu_attach_device(dev, mapping);

	ret = __depr_arm_iommu_attach_device(dev, mapping);

	if (ret) {

		pr_err("Failed to attach SMMU device, err = %d\n", ret);

		goto release_mapping;
@@ -869,15 +869,15 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv) 


	return ret;

release_mapping:

	arm_iommu_release_mapping(mapping);

	__depr_arm_iommu_release_mapping(mapping);

out:

	return ret;

}



static void cnss_pci_deinit_smmu(struct cnss_pci_data *pci_priv)

{

	arm_iommu_detach_device(&pci_priv->pci_dev->dev);

	arm_iommu_release_mapping(pci_priv->smmu_mapping);

	__depr_arm_iommu_detach_device(&pci_priv->pci_dev->dev);

	__depr_arm_iommu_release_mapping(pci_priv->smmu_mapping);



	pci_priv->smmu_mapping = NULL;

}

drivers/net/wireless/cnss2/qmi.c

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ int cnss_wlfw_wlan_mode_send_sync(struct cnss_plat_data *plat_priv, 
		return -ENOMEM;

	}



	req->mode = mode;

	req->mode = (enum wlfw_driver_mode_enum_v01)mode;

	req->hw_debug_valid = 1;

	req->hw_debug = 0;