| Message ID | 20190223084816.28985-1-ioana.ciornei@nxp.com |
|---|---|
| Headers | show |
| Series | soc: fsl: dpio: enable and configure cache stashing | expand |
From: Ioana Ciornei <ioana.ciornei@nxp.com> Date: Sat, 23 Feb 2019 08:48:42 +0000 > The first two patches enable cache stashing and configure the core cluster > destination per software portal while the third patch is the one > configuring the amount of stashing on a queue. Should I merge this series in via my networking tree? Thanks.
> Subject: Re: [PATCH 0/3] soc: fsl: dpio: enable and configure cache stashing > > From: Ioana Ciornei <ioana.ciornei@nxp.com> > Date: Sat, 23 Feb 2019 08:48:42 +0000 > > > The first two patches enable cache stashing and configure the core > > cluster destination per software portal while the third patch is the > > one configuring the amount of stashing on a queue. > > Should I merge this series in via my networking tree? Even though it would be really good to have this on the networking tree as soon as possible, I am afraid that patch 2/3 is not going to apply cleanly because it touches the same areas of code that some other patches on Leo's tree are. Thanks, Ioana C
On Mon, Feb 25, 2019 at 1:01 AM Ioana Ciornei <ioana.ciornei@nxp.com> wrote: > > > Subject: Re: [PATCH 0/3] soc: fsl: dpio: enable and configure cache stashing > > > > From: Ioana Ciornei <ioana.ciornei@nxp.com> > > Date: Sat, 23 Feb 2019 08:48:42 +0000 > > > > > The first two patches enable cache stashing and configure the core > > > cluster destination per software portal while the third patch is the > > > one configuring the amount of stashing on a queue. > > > > Should I merge this series in via my networking tree? > > Even though it would be really good to have this on the networking tree as soon as possible, I am afraid that patch 2/3 is not going to apply cleanly because it touches the same areas of code that some other patches on Leo's tree are. Hi David, What shall we do if we want to get this in the 5.1? Since the change on the ethernet driver is pretty small, can I get your ACK on that patch and merge the series through my tree? Otherwise I can also try to get the dpio patches in next merge window, and you can apply the Ethernet patch after that. Regards, Leo
From: Li Yang <leoyang.li@nxp.com> Date: Tue, 26 Feb 2019 13:03:17 -0600 > On Mon, Feb 25, 2019 at 1:01 AM Ioana Ciornei <ioana.ciornei@nxp.com> wrote: >> >> > Subject: Re: [PATCH 0/3] soc: fsl: dpio: enable and configure cache stashing >> > >> > From: Ioana Ciornei <ioana.ciornei@nxp.com> >> > Date: Sat, 23 Feb 2019 08:48:42 +0000 >> > >> > > The first two patches enable cache stashing and configure the core >> > > cluster destination per software portal while the third patch is the >> > > one configuring the amount of stashing on a queue. >> > >> > Should I merge this series in via my networking tree? >> >> Even though it would be really good to have this on the networking tree as soon as possible, I am afraid that patch 2/3 is not going to apply cleanly because it touches the same areas of code that some other patches on Leo's tree are. > > Hi David, > > What shall we do if we want to get this in the 5.1? Since the change > on the ethernet driver is pretty small, can I get your ACK on that > patch and merge the series through my tree? Sure. Acked-by: David S. Miller <davem@davemloft.net>
On Sat, Feb 23, 2019 at 2:49 AM Ioana Ciornei <ioana.ciornei@nxp.com> wrote: > > The first two patches enable cache stashing and configure the core cluster > destination per software portal while the third patch is the one > configuring the amount of stashing on a queue. Series applied for next. Thanks. Regards, Leo > > Ioana Ciornei (3): > soc: fsl: dpio: enable frame data cache stashing per software portal > soc: fsl: dpio: configure cache stashing destination > dpaa2-eth: configure the cache stashing amount on a queue > > drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 7 +++- > drivers/soc/fsl/Kconfig | 1 + > drivers/soc/fsl/dpio/dpio-cmd.h | 5 +++ > drivers/soc/fsl/dpio/dpio-driver.c | 52 ++++++++++++++++++++++++ > drivers/soc/fsl/dpio/dpio.c | 16 ++++++++ > drivers/soc/fsl/dpio/dpio.h | 5 +++ > drivers/soc/fsl/dpio/qbman-portal.c | 4 +- > 7 files changed, 87 insertions(+), 3 deletions(-) > > -- > 1.9.1 >