| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <a56e462d-83ee-194f-1f9f-3f4c339cad46@axis.com>
Date: Thu, 9 Mar 2017 15:48:25 +0100
From: Niklas Cassel <niklas.cassel@...s.com>
To: Kishon Vijay Abraham I <kishon@...com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Joao Pinto <Joao.Pinto@...opsys.com>,
<linux-pci@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-omap@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>
CC: <nsekhar@...com>, Jingoo Han <jingoohan1@...il.com>,
Richard Zhu <hongxing.zhu@....com>,
Lucas Stach <l.stach@...gutronix.de>,
Murali Karicheri <m-karicheri2@...com>,
Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>,
Jesper Nilsson <jespern@...s.com>,
Zhou Wang <wangzhou1@...ilicon.com>,
Gabriele Paoloni <gabriele.paoloni@...wei.com>
Subject: Re: [RESEND PATCH v3 5/7] PCI: dwc: all: Modify dbi accessors to
access data of 4/2/1 bytes
On 03/09/2017 07:39 AM, Kishon Vijay Abraham I wrote:
> Previously dbi accessors can be used to access data of size 4
> bytes. But there might be situations (like accessing
> MSI_MESSAGE_CONTROL in order to set/get the number of required
> MSI interrupts in EP mode) where dbi accessors must
> be used to access data of size 2. This is in preparation for
> adding endpoint mode support to designware driver.
Hello Kishon
I don't really like the idea of adding an extra argument to every existing read/write.
Will not a read/write of length != 32 be quite uncommon compared to
a read/write of length == 32?
How about adding some defines to pcie-designware.h:
#define dw_pcie_writel_dbi(pci, base, reg, val) dw_pcie_write_dbi(pci, base, reg, 0x4, val)
#define dw_pcie_readl_dbi(pci, base, reg) dw_pcie_read_dbi(pci, base, reg, 0x4)
That way we don't have to change every existing read/write.
Is there a reason why we can't just do:
val = dw_pcie_readl_dbi(pci, base, MSI_MESSAGE_CONTROL);
<shifting+masking the bits we need to get/set>
dw_pcie_writel_dbi(pci, base, MSI_MESSAGE_CONTROL, val);
Or are we going to be doing read/writes of length != 32 so often that
you think that it's cleaner to have this abstraction?
>
> Cc: Jingoo Han <jingoohan1@...il.com>
> Cc: Richard Zhu <hongxing.zhu@....com>
> Cc: Lucas Stach <l.stach@...gutronix.de>
> Cc: Murali Karicheri <m-karicheri2@...com>
> Cc: Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>
> Cc: Niklas Cassel <niklas.cassel@...s.com>
> Cc: Jesper Nilsson <jesper.nilsson@...s.com>
> Cc: Joao Pinto <Joao.Pinto@...opsys.com>
> Cc: Zhou Wang <wangzhou1@...ilicon.com>
> Cc: Gabriele Paoloni <gabriele.paoloni@...wei.com>
> Signed-off-by: Kishon Vijay Abraham I <kishon@...com>
> ---
> drivers/pci/dwc/pci-dra7xx.c | 8 ++--
> drivers/pci/dwc/pci-exynos.c | 16 +++----
> drivers/pci/dwc/pci-imx6.c | 54 +++++++++++-----------
> drivers/pci/dwc/pci-keystone-dw.c | 13 +++---
> drivers/pci/dwc/pcie-armada8k.c | 38 ++++++++--------
> drivers/pci/dwc/pcie-artpec6.c | 6 +--
> drivers/pci/dwc/pcie-designware-host.c | 18 ++++----
> drivers/pci/dwc/pcie-designware.c | 77 +++++++++++++++++++-------------
> drivers/pci/dwc/pcie-designware.h | 14 +++---
> drivers/pci/dwc/pcie-hisi.c | 14 +++---
> 10 files changed, 138 insertions(+), 120 deletions(-)
>
> diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c
> index 3708bd6..c6fef0a 100644
> --- a/drivers/pci/dwc/pci-dra7xx.c
> +++ b/drivers/pci/dwc/pci-dra7xx.c
> @@ -499,9 +499,9 @@ static int dra7xx_pcie_suspend(struct device *dev)
> u32 val;
>
> /* clear MSE */
> - val = dw_pcie_readl_dbi(pci, base, PCI_COMMAND);
> + val = dw_pcie_read_dbi(pci, base, PCI_COMMAND, 0x4);
> val &= ~PCI_COMMAND_MEMORY;
> - dw_pcie_writel_dbi(pci, base, PCI_COMMAND, val);
> + dw_pcie_write_dbi(pci, base, PCI_COMMAND, 0x4, val);
>
> return 0;
> }
> @@ -514,9 +514,9 @@ static int dra7xx_pcie_resume(struct device *dev)
> u32 val;
>
> /* set MSE */
> - val = dw_pcie_readl_dbi(pci, base, PCI_COMMAND);
> + val = dw_pcie_read_dbi(pci, base, PCI_COMMAND, 0x4);
> val |= PCI_COMMAND_MEMORY;
> - dw_pcie_writel_dbi(pci, base, PCI_COMMAND, val);
> + dw_pcie_write_dbi(pci, base, PCI_COMMAND, 0x4, val);
>
> return 0;
> }
> diff --git a/drivers/pci/dwc/pci-exynos.c b/drivers/pci/dwc/pci-exynos.c
> index a0d40f7..37d6d2b 100644
> --- a/drivers/pci/dwc/pci-exynos.c
> +++ b/drivers/pci/dwc/pci-exynos.c
> @@ -521,25 +521,25 @@ static void exynos_pcie_enable_interrupts(struct exynos_pcie *ep)
> exynos_pcie_msi_init(ep);
> }
>
> -static u32 exynos_pcie_readl_dbi(struct dw_pcie *pci, void __iomem *base,
> - u32 reg)
> +static u32 exynos_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base,
> + u32 reg, size_t size)
> {
> struct exynos_pcie *ep = to_exynos_pcie(pci);
> u32 val;
>
> exynos_pcie_sideband_dbi_r_mode(ep, true);
> - val = readl(base + reg);
> + dw_pcie_read(base + reg, size, &val);
> exynos_pcie_sideband_dbi_r_mode(ep, false);
> return val;
> }
>
> -static void exynos_pcie_writel_dbi(struct dw_pcie *pci, void __iomem *base,
> - u32 reg, u32 val)
> +static void exynos_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base,
> + u32 reg, size_t size, u32 val)
> {
> struct exynos_pcie *ep = to_exynos_pcie(pci);
>
> exynos_pcie_sideband_dbi_w_mode(ep, true);
> - writel(val, base + reg);
> + dw_pcie_write(base + reg, size, val);
> exynos_pcie_sideband_dbi_w_mode(ep, false);
> }
>
> @@ -646,8 +646,8 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep,
> }
>
> static const struct dw_pcie_ops dw_pcie_ops = {
> - .readl_dbi = exynos_pcie_readl_dbi,
> - .writel_dbi = exynos_pcie_writel_dbi,
> + .read_dbi = exynos_pcie_read_dbi,
> + .write_dbi = exynos_pcie_write_dbi,
> .link_up = exynos_pcie_link_up,
> };
>
> diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c
> index 85dd901..e58ca7a 100644
> --- a/drivers/pci/dwc/pci-imx6.c
> +++ b/drivers/pci/dwc/pci-imx6.c
> @@ -104,7 +104,7 @@ static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, int exp_val)
> u32 wait_counter = 0;
>
> do {
> - val = dw_pcie_readl_dbi(pci, base, PCIE_PHY_STAT);
> + val = dw_pcie_read_dbi(pci, base, PCIE_PHY_STAT, 0x4);
> val = (val >> PCIE_PHY_STAT_ACK_LOC) & 0x1;
> wait_counter++;
>
> @@ -125,17 +125,17 @@ static int pcie_phy_wait_ack(struct imx6_pcie *imx6_pcie, int addr)
> int ret;
>
> val = addr << PCIE_PHY_CTRL_DATA_LOC;
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, val);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, val);
>
> val |= (0x1 << PCIE_PHY_CTRL_CAP_ADR_LOC);
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, val);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, val);
>
> ret = pcie_phy_poll_ack(imx6_pcie, 1);
> if (ret)
> return ret;
>
> val = addr << PCIE_PHY_CTRL_DATA_LOC;
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, val);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, val);
>
> return pcie_phy_poll_ack(imx6_pcie, 0);
> }
> @@ -154,17 +154,17 @@ static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, int *data)
>
> /* assert Read signal */
> phy_ctl = 0x1 << PCIE_PHY_CTRL_RD_LOC;
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, phy_ctl);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, phy_ctl);
>
> ret = pcie_phy_poll_ack(imx6_pcie, 1);
> if (ret)
> return ret;
>
> - val = dw_pcie_readl_dbi(pci, base, PCIE_PHY_STAT);
> + val = dw_pcie_read_dbi(pci, base, PCIE_PHY_STAT, 0x4);
> *data = val & 0xffff;
>
> /* deassert Read signal */
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, 0x00);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, 0x00);
>
> return pcie_phy_poll_ack(imx6_pcie, 0);
> }
> @@ -183,11 +183,11 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
> return ret;
>
> var = data << PCIE_PHY_CTRL_DATA_LOC;
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, var);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, var);
>
> /* capture data */
> var |= (0x1 << PCIE_PHY_CTRL_CAP_DAT_LOC);
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, var);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, var);
>
> ret = pcie_phy_poll_ack(imx6_pcie, 1);
> if (ret)
> @@ -195,7 +195,7 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
>
> /* deassert cap data */
> var = data << PCIE_PHY_CTRL_DATA_LOC;
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, var);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, var);
>
> /* wait for ack de-assertion */
> ret = pcie_phy_poll_ack(imx6_pcie, 0);
> @@ -204,7 +204,7 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
>
> /* assert wr signal */
> var = 0x1 << PCIE_PHY_CTRL_WR_LOC;
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, var);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, var);
>
> /* wait for ack */
> ret = pcie_phy_poll_ack(imx6_pcie, 1);
> @@ -213,14 +213,14 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
>
> /* deassert wr signal */
> var = data << PCIE_PHY_CTRL_DATA_LOC;
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, var);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, var);
>
> /* wait for ack de-assertion */
> ret = pcie_phy_poll_ack(imx6_pcie, 0);
> if (ret)
> return ret;
>
> - dw_pcie_writel_dbi(pci, base, PCIE_PHY_CTRL, 0x0);
> + dw_pcie_write_dbi(pci, base, PCIE_PHY_CTRL, 0x4, 0x0);
>
> return 0;
> }
> @@ -423,8 +423,8 @@ static int imx6_pcie_wait_for_link(struct imx6_pcie *imx6_pcie)
> return 0;
>
> dev_dbg(dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
> - dw_pcie_readl_dbi(pci, base, PCIE_PHY_DEBUG_R0),
> - dw_pcie_readl_dbi(pci, base, PCIE_PHY_DEBUG_R1));
> + dw_pcie_read_dbi(pci, base, PCIE_PHY_DEBUG_R0, 0x4),
> + dw_pcie_read_dbi(pci, base, PCIE_PHY_DEBUG_R1, 0x4));
> return -ETIMEDOUT;
> }
>
> @@ -437,8 +437,8 @@ static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie)
> unsigned int retries;
>
> for (retries = 0; retries < 200; retries++) {
> - tmp = dw_pcie_readl_dbi(pci, base,
> - PCIE_LINK_WIDTH_SPEED_CONTROL);
> + tmp = dw_pcie_read_dbi(pci, base,
> + PCIE_LINK_WIDTH_SPEED_CONTROL, 0x4);
> /* Test if the speed change finished. */
> if (!(tmp & PORT_LOGIC_SPEED_CHANGE))
> return 0;
> @@ -471,10 +471,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
> * started in Gen2 mode, there is a possibility the devices on the
> * bus will not be detected at all. This happens with PCIe switches.
> */
> - tmp = dw_pcie_readl_dbi(pci, base, PCIE_RC_LCR);
> + tmp = dw_pcie_read_dbi(pci, base, PCIE_RC_LCR, 0x4);
> tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK;
> tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN1;
> - dw_pcie_writel_dbi(pci, base, PCIE_RC_LCR, tmp);
> + dw_pcie_write_dbi(pci, base, PCIE_RC_LCR, 0x4, tmp);
>
> /* Start LTSSM. */
> regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
> @@ -486,10 +486,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
>
> if (imx6_pcie->link_gen == 2) {
> /* Allow Gen2 mode after the link is up. */
> - tmp = dw_pcie_readl_dbi(pci, base, PCIE_RC_LCR);
> + tmp = dw_pcie_read_dbi(pci, base, PCIE_RC_LCR, 0x4);
> tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK;
> tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2;
> - dw_pcie_writel_dbi(pci, base, PCIE_RC_LCR, tmp);
> + dw_pcie_write_dbi(pci, base, PCIE_RC_LCR, 0x4, tmp);
> } else {
> dev_info(dev, "Link: Gen2 disabled\n");
> }
> @@ -498,9 +498,9 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
> * Start Directed Speed Change so the best possible speed both link
> * partners support can be negotiated.
> */
> - tmp = dw_pcie_readl_dbi(pci, base, PCIE_LINK_WIDTH_SPEED_CONTROL);
> + tmp = dw_pcie_read_dbi(pci, base, PCIE_LINK_WIDTH_SPEED_CONTROL, 0x4);
> tmp |= PORT_LOGIC_SPEED_CHANGE;
> - dw_pcie_writel_dbi(pci, base, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp);
> + dw_pcie_write_dbi(pci, base, PCIE_LINK_WIDTH_SPEED_CONTROL, 0x4, tmp);
>
> ret = imx6_pcie_wait_for_speed_change(imx6_pcie);
> if (ret) {
> @@ -515,14 +515,14 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
> goto err_reset_phy;
> }
>
> - tmp = dw_pcie_readl_dbi(pci, base, PCIE_RC_LCSR);
> + tmp = dw_pcie_read_dbi(pci, base, PCIE_RC_LCSR, 0x4);
> dev_info(dev, "Link up, Gen%i\n", (tmp >> 16) & 0xf);
> return 0;
>
> err_reset_phy:
> dev_dbg(dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n",
> - dw_pcie_readl_dbi(pci, base, PCIE_PHY_DEBUG_R0),
> - dw_pcie_readl_dbi(pci, base, PCIE_PHY_DEBUG_R1));
> + dw_pcie_read_dbi(pci, base, PCIE_PHY_DEBUG_R0, 0x4),
> + dw_pcie_read_dbi(pci, base, PCIE_PHY_DEBUG_R1, 0x4));
> imx6_pcie_reset_phy(imx6_pcie);
> return ret;
> }
> @@ -546,7 +546,7 @@ static int imx6_pcie_link_up(struct dw_pcie *pci)
> {
> void __iomem *base = pci->dbi_base;
>
> - return dw_pcie_readl_dbi(pci, base, PCIE_PHY_DEBUG_R1) &
> + return dw_pcie_read_dbi(pci, base, PCIE_PHY_DEBUG_R1, 0x4) &
> PCIE_PHY_DEBUG_R1_XMLH_LINK_UP;
> }
>
> diff --git a/drivers/pci/dwc/pci-keystone-dw.c b/drivers/pci/dwc/pci-keystone-dw.c
> index 7220c04..8318efe 100644
> --- a/drivers/pci/dwc/pci-keystone-dw.c
> +++ b/drivers/pci/dwc/pci-keystone-dw.c
> @@ -386,8 +386,8 @@ void ks_dw_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)
>
> /* Disable BARs for inbound access */
> ks_dw_pcie_set_dbi_mode(ks_pcie);
> - dw_pcie_writel_dbi(pci, base, PCI_BASE_ADDRESS_0, 0);
> - dw_pcie_writel_dbi(pci, base, PCI_BASE_ADDRESS_1, 0);
> + dw_pcie_write_dbi(pci, base, PCI_BASE_ADDRESS_0, 0x4, 0);
> + dw_pcie_write_dbi(pci, base, PCI_BASE_ADDRESS_1, 0x4, 0);
> ks_dw_pcie_clear_dbi_mode(ks_pcie);
>
> /* Set outbound translation size per window division */
> @@ -490,8 +490,8 @@ void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp)
> ks_dw_pcie_set_dbi_mode(ks_pcie);
>
> /* Enable BAR0 */
> - dw_pcie_writel_dbi(pci, base, PCI_BASE_ADDRESS_0, 1);
> - dw_pcie_writel_dbi(pci, base, PCI_BASE_ADDRESS_0, SZ_4K - 1);
> + dw_pcie_write_dbi(pci, base, PCI_BASE_ADDRESS_0, 0x4, 1);
> + dw_pcie_write_dbi(pci, base, PCI_BASE_ADDRESS_0, 0x4, SZ_4K - 1);
>
> ks_dw_pcie_clear_dbi_mode(ks_pcie);
>
> @@ -499,7 +499,8 @@ void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp)
> * For BAR0, just setting bus address for inbound writes (MSI) should
> * be sufficient. Use physical address to avoid any conflicts.
> */
> - dw_pcie_writel_dbi(pci, base, PCI_BASE_ADDRESS_0, ks_pcie->app.start);
> + dw_pcie_write_dbi(pci, base, PCI_BASE_ADDRESS_0, 0x4,
> + ks_pcie->app.start);
> }
>
> /**
> @@ -510,7 +511,7 @@ int ks_dw_pcie_link_up(struct dw_pcie *pci)
> u32 val;
> void __iomem *base = pci->dbi_base;
>
> - val = dw_pcie_readl_dbi(pci, base, DEBUG0);
> + val = dw_pcie_read_dbi(pci, base, DEBUG0, 0x4);
> return (val & LTSSM_STATE_MASK) == LTSSM_STATE_L0;
> }
>
> diff --git a/drivers/pci/dwc/pcie-armada8k.c b/drivers/pci/dwc/pcie-armada8k.c
> index b2328df..447d178 100644
> --- a/drivers/pci/dwc/pcie-armada8k.c
> +++ b/drivers/pci/dwc/pcie-armada8k.c
> @@ -75,7 +75,7 @@ static int armada8k_pcie_link_up(struct dw_pcie *pci)
> u32 mask = PCIE_GLB_STS_RDLH_LINK_UP | PCIE_GLB_STS_PHY_LINK_UP;
> void __iomem *base = pci->dbi_base;
>
> - reg = dw_pcie_readl_dbi(pci, base, PCIE_GLOBAL_STATUS_REG);
> + reg = dw_pcie_read_dbi(pci, base, PCIE_GLOBAL_STATUS_REG, 0x4);
>
> if ((reg & mask) == mask)
> return 1;
> @@ -92,45 +92,45 @@ static void armada8k_pcie_establish_link(struct armada8k_pcie *pcie)
>
> if (!dw_pcie_link_up(pci)) {
> /* Disable LTSSM state machine to enable configuration */
> - reg = dw_pcie_readl_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG);
> + reg = dw_pcie_read_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, 0x4);
> reg &= ~(PCIE_APP_LTSSM_EN);
> - dw_pcie_writel_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, reg);
> + dw_pcie_write_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, 0x4, reg);
> }
>
> /* Set the device to root complex mode */
> - reg = dw_pcie_readl_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG);
> + reg = dw_pcie_read_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, 0x4);
> reg &= ~(PCIE_DEVICE_TYPE_MASK << PCIE_DEVICE_TYPE_SHIFT);
> reg |= PCIE_DEVICE_TYPE_RC << PCIE_DEVICE_TYPE_SHIFT;
> - dw_pcie_writel_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, reg);
> + dw_pcie_write_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, 0x4, reg);
>
> /* Set the PCIe master AxCache attributes */
> - dw_pcie_writel_dbi(pci, base, PCIE_ARCACHE_TRC_REG,
> - ARCACHE_DEFAULT_VALUE);
> - dw_pcie_writel_dbi(pci, base, PCIE_AWCACHE_TRC_REG,
> - AWCACHE_DEFAULT_VALUE);
> + dw_pcie_write_dbi(pci, base, PCIE_ARCACHE_TRC_REG, 0x4,
> + ARCACHE_DEFAULT_VALUE);
> + dw_pcie_write_dbi(pci, base, PCIE_AWCACHE_TRC_REG, 0x4,
> + AWCACHE_DEFAULT_VALUE);
>
> /* Set the PCIe master AxDomain attributes */
> - reg = dw_pcie_readl_dbi(pci, base, PCIE_ARUSER_REG);
> + reg = dw_pcie_read_dbi(pci, base, PCIE_ARUSER_REG, 0x4);
> reg &= ~(AX_USER_DOMAIN_MASK << AX_USER_DOMAIN_SHIFT);
> reg |= DOMAIN_OUTER_SHAREABLE << AX_USER_DOMAIN_SHIFT;
> - dw_pcie_writel_dbi(pci, base, PCIE_ARUSER_REG, reg);
> + dw_pcie_write_dbi(pci, base, PCIE_ARUSER_REG, 0x4, reg);
>
> - reg = dw_pcie_readl_dbi(pci, base, PCIE_AWUSER_REG);
> + reg = dw_pcie_read_dbi(pci, base, PCIE_AWUSER_REG, 0x4);
> reg &= ~(AX_USER_DOMAIN_MASK << AX_USER_DOMAIN_SHIFT);
> reg |= DOMAIN_OUTER_SHAREABLE << AX_USER_DOMAIN_SHIFT;
> - dw_pcie_writel_dbi(pci, base, PCIE_AWUSER_REG, reg);
> + dw_pcie_write_dbi(pci, base, PCIE_AWUSER_REG, 0x4, reg);
>
> /* Enable INT A-D interrupts */
> - reg = dw_pcie_readl_dbi(pci, base, PCIE_GLOBAL_INT_MASK1_REG);
> + reg = dw_pcie_read_dbi(pci, base, PCIE_GLOBAL_INT_MASK1_REG, 0x4);
> reg |= PCIE_INT_A_ASSERT_MASK | PCIE_INT_B_ASSERT_MASK |
> PCIE_INT_C_ASSERT_MASK | PCIE_INT_D_ASSERT_MASK;
> - dw_pcie_writel_dbi(pci, base, PCIE_GLOBAL_INT_MASK1_REG, reg);
> + dw_pcie_write_dbi(pci, base, PCIE_GLOBAL_INT_MASK1_REG, 0x4, reg);
>
> if (!dw_pcie_link_up(pci)) {
> /* Configuration done. Start LTSSM */
> - reg = dw_pcie_readl_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG);
> + reg = dw_pcie_read_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, 0x4);
> reg |= PCIE_APP_LTSSM_EN;
> - dw_pcie_writel_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, reg);
> + dw_pcie_write_dbi(pci, base, PCIE_GLOBAL_CONTROL_REG, 0x4, reg);
> }
>
> /* Wait until the link becomes active again */
> @@ -159,8 +159,8 @@ static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg)
> * PCI device. However, they are also latched into the PCIe
> * controller, so we simply discard them.
> */
> - val = dw_pcie_readl_dbi(pci, base, PCIE_GLOBAL_INT_CAUSE1_REG);
> - dw_pcie_writel_dbi(pci, base, PCIE_GLOBAL_INT_CAUSE1_REG, val);
> + val = dw_pcie_read_dbi(pci, base, PCIE_GLOBAL_INT_CAUSE1_REG, 0x4);
> + dw_pcie_write_dbi(pci, base, PCIE_GLOBAL_INT_CAUSE1_REG, 0x4, val);
>
> return IRQ_HANDLED;
> }
> diff --git a/drivers/pci/dwc/pcie-artpec6.c b/drivers/pci/dwc/pcie-artpec6.c
> index e3ba11c..0829de4 100644
> --- a/drivers/pci/dwc/pcie-artpec6.c
> +++ b/drivers/pci/dwc/pcie-artpec6.c
> @@ -146,7 +146,7 @@ static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie)
> * Enable writing to config regs. This is required as the Synopsys
> * driver changes the class code. That register needs DBI write enable.
> */
> - dw_pcie_writel_dbi(pci, base, MISC_CONTROL_1_OFF, DBI_RO_WR_EN);
> + dw_pcie_write_dbi(pci, base, MISC_CONTROL_1_OFF, 0x4, DBI_RO_WR_EN);
>
> /* setup root complex */
> dw_pcie_setup_rc(pp);
> @@ -161,8 +161,8 @@ static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie)
> return 0;
>
> dev_dbg(pci->dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
> - dw_pcie_readl_dbi(pci, base, PCIE_PHY_DEBUG_R0),
> - dw_pcie_readl_dbi(pci, base, PCIE_PHY_DEBUG_R1));
> + dw_pcie_read_dbi(pci, base, PCIE_PHY_DEBUG_R0, 0x4),
> + dw_pcie_read_dbi(pci, base, PCIE_PHY_DEBUG_R1, 0x4));
>
> return -ETIMEDOUT;
> }
> diff --git a/drivers/pci/dwc/pcie-designware-host.c b/drivers/pci/dwc/pcie-designware-host.c
> index 9df620d..3150d33 100644
> --- a/drivers/pci/dwc/pcie-designware-host.c
> +++ b/drivers/pci/dwc/pcie-designware-host.c
> @@ -568,7 +568,7 @@ static u8 dw_pcie_iatu_unroll_enabled(struct dw_pcie *pci)
> u32 val;
> void __iomem *base = pci->dbi_base;
>
> - val = dw_pcie_readl_dbi(pci, base, PCIE_ATU_VIEWPORT);
> + val = dw_pcie_read_dbi(pci, base, PCIE_ATU_VIEWPORT, 0x4);
> if (val == 0xffffffff)
> return 1;
>
> @@ -584,27 +584,27 @@ void dw_pcie_setup_rc(struct pcie_port *pp)
> dw_pcie_setup(pci);
>
> /* setup RC BARs */
> - dw_pcie_writel_dbi(pci, base, PCI_BASE_ADDRESS_0, 0x00000004);
> - dw_pcie_writel_dbi(pci, base, PCI_BASE_ADDRESS_1, 0x00000000);
> + dw_pcie_write_dbi(pci, base, PCI_BASE_ADDRESS_0, 0x4, 0x00000004);
> + dw_pcie_write_dbi(pci, base, PCI_BASE_ADDRESS_1, 0x4, 0x00000000);
>
> /* setup interrupt pins */
> - val = dw_pcie_readl_dbi(pci, base, PCI_INTERRUPT_LINE);
> + val = dw_pcie_read_dbi(pci, base, PCI_INTERRUPT_LINE, 0x4);
> val &= 0xffff00ff;
> val |= 0x00000100;
> - dw_pcie_writel_dbi(pci, base, PCI_INTERRUPT_LINE, val);
> + dw_pcie_write_dbi(pci, base, PCI_INTERRUPT_LINE, 0x4, val);
>
> /* setup bus numbers */
> - val = dw_pcie_readl_dbi(pci, base, PCI_PRIMARY_BUS);
> + val = dw_pcie_read_dbi(pci, base, PCI_PRIMARY_BUS, 0x4);
> val &= 0xff000000;
> val |= 0x00010100;
> - dw_pcie_writel_dbi(pci, base, PCI_PRIMARY_BUS, val);
> + dw_pcie_write_dbi(pci, base, PCI_PRIMARY_BUS, 0x4, val);
>
> /* setup command register */
> - val = dw_pcie_readl_dbi(pci, base, PCI_COMMAND);
> + val = dw_pcie_read_dbi(pci, base, PCI_COMMAND, 0x4);
> val &= 0xffff0000;
> val |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
> PCI_COMMAND_MASTER | PCI_COMMAND_SERR;
> - dw_pcie_writel_dbi(pci, base, PCI_COMMAND, val);
> + dw_pcie_write_dbi(pci, base, PCI_COMMAND, 0x4, val);
>
> /*
> * If the platform provides ->rd_other_conf, it means the platform
> diff --git a/drivers/pci/dwc/pcie-designware.c b/drivers/pci/dwc/pcie-designware.c
> index f8eaeea..557ee53 100644
> --- a/drivers/pci/dwc/pcie-designware.c
> +++ b/drivers/pci/dwc/pcie-designware.c
> @@ -61,21 +61,35 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val)
> return PCIBIOS_SUCCESSFUL;
> }
>
> -u32 dw_pcie_readl_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg)
> +u32 dw_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg,
> + size_t size)
> {
> - if (pci->ops->readl_dbi)
> - return pci->ops->readl_dbi(pci, base, reg);
> + int ret;
> + u32 val;
> +
> + if (pci->ops->read_dbi)
> + return pci->ops->read_dbi(pci, base, reg, size);
>
> - return readl(base + reg);
> + ret = dw_pcie_read(base + reg, size, &val);
> + if (ret)
> + dev_err(pci->dev, "read DBI address failed\n");
> +
> + return val;
> }
>
> -void dw_pcie_writel_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg,
> - u32 val)
> +void dw_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg,
> + size_t size, u32 val)
> {
> - if (pci->ops->writel_dbi)
> - pci->ops->writel_dbi(pci, base, reg, val);
> - else
> - writel(val, base + reg);
> + int ret;
> +
> + if (pci->ops->write_dbi) {
> + pci->ops->write_dbi(pci, base, reg, size, val);
> + return;
> + }
> +
> + ret = dw_pcie_write(base + reg, size, val);
> + if (ret)
> + dev_err(pci->dev, "write DBI address failed\n");
> }
>
> static u32 dw_pcie_readl_unroll(struct dw_pcie *pci, void __iomem *base,
> @@ -83,7 +97,7 @@ static u32 dw_pcie_readl_unroll(struct dw_pcie *pci, void __iomem *base,
> {
> u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
>
> - return dw_pcie_readl_dbi(pci, base, offset + reg);
> + return dw_pcie_read_dbi(pci, base, offset + reg, 0x4);
> }
>
> static void dw_pcie_writel_unroll(struct dw_pcie *pci, void __iomem *base,
> @@ -91,7 +105,7 @@ static void dw_pcie_writel_unroll(struct dw_pcie *pci, void __iomem *base,
> {
> u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
>
> - dw_pcie_writel_dbi(pci, base, offset + reg, val);
> + dw_pcie_write_dbi(pci, base, offset + reg, 0x4, val);
> }
>
> void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index, int type,
> @@ -123,20 +137,21 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index, int type,
> PCIE_ATU_UNR_REGION_CTRL2,
> PCIE_ATU_ENABLE);
> } else {
> - dw_pcie_writel_dbi(pci, base, PCIE_ATU_VIEWPORT,
> - PCIE_ATU_REGION_OUTBOUND | index);
> - dw_pcie_writel_dbi(pci, base, PCIE_ATU_LOWER_BASE,
> - lower_32_bits(cpu_addr));
> - dw_pcie_writel_dbi(pci, base, PCIE_ATU_UPPER_BASE,
> - upper_32_bits(cpu_addr));
> - dw_pcie_writel_dbi(pci, base, PCIE_ATU_LIMIT,
> - lower_32_bits(cpu_addr + size - 1));
> - dw_pcie_writel_dbi(pci, base, PCIE_ATU_LOWER_TARGET,
> - lower_32_bits(pci_addr));
> - dw_pcie_writel_dbi(pci, base, PCIE_ATU_UPPER_TARGET,
> - upper_32_bits(pci_addr));
> - dw_pcie_writel_dbi(pci, base, PCIE_ATU_CR1, type);
> - dw_pcie_writel_dbi(pci, base, PCIE_ATU_CR2, PCIE_ATU_ENABLE);
> + dw_pcie_write_dbi(pci, base, PCIE_ATU_VIEWPORT, 0x4,
> + PCIE_ATU_REGION_OUTBOUND | index);
> + dw_pcie_write_dbi(pci, base, PCIE_ATU_LOWER_BASE, 0x4,
> + lower_32_bits(cpu_addr));
> + dw_pcie_write_dbi(pci, base, PCIE_ATU_UPPER_BASE, 0x4,
> + upper_32_bits(cpu_addr));
> + dw_pcie_write_dbi(pci, base, PCIE_ATU_LIMIT, 0x4,
> + lower_32_bits(cpu_addr + size - 1));
> + dw_pcie_write_dbi(pci, base, PCIE_ATU_LOWER_TARGET, 0x4,
> + lower_32_bits(pci_addr));
> + dw_pcie_write_dbi(pci, base, PCIE_ATU_UPPER_TARGET, 0x4,
> + upper_32_bits(pci_addr));
> + dw_pcie_write_dbi(pci, base, PCIE_ATU_CR1, 0x4, type);
> + dw_pcie_write_dbi(pci, base, PCIE_ATU_CR2, 0x4,
> + PCIE_ATU_ENABLE);
> }
>
> /*
> @@ -148,7 +163,7 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index, int type,
> val = dw_pcie_readl_unroll(pci, base, index,
> PCIE_ATU_UNR_REGION_CTRL2);
> else
> - val = dw_pcie_readl_dbi(pci, base, PCIE_ATU_CR2);
> + val = dw_pcie_read_dbi(pci, base, PCIE_ATU_CR2, 0x4);
>
> if (val == PCIE_ATU_ENABLE)
> return;
> @@ -202,7 +217,7 @@ void dw_pcie_setup(struct dw_pcie *pci)
> lanes = 0;
>
> /* set the number of lanes */
> - val = dw_pcie_readl_dbi(pci, base, PCIE_PORT_LINK_CONTROL);
> + val = dw_pcie_read_dbi(pci, base, PCIE_PORT_LINK_CONTROL, 0x4);
> val &= ~PORT_LINK_MODE_MASK;
> switch (lanes) {
> case 1:
> @@ -221,10 +236,10 @@ void dw_pcie_setup(struct dw_pcie *pci)
> dev_err(pci->dev, "num-lanes %u: invalid value\n", lanes);
> return;
> }
> - dw_pcie_writel_dbi(pci, base, PCIE_PORT_LINK_CONTROL, val);
> + dw_pcie_write_dbi(pci, base, PCIE_PORT_LINK_CONTROL, 0x4, val);
>
> /* set link width speed control register */
> - val = dw_pcie_readl_dbi(pci, base, PCIE_LINK_WIDTH_SPEED_CONTROL);
> + val = dw_pcie_read_dbi(pci, base, PCIE_LINK_WIDTH_SPEED_CONTROL, 0x4);
> val &= ~PORT_LOGIC_LINK_WIDTH_MASK;
> switch (lanes) {
> case 1:
> @@ -240,5 +255,5 @@ void dw_pcie_setup(struct dw_pcie *pci)
> val |= PORT_LOGIC_LINK_WIDTH_8_LANES;
> break;
> }
> - dw_pcie_writel_dbi(pci, base, PCIE_LINK_WIDTH_SPEED_CONTROL, val);
> + dw_pcie_write_dbi(pci, base, PCIE_LINK_WIDTH_SPEED_CONTROL, 0x4, val);
> }
> diff --git a/drivers/pci/dwc/pcie-designware.h b/drivers/pci/dwc/pcie-designware.h
> index fe93f7f..74df063 100644
> --- a/drivers/pci/dwc/pcie-designware.h
> +++ b/drivers/pci/dwc/pcie-designware.h
> @@ -144,9 +144,10 @@ struct pcie_port {
>
> struct dw_pcie_ops {
> u64 (*cpu_addr_fixup)(u64 cpu_addr);
> - u32 (*readl_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg);
> - void (*writel_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg,
> - u32 val);
> + u32 (*read_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg,
> + size_t size);
> + void (*write_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg,
> + size_t size, u32 val);
> int (*link_up)(struct dw_pcie *pcie);
> };
>
> @@ -164,9 +165,10 @@ struct dw_pcie {
> int dw_pcie_read(void __iomem *addr, int size, u32 *val);
> int dw_pcie_write(void __iomem *addr, int size, u32 val);
>
> -u32 dw_pcie_readl_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg);
> -void dw_pcie_writel_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg,
> - u32 val);
> +u32 dw_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg,
> + size_t size);
> +void dw_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg,
> + size_t size, u32 val);
> int dw_pcie_link_up(struct dw_pcie *pci);
> int dw_pcie_wait_for_link(struct dw_pcie *pci);
> void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index,
> diff --git a/drivers/pci/dwc/pcie-hisi.c b/drivers/pci/dwc/pcie-hisi.c
> index 409b54b..cc04381 100644
> --- a/drivers/pci/dwc/pcie-hisi.c
> +++ b/drivers/pci/dwc/pcie-hisi.c
> @@ -156,7 +156,7 @@ static int hisi_pcie_cfg_read(struct pcie_port *pp, int where, int size,
>
> walker += (where & 0x3);
> reg = where & ~0x3;
> - reg_val = dw_pcie_readl_dbi(pci, base, reg);
> + reg_val = dw_pcie_read_dbi(pci, base, reg, 0x4);
>
> if (size == 1)
> *val = *(u8 __force *) walker;
> @@ -183,15 +183,15 @@ static int hisi_pcie_cfg_write(struct pcie_port *pp, int where, int size,
> walker += (where & 0x3);
> reg = where & ~0x3;
> if (size == 4)
> - dw_pcie_writel_dbi(pci, base, reg, val);
> + dw_pcie_write_dbi(pci, base, reg, 0x4, val);
> else if (size == 2) {
> - reg_val = dw_pcie_readl_dbi(pci, base, reg);
> + reg_val = dw_pcie_read_dbi(pci, base, reg, 0x4);
> *(u16 __force *) walker = val;
> - dw_pcie_writel_dbi(pci, base, reg, reg_val);
> + dw_pcie_write_dbi(pci, base, reg, 0x4, reg_val);
> } else if (size == 1) {
> - reg_val = dw_pcie_readl_dbi(pci, base, reg);
> + reg_val = dw_pcie_read_dbi(pci, base, reg, 0x4);
> *(u8 __force *) walker = val;
> - dw_pcie_writel_dbi(pci, base, reg, reg_val);
> + dw_pcie_write_dbi(pci, base, reg, 0x4, reg_val);
> } else
> return PCIBIOS_BAD_REGISTER_NUMBER;
>
> @@ -214,7 +214,7 @@ static int hisi_pcie_link_up_hip06(struct hisi_pcie *hisi_pcie)
> void __iomem *base = pci->dbi_base;
> u32 val;
>
> - val = dw_pcie_readl_dbi(pci, base, PCIE_SYS_STATE4);
> + val = dw_pcie_read_dbi(pci, base, PCIE_SYS_STATE4, 0x4);
>
> return ((val & PCIE_LTSSM_STATE_MASK) == PCIE_LTSSM_LINKUP_STATE);
> }
Powered by blists - more mailing lists