Re: [PATCH v2 4/4] PCI: mediatek-gen3: Add Airoha EN7581 support

["lorenzo@kernel.org" <lorenzo@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 8555 bytes --]

> Hi Lorenzo,

Hi Jianjun,

> 
> On Thu, 2024-06-27 at 10:12 +0200, Lorenzo Bianconi wrote:
> >  	 
> > External email : Please do not click links or open attachments until
> > you have verified the sender or the content.
> >  Introduce support for Airoha EN7581 PCIe controller to mediatek-gen3
> > PCIe controller driver.
> > 
> > Tested-by: Zhengping Zhang <zhengping.zhang@airoha.com>
> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
> > ---
> >  drivers/pci/controller/Kconfig              |  2 +-
> >  drivers/pci/controller/pcie-mediatek-gen3.c | 96
> > ++++++++++++++++++++-
> >  2 files changed, 96 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/pci/controller/Kconfig
> > b/drivers/pci/controller/Kconfig
> > index e534c02ee34f..3bd6c9430010 100644
> > --- a/drivers/pci/controller/Kconfig
> > +++ b/drivers/pci/controller/Kconfig
> > @@ -196,7 +196,7 @@ config PCIE_MEDIATEK
> >  
> >  config PCIE_MEDIATEK_GEN3
> >  	tristate "MediaTek Gen3 PCIe controller"
> > -	depends on ARCH_MEDIATEK || COMPILE_TEST
> > +	depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST
> >  	depends on PCI_MSI
> >  	help
> >  	  Adds support for PCIe Gen3 MAC controller for MediaTek SoCs.
> > diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c
> > b/drivers/pci/controller/pcie-mediatek-gen3.c
> > index 438a5222d986..af567b4355fa 100644
> > --- a/drivers/pci/controller/pcie-mediatek-gen3.c
> > +++ b/drivers/pci/controller/pcie-mediatek-gen3.c
> > @@ -7,6 +7,7 @@
> >   */
> >  
> >  #include <linux/clk.h>
> > +#include <linux/clk-provider.h>
> >  #include <linux/delay.h>
> >  #include <linux/iopoll.h>
> >  #include <linux/irq.h>
> > @@ -15,6 +16,8 @@
> >  #include <linux/kernel.h>
> >  #include <linux/module.h>
> >  #include <linux/msi.h>
> > +#include <linux/of_device.h>
> > +#include <linux/of_pci.h>
> >  #include <linux/pci.h>
> >  #include <linux/phy/phy.h>
> >  #include <linux/platform_device.h>
> > @@ -29,6 +32,7 @@
> >  #define PCI_CLASS(class)		(class << 8)
> >  #define PCIE_RC_MODE			BIT(0)
> >  
> > +#define PCIE_EQ_PRESET_01_REF		0x100
> Should be PCIE_EQ_PRESET_01_REG

ack, I will fix it in v3.

> 
> >  #define PCIE_CFGNUM_REG			0x140
> >  #define PCIE_CFG_DEVFN(devfn)		((devfn) & GENMASK(7,
> > 0))
> >  #define PCIE_CFG_BUS(bus)		(((bus) << 8) & GENMASK(15, 8))
> > @@ -68,6 +72,7 @@
> >  #define PCIE_MSI_SET_ENABLE_REG		0x190
> >  #define PCIE_MSI_SET_ENABLE		GENMASK(PCIE_MSI_SET_NUM - 1,
> > 0)
> >  
> > +#define PCIE_PIPE4_PIE8_REG		0x338
> >  #define PCIE_MSI_SET_BASE_REG		0xc00
> >  #define PCIE_MSI_SET_OFFSET		0x10
> >  #define PCIE_MSI_SET_STATUS_OFFSET	0x04
> > @@ -100,7 +105,17 @@
> >  #define PCIE_ATR_TLP_TYPE_MEM		PCIE_ATR_TLP_TYPE(0)
> >  #define PCIE_ATR_TLP_TYPE_IO		PCIE_ATR_TLP_TYPE(2)
> >  
> > -#define MAX_NUM_PHY_RESETS		1
> > +/* EN7581 */
> > +#define PCIE_PEXTP_DIG_GLB44_P0_REG	0x10044
> > +#define PCIE_PEXTP_DIG_LN_RX30_P0_REG	0x15030
> > +#define PCIE_PEXTP_DIG_LN_RX30_P1_REG	0x15130
> These registers belong to PHY, I think they should be added in the phy
> driver, which is located at drivers/phy/mediatek/phy-mtk-pcie.c.

ack, I will move this configuration in the pcie-phy driver.

> 
> > +
> > +/* PCIe-PHY initialization delay in ms */
> > +#define PHY_INIT_TIME_MS		30
> > +/* PCIe reset line delay in ms */
> > +#define PCIE_RESET_TIME_MS		100
> > +
> > +#define MAX_NUM_PHY_RESETS		3
> >  
> >  struct mtk_gen3_pcie;
> >  
> > @@ -847,6 +862,74 @@ static int mtk_pcie_parse_port(struct
> > mtk_gen3_pcie *pcie)
> >  	return 0;
> >  }
> >  
> > +static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
> > +{
> > +	struct device *dev = pcie->dev;
> > +	int err;
> > +
> > +	/* Wait for bulk assert completion in mtk_pcie_setup */
> > +	mdelay(PCIE_RESET_TIME_MS);
> > +
> > +	/* Setup Tx-Rx detect time */
> > +	writel_relaxed(0x23020133, pcie->base +
> > PCIE_PEXTP_DIG_GLB44_P0_REG);
> Please also add definitions for each field, the layout for
> PCIE_PEXTP_DIG_GLB44_P0_REG is:
> Bit[7:0] 
>   Name: rg_xtp_rxdet_vcm_off_stb_t_sel
>   Description: Stable Time Selection of tx_cmkp_en De-Assert (DC Common
> Mode Turn-Off) During RX Detection, unit: 4 us
> Bit[15:8]
>   Name: rg_xtp_rxdet_en_stb_t_sel
>   Description: Stable Time Selection of tx_rxdet_en Assert During RX
> Detection, unit: 1 us
> Bit[23:16]
>   Name: rg_xtp_rxdet_finish_stb_t_sel
>   Description: rxdet finish stable time selection, unit: 1 tx250m_ck
> Bit[27:24]
>   Name: rg_xtp_txpd_tx_data_en_dly
>   Description: ckpd_tx_data_en_sync delay selection, unit: 1 tx250m_ck
> Bit[28:28]
>   Name: rg_xtp_txpd_rxdet_done_cdt
>   Description: rxdet_done cdt selection, 0: !pipe_tx_detect_rx  1:
> pipe_phy_status
> Bit[31:29]
>   Name: rg_xtp_rxdet_latch_stb_t_sel
>   Description: rxdet_latch state stable time selection, unit: 1
> tx250m_ck
> 
> > +	/* Setup Rx AEQ training time */
> > +	writel_relaxed(0x50500032, pcie->base +
> > PCIE_PEXTP_DIG_LN_RX30_P0_REG);
> > +	writel_relaxed(0x50500032, pcie->base +
> > PCIE_PEXTP_DIG_LN_RX30_P1_REG);
> Layout for PEXTP_DIG_LN_RX30:
> Bit[7:0] rg_xtp_ln_rx_pdown_l1p2_exit_wait_cnt
> Bit[8] rg_xtp_ln_rx_pdown_t2rlb_dig_en
> Bit[28:16] rg_xtp_ln_rx_pdown_e0_aeqen_wait_us
> 
> > +
> > +	err = phy_init(pcie->phy);
> > +	if (err) {
> > +		dev_err(dev, "failed to initialize PHY\n");
> > +		return err;
> > +	}
> > +	mdelay(PHY_INIT_TIME_MS);
> > +
> > +	err = phy_power_on(pcie->phy);
> > +	if (err) {
> > +		dev_err(dev, "failed to power on PHY\n");
> > +		goto err_phy_on;
> > +	}
> > +
> > +	err = reset_control_bulk_deassert(pcie->soc-
> > >phy_resets.num_resets, pcie->phy_resets);
> > +	if (err) {
> > +		dev_err(dev, "failed to deassert PHYs\n");
> > +		goto err_phy_deassert;
> > +	}
> > +	mdelay(PCIE_RESET_TIME_MS);
> > +
> > +	pm_runtime_enable(dev);
> > +	pm_runtime_get_sync(dev);
> > +
> > +	err = clk_bulk_prepare(pcie->num_clks, pcie->clks);
> > +	if (err) {
> > +		dev_err(dev, "failed to prepare clock\n");
> > +		goto err_clk_prepare;
> > +	}
> > +
> > +	writel_relaxed(0x41474147, pcie->base + PCIE_EQ_PRESET_01_REF);
> Bit[6:0] val_ln0_dn
>   Bit [3:0]: Downstream port transmitter preset
>   Bit [6:4]: Downstream port receiver preset hint
> Bit[14:8] val_ln0_up
>   Bit [11:8]: Upstream port transmitter preset
>   Bit [14:12]: Upstream port receiver preset hint
> Bit[22:16] val_ln1_dn
>   Bit [19:16]: Downstream port transmitter preset
>   Bit [22:20]: Downstream port receiver preset hint
> BIt[30:24] val_ln1_up
>   Bit [27:24]: Upstream port transmitter preset
>   Bit [30:28]: Upstream port receiver preset hint
> 
> > +	writel_relaxed(0x1018020f, pcie->base + PCIE_PIPE4_PIE8_REG);
> Bit[5:0] k_finetune_max
> Bit[7:6] k_finetune_err
> Bit[18:8] k_preset_to_use
> Bit[19:19] k_phyparam_query
> Bit[20:20] k_query_timeout
> Bit[31:21] k_preset_to_use_16g
> 

ack, thx for the clarification. I will add them in v4.

Regards,
Lorenzo

> Thanks.
> 
> > +
> > +	err = clk_bulk_enable(pcie->num_clks, pcie->clks);
> > +	if (err) {
> > +		dev_err(dev, "failed to prepare clock\n");
> > +		goto err_clk_enable;
> > +	}
> > +
> > +	return 0;
> > +
> > +err_clk_enable:
> > +	clk_bulk_unprepare(pcie->num_clks, pcie->clks);
> > +err_clk_prepare:
> > +	pm_runtime_put_sync(dev);
> > +	pm_runtime_disable(dev);
> > +	reset_control_bulk_assert(pcie->soc->phy_resets.num_resets,
> > pcie->phy_resets);
> > +err_phy_deassert:
> > +	phy_power_off(pcie->phy);
> > +err_phy_on:
> > +	phy_exit(pcie->phy);
> > +
> > +	return err;
> > +}
> > +
> >  static int mtk_pcie_power_up(struct mtk_gen3_pcie *pcie)
> >  {
> >  	struct device *dev = pcie->dev;
> > @@ -1113,8 +1196,19 @@ static const struct mtk_gen3_pcie_pdata
> > mtk_pcie_soc_mt8192 = {
> >  	},
> >  };
> >  
> > +static const struct mtk_gen3_pcie_pdata mtk_pcie_soc_en7581 = {
> > +	.power_up = mtk_pcie_en7581_power_up,
> > +	.phy_resets = {
> > +		.id[0] = "phy-lane0",
> > +		.id[1] = "phy-lane1",
> > +		.id[2] = "phy-lane2",
> > +		.num_resets = 3,
> > +	},
> > +};
> > +
> >  static const struct of_device_id mtk_pcie_of_match[] = {
> >  	{ .compatible = "mediatek,mt8192-pcie", .data =
> > &mtk_pcie_soc_mt8192 },
> > +	{ .compatible = "airoha,en7581-pcie", .data =
> > &mtk_pcie_soc_en7581 },
> >  	{},
> >  };
> >  MODULE_DEVICE_TABLE(of, mtk_pcie_of_match);
> > -- 
> > 2.45.2
> > 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]