Commit f134bd1e authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: sgi-ip27: Fix missing prototypes 



Fix missing prototypes by making not shared functions static and
adding others to ip27-common.h. Also drop ip27-hubio.c as it's
not used for a long time.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent feab1914

arch/mips/sgi-ip27/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


obj-y	:= ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o \

	   ip27-klnuma.o ip27-memory.o ip27-nmi.o ip27-reset.o ip27-timer.o \

	   ip27-hubio.o ip27-xtalk.o

	   ip27-xtalk.o



obj-$(CONFIG_EARLY_PRINTK)	+= ip27-console.o

obj-$(CONFIG_SMP)		+= ip27-smp.o

arch/mips/sgi-ip27/ip27-berr.c

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <asm/traps.h>

#include <linux/uaccess.h>



#include "ip27-common.h"



static void dump_hub_information(unsigned long errst0, unsigned long errst1)

{

	static char *err_type[2][8] = {
@@ -57,7 +59,7 @@ static void dump_hub_information(unsigned long errst0, unsigned long errst1) 
	       [st0.pi_stat0_fmt.s0_err_type] ? : "invalid");

}



int ip27_be_handler(struct pt_regs *regs, int is_fixup)

static int ip27_be_handler(struct pt_regs *regs, int is_fixup)

{

	unsigned long errst0, errst1;

	int data = regs->cp0_cause & 4;

arch/mips/sgi-ip27/ip27-common.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ extern void hub_rt_clock_event_init(void); 
extern void hub_rtc_init(nasid_t nasid);

extern void install_cpu_nmi_handler(int slice);

extern void install_ipi(void);

extern void ip27_be_init(void);

extern void ip27_reboot_setup(void);

extern const struct plat_smp_ops ip27_smp_ops;

extern unsigned long node_getfirstfree(nasid_t nasid);
@@ -17,4 +18,5 @@ extern void per_cpu_init(void); 
extern void replicate_kernel_text(void);

extern void setup_replication_mask(void);





#endif /* __IP27_COMMON_H */

arch/mips/sgi-ip27/ip27-hubio.c

deleted100644 → 0
+0 −185
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 1992-1997, 2000-2003 Silicon Graphics, Inc.

 * Copyright (C) 2004 Christoph Hellwig.

 *

 * Support functions for the HUB ASIC - mostly PIO mapping related.

 */



#include <linux/bitops.h>

#include <linux/string.h>

#include <linux/mmzone.h>

#include <asm/sn/addrs.h>

#include <asm/sn/arch.h>

#include <asm/sn/agent.h>

#include <asm/sn/io.h>

#include <asm/xtalk/xtalk.h>





static int force_fire_and_forget = 1;



/**

 * hub_pio_map	-  establish a HUB PIO mapping

 *

 * @nasid:	nasid to perform PIO mapping on

 * @widget:	widget ID to perform PIO mapping for

 * @xtalk_addr: xtalk_address that needs to be mapped

 * @size:	size of the PIO mapping

 *

 **/

unsigned long hub_pio_map(nasid_t nasid, xwidgetnum_t widget,

			  unsigned long xtalk_addr, size_t size)

{

	unsigned i;



	/* use small-window mapping if possible */

	if ((xtalk_addr % SWIN_SIZE) + size <= SWIN_SIZE)

		return NODE_SWIN_BASE(nasid, widget) + (xtalk_addr % SWIN_SIZE);



	if ((xtalk_addr % BWIN_SIZE) + size > BWIN_SIZE) {

		printk(KERN_WARNING "PIO mapping at hub %d widget %d addr 0x%lx"

				" too big (%ld)\n",

				nasid, widget, xtalk_addr, size);

		return 0;

	}



	xtalk_addr &= ~(BWIN_SIZE-1);

	for (i = 0; i < HUB_NUM_BIG_WINDOW; i++) {

		if (test_and_set_bit(i, hub_data(nasid)->h_bigwin_used))

			continue;



		/*

		 * The code below does a PIO write to setup an ITTE entry.

		 *

		 * We need to prevent other CPUs from seeing our updated

		 * memory shadow of the ITTE (in the piomap) until the ITTE

		 * entry is actually set up; otherwise, another CPU might

		 * attempt a PIO prematurely.

		 *

		 * Also, the only way we can know that an entry has been

		 * received  by the hub and can be used by future PIO reads/

		 * writes is by reading back the ITTE entry after writing it.

		 *

		 * For these two reasons, we PIO read back the ITTE entry

		 * after we write it.

		 */

		IIO_ITTE_PUT(nasid, i, HUB_PIO_MAP_TO_MEM, widget, xtalk_addr);

		__raw_readq(IIO_ITTE_GET(nasid, i));



		return NODE_BWIN_BASE(nasid, widget) + (xtalk_addr % BWIN_SIZE);

	}



	printk(KERN_WARNING "unable to establish PIO mapping for at"

			" hub %d widget %d addr 0x%lx\n",

			nasid, widget, xtalk_addr);

	return 0;

}





/*

 * hub_setup_prb(nasid, prbnum, credits, conveyor)

 *

 *	Put a PRB into fire-and-forget mode if conveyor isn't set.  Otherwise,

 *	put it into conveyor belt mode with the specified number of credits.

 */

static void hub_setup_prb(nasid_t nasid, int prbnum, int credits)

{

	union iprb_u prb;

	int prb_offset;



	/*

	 * Get the current register value.

	 */

	prb_offset = IIO_IOPRB(prbnum);

	prb.iprb_regval = REMOTE_HUB_L(nasid, prb_offset);



	/*

	 * Clear out some fields.

	 */

	prb.iprb_ovflow = 1;

	prb.iprb_bnakctr = 0;

	prb.iprb_anakctr = 0;



	/*

	 * Enable or disable fire-and-forget mode.

	 */

	prb.iprb_ff = force_fire_and_forget ? 1 : 0;



	/*

	 * Set the appropriate number of PIO credits for the widget.

	 */

	prb.iprb_xtalkctr = credits;



	/*

	 * Store the new value to the register.

	 */

	REMOTE_HUB_S(nasid, prb_offset, prb.iprb_regval);

}



/**

 * hub_set_piomode  -  set pio mode for a given hub

 *

 * @nasid:	physical node ID for the hub in question

 *

 * Put the hub into either "PIO conveyor belt" mode or "fire-and-forget" mode.

 * To do this, we have to make absolutely sure that no PIOs are in progress

 * so we turn off access to all widgets for the duration of the function.

 *

 * XXX - This code should really check what kind of widget we're talking

 * to.	Bridges can only handle three requests, but XG will do more.

 * How many can crossbow handle to widget 0?  We're assuming 1.

 *

 * XXX - There is a bug in the crossbow that link reset PIOs do not

 * return write responses.  The easiest solution to this problem is to

 * leave widget 0 (xbow) in fire-and-forget mode at all times.	This

 * only affects pio's to xbow registers, which should be rare.

 **/

static void hub_set_piomode(nasid_t nasid)

{

	u64 ii_iowa;

	union hubii_wcr_u ii_wcr;

	unsigned i;



	ii_iowa = REMOTE_HUB_L(nasid, IIO_OUTWIDGET_ACCESS);

	REMOTE_HUB_S(nasid, IIO_OUTWIDGET_ACCESS, 0);



	ii_wcr.wcr_reg_value = REMOTE_HUB_L(nasid, IIO_WCR);



	if (ii_wcr.iwcr_dir_con) {

		/*

		 * Assume a bridge here.

		 */

		hub_setup_prb(nasid, 0, 3);

	} else {

		/*

		 * Assume a crossbow here.

		 */

		hub_setup_prb(nasid, 0, 1);

	}



	/*

	 * XXX - Here's where we should take the widget type into

	 * when account assigning credits.

	 */

	for (i = HUB_WIDGET_ID_MIN; i <= HUB_WIDGET_ID_MAX; i++)

		hub_setup_prb(nasid, i, 3);



	REMOTE_HUB_S(nasid, IIO_OUTWIDGET_ACCESS, ii_iowa);

}



/*

 * hub_pio_init	 -  PIO-related hub initialization

 *

 * @hub:	hubinfo structure for our hub

 */

void hub_pio_init(nasid_t nasid)

{

	unsigned i;



	/* initialize big window piomaps for this hub */

	bitmap_zero(hub_data(nasid)->h_bigwin_used, HUB_NUM_BIG_WINDOW);

	for (i = 0; i < HUB_NUM_BIG_WINDOW; i++)

		IIO_ITTE_DISABLE(nasid, i);



	hub_set_piomode(nasid);

}

arch/mips/sgi-ip27/ip27-irq.c

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <asm/sn/intr.h>

#include <asm/sn/irq_alloc.h>



#include "ip27-common.h"



struct hub_irq_data {

	u64	*irq_mask[2];

	cpuid_t	cpu;