/* PNP fundamental operations */
-void pnp_write_config(device_t dev, uint8_t reg, uint8_t value)
+void pnp_write_config(device_t dev, u8 reg, u8 value)
{
- outb(reg, dev->path.u.pnp.port);
- outb(value, dev->path.u.pnp.port + 1);
+ outb(reg, dev->path.pnp.port);
+ outb(value, dev->path.pnp.port + 1);
}
-uint8_t pnp_read_config(device_t dev, uint8_t reg)
+u8 pnp_read_config(device_t dev, u8 reg)
{
- outb(reg, dev->path.u.pnp.port);
- return inb(dev->path.u.pnp.port + 1);
+ outb(reg, dev->path.pnp.port);
+ return inb(dev->path.pnp.port + 1);
}
void pnp_set_logical_device(device_t dev)
{
- pnp_write_config(dev, 0x07, dev->path.u.pnp.device);
+ pnp_write_config(dev, 0x07, dev->path.pnp.device & 0xff);
}
void pnp_set_enable(device_t dev, int enable)
{
- pnp_write_config(dev, 0x30, enable?0x1:0x0);
+ u8 tmp, bitpos;
+
+ tmp = pnp_read_config(dev, 0x30);
+
+ /* Handle virtual devices, which share the same LDN register. */
+ bitpos = (dev->path.pnp.device >> 8) & 0x7;
+
+ if (enable)
+ tmp |= (1 << bitpos);
+ else
+ tmp &= ~(1 << bitpos);
+
+ pnp_write_config(dev, 0x30, tmp);
}
int pnp_read_enable(device_t dev)
{
- return !!pnp_read_config(dev, 0x30);
+ u8 tmp, bitpos;
+
+ tmp = pnp_read_config(dev, 0x30);
+
+ /* Handle virtual devices, which share the same LDN register. */
+ bitpos = (dev->path.pnp.device >> 8) & 0x7;
+
+ return !!(tmp & (1 << bitpos));
}
-void pnp_set_iobase(device_t dev, unsigned index, unsigned iobase)
+void pnp_set_iobase(device_t dev, u8 index, u16 iobase)
{
- /* Index == 0x60 or 0x62 */
+ /* Index == 0x60 or 0x62. */
pnp_write_config(dev, index + 0, (iobase >> 8) & 0xff);
pnp_write_config(dev, index + 1, iobase & 0xff);
}
-void pnp_set_irq(device_t dev, unsigned index, unsigned irq)
+void pnp_set_irq(device_t dev, u8 index, u8 irq)
{
- /* Index == 0x70 or 0x72 */
+ /* Index == 0x70 or 0x72. */
pnp_write_config(dev, index, irq);
}
-void pnp_set_drq(device_t dev, unsigned index, unsigned drq)
+void pnp_set_drq(device_t dev, u8 index, u8 drq)
{
- /* Index == 0x74 */
+ /* Index == 0x74. */
pnp_write_config(dev, index, drq & 0xff);
}
static void pnp_set_resource(device_t dev, struct resource *resource)
{
if (!(resource->flags & IORESOURCE_ASSIGNED)) {
- printk_err("ERROR: %s %02x %s size: 0x%010Lx not assigned\n",
- dev_path(dev), resource->index,
- resource_type(resource),
- resource->size);
+ printk(BIOS_ERR, "ERROR: %s %02lx %s size: 0x%010Lx "
+ "not assigned\n", dev_path(dev), resource->index,
+ resource_type(resource), resource->size);
return;
}
- /* Now store the resource */
+ /* Now store the resource. */
if (resource->flags & IORESOURCE_IO) {
pnp_set_iobase(dev, resource->index, resource->base);
- }
- else if (resource->flags & IORESOURCE_DRQ) {
+ } else if (resource->flags & IORESOURCE_DRQ) {
pnp_set_drq(dev, resource->index, resource->base);
- }
- else if (resource->flags & IORESOURCE_IRQ) {
+ } else if (resource->flags & IORESOURCE_IRQ) {
pnp_set_irq(dev, resource->index, resource->base);
- }
- else {
- printk_err("ERROR: %s %02x unknown resource type\n",
- dev_path(dev), resource->index);
+ } else {
+ printk(BIOS_ERR, "ERROR: %s %02lx unknown resource type\n",
+ dev_path(dev), resource->index);
return;
}
resource->flags |= IORESOURCE_STORED;
void pnp_set_resources(device_t dev)
{
- int i;
+ struct resource *res;
- /* Select the device */
+ /* Select the logical device (LDN). */
pnp_set_logical_device(dev);
/* Paranoia says I should disable the device here... */
- for(i = 0; i < dev->resources; i++) {
- pnp_set_resource(dev, &dev->resource[i]);
- }
+ for (res = dev->resource_list; res; res = res->next)
+ pnp_set_resource(dev, res);
}
void pnp_enable_resources(device_t dev)
.enable = pnp_enable,
};
-/* PNP chip opertations */
+/* PNP chip operations */
-static void pnp_get_ioresource(device_t dev, unsigned index, struct io_info *info)
+static void pnp_get_ioresource(device_t dev, u8 index, struct io_info *info)
{
struct resource *resource;
unsigned moving, gran, step;
resource = new_resource(dev, index);
-
- /* Initilize the resource */
+
+ /* Initilize the resource. */
resource->limit = 0xffff;
resource->flags |= IORESOURCE_IO;
-
- /* Get the resource size */
+
+ /* Get the resource size... */
+
moving = info->mask;
gran = 15;
step = 1 << gran;
- /* Find the first bit that moves */
- while((moving & step) == 0) {
+
+ /* Find the first bit that moves. */
+ while ((moving & step) == 0) {
gran--;
step >>= 1;
}
- /* Now find the first bit that does not move */
- while((moving & step) != 0) {
+
+ /* Now find the first bit that does not move. */
+ while ((moving & step) != 0) {
gran--;
step >>= 1;
}
- /* Of the moving bits the last bit in the first group,
+
+ /*
+ * Of the moving bits the last bit in the first group,
* tells us the size of this resource.
*/
if ((moving & step) == 0) {
gran++;
step <<= 1;
}
- /* Set the resource size and alignment */
+
+ /* Set the resource size and alignment. */
resource->gran = gran;
resource->align = gran;
resource->limit = info->mask | (step - 1);
{
struct resource *resource;
- if (info->flags & PNP_IO0) {
+ if (info->flags & PNP_IO0)
pnp_get_ioresource(dev, PNP_IDX_IO0, &info->io0);
- }
- if (info->flags & PNP_IO1) {
+ if (info->flags & PNP_IO1)
pnp_get_ioresource(dev, PNP_IDX_IO1, &info->io1);
- }
- if (info->flags & PNP_IO2) {
+ if (info->flags & PNP_IO2)
pnp_get_ioresource(dev, PNP_IDX_IO2, &info->io2);
- }
- if (info->flags & PNP_IO3) {
+ if (info->flags & PNP_IO3)
pnp_get_ioresource(dev, PNP_IDX_IO3, &info->io3);
- }
+
if (info->flags & PNP_IRQ0) {
resource = new_resource(dev, PNP_IDX_IRQ0);
resource->size = 1;
resource->size = 1;
resource->flags |= IORESOURCE_IRQ;
}
+
if (info->flags & PNP_DRQ0) {
resource = new_resource(dev, PNP_IDX_DRQ0);
resource->size = 1;
resource = new_resource(dev, PNP_IDX_DRQ1);
resource->size = 1;
resource->flags |= IORESOURCE_DRQ;
- }
-}
+ }
+
+ /*
+ * These are not IRQs, but set the flag to have the
+ * resource allocator do the right thing.
+ */
+ if (info->flags & PNP_EN) {
+ resource = new_resource(dev, PNP_IDX_EN);
+ resource->size = 1;
+ resource->flags |= IORESOURCE_IRQ;
+ }
+ if (info->flags & PNP_MSC0) {
+ resource = new_resource(dev, PNP_IDX_MSC0);
+ resource->size = 1;
+ resource->flags |= IORESOURCE_IRQ;
+ }
+ if (info->flags & PNP_MSC1) {
+ resource = new_resource(dev, PNP_IDX_MSC1);
+ resource->size = 1;
+ resource->flags |= IORESOURCE_IRQ;
+ }
+}
-void pnp_enable_devices(device_t base_dev, struct device_operations *ops,
- unsigned functions, struct pnp_info *info)
+void pnp_enable_devices(device_t base_dev, struct device_operations *ops,
+ unsigned int functions, struct pnp_info *info)
{
struct device_path path;
device_t dev;
int i;
- path.type = DEVICE_PATH_PNP;
- path.u.pnp.port = base_dev->path.u.pnp.port;
-
- /* Setup the ops and resources on the newly allocated devices */
- for(i = 0; i < functions; i++) {
+ path.type = DEVICE_PATH_PNP;
+ path.pnp.port = base_dev->path.pnp.port;
+
+ /* Setup the ops and resources on the newly allocated devices. */
+ for (i = 0; i < functions; i++) {
/* Skip logical devices this Super I/O doesn't have. */
if (info[i].function == -1)
continue;
- path.u.pnp.device = info[i].function;
+ path.pnp.device = info[i].function;
dev = alloc_find_dev(base_dev->bus, &path);
-
- /* Don't initialize a device multiple times */
- if (dev->ops)
+
+ /* Don't initialize a device multiple times. */
+ if (dev->ops)
continue;
- if (info[i].ops == 0) {
+ if (info[i].ops == 0)
dev->ops = ops;
- } else {
+ else
dev->ops = info[i].ops;
- }
+
get_resources(dev, &info[i]);
}
}
projects / coreboot.git / blobdiff