MPC52xx updates : sparse clean-ups

Hi Tom & all

Here's some updates related to the Freescale MPC52xx. First some clean-ups for sparse warnings and then PCI support. I'd like to get theses approved & merged before I submit conversion to platform bus model.

As usual, the patches can also be pulled of a bk repository :
bk://tnt.bkbits.net/linux-2.5-mpc52xx-pending

(note it's _NOT_ the same url as before even if it's close ;)

Sylvain

---

diff -Nru a/arch/ppc/syslib/mpc52xx_pic.c b/arch/ppc/syslib/mpc52xx_pic.c
@@ -33,8 +33,8 @@

#include <asm/mpc52xx.h>

-static struct mpc52xx_intr *intr;
-static struct mpc52xx_sdma *sdma;
+static struct mpc52xx_intr __iomem *intr;
+static struct mpc52xx_sdma __iomem *sdma;

static void
mpc52xx_ic_disable(unsigned int irq)
@@ -173,7 +173,7 @@

       mpc52xx_ic_disable,             /* disable(irq) */
       mpc52xx_ic_disable_and_ack,     /* disable_and_ack(irq) */
       mpc52xx_ic_end,                 /* end(irq) */
-       0                               /* set_affinity(irq, cpumask) SMP. */
+       NULL                            /* set_affinity(irq, cpumask) SMP. */

};

void __init
@@ -183,10 +183,8 @@

       u32 intr_ctrl;

       /* Remap the necessary zones */

- intr = (struct mpc52xx_intr *)
- ioremap(MPC52xx_INTR, sizeof(struct mpc52xx_intr));
- sdma = (struct mpc52xx_sdma *)
- ioremap(MPC52xx_SDMA, sizeof(struct mpc52xx_sdma));
+ intr = ioremap(MPC52xx_INTR, sizeof(struct mpc52xx_intr));
+ sdma = ioremap(MPC52xx_SDMA, sizeof(struct mpc52xx_sdma));

       if ((intr==NULL) || (sdma==NULL))
               panic("Can't ioremap PIC/SDMA register for init_irq !");

diff -Nru a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c
@@ -39,7 +39,8 @@

