Unverified Commit 8da2e9af authored by Manivannan Sadhasivam's avatar Manivannan Sadhasivam Committed by Krzysztof Wilczyński
Browse files

PCI: qcom: Use PCIE_SPEED2MBS_ENC() macro for encoding link speed 



Instead of hardcoding the link speed in MBps, use existing
PCIE_SPEED2MBS_ENC() macro that does the encoding of the link speed for
us. Also, let's Wrap it with QCOM_PCIE_LINK_SPEED_TO_BW() macro to do
the conversion to ICC speed.

This eliminates the need for a switch case in qcom_pcie_icc_update() and
also works for future Gen speeds without any code modifications.

Suggested-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/linux-pci/20231004164430.39662-1-manivannan.sadhasivam@linaro.org


Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
parent 0bb80ecc

drivers/pci/controller/dwc/pcie-qcom.c

+6 −18
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ 


#define QCOM_PCIE_CRC8_POLYNOMIAL		(BIT(2) | BIT(1) | BIT(0))



#define QCOM_PCIE_LINK_SPEED_TO_BW(speed) \

		Mbps_to_icc(PCIE_SPEED2MBS_ENC(pcie_link_speed[speed]))



#define QCOM_PCIE_1_0_0_MAX_CLOCKS		4

struct qcom_pcie_resources_1_0_0 {

	struct clk_bulk_data clks[QCOM_PCIE_1_0_0_MAX_CLOCKS];
@@ -1347,7 +1350,7 @@ static int qcom_pcie_icc_init(struct qcom_pcie *pcie) 
	 * Set an initial peak bandwidth corresponding to single-lane Gen 1

	 * for the pcie-mem path.

	 */

	ret = icc_set_bw(pcie->icc_mem, 0, MBps_to_icc(250));

	ret = icc_set_bw(pcie->icc_mem, 0, QCOM_PCIE_LINK_SPEED_TO_BW(1));

	if (ret) {

		dev_err(pci->dev, "failed to set interconnect bandwidth: %d\n",

			ret);
@@ -1360,7 +1363,7 @@ static int qcom_pcie_icc_init(struct qcom_pcie *pcie) 
static void qcom_pcie_icc_update(struct qcom_pcie *pcie)

{

	struct dw_pcie *pci = pcie->pci;

	u32 offset, status, bw;

	u32 offset, status;

	int speed, width;

	int ret;
@@ -1377,22 +1380,7 @@ static void qcom_pcie_icc_update(struct qcom_pcie *pcie) 
	speed = FIELD_GET(PCI_EXP_LNKSTA_CLS, status);

	width = FIELD_GET(PCI_EXP_LNKSTA_NLW, status);



	switch (speed) {

	case 1:

		bw = MBps_to_icc(250);

		break;

	case 2:

		bw = MBps_to_icc(500);

		break;

	default:

		WARN_ON_ONCE(1);

		fallthrough;

	case 3:

		bw = MBps_to_icc(985);

		break;

	}



	ret = icc_set_bw(pcie->icc_mem, 0, width * bw);

	ret = icc_set_bw(pcie->icc_mem, 0, width * QCOM_PCIE_LINK_SPEED_TO_BW(speed));

	if (ret) {

		dev_err(pci->dev, "failed to set interconnect bandwidth: %d\n",

			ret);