linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Vitaly Bordug <vbordug@ru.mvista.com>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: p_gortmaker@yahoo.com, linuxppc-embedded@ozlabs.org
Subject: Re: [PATCH 2/5] Updates for WRS SBC82xx boards
Date: Fri, 26 May 2006 12:22:48 +0400	[thread overview]
Message-ID: <20060526122248.14c6728c@localhost.localdomain> (raw)
In-Reply-To: <20060525182533.GD679@windriver.com>

On Thu, 25 May 2006 14:25:33 -0400
Paul Gortmaker <paul.gortmaker@windriver.com> wrote:

> 
> patch2: sbc82xx-PCI-diff1
> 	- allow m82xx_pci.c to be used by other platforms that have
> 	  their own map_irq
> 
> I'm open to doing this another way if desired -- I just went for the
> minimal impact on the existing code with this.

> 
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> 
> diff -ur orig/linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.c
> linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.c ---
> orig/linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.c	2006-02-09
> 16:20:35.000000000 -0500 +++
> linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.c	2006-02-09
> 16:01:40.000000000 -0500 @@ -198,7 +198,7 @@ } }
>  
> -static int sbc82xx_pci_map_irq(struct pci_dev *dev, unsigned char
> idsel, +int pq2pci_map_irq(struct pci_dev *dev, unsigned char idsel,
>  			       unsigned char pin)
>  {
>  	static char pci_irq_table[][4] = {
> @@ -247,7 +247,7 @@
>  	callback_init_IRQ	= ppc_md.init_IRQ;
>  
>  	ppc_md.init_IRQ		= sbc82xx_init_IRQ;
> -	ppc_md.pci_map_irq	= sbc82xx_pci_map_irq;
> +	ppc_md.pci_map_irq	= pq2pci_map_irq;
>  #ifdef CONFIG_GEN_RTC
>  	ppc_md.time_init        = NULL;
>  	ppc_md.get_rtc_time     = NULL;
> diff -ur orig/linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.h
> linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.h ---
> orig/linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.h	2006-02-09
> 16:20:35.000000000 -0500 +++
> linux-2.6.16rc2/arch/ppc/platforms/sbc82xx.h	2006-02-09
> 16:35:05.000000000 -0500 @@ -24,6 +24,7 @@ #define
> BOOTROM_RESTART_ADDR      ((uint)0x40000104) 
> +#define HAVE_OWN_PQ2PCI_IRQ
>  #define SBC82xx_PC_IRQA		(NR_CPM_INTS+0)
>  #define SBC82xx_PC_IRQB		(NR_CPM_INTS+1)
>  #define SBC82xx_MPC185_IRQ	(NR_CPM_INTS+2)
> diff -ur orig/linux-2.6.16rc2/arch/ppc/syslib/m82xx_pci.c
> linux-2.6.16rc2/arch/ppc/syslib/m82xx_pci.c ---
> orig/linux-2.6.16rc2/arch/ppc/syslib/m82xx_pci.c	2006-01-02
> 22:21:10.000000000 -0500 +++
> linux-2.6.16rc2/arch/ppc/syslib/m82xx_pci.c	2006-02-09
> 14:35:10.000000000 -0500 @@ -51,6 +51,10 @@
>   * Interrupt routing
>   */
>  
> +#ifdef HAVE_OWN_PQ2PCI_IRQ
> +extern int
> +pq2pci_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned
> char pin); +#else 
>  static inline int
>  pq2pci_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned
> char pin) {
> @@ -172,6 +176,7 @@
>  	setup_irq(PCI_INT_TO_SIU, &pq2pci_irqaction);
>  	return;
>  }
> +#endif	/* HAVE_OWN_PQ2PCI_IRQ */
Sorry, but I don't quite follow the reason of that. As I see, 
you are going to call find_bridges stuff but with demux disabled.

I see no reason to add any defines - if you won't call init_irq,
nothing will happen, I mean demux will not be assigned and so on. BTW,
right now it will not be issued in case of sbc82xx. It is not code-size
optimal, but we'll leave optimizations to arch/powerpc time. 

Actually, you'll just have to override map_irq with sbc_ thing after
find_bridges() call.

>  
>  static int
>  pq2pci_exclude_device(u_char bus, u_char devfn)
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
> 
> 

      reply	other threads:[~2006-05-26  8:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-25 18:25 [PATCH 2/5] Updates for WRS SBC82xx boards Paul Gortmaker
2006-05-26  8:22 ` Vitaly Bordug [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060526122248.14c6728c@localhost.localdomain \
    --to=vbordug@ru.mvista.com \
    --cc=linuxppc-embedded@ozlabs.org \
    --cc=p_gortmaker@yahoo.com \
    --cc=paul.gortmaker@windriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).