* [PATCH] pci: pci-mvebu: setup BAR0 to internal-regs
@ 2020-06-11 5:40 Shmuel Hazan
2020-06-16 19:52 ` Bjorn Helgaas
0 siblings, 1 reply; 2+ messages in thread
From: Shmuel Hazan @ 2020-06-11 5:40 UTC (permalink / raw)
To: Thomas Petazzoni, Jason Cooper
Cc: Marek Behún, Baruch Siach, Chris ackham, linux-pci,
linux-arm-kernel, Shmuel Hazan
According to the Armada XP datasheet, section 10.2.6: "in order for
the device todo a write to the MSI doorbell address, it needs to write
to a register in the internal registers" space".
As a result of the requirement above, without this patch, MSI won't
function and therefore some devices won't operate properly without
pci=nomsi.
Tested on an Armada 385 board with the following PCIe devices:
- Wilocity Wil6200 rev 2 (wil6210)
- Qualcomm Atheros QCA6174 (ath10k_pci)
Both failed to get a response from the device after loading the
firmware and seem to operate properly with this patch.
Signed-off-by: Shmuel Hazan <sh@tkos.co.il>
---
drivers/pci/controller/pci-mvebu.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
index 153a64676bc9..101c06602aa1 100644
--- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c
@@ -105,6 +105,7 @@ struct mvebu_pcie_port {
struct mvebu_pcie_window memwin;
struct mvebu_pcie_window iowin;
u32 saved_pcie_stat;
+ struct resource regs;
};
static inline void mvebu_writel(struct mvebu_pcie_port *port, u32 val, u32 reg)
@@ -149,7 +150,9 @@ static void mvebu_pcie_set_local_dev_nr(struct mvebu_pcie_port *port, int nr)
/*
* Setup PCIE BARs and Address Decode Wins:
- * BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
+ * BAR[0] -> internal registers (needed for MSI)
+ * BAR[1] -> covers all DRAM banks
+ * BAR[2] -> Disabled
* WIN[0-3] -> DRAM bank[0-3]
*/
static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
@@ -203,6 +206,12 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
mvebu_writel(port, 0, PCIE_BAR_HI_OFF(1));
mvebu_writel(port, ((size - 1) & 0xffff0000) | 1,
PCIE_BAR_CTRL_OFF(1));
+
+ /*
+ * Point BAR[0] to the device's internal registers.
+ */
+ mvebu_writel(port, round_down(port->regs.start, SZ_1M), PCIE_BAR_LO_OFF(0));
+ mvebu_writel(port, 0, PCIE_BAR_HI_OFF(0));
}
static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
@@ -708,14 +717,13 @@ static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev,
struct device_node *np,
struct mvebu_pcie_port *port)
{
- struct resource regs;
int ret = 0;
- ret = of_address_to_resource(np, 0, ®s);
+ ret = of_address_to_resource(np, 0, &port->regs);
if (ret)
return (void __iomem *)ERR_PTR(ret);
- return devm_ioremap_resource(&pdev->dev, ®s);
+ return devm_ioremap_resource(&pdev->dev, &port->regs);
}
#define DT_FLAGS_TO_TYPE(flags) (((flags) >> 24) & 0x03)
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pci: pci-mvebu: setup BAR0 to internal-regs
2020-06-11 5:40 [PATCH] pci: pci-mvebu: setup BAR0 to internal-regs Shmuel Hazan
@ 2020-06-16 19:52 ` Bjorn Helgaas
0 siblings, 0 replies; 2+ messages in thread
From: Bjorn Helgaas @ 2020-06-16 19:52 UTC (permalink / raw)
To: Shmuel Hazan
Cc: Thomas Petazzoni, Jason Cooper, Marek Behún, Baruch Siach,
Chris ackham, linux-pci, linux-arm-kernel
No comment on the patch itself, but "git log --oneline
drivers/pci/controller/pci-mvebu.c" tells you that your subject should
start with:
PCI: mvebu: Set ...
On Thu, Jun 11, 2020 at 08:40:42AM +0300, Shmuel Hazan wrote:
> According to the Armada XP datasheet, section 10.2.6: "in order for
> the device todo a write to the MSI doorbell address, it needs to write
> to a register in the internal registers" space".
s/todo/to do/
There are three " characters above; they need to come in pairs. If
they're nested, use ' for one pair.
> As a result of the requirement above, without this patch, MSI won't
> function and therefore some devices won't operate properly without
> pci=nomsi.
>
> Tested on an Armada 385 board with the following PCIe devices:
> - Wilocity Wil6200 rev 2 (wil6210)
> - Qualcomm Atheros QCA6174 (ath10k_pci)
>
> Both failed to get a response from the device after loading the
> firmware and seem to operate properly with this patch.
>
> Signed-off-by: Shmuel Hazan <sh@tkos.co.il>
> ---
> drivers/pci/controller/pci-mvebu.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
> index 153a64676bc9..101c06602aa1 100644
> --- a/drivers/pci/controller/pci-mvebu.c
> +++ b/drivers/pci/controller/pci-mvebu.c
> @@ -105,6 +105,7 @@ struct mvebu_pcie_port {
> struct mvebu_pcie_window memwin;
> struct mvebu_pcie_window iowin;
> u32 saved_pcie_stat;
> + struct resource regs;
> };
>
> static inline void mvebu_writel(struct mvebu_pcie_port *port, u32 val, u32 reg)
> @@ -149,7 +150,9 @@ static void mvebu_pcie_set_local_dev_nr(struct mvebu_pcie_port *port, int nr)
>
> /*
> * Setup PCIE BARs and Address Decode Wins:
> - * BAR[0,2] -> disabled, BAR[1] -> covers all DRAM banks
> + * BAR[0] -> internal registers (needed for MSI)
> + * BAR[1] -> covers all DRAM banks
> + * BAR[2] -> Disabled
> * WIN[0-3] -> DRAM bank[0-3]
> */
> static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> @@ -203,6 +206,12 @@ static void mvebu_pcie_setup_wins(struct mvebu_pcie_port *port)
> mvebu_writel(port, 0, PCIE_BAR_HI_OFF(1));
> mvebu_writel(port, ((size - 1) & 0xffff0000) | 1,
> PCIE_BAR_CTRL_OFF(1));
> +
> + /*
> + * Point BAR[0] to the device's internal registers.
> + */
> + mvebu_writel(port, round_down(port->regs.start, SZ_1M), PCIE_BAR_LO_OFF(0));
> + mvebu_writel(port, 0, PCIE_BAR_HI_OFF(0));
> }
>
> static void mvebu_pcie_setup_hw(struct mvebu_pcie_port *port)
> @@ -708,14 +717,13 @@ static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev,
> struct device_node *np,
> struct mvebu_pcie_port *port)
> {
> - struct resource regs;
> int ret = 0;
>
> - ret = of_address_to_resource(np, 0, ®s);
> + ret = of_address_to_resource(np, 0, &port->regs);
> if (ret)
> return (void __iomem *)ERR_PTR(ret);
>
> - return devm_ioremap_resource(&pdev->dev, ®s);
> + return devm_ioremap_resource(&pdev->dev, &port->regs);
> }
>
> #define DT_FLAGS_TO_TYPE(flags) (((flags) >> 24) & 0x03)
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-16 19:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-11 5:40 [PATCH] pci: pci-mvebu: setup BAR0 to internal-regs Shmuel Hazan
2020-06-16 19:52 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).