[Skiboot] [PATCH 0/3] xive/p9: more cleanups

Oliver O'Halloran oohall at gmail.com
Fri Jul 3 15:33:55 AEST 2020


On Wed, Jun 24, 2020 at 7:16 PM Cédric Le Goater <clg at kaod.org> wrote:
>
> Hello,
>
> To be applied on top of the series "xive/p9: various small cleanups" :
>
>    http://patchwork.ozlabs.org/project/skiboot/list/?series=182976

I think a patch went AWOL at some point since there was a conflict
with this hunk:

@@ -1675,8 +1675,8 @@ static bool xive_prealloc_tables(struct xive *x)
        x->eq_ind_count = XIVE_EQ_TABLE_SIZE / XIVE_VSD_SIZE;

        /* Indirect VP table.  Limited to one top page. */
-       al = ALIGN_UP(XIVE_VP_TABLE_SIZE, 0x10000);
-       if (al > 0x10000) {
+       al = ALIGN_UP(XIVE_VP_TABLE_SIZE, PAGE_SIZE);
+       if (al > PAGE_SIZE) {
                xive_err(x, "VP indirect table is too big !\n");
                return false;
        }

After the first series was applied the first context wasn't matching
because it was still

x->eq_ind_count = XIVE_EQ_TABLE_SIZE / 8;

I fixed it up in 86b617c7f74a9122e9572657a9ab9b4c6ba13c4c. Hope that's
ok. Anyway, series merged as of 132f5a8747af.


More information about the Skiboot mailing list