Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4241 → Rev 4242

/branches/dd/uspace/srv/pci/libpci/internal.h
38,6 → 38,4
struct pci_dev *pci_alloc_dev(struct pci_access *);
int pci_link_dev(struct pci_access *, struct pci_dev *);
 
extern struct pci_methods pm_intel_conf1, pm_intel_conf2, pm_us2i, pm_linux_proc,
pm_fbsd_device, pm_aix_device, pm_nbsd_libpci, pm_obsd_device,
pm_dump, pm_linux_sysfs;
extern struct pci_methods pm_intel_conf1, pm_intel_conf2, pm_us2i;
/branches/dd/uspace/srv/pci/libpci/us2i.c
4,10 → 4,10
#include <stdio.h>
 
#include "internal.h"
#include "header.h"
 
/* physical addresses and offsets */
#define U2P_BASE 0x1FE00000000
//#define U2P_BASE 0x1FE00000000
#define U2P_BASE 0x1ca00000000
#define PCI_CONF_OFFSET 0x001000000
#define PCI_CONF_SIZE 0x001000000
#define PCI_CONF_BASE (U2P_BASE + PCI_CONF_OFFSET)
22,9 → 22,10
* fn ... function number (0 - 7)
* reg ... register number (register's position within PCI configuration header)
**/
#define CONF_ADDR(bus, dev, fn, reg) (conf_addr + ((bus << 16) | (dev << 11) | (fn << 8) | (reg << 2)))
#define CONF_ADDR(bus, dev, fn, reg) ((void *)(conf_addr + ((bus << 16) | (dev << 11) | (fn << 8) | (reg << 0))))
 
 
 
static void us2i_init(struct pci_access *a)
{
}
33,39 → 34,118
{
}
 
static int us2i_detect(struct pci_access *a)
static inline uint64_t pio_read_64(uint64_t *port)
{
unsigned int tmp;
uint64_t rv;
 
rv = *port;
memory_barrier();
 
return rv;
}
 
 
// read whole 8-byte blocks
static void us2i_read_aligned(int bus, int dev, int fn, int pos, byte * buf, int len)
{
uint64_t aux;
int offset = pos % 8;
int aligned_pos = pos - offset;
if (len + offset > 8) {
len = 8 - offset;
}
void *addr = CONF_ADDR(bus, dev, fn, aligned_pos);
aux = pio_read_64(addr);
int i;
for (i = 0; i < len; i++) {
buf[i] = ((byte *)(&aux))[offset + i];
}
}
 
static int us2i_detect(struct pci_access *a)
{
/*
* Gain control over PCI configuration ports.
*/
if (pio_enable((void *)PCI_CONF_BASE, PCI_CONF_SIZE, &conf_addr)) {
return 0;
}
}
printf("PCI: conf_addr = %lx", conf_addr);
printf("PCI: vendor id address = %lx", CONF_ADDR(0, 0, 0, PCI_VENDOR_ID));
u16 vendor_id, device_id;
us2i_read_aligned(0, 0, 0, PCI_VENDOR_ID, &vendor_id, 2);
vendor_id = cpu_to_le16(vendor_id);
us2i_read_aligned(0, 0, 0, PCI_DEVICE_ID, &device_id, 2);
device_id = cpu_to_le16(device_id);
 
//int vendor_id = le16_to_cpu(pio_read_16(CONF_ADDR(0, 0, 0, PCI_VENDOR_ID)));
//int device_id = le16_to_cpu(pio_read_16(CONF_ADDR(0, 0, 0, PCI_DEVICE_ID)));
//int vendor_id = pio_read_8(CONF_ADDR(0, 0, 0, PCI_VENDOR_ID));
//vendor_id = vendor_id + pio_read_8(CONF_ADDR(0, 0, 0, PCI_VENDOR_ID + 1)) << 8;
//int device_id = pio_read_8(CONF_ADDR(0, 0, 0, PCI_DEVICE_ID));
//device_id = device_id | pio_read_8(CONF_ADDR(0, 0, 0, PCI_DEVICE_ID + 1)) << 8;
asm volatile ("sethi 0x42224, %g0");
int vendor_id = pio_read_16(CONF_ADDR(0, 0, 0, PCI_VENDOR_ID));
vendor_id = vendor_id | pio_read_8(CONF_ADDR(0, 0, 0, PCI_VENDOR_ID + 1)) << 8;
int device_id = pio_read_8(CONF_ADDR(0, 0, 0, PCI_DEVICE_ID));
device_id = device_id | pio_read_8(CONF_ADDR(0, 0, 0, PCI_DEVICE_ID + 1)) << 8;
printf("PCI: vendor id = %x", vendor_id);
printf("PCI: device id = %x", device_id);
printf("PCI: vendor id = %x\n", vendor_id);
printf("PCI: device id = %x\n", device_id);
 
return vendor_id == 0x108E && device_id == 0x8000; // should be Psycho from Sun Microsystems
// return vendor_id == 0x108E && device_id == 0x8000; // should be Psycho from Sun Microsystems ???
//return vendor_id == 0x108E /*&& device_id == 0x1000*/; // should be Psycho from Sun Microsystems
return 1;
}
 
