[PATCH] ppc64: split iSeries specific parts out of vio.c
This patch splits the iSeries specific parts out of vio.c. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Stephen Rothwell
Paul Mackerras
Родитель
6020164499
Коммит
3e494c8048
|
|
@ -50,7 +50,9 @@ obj-$(CONFIG_LPARCFG) += lparcfg.o
|
|||
obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
|
||||
obj-$(CONFIG_BOOTX_TEXT) += btext.o
|
||||
obj-$(CONFIG_HVCS) += hvcserver.o
|
||||
obj-$(CONFIG_IBMVIO) += vio.o
|
||||
|
||||
vio-obj-$(CONFIG_PPC_ISERIES) += iSeries_vio.o
|
||||
obj-$(CONFIG_IBMVIO) += vio.o $(vio-obj-y)
|
||||
obj-$(CONFIG_XICS) += xics.o
|
||||
obj-$(CONFIG_MPIC) += mpic.o
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,133 @@
|
|||
/*
|
||||
* IBM PowerPC iSeries Virtual I/O Infrastructure Support.
|
||||
*
|
||||
* Copyright (c) 2005 Stephen Rothwell, IBM Corp.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
#include <linux/types.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
#include <asm/vio.h>
|
||||
#include <asm/iommu.h>
|
||||
#include <asm/abs_addr.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/iSeries/vio.h>
|
||||
#include <asm/iSeries/HvTypes.h>
|
||||
#include <asm/iSeries/HvLpConfig.h>
|
||||
#include <asm/iSeries/HvCallXm.h>
|
||||
|
||||
struct device *iSeries_vio_dev = &vio_bus_device.dev;
|
||||
EXPORT_SYMBOL(iSeries_vio_dev);
|
||||
|
||||
static struct iommu_table veth_iommu_table;
|
||||
static struct iommu_table vio_iommu_table;
|
||||
|
||||
void __init iommu_vio_init(void)
|
||||
{
|
||||
struct iommu_table *t;
|
||||
struct iommu_table_cb cb;
|
||||
unsigned long cbp;
|
||||
unsigned long itc_entries;
|
||||
|
||||
cb.itc_busno = 255; /* Bus 255 is the virtual bus */
|
||||
cb.itc_virtbus = 0xff; /* Ask for virtual bus */
|
||||
|
||||
cbp = virt_to_abs(&cb);
|
||||
HvCallXm_getTceTableParms(cbp);
|
||||
|
||||
itc_entries = cb.itc_size * PAGE_SIZE / sizeof(union tce_entry);
|
||||
veth_iommu_table.it_size = itc_entries / 2;
|
||||
veth_iommu_table.it_busno = cb.itc_busno;
|
||||
veth_iommu_table.it_offset = cb.itc_offset;
|
||||
veth_iommu_table.it_index = cb.itc_index;
|
||||
veth_iommu_table.it_type = TCE_VB;
|
||||
veth_iommu_table.it_blocksize = 1;
|
||||
|
||||
t = iommu_init_table(&veth_iommu_table);
|
||||
|
||||
if (!t)
|
||||
printk("Virtual Bus VETH TCE table failed.\n");
|
||||
|
||||
vio_iommu_table.it_size = itc_entries - veth_iommu_table.it_size;
|
||||
vio_iommu_table.it_busno = cb.itc_busno;
|
||||
vio_iommu_table.it_offset = cb.itc_offset +
|
||||
veth_iommu_table.it_size;
|
||||
vio_iommu_table.it_index = cb.itc_index;
|
||||
vio_iommu_table.it_type = TCE_VB;
|
||||
vio_iommu_table.it_blocksize = 1;
|
||||
|
||||
t = iommu_init_table(&vio_iommu_table);
|
||||
|
||||
if (!t)
|
||||
printk("Virtual Bus VIO TCE table failed.\n");
|
||||
}
|
||||
|
||||
/**
|
||||
* vio_register_device: - Register a new vio device.
|
||||
* @voidev: The device to register.
|
||||
*/
|
||||
static struct vio_dev *__init vio_register_device_iseries(char *type,
|
||||
uint32_t unit_num)
|
||||
{
|
||||
struct vio_dev *viodev;
|
||||
|
||||
/* allocate a vio_dev for this node */
|
||||
viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);
|
||||
if (!viodev)
|
||||
return NULL;
|
||||
memset(viodev, 0, sizeof(struct vio_dev));
|
||||
|
||||
snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%s%d", type, unit_num);
|
||||
|
||||
return vio_register_device_common(viodev, viodev->dev.bus_id, type,
|
||||
unit_num, &vio_iommu_table);
|
||||
}
|
||||
|
||||
void __init probe_bus_iseries(void)
|
||||
{
|
||||
HvLpIndexMap vlan_map;
|
||||
struct vio_dev *viodev;
|
||||
int i;
|
||||
|
||||
/* there is only one of each of these */
|
||||
vio_register_device_iseries("viocons", 0);
|
||||
vio_register_device_iseries("vscsi", 0);
|
||||
|
||||
vlan_map = HvLpConfig_getVirtualLanIndexMap();
|
||||
for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) {
|
||||
if ((vlan_map & (0x8000 >> i)) == 0)
|
||||
continue;
|
||||
viodev = vio_register_device_iseries("vlan", i);
|
||||
/* veth is special and has it own iommu_table */
|
||||
viodev->iommu_table = &veth_iommu_table;
|
||||
}
|
||||
for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++)
|
||||
vio_register_device_iseries("viodasd", i);
|
||||
for (i = 0; i < HVMAXARCHITECTEDVIRTUALCDROMS; i++)
|
||||
vio_register_device_iseries("viocd", i);
|
||||
for (i = 0; i < HVMAXARCHITECTEDVIRTUALTAPES; i++)
|
||||
vio_register_device_iseries("viotape", i);
|
||||
}
|
||||
|
||||
/**
|
||||
* vio_bus_init_iseries: - Initialize the iSeries virtual IO bus
|
||||
*/
|
||||
static int __init vio_bus_init_iseries(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = vio_bus_init();
|
||||
if (err == 0) {
|
||||
vio_bus_device.iommu_table = &vio_iommu_table;
|
||||
iSeries_vio_dev = &vio_bus_device.dev;
|
||||
probe_bus_iseries();
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
__initcall(vio_bus_init_iseries);
|
||||
|
|
@ -25,10 +25,6 @@
|
|||
#include <asm/ppcdebug.h>
|
||||
#include <asm/vio.h>
|
||||
#include <asm/hvcall.h>
|
||||
#include <asm/iSeries/vio.h>
|
||||
#include <asm/iSeries/HvTypes.h>
|
||||
#include <asm/iSeries/HvCallXm.h>
|
||||
#include <asm/iSeries/HvLpConfig.h>
|
||||
|
||||
#define DBGENTER() pr_debug("%s entered\n", __FUNCTION__)
|
||||
|
||||
|
|
@ -41,26 +37,14 @@ static const struct vio_device_id *vio_match_device(
|
|||
static struct iommu_table *vio_build_iommu_table(struct vio_dev *);
|
||||
static int vio_num_address_cells;
|
||||
#endif
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
static struct iommu_table veth_iommu_table;
|
||||
static struct iommu_table vio_iommu_table;
|
||||
#endif
|
||||
static struct vio_dev vio_bus_device = { /* fake "parent" device */
|
||||
struct vio_dev vio_bus_device = { /* fake "parent" device */
|
||||
.name = vio_bus_device.dev.bus_id,
|
||||
.type = "",
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
.iommu_table = &vio_iommu_table,
|
||||
#endif
|
||||
.dev.bus_id = "vio",
|
||||
.dev.bus = &vio_bus_type,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
static struct vio_dev *__init vio_register_device_iseries(char *type,
|
||||
uint32_t unit_num);
|
||||
|
||||
struct device *iSeries_vio_dev = &vio_bus_device.dev;
|
||||
EXPORT_SYMBOL(iSeries_vio_dev);
|
||||
|
||||
#define device_is_compatible(a, b) 1
|
||||
|
||||
|
|
@ -157,48 +141,6 @@ static const struct vio_device_id * vio_match_device(const struct vio_device_id
|
|||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
void __init iommu_vio_init(void)
|
||||
{
|
||||
struct iommu_table *t;
|
||||
struct iommu_table_cb cb;
|
||||
unsigned long cbp;
|
||||
unsigned long itc_entries;
|
||||
|
||||
cb.itc_busno = 255; /* Bus 255 is the virtual bus */
|
||||
cb.itc_virtbus = 0xff; /* Ask for virtual bus */
|
||||
|
||||
cbp = virt_to_abs(&cb);
|
||||
HvCallXm_getTceTableParms(cbp);
|
||||
|
||||
itc_entries = cb.itc_size * PAGE_SIZE / sizeof(union tce_entry);
|
||||
veth_iommu_table.it_size = itc_entries / 2;
|
||||
veth_iommu_table.it_busno = cb.itc_busno;
|
||||
veth_iommu_table.it_offset = cb.itc_offset;
|
||||
veth_iommu_table.it_index = cb.itc_index;
|
||||
veth_iommu_table.it_type = TCE_VB;
|
||||
veth_iommu_table.it_blocksize = 1;
|
||||
|
||||
t = iommu_init_table(&veth_iommu_table);
|
||||
|
||||
if (!t)
|
||||
printk("Virtual Bus VETH TCE table failed.\n");
|
||||
|
||||
vio_iommu_table.it_size = itc_entries - veth_iommu_table.it_size;
|
||||
vio_iommu_table.it_busno = cb.itc_busno;
|
||||
vio_iommu_table.it_offset = cb.itc_offset +
|
||||
veth_iommu_table.it_size;
|
||||
vio_iommu_table.it_index = cb.itc_index;
|
||||
vio_iommu_table.it_type = TCE_VB;
|
||||
vio_iommu_table.it_blocksize = 1;
|
||||
|
||||
t = iommu_init_table(&vio_iommu_table);
|
||||
|
||||
if (!t)
|
||||
printk("Virtual Bus VIO TCE table failed.\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
static void probe_bus_pseries(void)
|
||||
{
|
||||
|
|
@ -223,38 +165,10 @@ static void probe_bus_pseries(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
static void probe_bus_iseries(void)
|
||||
{
|
||||
HvLpIndexMap vlan_map = HvLpConfig_getVirtualLanIndexMap();
|
||||
struct vio_dev *viodev;
|
||||
int i;
|
||||
|
||||
/* there is only one of each of these */
|
||||
vio_register_device_iseries("viocons", 0);
|
||||
vio_register_device_iseries("vscsi", 0);
|
||||
|
||||
vlan_map = HvLpConfig_getVirtualLanIndexMap();
|
||||
for (i = 0; i < HVMAXARCHITECTEDVIRTUALLANS; i++) {
|
||||
if ((vlan_map & (0x8000 >> i)) == 0)
|
||||
continue;
|
||||
viodev = vio_register_device_iseries("vlan", i);
|
||||
/* veth is special and has it own iommu_table */
|
||||
viodev->iommu_table = &veth_iommu_table;
|
||||
}
|
||||
for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++)
|
||||
vio_register_device_iseries("viodasd", i);
|
||||
for (i = 0; i < HVMAXARCHITECTEDVIRTUALCDROMS; i++)
|
||||
vio_register_device_iseries("viocd", i);
|
||||
for (i = 0; i < HVMAXARCHITECTEDVIRTUALTAPES; i++)
|
||||
vio_register_device_iseries("viotape", i);
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* vio_bus_init: - Initialize the virtual IO bus
|
||||
*/
|
||||
static int __init vio_bus_init(void)
|
||||
int __init vio_bus_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
|
|
@ -264,25 +178,35 @@ static int __init vio_bus_init(void)
|
|||
return err;
|
||||
}
|
||||
|
||||
/* the fake parent of all vio devices, just to give us a nice directory */
|
||||
/* the fake parent of all vio devices, just to give us
|
||||
* a nice directory
|
||||
*/
|
||||
err = device_register(&vio_bus_device.dev);
|
||||
if (err) {
|
||||
printk(KERN_WARNING "%s: device_register returned %i\n", __FUNCTION__,
|
||||
err);
|
||||
printk(KERN_WARNING "%s: device_register returned %i\n",
|
||||
__FUNCTION__, err);
|
||||
return err;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
probe_bus_pseries();
|
||||
#endif
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
probe_bus_iseries();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
__initcall(vio_bus_init);
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
/**
|
||||
* vio_bus_init_pseries: - Initialize the pSeries virtual IO bus
|
||||
*/
|
||||
static int __init vio_bus_init_pseries(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = vio_bus_init();
|
||||
if (err == 0)
|
||||
probe_bus_pseries();
|
||||
return err;
|
||||
}
|
||||
|
||||
__initcall(vio_bus_init_pseries);
|
||||
#endif
|
||||
|
||||
/* vio_dev refcount hit 0 */
|
||||
static void __devinit vio_dev_release(struct device *dev)
|
||||
|
|
@ -312,7 +236,7 @@ static ssize_t viodev_show_name(struct device *dev, struct device_attribute *att
|
|||
}
|
||||
DEVICE_ATTR(name, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_name, NULL);
|
||||
|
||||
static struct vio_dev * __devinit vio_register_device_common(
|
||||
struct vio_dev * __devinit vio_register_device_common(
|
||||
struct vio_dev *viodev, char *name, char *type,
|
||||
uint32_t unit_address, struct iommu_table *iommu_table)
|
||||
{
|
||||
|
|
@ -408,31 +332,6 @@ struct vio_dev * __devinit vio_register_device_node(struct device_node *of_node)
|
|||
EXPORT_SYMBOL(vio_register_device_node);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC_ISERIES
|
||||
/**
|
||||
* vio_register_device: - Register a new vio device.
|
||||
* @voidev: The device to register.
|
||||
*/
|
||||
static struct vio_dev *__init vio_register_device_iseries(char *type,
|
||||
uint32_t unit_num)
|
||||
{
|
||||
struct vio_dev *viodev;
|
||||
|
||||
DBGENTER();
|
||||
|
||||
/* allocate a vio_dev for this node */
|
||||
viodev = kmalloc(sizeof(struct vio_dev), GFP_KERNEL);
|
||||
if (!viodev)
|
||||
return NULL;
|
||||
memset(viodev, 0, sizeof(struct vio_dev));
|
||||
|
||||
snprintf(viodev->dev.bus_id, BUS_ID_SIZE, "%s%d", type, unit_num);
|
||||
|
||||
return vio_register_device_common(viodev, viodev->dev.bus_id, type,
|
||||
unit_num, &vio_iommu_table);
|
||||
}
|
||||
#endif
|
||||
|
||||
void __devinit vio_unregister_device(struct vio_dev *viodev)
|
||||
{
|
||||
DBGENTER();
|
||||
|
|
|
|||
|
|
@ -56,6 +56,9 @@ const void * vio_get_attribute(struct vio_dev *vdev, void* which, int* length);
|
|||
int vio_get_irq(struct vio_dev *dev);
|
||||
int vio_enable_interrupts(struct vio_dev *dev);
|
||||
int vio_disable_interrupts(struct vio_dev *dev);
|
||||
extern struct vio_dev * __devinit vio_register_device_common(
|
||||
struct vio_dev *viodev, char *name, char *type,
|
||||
uint32_t unit_address, struct iommu_table *iommu_table);
|
||||
|
||||
extern struct dma_mapping_ops vio_dma_ops;
|
||||
|
||||
|
|
@ -95,9 +98,13 @@ struct vio_dev {
|
|||
struct device dev;
|
||||
};
|
||||
|
||||
extern struct vio_dev vio_bus_device;
|
||||
|
||||
static inline struct vio_dev *to_vio_dev(struct device *dev)
|
||||
{
|
||||
return container_of(dev, struct vio_dev, dev);
|
||||
}
|
||||
|
||||
extern int vio_bus_init(void);
|
||||
|
||||
#endif /* _ASM_VIO_H */
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче