Merge "msm: pcie: add support to manage PCIe PHY PLL block"

This commit is contained in:
qctecmdr 2020-05-15 20:31:16 -07:00 • committed by Gerrit - the friendly Code Review server
commit c09480d98d

View file

@ -160,6 +160,8 @@
#define IPC_TIMEOUT_MS (250)
#define PHY_C_READY (BIT(0))
#define PHY_READY_TIMEOUT_COUNT (10)
#define XMLH_LINK_UP (0x400)
#define MAX_PROP_SIZE (32)
@ -575,6 +577,8 @@ struct msm_pcie_device_info {
enum msm_pcie_drv_cmds {
MSM_PCIE_DRV_CMD_ENABLE = 0xc0000000,
MSM_PCIE_DRV_CMD_DISABLE = 0xc0000001,
MSM_PCIE_DRV_CMD_ENABLE_L1SS_SLEEP = 0xc0000005,
MSM_PCIE_DRV_CMD_DISABLE_L1SS_SLEEP = 0xc0000006,
};
/* DRV IPC message type */
@ -606,18 +610,6 @@ struct __packed msm_pcie_drv_msg {
struct msm_pcie_drv_tre pkt;
};
struct msm_pcie_drv_info {
bool ep_connected; /* drv supports only one endpoint (no switch) */
struct msm_pcie_drv_msg drv_enable; /* hand off payload */
struct msm_pcie_drv_msg drv_disable; /* payload to request back */
int dev_id;
u16 seq;
u16 reply_seq;
u32 timeout_ms; /* IPC command timeout */
u32 l1ss_timeout_us;
struct completion completion;
};
/* msm pcie device structure */
struct msm_pcie_dev_t {
struct platform_device *pdev;
@ -762,6 +754,27 @@ struct msm_root_dev_t {
struct pci_dev *pci_dev;
};
struct msm_pcie_drv_info {
bool ep_connected; /* drv supports only one endpoint (no switch) */
struct msm_pcie_drv_msg drv_enable; /* hand off payload */
struct msm_pcie_drv_msg drv_disable; /* payload to request back */
struct msm_pcie_drv_msg drv_enable_l1ss_sleep; /* enable l1ss sleep */
struct msm_pcie_drv_msg drv_disable_l1ss_sleep; /* disable l1ss sleep */
int dev_id;
u16 seq;
u16 reply_seq;
u32 timeout_ms; /* IPC command timeout */
u32 l1ss_timeout_us;
struct completion completion;
/* for DRV SSR */
void (*manage_pll_power_on)(struct msm_pcie_dev_t *pcie_dev,
struct msm_pcie_drv_info *drv_info);
u32 phy_resetsm_cntrl2;
u32 phy_core_pll_en_mux;
u32 phy_c_ready_status;
};
static u32 msm_pcie_keep_resources_on;
/* debugfs values */
@ -5548,14 +5561,96 @@ static void msm_pcie_check_l1ss_support_all(struct msm_pcie_dev_t *dev)
pci_walk_bus(dev->dev->bus, msm_pcie_check_l1ss_support, dev);
}
static void msm_pcie_drv_manage_pll_power_on(struct msm_pcie_dev_t *pcie_dev,
struct msm_pcie_drv_info *drv_info)
{
u32 cnt = 0;
u32 cnt_max = 20; /* 1ms */
PCIE_DBG(pcie_dev, "PCIe: RC%d: manually power on PHY PLL\n",
pcie_dev->rc_idx);
msm_pcie_write_mask(pcie_dev->phy + drv_info->phy_resetsm_cntrl2,
BIT(drv_info->phy_core_pll_en_mux), 0);
while (!(readl_relaxed(pcie_dev->phy + drv_info->phy_c_ready_status) &
PHY_C_READY)) {
if (unlikely(cnt++ >= cnt_max)) {
PCIE_ERR(pcie_dev,
"PCIe: RC%d: failed to manually power on PHY PLL\n",
pcie_dev->rc_idx);
return;
}
usleep_range(50, 55);
}
PCIE_DBG(pcie_dev, "PCIe: RC%d: successfully powered on PHY PLL\n",
pcie_dev->rc_idx);
}
static int msm_pcie_setup_drv_manage_pll(struct msm_pcie_dev_t *pcie_dev,
struct device_node *of_node,
struct msm_pcie_drv_info *drv_info)
{
int ret;
PCIE_DBG(pcie_dev, "PCIe: RC%d: enter\n", pcie_dev->rc_idx);
ret = of_property_read_u32(of_node, "qcom,phy-resetsm-cntrl2",
&drv_info->phy_resetsm_cntrl2);
if (ret) {
PCIE_ERR(pcie_dev,
"PCIe: RC%d failed to get qcom,phy-resetsm-cntrl2\n",
pcie_dev->rc_idx);
return ret;
}
ret = of_property_read_u32(of_node, "qcom,phy-core-pll-en-mux",
&drv_info->phy_core_pll_en_mux);
if (ret) {
PCIE_ERR(pcie_dev,
"PCIe: RC%d failed to get qcom,phy-core-pll-en-mux\n",
pcie_dev->rc_idx);
return ret;
}
ret = of_property_read_u32(of_node, "qcom,phy-c-ready-status",
&drv_info->phy_c_ready_status);
if (ret) {
PCIE_ERR(pcie_dev,
"PCIe: RC%d failed to get qcom,phy-c-ready-status\n",
pcie_dev->rc_idx);
return ret;
}
drv_info->manage_pll_power_on = msm_pcie_drv_manage_pll_power_on;
return 0;
}
static void msm_pcie_setup_drv_msg(struct msm_pcie_drv_msg *msg, u32 dev_id,
enum msm_pcie_drv_cmds cmd)
{
struct msm_pcie_drv_tre *pkt = &msg->pkt;
struct msm_pcie_drv_header *hdr = &msg->hdr;
hdr->major_ver = MSM_PCIE_DRV_MAJOR_VERSION;
hdr->minor_ver = MSM_PCIE_DRV_MINOR_VERSION;
hdr->msg_id = MSM_PCIE_DRV_MSG_ID_CMD;
hdr->payload_size = sizeof(*pkt);
hdr->dev_id = dev_id;
pkt->dword[0] = cmd;
pkt->dword[1] = hdr->dev_id;
}
static int msm_pcie_setup_drv(struct msm_pcie_dev_t *pcie_dev,
struct device_node *of_node)
{
struct msm_pcie_drv_info *drv_info;
struct msm_pcie_drv_msg *msg;
struct msm_pcie_drv_tre *pkt;
struct msm_pcie_drv_header *hdr;
int ret;
u32 phy_manage_pll = 0;
drv_info = devm_kzalloc(&pcie_dev->pdev->dev, sizeof(*drv_info),
GFP_KERNEL);
@ -5572,31 +5667,30 @@ static int msm_pcie_setup_drv(struct msm_pcie_dev_t *pcie_dev,
drv_info->dev_id = pcie_dev->rc_idx;
/* cache frequent command for communication */
msg = &drv_info->drv_enable;
pkt = &msg->pkt;
hdr = &msg->hdr;
hdr->major_ver = MSM_PCIE_DRV_MAJOR_VERSION;
hdr->minor_ver = MSM_PCIE_DRV_MINOR_VERSION;
hdr->msg_id = MSM_PCIE_DRV_MSG_ID_CMD;
hdr->payload_size = sizeof(*pkt);
hdr->dev_id = drv_info->dev_id;
ret = of_property_read_u32(of_node, "qcom,phy-manage-pll",
&phy_manage_pll);
if (!ret && phy_manage_pll) {
ret = msm_pcie_setup_drv_manage_pll(pcie_dev, of_node,
drv_info);
if (ret)
return ret;
}
pkt->dword[0] = MSM_PCIE_DRV_CMD_ENABLE;
pkt->dword[1] = hdr->dev_id;
pkt->dword[2] = drv_info->l1ss_timeout_us / 1000;
msm_pcie_setup_drv_msg(&drv_info->drv_enable, drv_info->dev_id,
MSM_PCIE_DRV_CMD_ENABLE);
msg = &drv_info->drv_disable;
pkt = &msg->pkt;
hdr = &msg->hdr;
hdr->major_ver = MSM_PCIE_DRV_MAJOR_VERSION;
hdr->minor_ver = MSM_PCIE_DRV_MINOR_VERSION;
hdr->msg_id = MSM_PCIE_DRV_MSG_ID_CMD;
hdr->payload_size = sizeof(*pkt);
hdr->dev_id = drv_info->dev_id;
msm_pcie_setup_drv_msg(&drv_info->drv_disable, drv_info->dev_id,
MSM_PCIE_DRV_CMD_DISABLE);
pkt->dword[0] = MSM_PCIE_DRV_CMD_DISABLE;
pkt->dword[1] = hdr->dev_id;
msm_pcie_setup_drv_msg(&drv_info->drv_enable_l1ss_sleep,
drv_info->dev_id,
MSM_PCIE_DRV_CMD_ENABLE_L1SS_SLEEP);
drv_info->drv_enable_l1ss_sleep.pkt.dword[2] =
drv_info->l1ss_timeout_us / 1000;
msm_pcie_setup_drv_msg(&drv_info->drv_disable_l1ss_sleep,
drv_info->dev_id,
MSM_PCIE_DRV_CMD_DISABLE_L1SS_SLEEP);
init_completion(&drv_info->completion);
drv_info->timeout_ms = IPC_TIMEOUT_MS;
@ -6825,18 +6919,65 @@ static void msm_pcie_fixup_resume_early(struct pci_dev *dev)
DECLARE_PCI_FIXUP_RESUME_EARLY(PCIE_VENDOR_ID_QCOM, PCI_ANY_ID,
msm_pcie_fixup_resume_early);
static int msm_pcie_drv_send_rpmsg(struct msm_pcie_dev_t *pcie_dev,
struct rpmsg_device *rpdev,
struct msm_pcie_drv_msg *msg)
{
struct msm_pcie_drv_info *drv_info = pcie_dev->drv_info;
int ret;
reinit_completion(&drv_info->completion);
drv_info->reply_seq = drv_info->seq++;
msg->hdr.seq = drv_info->reply_seq;
if (unlikely(drv_info->seq == MSM_PCIE_DRV_SEQ_RESV))
drv_info->seq = 0;
PCIE_DBG(pcie_dev, "PCIe: RC%d: DRV: sending rpmsg: command: 0x%x\n",
pcie_dev->rc_idx, msg->pkt.dword[0]);
ret = rpmsg_trysend(rpdev->ept, msg, sizeof(*msg));
if (ret) {
PCIE_ERR(pcie_dev, "PCIe: RC%d: DRV: failed to send rpmsg\n",
pcie_dev->rc_idx);
return ret;
}
ret = wait_for_completion_timeout(&drv_info->completion,
msecs_to_jiffies(drv_info->timeout_ms));
if (!ret) {
PCIE_ERR(pcie_dev,
"PCIe: RC%d: DRV: completion timeout for rpmsg\n",
pcie_dev->rc_idx);
return -ETIMEDOUT;
}
PCIE_DBG(pcie_dev, "PCIe: RC%d: DRV: rpmsg successfully sent\n",
pcie_dev->rc_idx);
return 0;
}
static int msm_pcie_drv_resume(struct msm_pcie_dev_t *pcie_dev)
{
struct rpmsg_device *rpdev = pcie_drv.rpdev;
struct msm_pcie_drv_info *drv_info = pcie_dev->drv_info;
struct msm_pcie_drv_msg *drv_disable = &drv_info->drv_disable;
struct msm_pcie_clk_info_t *clk_info;
u32 current_link_speed;
u32 current_link_speed, clkreq_override_en = 0;
int ret, i;
mutex_lock(&pcie_dev->recovery_lock);
mutex_lock(&pcie_dev->setup_lock);
/* if rpdev is NULL then DRV subsystem is powered down */
if (rpdev) {
ret = msm_pcie_drv_send_rpmsg(pcie_dev, rpdev,
&drv_info->drv_disable_l1ss_sleep);
if (ret)
rpdev = NULL;
}
msm_pcie_vreg_init(pcie_dev);
regulator_enable(pcie_dev->gdsc);
@ -6855,37 +6996,68 @@ static int msm_pcie_drv_resume(struct msm_pcie_dev_t *pcie_dev)
if (clk_info->hdl && !clk_info->suppressible)
clk_prepare_enable(clk_info->hdl);
/*
* if DRV subsystem did not respond to previous rpmsg command, check if
* PCIe CLKREQ override is still enabled
*/
if (!rpdev) {
clkreq_override_en = readl_relaxed(pcie_dev->parf +
PCIE20_PARF_CLKREQ_OVERRIDE) &
PCIE20_PARF_CLKREQ_IN_ENABLE;
if (clkreq_override_en)
PCIE_DBG(pcie_dev,
"PCIe: RC%d: CLKREQ Override detected\n",
pcie_dev->rc_idx);
}
/*
* if PCIe CLKREQ override is still enabled, then make sure PCIe mux is
* set to PCIe PIPE before enabling PCIe PIPE CLK.
* APPS votes for mux was PCIe PIPE before DRV suspend. In order to vote
* for PCIe PIPE, need to first set mux to XO then PCIe PIPE or else
* clock driver will short the request.
*/
if (clkreq_override_en && pcie_dev->pipe_clk_mux) {
if (pcie_dev->ref_clk_src) {
PCIE_DBG(pcie_dev,
"PCIe: RC%d: setting PCIe PIPE MUX to XO\n",
pcie_dev->rc_idx);
clk_set_parent(pcie_dev->pipe_clk_mux,
pcie_dev->ref_clk_src);
}
if (pcie_dev->pipe_clk_ext_src) {
PCIE_DBG(pcie_dev,
"PCIe: RC%d: setting PCIe PIPE MUX to PCIe PIPE\n",
pcie_dev->rc_idx);
clk_set_parent(pcie_dev->pipe_clk_mux,
pcie_dev->pipe_clk_ext_src);
}
}
clk_info = pcie_dev->pipeclk;
for (i = 0; i < MSM_PCIE_MAX_PIPE_CLK; i++, clk_info++)
if (clk_info->hdl && !clk_info->suppressible)
clk_prepare_enable(clk_info->hdl);
/* if rpdev is NULL then DRV subsystem is powered down */
if (rpdev) {
reinit_completion(&drv_info->completion);
if (clkreq_override_en) {
if (drv_info->manage_pll_power_on)
drv_info->manage_pll_power_on(pcie_dev, drv_info);
drv_info->reply_seq = drv_info->seq++;
drv_disable->hdr.seq = drv_info->reply_seq;
if (unlikely(drv_info->seq == MSM_PCIE_DRV_SEQ_RESV))
drv_info->seq = 0;
ret = rpmsg_trysend(rpdev->ept, drv_disable,
sizeof(*drv_disable));
if (!ret) {
ret = wait_for_completion_timeout(&drv_info->completion,
msecs_to_jiffies(drv_info->timeout_ms));
if (!ret)
PCIE_ERR(pcie_dev,
"PCIe: RC%d: DRV: completion timeout for rpmsg\n",
pcie_dev->rc_idx);
} else {
PCIE_ERR(pcie_dev,
"PCIe: RC%d: DRV: failed to send rpmsg\n",
pcie_dev->rc_idx);
}
/* remove CLKREQ override */
msm_pcie_write_reg_field(pcie_dev->parf,
PCIE20_PARF_CLKREQ_OVERRIDE,
PCIE20_PARF_CLKREQ_IN_ENABLE, 0);
msm_pcie_write_reg_field(pcie_dev->parf,
PCIE20_PARF_CLKREQ_OVERRIDE,
PCIE20_PARF_CLKREQ_IN_VALUE, 0);
}
/* if rpdev is NULL then DRV subsystem is powered down */
if (rpdev)
msm_pcie_drv_send_rpmsg(pcie_dev, rpdev,
&drv_info->drv_disable);
/* scale CX and rate change based on current GEN speed */
current_link_speed = readl_relaxed(pcie_dev->dm_core +
PCIE20_CAP_LINKCTRLSTATUS);
@ -6894,14 +7066,6 @@ static int msm_pcie_drv_resume(struct msm_pcie_dev_t *pcie_dev)
msm_pcie_scale_link_bandwidth(pcie_dev, current_link_speed);
/* always ungate clkreq */
msm_pcie_write_reg_field(pcie_dev->parf,
PCIE20_PARF_CLKREQ_OVERRIDE,
PCIE20_PARF_CLKREQ_IN_ENABLE, 0);
msm_pcie_write_reg_field(pcie_dev->parf,
PCIE20_PARF_CLKREQ_OVERRIDE,
PCIE20_PARF_CLKREQ_IN_VALUE, 0);
pcie_dev->user_suspend = false;
spin_lock_irq(&pcie_dev->cfg_lock);
pcie_dev->cfg_access = true;
@ -6921,8 +7085,6 @@ static int msm_pcie_drv_suspend(struct msm_pcie_dev_t *pcie_dev,
{
struct rpmsg_device *rpdev = pcie_drv.rpdev;
struct msm_pcie_drv_info *drv_info = pcie_dev->drv_info;
struct msm_pcie_drv_msg *drv_enable = &drv_info->drv_enable;
struct msm_pcie_drv_tre *pkt = &drv_enable->pkt;
struct msm_pcie_clk_info_t *clk_info;
int ret, i;
@ -6940,36 +7102,12 @@ static int msm_pcie_drv_suspend(struct msm_pcie_dev_t *pcie_dev,
}
mutex_lock(&pcie_dev->recovery_lock);
reinit_completion(&drv_info->completion);
/* disable global irq - no more linkdown/aer detection */
disable_irq(pcie_dev->irq[MSM_PCIE_INT_GLOBAL_INT].num);
if (options & MSM_PCIE_CONFIG_NO_L1SS_TO)
pkt->dword[2] = 0;
else
pkt->dword[2] = drv_info->l1ss_timeout_us / 1000;
drv_info->reply_seq = drv_info->seq++;
drv_enable->hdr.seq = drv_info->reply_seq;
if (unlikely(drv_info->seq == MSM_PCIE_DRV_SEQ_RESV))
drv_info->seq = 0;
ret = rpmsg_trysend(rpdev->ept, drv_enable, sizeof(*drv_enable));
ret = msm_pcie_drv_send_rpmsg(pcie_dev, rpdev, &drv_info->drv_enable);
if (ret) {
PCIE_ERR(pcie_dev, "PCIe: RC%d: DRV: failed to send rpmsg\n",
pcie_dev->rc_idx);
ret = -EBUSY;
goto out;
}
ret = wait_for_completion_timeout(&drv_info->completion,
msecs_to_jiffies(drv_info->timeout_ms));
if (!ret) {
PCIE_ERR(pcie_dev,
"PCIe: RC%d: DRV: completion timeout for rpmsg\n",
pcie_dev->rc_idx);
ret = -EBUSY;
goto out;
}
@ -7007,6 +7145,11 @@ static int msm_pcie_drv_suspend(struct msm_pcie_dev_t *pcie_dev,
msm_pcie_vreg_deinit(pcie_dev);
/* enable L1ss sleep if client allows it */
if (!(options & MSM_PCIE_CONFIG_NO_L1SS_TO))
msm_pcie_drv_send_rpmsg(pcie_dev, rpdev,
&drv_info->drv_enable_l1ss_sleep);
mutex_unlock(&pcie_dev->setup_lock);
mutex_unlock(&pcie_dev->recovery_lock);