Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230609183056.1765183-1-robh@kernel.org> <CAL_JsqLTc_9Yujp=wJjjn7P5YwAFZ9fn2SU6ey1q_gY3MFp9TA@mail.gmail.com>
In-Reply-To: <CAL_JsqLTc_9Yujp=wJjjn7P5YwAFZ9fn2SU6ey1q_gY3MFp9TA@mail.gmail.com>
From:   Rob Herring <robh@kernel.org>
Date:   Tue, 18 Jul 2023 13:03:03 -0600
Message-ID: <CAL_JsqLNg00Z81cpSAOtwVWnfuQMoy2veBcHUHNby1Qh35mLTw@mail.gmail.com>
Subject: Re: [PATCH] fsi: Use of_property_read_reg() to parse "reg"
To:     Jeremy Kerr <jk@ozlabs.org>, Joel Stanley <joel@jms.id.au>,
        Alistar Popple <alistair@popple.id.au>,
        Eddie James <eajames@linux.ibm.com>
Cc:     linux-fsi@lists.ozlabs.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Jun 30, 2023 at 3:02=E2=80=AFPM Rob Herring <robh@kernel.org> wrote=
:
>
> On Fri, Jun 9, 2023 at 12:31=E2=80=AFPM Rob Herring <robh@kernel.org> wro=
te:
> >
> > Use the recently added of_property_read_reg() helper to get the
> > untranslated "reg" address value.
> >
> > Signed-off-by: Rob Herring <robh@kernel.org>
> > ---
> >  drivers/fsi/fsi-core.c | 39 +++++++++------------------------------
> >  1 file changed, 9 insertions(+), 30 deletions(-)
>
> Ping!

Is FSI still maintained or should we just remove it?

>
> >
> > diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
> > index 0b927c9f4267..19c4d5b3bde9 100644
> > --- a/drivers/fsi/fsi-core.c
> > +++ b/drivers/fsi/fsi-core.c
> > @@ -16,6 +16,7 @@
> >  #include <linux/idr.h>
> >  #include <linux/module.h>
> >  #include <linux/of.h>
> > +#include <linux/of_address.h>
> >  #include <linux/slab.h>
> >  #include <linux/bitops.h>
> >  #include <linux/cdev.h>
> > @@ -415,28 +416,18 @@ EXPORT_SYMBOL_GPL(fsi_slave_release_range);
> >  static bool fsi_device_node_matches(struct device *dev, struct device_=
node *np,
> >                 uint32_t addr, uint32_t size)
> >  {
> > -       unsigned int len, na, ns;
> > -       const __be32 *prop;
> > -       uint32_t psize;
> > +       u64 paddr, psize;
> >
> > -       na =3D of_n_addr_cells(np);
> > -       ns =3D of_n_size_cells(np);
> > -
> > -       if (na !=3D 1 || ns !=3D 1)
> > -               return false;
> > -
> > -       prop =3D of_get_property(np, "reg", &len);
> > -       if (!prop || len !=3D 8)
> > +       if (of_property_read_reg(np, 0, &paddr, &psize))
> >                 return false;
> >
> > -       if (of_read_number(prop, 1) !=3D addr)
> > +       if (paddr !=3D addr)
> >                 return false;
> >
> > -       psize =3D of_read_number(prop + 1, 1);
> >         if (psize !=3D size) {
> >                 dev_warn(dev,
> > -                       "node %s matches probed address, but not size (=
got 0x%x, expected 0x%x)",
> > -                       of_node_full_name(np), psize, size);
> > +                       "node %pOF matches probed address, but not size=
 (got 0x%llx, expected 0x%x)",
> > +                       np, psize, size);
> >         }
> >
> >         return true;
> > @@ -653,24 +644,12 @@ static void fsi_slave_release(struct device *dev)
> >  static bool fsi_slave_node_matches(struct device_node *np,
> >                 int link, uint8_t id)
> >  {
> > -       unsigned int len, na, ns;
> > -       const __be32 *prop;
> > -
> > -       na =3D of_n_addr_cells(np);
> > -       ns =3D of_n_size_cells(np);
> > -
> > -       /* Ensure we have the correct format for addresses and sizes in
> > -        * reg properties
> > -        */
> > -       if (na !=3D 2 || ns !=3D 0)
> > -               return false;
> > +       u64 addr;
> >
> > -       prop =3D of_get_property(np, "reg", &len);
> > -       if (!prop || len !=3D 8)
> > +       if (of_property_read_reg(np, 0, &addr, NULL))
> >                 return false;
> >
> > -       return (of_read_number(prop, 1) =3D=3D link) &&
> > -               (of_read_number(prop + 1, 1) =3D=3D id);
> > +       return addr =3D=3D (((u64)link << 32) | id);
> >  }
> >
> >  /* Find a matching node for the slave at (link, id). Returns NULL if n=
one
> > --
> > 2.39.2
> >