RFC Patch: Use x86 init_hwif in the alim15x3 for x86-like PowerPC systems

[Anton Vorontsov]

On Fri, Apr 17, 2009 at 09:40:19AM +0200, Benjamin Herrenschmidt wrote:
> On Thu, 2009-04-16 at 21:30 +0200, Bartlomiej Zolnierkiewicz wrote:
> > Hi,
> > 
> > On Wednesday 15 April 2009 16:34:22 Roderick Colenbrander wrote:
> > > Hi,
> > > 
> > > I'm using a Xilinx ML510 it features a PowerPC 440 cpu inside a
> > > Virtex-5 FPGA. The board also contains a ALI M1533 south bridge
> > > for IDE, USB and Audio. I did a lot of work to get the pci bus working
> > > on this board and it works correctly but the default init code
> > > of the alim15x3 driver doesn't work for me. The driver explicitly
> > > disabled some initialization code for powerpc after uncommenting this
> > > code it works properly. Benjamin Herrenschmidt and I think this
> > > !CONFIG_PPC check should be removed because the system behaves
> > > like a real 'x86' system (also the i8259 interrupt controller is used).
> > 
> > Ben, I guess you are OK with the change and there are no longer other
> > platforms requiring CONFIG_PPC check below?  [I don't see your ACK here]
> 
> Yup. I don't see a case where the hack would be of any use, so I'm
> happy to remove us from the test. Whenever a 8259 is present we
> assign it the legacy interrupts 1...15 with a virtual==physical mapping
> so all those x86-ish things should run just fine.

But they don't. On MPC8610HPCD we have IDE interrupt directly
connected to the MPIC line (through PCI sideband interrupt), and
i8259 is _completely_ disabled in the bridge.

See this commit:

  commit 6d1cee44361b8d06ccd1812e80448d86ae60dfe3
  Author: Anton Vorontsov <avorontsov at ru.mvista.com>
  Date:   Tue Apr 29 22:57:38 2008 +0200
  
      alim15x3: disable init_hwif_ali15x3 for PowerPC

> Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

If the patch applied, MPC8610HPCD will be broken.

We need at least some machine_is() check.

> > > Regards,
> > > Roderick Colenbrander
> > > 
> > > 
> > > From 1c40c2f1485ecd3bc5ad7a3af537cb94de0877c3 Mon Sep 17 00:00:00 2001
> > > From: Roderick Colenbrander <thunderbird2k at gmail.com>
> > > Date: Wed, 15 Apr 2009 10:45:17 +0200
> > > Subject: [PATCH] Use the 'x86' init_hwif code in the alim15x3 for
> > > x86-like PowerPC boards like Xilinx ML310/410/510.
> > 
> > Roderick, please add your "Signed-off-by:" line
> > (per Documentation/SubmittingPatches).
> > 
> > Thanks.
> > 
> > > ---
> > >  drivers/ide/alim15x3.c |    9 +++++----
> > >  1 files changed, 5 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
> > > index 537da1c..9176c0f 100644
> > > --- a/drivers/ide/alim15x3.c
> > > +++ b/drivers/ide/alim15x3.c
> > > @@ -402,14 +402,15 @@ static u8 ali_cable_detect(ide_hwif_t *hwif)
> > >      return cbl;
> > >  }
> > > 
> > > -#if !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC)
> > > +#if !defined(CONFIG_SPARC64)
> > >  /**
> > >   *    init_hwif_ali15x3    -    Initialize the ALI IDE x86 stuff
> > >   *    @hwif: interface to configure
> > >   *
> > >   *    Obtain the IRQ tables for an ALi based IDE solution on the PC
> > > - *    class platforms. This part of the code isn't applicable to the
> > > - *    Sparc and PowerPC systems.
> > > + *    class platforms. This part of the code isn't applicable to
> > > + *    Sparc systems. It is usable on 'x86-like' PowerPC systems
> > > + *      which use a Ali M15x3 south bridge like e.g. Xilinx ML310/410/510.
> > >   */
> > > 
> > >  static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
> > > @@ -455,7 +456,7 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
> > >  }
> > >  #else
> > >  #define init_hwif_ali15x3 NULL
> > > -#endif /* !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) */
> > > +#endif /* !defined(CONFIG_SPARC64) */
> > > 
> > >  /**
> > >   *    init_dma_ali15x3    -    set up DMA on ALi15x3
> > > --
> > > 1.5.6.3
> 
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

-- 
Anton Vorontsov
email: cbouatmailru at gmail.com
irc://irc.freenode.net/bd2