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

Commit 1d19ff2f authored by Alok Chauhan's avatar Alok Chauhan
Browse files

msm: emac: Add support to vote for bus bandwidth scaling 



EMAC as  a Bus client on PCNOC bus has to vote for
Bus scaling to achieve required throughput and to
avoid bus access error on PCNOC in absence
of Bus scaling vote from Bus client and PNOC clock
gating is enabled.

Change-Id: Iae08aba1d1aa5ab81d453820148b8a6abf0ea4cc
Signed-off-by: default avatarAlok Chauhan <alokc@codeaurora.org>
parent a9eb03fd

Documentation/devicetree/bindings/net/msm-emac.txt

+7 −0
Original line number Diff line number Diff line
@@ -181,6 +181,13 @@ MDM9607: 
                pinctrl-3 = <&emac0_ephy_sleep>;

                qcom,emac-tstamp-en;

                qcom,emac-ptp-frac-ns-adj = <125000000 1>;



		qcom,msm-bus,name = "emac0";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

				<114 512 0 0>,

				<114 512 125000 800000>;

                status = "disable";



                phy0: ethernet-phy@0 {

arch/arm/boot/dts/qcom/mdm9607.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -1700,6 +1700,13 @@ 
		pinctrl-3 = <&emac0_ephy_sleep>;

		qcom,emac-tstamp-en;

		qcom,emac-ptp-frac-ns-adj = <125000000 1>;



		qcom,msm-bus,name = "emac0";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

				<114 512 0 0>,       /* No vote */

				<114 512 125000 800000>; /* Max. bandwidth */

		status = "disable";



		phy0: ethernet-phy@0 {

drivers/net/ethernet/qualcomm/emac/emac.h

+15 −0
Original line number Diff line number Diff line
@@ -47,6 +47,18 @@ 


#define EMAC_ADPT_RESET_WAIT_TIME	20



/**

 * Requested EMAC votes for BUS bandwidth

 *

 * EMAC_NO_PERF_VOTE      BUS Vote for inactive EMAC session or disconnect

 * EMAC_MAX_PERF_VOTE    Maximum BUS bandwidth vote

 *

 */

enum emac_bus_vote {

	EMAC_NO_PERF_VOTE = 0,

	EMAC_MAX_PERF_VOTE

};



enum emac_vreg_id {

	EMAC_VREG1,

	EMAC_VREG2,
@@ -726,6 +738,9 @@ struct emac_adapter { 
	int	(*gpio_on)(struct emac_adapter *adpt, bool mdio, bool ephy);

	int	(*gpio_off)(struct emac_adapter *adpt, bool mdio, bool ephy);

	struct wakeup_source link_wlock;



	u32       bus_cl_hdl;

	struct msm_bus_scale_pdata *bus_scale_table;

};



static inline struct emac_adapter *emac_hw_get_adap(struct emac_hw *hw)

drivers/net/ethernet/qualcomm/emac/emac_main.c

+37 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/property.h>

#include <net/ip6_checksum.h>

#endif

#include <linux/msm-bus.h>



#include "emac.h"

#include "emac_phy.h"
@@ -2604,6 +2605,38 @@ static int msm_emac_pinctrl_init(struct emac_adapter *adpt, struct device *dev) 
	return 0;

}



static void msm_emac_clk_path_vote(struct emac_adapter *adpt,

				   enum emac_bus_vote vote)

{

	if (adpt->bus_cl_hdl)

		if (msm_bus_scale_client_update_request(adpt->bus_cl_hdl, vote))

			emac_err(adpt, "Failed to vote for bus bw\n");

}



static void msm_emac_clk_path_teardown(struct emac_adapter *adpt)

{

	if (adpt->bus_cl_hdl) {

		msm_emac_clk_path_vote(adpt, EMAC_NO_PERF_VOTE);

		msm_bus_scale_unregister_client(adpt->bus_cl_hdl);

		adpt->bus_cl_hdl = 0;

	}

}



static void msm_emac_clk_path_init(struct platform_device *pdev,

				   struct emac_adapter *adpt)

{

	/* Get bus scalling data */

	adpt->bus_scale_table = msm_bus_cl_get_pdata(pdev);

	if (IS_ERR_OR_NULL(adpt->bus_scale_table)) {

		emac_err(adpt, "bus scaling is disabled\n");

		return;

	}



	adpt->bus_cl_hdl = msm_bus_scale_register_client(adpt->bus_scale_table);

	if (!adpt->bus_cl_hdl)

		emac_err(adpt, "Failed to register BUS scaling client!!\n");

}



/* Get the resources */

static int emac_get_resources(struct platform_device *pdev,

			      struct emac_adapter *adpt)
@@ -2685,6 +2718,7 @@ static int emac_get_resources(struct platform_device *pdev, 
	if (ACPI_HANDLE(adpt->dev))

		retval = emac_acpi_get_resources(pdev, adpt);



	msm_emac_clk_path_init(pdev, adpt);

	return retval;

}
@@ -2870,6 +2904,7 @@ static int emac_pm_suspend(struct device *device, bool wol_enable) 
	}



	adpt->gpio_off(adpt, true, false);

	msm_emac_clk_path_vote(adpt, EMAC_NO_PERF_VOTE);

	return 0;

}
@@ -2883,6 +2918,7 @@ static int emac_pm_resume(struct device *device) 
	int retval = 0, i;



	adpt->gpio_on(adpt, true, false);

	msm_emac_clk_path_vote(adpt, EMAC_MAX_PERF_VOTE);

	emac_hw_reset_mac(hw);



	/* Disable EPHY Link UP interrupt */
@@ -3232,6 +3268,7 @@ static int emac_remove(struct platform_device *pdev) 
	adpt->gpio_off(adpt, true, true);

	emac_disable_clks(adpt);

	emac_disable_regulator(adpt, EMAC_VREG1, EMAC_VREG5);

	msm_emac_clk_path_teardown(adpt);



	if (!ACPI_COMPANION(&pdev->dev))

		put_device(&adpt->phydev->dev);