Re: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro

From: Lad, Prabhakar
Date: Mon Dec 19 2022 - 11:25:18 EST


Hi Conor,

On Mon, Dec 19, 2022 at 4:22 PM Conor Dooley <conor@xxxxxxxxxx> wrote:
>
> On Mon, Dec 19, 2022 at 11:15:17AM +0000, Lad, Prabhakar wrote:
> > > On Mon, Dec 12, 2022 at 11:55:00AM +0000, Prabhakar wrote:
> > > > From: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
> > > >
> > > > Introduce ALTERNATIVE_3() macro.
> > > >
> > > > A vendor wants to replace an old_content, but another vendor has used
> > > > ALTERNATIVE_2() to patch its customized content at the same location.
> > > > In this case, this vendor can use macro ALTERNATIVE_3() and then replace
> > > > ALTERNATIVE_2() with ALTERNATIVE_3() to append its customized content.
> > > >
> > > > While at it update comment above ALTERNATIVE_2() macro and make it generic
> > > > so that the comment holds good for any new addition of ALTERNATIVE_X()
> > > > macros.
> > > >
> > > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
>
> > > > + *
> > > > + * Usage:
> > > > + * ALTERNATIVE_x(old_content,
> > > > + * new_content1, vendor_id1, errata_id1, CONFIG_k1,
> > > > + * new_content2, vendor_id2, errata_id2, CONFIG_k2,
> > > > + * ...
> > > > + * new_contentx, vendor_idx, errata_idx, CONFIG_kx)
> > > > */
> > > > #define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \
> > > > new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \
> > > > _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \
> > > > new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2)
> > > >
> > > > +#define ALTERNATIVE_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \
> > > > + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \
> > > > + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \
> > > > + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \
> > > > + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \
> > > > + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3)
> > >
> > > btw, why is this indented with spaces when the line above it is indented
> > > with tabs? (At least, that is how it appears in mutt).
> > >
> > I'll update it with spaces.
>
> The file uses tabs, so it'd be switching the spaces you added with tabs,
> right?
My bad that was a typo, I meant tabs :p

Cheers,
Prabhakar