* [PATCH 1/3] pci: correct BAR size calculation
@ 2014-11-12 20:24 Lucas Stach
2014-11-12 20:24 ` [PATCH 2/3] pci: align bridge windows Lucas Stach
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Lucas Stach @ 2014-11-12 20:24 UTC (permalink / raw)
To: barebox
The previous math would return negative sizes
for some BARs.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
drivers/pci/pci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index ba9d097..87c2fca 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -154,7 +154,7 @@ static void setup_device(struct pci_dev *dev, int max_bar)
}
if (mask & 0x01) { /* IO */
- size = -(mask & 0xfffffffe);
+ size = ((~(mask & 0xfffffffe)) & 0xffff) + 1;
DBG(" PCI: pbar%d: mask=%08x io %d bytes\n", bar, mask, size);
if (last_io + size >
dev->bus->resource[PCI_BUS_RESOURCE_IO]->end) {
@@ -167,7 +167,7 @@ static void setup_device(struct pci_dev *dev, int max_bar)
last_io += size;
} else if ((mask & PCI_BASE_ADDRESS_MEM_PREFETCH) &&
last_mem_pref) /* prefetchable MEM */ {
- size = -(mask & 0xfffffff0);
+ size = (~(mask & 0xfffffff0)) + 1;
DBG(" PCI: pbar%d: mask=%08x P memory %d bytes\n",
bar, mask, size);
if (last_mem_pref + size >
@@ -181,7 +181,7 @@ static void setup_device(struct pci_dev *dev, int max_bar)
last_addr = last_mem_pref;
last_mem_pref += size;
} else { /* non-prefetch MEM */
- size = -(mask & 0xfffffff0);
+ size = (~(mask & 0xfffffff0)) + 1;
DBG(" PCI: pbar%d: mask=%08x NP memory %d bytes\n",
bar, mask, size);
if (last_mem + size >
--
1.9.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/3] pci: align bridge windows
2014-11-12 20:24 [PATCH 1/3] pci: correct BAR size calculation Lucas Stach
@ 2014-11-12 20:24 ` Lucas Stach
2014-11-12 20:24 ` [PATCH 3/3] pci: tegra: relax link-up timeout Lucas Stach
2014-11-17 7:36 ` [PATCH 1/3] pci: correct BAR size calculation Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2014-11-12 20:24 UTC (permalink / raw)
To: barebox
The bridge filtering logic needs a minimum
alignment of 1MB for mem and 4KB for io resources.
Take this into account while assigning resources
to devices in oredr to not produce overlapping
windows between different bridges.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
drivers/pci/pci.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 87c2fca..7f8ebcf 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1,4 +1,5 @@
#include <common.h>
+#include <sizes.h>
#include <linux/pci.h>
#ifdef DEBUG
@@ -259,14 +260,17 @@ static void postscan_setup_bridge(struct pci_dev *dev)
pci_write_config_byte(dev, PCI_SUBORDINATE_BUS, bus_index - 1);
if (last_mem)
+ last_mem = ALIGN(last_mem, SZ_1M);
pci_write_config_word(dev, PCI_MEMORY_LIMIT,
((last_mem - 1) & 0xfff00000) >> 16);
if (last_mem_pref)
+ last_mem_pref = ALIGN(last_mem_pref, SZ_1M);
pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT,
((last_mem_pref - 1) & 0xfff00000) >> 16);
if (last_io) {
+ last_io = ALIGN(last_io, SZ_4K);
pci_write_config_byte(dev, PCI_IO_LIMIT,
((last_io - 1) & 0x0000f000) >> 8);
pci_write_config_word(dev, PCI_IO_LIMIT_UPPER16,
--
1.9.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] pci: tegra: relax link-up timeout
2014-11-12 20:24 [PATCH 1/3] pci: correct BAR size calculation Lucas Stach
2014-11-12 20:24 ` [PATCH 2/3] pci: align bridge windows Lucas Stach
@ 2014-11-12 20:24 ` Lucas Stach
2014-11-17 7:36 ` [PATCH 1/3] pci: correct BAR size calculation Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Lucas Stach @ 2014-11-12 20:24 UTC (permalink / raw)
To: barebox
Some devices need a considerable amount of time
from reset deassertion until they are ready to
establish a link. Relaxing the link-up timeout
helps to detect them more reliable.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
drivers/pci/pci-tegra.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c
index f2ade77..1ff3c0d 100644
--- a/drivers/pci/pci-tegra.c
+++ b/drivers/pci/pci-tegra.c
@@ -1145,7 +1145,7 @@ static bool tegra_pcie_port_check_link(struct tegra_pcie_port *port)
writel(value, port->base + RP_PRIV_MISC);
do {
- timeout = wait_on_timeout(50 * MSECOND,
+ timeout = wait_on_timeout(150 * MSECOND,
readl(port->regs.start + RP_VEND_XP) & RP_VEND_XP_DL_UP);
if (timeout) {
--
1.9.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] pci: correct BAR size calculation
2014-11-12 20:24 [PATCH 1/3] pci: correct BAR size calculation Lucas Stach
2014-11-12 20:24 ` [PATCH 2/3] pci: align bridge windows Lucas Stach
2014-11-12 20:24 ` [PATCH 3/3] pci: tegra: relax link-up timeout Lucas Stach
@ 2014-11-17 7:36 ` Sascha Hauer
2 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2014-11-17 7:36 UTC (permalink / raw)
To: Lucas Stach; +Cc: barebox
On Wed, Nov 12, 2014 at 09:24:35PM +0100, Lucas Stach wrote:
> The previous math would return negative sizes
> for some BARs.
>
> Signed-off-by: Lucas Stach <dev@lynxeye.de>
Applied all, thanks
Sascha
> ---
> drivers/pci/pci.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index ba9d097..87c2fca 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -154,7 +154,7 @@ static void setup_device(struct pci_dev *dev, int max_bar)
> }
>
> if (mask & 0x01) { /* IO */
> - size = -(mask & 0xfffffffe);
> + size = ((~(mask & 0xfffffffe)) & 0xffff) + 1;
> DBG(" PCI: pbar%d: mask=%08x io %d bytes\n", bar, mask, size);
> if (last_io + size >
> dev->bus->resource[PCI_BUS_RESOURCE_IO]->end) {
> @@ -167,7 +167,7 @@ static void setup_device(struct pci_dev *dev, int max_bar)
> last_io += size;
> } else if ((mask & PCI_BASE_ADDRESS_MEM_PREFETCH) &&
> last_mem_pref) /* prefetchable MEM */ {
> - size = -(mask & 0xfffffff0);
> + size = (~(mask & 0xfffffff0)) + 1;
> DBG(" PCI: pbar%d: mask=%08x P memory %d bytes\n",
> bar, mask, size);
> if (last_mem_pref + size >
> @@ -181,7 +181,7 @@ static void setup_device(struct pci_dev *dev, int max_bar)
> last_addr = last_mem_pref;
> last_mem_pref += size;
> } else { /* non-prefetch MEM */
> - size = -(mask & 0xfffffff0);
> + size = (~(mask & 0xfffffff0)) + 1;
> DBG(" PCI: pbar%d: mask=%08x NP memory %d bytes\n",
> bar, mask, size);
> if (last_mem + size >
> --
> 1.9.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-11-17 7:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-12 20:24 [PATCH 1/3] pci: correct BAR size calculation Lucas Stach
2014-11-12 20:24 ` [PATCH 2/3] pci: align bridge windows Lucas Stach
2014-11-12 20:24 ` [PATCH 3/3] pci: tegra: relax link-up timeout Lucas Stach
2014-11-17 7:36 ` [PATCH 1/3] pci: correct BAR size calculation Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox