diff mbox

phb4: Always assign powerbus BARs

Message ID 1484541691.11927.29.camel@kernel.crashing.org
State Accepted
Headers show

Commit Message

Benjamin Herrenschmidt Jan. 16, 2017, 4:41 a.m. UTC
On FSP machines, HostBoot configure them with weird values that
confuse us, instead let's just own the assignment. This is temporary,
I will centralize memory map management next but this gets us going.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 hw/phb4.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Neuling Feb. 10, 2017, 6:12 a.m. UTC | #1
On Sun, 2017-01-15 at 22:41 -0600, Benjamin Herrenschmidt wrote:
> On FSP machines, HostBoot configure them with weird values that
> confuse us, instead let's just own the assignment. This is temporary,
> I will centralize memory map management next but this gets us going.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

I would drop the "On FSP machines, " as this applies to all hostbooted machines.
so the comment becomes:
--
HostBoot configure them with weird values that confuse us, instead let's just
own the assignment. This is temporary, I will centralize memory map management
next but this gets us going.
--

Other than that:
Acked-By: Michael Neuling <mikey@neuling.org>

> ---
>  hw/phb4.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/hw/phb4.c b/hw/phb4.c
> index 78f167f..e1ff10c 100644
> --- a/hw/phb4.c
> +++ b/hw/phb4.c
> @@ -3309,8 +3309,12 @@ static void phb4_probe_stack(struct dt_node *stk_node,
> uint32_t pec_index,
>  	      gcid, pec_index, stk_index, path);
>  	free(path);
>  
> +#if 0
>  	force_assign = dt_has_node_property(stk_node,
>  					    "force-assign-bars", NULL);
> +#else
> +	force_assign=1;
> +#endif
>  
>  	pci_stack = pci_base + 0x40 * (stk_index + 1);
>  	nest_stack = nest_base + 0x40 * (stk_index + 1);
> 
> _______________________________________________
> Skiboot mailing list
> Skiboot@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/skiboot
Stewart Smith Feb. 23, 2017, 7:13 a.m. UTC | #2
Michael Neuling <mikey@neuling.org> writes:
> On Sun, 2017-01-15 at 22:41 -0600, Benjamin Herrenschmidt wrote:
>> On FSP machines, HostBoot configure them with weird values that
>> confuse us, instead let's just own the assignment. This is temporary,
>> I will centralize memory map management next but this gets us going.
>> 
>> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>
> I would drop the "On FSP machines, " as this applies to all hostbooted machines.
> so the comment becomes:
> --
> HostBoot configure them with weird values that confuse us, instead let's just
> own the assignment. This is temporary, I will centralize memory map management
> next but this gets us going.
> --
>
> Other than that:
> Acked-By: Michael Neuling <mikey@neuling.org>

Thanks - merged to master as of 8e64bbd66280ee39d4c91efc567587f6af53cc85
diff mbox

Patch

diff --git a/hw/phb4.c b/hw/phb4.c
index 78f167f..e1ff10c 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -3309,8 +3309,12 @@  static void phb4_probe_stack(struct dt_node *stk_node, uint32_t pec_index,
 	      gcid, pec_index, stk_index, path);
 	free(path);
 
+#if 0
 	force_assign = dt_has_node_property(stk_node,
 					    "force-assign-bars", NULL);
+#else
+	force_assign=1;
+#endif
 
 	pci_stack = pci_base + 0x40 * (stk_index + 1);
 	nest_stack = nest_base + 0x40 * (stk_index + 1);