Re: [PATCH v4 08/11] PCI: imx6: Simplify pcie_phy_poll_ack()

[Lucas Stach]

Am Sonntag, den 14.04.2019, 17:46 -0700 schrieb Andrey Smirnov:
> Simplify pcie_phy_poll_ack() by incorporating shifting into constant
> definition and convert the code to use 'bool'. No functional change
> intended.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov@xxxxxxxxx>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: Chris Healy <cphealy@xxxxxxxxx>
> Cc: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: linux-pci@xxxxxxxxxxxxxxx

Reviewed-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>

> ---
> Âdrivers/pci/controller/dwc/pci-imx6.c | 26 +++++++++++++----------
> ---
> Â1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c
> b/drivers/pci/controller/dwc/pci-imx6.c
> index 669e01353026..3fd084357488 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -112,7 +112,7 @@ struct imx6_pcie {
> Â#define PCIE_PHY_CTRL_RD		BIT(19)
> Â
> Â#define PCIE_PHY_STAT (PL_OFFSET + 0x110)
> -#define PCIE_PHY_STAT_ACK_LOC 16
> +#define PCIE_PHY_STAT_ACK		BIT(16)
> Â
> Â#define PCIE_LINK_WIDTH_SPEED_CONTROL	0x80C
> Â
> @@ -151,16 +151,16 @@ struct imx6_pcie {
> Â#define PHY_RX_OVRD_IN_LO_RX_DATA_EN		BIT(5)
> Â#define PHY_RX_OVRD_IN_LO_RX_PLL_EN		BIT(3)
> Â
> -static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, int
> exp_val)
> +static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, bool
> exp_val)
> Â{
> Â	struct dw_pcie *pci = imx6_pcie->pci;
> -	u32 val;
> +	bool val;
> Â	u32 max_iterations = 10;
> Â	u32 wait_counter = 0;
> Â
> Â	do {
> -		val = dw_pcie_readl_dbi(pci, PCIE_PHY_STAT);
> -		val = (val >> PCIE_PHY_STAT_ACK_LOC) & 0x1;
> +		val = dw_pcie_readl_dbi(pci, PCIE_PHY_STAT) &
> +			PCIE_PHY_STAT_ACK;
> Â		wait_counter++;
> Â
> Â		if (val == exp_val)
> @@ -184,14 +184,14 @@ static int pcie_phy_wait_ack(struct imx6_pcie
> *imx6_pcie, int addr)
> Â	val |= PCIE_PHY_CTRL_CAP_ADR;
> Â	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, val);
> Â
> -	ret = pcie_phy_poll_ack(imx6_pcie, 1);
> +	ret = pcie_phy_poll_ack(imx6_pcie, true);
> Â	if (ret)
> Â		return ret;
> Â
> Â	val = PCIE_PHY_CTRL_DATA(addr);
> Â	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, val);
> Â
> -	return pcie_phy_poll_ack(imx6_pcie, 0);
> +	return pcie_phy_poll_ack(imx6_pcie, false);
> Â}
> Â
> Â/* Read from the 16-bit PCIe PHY control registers (not memory-
> mapped) */
> @@ -209,7 +209,7 @@ static int pcie_phy_read(struct imx6_pcie
> *imx6_pcie, int addr, int *data)
> Â	phy_ctl = PCIE_PHY_CTRL_RD;
> Â	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, phy_ctl);
> Â
> -	ret = pcie_phy_poll_ack(imx6_pcie, 1);
> +	ret = pcie_phy_poll_ack(imx6_pcie, true);
> Â	if (ret)
> Â		return ret;
> Â
> @@ -219,7 +219,7 @@ static int pcie_phy_read(struct imx6_pcie
> *imx6_pcie, int addr, int *data)
> Â	/* deassert Read signal */
> Â	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, 0x00);
> Â
> -	return pcie_phy_poll_ack(imx6_pcie, 0);
> +	return pcie_phy_poll_ack(imx6_pcie, false);
> Â}
> Â
> Âstatic int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int
> data)
> @@ -241,7 +241,7 @@ static int pcie_phy_write(struct imx6_pcie
> *imx6_pcie, int addr, int data)
> Â	var |= PCIE_PHY_CTRL_CAP_DAT;
> Â	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
> Â
> -	ret = pcie_phy_poll_ack(imx6_pcie, 1);
> +	ret = pcie_phy_poll_ack(imx6_pcie, true);
> Â	if (ret)
> Â		return ret;
> Â
> @@ -250,7 +250,7 @@ static int pcie_phy_write(struct imx6_pcie
> *imx6_pcie, int addr, int data)
> Â	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
> Â
> Â	/* wait for ack de-assertion */
> -	ret = pcie_phy_poll_ack(imx6_pcie, 0);
> +	ret = pcie_phy_poll_ack(imx6_pcie, false);
> Â	if (ret)
> Â		return ret;
> Â
> @@ -259,7 +259,7 @@ static int pcie_phy_write(struct imx6_pcie
> *imx6_pcie, int addr, int data)
> Â	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
> Â
> Â	/* wait for ack */
> -	ret = pcie_phy_poll_ack(imx6_pcie, 1);
> +	ret = pcie_phy_poll_ack(imx6_pcie, true);
> Â	if (ret)
> Â		return ret;
> Â
> @@ -268,7 +268,7 @@ static int pcie_phy_write(struct imx6_pcie
> *imx6_pcie, int addr, int data)
> Â	dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
> Â
> Â	/* wait for ack de-assertion */
> -	ret = pcie_phy_poll_ack(imx6_pcie, 0);
> +	ret = pcie_phy_poll_ack(imx6_pcie, false);
> Â	if (ret)
> Â		return ret;
> Â