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

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
...@@ -30,8 +30,10 @@ ...@@ -30,8 +30,10 @@
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/tce.h> #include <asm/tce.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/abs_addr.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iSeries/HvCallXm.h>
#include <asm/iSeries/iSeries_pci.h>
#include "pci.h"
extern struct list_head iSeries_Global_Device_List; extern struct list_head iSeries_Global_Device_List;
...@@ -127,7 +129,7 @@ static void iommu_table_getparms(struct device_node *dn, ...@@ -127,7 +129,7 @@ static void iommu_table_getparms(struct device_node *dn,
parms->itc_slotno = PCI_DN(dn)->LogicalSlot; parms->itc_slotno = PCI_DN(dn)->LogicalSlot;
parms->itc_virtbus = 0; parms->itc_virtbus = 0;
HvCallXm_getTceTableParms(ISERIES_HV_ADDR(parms)); HvCallXm_getTceTableParms(iseries_hv_addr(parms));
if (parms->itc_size == 0) if (parms->itc_size == 0)
panic("PCI_DMA: parms->size is zero, parms is 0x%p", parms); panic("PCI_DMA: parms->size is zero, parms is 0x%p", parms);
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <asm/time.h> #include <asm/time.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/paca.h> #include <asm/paca.h>
#include <asm/abs_addr.h>
#include <asm/iSeries/vio.h> #include <asm/iSeries/vio.h>
#include <asm/iSeries/mf.h> #include <asm/iSeries/mf.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iSeries/HvLpConfig.h>
...@@ -1064,10 +1065,10 @@ static void mf_getSrcHistory(char *buffer, int size) ...@@ -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.lp_index = HvLpConfig_getLpIndex();
ev->event.data.vsp_cmd.result_code = 0xFF; ev->event.data.vsp_cmd.result_code = 0xFF;
ev->event.data.vsp_cmd.reserved = 0; 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[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[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[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[3] = iseries_hv_addr(pages[3]);
mb(); mb();
if (signal_event(ev) != 0) if (signal_event(ev) != 0)
return; return;
......
...@@ -34,15 +34,16 @@ ...@@ -34,15 +34,16 @@
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/ppcdebug.h> #include <asm/ppcdebug.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/abs_addr.h>
#include <asm/iSeries/HvCallPci.h> #include <asm/iSeries/HvCallPci.h>
#include <asm/iSeries/HvCallXm.h> #include <asm/iSeries/HvCallXm.h>
#include <asm/iSeries/iSeries_pci.h>
#include <asm/iSeries/mf.h> #include <asm/iSeries/mf.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
#include "irq.h" #include "irq.h"
#include "pci.h"
extern unsigned long io_page_mask; extern unsigned long io_page_mask;
...@@ -368,7 +369,7 @@ static void scan_PHB_slots(struct pci_controller *Phb) ...@@ -368,7 +369,7 @@ static void scan_PHB_slots(struct pci_controller *Phb)
*/ */
for (IdSel = 1; IdSel < MaxAgents; ++IdSel) { for (IdSel = 1; IdSel < MaxAgents; ++IdSel) {
HvRc = HvCallPci_getDeviceInfo(bus, SubBus, IdSel, HvRc = HvCallPci_getDeviceInfo(bus, SubBus, IdSel,
ISERIES_HV_ADDR(DevInfo), iseries_hv_addr(DevInfo),
sizeof(struct HvCallPci_DeviceInfo)); sizeof(struct HvCallPci_DeviceInfo));
if (HvRc == 0) { if (HvRc == 0) {
if (DevInfo->deviceType == HvCallPci_NodeDevice) if (DevInfo->deviceType == HvCallPci_NodeDevice)
...@@ -409,7 +410,7 @@ static void scan_EADS_bridge(HvBusNumber bus, HvSubBusNumber SubBus, ...@@ -409,7 +410,7 @@ static void scan_EADS_bridge(HvBusNumber bus, HvSubBusNumber SubBus,
"PCI:Connect EADs: 0x%02X.%02X.%02X\n", "PCI:Connect EADs: 0x%02X.%02X.%02X\n",
bus, SubBus, AgentId); bus, SubBus, AgentId);
HvRc = HvCallPci_getBusUnitInfo(bus, SubBus, AgentId, HvRc = HvCallPci_getBusUnitInfo(bus, SubBus, AgentId,
ISERIES_HV_ADDR(BridgeInfo), iseries_hv_addr(BridgeInfo),
sizeof(struct HvCallPci_BridgeInfo)); sizeof(struct HvCallPci_BridgeInfo));
if (HvRc == 0) { if (HvRc == 0) {
printk("bridge info: type %x subbus %x maxAgents %x maxsubbus %x logslot %x\n", printk("bridge info: type %x subbus %x maxAgents %x maxsubbus %x logslot %x\n",
......
#ifndef _ISERIES_64_PCI_H #ifndef _PLATFORMS_ISERIES_PCI_H
#define _ISERIES_64_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. * Define some useful macros for the iSeries pci routines.
* Copyright (C) 2001 Allan H Trautman, IBM Corporation * Copyright (C) 2001 Allan H Trautman, IBM Corporation
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
* End Change Activity * End Change Activity
*/ */
#include <asm/abs_addr.h>
#include <asm/prom.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
struct pci_dev; /* For Forward Reference */ struct pci_dev; /* For Forward Reference */
...@@ -42,9 +40,6 @@ 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_BUS(DevPtr) PCI_DN(DevPtr)->DsaAddr.Dsa.busNumber
#define ISERIES_SUBBUS(DevPtr) PCI_DN(DevPtr)->DsaAddr.Dsa.subBusNumber #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. * Decodes Linux DevFn to iSeries DevFn, bridge device, or function.
...@@ -59,12 +54,6 @@ struct pci_dev; /* For Forward Reference */ ...@@ -59,12 +54,6 @@ struct pci_dev; /* For Forward Reference */
#define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus) ((subbus >> 5) & 0x7) #define ISERIES_GET_DEVICE_FROM_SUBBUS(subbus) ((subbus >> 5) & 0x7)
#define ISERIES_GET_FUNCTION_FROM_SUBBUS(subbus) ((subbus >> 2) & 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); extern void iSeries_Device_Information(struct pci_dev*, int);
#endif /* _ISERIES_64_PCI_H */ #endif /* _PLATFORMS_ISERIES_PCI_H */
...@@ -27,12 +27,14 @@ ...@@ -27,12 +27,14 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/resource.h> #include <asm/resource.h>
#include <asm/abs_addr.h>
#include <asm/iSeries/HvCallPci.h> #include <asm/iSeries/HvCallPci.h>
#include <asm/iSeries/HvTypes.h> #include <asm/iSeries/HvTypes.h>
#include <asm/iSeries/iSeries_pci.h>
#include "pci.h"
/* /*
* Size of Bus VPD data * Size of Bus VPD data
...@@ -212,7 +214,7 @@ static void __init iSeries_Get_Location_Code(u16 bus, HvAgentId agent, ...@@ -212,7 +214,7 @@ static void __init iSeries_Get_Location_Code(u16 bus, HvAgentId agent,
printk("PCI: Bus VPD Buffer allocation failure.\n"); printk("PCI: Bus VPD Buffer allocation failure.\n");
return; return;
} }
BusVpdLen = HvCallPci_getBusVpd(bus, ISERIES_HV_ADDR(BusVpdPtr), BusVpdLen = HvCallPci_getBusVpd(bus, iseries_hv_addr(BusVpdPtr),
BUS_VPDSIZE); BUS_VPDSIZE);
if (BusVpdLen == 0) { if (BusVpdLen == 0) {
printk("PCI: Bus VPD Buffer zero length.\n"); printk("PCI: Bus VPD Buffer zero length.\n");
......
/* /*
* arch/ppc64/kernel/pci_iommu.c * arch/ppc64/kernel/pci_iommu.c
* Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen, IBM Corporation
* *
* Rewrite, cleanup, new allocation schemes: * Rewrite, cleanup, new allocation schemes:
* Copyright (C) 2004 Olof Johansson, IBM Corporation * Copyright (C) 2004 Olof Johansson, IBM Corporation
* *
* Dynamic DMA mapping support, platform-independent parts. * Dynamic DMA mapping support, platform-independent parts.
...@@ -11,19 +11,18 @@ ...@@ -11,19 +11,18 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <linux/config.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -39,10 +38,6 @@ ...@@ -39,10 +38,6 @@
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/ppc-pci.h> #include <asm/ppc-pci.h>
#ifdef CONFIG_PPC_ISERIES
#include <asm/iSeries/iSeries_pci.h>
#endif /* CONFIG_PPC_ISERIES */
/* /*
* We can use ->sysdata directly and avoid the extra work in * We can use ->sysdata directly and avoid the extra work in
* pci_device_to_OF_node since ->sysdata will have been initialised * pci_device_to_OF_node since ->sysdata will have been initialised
......
...@@ -70,8 +70,9 @@ ...@@ -70,8 +70,9 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/ethtool.h> #include <linux/ethtool.h>
#include <asm/abs_addr.h>
#include <asm/iSeries/mf.h> #include <asm/iSeries/mf.h>
#include <asm/iSeries/iSeries_pci.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/iSeries/HvLpConfig.h> #include <asm/iSeries/HvLpConfig.h>
...@@ -1397,13 +1398,13 @@ static inline void veth_build_dma_list(struct dma_chunk *list, ...@@ -1397,13 +1398,13 @@ static inline void veth_build_dma_list(struct dma_chunk *list,
* it just at the granularity of iSeries real->absolute * it just at the granularity of iSeries real->absolute
* mapping? Indeed, given the way the allocator works, can we * mapping? Indeed, given the way the allocator works, can we
* count on them being absolutely contiguous? */ * count on them being absolutely contiguous? */
list[0].addr = ISERIES_HV_ADDR(p); list[0].addr = iseries_hv_addr(p);
list[0].size = min(length, list[0].size = min(length,
PAGE_SIZE - ((unsigned long)p & ~PAGE_MASK)); PAGE_SIZE - ((unsigned long)p & ~PAGE_MASK));
done = list[0].size; done = list[0].size;
while (done < length) { while (done < length) {
list[i].addr = ISERIES_HV_ADDR(p + done); list[i].addr = iseries_hv_addr(p + done);
list[i].size = min(length-done, PAGE_SIZE); list[i].size = min(length-done, PAGE_SIZE);
done += list[i].size; done += list[i].size;
i++; i++;
...@@ -1496,8 +1497,8 @@ static void veth_receive(struct veth_lpar_connection *cnx, ...@@ -1496,8 +1497,8 @@ static void veth_receive(struct veth_lpar_connection *cnx,
cnx->dst_inst, cnx->dst_inst,
HvLpDma_AddressType_RealAddress, HvLpDma_AddressType_RealAddress,
HvLpDma_AddressType_TceIndex, HvLpDma_AddressType_TceIndex,
ISERIES_HV_ADDR(&local_list), iseries_hv_addr(&local_list),
ISERIES_HV_ADDR(&remote_list), iseries_hv_addr(&remote_list),
length); length);
if (rc != HvLpDma_Rc_Good) { if (rc != HvLpDma_Rc_Good) {
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#ifndef _ASM_IOMMU_H #ifndef _ASM_IOMMU_H
#define _ASM_IOMMU_H #define _ASM_IOMMU_H
#include <linux/config.h>
#include <asm/types.h> #include <asm/types.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/device.h> #include <linux/device.h>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include <linux/config.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <asm/atomic.h> #include <asm/atomic.h>
......
...@@ -63,4 +63,11 @@ static inline unsigned long phys_to_abs(unsigned long pa) ...@@ -63,4 +63,11 @@ static inline unsigned long phys_to_abs(unsigned long pa)
#define virt_to_abs(va) phys_to_abs(__pa(va)) #define virt_to_abs(va) phys_to_abs(__pa(va))
#define abs_to_virt(aa) __va(aa) #define abs_to_virt(aa) __va(aa)
/*
* Converts Virtual Address to Real Address for
* Legacy iSeries Hypervisor calls
*/
#define iseries_hv_addr(virtaddr) \
(0x8000000000000000 | virt_to_abs(virtaddr))
#endif /* _ABS_ADDR_H */ #endif /* _ABS_ADDR_H */
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#ifndef _ASM_PCI_BRIDGE_H #ifndef _ASM_PCI_BRIDGE_H
#define _ASM_PCI_BRIDGE_H #define _ASM_PCI_BRIDGE_H
#include <linux/config.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/list.h> #include <linux/list.h>
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* as published by the Free Software Foundation; either version * as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include <linux/config.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <asm/atomic.h> #include <asm/atomic.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment