Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 426c1a11 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

powerpc: move iSeries/iSeries_pci.h to platforms/iseries 



The only real user of this file outside platforms/iseries was
drivers/net/iseries_veth.c but all it wanted was ISERIES_HV_ADDR()
so we move that to abs_addr.h (and lowercase it).

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 190554db

arch/powerpc/platforms/iseries/iommu.c

+4 −2
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ 
#include <asm/iommu.h>

#include <asm/tce.h>

#include <asm/machdep.h>

#include <asm/abs_addr.h>

#include <asm/iSeries/HvCallXm.h>

#include <asm/iSeries/iSeries_pci.h>



#include "pci.h"



extern struct list_head iSeries_Global_Device_List;
@@ -127,7 +129,7 @@ static void iommu_table_getparms(struct device_node *dn, 
	parms->itc_slotno = PCI_DN(dn)->LogicalSlot;

	parms->itc_virtbus = 0;



	HvCallXm_getTceTableParms(ISERIES_HV_ADDR(parms));

	HvCallXm_getTceTableParms(iseries_hv_addr(parms));



	if (parms->itc_size == 0)

		panic("PCI_DMA: parms->size is zero, parms is 0x%p", parms);

arch/powerpc/platforms/iseries/mf.c

+5 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/time.h>

#include <asm/uaccess.h>

#include <asm/paca.h>

#include <asm/abs_addr.h>

#include <asm/iSeries/vio.h>

#include <asm/iSeries/mf.h>

#include <asm/iSeries/HvLpConfig.h>
@@ -1064,10 +1065,10 @@ static void mf_getSrcHistory(char *buffer, int size) 
	ev->event.data.vsp_cmd.lp_index = HvLpConfig_getLpIndex();

	ev->event.data.vsp_cmd.result_code = 0xFF;

	ev->event.data.vsp_cmd.reserved = 0;

	ev->event.data.vsp_cmd.sub_data.page[0] = ISERIES_HV_ADDR(pages[0]);

	ev->event.data.vsp_cmd.sub_data.page[1] = ISERIES_HV_ADDR(pages[1]);

	ev->event.data.vsp_cmd.sub_data.page[2] = ISERIES_HV_ADDR(pages[2]);

	ev->event.data.vsp_cmd.sub_data.page[3] = ISERIES_HV_ADDR(pages[3]);

	ev->event.data.vsp_cmd.sub_data.page[0] = iseries_hv_addr(pages[0]);

	ev->event.data.vsp_cmd.sub_data.page[1] = iseries_hv_addr(pages[1]);

	ev->event.data.vsp_cmd.sub_data.page[2] = iseries_hv_addr(pages[2]);

	ev->event.data.vsp_cmd.sub_data.page[3] = iseries_hv_addr(pages[3]);

	mb();

	if (signal_event(ev) != 0)

		return;

arch/powerpc/platforms/iseries/pci.c

+4 −3
Original line number Diff line number Diff line
@@ -34,15 +34,16 @@ 
#include <asm/pci-bridge.h>

#include <asm/ppcdebug.h>

#include <asm/iommu.h>

#include <asm/abs_addr.h>



#include <asm/iSeries/HvCallPci.h>

#include <asm/iSeries/HvCallXm.h>

#include <asm/iSeries/iSeries_pci.h>

#include <asm/iSeries/mf.h>



#include <asm/ppc-pci.h>



#include "irq.h"

#include "pci.h"



extern unsigned long io_page_mask;
@@ -368,7 +369,7 @@ static void scan_PHB_slots(struct pci_controller *Phb) 
	 */

	for (IdSel = 1; IdSel < MaxAgents; ++IdSel) {

		HvRc = HvCallPci_getDeviceInfo(bus, SubBus, IdSel,

				ISERIES_HV_ADDR(DevInfo),

				iseries_hv_addr(DevInfo),

				sizeof(struct HvCallPci_DeviceInfo));

		if (HvRc == 0) {

			if (DevInfo->deviceType == HvCallPci_NodeDevice)
@@ -409,7 +410,7 @@ static void scan_EADS_bridge(HvBusNumber bus, HvSubBusNumber SubBus, 
					"PCI:Connect EADs: 0x%02X.%02X.%02X\n",

					bus, SubBus, AgentId);

			HvRc = HvCallPci_getBusUnitInfo(bus, SubBus, AgentId,

					ISERIES_HV_ADDR(BridgeInfo),

					iseries_hv_addr(BridgeInfo),

					sizeof(struct HvCallPci_BridgeInfo));

			if (HvRc == 0) {

				printk("bridge info: type %x subbus %x maxAgents %x maxsubbus %x logslot %x\n",

include/asm-ppc64/iSeries/iSeries_pci.h→arch/powerpc/platforms/iseries/pci.h

+4 −15
Original line number Diff line number Diff line 
#ifndef _ISERIES_64_PCI_H

#define _ISERIES_64_PCI_H

#ifndef _PLATFORMS_ISERIES_PCI_H

#define _PLATFORMS_ISERIES_PCI_H



/*

 * File iSeries_pci.h created by Allan Trautman on Tue Feb 20, 2001.

 * Created by Allan Trautman on Tue Feb 20, 2001.

 *

 * Define some useful macros for the iSeries pci routines.

 * Copyright (C) 2001  Allan H Trautman, IBM Corporation
@@ -30,8 +30,6 @@ 
 * End Change Activity

 */



#include <asm/abs_addr.h>

#include <asm/prom.h>

#include <asm/pci-bridge.h>



struct pci_dev;				/* For Forward Reference */
@@ -42,9 +40,6 @@ struct pci_dev; /* For Forward Reference */ 


#define ISERIES_BUS(DevPtr)	PCI_DN(DevPtr)->DsaAddr.Dsa.busNumber

#define ISERIES_SUBBUS(DevPtr)	PCI_DN(DevPtr)->DsaAddr.Dsa.subBusNumber

#define ISERIES_DEVNODE(PciDev)	((struct device_node *)PciDev->sysdata)



#define EADsMaxAgents 7



/*

 * Decodes Linux DevFn to iSeries DevFn, bridge device, or function.
@@ -59,12 +54,6 @@ struct pci_dev; /* For Forward Reference */ 
#define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus)		((subbus >> 5) & 0x7)

#define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus)	((subbus >> 2) & 0x7)



/*

 * Converts Virtual Address to Real Address for Hypervisor calls

 */

#define ISERIES_HV_ADDR(virtaddr)	\

	(0x8000000000000000 | virt_to_abs(virtaddr))



extern void	iSeries_Device_Information(struct pci_dev*, int);



#endif /* _ISERIES_64_PCI_H */
 
#endif /* _PLATFORMS_ISERIES_PCI_H */

arch/powerpc/platforms/iseries/vpdinfo.c

+5 −3
Original line number Diff line number Diff line
@@ -27,12 +27,14 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/pci.h>



#include <asm/types.h>

#include <asm/resource.h>



#include <asm/abs_addr.h>

#include <asm/iSeries/HvCallPci.h>

#include <asm/iSeries/HvTypes.h>

#include <asm/iSeries/iSeries_pci.h>



#include "pci.h"



/*

 * Size of Bus VPD data
@@ -212,7 +214,7 @@ static void __init iSeries_Get_Location_Code(u16 bus, HvAgentId agent, 
		printk("PCI: Bus VPD Buffer allocation failure.\n");

		return;

	}

	BusVpdLen = HvCallPci_getBusVpd(bus, ISERIES_HV_ADDR(BusVpdPtr),

	BusVpdLen = HvCallPci_getBusVpd(bus, iseries_hv_addr(BusVpdPtr),

					BUS_VPDSIZE);

	if (BusVpdLen == 0) {

		printk("PCI: Bus VPD Buffer zero length.\n");