static int us2i_read(struct pci_dev *d, int pos, byte * buf, int len)
{
void * addr = CONF_ADDR(d->bus, d->dev, d->func, pos);
if (pos >= 256)
return 0;
 
switch (len) {
case 1:
us2i_read_aligned(d->bus, d->dev, d->func, pos, buf, len);
break;
case 2:
us2i_read_aligned(d->bus, d->dev, d->func, pos, buf, len);
((u16 *) buf)[0] = cpu_to_le16(*((u16 *) buf));
break;
case 4:
us2i_read_aligned(d->bus, d->dev, d->func, pos, buf, len);
((u32 *) buf)[0] = cpu_to_le32(*((u32 *) buf));
break;
default:
return pci_generic_block_read(d, pos, buf, len);
}
return 1;
/*
void * addr = CONF_ADDR(d->bus, d->dev, d->func, pos);
if (pos >= 256)
return 0;
 
switch (len) {
case 1:
buf[0] = pio_read_8(addr);
break;
case 2:
((u16 *) buf)[0] = cpu_to_le16(pio_read_16(addr));
break;
case 4:
((u32 *) buf)[0] = cpu_to_le32(pio_read_32(addr));
break;
default:
return pci_generic_block_read(d, pos, buf, len);
}
return 1; */
/*if (pos >= 256)
return 0;
 
switch (len) {
case 1:
buf[0] = pio_read_8(CONF_ADDR(d->bus, d->dev, d->func, pos));
break;
case 2:
81,11 → 161,13
default:
return pci_generic_block_read(d, pos, buf, len);
}
return 1;
return 1;*/
}
 
static int us2i_write(struct pci_dev *d, int pos, byte * buf, int len)
{
void * addr = CONF_ADDR(d->bus, d->dev, d->func, pos);
 
if (pos >= 256)
return 0;
 
94,14 → 176,10
pio_write_8(CONF_ADDR(d->bus, d->dev, d->func, pos), buf[0]);
break;
case 2:
us2i_write(d, pos + 1, buf, 1); // unlike PCI, sparc uses big endian
us2i_write(d, pos, buf + 1, 1);
pio_write_16(addr, le16_to_cpu(((u16 *) buf)[0]));
break;
case 4:
us2i_write(d, pos + 3, buf, 1); // endians in an ugly way ... FIX ME
us2i_write(d, pos + 2, buf + 1, 1);
us2i_write(d, pos + 1, buf + 2, 1);
us2i_write(d, pos, buf + 3, 1);
pio_write_32(addr, le32_to_cpu(((u32 *) buf)[0]));
break;
default:
return pci_generic_block_write(d, pos, buf, len);
/branches/dd/uspace/srv/pci/libpci/sysdep.h
20,7 → 20,36
typedef u8 byte;
typedef u16 word;
 
#define cpu_to_le16(x) (x)
#define cpu_to_le32(x) (x)
#define le16_to_cpu(x) (x)
#define le32_to_cpu(x) (x)
static inline void swap(u8 *x, u8 *y)
{
u8 z = *x;
*x = *y;
*y = z;
}
 
static inline u16 invert_endianess_16(u16 x)
{
u8 *px = (u8 *)&x;
swap(&px[0], &px[1]);
return x;
}
 
static inline u32 invert_endianess_32(u32 x)
{
u8 *px = (u8 *)&x;
swap(&px[0], &px[3]);
swap(&px[1], &px[2]);
return x;
}
 
#ifdef UARCH_sparc64
#define cpu_to_le16(x) (invert_endianess_16(x))
#define cpu_to_le32(x) (invert_endianess_32(x))
#define le16_to_cpu(x) (invert_endianess_16(x))
#define le32_to_cpu(x) (invert_endianess_32(x))
#else
#define cpu_to_le16(x) (x)
#define cpu_to_le32(x) (x)
#define le16_to_cpu(x) (x)
#define le32_to_cpu(x) (x)
#endif