[PATCH] Connecting the SB600's i8259 controller rather in pasemi's pci.c than in pasemi's setup.c.

[Christian Zigotzky <chzigotzky@xenosoft.de>]

Is this patch OK? My P.A. Semi Nemo board boots with the patched kernel.

-- Christian

On 07/07/26 06:31, Christian Zigotzky wrote:
 > Any comments about this patch?
 >
 > Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de>
 >
 > -- Christian
 >
 >
 > On 01/07/26 12:54, Christian Zigotzky wrote:
 > >  "pas_pci_init" was before "nemo_init_IRQ".
 > >  Now "pas_pci_init" is after "nemo_init_IRQ" in the official kernel 
source
 > >  code.
 > >  I think "pas_pci_init" scans (discovers) the PCI(e) devices
 > >  and after that, "nemo_init_IRQ" assigns interrupt numbers
 > >  to these devices if required.
 > >  It's not possible to assigns interrupt numbers to PCI(e) devices
 > >  which have not been discovered yet.
 > >
 > > Signed-off-by: Christian Zigotzky <chzigotzky@xenosoft.de>
 > > ---
 > >  arch/powerpc/platforms/pasemi/pci.c   | 7 +++++++
 > >  arch/powerpc/platforms/pasemi/setup.c | 7 ++++---
 > >  2 files changed, 11 insertions(+), 3 deletions(-)
 > >
 > > diff --git a/arch/powerpc/platforms/pasemi/pci.c 
b/arch/powerpc/platforms/pasemi/pci.c
 > > index 2df955274652..7208c325bfc5 100644
 > > --- a/arch/powerpc/platforms/pasemi/pci.c
 > > +++ b/arch/powerpc/platforms/pasemi/pci.c
 > > @@ -25,6 +25,8 @@
 > >
 > >  #define PA_PXP_CFA(bus, devfn, off) (((bus) << 20) | ((devfn) << 
12) | (off))
 > >
 > > +extern void nemo_init_IRQ(void);
 > > +
 > >  static inline int pa_pxp_offset_valid(u8 bus, u8 devfn, int offset)
 > >  {
 > >      /* Device 0 Function 0 is special: It's config space spans 
function 1 as
 > > @@ -265,6 +267,11 @@ static int __init pas_add_bridge(struct 
device_node *dev)
 > >       */
 > >      isa_bridge_find_early(hose);
 > >
 > > +    /*
 > > +     * ISA bridge is now active, add the i8259 cascade (if needed)
 > > +     */
 > > +    nemo_init_IRQ();
 > > +
 > >      return 0;
 > >  }
 > >
 > > diff --git a/arch/powerpc/platforms/pasemi/setup.c 
b/arch/powerpc/platforms/pasemi/setup.c
 > > index d03b41336901..eec74611be46 100644
 > > --- a/arch/powerpc/platforms/pasemi/setup.c
 > > +++ b/arch/powerpc/platforms/pasemi/setup.c
 > > @@ -214,10 +214,12 @@ static void sb600_8259_cascade(struct 
irq_desc *desc)
 > >      chip->irq_eoi(&desc->irq_data);
 > >  }
 > >
 > > -static void __init nemo_init_IRQ(struct mpic *mpic)
 > > +void nemo_init_IRQ(void)
 > >  {
 > >      struct device_node *np;
 > >      int gpio_virq;
 > > +    struct mpic *mpic;
 > > +
 > >      /* Connect the SB600's legacy i8259 controller */
 > >      np = of_find_node_by_path("/pxp@0,e0000000");
 > >      i8259_init(np, 0);
 > > @@ -228,6 +230,7 @@ static void __init nemo_init_IRQ(struct mpic *mpic)
 > >      irq_set_chained_handler(gpio_virq, sb600_8259_cascade);
 > >      mpic_unmask_irq(irq_get_irq_data(gpio_virq));
 > >
 > > +    mpic = irq_get_chip_data(gpio_virq);
 > >      irq_set_default_domain(mpic->irqhost);
 > >  }
 > >
 > > @@ -298,8 +301,6 @@ static __init void pas_init_IRQ(void)
 > >          mpic_unmask_irq(irq_get_irq_data(nmi_virq));
 > >      }
 > >
 > > -    nemo_init_IRQ(mpic);
 > > -
 > >      of_node_put(mpic_node);
 > >      of_node_put(root);
 > >  }
 >
 >


-- 
Sent with BrassMonkey 34.2.2 
(https://github.com/chzigotzky/Web-Browsers-and-Suites-for-Linux-PPC/releases/tag/BrassMonkey_34.2.2)