projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
printk_foo -> printk(BIOS_FOO, ...)
[coreboot.git]
/
src
/
devices
/
pci_device.c
diff --git
a/src/devices/pci_device.c
b/src/devices/pci_device.c
index b5088c1080e871588930e7a19dc7f0c1f22badfc..fbe8b335af72662d6cc4d9f4e09bde21e43f18cf 100644
(file)
--- a/
src/devices/pci_device.c
+++ b/
src/devices/pci_device.c
@@
-136,7
+136,7
@@
unsigned pci_find_next_capability(struct device *dev, unsigned cap,
int this_cap;
pos &= ~3;
this_cap = pci_read_config8(dev, pos + PCI_CAP_LIST_ID);
int this_cap;
pos &= ~3;
this_cap = pci_read_config8(dev, pos + PCI_CAP_LIST_ID);
- printk
_spew(
"Capability: type 0x%02x @ 0x%02x\n", this_cap,
+ printk
(BIOS_SPEW,
"Capability: type 0x%02x @ 0x%02x\n", this_cap,
pos);
if (this_cap == 0xff) {
break;
pos);
if (this_cap == 0xff) {
break;
@@
-226,8
+226,7
@@
struct resource *pci_get_resource(struct device *dev, unsigned long index)
*/
if (moving == 0) {
if (value != 0) {
*/
if (moving == 0) {
if (value != 0) {
- printk_debug
- ("%s register %02lx(%08lx), read-only ignoring it\n",
+ printk(BIOS_DEBUG, "%s register %02lx(%08lx), read-only ignoring it\n",
dev_path(dev), index, value);
}
resource->flags = 0;
dev_path(dev), index, value);
}
resource->flags = 0;
@@
-257,8
+256,8
@@
struct resource *pci_get_resource(struct device *dev, unsigned long index)
resource->flags |= IORESOURCE_PCI64;
} else {
/* Invalid value. */
resource->flags |= IORESOURCE_PCI64;
} else {
/* Invalid value. */
- printk
_err(
"Broken BAR with value %lx\n", attr);
- printk
_err(
" on dev %s at index %02lx\n",
+ printk
(BIOS_ERR,
"Broken BAR with value %lx\n", attr);
+ printk
(BIOS_ERR,
" on dev %s at index %02lx\n",
dev_path(dev), index);
resource->flags = 0;
}
dev_path(dev), index);
resource->flags = 0;
}
@@
-313,8
+312,7
@@
static void pci_get_rom_resource(struct device *dev, unsigned long index)
resource->flags |= IORESOURCE_MEM | IORESOURCE_READONLY;
} else {
if (value != 0) {
resource->flags |= IORESOURCE_MEM | IORESOURCE_READONLY;
} else {
if (value != 0) {
- printk_debug
- ("%s register %02lx(%08lx), read-only ignoring it\n",
+ printk(BIOS_DEBUG, "%s register %02lx(%08lx), read-only ignoring it\n",
dev_path(dev), index, value);
}
resource->flags = 0;
dev_path(dev), index, value);
}
resource->flags = 0;
@@
-454,7
+452,7
@@
static void pci_set_resource(struct device *dev, struct resource *resource)
/* Make certain the resource has actually been assigned a value. */
if (!(resource->flags & IORESOURCE_ASSIGNED)) {
/* Make certain the resource has actually been assigned a value. */
if (!(resource->flags & IORESOURCE_ASSIGNED)) {
- printk
_err(
"ERROR: %s %02lx %s size: 0x%010llx not assigned\n",
+ printk
(BIOS_ERR,
"ERROR: %s %02lx %s size: 0x%010llx not assigned\n",
dev_path(dev), resource->index,
resource_type(resource), resource->size);
return;
dev_path(dev), resource->index,
resource_type(resource), resource->size);
return;
@@
-543,7
+541,7
@@
static void pci_set_resource(struct device *dev, struct resource *resource)
} else {
/* Don't let me think I stored the resource. */
resource->flags &= ~IORESOURCE_STORED;
} else {
/* Don't let me think I stored the resource. */
resource->flags &= ~IORESOURCE_STORED;
- printk
_err(
"ERROR: invalid resource->index %lx\n",
+ printk
(BIOS_ERR,
"ERROR: invalid resource->index %lx\n",
resource->index);
}
report_resource_stored(dev, resource, "");
resource->index);
}
report_resource_stored(dev, resource, "");
@@
-594,7
+592,7
@@
void pci_dev_enable_resources(struct device *dev)
/* Set the subsystem vendor and device id for mainboard devices. */
ops = ops_pci(dev);
if (dev->on_mainboard && ops && ops->set_subsystem) {
/* Set the subsystem vendor and device id for mainboard devices. */
ops = ops_pci(dev);
if (dev->on_mainboard && ops && ops->set_subsystem) {
- printk
_debug(
"%s subsystem <- %02x/%02x\n",
+ printk
(BIOS_DEBUG,
"%s subsystem <- %02x/%02x\n",
dev_path(dev),
CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID,
CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID);
dev_path(dev),
CONFIG_MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID,
CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID);
@@
-607,7
+605,7
@@
void pci_dev_enable_resources(struct device *dev)
/* v3 has
* command |= (PCI_COMMAND_PARITY + PCI_COMMAND_SERR); // Error check.
*/
/* v3 has
* command |= (PCI_COMMAND_PARITY + PCI_COMMAND_SERR); // Error check.
*/
- printk
_debug(
"%s cmd <- %02x\n", dev_path(dev), command);
+ printk
(BIOS_DEBUG,
"%s cmd <- %02x\n", dev_path(dev), command);
pci_write_config16(dev, PCI_COMMAND, command);
}
pci_write_config16(dev, PCI_COMMAND, command);
}
@@
-623,7
+621,7
@@
void pci_bus_enable_resources(struct device *dev)
ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL);
ctrl |= dev->link[0].bridge_ctrl;
ctrl |= (PCI_BRIDGE_CTL_PARITY + PCI_BRIDGE_CTL_SERR); /* Error check. */
ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL);
ctrl |= dev->link[0].bridge_ctrl;
ctrl |= (PCI_BRIDGE_CTL_PARITY + PCI_BRIDGE_CTL_SERR); /* Error check. */
- printk
_debug(
"%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
+ printk
(BIOS_DEBUG,
"%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);
pci_dev_enable_resources(dev);
pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);
pci_dev_enable_resources(dev);
@@
-731,7
+729,7
@@
static struct device_operations *get_pci_bridge_ops(device_t dev)
#if CONFIG_PCIX_PLUGIN_SUPPORT == 1
pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
if (pos) {
#if CONFIG_PCIX_PLUGIN_SUPPORT == 1
pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
if (pos) {
- printk
_debug(
"%s subordinate bus PCI-X\n", dev_path(dev));
+ printk
(BIOS_DEBUG,
"%s subordinate bus PCI-X\n", dev_path(dev));
return &default_pcix_ops_bus;
}
#endif
return &default_pcix_ops_bus;
}
#endif
@@
-745,7
+743,7
@@
static struct device_operations *get_pci_bridge_ops(device_t dev)
flags = pci_read_config16(dev, pos + PCI_CAP_FLAGS);
if ((flags >> 13) == 1) {
/* Host or Secondary Interface */
flags = pci_read_config16(dev, pos + PCI_CAP_FLAGS);
if ((flags >> 13) == 1) {
/* Host or Secondary Interface */
- printk
_debug(
"%s subordinate bus Hypertransport\n",
+ printk
(BIOS_DEBUG,
"%s subordinate bus Hypertransport\n",
dev_path(dev));
return &default_ht_ops_bus;
}
dev_path(dev));
return &default_ht_ops_bus;
}
@@
-760,11
+758,11
@@
static struct device_operations *get_pci_bridge_ops(device_t dev)
case PCI_EXP_TYPE_ROOT_PORT:
case PCI_EXP_TYPE_UPSTREAM:
case PCI_EXP_TYPE_DOWNSTREAM:
case PCI_EXP_TYPE_ROOT_PORT:
case PCI_EXP_TYPE_UPSTREAM:
case PCI_EXP_TYPE_DOWNSTREAM:
- printk
_debug(
"%s subordinate bus PCI Express\n",
+ printk
(BIOS_DEBUG,
"%s subordinate bus PCI Express\n",
dev_path(dev));
return &default_pciexp_ops_bus;
case PCI_EXP_TYPE_PCI_BRIDGE:
dev_path(dev));
return &default_pciexp_ops_bus;
case PCI_EXP_TYPE_PCI_BRIDGE:
- printk
_debug(
"%s subordinate PCI\n", dev_path(dev));
+ printk
(BIOS_DEBUG,
"%s subordinate PCI\n", dev_path(dev));
return &default_pci_ops_bus;
default:
break;
return &default_pci_ops_bus;
default:
break;
@@
-795,7
+793,7
@@
static void set_pci_ops(struct device *dev)
if ((driver->vendor == dev->vendor) &&
(driver->device == dev->device)) {
dev->ops = (struct device_operations *)driver->ops;
if ((driver->vendor == dev->vendor) &&
(driver->device == dev->device)) {
dev->ops = (struct device_operations *)driver->ops;
- printk
_spew(
"%s [%04x/%04x] %sops\n",
+ printk
(BIOS_SPEW,
"%s [%04x/%04x] %sops\n",
dev_path(dev),
driver->vendor, driver->device,
(driver->ops->scan_bus ? "bus " : ""));
dev_path(dev),
driver->vendor, driver->device,
(driver->ops->scan_bus ? "bus " : ""));
@@
-823,7
+821,7
@@
static void set_pci_ops(struct device *dev)
default:
bad:
if (dev->enabled) {
default:
bad:
if (dev->enabled) {
- printk
_err(
"%s [%04x/%04x/%06x] has unknown header "
+ printk
(BIOS_ERR,
"%s [%04x/%04x/%06x] has unknown header "
"type %02x, ignoring.\n",
dev_path(dev),
dev->vendor, dev->device,
"type %02x, ignoring.\n",
dev_path(dev),
dev->vendor, dev->device,
@@
-852,7
+850,7
@@
static struct device *pci_scan_get_dev(struct device **list, unsigned int devfn)
dev = 0;
for (; *list; list = &(*list)->sibling) {
if ((*list)->path.type != DEVICE_PATH_PCI) {
dev = 0;
for (; *list; list = &(*list)->sibling) {
if ((*list)->path.type != DEVICE_PATH_PCI) {
- printk
_err(
"child %s not a pci device\n",
+ printk
(BIOS_ERR,
"child %s not a pci device\n",
dev_path(*list));
continue;
}
dev_path(*list));
continue;
}
@@
-916,7
+914,7
@@
device_t pci_probe_dev(device_t dev, struct bus * bus, unsigned devfn)
*/
if ((id == 0xffffffff) || (id == 0x00000000) ||
(id == 0x0000ffff) || (id == 0xffff0000)) {
*/
if ((id == 0xffffffff) || (id == 0x00000000) ||
(id == 0x0000ffff) || (id == 0xffff0000)) {
- printk
_spew(
"%s, bad id 0x%x\n", dev_path(&dummy), id);
+ printk
(BIOS_SPEW,
"%s, bad id 0x%x\n", dev_path(&dummy), id);
return NULL;
}
dev = alloc_dev(bus, &dummy.path);
return NULL;
}
dev = alloc_dev(bus, &dummy.path);
@@
-947,7
+945,7
@@
device_t pci_probe_dev(device_t dev, struct bus * bus, unsigned devfn)
if ((id == 0xffffffff) || (id == 0x00000000) ||
(id == 0x0000ffff) || (id == 0xffff0000)) {
if (dev->enabled) {
if ((id == 0xffffffff) || (id == 0x00000000) ||
(id == 0x0000ffff) || (id == 0xffff0000)) {
if (dev->enabled) {
- printk
_info(
"PCI: Static device %s not found, disabling it.\n",
+ printk
(BIOS_INFO,
"PCI: Static device %s not found, disabling it.\n",
dev_path(dev));
dev->enabled = 0;
}
dev_path(dev));
dev->enabled = 0;
}
@@
-982,7
+980,7
@@
device_t pci_probe_dev(device_t dev, struct bus * bus, unsigned devfn)
}
/* Display the device. */
}
/* Display the device. */
- printk
_debug(
"%s [%04x/%04x] %s%s\n",
+ printk
(BIOS_DEBUG,
"%s [%04x/%04x] %s%s\n",
dev_path(dev),
dev->vendor, dev->device,
dev->enabled ? "enabled" : "disabled",
dev_path(dev),
dev->vendor, dev->device,
dev->enabled ? "enabled" : "disabled",
@@
-1016,10
+1014,10
@@
unsigned int pci_scan_bus(struct bus *bus,
struct device *child;
#if CONFIG_PCI_BUS_SEGN_BITS
struct device *child;
#if CONFIG_PCI_BUS_SEGN_BITS
- printk
_debug(
"PCI: pci_scan_bus for bus %04x:%02x\n",
+ printk
(BIOS_DEBUG,
"PCI: pci_scan_bus for bus %04x:%02x\n",
bus->secondary >> 8, bus->secondary & 0xff);
#else
bus->secondary >> 8, bus->secondary & 0xff);
#else
- printk
_debug(
"PCI: pci_scan_bus for bus %02x\n", bus->secondary);
+ printk
(BIOS_DEBUG,
"PCI: pci_scan_bus for bus %02x\n", bus->secondary);
#endif
old_devices = bus->children;
#endif
old_devices = bus->children;
@@
-1055,11
+1053,11
@@
unsigned int pci_scan_bus(struct bus *bus,
*/
if (old_devices) {
device_t left;
*/
if (old_devices) {
device_t left;
- printk
_warning(
"PCI: Left over static devices:\n");
+ printk
(BIOS_WARNING,
"PCI: Left over static devices:\n");
for (left = old_devices; left; left = left->sibling) {
for (left = old_devices; left; left = left->sibling) {
- printk
_warning(
"%s\n", dev_path(left));
+ printk
(BIOS_WARNING,
"%s\n", dev_path(left));
}
}
- printk
_warning(
"PCI: Check your mainboard Config.lb.\n");
+ printk
(BIOS_WARNING,
"PCI: Check your mainboard Config.lb.\n");
}
/* For all children that implement scan_bus() (i.e. bridges)
}
/* For all children that implement scan_bus() (i.e. bridges)
@@
-1073,7
+1071,7
@@
unsigned int pci_scan_bus(struct bus *bus,
* side of any bridges that may be on this bus plus any devices.
* Return how far we've got finding sub-buses.
*/
* side of any bridges that may be on this bus plus any devices.
* Return how far we've got finding sub-buses.
*/
- printk
_debug(
"PCI: pci_scan_bus returning with max=%03x\n", max);
+ printk
(BIOS_DEBUG,
"PCI: pci_scan_bus returning with max=%03x\n", max);
post_code(0x55);
return max;
}
post_code(0x55);
return max;
}
@@
-1100,7
+1098,7
@@
unsigned int do_pci_scan_bridge(struct device *dev, unsigned int max,
u32 buses;
u16 cr;
u32 buses;
u16 cr;
- printk
_spew(
"%s for %s\n", __func__, dev_path(dev));
+ printk
(BIOS_SPEW,
"%s for %s\n", __func__, dev_path(dev));
bus = &dev->link[0];
bus->dev = dev;
bus = &dev->link[0];
bus->dev = dev;
@@
-1146,7
+1144,7
@@
unsigned int do_pci_scan_bridge(struct device *dev, unsigned int max,
pci_write_config32(dev, PCI_PRIMARY_BUS, buses);
pci_write_config16(dev, PCI_COMMAND, cr);
pci_write_config32(dev, PCI_PRIMARY_BUS, buses);
pci_write_config16(dev, PCI_COMMAND, cr);
- printk
_spew(
"%s returns max %d\n", __func__, max);
+ printk
(BIOS_SPEW,
"%s returns max %d\n", __func__, max);
return max;
}
return max;
}
@@
-1224,7
+1222,7
@@
void pci_assign_irqs(unsigned bus, unsigned slot,
irq = pIntAtoD[line - 1];
irq = pIntAtoD[line - 1];
- printk
_debug(
"Assigning IRQ %d to %d:%x.%d\n",
+ printk
(BIOS_DEBUG,
"Assigning IRQ %d to %d:%x.%d\n",
irq, bus, slot, funct);
pci_write_config8(pdev, PCI_INTERRUPT_LINE,
irq, bus, slot, funct);
pci_write_config8(pdev, PCI_INTERRUPT_LINE,
@@
-1232,7
+1230,7
@@
void pci_assign_irqs(unsigned bus, unsigned slot,
#ifdef PARANOID_IRQ_ASSIGNMENTS
irq = pci_read_config8(pdev, PCI_INTERRUPT_LINE);
#ifdef PARANOID_IRQ_ASSIGNMENTS
irq = pci_read_config8(pdev, PCI_INTERRUPT_LINE);
- printk
_debug(
" Readback = %d\n", irq);
+ printk
(BIOS_DEBUG,
" Readback = %d\n", irq);
#endif
// Change to level triggered
#endif
// Change to level triggered