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

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

Merge "msm: pcie: validate speed switch request"

parents bb89e62f 0cb7e0e8

drivers/pci/controller/pci-msm.c

+10 −1
Original line number Diff line number Diff line
@@ -3740,7 +3740,7 @@ static int msm_pcie_get_bw_scale(struct msm_pcie_dev_t *pcie_dev) 
		of_property_read_u32_array(pdev->dev.of_node, "qcom,bw-scale",

				(u32 *)pcie_dev->bw_scale, size / sizeof(u32));



		pcie_dev->bw_gen_max = size / sizeof(u32);

		pcie_dev->bw_gen_max = size / sizeof(*pcie_dev->bw_scale);

	} else {

		PCIE_DBG(pcie_dev, "RC%d: bandwidth scaling is not supported\n",

			pcie_dev->rc_idx);
@@ -6206,6 +6206,15 @@ int msm_pcie_set_link_bandwidth(struct pci_dev *pci_dev, u16 target_link_speed, 


	pcie_dev = PCIE_BUS_PRIV_DATA(root_pci_dev->bus);



	if (target_link_speed > pcie_dev->bw_gen_max ||

		(pcie_dev->target_link_speed &&

		target_link_speed > pcie_dev->target_link_speed)) {

		PCIE_DBG(pcie_dev,

			"PCIe: RC%d: invalid target link speed: %d\n",

			pcie_dev->rc_idx, target_link_speed);

		return -EINVAL;

	}



	pcie_capability_read_word(root_pci_dev, PCI_EXP_LNKSTA, &link_status);



	current_link_speed = link_status & PCI_EXP_LNKSTA_CLS;