void
mpc52xx_restart(char *cmd)
{
- struct mpc52xx_gpt* gpt0 = (struct mpc52xx_gpt*) MPC52xx_GPTx(0);
+ struct mpc52xx_gpt __iomem *gpt0 =
+ (struct mpc52xx_gpt __iomem *) MPC52xx_GPTx(0);

       local_irq_disable();

@@ -102,7 +103,7 @@
#endif

static void
-mpc52xx_psc_putc(struct mpc52xx_psc * psc, unsigned char c) +mpc52xx_psc_putc(struct mpc52xx_psc __iomem *psc, unsigned char c)

{
       while (!(in_be16(&psc->mpc52xx_psc_status) &
                MPC52xx_PSC_SR_TXRDY));

@@ -112,8 +113,9 @@
void
mpc52xx_progress(char *s, unsigned short hex)
{

-       struct mpc52xx_psc *psc = (struct mpc52xx_psc *)MPC52xx_CONSOLE;
       char c;

+ struct mpc52xx_psc __iomem *psc =
+ (struct mpc52xx_psc __iomem *)MPC52xx_CONSOLE;

       while ((c = *s++) != 0) {
               if (c == '\n')
@@ -138,11 +140,11 @@
        * else get size from sdram config registers
        */
       if (ramsize == 0) {
-               struct mpc52xx_mmap_ctl *mmap_ctl;
+               struct mpc52xx_mmap_ctl __iomem *mmap_ctl;
               u32 sdram_config_0, sdram_config_1;

               /* Temp BAT2 mapping active when this is called ! */

- mmap_ctl = (struct mpc52xx_mmap_ctl*) MPC52xx_MMAP_CTL;
+ mmap_ctl = (struct mpc52xx_mmap_ctl __iomem *) MPC52xx_MMAP_CTL;

               sdram_config_0 = in_be32(&mmap_ctl->sdram0);
               sdram_config_1 = in_be32(&mmap_ctl->sdram1);
@@ -169,13 +171,11 @@
       /* if bootloader didn't pass bus frequencies, calculate them */
       if (xlbfreq == 0) {
               /* Get RTC & Clock manager modules */
-               struct mpc52xx_rtc *rtc;
-               struct mpc52xx_cdm *cdm;
+               struct mpc52xx_rtc __iomem *rtc;
+               struct mpc52xx_cdm __iomem *cdm;

- rtc = (struct mpc52xx_rtc*)
- ioremap(MPC52xx_RTC, sizeof(struct mpc52xx_rtc));
- cdm = (struct mpc52xx_cdm*)
- ioremap(MPC52xx_CDM, sizeof(struct mpc52xx_cdm));
+ rtc = ioremap(MPC52xx_RTC, sizeof(struct mpc52xx_rtc));
+ cdm = ioremap(MPC52xx_CDM, sizeof(struct mpc52xx_cdm));

if ((rtc==NULL) || (cdm==NULL))
panic("Can't ioremap RTC/CDM while computing bus
freq");
@@ -212,8 +212,8 @@

               __res.bi_pcifreq = pcifreq;

               /* Release mapping */
-               iounmap((void*)rtc);
-               iounmap((void*)cdm);
+               iounmap(rtc);
+               iounmap(cdm);
       }

       divisor = 4;

diff -Nru a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
@@ -86,7 +86,7 @@
        *        the console_init
        */
 
-#define PSC(port) ((struct mpc52xx_psc *)((port)->membase))
+#define PSC(port) ((struct mpc52xx_psc __iomem *)((port)->membase))
 
 

/* Forward declaration of the interruption handling routine */ @@ -190,7 +190,7 @@
static int
mpc52xx_uart_startup(struct uart_port *port)
{
- struct mpc52xx_psc *psc = PSC(port);
+ struct mpc52xx_psc __iomem *psc = PSC(port);

       /* Reset/activate the port, clear and enable interrupts */
       out_8(&psc->command,MPC52xx_PSC_RST_RX);

@@ -217,7 +217,7 @@
static void
mpc52xx_uart_shutdown(struct uart_port *port)
{
- struct mpc52xx_psc *psc = PSC(port);
+ struct mpc52xx_psc __iomem *psc = PSC(port);

       /* Shut down the port, interrupt and all */
       out_8(&psc->command,MPC52xx_PSC_RST_RX);

@@ -231,7 +231,7 @@
mpc52xx_uart_set_termios(struct uart_port *port, struct termios *new,
struct termios *old)
{
- struct mpc52xx_psc *psc = PSC(port);

+       struct mpc52xx_psc __iomem *psc = PSC(port);
       unsigned long flags;
       unsigned char mr1, mr2;
       unsigned short ctr;

@@ -562,7 +562,7 @@
mpc52xx_console_get_options(struct uart_port *port,
int *baud, int *parity, int *bits, int *flow)
{
- struct mpc52xx_psc *psc = PSC(port);

+       struct mpc52xx_psc __iomem *psc = PSC(port);
       unsigned char mr1;

       /* Read the mode registers */
@@ -592,7 +592,7 @@
mpc52xx_console_write(struct console *co, const char *s, unsigned int count)
{
       struct uart_port *port = &mpc52xx_uart_ports[co->index];
-       struct mpc52xx_psc *psc = PSC(port);
+       struct mpc52xx_psc __iomem *psc = PSC(port);
       unsigned int i, j;

       /* Disable interrupts */

And here's the second patch :

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2005/03/11 19:58:21+01:00 [email protected]
# ppc32: Add PCI bus support for Freescale MPC52xx
# # Note that this support has "known" problem but theses
# are believed to be due to hardware issues.
# # Signed-off-by: Sylvain Munaut <[email protected]>
#

# arch/ppc/syslib/mpc52xx_pci.h
#   2005/03/11 19:57:56+01:00 [email protected] +139 -0
#   ppc32: Add PCI bus support for Freescale MPC52xx
#
# include/linux/pci_ids.h
#   2005/03/11 19:57:56+01:00 [email protected] +1 -0
#   ppc32: Add PCI bus support for Freescale MPC52xx
#
# include/asm-ppc/mpc52xx.h
#   2005/03/11 19:57:56+01:00 [email protected] +2 -0
#   ppc32: Add PCI bus support for Freescale MPC52xx
#
# arch/ppc/syslib/mpc52xx_pci.h
#   2005/03/11 19:57:56+01:00 [email protected] +0 -0
#   BitKeeper file /home/tnt/musicbox/kernel/linux-2.5-mpc52xx-pending/arch/ppc/syslib/mpc52xx_pci.h
#
# arch/ppc/syslib/mpc52xx_pci.c
#   2005/03/11 19:57:56+01:00 [email protected] +235 -0
#   ppc32: Add PCI bus support for Freescale MPC52xx
#
# arch/ppc/syslib/Makefile
#   2005/03/11 19:57:56+01:00 [email protected] +3 -0
#   ppc32: Add PCI bus support for Freescale MPC52xx
#
# arch/ppc/platforms/lite5200.c
#   2005/03/11 19:57:56+01:00 [email protected] +33 -3
#   ppc32: Add PCI bus support for Freescale MPC52xx
#
# arch/ppc/Kconfig
#   2005/03/11 19:57:56+01:00 [email protected] +1 -1
#   ppc32: Add PCI bus support for Freescale MPC52xx
#
# arch/ppc/syslib/mpc52xx_pci.c
#   2005/03/11 19:57:56+01:00 [email protected] +0 -0
#   BitKeeper file /home/tnt/musicbox/kernel/linux-2.5-mpc52xx-pending/arch/ppc/syslib/mpc52xx_pci.c
#
diff -Nru a/arch/ppc/Kconfig b/arch/ppc/Kconfig
--- a/arch/ppc/Kconfig  2005-03-11 20:41:56 +01:00
+++ b/arch/ppc/Kconfig  2005-03-11 20:41:56 +01:00
@@ -1097,7 +1097,7 @@
       bool

config PCI

-       bool "PCI support" if 40x || CPM2 || 83xx || 85xx
+       bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx
       default y if !40x && !CPM2 && !8xx && !APUS && !83xx && !85xx
       default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
       default PCI_QSPAN if !4xx && !CPM2 && 8xx

diff -Nru a/arch/ppc/platforms/lite5200.c b/arch/ppc/platforms/lite5200.c
@@ -35,6 +35,8 @@

#include <asm/ocp.h>
#include <asm/mpc52xx.h>

+#include <syslib/mpc52xx_pci.h>
+

extern int powersave_nap;

fdef CONFIG_PCI
+static int
+lite5200_map_irq(struct pci_dev *dev, unsigned char idsel,
+ unsigned char pin) {
+ return (pin == 1) && (idsel==24) ? MPC52xx_IRQ0 : -1;
+}
+#endif
+
static void __init
lite5200_setup_cpu(void)
{

+       struct mpc52xx_xlb  __iomem *xlb;
       struct mpc52xx_intr __iomem *intr;

       u32 intr_ctrl;

       /* Map zones */
+       xlb  = ioremap(MPC52xx_XLB,sizeof(struct mpc52xx_xlb));
       intr = ioremap(MPC52xx_INTR,sizeof(struct mpc52xx_intr));

- if (!intr) {
- printk("lite5200.c: Error while mapping INTR during lite5200_setup_cpu\n");
+ if (!xlb || !intr) {

+               printk("lite5200.c: Error while mapping XLB/INTR during lite5200_setup_cpu\n");
               goto unmap_regs;
       }

+       /* Configure the XLB Arbiter */
+       out_be32(&xlb->master_pri_enable, 0xff);
+       out_be32(&xlb->master_priority, 0x11111111);
+
+       /* Enable ram snooping for 1GB window */
+       out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_SNOOP);
+       out_be32(&xlb->snoop_window, MPC52xx_PCI_TARGET_MEM | 0x1d);
+
       /* IRQ[0-3] setup : IRQ0     - Level Active Low  */
       /*                  IRQ[1-3] - Level Active High */
       intr_ctrl = in_be32(&intr->ctrl);

@@ -103,6 +123,7 @@

       /* Unmap reg zone */
unmap_regs:
+       if (xlb)  iounmap(xlb);
       if (intr) iounmap(intr);
}

@@ -114,6 +135,11 @@

       /* CPU & Port mux setup */
       lite5200_setup_cpu();

+
+#ifdef CONFIG_PCI
+ /* PCI Bridge setup */
+ mpc52xx_find_bridges();
+#endif
}

void __init
@@ -152,7 +178,7 @@

       /* BAT setup */
       mpc52xx_set_bat();

- /* No ISA bus AFAIK */
+ /* No ISA bus by default */

       isa_io_base             = 0;
       isa_mem_base            = 0;

@@ -165,6 +191,10 @@

       ppc_md.show_percpuinfo  = NULL;
       ppc_md.init_IRQ         = mpc52xx_init_irq;
       ppc_md.get_irq          = mpc52xx_get_irq;

+
+#ifdef CONFIG_PCI
+ ppc_md.pci_map_irq = lite5200_map_irq;
+#endif

       ppc_md.find_end_of_memory = mpc52xx_find_end_of_memory;
       ppc_md.setup_io_mappings  = mpc52xx_map_io;

diff -Nru a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
@@ -106,3 +106,6 @@

endif
obj-$(CONFIG_MPC8555_CDS) += todc_time.o
obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o
+ifeq ($(CONFIG_PPC_MPC52xx),y)
+obj-$(CONFIG_PCI) += mpc52xx_pci.o
+endif

diff -Nru a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h
@@ -393,6 +393,8 @@

extern void mpc52xx_calibrate_decr(void);
extern void mpc52xx_add_board_devices(struct ocp_def board_ocp[]);

+extern void mpc52xx_find_bridges(void);
+
#endif /* __ASSEMBLY__ */

diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
@@ -807,6 +807,7 @@

#define PCI_DEVICE_ID_MOTOROLA_HAWK 0x4803
#define PCI_DEVICE_ID_MOTOROLA_CPX8216 0x4806
#define PCI_DEVICE_ID_MOTOROLA_HARRIER 0x480b
+#define PCI_DEVICE_ID_MOTOROLA_MPC5200 0x5803

#define PCI_VENDOR_ID_PROMISE 0x105a
#define PCI_DEVICE_ID_PROMISE_20265 0x0d30

The first hunk of arch/ppc/platforms/lite5200.c looks corrupted. See the line beginning "fdef CONFIG_PCI".

-Dale

[ deleted lines ]

Damn, you're right and even the first patch is screwed, half of it is missing.

Discard theses, I'll put them on-line somewhere and post the urls.

Sylvain

+01:00

+01:00

=A0=A0 /* disable(irq) */

disable_and_ack(irq) */

=A0=A0=A0=A0 /* end(irq) */

=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 /* set_affinity(irq, cpumask)

=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 /* set_affinity(irq, cpumask)

It looks like others have moved to a C99 initialization style for=20 hw_interrupt_type, see syslib/ipic.c for an example.

sizeof(struct mpc52xx_intr));

sizeof(struct mpc52xx_sdma));

mpc52xx_intr));

mpc52xx_sdma));

PIC/SDMA register for init_irq=20

+01:00

mpc52xx_gpt*)=20

__iomem *) MPC52xx_GPTx(0);

MPC52xx_PSC_SR_TXRDY));

*mmap_ctl;

__iomem *mmap_ctl;

sdram_config_1;

active when this is called ! */

mpc52xx_mmap_ctl*)=20

mpc52xx_mmap_ctl __iomem *)

in_be32(&mmap_ctl->sdram0);

in_be32(&mmap_ctl->sdram1);

calculate them=20

manager modules */

__iomem *rtc;

__iomem *cdm;

mpc52xx_rtc*)

ioremap(MPC52xx_RTC, sizeof(struct=20

mpc52xx_cdm*)

ioremap(MPC52xx_CDM, sizeof(struct=20

ioremap(MPC52xx_RTC, sizeof(struct mpc52xx_rtc));

ioremap(MPC52xx_CDM, sizeof(struct mpc52xx_cdm));

(cdm=3D=3DNULL))

panic("Can't ioremap RTC/CDM while computing=20

pcifreq;

+01:00

+01:00

interrupts */

=A0=A0=A0=A0 int *baud, int *parity, int *bits, int=20

int

&mpc52xx_uart_ports[co->index];

Indeed. Here's a third patch ;)
It has been added to the bk tree as well.

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2005/03/11 21:37:08+01:00 [email protected]
# ppc32: Change to a C99 initialization style for hw_interrupt_type
# in MPC52xx interrupt controller
#

# arch/ppc/syslib/mpc52xx_pic.c
#   2005/03/11 21:36:54+01:00 [email protected] +5 -8
#   ppc32: Change to a C99 initialization style for hw_interrupt_type
#          in MPC52xx interrupt controller
#
diff -Nru a/arch/ppc/syslib/mpc52xx_pic.c b/arch/ppc/syslib/mpc52xx_pic.c
--- a/arch/ppc/syslib/mpc52xx_pic.c     2005-03-11 21:45:50 +01:00
+++ b/arch/ppc/syslib/mpc52xx_pic.c     2005-03-11 21:45:50 +01:00
@@ -166,14 +166,11 @@
}

static struct hw_interrupt_type mpc52xx_ic = {

-       "MPC52xx",
-       NULL,                           /* startup(irq) */
-       NULL,                           /* shutdown(irq) */
-       mpc52xx_ic_enable,              /* enable(irq) */
-       mpc52xx_ic_disable,             /* disable(irq) */
-       mpc52xx_ic_disable_and_ack,     /* disable_and_ack(irq) */
-       mpc52xx_ic_end,                 /* end(irq) */
-       NULL                            /* set_affinity(irq, cpumask) SMP. */
+       .typename       = "MPC52xx",
+       .enable         = mpc52xx_ic_enable,
+       .disable        = mpc52xx_ic_disable,
+       .ack            = mpc52xx_ic_disable_and_ack,
+       .end            = mpc52xx_ic_end,

};

void __init

On Fri, Mar 11, 2005 at 09:47:40PM +0100, Sylvain Munaut wrote:

[snip]

[snip]

Shouldn't that be " MPC52xx ", or is that another field I'm thinking of?

Tom Rini
http://gate.crashing.org/~trini/