On Wed, 27 Jul 2016 14:53:25 +1000 Michael Ellerman <m...@ellerman.id.au> wrote:
> Alexandre Bounine <alexandre.boun...@idt.com> writes: > > > Implement changes made in RapidIO specification rev.3 to LP-Serial Physical > > Layer register definitions: > > - use per-port register offset calculations based on LP-Serial Extended > > Features Block (EFB) Register Map type (I or II) with different per-port > > offset step (0x20 vs. 0x40 respectfully). > > - remove deprecated Parallel Physical layer definitions and related code. > > > > Signed-off-by: Alexandre Bounine <alexandre.boun...@idt.com> > > Tested-by: Barry Wood <barry.w...@idt.com> > > Cc: Matt Porter <mpor...@kernel.crashing.org> > > Cc: Andre van Herk <andre.van.h...@prodrive-technologies.com> > > Cc: Barry Wood <barry.w...@idt.com> > > Cc: linux-kernel@vger.kernel.org > > --- > > drivers/rapidio/devices/rio_mport_cdev.c | 2 +- > > drivers/rapidio/devices/tsi721.c | 8 +- > > drivers/rapidio/rio-scan.c | 74 +++---------- > > drivers/rapidio/rio.c | 149 ++++++++++++++------------- > > drivers/rapidio/rio.h | 2 +- > > drivers/rapidio/switches/tsi57x.c | 26 ++--- > > include/linux/rio.h | 11 +-- > > include/linux/rio_regs.h | 167 > > +++++++++++++++++++++++------ > > 8 files changed, 248 insertions(+), 191 deletions(-) > > This is breaking the build for me on powerpc, for > corenet64_smp_defconfig at least. > > eg. > > http://kisskb.ellerman.id.au/kisskb/buildresult/12750751/ > > Commit: Add linux-next specific files for 20160722 > 13123042d0dbf7635f052efc2ae69fd9af624f1d > Compiler: powerpc-linux-gcc (GCC) 4.6.3 > > Possible errors > --------------- > > arch/powerpc/sysdev/fsl_rio.c:702:11: error: 'struct rio_mport' has no member > named 'phy_type' > arch/powerpc/sysdev/fsl_rio.c:702:25: error: 'RIO_PHY_SERIAL' undeclared > (first use in this function) > make[2]: *** [arch/powerpc/sysdev/fsl_rio.o] Error 1 > make[1]: *** [arch/powerpc/sysdev] Error 2 > make: *** [sub-make] Error 2 I'll go out on a limb and assume it's this: --- a/arch/powerpc/sysdev/fsl_rio.c~powerpc-fsl_rio-apply-changes-for-rio-spec-rev-3-fix +++ a/arch/powerpc/sysdev/fsl_rio.c @@ -698,11 +698,6 @@ int fsl_rio_setup(struct platform_device RIO_INB_ATMU_REGS_PORT2_OFFSET)); - /* Set to receive any dist ID for serial RapidIO controller. */ - if (port->phy_type == RIO_PHY_SERIAL) - out_be32((priv->regs_win - + RIO_ISR_AACR + i*0x80), RIO_ISR_AACR_AA); - /* Configure maintenance transaction window */ out_be32(&priv->maint_atmu_regs->rowbar, port->iores.start >> 12); _
