Support qcom USB3+DP combo phy (or type-c phy)
Subsystems (7)
v4 cover Support qcom USB3+DP combo phy (or type-c phy)
This patch series is based on v12 of the msm DP driver submission[1] plus a compliance patch[2]. In the v5 patch series review I suggested that the DP PHY and PLL be split out of the drm driver and moved to the qmp phy driver. This patch series does that, but it is still marked as an RFC because there are a couple more things to do, mostly updating the DT binding and getting agreement on how to structure the code.
Eventually I believe the qmp phy driver will need to listen for type-c notifiers or somehow know the type-c pinout being used so this driver can program things slightly differently. Right now, I don't have any way to test it though, so I've left it as future work. For some more details, the DP phy and the USB3 phy share the same physical pins on the SoC and those pins pretty much line up with a type-c pinout modulo some CC pins for cable orientation detection logic that lives on the PMIC. So the DP phy can use all four lanes or it can use two lanes and the USB3 phy can use two lanes. In the hardware designs that I have access to it is always two lanes for USB3 and two lanes for DP going through what looks like a type-c pinout so this just hard codes that configuration in the driver.
Here's the example node that I'm using on sc7180:
usb_1_qmpphy: phy-wrapper@88e9000 {
compatible = "qcom,sc7180-qmp-usb3-dp-phy";
reg = <0 0x088e9000 0 0x18c>, // usb pll (or serdes)
<0 0x088e8000 0 0x38>, // dp com
<0 0x088ea000 0 0x40>; // dp pll (or serdes)
status = "disabled";
#address-cells = <2>;
#size-cells = <2>;
ranges;
clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>,
<&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
<&gcc GCC_USB3_PRIM_CLKREF_CLK>,
<&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>;
clock-names = "aux", "cfg_ahb", "ref", "com_aux";
resets = <&gcc GCC_USB3_PHY_PRIM_BCR>,
<&gcc GCC_USB3_DP_PHY_PRIM_BCR>;
reset-names = "phy", "common";
usb_1_ssphy: usb3-phy@88e9200 {
reg = <0 0x088e9200 0 0x128>, // tx0
<0 0x088e9400 0 0x200>, // rx0
<0 0x088e9c00 0 0x218>, // pcs
<0 0x088e9600 0 0x128>, // tx1
<0 0x088e9800 0 0x200>, // rx1
<0 0x088e9a00 0 0x18>; // pcs misc
#clock-cells = <0>;
#phy-cells = <0>;
clocks = <&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
clock-names = "pipe0";
clock-output-names = "usb3_phy_pipe_clk_src";
};
dp_phy: dp-phy@88ea200 {
reg = <0 0x088ea200 0 0x200>, // tx0
<0 0x088ea400 0 0x200>, // rx0
<0 0x088eaa00 0 0x200>, // dp phy
<0 0x088ea600 0 0x200>, // tx1
<0 0x088ea800 0 0x200>; // rx1
#clock-cells = <1>;
#phy-cells = <0>;
};
};I had to put the serdes register region in the wrapper node and jam the common area (dp_com) in the middle. Sort of a mess but it was the best I could do to make the driver changes minimially invasive. I also had to change the node names to 'usb3-phy' and 'dp-phy' from 'phy' so that I could differentiate the different phys in the driver. Otherwise the qmp driver was already mostly prepared for two different phys to sit next to each other inside the phy wrapper so it was mostly just a chore of moving code from one place to another.
The last patch in this series rips out the DP PHY and PLL code from the drm driver and wires in the phy API calls instead. I think Rob Clark has already staged the last patch, but I sent it again for completeness. I can pick the clk patch into clk-next and the phy patches can go via the phy tree, then everything can meet in linux-next. There are still some more TODOs in the code but they feel minor enough to fix with more testing and devices that can exercise those code paths, i.e. connecting to the type-c subsystem.
Changes from v3 (https://lore.kernel.org/r/[email protected])
* Added compatible string to first binding patch
* Checkpatch cleanups
Changes from v2 (https://lore.kernel.org/r/[email protected])
* Added regs to sc7180 dp struct
* s/QSERDES_COM_RESETSM_CNTRL/QSERDES_V3_COM_RESETSM_CNTRL/ in qcom_qmp_phy_configure_dp_phy()
Changes from v1 (https://lore.kernel.org/r/[email protected])
* New patch for devm_platform_ioremap_resource()
* Moved serdes tables to sc7180 patch
* Removed more dead code from drm driver in last patch
* Reset aux phy is kept around now. Slightly moved where we init the
phy and setup aux
* Added a phy_exit() call to last patch so we properly shut down DP on disconnect and can work on multiple plugs
Changes from RFC (https://lore.kernel.org/r/[email protected])
* New patch for DT binding
* Rebased onto latest DP patch series
TODO:
* Clean up phy power on sequence a bit so that it is done in one place instead of two
* Allow link rate to change after phy is powered on?
* Make the runtime PM logic detect combo phy and power down both?
Stephen Boyd (10):
dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy information
phy: qcom-qmp: Move phy mode into struct qmp_phy
phy: qcom-qmp: Remove 'initialized' in favor of 'init_count'
phy: qcom-qmp: Move 'serdes' and 'cfg' into 'struct qcom_phy'
phy: qcom-qmp: Get dp_com I/O resource by index
phy: qcom-qmp: Use devm_platform_ioremap_resource() to simplify
phy: qcom-qmp: Add support for DP in USB3+DP combo phy
phy: qcom-qmp: Add support for sc7180 DP phy
clk: qcom: dispcc: Update DP clk ops for phy design drm/msm/dp: Use qmp phy for DP PLL and PHY
.../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 95 +- drivers/clk/qcom/clk-rcg2.c | 19 +- drivers/clk/qcom/dispcc-sc7180.c | 3 - drivers/gpu/drm/msm/Makefile | 4 +- drivers/gpu/drm/msm/dp/dp_aux.c | 7 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 287 +---- drivers/gpu/drm/msm/dp/dp_catalog.h | 9 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 48 +- drivers/gpu/drm/msm/dp/dp_display.c | 17 - drivers/gpu/drm/msm/dp/dp_display.h | 3 - drivers/gpu/drm/msm/dp/dp_link.c | 2 + drivers/gpu/drm/msm/dp/dp_panel.c | 1 + drivers/gpu/drm/msm/dp/dp_parser.c | 12 +- drivers/gpu/drm/msm/dp/dp_parser.h | 12 +- drivers/gpu/drm/msm/dp/dp_pll.c | 99 -- drivers/gpu/drm/msm/dp/dp_pll.h | 61 - drivers/gpu/drm/msm/dp/dp_pll_10nm.c | 930 --------------- drivers/gpu/drm/msm/dp/dp_pll_private.h | 89 -- drivers/gpu/drm/msm/dp/dp_power.c | 39 +- drivers/gpu/drm/msm/dp/dp_power.h | 9 - drivers/gpu/drm/msm/dp/dp_reg.h | 213 ---- drivers/phy/qualcomm/phy-qcom-qmp.c | 1053 ++++++++++++++--- drivers/phy/qualcomm/phy-qcom-qmp.h | 80 ++ 23 files changed, 1139 insertions(+), 1953 deletions(-) delete mode 100644 drivers/gpu/drm/msm/dp/dp_pll.c delete mode 100644 drivers/gpu/drm/msm/dp/dp_pll.h delete mode 100644 drivers/gpu/drm/msm/dp/dp_pll_10nm.c delete mode 100644 drivers/gpu/drm/msm/dp/dp_pll_private.h
[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/[email protected]
base-commit: d012a7190fc1fd72ed48911e77ca97ba4521bccd
prerequisite-patch-id: aa650e8353e003be0075deea0dee92a82e321432
prerequisite-patch-id: 496af774194db20706fa82eb79f95891c8784952
prerequisite-patch-id: 87e6b1a10063ca350cacd64408024714599a14f4
prerequisite-patch-id: ac467cb99ea60ee186ab9bbe47a3e4d9c13a1313
prerequisite-patch-id: 4eff0531912abbfa748181e90baffba9eb52e295
prerequisite-patch-id: a6970d668b3570f2c10eda99904aa3dfc8fefa1d
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v4 1/10 dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy information
This binding only describes the USB phy inside the USB3 + DP "combo" phy. Add information for the DP phy and describe the sub-nodes that represent the DP and USB3 phys that exist inside the combo wrapper. Remove reg-names from required properties because it isn't required nor used by the kernel driver.
--- .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 95 ++++++++++++++++--- 1 file changed, 84 insertions(+), 11 deletions(-)
Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml +84 -11
@@ -13,17 +13,21 @@ maintainers: properties: compatible: enum: + - qcom,sc7180-qmp-usb3-dp-phy - qcom,sc7180-qmp-usb3-phy + - qcom,sdm845-qmp-usb3-dp-phy - qcom,sdm845-qmp-usb3-phy reg: items: - - description: Address and length of PHY's common serdes block. + - description: Address and length of PHY's USB serdes block. - description: Address and length of the DP_COM control block. + - description: Address and length of PHY's DP serdes block. reg-names: items: - - const: reg-base + - const: usb - const: dp_com + - const: dp "#clock-cells": enum: [ 1, 2 ]
@@ -74,16 +78,74 @@ properties: #Required nodes: patternProperties: - "^phy@[0-9a-f]+$": + "^usb3-phy@[0-9a-f]+$": type: object description: - Each device node of QMP phy is required to have as many child nodes as - the number of lanes the PHY has. + The USB3 PHY. + + properties: + reg: + items: + - description: Address and length of TX. + - description: Address and length of RX. + - description: Address and length of PCS. + - description: Address and length of TX2. + - description: Address and length of RX2. + - description: Address and length of pcs_misc. + + clocks: + items: + - description: pipe clock + + clock-names: + items: + - const: pipe0 + + clock-output-names: + items: + - const: usb3_phy_pipe_clk_src + + '#clock-cells': + const: 0 + + '#phy-cells': + const: 0 + + required: + - reg + - clocks + - clock-names + - '#clock-cells' + - '#phy-cells' + + "^dp-phy@[0-9a-f]+$": + type: object + description: + The DP PHY. + + properties: + reg: + items: + - description: Address and length of TX. + - description: Address and length of RX. + - description: Address and length of PCS. + - description: Address and length of TX2. + - description: Address and length of RX2. + + '#clock-cells': + const: 1 + + '#phy-cells': + const: 0 + + required: + - reg + - '#clock-cells' + - '#phy-cells' required: - compatible - reg - - reg-names - "#clock-cells" - "#address-cells" - "#size-cells"
@@ -101,14 +163,15 @@ examples: - | #include <dt-bindings/clock/qcom,gcc-sdm845.h> usb_1_qmpphy: phy-wrapper@88e9000 { - compatible = "qcom,sdm845-qmp-usb3-phy"; + compatible = "qcom,sdm845-qmp-usb3-dp-phy"; reg = <0x088e9000 0x18c>, - <0x088e8000 0x10>; - reg-names = "reg-base", "dp_com"; + <0x088e8000 0x10>, + <0x088ea000 0x40>; + reg-names = "usb", "dp_com", "dp"; #clock-cells = <1>; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x088e9000 0x1000>; + ranges = <0x0 0x088e9000 0x2000>; clocks = <&gcc GCC_USB3_PRIM_PHY_AUX_CLK>, <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>,
@@ -123,7 +186,7 @@ examples: vdda-phy-supply = <&vdda_usb2_ss_1p2>; vdda-pll-supply = <&vdda_usb2_ss_core>; - phy@200 { + usb3-phy@200 { reg = <0x200 0x128>, <0x400 0x200>, <0xc00 0x218>,
@@ -136,4 +199,14 @@ examples: clock-names = "pipe0"; clock-output-names = "usb3_phy_pipe_clk_src"; }; + + dp-phy@88ea200 { + reg = <0xa200 0x200>, + <0xa400 0x200>, + <0xaa00 0x200>, + <0xa600 0x200>, + <0xa800 0x200>; + #clock-cells = <1>; + #phy-cells = <0>; + }; };
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v4 01/10] dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy information
Quoted 21 lines · Stephen Boyd
This binding only describes the USB phy inside the USB3 + DP "combo" phy. Add information for the DP phy and describe the sub-nodes that represent the DP and USB3 phys that exist inside the combo wrapper. Remove reg-names from required properties because it isn't required nor used by the kernel driver.
Cc Jeykumar Sankaran <[email protected]>Cc Chandan Uddaraju <[email protected]>Cc Vara Reddy <[email protected]>Cc Tanmay Shah <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Manu Gautam <[email protected]>Cc Sandeep Maheswaram <[email protected]>Cc Douglas Anderson <[email protected]>Cc Sean Paul <[email protected]>Cc Jonathan Marek <[email protected]>Cc Dmitry Baryshkov <[email protected]>Cc <[email protected]>Cc Rob Herring <[email protected]>Cc Rob Clark <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 4 lines
--- .../bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 95 ++++++++++++++++--- 1 file changed, 84 insertions(+), 11 deletions(-)
PATCH v4 2/10 phy: qcom-qmp: Move phy mode into struct qmp_phy
In reply to Stephen BoydThe phy mode pertains to the phy itself, i.e. 'struct qmp_phy', not the wrapper, i.e. 'struct qcom_qmp'. Move the phy mode into the phy structure to more accurately reflect what is going on. This also cleans up 'struct qcom_qmp' so that it can eventually be the place where qmp wrapper wide data is located, paving the way for the USB3+DP combo phy.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +7 -8
@@ -1812,6 +1812,7 @@ struct qmp_phy_cfg {* @index: lane index * @qmp: QMP phy to which this lane belongs * @lane_rst: lane's reset controller +* @mode: current PHY mode */ struct qmp_phy {struct phy *phy;
@@ -1825,6 +1826,7 @@ struct qmp_phy {unsigned int index;struct qcom_qmp *qmp;struct reset_control *lane_rst; +enum phy_mode mode; };/**
@@ -1843,7 +1845,6 @@ struct qmp_phy {* @phy_mutex: mutex lock for PHY common block initialization * @init_count: phy common block initialization count * @phy_initialized: indicate if PHY has been initialized -* @mode: current PHY mode * @ufs_reset: optional UFS PHY reset handle */ struct qcom_qmp {
@@ -1861,7 +1862,6 @@ struct qcom_qmp {struct mutex phy_mutex;int init_count;bool phy_initialized; -enum phy_mode mode;struct reset_control *ufs_reset; };
@@ -2801,9 +2801,8 @@ static int qcom_qmp_phy_set_mode(struct phy *phy, enum phy_mode mode, int submode) {struct qmp_phy *qphy =phy_get_drvdata (phy); -struct qcom_qmp *qmp = qphy->qmp; - qmp->mode = mode; + qphy->mode = mode;return 0 ; }
@@ -2816,8 +2815,8 @@ static void qcom_qmp_phy_enable_autonomous_mode(struct qmp_phy *qphy)void __iomem *pcs_misc = qphy->pcs_misc;u32 intr_mask; -if (qmp->mode ==PHY_MODE_USB_HOST_SS || - qmp->mode ==PHY_MODE_USB_DEVICE_SS ) +if (qphy->mode ==PHY_MODE_USB_HOST_SS || + qphy->mode ==PHY_MODE_USB_DEVICE_SS ) intr_mask =ARCVR_DTCT_EN |ALFPS_DTCT_EN ;else intr_mask =ARCVR_DTCT_EN |ARCVR_DTCT_EVENT_SEL ;
@@ -2863,7 +2862,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev)struct qmp_phy *qphy = qmp->phys[0 ];const struct qmp_phy_cfg *cfg = qmp->cfg; -dev_vdbg (dev,"Suspending QMP phy, mode:%d\n" , qmp->mode); +dev_vdbg (dev,"Suspending QMP phy, mode:%d\n" , qphy->mode);/* Supported only for USB3 PHY */ if (cfg->type !=PHY_TYPE_USB3 )
@@ -2889,7 +2888,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev)const struct qmp_phy_cfg *cfg = qmp->cfg;int ret =0 ; -dev_vdbg (dev,"Resuming QMP phy, mode:%d\n" , qmp->mode); +dev_vdbg (dev,"Resuming QMP phy, mode:%d\n" , qphy->mode);/* Supported only for USB3 PHY */ if (cfg->type !=PHY_TYPE_USB3 )
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v4 3/10 phy: qcom-qmp: Remove 'initialized' in favor of 'init_count'
In reply to Stephen BoydWe already track if any phy inside the qmp wrapper has been initialized by means of the struct qcom_qmp::init_count member. Let's drop the duplicate 'initialized' member to simplify the code a bit.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +2 -7
@@ -1844,7 +1844,6 @@ struct qmp_phy {* @phys: array of per-lane phy descriptors * @phy_mutex: mutex lock for PHY common block initialization * @init_count: phy common block initialization count -* @phy_initialized: indicate if PHY has been initialized * @ufs_reset: optional UFS PHY reset handle */ struct qcom_qmp {
@@ -1861,7 +1860,6 @@ struct qcom_qmp {struct mutex phy_mutex;int init_count; -bool phy_initialized;struct reset_control *ufs_reset; };
@@ -2748,7 +2746,6 @@ static int qcom_qmp_phy_enable(struct phy *phy)dev_err (qmp->dev,"phy initialization timed-out\n" ); goto err_pcs_ready; } - qmp->phy_initialized = true;return 0 ; err_pcs_ready:
@@ -2792,8 +2789,6 @@ static int qcom_qmp_phy_disable(struct phy *phy)qcom_qmp_phy_com_exit (qmp); - qmp->phy_initialized = false; -return 0 ; }
@@ -2868,7 +2863,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev)if (cfg->type !=PHY_TYPE_USB3 )return 0 ; -if (!qmp->phy_initialized) { +if (!qmp->init_count) {dev_vdbg (dev,"PHY not initialized, bailing out\n" );return 0 ; }
@@ -2894,7 +2889,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev)if (cfg->type !=PHY_TYPE_USB3 )return 0 ; -if (!qmp->phy_initialized) { +if (!qmp->init_count) {dev_vdbg (dev,"PHY not initialized, bailing out\n" );return 0 ; }
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v4 4/10 phy: qcom-qmp: Move 'serdes' and 'cfg' into 'struct qcom_phy'
In reply to Stephen BoydThe serdes I/O region is where the PLL for the phy is controlled. Sometimes the PLL is shared between multiple phys, for example in the PCIe case where there are three phys inside the same wrapper. Other times the PLL is for a single phy, i.e. some USB3 phys. To complete the trifecta we have the USB3+DP combo phy where the USB3 and DP phys each have their own serdes region because they have their own PLL while they both share a common I/O region pertaining to the USB type-c pinout and cable orientation.
Let's move the serdes iomem pointer into 'struct qmp_phy' so that we can correlate PLL control to the phy that uses it. This allows us to support the USB3+DP combo phy in this driver. This isn't a problem for the 3-lane/phy PCIe phy because there is a common init function that is the only place the serdes region is programmed.
Furthermore, move the configuration data that contains most of the register programming sequences to the qmp phy struct. This data isn't qmp wrapper specific. It is phy specific data used to tune various settings for things like pre-emphasis, bias, etc.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 113 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 57 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +56 -57
@@ -1802,6 +1802,8 @@ struct qmp_phy_cfg {* struct qmp_phy - per-lane phy descriptor * * @phy: generic phy +* @cfg: phy specific configuration +* @serdes: iomapped memory space for phy's serdes (i.e. PLL) * @tx: iomapped memory space for lane's tx * @rx: iomapped memory space for lane's rx * @pcs: iomapped memory space for lane's pcs
@@ -1816,6 +1818,8 @@ struct qmp_phy_cfg {*/ struct qmp_phy {struct phy *phy; +const struct qmp_phy_cfg *cfg; +void __iomem *serdes;void __iomem *tx;void __iomem *rx;void __iomem *pcs;
@@ -1833,14 +1837,12 @@ struct qmp_phy {* struct qcom_qmp - structure holding QMP phy block attributes * * @dev: device -* @serdes: iomapped memory space for phy's serdes * @dp_com: iomapped memory space for phy's dp_com control block * * @clks: array of clocks required by phy * @resets: array of resets required by phy * @vregs: regulator supplies bulk data * -* @cfg: phy specific configuration * @phys: array of per-lane phy descriptors * @phy_mutex: mutex lock for PHY common block initialization * @init_count: phy common block initialization count
@@ -1848,14 +1850,12 @@ struct qmp_phy {*/ struct qcom_qmp {struct device *dev; -void __iomem *serdes;void __iomem *dp_com;struct clk_bulk_data *clks;struct reset_control **resets;struct regulator_bulk_data *vregs; -const struct qmp_phy_cfg *cfg;struct qmp_phy **phys;struct mutex phy_mutex;
@@ -2478,8 +2478,8 @@ static void qcom_qmp_phy_configure(void __iomem *base,static int qcom_qmp_phy_com_init (struct qmp_phy *qphy) {struct qcom_qmp *qmp = qphy->qmp; -const struct qmp_phy_cfg *cfg = qmp->cfg; -void __iomem *serdes = qmp->serdes; +const struct qmp_phy_cfg *cfg = qphy->cfg; +void __iomem *serdes = qphy->serdes;void __iomem *pcs = qphy->pcs;void __iomem *dp_com = qmp->dp_com;int ret, i;
@@ -2510,7 +2510,7 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) ret =reset_control_deassert (qmp->resets[i]);if (ret) {dev_err (qmp->dev,"%s reset deassert failed\n" , - qmp->cfg->reset_list[i]); + qphy->cfg->reset_list[i]); goto err_rst; } }
@@ -2592,10 +2592,11 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)return ret; } -static int qcom_qmp_phy_com_exit (struct qcom_qmp *qmp) +static int qcom_qmp_phy_com_exit (struct qmp_phy *qphy) { -const struct qmp_phy_cfg *cfg = qmp->cfg; -void __iomem *serdes = qmp->serdes; +struct qcom_qmp *qmp = qphy->qmp; +const struct qmp_phy_cfg *cfg = qphy->cfg; +void __iomem *serdes = qphy->serdes;int i = cfg->num_resets;mutex_lock (&qmp->phy_mutex);
@@ -2630,7 +2631,7 @@ static int qcom_qmp_phy_enable(struct phy *phy) {struct qmp_phy *qphy =phy_get_drvdata (phy);struct qcom_qmp *qmp = qphy->qmp; -const struct qmp_phy_cfg *cfg = qmp->cfg; +const struct qmp_phy_cfg *cfg = qphy->cfg;void __iomem *tx = qphy->tx;void __iomem *rx = qphy->rx;void __iomem *pcs = qphy->pcs;
@@ -2755,7 +2756,7 @@ static int qcom_qmp_phy_enable(struct phy *phy)if (cfg->has_lane_rst)reset_control_assert (qphy->lane_rst); err_lane_rst: -qcom_qmp_phy_com_exit (qmp); +qcom_qmp_phy_com_exit (qphy);return ret; }
@@ -2763,8 +2764,7 @@ static int qcom_qmp_phy_enable(struct phy *phy)static int qcom_qmp_phy_disable (struct phy *phy) {struct qmp_phy *qphy =phy_get_drvdata (phy); -struct qcom_qmp *qmp = qphy->qmp; -const struct qmp_phy_cfg *cfg = qmp->cfg; +const struct qmp_phy_cfg *cfg = qphy->cfg;clk_disable_unprepare (qphy->pipe_clk);
@@ -2787,7 +2787,7 @@ static int qcom_qmp_phy_disable(struct phy *phy)if (cfg->has_lane_rst)reset_control_assert (qphy->lane_rst); -qcom_qmp_phy_com_exit (qmp); +qcom_qmp_phy_com_exit (qphy);return 0 ; }
@@ -2804,8 +2804,7 @@ static int qcom_qmp_phy_set_mode(struct phy *phy,static void qcom_qmp_phy_enable_autonomous_mode (struct qmp_phy *qphy) { -struct qcom_qmp *qmp = qphy->qmp; -const struct qmp_phy_cfg *cfg = qmp->cfg; +const struct qmp_phy_cfg *cfg = qphy->cfg;void __iomem *pcs = qphy->pcs;void __iomem *pcs_misc = qphy->pcs_misc;u32 intr_mask;
@@ -2834,8 +2833,7 @@ static void qcom_qmp_phy_enable_autonomous_mode(struct qmp_phy *qphy)static void qcom_qmp_phy_disable_autonomous_mode (struct qmp_phy *qphy) { -struct qcom_qmp *qmp = qphy->qmp; -const struct qmp_phy_cfg *cfg = qmp->cfg; +const struct qmp_phy_cfg *cfg = qphy->cfg;void __iomem *pcs = qphy->pcs;void __iomem *pcs_misc = qphy->pcs_misc;
@@ -2855,7 +2853,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev) {struct qcom_qmp *qmp =dev_get_drvdata (dev);struct qmp_phy *qphy = qmp->phys[0 ]; -const struct qmp_phy_cfg *cfg = qmp->cfg; +const struct qmp_phy_cfg *cfg = qphy->cfg;dev_vdbg (dev,"Suspending QMP phy, mode:%d\n" , qphy->mode);
@@ -2880,7 +2878,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev) {struct qcom_qmp *qmp =dev_get_drvdata (dev);struct qmp_phy *qphy = qmp->phys[0 ]; -const struct qmp_phy_cfg *cfg = qmp->cfg; +const struct qmp_phy_cfg *cfg = qphy->cfg;int ret =0 ;dev_vdbg (dev,"Resuming QMP phy, mode:%d\n" , qphy->mode);
@@ -2912,10 +2910,10 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev)return 0 ; } -static int qcom_qmp_phy_vreg_init (struct device *dev) +static int qcom_qmp_phy_vreg_init (struct device *dev,const struct qmp_phy_cfg *cfg) {struct qcom_qmp *qmp =dev_get_drvdata (dev); -int num = qmp->cfg->num_vregs; +int num = cfg->num_vregs;int i; qmp->vregs =devm_kcalloc (dev, num,sizeof (*qmp->vregs),GFP_KERNEL );
@@ -2923,24 +2921,24 @@ static int qcom_qmp_phy_vreg_init(struct device *dev)return -ENOMEM ;for (i =0 ; i < num; i++) - qmp->vregs[i].supply = qmp->cfg->vreg_list[i]; + qmp->vregs[i].supply = cfg->vreg_list[i];return devm_regulator_bulk_get (dev, num, qmp->vregs); } -static int qcom_qmp_phy_reset_init (struct device *dev) +static int qcom_qmp_phy_reset_init (struct device *dev,const struct qmp_phy_cfg *cfg) {struct qcom_qmp *qmp =dev_get_drvdata (dev);int i; - qmp->resets =devm_kcalloc (dev, qmp->cfg->num_resets, + qmp->resets =devm_kcalloc (dev, cfg->num_resets,sizeof (*qmp->resets),GFP_KERNEL );if (!qmp->resets)return -ENOMEM ; -for (i =0 ; i < qmp->cfg->num_resets; i++) { +for (i =0 ; i < cfg->num_resets; i++) {struct reset_control *rst; -const char *name = qmp->cfg->reset_list[i]; +const char *name = cfg->reset_list[i]; rst =devm_reset_control_get (dev, name);if (IS_ERR (rst)) {
@@ -2953,10 +2951,10 @@ static int qcom_qmp_phy_reset_init(struct device *dev)return 0 ; } -static int qcom_qmp_phy_clk_init (struct device *dev) +static int qcom_qmp_phy_clk_init (struct device *dev,const struct qmp_phy_cfg *cfg) {struct qcom_qmp *qmp =dev_get_drvdata (dev); -int num = qmp->cfg->num_clks; +int num = cfg->num_clks;int i; qmp->clks =devm_kcalloc (dev, num,sizeof (*qmp->clks),GFP_KERNEL );
@@ -2964,7 +2962,7 @@ static int qcom_qmp_phy_clk_init(struct device *dev)return -ENOMEM ;for (i =0 ; i < num; i++) - qmp->clks[i].id = qmp->cfg->clk_list[i]; + qmp->clks[i].id = cfg->clk_list[i];return devm_clk_bulk_get (dev, num, qmp->clks); }
@@ -2998,12 +2996,6 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)struct clk_init_data init = { };int ret; -if ((qmp->cfg->type !=PHY_TYPE_USB3 ) && - (qmp->cfg->type !=PHY_TYPE_PCIE )) { -/* not all phys register pipe clocks, so return success */ -return 0 ; - } - ret =of_property_read_string (np,"clock-output-names" , &init.name);if (ret) {dev_err (qmp->dev,"%pOFn: No clock-output-names\n" , np);
@@ -3054,7 +3046,8 @@ static const struct phy_ops qcom_qmp_pcie_ufs_ops = { };static -int qcom_qmp_phy_create (struct device *dev,struct device_node *np,int id) +int qcom_qmp_phy_create (struct device *dev,struct device_node *np,int id, +void __iomem *serdes,const struct qmp_phy_cfg *cfg) {struct qcom_qmp *qmp =dev_get_drvdata (dev);struct phy *generic_phy;
@@ -3067,6 +3060,8 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)if (!qphy)return -ENOMEM ; + qphy->cfg = cfg; + qphy->serdes = serdes;/* * Get memory resources for each phy lane: * Resources are indexed as: tx -> 0; rx -> 1; pcs -> 2.
@@ -3091,7 +3086,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)* back to old legacy behavior of assuming they can be reached at an * offset from the first lane. */ -if (qmp->cfg->is_dual_lane_phy) { +if (cfg->is_dual_lane_phy) { qphy->tx2 =of_iomap (np,3 ); qphy->rx2 =of_iomap (np,4 );if (!qphy->tx2 || !qphy->rx2) {
@@ -3124,8 +3119,8 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)snprintf (prop_name,sizeof (prop_name),"pipe%d" , id); qphy->pipe_clk =of_clk_get_by_name (np, prop_name);if (IS_ERR (qphy->pipe_clk)) { -if (qmp->cfg->type ==PHY_TYPE_PCIE || - qmp->cfg->type ==PHY_TYPE_USB3 ) { +if (cfg->type ==PHY_TYPE_PCIE || + cfg->type ==PHY_TYPE_USB3 ) { ret =PTR_ERR (qphy->pipe_clk);if (ret != -EPROBE_DEFER ) dev_err(dev,
@@ -3137,7 +3132,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id) }/* Get lane reset, if any */ -if (qmp->cfg->has_lane_rst) { +if (cfg->has_lane_rst) {snprintf (prop_name,sizeof (prop_name),"lane%d" , id); qphy->lane_rst =of_reset_control_get (np, prop_name);if (IS_ERR (qphy->lane_rst)) {
@@ -3146,7 +3141,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id) } } -if (qmp->cfg->type ==PHY_TYPE_UFS || qmp->cfg->type ==PHY_TYPE_PCIE ) +if (cfg->type ==PHY_TYPE_UFS || cfg->type ==PHY_TYPE_PCIE ) ops = &qcom_qmp_pcie_ufs_ops; generic_phy =devm_phy_create (dev, np, ops);
@@ -3244,6 +3239,8 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)struct device_node *child;struct phy_provider *phy_provider;void __iomem *base; +void __iomem *serdes; +const struct qmp_phy_cfg *cfg;int num, id;int ret;
@@ -3255,8 +3252,8 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)dev_set_drvdata (dev, qmp);/* Get the specific init parameters of QMP phy */ - qmp->cfg =of_device_get_match_data (dev); -if (!qmp->cfg) + cfg =of_device_get_match_data (dev); +if (!cfg)return -EINVAL ; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -3265,10 +3262,10 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)return PTR_ERR (base);/* per PHY serdes; usually located at base address */ - qmp->serdes = base; + serdes = base;/* per PHY dp_com; if PHY has dp_com control block */ -if (qmp->cfg->has_phy_dp_com_ctrl) { +if (cfg->has_phy_dp_com_ctrl) { res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"dp_com" ); base =devm_ioremap_resource (dev, res);
@@ -3280,15 +3277,15 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)mutex_init (&qmp->phy_mutex); - ret =qcom_qmp_phy_clk_init (dev); + ret =qcom_qmp_phy_clk_init (dev, cfg);if (ret)return ret; - ret =qcom_qmp_phy_reset_init (dev); + ret =qcom_qmp_phy_reset_init (dev, cfg);if (ret)return ret; - ret =qcom_qmp_phy_vreg_init (dev); + ret =qcom_qmp_phy_vreg_init (dev, cfg);if (ret) {if (ret != -EPROBE_DEFER ) dev_err(dev, "failed to get regulator supplies: %d\n",
@@ -3298,7 +3295,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) num =of_get_available_child_count (dev->of_node);/* do we have a rogue child node ? */ -if (num > qmp->cfg->nlanes) +if (num > cfg->nlanes)return -EINVAL ; qmp->phys =devm_kcalloc (dev, num,sizeof (*qmp->phys),GFP_KERNEL );
@@ -3316,7 +3313,7 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)for_each_available_child_of_node (dev->of_node, child) {/* Create per-lane phy */ - ret =qcom_qmp_phy_create (dev, child, id); + ret =qcom_qmp_phy_create (dev, child, id, serdes, cfg);if (ret) {dev_err (dev,"failed to create lane%d phy, %d\n" , id, ret);
@@ -3327,11 +3324,13 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)* Register the pipe clock provided by phy. * See function description to see details of this pipe clock. */ - ret =phy_pipe_clk_register (qmp, child); -if (ret) { -dev_err (qmp->dev, -"failed to register pipe clock source\n" ); - goto err_node_put; +if (cfg->type ==PHY_TYPE_USB3 || cfg->type ==PHY_TYPE_PCIE ) { + ret =phy_pipe_clk_register (qmp, child); +if (ret) { +dev_err (qmp->dev, +"failed to register pipe clock source\n" ); + goto err_node_put; + } } id++; }
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v4 5/10 phy: qcom-qmp: Get dp_com I/O resource by index
In reply to Stephen BoydThe dp_com resource is always at index 1 according to the dts files in the kernel. Get this resource by index so that we don't need to make future additions to the DT binding use 'reg-names'.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -7
@@ -3266,13 +3266,9 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)/* per PHY dp_com; if PHY has dp_com control block */ if (cfg->has_phy_dp_com_ctrl) { - res =platform_get_resource_byname (pdev,IORESOURCE_MEM , -"dp_com" ); - base =devm_ioremap_resource (dev, res); -if (IS_ERR (base)) -return PTR_ERR (base); - - qmp->dp_com = base; + qmp->dp_com =devm_platform_ioremap_resource (pdev,1 ); +if (IS_ERR (qmp->dp_com)) +return PTR_ERR (qmp->dp_com); }mutex_init (&qmp->phy_mutex);
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v4 6/10 phy: qcom-qmp: Use devm_platform_ioremap_resource() to simplify
In reply to Stephen BoydWe can use the wrapper API here to save some lines and remove the need for the 'base' and 'res' local variable.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +3 -8
@@ -3235,10 +3235,8 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) {struct qcom_qmp *qmp;struct device *dev = &pdev->dev; -struct resource *res;struct device_node *child;struct phy_provider *phy_provider; -void __iomem *base;void __iomem *serdes;const struct qmp_phy_cfg *cfg;int num, id;
@@ -3256,13 +3254,10 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)if (!cfg)return -EINVAL ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - base =devm_ioremap_resource (dev, res); -if (IS_ERR (base)) -return PTR_ERR (base); -/* per PHY serdes; usually located at base address */ - serdes = base; + serdes =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (serdes)) +return PTR_ERR (serdes);/* per PHY dp_com; if PHY has dp_com control block */ if (cfg->has_phy_dp_com_ctrl) {
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v4 7/10 phy: qcom-qmp: Add support for DP in USB3+DP combo phy
In reply to Stephen BoydAdd support for the USB3 + DisplayPort (DP) "combo" phy to the qmp phy driver. We already have support for the USB3 part of the combo phy, so most additions are for the DP phy.
Split up the qcom_qmp_phy{enable,disable}() functions into the phy init, power on, power off, and exit functions that the common phy framework expects so that the DP phy can add even more phy ops like phy_calibrate() and phy_configure(). This allows us to initialize the DP PHY and configure the AUX channel before powering on the PHY at the link rate that was negotiated during link training.
The general design is as follows:
1) DP controller calls phy_init() to initialize the PHY and configure the dp_com register region.
2) DP controller calls phy_configure() to tune the link rate and voltage swing and pre-emphasis settings.
3) DP controller calls phy_power_on() to enable the PLL and power on the phy.
4) DP controller calls phy_configure() again to tune the voltage swing and pre-emphasis settings determind during link training.
5) DP controller calls phy_calibrate() some number of times to change the aux settings if the aux channel times out during link training.
6) DP controller calls phy_power_off() if the link rate is to be changed and goes back to step 2 to try again at a different link rate.
5) DP controller calls phy_power_off() and then phy_exit() to power down the PHY when it is done.
The DP PHY contains a PLL that is different from the one used for the USB3 PHY. Instead of a pipe clk there is a link clk and a pixel clk output from the DP PLL after going through various dividers. Introduce clk ops for these two clks that just tell the child clks what the frequency of the pixel and link are. When the phy link rate is configured we call clk_set_rate() to update the child clks in the display clk controller on what rate is in use. The clk frequencies always differ based on the link rate (i.e. 1.6Gb/s 2.7Gb/s, 5.4Gb/s, or 8.1Gb/s corresponding to various transmission modes like HBR1, HBR2 or HBR3) so we simply store the link rate and use that to calculate the clk frequencies.
The PLL enable sequence is a little different from other QMP phy PLLs so we power on the PLL in qcom_qmp_phy_configure_dp_phy() that gets called from phy_power_on(). This should probably be split out better so that each phy has a way to run the final PLL/PHY enable sequence.
This code is based on a submission of this phy and PLL in the drm subsystem.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 785 ++++++++++++++++++++++++---- drivers/phy/qualcomm/phy-qcom-qmp.h | 80 +++ 2 files changed, 775 insertions(+), 90 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp.c +695 -90
@@ -1762,6 +1762,16 @@ struct qmp_phy_cfg {const struct qmp_phy_init_tbl *pcs_misc_tbl;int pcs_misc_tbl_num; +/* Init sequence for DP PHY block link rates */ +const struct qmp_phy_init_tbl *serdes_tbl_rbr; +int serdes_tbl_rbr_num; +const struct qmp_phy_init_tbl *serdes_tbl_hbr; +int serdes_tbl_hbr_num; +const struct qmp_phy_init_tbl *serdes_tbl_hbr2; +int serdes_tbl_hbr2_num; +const struct qmp_phy_init_tbl *serdes_tbl_hbr3; +int serdes_tbl_hbr3_num; +/* clock ids to be requested */ const char *const *clk_list;int num_clks;
@@ -1798,6 +1808,11 @@ struct qmp_phy_cfg {bool no_pcs_sw_reset; }; +struct qmp_phy_combo_cfg { +const struct qmp_phy_cfg *usb_cfg; +const struct qmp_phy_cfg *dp_cfg; +}; +/** * struct qmp_phy - per-lane phy descriptor *
@@ -1831,6 +1846,15 @@ struct qmp_phy {struct qcom_qmp *qmp;struct reset_control *lane_rst;enum phy_mode mode; +unsigned int dp_aux_cfg; +struct phy_configure_opts_dp dp_opts; +struct qmp_phy_dp_clks *dp_clks; +}; + +struct qmp_phy_dp_clks { +struct qmp_phy *qphy; +struct clk_hw dp_link_hw; +struct clk_hw dp_pixel_hw; };/**
@@ -2475,6 +2499,295 @@ static void qcom_qmp_phy_configure(void __iomem *base,qcom_qmp_phy_configure_lane (base, regs, tbl, num,0xff ); } +static int qcom_qmp_phy_serdes_init (struct qmp_phy *qphy) +{ +struct qcom_qmp *qmp = qphy->qmp; +const struct qmp_phy_cfg *cfg = qphy->cfg; +void __iomem *serdes = qphy->serdes; +const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts; +const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl; +int serdes_tbl_num = cfg->serdes_tbl_num; +int ret; + +qcom_qmp_phy_configure (serdes, cfg->regs, serdes_tbl, serdes_tbl_num); + +if (cfg->type ==PHY_TYPE_DP ) { +switch (dp_opts->link_rate) { +case 1620 : +qcom_qmp_phy_configure (serdes, cfg->regs, + cfg->serdes_tbl_rbr, + cfg->serdes_tbl_rbr_num); +break ; +case 2700 : +qcom_qmp_phy_configure (serdes, cfg->regs, + cfg->serdes_tbl_hbr, + cfg->serdes_tbl_hbr_num); +break ; +case 5400 : +qcom_qmp_phy_configure (serdes, cfg->regs, + cfg->serdes_tbl_hbr2, + cfg->serdes_tbl_hbr2_num); +break ; +case 8100 : +qcom_qmp_phy_configure (serdes, cfg->regs, + cfg->serdes_tbl_hbr3, + cfg->serdes_tbl_hbr3_num); +break ; +default : +/* Other link rates aren't supported */ +return -EINVAL ; + } + } + + +if (cfg->has_phy_com_ctrl) { +void __iomem *status; +unsigned int mask, val; + +qphy_clrbits (serdes, cfg->regs[QPHY_COM_SW_RESET ],SW_RESET ); +qphy_setbits (serdes, cfg->regs[QPHY_COM_START_CONTROL ], +SERDES_START |PCS_START ); + + status = serdes + cfg->regs[QPHY_COM_PCS_READY_STATUS ]; + mask = cfg->mask_com_pcs_ready; + + ret =readl_poll_timeout (status, val, (val & mask),10 , +PHY_INIT_COMPLETE_TIMEOUT ); +if (ret) { +dev_err (qmp->dev, +"phy common block init timed-out\n" ); +return ret; + } + } + +return 0 ; +} + +static void qcom_qmp_phy_dp_aux_init (struct qmp_phy *qphy) +{ +writel (DP_PHY_PD_CTL_PWRDN |DP_PHY_PD_CTL_AUX_PWRDN | +DP_PHY_PD_CTL_PLL_PWRDN |DP_PHY_PD_CTL_DP_CLAMP_EN , + qphy->pcs +QSERDES_V3_DP_PHY_PD_CTL ); + +/* Turn on BIAS current for PHY/PLL */ +writel (QSERDES_V3_COM_BIAS_EN |QSERDES_V3_COM_BIAS_EN_MUX | +QSERDES_V3_COM_CLKBUF_L_EN |QSERDES_V3_COM_EN_SYSCLK_TX_SEL , + qphy->serdes +QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN ); + +writel (DP_PHY_PD_CTL_PSR_PWRDN , qphy->pcs +QSERDES_V3_DP_PHY_PD_CTL ); + +writel (DP_PHY_PD_CTL_PWRDN |DP_PHY_PD_CTL_AUX_PWRDN | +DP_PHY_PD_CTL_LANE_0_1_PWRDN | +DP_PHY_PD_CTL_LANE_2_3_PWRDN |DP_PHY_PD_CTL_PLL_PWRDN | +DP_PHY_PD_CTL_DP_CLAMP_EN , + qphy->pcs +QSERDES_V3_DP_PHY_PD_CTL ); + +writel (QSERDES_V3_COM_BIAS_EN | +QSERDES_V3_COM_BIAS_EN_MUX |QSERDES_V3_COM_CLKBUF_R_EN | +QSERDES_V3_COM_CLKBUF_L_EN |QSERDES_V3_COM_EN_SYSCLK_TX_SEL | +QSERDES_V3_COM_CLKBUF_RX_DRIVE_L , + qphy->serdes +QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN ); + +writel (0x00 , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG0 ); +writel (0x13 , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG1 ); +writel (0x24 , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG2 ); +writel (0x00 , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG3 ); +writel (0x0a , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG4 ); +writel (0x26 , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG5 ); +writel (0x0a , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG6 ); +writel (0x03 , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG7 ); +writel (0xbb , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG8 ); +writel (0x03 , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG9 ); + qphy->dp_aux_cfg =0 ; + +writel (PHY_AUX_STOP_ERR_MASK |PHY_AUX_DEC_ERR_MASK | +PHY_AUX_SYNC_ERR_MASK |PHY_AUX_ALIGN_ERR_MASK | +PHY_AUX_REQ_ERR_MASK , + qphy->pcs +QSERDES_V3_DP_PHY_AUX_INTERRUPT_MASK ); +} + +static const u8 qmp_dp_v3_pre_emphasis_hbr_rbr[4 ][4 ] = { + {0x00 ,0x0c ,0x14 ,0x19 }, + {0x00 ,0x0b ,0x12 ,0xff }, + {0x00 ,0x0b ,0xff ,0xff }, + {0x04 ,0xff ,0xff ,0xff } +}; + +static const u8 qmp_dp_v3_voltage_swing_hbr_rbr[4 ][4 ] = { + {0x08 ,0x0f ,0x16 ,0x1f }, + {0x11 ,0x1e ,0x1f ,0xff }, + {0x19 ,0x1f ,0xff ,0xff }, + {0x1f ,0xff ,0xff ,0xff } +}; + +static void qcom_qmp_phy_configure_dp_tx (struct qmp_phy *qphy) +{ +const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts; +unsigned int v_level =0 , p_level =0 ; +u32 bias_en, drvr_en; +u8 voltage_swing_cfg, pre_emphasis_cfg; +int i; + +for (i =0 ; i < dp_opts->lanes; i++) { + v_level =max (v_level, dp_opts->voltage[i]); + p_level =max (p_level, dp_opts->pre[i]); + } + +if (dp_opts->lanes ==1 ) { + bias_en =0x3e ; + drvr_en =0x13 ; + }else { + bias_en =0x3f ; + drvr_en =0x10 ; + } + + voltage_swing_cfg = qmp_dp_v3_voltage_swing_hbr_rbr[v_level][p_level]; + pre_emphasis_cfg = qmp_dp_v3_pre_emphasis_hbr_rbr[v_level][p_level]; + +/* TODO: Move check to config check */ +if (voltage_swing_cfg ==0xFF && pre_emphasis_cfg ==0xFF ) +return ; + +/* Enable MUX to use Cursor values from these registers */ + voltage_swing_cfg |= DP_PHY_TXn_TX_DRV_LVL_MUX_EN; + pre_emphasis_cfg |= DP_PHY_TXn_TX_EMP_POST1_LVL_MUX_EN; + +writel (voltage_swing_cfg, qphy->tx +QSERDES_V3_TX_TX_DRV_LVL ); +writel (pre_emphasis_cfg, qphy->tx +QSERDES_V3_TX_TX_EMP_POST1_LVL ); +writel (voltage_swing_cfg, qphy->tx2 +QSERDES_V3_TX_TX_DRV_LVL ); +writel (pre_emphasis_cfg, qphy->tx2 +QSERDES_V3_TX_TX_EMP_POST1_LVL ); + +writel (drvr_en, qphy->tx +QSERDES_V3_TX_HIGHZ_DRVR_EN ); +writel (bias_en, qphy->tx +QSERDES_V3_TX_TRANSCEIVER_BIAS_EN ); +writel (drvr_en, qphy->tx2 +QSERDES_V3_TX_HIGHZ_DRVR_EN ); +writel (bias_en, qphy->tx2 +QSERDES_V3_TX_TRANSCEIVER_BIAS_EN ); +} + +static int qcom_qmp_dp_phy_configure (struct phy *phy,union phy_configure_opts *opts) +{ +const struct phy_configure_opts_dp *dp_opts = &opts->dp; +struct qmp_phy *qphy =phy_get_drvdata (phy); + +memcpy (&qphy->dp_opts, dp_opts,sizeof (*dp_opts)); +if (qphy->dp_opts.set_voltages) { +qcom_qmp_phy_configure_dp_tx (qphy); + qphy->dp_opts.set_voltages =0 ; + } + +return 0 ; +} + +static int qcom_qmp_phy_configure_dp_phy (struct qmp_phy *qphy) +{ +const struct qmp_phy_dp_clks *dp_clks = qphy->dp_clks; +const struct phy_configure_opts_dp *dp_opts = &qphy->dp_opts; +u32 val, phy_vco_div, status; +unsigned long pixel_freq; + + val =DP_PHY_PD_CTL_PWRDN |DP_PHY_PD_CTL_AUX_PWRDN | +DP_PHY_PD_CTL_PLL_PWRDN |DP_PHY_PD_CTL_DP_CLAMP_EN ; + +/* +* TODO: Assume orientation is CC1 for now and two lanes, need to +* use type-c connector to understand orientation and lanes. +* +* Otherwise val changes to be like below if this code understood +* the orientation of the type-c cable. +* +* if (lane_cnt == 4 || orientation == ORIENTATION_CC2) +* val |= DP_PHY_PD_CTL_LANE_0_1_PWRDN; +* if (lane_cnt == 4 || orientation == ORIENTATION_CC1) +* val |= DP_PHY_PD_CTL_LANE_2_3_PWRDN; +* if (orientation == ORIENTATION_CC2) +* writel(0x4c, qphy->pcs + QSERDES_V3_DP_PHY_MODE); +*/ + val |=DP_PHY_PD_CTL_LANE_2_3_PWRDN ; +writel (val, qphy->pcs +QSERDES_V3_DP_PHY_PD_CTL ); + +writel (0x5c , qphy->pcs +QSERDES_V3_DP_PHY_MODE ); +writel (0x05 , qphy->pcs +QSERDES_V3_DP_PHY_TX0_TX1_LANE_CTL ); +writel (0x05 , qphy->pcs +QSERDES_V3_DP_PHY_TX2_TX3_LANE_CTL ); + +switch (dp_opts->link_rate) { +case 1620 : + phy_vco_div =0x1 ; + pixel_freq =1620000000UL /2 ; +break ; +case 2700 : + phy_vco_div =0x1 ; + pixel_freq =2700000000UL /2 ; +break ; +case 5400 : + phy_vco_div =0x2 ; + pixel_freq =5400000000UL /4 ; +break ; +case 8100 : + phy_vco_div =0x0 ; + pixel_freq =8100000000UL /6 ; +break ; +default : +/* Other link rates aren't supported */ +return -EINVAL ; + } +writel (phy_vco_div, qphy->pcs +QSERDES_V3_DP_PHY_VCO_DIV ); + +clk_set_rate (dp_clks->dp_link_hw.clk, dp_opts->link_rate *100000 ); +clk_set_rate (dp_clks->dp_pixel_hw.clk, pixel_freq); + +writel (0x04 , qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG2 ); +writel (0x01 , qphy->pcs +QSERDES_V3_DP_PHY_CFG ); +writel (0x05 , qphy->pcs +QSERDES_V3_DP_PHY_CFG ); +writel (0x01 , qphy->pcs +QSERDES_V3_DP_PHY_CFG ); +writel (0x09 , qphy->pcs +QSERDES_V3_DP_PHY_CFG ); + +writel (0x20 , qphy->serdes +QSERDES_V3_COM_RESETSM_CNTRL ); + +if (readl_poll_timeout (qphy->serdes +QSERDES_V3_COM_C_READY_STATUS , + status, + ((status &BIT (0 )) >0 ), +500 , +10000 )) +return -ETIMEDOUT ; + +writel (0x19 , qphy->pcs +QSERDES_V3_DP_PHY_CFG ); + +if (readl_poll_timeout (qphy->pcs +QSERDES_V3_DP_PHY_STATUS , + status, + ((status &BIT (1 )) >0 ), +500 , +10000 )) +return -ETIMEDOUT ; + +writel (0x18 , qphy->pcs +QSERDES_V3_DP_PHY_CFG ); +udelay (2000 ); +writel (0x19 , qphy->pcs +QSERDES_V3_DP_PHY_CFG ); + +return readl_poll_timeout (qphy->pcs +QSERDES_V3_DP_PHY_STATUS , + status, + ((status &BIT (1 )) >0 ), +500 , +10000 ); +} + +/* +* We need to calibrate the aux setting here as many times +* as the caller tries +*/ +static int qcom_qmp_dp_phy_calibrate (struct phy *phy) +{ +struct qmp_phy *qphy =phy_get_drvdata (phy); +const u8 cfg1_settings[] = {0x13 ,0x23 ,0x1d }; +u8 val; + + qphy->dp_aux_cfg++; + qphy->dp_aux_cfg %=ARRAY_SIZE (cfg1_settings); + val = cfg1_settings[qphy->dp_aux_cfg]; + +writel (val, qphy->pcs +QSERDES_V3_DP_PHY_AUX_CFG1 ); + +return 0 ; +} +static int qcom_qmp_phy_com_init (struct qmp_phy *qphy) {struct qcom_qmp *qmp = qphy->qmp;
@@ -2529,6 +2842,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)SW_DPPHY_RESET_MUX |SW_DPPHY_RESET | SW_USB3PHY_RESET_MUX | SW_USB3PHY_RESET); +/* Default type-c orientation, i.e CC1 */ +qphy_setbits (dp_com,QPHY_V3_DP_COM_TYPEC_CTRL ,0x02 ); +qphy_setbits (dp_com,QPHY_V3_DP_COM_PHY_MODE_CTRL ,USB3_MODE |DP_MODE );
@@ -2536,6 +2852,9 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy)qphy_clrbits (dp_com,QPHY_V3_DP_COM_RESET_OVRD_CTRL ,SW_DPPHY_RESET_MUX |SW_DPPHY_RESET |SW_USB3PHY_RESET_MUX |SW_USB3PHY_RESET ); + +qphy_clrbits (dp_com,QPHY_V3_DP_COM_SWI_CTRL ,0x03 ); +qphy_clrbits (dp_com,QPHY_V3_DP_COM_SW_RESET ,SW_RESET ); }if (cfg->has_phy_com_ctrl) {
@@ -2551,36 +2870,10 @@ static int qcom_qmp_phy_com_init(struct qmp_phy *qphy) cfg->pwrdn_ctrl); } -/* Serdes configuration */ -qcom_qmp_phy_configure (serdes, cfg->regs, cfg->serdes_tbl, - cfg->serdes_tbl_num); - -if (cfg->has_phy_com_ctrl) { -void __iomem *status; -unsigned int mask, val; - -qphy_clrbits (serdes, cfg->regs[QPHY_COM_SW_RESET ],SW_RESET ); -qphy_setbits (serdes, cfg->regs[QPHY_COM_START_CONTROL ], -SERDES_START |PCS_START ); - - status = serdes + cfg->regs[QPHY_COM_PCS_READY_STATUS ]; - mask = cfg->mask_com_pcs_ready; - - ret =readl_poll_timeout (status, val, (val & mask),10 , -PHY_INIT_COMPLETE_TIMEOUT ); -if (ret) { -dev_err (qmp->dev, -"phy common block init timed-out\n" ); - goto err_com_init; - } - } -mutex_unlock (&qmp->phy_mutex);return 0 ; -err_com_init: -clk_bulk_disable_unprepare (cfg->num_clks, qmp->clks); err_rst:while (++i < cfg->num_resets)reset_control_assert (qmp->resets[i]);
@@ -2627,20 +2920,12 @@ static int qcom_qmp_phy_com_exit(struct qmp_phy *qphy)return 0 ; } -static int qcom_qmp_phy_enable (struct phy *phy) +static int qcom_qmp_phy_init (struct phy *phy) {struct qmp_phy *qphy =phy_get_drvdata (phy);struct qcom_qmp *qmp = qphy->qmp;const struct qmp_phy_cfg *cfg = qphy->cfg; -void __iomem *tx = qphy->tx; -void __iomem *rx = qphy->rx; -void __iomem *pcs = qphy->pcs; -void __iomem *pcs_misc = qphy->pcs_misc; -void __iomem *dp_com = qmp->dp_com; -void __iomem *status; -unsigned int mask, val, ready;int ret; -dev_vdbg (qmp->dev,"Initializing QMP phy\n" );if (cfg->no_pcs_sw_reset) {
@@ -2667,13 +2952,34 @@ static int qcom_qmp_phy_enable(struct phy *phy) ret =reset_control_assert (qmp->ufs_reset);if (ret) - goto err_lane_rst; +return ret; } ret =qcom_qmp_phy_com_init (qphy);if (ret)return ret; +if (cfg->type ==PHY_TYPE_DP ) +qcom_qmp_phy_dp_aux_init (qphy); + +return 0 ; +} + +static int qcom_qmp_phy_power_on (struct phy *phy) +{ +struct qmp_phy *qphy =phy_get_drvdata (phy); +struct qcom_qmp *qmp = qphy->qmp; +const struct qmp_phy_cfg *cfg = qphy->cfg; +void __iomem *tx = qphy->tx; +void __iomem *rx = qphy->rx; +void __iomem *pcs = qphy->pcs; +void __iomem *pcs_misc = qphy->pcs_misc; +void __iomem *status; +unsigned int mask, val, ready; +int ret; + +qcom_qmp_phy_serdes_init (qphy); +if (cfg->has_lane_rst) { ret =reset_control_deassert (qphy->lane_rst);if (ret) {
@@ -2697,13 +3003,23 @@ static int qcom_qmp_phy_enable(struct phy *phy)qcom_qmp_phy_configure_lane (qphy->tx2, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num,2 ); +/* Configure special DP tx tunings */ +if (cfg->type ==PHY_TYPE_DP ) +qcom_qmp_phy_configure_dp_tx (qphy); +qcom_qmp_phy_configure_lane (rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num,1 ); +if (cfg->is_dual_lane_phy)qcom_qmp_phy_configure_lane (qphy->rx2, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num,2 ); -qcom_qmp_phy_configure (pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); +/* Configure link rate, swing, etc. */ +if (cfg->type ==PHY_TYPE_DP ) +qcom_qmp_phy_configure_dp_phy (qphy); +else +qcom_qmp_phy_configure (pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); + ret =reset_control_deassert (qmp->ufs_reset);if (ret) goto err_lane_rst;
@@ -2721,69 +3037,77 @@ static int qcom_qmp_phy_enable(struct phy *phy)if (cfg->has_pwrdn_delay)usleep_range (cfg->pwrdn_delay_min, cfg->pwrdn_delay_max); -/* Pull PHY out of reset state */ -if (!cfg->no_pcs_sw_reset) -qphy_clrbits (pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET ); - -if (cfg->has_phy_dp_com_ctrl) -qphy_clrbits (dp_com,QPHY_V3_DP_COM_SW_RESET ,SW_RESET ); - -/* start SerDes and Phy-Coding-Sublayer */ -qphy_setbits (pcs, cfg->regs[QPHY_START_CTRL ], cfg->start_ctrl); - -if (cfg->type ==PHY_TYPE_UFS ) { - status = pcs + cfg->regs[QPHY_PCS_READY_STATUS ]; - mask =PCS_READY ; - ready =PCS_READY ; - }else { - status = pcs + cfg->regs[QPHY_PCS_STATUS ]; - mask =PHYSTATUS ; - ready =0 ; - } +if (cfg->type !=PHY_TYPE_DP ) { +/* Pull PHY out of reset state */ +if (!cfg->no_pcs_sw_reset) +qphy_clrbits (pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET ); +/* start SerDes and Phy-Coding-Sublayer */ +qphy_setbits (pcs, cfg->regs[QPHY_START_CTRL ], cfg->start_ctrl); + +if (cfg->type ==PHY_TYPE_UFS ) { + status = pcs + cfg->regs[QPHY_PCS_READY_STATUS ]; + mask =PCS_READY ; + ready =PCS_READY ; + }else { + status = pcs + cfg->regs[QPHY_PCS_STATUS ]; + mask =PHYSTATUS ; + ready =0 ; + } - ret =readl_poll_timeout (status, val, (val & mask) == ready,10 , -PHY_INIT_COMPLETE_TIMEOUT ); -if (ret) { -dev_err (qmp->dev,"phy initialization timed-out\n" ); - goto err_pcs_ready; + ret =readl_poll_timeout (status, val, (val & mask) == ready,10 , +PHY_INIT_COMPLETE_TIMEOUT ); +if (ret) { +dev_err (qmp->dev,"phy initialization timed-out\n" ); + goto err_pcs_ready; + } }return 0 ; err_pcs_ready: -reset_control_assert (qmp->ufs_reset);clk_disable_unprepare (qphy->pipe_clk); err_clk_enable:if (cfg->has_lane_rst)reset_control_assert (qphy->lane_rst); err_lane_rst: -qcom_qmp_phy_com_exit (qphy); -return ret; } -static int qcom_qmp_phy_disable (struct phy *phy) +static int qcom_qmp_phy_power_off (struct phy *phy) {struct qmp_phy *qphy =phy_get_drvdata (phy);const struct qmp_phy_cfg *cfg = qphy->cfg;clk_disable_unprepare (qphy->pipe_clk); -/* PHY reset */ -if (!cfg->no_pcs_sw_reset) -qphy_setbits (qphy->pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET ); +if (cfg->type ==PHY_TYPE_DP ) { +/* Assert DP PHY power down */ +writel (DP_PHY_PD_CTL_PSR_PWRDN , qphy->pcs +QSERDES_V3_DP_PHY_PD_CTL ); + }else { +/* PHY reset */ +if (!cfg->no_pcs_sw_reset) +qphy_setbits (qphy->pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET ); -/* stop SerDes and Phy-Coding-Sublayer */ -qphy_clrbits (qphy->pcs, cfg->regs[QPHY_START_CTRL ], cfg->start_ctrl); +/* stop SerDes and Phy-Coding-Sublayer */ +qphy_clrbits (qphy->pcs, cfg->regs[QPHY_START_CTRL ], cfg->start_ctrl); -/* Put PHY into POWER DOWN state: active low */ -if (cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL ]) { -qphy_clrbits (qphy->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL ], - cfg->pwrdn_ctrl); - }else { -qphy_clrbits (qphy->pcs,QPHY_POWER_DOWN_CONTROL , - cfg->pwrdn_ctrl); +/* Put PHY into POWER DOWN state: active low */ +if (cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL ]) { +qphy_clrbits (qphy->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL ], + cfg->pwrdn_ctrl); + }else { +qphy_clrbits (qphy->pcs,QPHY_POWER_DOWN_CONTROL , + cfg->pwrdn_ctrl); + } } +return 0 ; +} + +static int qcom_qmp_phy_exit (struct phy *phy) +{ +struct qmp_phy *qphy =phy_get_drvdata (phy); +const struct qmp_phy_cfg *cfg = qphy->cfg; +if (cfg->has_lane_rst)reset_control_assert (qphy->lane_rst);
@@ -2792,6 +3116,31 @@ static int qcom_qmp_phy_disable(struct phy *phy)return 0 ; } +static int qcom_qmp_phy_enable (struct phy *phy) +{ +int ret; + + ret =qcom_qmp_phy_init (phy); +if (ret) +return ret; + + ret =qcom_qmp_phy_power_on (phy); +if (ret) +qcom_qmp_phy_exit (phy); + +return ret; +} + +static int qcom_qmp_phy_disable (struct phy *phy) +{ +int ret; + + ret =qcom_qmp_phy_power_off (phy); +if (ret) +return ret; +return qcom_qmp_phy_exit (phy); +} +static int qcom_qmp_phy_set_mode (struct phy *phy,enum phy_mode mode,int submode) {
@@ -2857,7 +3206,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev)dev_vdbg (dev,"Suspending QMP phy, mode:%d\n" , qphy->mode); -/* Supported only for USB3 PHY */ +/* Supported only for USB3 PHY and luckily USB3 is the first phy */ if (cfg->type !=PHY_TYPE_USB3 )return 0 ;
@@ -2883,7 +3232,7 @@ static int __maybe_unused qcom_qmp_phy_runtime_resume(struct device *dev)dev_vdbg (dev,"Resuming QMP phy, mode:%d\n" , qphy->mode); -/* Supported only for USB3 PHY */ +/* Supported only for USB3 PHY and luckily USB3 is the first phy */ if (cfg->type !=PHY_TYPE_USB3 )return 0 ;
@@ -2967,7 +3316,7 @@ static int qcom_qmp_phy_clk_init(struct device *dev, const struct qmp_phy_cfg *creturn devm_clk_bulk_get (dev, num, qmp->clks); } -static void phy_pipe_clk_release_provider (void *res) +static void phy_clk_release_provider (void *res) {of_clk_del_provider (res); }
@@ -3024,9 +3373,202 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np)* Roll a devm action because the clock provider is the child node, but * the child node is not actually a device. */ - ret =devm_add_action (qmp->dev, phy_pipe_clk_release_provider, np); + ret =devm_add_action (qmp->dev, phy_clk_release_provider, np);if (ret) -phy_pipe_clk_release_provider (np); +phy_clk_release_provider (np); + +return ret; +} + +/* +* Display Port PLL driver block diagram for branch clocks +* +* +------------------------------+ +* | DP_VCO_CLK | +* | | +* | +-------------------+ | +* | | (DP PLL/VCO) | | +* | +---------+---------+ | +* | v | +* | +----------+-----------+ | +* | | hsclk_divsel_clk_src | | +* | +----------+-----------+ | +* +------------------------------+ +* | +* +---------<---------v------------>----------+ +* | | +* +--------v----------------+ | +* | dp_phy_pll_link_clk | | +* | link_clk | | +* +--------+----------------+ | +* | | +* | | +* v v +* Input to DISPCC block | +* for link clk, crypto clk | +* and interface clock | +* | +* | +* +--------<------------+-----------------+---<---+ +* | | | +* +----v---------+ +--------v-----+ +--------v------+ +* | vco_divided | | vco_divided | | vco_divided | +* | _clk_src | | _clk_src | | _clk_src | +* | | | | | | +* |divsel_six | | divsel_two | | divsel_four | +* +-------+------+ +-----+--------+ +--------+------+ +* | | | +* v---->----------v-------------<------v +* | +* +----------+-----------------+ +* | dp_phy_pll_vco_div_clk | +* +---------+------------------+ +* | +* v +* Input to DISPCC block +* for DP pixel clock +* +*/ +static int qcom_qmp_dp_pixel_clk_determine_rate (struct clk_hw *hw, +struct clk_rate_request *req) +{ +switch (req->rate) { +case 1620000000UL /2 : +case 2700000000UL /2 : +/* 5.4 and 8.1 GHz are same link rate as 2.7GHz, i.e. div 4 and div 6 */ +return 0 ; +default : +return -EINVAL ; + } +} + +static unsigned long +qcom_qmp_dp_pixel_clk_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) +{ +const struct qmp_phy_dp_clks *dp_clks; +const struct qmp_phy *qphy; +const struct phy_configure_opts_dp *dp_opts; + + dp_clks = container_of(hw, struct qmp_phy_dp_clks, dp_pixel_hw); + qphy = dp_clks->qphy; + dp_opts = &qphy->dp_opts; + +switch (dp_opts->link_rate) { +case 1620 : +return 1620000000UL /2 ; +case 2700 : +return 2700000000UL /2 ; +case 5400 : +return 5400000000UL /4 ; +case 8100 : +return 8100000000UL /6 ; +default : +return 0 ; + } +} + +static const struct clk_ops qcom_qmp_dp_pixel_clk_ops = { + .determine_rate = qcom_qmp_dp_pixel_clk_determine_rate, + .recalc_rate = qcom_qmp_dp_pixel_clk_recalc_rate, +}; + +static int qcom_qmp_dp_link_clk_determine_rate (struct clk_hw *hw, +struct clk_rate_request *req) +{ +switch (req->rate) { +case 162000000 : +case 270000000 : +case 540000000 : +case 810000000 : +return 0 ; +default : +return -EINVAL ; + } +} + +static unsigned long +qcom_qmp_dp_link_clk_recalc_rate (struct clk_hw *hw,unsigned long parent_rate) +{ +const struct qmp_phy_dp_clks *dp_clks; +const struct qmp_phy *qphy; +const struct phy_configure_opts_dp *dp_opts; + + dp_clks = container_of(hw, struct qmp_phy_dp_clks, dp_link_hw); + qphy = dp_clks->qphy; + dp_opts = &qphy->dp_opts; + +switch (dp_opts->link_rate) { +case 1620 : +case 2700 : +case 5400 : +case 8100 : +return dp_opts->link_rate *100000 ; +default : +return 0 ; + } +} + +static const struct clk_ops qcom_qmp_dp_link_clk_ops = { + .determine_rate = qcom_qmp_dp_link_clk_determine_rate, + .recalc_rate = qcom_qmp_dp_link_clk_recalc_rate, +}; + +static struct clk_hw * +qcom_qmp_dp_clks_hw_get (struct of_phandle_args *clkspec,void *data) +{ +struct qmp_phy_dp_clks *dp_clks = data; +unsigned int idx = clkspec->args[0 ]; + +if (idx >=2 ) { +pr_err ("%s: invalid index %u\n" , __func__, idx); +return ERR_PTR (-EINVAL ); + } + +if (idx ==0 ) +return &dp_clks->dp_link_hw; + +return &dp_clks->dp_pixel_hw; +} + +static int phy_dp_clks_register (struct qcom_qmp *qmp,struct qmp_phy *qphy, +struct device_node *np) +{ +struct clk_init_data init = { }; +struct qmp_phy_dp_clks *dp_clks; +int ret; + + dp_clks =devm_kzalloc (qmp->dev,sizeof (*dp_clks),GFP_KERNEL ); +if (!dp_clks) +return -ENOMEM ; + + dp_clks->qphy = qphy; + qphy->dp_clks = dp_clks; + + init.ops = &qcom_qmp_dp_link_clk_ops; + init.name ="qmp_dp_phy_pll_link_clk" ; + dp_clks->dp_link_hw.init = &init; + ret =devm_clk_hw_register (qmp->dev, &dp_clks->dp_link_hw); +if (ret) +return ret; + + init.ops = &qcom_qmp_dp_pixel_clk_ops; + init.name ="qmp_dp_phy_pll_vco_div_clk" ; + dp_clks->dp_pixel_hw.init = &init; + ret =devm_clk_hw_register (qmp->dev, &dp_clks->dp_pixel_hw); +if (ret) +return ret; + + ret =of_clk_add_hw_provider (np, qcom_qmp_dp_clks_hw_get, dp_clks); +if (ret) +return ret; + +/* +* Roll a devm action because the clock provider is the child node, but +* the child node is not actually a device. +*/ + ret =devm_add_action (qmp->dev, phy_clk_release_provider, np); +if (ret) +phy_clk_release_provider (np);return ret; }
@@ -3038,6 +3580,17 @@ static const struct phy_ops qcom_qmp_phy_gen_ops = { .owner = THIS_MODULE, }; +static const struct phy_ops qcom_qmp_phy_dp_ops = { + .init = qcom_qmp_phy_init, + .configure = qcom_qmp_dp_phy_configure, + .power_on = qcom_qmp_phy_power_on, + .calibrate = qcom_qmp_dp_phy_calibrate, + .power_off = qcom_qmp_phy_power_off, + .exit = qcom_qmp_phy_exit, + .set_mode = qcom_qmp_phy_set_mode, + .owner =THIS_MODULE , +}; +static const struct phy_ops qcom_qmp_pcie_ufs_ops = { .power_on = qcom_qmp_phy_enable, .power_off = qcom_qmp_phy_disable,
@@ -3052,7 +3605,7 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,struct qcom_qmp *qmp =dev_get_drvdata (dev);struct phy *generic_phy;struct qmp_phy *qphy; -const struct phy_ops *ops = &qcom_qmp_phy_gen_ops; +const struct phy_ops *ops;char prop_name[MAX_PROP_NAME ];int ret;
@@ -3143,6 +3696,10 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id,if (cfg->type ==PHY_TYPE_UFS || cfg->type ==PHY_TYPE_PCIE ) ops = &qcom_qmp_pcie_ufs_ops; +else if (cfg->type ==PHY_TYPE_DP ) + ops = &qcom_qmp_phy_dp_ops; +else + ops = &qcom_qmp_phy_gen_ops; generic_phy =devm_phy_create (dev, np, ops);if (IS_ERR (generic_phy)) {
@@ -3226,6 +3783,10 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = { };MODULE_DEVICE_TABLE (of, qcom_qmp_phy_of_match_table); +static const struct of_device_id qcom_qmp_combo_phy_of_match_table[] = { + { } +}; +static const struct dev_pm_ops qcom_qmp_phy_pm_ops = {SET_RUNTIME_PM_OPS (qcom_qmp_phy_runtime_suspend, qcom_qmp_phy_runtime_resume,NULL )
@@ -3238,8 +3799,13 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)struct device_node *child;struct phy_provider *phy_provider;void __iomem *serdes; +void __iomem *usb_serdes; +void __iomem *dp_serdes; +const struct qmp_phy_combo_cfg *combo_cfg =NULL ;const struct qmp_phy_cfg *cfg; -int num, id; +const struct qmp_phy_cfg *usb_cfg; +const struct qmp_phy_cfg *dp_cfg; +int num, id, expected_phys;int ret; qmp =devm_kzalloc (dev,sizeof (*qmp),GFP_KERNEL );
@@ -3251,21 +3817,45 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)/* Get the specific init parameters of QMP phy */ cfg =of_device_get_match_data (dev); -if (!cfg) -return -EINVAL ; +if (!cfg) { +const struct of_device_id *match; + + match =of_match_device (qcom_qmp_combo_phy_of_match_table, dev); +if (!match) +return -EINVAL ; + + combo_cfg = match->data; +if (!combo_cfg) +return -EINVAL ; + + usb_cfg = combo_cfg->usb_cfg; + cfg = usb_cfg;/* Setup clks and regulators */ + }/* per PHY serdes; usually located at base address */ - serdes =devm_platform_ioremap_resource (pdev,0 ); + usb_serdes = serdes =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (serdes))return PTR_ERR (serdes);/* per PHY dp_com; if PHY has dp_com control block */ -if (cfg->has_phy_dp_com_ctrl) { +if (combo_cfg || cfg->has_phy_dp_com_ctrl) { qmp->dp_com =devm_platform_ioremap_resource (pdev,1 );if (IS_ERR (qmp->dp_com))return PTR_ERR (qmp->dp_com); } +if (combo_cfg) { +/* Only two serdes for combo PHY */ + dp_serdes =devm_platform_ioremap_resource (pdev,2 ); +if (IS_ERR (dp_serdes)) +return PTR_ERR (dp_serdes); + + dp_cfg = combo_cfg->dp_cfg; + expected_phys =2 ; + }else { + expected_phys = cfg->nlanes; + } +mutex_init (&qmp->phy_mutex); ret =qcom_qmp_phy_clk_init (dev, cfg);
@@ -3286,14 +3876,13 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) num =of_get_available_child_count (dev->of_node);/* do we have a rogue child node ? */ -if (num > cfg->nlanes) +if (num > expected_phys)return -EINVAL ; qmp->phys =devm_kcalloc (dev, num,sizeof (*qmp->phys),GFP_KERNEL );if (!qmp->phys)return -ENOMEM ; - id =0 ;pm_runtime_set_active (dev);pm_runtime_enable (dev);/*
@@ -3302,7 +3891,16 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev)*/ pm_runtime_forbid (dev); + id =0 ;for_each_available_child_of_node (dev->of_node, child) { +if (of_node_name_eq (child,"dp-phy" )) { + cfg = dp_cfg; + serdes = dp_serdes; + }else if (of_node_name_eq (child,"usb3-phy" )) { + cfg = usb_cfg; + serdes = usb_serdes; + } +/* Create per-lane phy */ ret =qcom_qmp_phy_create (dev, child, id, serdes, cfg);if (ret) {
@@ -3322,6 +3920,13 @@ static int qcom_qmp_phy_probe(struct platform_device *pdev) "failed to register pipe clock source\n"); goto err_node_put; } + }else if (cfg->type ==PHY_TYPE_DP ) { + ret =phy_dp_clks_register (qmp, qmp->phys[id], child); +if (ret) { +dev_err (qmp->dev, +"failed to register DP clock source\n" ); + goto err_node_put; + } } id++; }
drivers/phy/qualcomm/phy-qcom-qmp.h +80 -0
110 lines not on this page · raw message
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v4 8/10 phy: qcom-qmp: Add support for sc7180 DP phy
In reply to Stephen BoydAdd the necessary compatible strings and phy data for the sc7180 USB3+DP combo phy.
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 124 ++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +124 -0
@@ -947,6 +947,88 @@ static const struct qmp_phy_init_tbl qmp_v3_usb3_tx_tbl[] = { QMP_PHY_INIT_CFG(QSERDES_V3_TX_RES_CODE_LANE_OFFSET_TX, 0x06), }; +static const struct qmp_phy_init_tbl qmp_v3_dp_serdes_tbl[] = { +QMP_PHY_INIT_CFG (QSERDES_V3_COM_SVS_MODE_CLK_SEL ,0x01 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_SYSCLK_EN_SEL ,0x37 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_SYS_CLK_CTRL ,0x02 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_CLK_ENABLE1 ,0x0e ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_SYSCLK_BUF_ENABLE ,0x06 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_CLK_SELECT ,0x30 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_CMN_CONFIG ,0x02 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START1_MODE0 ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE0 ,0x3f ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE0 ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_VCO_TUNE_MAP ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP3_MODE0 ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_BG_TIMER ,0x0a ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_CORECLK_DIV_MODE0 ,0x0a ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_VCO_TUNE_CTRL ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_BIAS_EN_CLKBUFLR_EN ,0x3f ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_CORE_CLK_EN ,0x1f ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_PLL_IVCO ,0x07 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_PLL_CCTRL_MODE0 ,0x36 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_PLL_RCTRL_MODE0 ,0x16 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_CP_CTRL_MODE0 ,0x06 ), +}; + +static const struct qmp_phy_init_tbl qmp_v3_dp_serdes_tbl_rbr[] = { +QMP_PHY_INIT_CFG (QSERDES_V3_COM_HSCLK_SEL ,0x0c ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DEC_START_MODE0 ,0x69 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START2_MODE0 ,0x80 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START3_MODE0 ,0x07 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP1_MODE0 ,0x6f ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP2_MODE0 ,0x08 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP_EN ,0x00 ), +}; + +static const struct qmp_phy_init_tbl qmp_v3_dp_serdes_tbl_hbr[] = { +QMP_PHY_INIT_CFG (QSERDES_V3_COM_HSCLK_SEL ,0x04 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DEC_START_MODE0 ,0x69 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START2_MODE0 ,0x80 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START3_MODE0 ,0x07 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP1_MODE0 ,0x0f ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP2_MODE0 ,0x0e ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP_EN ,0x00 ), +}; + +static const struct qmp_phy_init_tbl qmp_v3_dp_serdes_tbl_hbr2[] = { +QMP_PHY_INIT_CFG (QSERDES_V3_COM_HSCLK_SEL ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DEC_START_MODE0 ,0x8c ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START2_MODE0 ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START3_MODE0 ,0x0a ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP1_MODE0 ,0x1f ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP2_MODE0 ,0x1c ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP_EN ,0x00 ), +}; + +static const struct qmp_phy_init_tbl qmp_v3_dp_serdes_tbl_hbr3[] = { +QMP_PHY_INIT_CFG (QSERDES_V3_COM_HSCLK_SEL ,0x03 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DEC_START_MODE0 ,0x69 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START2_MODE0 ,0x80 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_DIV_FRAC_START3_MODE0 ,0x07 ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP1_MODE0 ,0x2f ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP2_MODE0 ,0x2a ), +QMP_PHY_INIT_CFG (QSERDES_V3_COM_LOCK_CMP_EN ,0x08 ), +}; + +static const struct qmp_phy_init_tbl qmp_v3_dp_tx_tbl[] = { +QMP_PHY_INIT_CFG (QSERDES_V3_TX_TRANSCEIVER_BIAS_EN ,0x1a ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_VMODE_CTRL1 ,0x40 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_PRE_STALL_LDO_BOOST_EN ,0x30 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_INTERFACE_SELECT ,0x3d ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_CLKBUF_ENABLE ,0x0f ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_RESET_TSYNC_EN ,0x03 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_TRAN_DRVR_EMP_EN ,0x03 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_PARRATE_REC_DETECT_IDLE_EN ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_TX_INTERFACE_MODE ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_TX_BAND ,0x4 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_TX_POL_INV ,0x0a ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_TX_DRV_LVL ,0x38 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_TX_EMP_POST1_LVL ,0x20 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_RES_CODE_LANE_OFFSET_TX ,0x06 ), +QMP_PHY_INIT_CFG (QSERDES_V3_TX_RES_CODE_LANE_OFFSET_RX ,0x07 ), +}; +static const struct qmp_phy_init_tbl qmp_v3_usb3_rx_tbl[] = {QMP_PHY_INIT_CFG (QSERDES_V3_RX_UCDR_FASTLOCK_FO_GAIN ,0x0b ),QMP_PHY_INIT_CFG (QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL2 ,0x0f ),
@@ -2223,6 +2305,41 @@ static const struct qmp_phy_cfg sc7180_usb3phy_cfg = { .is_dual_lane_phy = true, }; +static const struct qmp_phy_cfg sc7180_dpphy_cfg = { + .type =PHY_TYPE_DP , + .nlanes =1 , + + .serdes_tbl = qmp_v3_dp_serdes_tbl, + .serdes_tbl_num =ARRAY_SIZE (qmp_v3_dp_serdes_tbl), + .tx_tbl = qmp_v3_dp_tx_tbl, + .tx_tbl_num =ARRAY_SIZE (qmp_v3_dp_tx_tbl), + + .serdes_tbl_rbr = qmp_v3_dp_serdes_tbl_rbr, + .serdes_tbl_rbr_num =ARRAY_SIZE (qmp_v3_dp_serdes_tbl_rbr), + .serdes_tbl_hbr = qmp_v3_dp_serdes_tbl_hbr, + .serdes_tbl_hbr_num =ARRAY_SIZE (qmp_v3_dp_serdes_tbl_hbr), + .serdes_tbl_hbr2 = qmp_v3_dp_serdes_tbl_hbr2, + .serdes_tbl_hbr2_num =ARRAY_SIZE (qmp_v3_dp_serdes_tbl_hbr2), + .serdes_tbl_hbr3 = qmp_v3_dp_serdes_tbl_hbr3, + .serdes_tbl_hbr3_num =ARRAY_SIZE (qmp_v3_dp_serdes_tbl_hbr3), + + .clk_list = qmp_v3_phy_clk_l, + .num_clks =ARRAY_SIZE (qmp_v3_phy_clk_l), + .reset_list = sc7180_usb3phy_reset_l, + .num_resets =ARRAY_SIZE (sc7180_usb3phy_reset_l), + .vreg_list = qmp_phy_vreg_l, + .num_vregs =ARRAY_SIZE (qmp_phy_vreg_l), + .regs = qmp_v3_usb3phy_regs_layout, + + .has_phy_dp_com_ctrl = true, + .is_dual_lane_phy = true, +}; + +static const struct qmp_phy_combo_cfg sc7180_usb3dpphy_cfg = { + .usb_cfg = &sc7180_usb3phy_cfg, + .dp_cfg = &sc7180_dpphy_cfg, +}; +static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = { .type =PHY_TYPE_USB3 , .nlanes =1 ,
@@ -3742,6 +3859,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = { }, { .compatible = "qcom,sc7180-qmp-usb3-phy", .data = &sc7180_usb3phy_cfg, + }, { + .compatible = "qcom,sc7180-qmp-usb3-dp-phy", + /* It's a combo phy */ }, { .compatible = "qcom,sdm845-qhp-pcie-phy", .data = &sdm845_qhp_pciephy_cfg,
@@ -3784,6 +3904,10 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = {MODULE_DEVICE_TABLE (of, qcom_qmp_phy_of_match_table);static const struct of_device_id qcom_qmp_combo_phy_of_match_table[] = { + { + .compatible ="qcom,sc7180-qmp-usb3-dp-phy" , + .data = &sc7180_usb3dpphy_cfg, + }, { } };
Signature · 1 line
Sent by a computer, using git, on the internet
PATCH v4 9/10 clk: qcom: dispcc: Update DP clk ops for phy design
In reply to Stephen BoydThe clk_rcg2_dp_determine_rate() function is used for the DP pixel clk. This function should return the rate that can be achieved by the pixel clk in 'struct clk_rate_request::rate' and match the logic similar to what is seen in clk_rcg2_dp_set_rate(). But that isn't the case. Instead the code merely bubbles the rate request up to the parent of the pixel clk and doesn't try to do a rational approximation of the rate that would be achieved by picking some m/n value for the RCG.
Let's change this logic so that we can assume the parent clk frequency is fixed (it is because it's the VCO of the DP PLL that is configured based on the link rate) and so that we can calculate what the m/n value will be and adjust the req->rate appropriately.
--- drivers/clk/qcom/clk-rcg2.c | 19 +++++++++++++------ drivers/clk/qcom/dispcc-sc7180.c | 3 --- 2 files changed, 13 insertions(+), 9 deletions(-)
drivers/clk/qcom/clk-rcg2.c +13 -6
@@ -1182,14 +1182,21 @@ static int clk_rcg2_dp_set_rate_and_parent(struct clk_hw *hw,static int clk_rcg2_dp_determine_rate (struct clk_hw *hw,struct clk_rate_request *req) { -struct clk_rate_request parent_req = *req; -int ret; +struct clk_rcg2 *rcg =to_clk_rcg2 (hw); +unsigned long num, den; +u64 tmp; - ret =__clk_determine_rate (clk_hw_get_parent (hw), &parent_req); -if (ret) -return ret; +/* Parent rate is a fixed phy link rate */ +rational_best_approximation (req->best_parent_rate, req->rate, +GENMASK (rcg->mnd_width -1 ,0 ), +GENMASK (rcg->mnd_width -1 ,0 ), &den, &num); + +if (!num || !den) +return -EINVAL ; - req->best_parent_rate = parent_req.rate; + tmp = req->best_parent_rate * num; +do_div (tmp, den); + req->rate = tmp;return 0 ; }
drivers/clk/qcom/dispcc-sc7180.c +0 -3
@@ -202,7 +202,6 @@ static struct clk_rcg2 disp_cc_mdss_dp_crypto_clk_src = { .name = "disp_cc_mdss_dp_crypto_clk_src", .parent_data = disp_cc_parent_data_1, .num_parents = ARRAY_SIZE(disp_cc_parent_data_1), - .flags = CLK_SET_RATE_PARENT, .ops = &clk_byte2_ops, }, };
@@ -216,7 +215,6 @@ static struct clk_rcg2 disp_cc_mdss_dp_link_clk_src = { .name = "disp_cc_mdss_dp_link_clk_src", .parent_data = disp_cc_parent_data_1, .num_parents = ARRAY_SIZE(disp_cc_parent_data_1), - .flags = CLK_SET_RATE_PARENT, .ops = &clk_byte2_ops, }, };
@@ -230,7 +228,6 @@ static struct clk_rcg2 disp_cc_mdss_dp_pixel_clk_src = { .name = "disp_cc_mdss_dp_pixel_clk_src", .parent_data = disp_cc_parent_data_1, .num_parents = ARRAY_SIZE(disp_cc_parent_data_1), - .flags = CLK_SET_RATE_PARENT, .ops = &clk_dp_ops, }, };
Signature · 1 line
Sent by a computer, using git, on the internet
Re: [PATCH v4 09/10] clk: qcom: dispcc: Update DP clk ops for phy design
Quoting Stephen Boyd (2020-09-16 16:12:01)
Quoted 27 lines
The
clk_rcg2_dp_determine_rate()function is used for the DP pixel clk. This function should return the rate that can be achieved by the pixel clk in 'structclk_rate_request::rate' and match the logic similar to what is seen inclk_rcg2_dp_set_rate(). But that isn't the case. Instead the code merely bubbles the rate request up to the parent of the pixel clk and doesn't try to do a rational approximation of the rate that would be achieved by picking some m/n value for the RCG.Let's change this logic so that we can assume the parent clk frequency is fixed (it is because it's the VCO of the DP PLL that is configured based on the link rate) and so that we can calculate what the m/n value will be and adjust the
req->rateappropriately.Cc Jeykumar Sankaran <[email protected]>Cc Chandan Uddaraju <[email protected]>Cc Vara Reddy <[email protected]>Cc Tanmay Shah <[email protected]>Cc Bjorn Andersson <[email protected]>Cc Manu Gautam <[email protected]>Cc Sandeep Maheswaram <[email protected]>Cc Douglas Anderson <[email protected]>Cc Sean Paul <[email protected]>Cc Stephen Boyd <[email protected]>Cc Jonathan Marek <[email protected]>Cc Dmitry Baryshkov <[email protected]>Cc Rob Clark <[email protected]>Signed-off-by Stephen Boyd <[email protected]>
Quoted 1 line
---
Applied to clk-next
PATCH v4 10/10 drm/msm/dp: Use qmp phy for DP PLL and PHY
In reply to Stephen BoydMake the necessary changes to the DP driver to use the qmp phy from the common phy framework instead of rolling our own in the drm subsystem. This also removes the PLL code and adds proper includes so things build.
--- drivers/gpu/drm/msm/Makefile | 4 +- drivers/gpu/drm/msm/dp/dp_aux.c | 7 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 287 +------- drivers/gpu/drm/msm/dp/dp_catalog.h | 9 +- drivers/gpu/drm/msm/dp/dp_ctrl.c | 48 +- drivers/gpu/drm/msm/dp/dp_display.c | 17 - drivers/gpu/drm/msm/dp/dp_display.h | 3 - drivers/gpu/drm/msm/dp/dp_link.c | 2 + drivers/gpu/drm/msm/dp/dp_panel.c | 1 + drivers/gpu/drm/msm/dp/dp_parser.c | 12 +- drivers/gpu/drm/msm/dp/dp_parser.h | 12 +- drivers/gpu/drm/msm/dp/dp_pll.c | 99 --- drivers/gpu/drm/msm/dp/dp_pll.h | 61 -- drivers/gpu/drm/msm/dp/dp_pll_10nm.c | 930 ------------------------ drivers/gpu/drm/msm/dp/dp_pll_private.h | 89 --- drivers/gpu/drm/msm/dp/dp_power.c | 39 +- drivers/gpu/drm/msm/dp/dp_power.h | 9 - drivers/gpu/drm/msm/dp/dp_reg.h | 213 ------ 18 files changed, 79 insertions(+), 1763 deletions(-) delete mode 100644 drivers/gpu/drm/msm/dp/dp_pll.c delete mode 100644 drivers/gpu/drm/msm/dp/dp_pll.h delete mode 100644 drivers/gpu/drm/msm/dp/dp_pll_10nm.c delete mode 100644 drivers/gpu/drm/msm/dp/dp_pll_private.h
drivers/gpu/drm/msm/Makefile +1 -3
@@ -109,9 +109,7 @@ msm-$(CONFIG_DRM_MSM_DP)+= dp/dp_aux.o \ dp/dp_link.o \ dp/dp_panel.o \ dp/dp_parser.o \ - dp/dp_power.o \ - dp/dp_pll.o \ - dp/dp_pll_10nm.o + dp/dp_power.o msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o msm-$(CONFIG_COMMON_CLK) += disp/mdp4/mdp4_lvds_pll.o
drivers/gpu/drm/msm/dp/dp_aux.c +3 -4
@@ -4,6 +4,7 @@*/ #include <linux/delay.h> +#include <drm/drm_print.h> #include "dp_reg.h" #include "dp_aux.h"
@@ -380,8 +381,7 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux,if (aux->native) { aux->retry_cnt++;if (!(aux->retry_cnt % retry_count)) -dp_catalog_aux_update_cfg (aux->catalog, -PHY_AUX_CFG1 ); +dp_catalog_aux_update_cfg (aux->catalog);dp_catalog_aux_reset (aux->catalog); }usleep_range (400 ,500 );/* at least 400us to next try */
@@ -438,7 +438,7 @@ void dp_aux_reconfig(struct drm_dp_aux *dp_aux) aux = container_of(dp_aux, struct dp_aux_private, dp_aux); -dp_catalog_aux_update_cfg (aux->catalog,PHY_AUX_CFG1 ); +dp_catalog_aux_update_cfg (aux->catalog);dp_catalog_aux_reset (aux->catalog); }
@@ -453,7 +453,6 @@ void dp_aux_init(struct drm_dp_aux *dp_aux) aux = container_of(dp_aux, struct dp_aux_private, dp_aux); -dp_catalog_aux_setup (aux->catalog);dp_catalog_aux_enable (aux->catalog, true); aux->retry_cnt =0 ; }
drivers/gpu/drm/msm/dp/dp_catalog.c +21 -266
359 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_catalog.h +3 -6
@@ -6,6 +6,8 @@#ifndef _DP_CATALOG_H_#define _DP_CATALOG_H_ +#include <drm/drm_modes.h> +#include "dp_parser.h" /* interrupts */
@@ -58,9 +60,7 @@ int dp_catalog_aux_clear_trans(struct dp_catalog *dp_catalog, bool read);int dp_catalog_aux_clear_hw_interrupts (struct dp_catalog *dp_catalog);void dp_catalog_aux_reset (struct dp_catalog *dp_catalog);void dp_catalog_aux_enable (struct dp_catalog *dp_catalog,bool enable); -void dp_catalog_aux_update_cfg (struct dp_catalog *dp_catalog, -enum dp_phy_aux_config_type type); -void dp_catalog_aux_setup (struct dp_catalog *dp_catalog); +void dp_catalog_aux_update_cfg (struct dp_catalog *dp_catalog);int dp_catalog_aux_get_irq (struct dp_catalog *dp_catalog);/* DP Controller APIs */
@@ -73,7 +73,6 @@ void dp_catalog_ctrl_config_msa(struct dp_catalog *dp_catalog, u32 rate, u32 stream_rate_khz, bool fixed_nvid);int dp_catalog_ctrl_set_pattern (struct dp_catalog *dp_catalog,u32 pattern);void dp_catalog_ctrl_reset (struct dp_catalog *dp_catalog); -void dp_catalog_ctrl_usb_reset (struct dp_catalog *dp_catalog,bool flip);bool dp_catalog_ctrl_mainlink_ready (struct dp_catalog *dp_catalog);void dp_catalog_ctrl_enable_irq (struct dp_catalog *dp_catalog,bool enable); void dp_catalog_hpd_config_intr(struct dp_catalog *dp_catalog,
@@ -81,8 +80,6 @@ void dp_catalog_hpd_config_intr(struct dp_catalog *dp_catalog,void dp_catalog_ctrl_hpd_config (struct dp_catalog *dp_catalog);u32 dp_catalog_hpd_get_intr_status (struct dp_catalog *dp_catalog);void dp_catalog_ctrl_phy_reset (struct dp_catalog *dp_catalog); -void dp_catalog_ctrl_phy_lane_cfg (struct dp_catalog *dp_catalog,bool flipped, -u8 lane_cnt);int dp_catalog_ctrl_update_vx_px (struct dp_catalog *dp_catalog,u8 v_level,u8 p_level);int dp_catalog_ctrl_get_interrupt (struct dp_catalog *dp_catalog);
drivers/gpu/drm/msm/dp/dp_ctrl.c +34 -14
140 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_display.c +0 -17
@@ -24,7 +24,6 @@#include "dp_ctrl.h" #include "dp_display.h" #include "dp_drm.h" -#include "dp_pll.h" static struct msm_dp *g_dp_display;#define HPD_STRING_SIZE 30
@@ -84,7 +83,6 @@ struct dp_display_private {struct dp_usbpd *usbpd;struct dp_parser *parser; -struct msm_dp_pll *pll;struct dp_power *power;struct dp_catalog *catalog;struct drm_dp_aux *aux;
@@ -604,7 +602,6 @@ static void dp_display_deinit_sub_modules(struct dp_display_private *dp)dp_ctrl_put (dp->ctrl);dp_panel_put (dp->panel);dp_aux_put (dp->aux); -dp_pll_put (dp->pll); }static int dp_init_sub_modules (struct dp_display_private *dp)
@@ -615,9 +612,6 @@ static int dp_init_sub_modules(struct dp_display_private *dp)struct dp_panel_in panel_in = { .dev = dev, }; -struct dp_pll_in pll_in = { - .pdev = dp->pdev, - };/* Callback APIs used for cable status change event */ cb->configure = dp_display_usbpd_configure_cb;
@@ -648,17 +642,6 @@ static int dp_init_sub_modules(struct dp_display_private *dp) goto error; } - pll_in.parser = dp->parser; - dp->pll =dp_pll_get (&pll_in); -if (IS_ERR_OR_NULL (dp->pll)) { - rc = -EINVAL ; -DRM_ERROR ("failed to initialize pll, rc = %d\n" , rc); - dp->pll =NULL ; - goto error; - } - - dp->parser->pll = dp->pll; - dp->power =dp_power_get (dp->parser);if (IS_ERR (dp->power)) { rc =PTR_ERR (dp->power);
drivers/gpu/drm/msm/dp/dp_display.h +0 -3
@@ -24,7 +24,4 @@ int dp_display_request_irq(struct msm_dp *dp_display);bool dp_display_check_video_test (struct msm_dp *dp_display);int dp_display_get_test_bpp (struct msm_dp *dp_display); -void __init msm_dp_pll_driver_register (void ); -void __exit msm_dp_pll_driver_unregister(void); -#endif /* _DP_DISPLAY_H_ */
drivers/gpu/drm/msm/dp/dp_link.c +2 -0
@@ -5,6 +5,8 @@#define pr_fmt (fmt) "[drm-dp] %s: " fmt, __func__ +#include <drm/drm_print.h> +#include "dp_link.h" #include "dp_panel.h"
drivers/gpu/drm/msm/dp/dp_panel.c +1 -0
@@ -7,6 +7,7 @@#include <drm/drm_connector.h> #include <drm/drm_edid.h> +#include <drm/drm_print.h> struct dp_panel_private {struct device *dev;
drivers/gpu/drm/msm/dp/dp_parser.c +9 -3
@@ -4,6 +4,9 @@*/ #include <linux/of_gpio.h> +#include <linux/phy/phy.h> + +#include <drm/drm_print.h> #include "dp_parser.h" #include "dp_reg.h"
@@ -53,8 +56,6 @@ static void dp_parser_unmap_io_resources(struct dp_parser *parser)struct dp_io *io = &parser->io;msm_dss_iounmap (&io->dp_controller); -msm_dss_iounmap (&io->phy_reg); -msm_dss_iounmap (&io->usb3_dp_com); }static int dp_parser_ctrl_res (struct dp_parser *parser)
@@ -69,6 +70,12 @@ static int dp_parser_ctrl_res(struct dp_parser *parser) goto err; } + io->phy =devm_phy_get (&pdev->dev,"dp" ); +if (IS_ERR (io->phy)) { + rc =PTR_ERR (io->phy); + goto err; + } +return 0 ; err:dp_parser_unmap_io_resources (parser);
@@ -90,7 +97,6 @@ static int dp_parser_misc(struct dp_parser *parser) } parser->max_dp_lanes = len; -return 0 ; }
drivers/gpu/drm/msm/dp/dp_parser.h +4 -8
@@ -7,10 +7,11 @@#define _DP_PARSER_H_#include <linux/platform_device.h> +#include <linux/phy/phy.h> +#include <linux/phy/phy-dp.h> #include "dpu_io_util.h" #include "msm_drv.h" -#include "dp_pll.h" #define DP_LABEL "MDSS DP DISPLAY"#define DP_MAX_PIXEL_CLK_KHZ 675000
@@ -62,15 +63,11 @@ struct dp_display_data {* * @dp_controller: Display Port controller mapped memory address * @phy_io: phy's mapped memory address -* @ln_tx0_io: USB-DP lane TX0's mapped memory address -* @ln_tx1_io: USB-DP lane TX1's mapped memory address -* @dp_pll_io: DP PLL mapped memory address -* @usb3_dp_com: USB3 DP PHY combo mapped memory address */ struct dp_io {struct dss_io_data dp_controller; -struct dss_io_data phy_reg; -struct dss_io_data usb3_dp_com; +struct phy *phy; +union phy_configure_opts phy_opts; };/**
@@ -117,7 +114,6 @@ struct dp_parser {struct dp_pinctrl pinctrl;struct dp_io io;struct dp_display_data disp_data; -struct msm_dp_pll *pll;const struct dp_regulator_cfg *regulator_cfg;u32 max_dp_lanes;
drivers/gpu/drm/msm/dp/dp_pll.c deleted +0 -99
99 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_pll.h deleted +0 -61
61 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_pll_10nm.c deleted +0 -930
930 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_pll_private.h deleted +0 -89
89 lines not on this page · raw message
drivers/gpu/drm/msm/dp/dp_power.c +1 -38
@@ -9,6 +9,7 @@#include <linux/clk-provider.h> #include <linux/regulator/consumer.h> #include "dp_power.h" +#include "msm_drv.h" struct dp_power_private {struct dp_parser *parser;
@@ -102,16 +103,6 @@ static int dp_power_clk_init(struct dp_power_private *power) ctrl = &power->parser->mp[DP_CTRL_PM ]; stream = &power->parser->mp[DP_STREAM_PM ]; -if (power->parser->pll && power->parser->pll->get_provider) { - rc = power->parser->pll->get_provider (power->parser->pll, - &power->link_provider, &power->pixel_provider); -if (rc) { -DRM_ERROR ("%s:provider failed,don't set parent\n" , - __func__); -return 0 ; - } - } - rc =msm_dss_get_clk (dev, core->clk_config, core->num_clk);if (rc) { DRM_ERROR("failed to get %s clk. err=%d\n",
@@ -312,34 +303,6 @@ void dp_power_client_deinit(struct dp_power *dp_power) } -int dp_power_set_link_clk_parent (struct dp_power *dp_power) -{ -int rc =0 ; -struct dp_power_private *power; -u32 num; -struct dss_clk *cfg; -char *name ="ctrl_link" ; - -if (!dp_power) { -DRM_ERROR ("invalid power data\n" ); - rc = -EINVAL ; - goto exit; - } - - power = container_of(dp_power, struct dp_power_private, dp_power); - - num = power->parser->mp[DP_CTRL_PM ].num_clk; - cfg = power->parser->mp[DP_CTRL_PM ].clk_config; - -while (num &&strcmp (cfg->clk_name, name)) { - num--; - cfg++; - } - -exit: -return rc; -} -int dp_power_init (struct dp_power *dp_power,bool flip) {int rc =0 ;
drivers/gpu/drm/msm/dp/dp_power.h +0 -9
@@ -69,15 +69,6 @@ int dp_power_clk_status(struct dp_power *dp_power, enum dp_pm_type pm_type);int dp_power_clk_enable (struct dp_power *power,enum dp_pm_type pm_type,bool enable); -/** -* dp_power_set_link_clk_parent() - configures parent of link clocks -* -* @power: instance of power module -* return: 0 for success, error for failures -* -* This API will set the link clock parent source -*/ -int dp_power_set_link_clk_parent (struct dp_power *power);/** * dp_power_client_init() - initialize clock and regulator modules
drivers/gpu/drm/msm/dp/dp_reg.h +0 -213
233 lines not on this page · raw message
Signature · 1 line
Sent by a computer, using git, on the internet
Vinod Koul
maintainerQuoted 7 lines · Stephen Boyd
This patch series is based on v12 of the msm DP driver submission[1] plus a compliance patch[2]. In the v5 patch series review I suggested that the DP PHY and PLL be split out of the drm driver and moved to the qmp phy driver. This patch series does that, but it is still marked as an RFC because there are a couple more things to do, mostly updating the DT binding and getting agreement on how to structure the code.
Quoted 12 lines
Eventually I believe the qmp phy driver will need to listen for type-c notifiers or somehow know the type-c pinout being used so this driver can program things slightly differently. Right now, I don't have any way to test it though, so I've left it as future work. For some more details, the DP phy and the USB3 phy share the same physical pins on the SoC and those pins pretty much line up with a type-c pinout modulo some CC pins for cable orientation detection logic that lives on the PMIC. So the DP phy can use all four lanes or it can use two lanes and the USB3 phy can use two lanes. In the hardware designs that I have access to it is always two lanes for USB3 and two lanes for DP going through what looks like a type-c pinout so this just hard codes that configuration in the driver.
Applied 1 thru 8, thanks
Signature · 1 line
~Vinod