* linux-next: manual merge of the mvebu tree with the pci tree
@ 2013-08-14 6:18 Stephen Rothwell
2013-08-15 13:31 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2013-08-14 6:18 UTC (permalink / raw)
To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel
Cc: linux-next, linux-kernel, Thomas Petazzoni, Bjorn Helgaas,
Sebastian Hesselbarth
[-- Attachment #1: Type: text/plain, Size: 864 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
drivers/pci/host/Kconfig between commit 5477a33b51b7 ("PCI: mvebu: Make
Marvell PCIe driver depend on OF") from the pci tree and commit
31d896ade95d ("PCI: mvebu: add support for Marvell Dove SoCs") from the
mvebu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/pci/host/Kconfig
index e5ba4eb,492eec9..0000000
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -3,8 -3,7 +3,8 @@@ menu "PCI host controller drivers
config PCI_MVEBU
bool "Marvell EBU PCIe controller"
- depends on ARCH_MVEBU || ARCH_KIRKWOOD
+ depends on ARCH_MVEBU || ARCH_DOVE || ARCH_KIRKWOOD
+ depends on OF
config PCIE_DW
bool
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the mvebu tree with the pci tree
2013-08-14 6:18 linux-next: manual merge of the mvebu tree with the pci tree Stephen Rothwell
@ 2013-08-15 13:31 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2013-08-15 13:31 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jason Cooper, andrew, gregory.clement, linux-arm-kernel,
linux-next, linux-kernel, Bjorn Helgaas, Sebastian Hesselbarth
Dear Stephen Rothwell,
On Wed, 14 Aug 2013 16:18:40 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in
> drivers/pci/host/Kconfig between commit 5477a33b51b7 ("PCI: mvebu: Make
> Marvell PCIe driver depend on OF") from the pci tree and commit
> 31d896ade95d ("PCI: mvebu: add support for Marvell Dove SoCs") from the
> mvebu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Your fix seems correct to me.
Thanks,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the mvebu tree with the pci tree
2013-08-14 6:22 Stephen Rothwell
@ 2013-08-14 13:05 ` Jason Cooper
0 siblings, 0 replies; 4+ messages in thread
From: Jason Cooper @ 2013-08-14 13:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: andrew, gregory.clement, linux-arm-kernel, linux-next,
linux-kernel, Tushar Behera, Bjorn Helgaas,
Sebastian Hesselbarth
Stephen,
On Wed, Aug 14, 2013 at 04:22:33PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the mvebu tree got a conflict in
> drivers/pci/host/pci-mvebu.c between commit f48fbf9c7e89 ("PCI: mvebu:
> Convert to use devm_ioremap_resource") from the pci tree and commit
> 826727641b2a ("PCI: mvebu: move clock enable before register access")
> from the mvebu tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Just a heads up:
> diff --cc drivers/pci/host/pci-mvebu.c
> index ce1543a,88c6790..0000000
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@@ -725,12 -741,71 +741,71 @@@ static void __iomem *mvebu_pcie_map_reg
>
> ret = of_address_to_resource(np, 0, ®s);
> if (ret)
> - return NULL;
> + return ERR_PTR(ret);
>
> - return devm_request_and_ioremap(&pdev->dev, ®s);
> + return devm_ioremap_resource(&pdev->dev, ®s);
> }
>
> - static int __init mvebu_pcie_probe(struct platform_device *pdev)
> + #define DT_FLAGS_TO_TYPE(flags) (((flags) >> 24) & 0x03)
> + #define DT_TYPE_IO 0x1
> + #define DT_TYPE_MEM32 0x2
> + #define DT_CPUADDR_TO_TARGET(cpuaddr) (((cpuaddr) >> 56) & 0xFF)
> + #define DT_CPUADDR_TO_ATTR(cpuaddr) (((cpuaddr) >> 48) & 0xFF)
> +
> + static int mvebu_get_tgt_attr(struct device_node *np, int devfn,
> + unsigned long type, int *tgt, int *attr)
> + {
> + const int na = 3, ns = 2;
> + const __be32 *range;
> + int rlen, nranges, rangesz, pna, i;
> +
> + range = of_get_property(np, "ranges", &rlen);
> + if (!range)
> + return -EINVAL;
> +
> + pna = of_n_addr_cells(np);
> + rangesz = pna + na + ns;
> + nranges = rlen / sizeof(__be32) / rangesz;
> +
> + for (i = 0; i < nranges; i++) {
> + u32 flags = of_read_number(range, 1);
> + u32 slot = of_read_number(range, 2);
> + u64 cpuaddr = of_read_number(range + na, pna);
> + unsigned long rtype;
> +
> + if (DT_FLAGS_TO_TYPE(flags) == DT_TYPE_IO)
> + rtype = IORESOURCE_IO;
> + else if (DT_FLAGS_TO_TYPE(flags) == DT_TYPE_MEM32)
> + rtype = IORESOURCE_MEM;
> +
> + if (slot == PCI_SLOT(devfn) && type == rtype) {
> + *tgt = DT_CPUADDR_TO_TARGET(cpuaddr);
> + *attr = DT_CPUADDR_TO_ATTR(cpuaddr);
> + return 0;
> + }
> +
> + range += rangesz;
> + }
> +
> + return -ENOENT;
> + }
> +
> + static void mvebu_pcie_msi_enable(struct mvebu_pcie *pcie)
> + {
> + struct device_node *msi_node;
> +
> + msi_node = of_parse_phandle(pcie->pdev->dev.of_node,
> + "msi-parent", 0);
> + if (!msi_node)
> + return;
> +
> + pcie->msi = of_pci_find_msi_chip_by_node(msi_node);
> +
> + if (pcie->msi)
> + pcie->msi->dev = &pcie->pdev->dev;
> + }
> +
> + static int mvebu_pcie_probe(struct platform_device *pdev)
> {
> struct mvebu_pcie *pcie;
> struct device_node *np = pdev->dev.of_node;
> @@@ -816,11 -888,62 +888,63 @@@
> if (port->devfn < 0)
> continue;
>
> + ret = mvebu_get_tgt_attr(np, port->devfn, IORESOURCE_MEM,
> + &port->mem_target, &port->mem_attr);
> + if (ret < 0) {
> + dev_err(&pdev->dev, "PCIe%d.%d: cannot get tgt/attr for mem window\n",
> + port->port, port->lane);
> + continue;
> + }
> +
> + ret = mvebu_get_tgt_attr(np, port->devfn, IORESOURCE_IO,
> + &port->io_target, &port->io_attr);
> + if (ret < 0) {
> + dev_err(&pdev->dev, "PCIe%d.%d: cannot get tgt/attr for io window\n",
> + port->port, port->lane);
> + continue;
> + }
> +
> + port->reset_gpio = of_get_named_gpio_flags(child,
> + "reset-gpios", 0, &flags);
> + if (gpio_is_valid(port->reset_gpio)) {
> + u32 reset_udelay = 20000;
> +
> + port->reset_active_low = flags & OF_GPIO_ACTIVE_LOW;
> + port->reset_name = kasprintf(GFP_KERNEL,
> + "pcie%d.%d-reset", port->port, port->lane);
> + of_property_read_u32(child, "reset-delay-us",
> + &reset_udelay);
> +
> + ret = devm_gpio_request_one(&pdev->dev,
> + port->reset_gpio, GPIOF_DIR_OUT, port->reset_name);
> + if (ret) {
> + if (ret == -EPROBE_DEFER)
> + return ret;
> + continue;
> + }
> +
> + gpio_set_value(port->reset_gpio,
> + (port->reset_active_low) ? 1 : 0);
> + udelay(reset_udelay);
This line changed to:
msleep(reset_udelay/1000);
no other changes and resolution should remain the same.
thx,
Jason.
> + }
> +
> + port->clk = of_clk_get_by_name(child, NULL);
> + if (IS_ERR(port->clk)) {
> + dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n",
> + port->port, port->lane);
> + continue;
> + }
> +
> + ret = clk_prepare_enable(port->clk);
> + if (ret)
> + continue;
> +
> port->base = mvebu_pcie_map_registers(pdev, child, port);
> - if (!port->base) {
> + if (IS_ERR(port->base)) {
> dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n",
> port->port, port->lane);
> + clk_disable_unprepare(port->clk);
> + port->base = NULL;
> continue;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the mvebu tree with the pci tree
@ 2013-08-14 6:22 Stephen Rothwell
2013-08-14 13:05 ` Jason Cooper
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2013-08-14 6:22 UTC (permalink / raw)
To: Jason Cooper, andrew, gregory.clement, linux-arm-kernel
Cc: linux-next, linux-kernel, Tushar Behera, Bjorn Helgaas,
Sebastian Hesselbarth
[-- Attachment #1: Type: text/plain, Size: 4754 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
drivers/pci/host/pci-mvebu.c between commit f48fbf9c7e89 ("PCI: mvebu:
Convert to use devm_ioremap_resource") from the pci tree and commit
826727641b2a ("PCI: mvebu: move clock enable before register access")
from the mvebu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/pci/host/pci-mvebu.c
index ce1543a,88c6790..0000000
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@@ -725,12 -741,71 +741,71 @@@ static void __iomem *mvebu_pcie_map_reg
ret = of_address_to_resource(np, 0, ®s);
if (ret)
- return NULL;
+ return ERR_PTR(ret);
- return devm_request_and_ioremap(&pdev->dev, ®s);
+ return devm_ioremap_resource(&pdev->dev, ®s);
}
- static int __init mvebu_pcie_probe(struct platform_device *pdev)
+ #define DT_FLAGS_TO_TYPE(flags) (((flags) >> 24) & 0x03)
+ #define DT_TYPE_IO 0x1
+ #define DT_TYPE_MEM32 0x2
+ #define DT_CPUADDR_TO_TARGET(cpuaddr) (((cpuaddr) >> 56) & 0xFF)
+ #define DT_CPUADDR_TO_ATTR(cpuaddr) (((cpuaddr) >> 48) & 0xFF)
+
+ static int mvebu_get_tgt_attr(struct device_node *np, int devfn,
+ unsigned long type, int *tgt, int *attr)
+ {
+ const int na = 3, ns = 2;
+ const __be32 *range;
+ int rlen, nranges, rangesz, pna, i;
+
+ range = of_get_property(np, "ranges", &rlen);
+ if (!range)
+ return -EINVAL;
+
+ pna = of_n_addr_cells(np);
+ rangesz = pna + na + ns;
+ nranges = rlen / sizeof(__be32) / rangesz;
+
+ for (i = 0; i < nranges; i++) {
+ u32 flags = of_read_number(range, 1);
+ u32 slot = of_read_number(range, 2);
+ u64 cpuaddr = of_read_number(range + na, pna);
+ unsigned long rtype;
+
+ if (DT_FLAGS_TO_TYPE(flags) == DT_TYPE_IO)
+ rtype = IORESOURCE_IO;
+ else if (DT_FLAGS_TO_TYPE(flags) == DT_TYPE_MEM32)
+ rtype = IORESOURCE_MEM;
+
+ if (slot == PCI_SLOT(devfn) && type == rtype) {
+ *tgt = DT_CPUADDR_TO_TARGET(cpuaddr);
+ *attr = DT_CPUADDR_TO_ATTR(cpuaddr);
+ return 0;
+ }
+
+ range += rangesz;
+ }
+
+ return -ENOENT;
+ }
+
+ static void mvebu_pcie_msi_enable(struct mvebu_pcie *pcie)
+ {
+ struct device_node *msi_node;
+
+ msi_node = of_parse_phandle(pcie->pdev->dev.of_node,
+ "msi-parent", 0);
+ if (!msi_node)
+ return;
+
+ pcie->msi = of_pci_find_msi_chip_by_node(msi_node);
+
+ if (pcie->msi)
+ pcie->msi->dev = &pcie->pdev->dev;
+ }
+
+ static int mvebu_pcie_probe(struct platform_device *pdev)
{
struct mvebu_pcie *pcie;
struct device_node *np = pdev->dev.of_node;
@@@ -816,11 -888,62 +888,63 @@@
if (port->devfn < 0)
continue;
+ ret = mvebu_get_tgt_attr(np, port->devfn, IORESOURCE_MEM,
+ &port->mem_target, &port->mem_attr);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "PCIe%d.%d: cannot get tgt/attr for mem window\n",
+ port->port, port->lane);
+ continue;
+ }
+
+ ret = mvebu_get_tgt_attr(np, port->devfn, IORESOURCE_IO,
+ &port->io_target, &port->io_attr);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "PCIe%d.%d: cannot get tgt/attr for io window\n",
+ port->port, port->lane);
+ continue;
+ }
+
+ port->reset_gpio = of_get_named_gpio_flags(child,
+ "reset-gpios", 0, &flags);
+ if (gpio_is_valid(port->reset_gpio)) {
+ u32 reset_udelay = 20000;
+
+ port->reset_active_low = flags & OF_GPIO_ACTIVE_LOW;
+ port->reset_name = kasprintf(GFP_KERNEL,
+ "pcie%d.%d-reset", port->port, port->lane);
+ of_property_read_u32(child, "reset-delay-us",
+ &reset_udelay);
+
+ ret = devm_gpio_request_one(&pdev->dev,
+ port->reset_gpio, GPIOF_DIR_OUT, port->reset_name);
+ if (ret) {
+ if (ret == -EPROBE_DEFER)
+ return ret;
+ continue;
+ }
+
+ gpio_set_value(port->reset_gpio,
+ (port->reset_active_low) ? 1 : 0);
+ udelay(reset_udelay);
+ }
+
+ port->clk = of_clk_get_by_name(child, NULL);
+ if (IS_ERR(port->clk)) {
+ dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n",
+ port->port, port->lane);
+ continue;
+ }
+
+ ret = clk_prepare_enable(port->clk);
+ if (ret)
+ continue;
+
port->base = mvebu_pcie_map_registers(pdev, child, port);
- if (!port->base) {
+ if (IS_ERR(port->base)) {
dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n",
port->port, port->lane);
+ clk_disable_unprepare(port->clk);
+ port->base = NULL;
continue;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-15 13:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-14 6:18 linux-next: manual merge of the mvebu tree with the pci tree Stephen Rothwell
2013-08-15 13:31 ` Thomas Petazzoni
2013-08-14 6:22 Stephen Rothwell
2013-08-14 13:05 ` Jason Cooper
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).