mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: serial: Add 16850 uart type support to OF uart driver hvc_console: Remove tty->low_latency powerpc: Get the number of SLBs from "slb-size" property powerpc: is_hugepage_only_range() must account for both 4kB and 64kB slices powerpc/ps3: printing fixups for l64 to ll64 conversion drivers/video powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/scsi powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/ps3 powerpc/ps3: Printing fixups for l64 to ll64 conversion sound/ppc powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/char powerpc/ps3: Printing fixups for l64 to ll64 conversion drivers/block powerpc/ps3: Printing fixups for l64 to ll64 conversion arch/powerpc powerpc/ps3: ps3_repository_read_mm_info() takes u64 * arguments powerpc/ps3: clear_bit()/set_bit() operate on unsigned longs powerpc/ps3: The lv1_ routines have u64 parameters powerpc/ps3: Use dma_addr_t down through the stack powerpc/ps3: set_dabr() takes an unsigned long powerpc: Cleanup from l64 to ll64 change drivers/scsi
This commit is contained in:
Linus Torvalds
commit
b762666cc7
24 changed files with 196 additions and 168 deletions
|
|
@ -141,7 +141,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
|
|||
|
||||
start_sector = req->sector * priv->blocking_factor;
|
||||
sectors = req->nr_sectors * priv->blocking_factor;
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: %s %lu sectors starting at %lu\n",
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: %s %llu sectors starting at %llu\n",
|
||||
__func__, __LINE__, op, sectors, start_sector);
|
||||
|
||||
if (write) {
|
||||
|
|
@ -178,7 +178,7 @@ static int ps3disk_submit_flush_request(struct ps3_storage_device *dev,
|
|||
LV1_STORAGE_ATA_HDDOUT, 0, 0, 0,
|
||||
0, &dev->tag);
|
||||
if (res) {
|
||||
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%lx\n",
|
||||
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n",
|
||||
__func__, __LINE__, res);
|
||||
end_request(req, 0);
|
||||
return 0;
|
||||
|
|
@ -238,11 +238,11 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
|
|||
|
||||
if (tag != dev->tag)
|
||||
dev_err(&dev->sbd.core,
|
||||
"%s:%u: tag mismatch, got %lx, expected %lx\n",
|
||||
"%s:%u: tag mismatch, got %llx, expected %llx\n",
|
||||
__func__, __LINE__, tag, dev->tag);
|
||||
|
||||
if (res) {
|
||||
dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%lx\n",
|
||||
dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%llx\n",
|
||||
__func__, __LINE__, res, status);
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
|
@ -269,7 +269,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)
|
|||
op = read ? "read" : "write";
|
||||
}
|
||||
if (status) {
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%lx\n", __func__,
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%llx\n", __func__,
|
||||
__LINE__, op, status);
|
||||
error = -EIO;
|
||||
} else {
|
||||
|
|
@ -297,7 +297,7 @@ static int ps3disk_sync_cache(struct ps3_storage_device *dev)
|
|||
|
||||
res = ps3stor_send_command(dev, LV1_STORAGE_ATA_HDDOUT, 0, 0, 0, 0);
|
||||
if (res) {
|
||||
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%lx\n",
|
||||
dev_err(&dev->sbd.core, "%s:%u: sync cache failed 0x%llx\n",
|
||||
__func__, __LINE__, res);
|
||||
return -EIO;
|
||||
}
|
||||
|
|
@ -388,7 +388,7 @@ static int ps3disk_identify(struct ps3_storage_device *dev)
|
|||
sizeof(ata_cmnd), ata_cmnd.buffer,
|
||||
ata_cmnd.arglen);
|
||||
if (res) {
|
||||
dev_err(&dev->sbd.core, "%s:%u: identify disk failed 0x%lx\n",
|
||||
dev_err(&dev->sbd.core, "%s:%u: identify disk failed 0x%llx\n",
|
||||
__func__, __LINE__, res);
|
||||
return -EIO;
|
||||
}
|
||||
|
|
@ -426,7 +426,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
|
|||
|
||||
if (dev->blk_size < 512) {
|
||||
dev_err(&dev->sbd.core,
|
||||
"%s:%u: cannot handle block size %lu\n", __func__,
|
||||
"%s:%u: cannot handle block size %llu\n", __func__,
|
||||
__LINE__, dev->blk_size);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
@ -512,7 +512,7 @@ static int __devinit ps3disk_probe(struct ps3_system_bus_device *_dev)
|
|||
dev->regions[dev->region_idx].size*priv->blocking_factor);
|
||||
|
||||
dev_info(&dev->sbd.core,
|
||||
"%s is a %s (%lu MiB total, %lu MiB for OtherOS)\n",
|
||||
"%s is a %s (%llu MiB total, %lu MiB for OtherOS)\n",
|
||||
gendisk->disk_name, priv->model, priv->raw_capacity >> 11,
|
||||
get_capacity(gendisk) >> 11);
|
||||
|
||||
|
|
|
|||
|
|
@ -318,8 +318,6 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
|
|||
} /* else count == 0 */
|
||||
|
||||
tty->driver_data = hp;
|
||||
if (!hp->irq_requested)
|
||||
tty->low_latency = 1; /* Makes flushes to ldisc synchronous. */
|
||||
|
||||
hp->tty = tty;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ static ssize_t ps3flash_read_write_sectors(struct ps3_storage_device *dev,
|
|||
u64 res = ps3stor_read_write_sectors(dev, lpar, start_sector, sectors,
|
||||
write);
|
||||
if (res) {
|
||||
dev_err(&dev->sbd.core, "%s:%u: %s failed 0x%lx\n", __func__,
|
||||
dev_err(&dev->sbd.core, "%s:%u: %s failed 0x%llx\n", __func__,
|
||||
__LINE__, write ? "write" : "read", res);
|
||||
return -EIO;
|
||||
}
|
||||
|
|
@ -59,7 +59,7 @@ static ssize_t ps3flash_read_sectors(struct ps3_storage_device *dev,
|
|||
|
||||
max_sectors = dev->bounce_size / dev->blk_size;
|
||||
if (sectors > max_sectors) {
|
||||
dev_dbg(&dev->sbd.core, "%s:%u Limiting sectors to %lu\n",
|
||||
dev_dbg(&dev->sbd.core, "%s:%u Limiting sectors to %llu\n",
|
||||
__func__, __LINE__, max_sectors);
|
||||
sectors = max_sectors;
|
||||
}
|
||||
|
|
@ -144,7 +144,7 @@ static ssize_t ps3flash_read(struct file *file, char __user *buf, size_t count,
|
|||
goto fail;
|
||||
}
|
||||
|
||||
n = min(remaining, sectors_read*dev->blk_size-offset);
|
||||
n = min_t(u64, remaining, sectors_read*dev->blk_size-offset);
|
||||
dev_dbg(&dev->sbd.core,
|
||||
"%s:%u: copy %lu bytes from 0x%p to user 0x%p\n",
|
||||
__func__, __LINE__, n, dev->bounce_buf+offset, buf);
|
||||
|
|
@ -225,7 +225,7 @@ static ssize_t ps3flash_write(struct file *file, const char __user *buf,
|
|||
if (end_read_sector >= start_read_sector) {
|
||||
/* Merge head and tail */
|
||||
dev_dbg(&dev->sbd.core,
|
||||
"Merged head and tail: %lu sectors at %lu\n",
|
||||
"Merged head and tail: %llu sectors at %llu\n",
|
||||
chunk_sectors, start_write_sector);
|
||||
res = ps3flash_read_sectors(dev, start_write_sector,
|
||||
chunk_sectors, 0);
|
||||
|
|
@ -235,7 +235,7 @@ static ssize_t ps3flash_write(struct file *file, const char __user *buf,
|
|||
if (head) {
|
||||
/* Read head */
|
||||
dev_dbg(&dev->sbd.core,
|
||||
"head: %lu sectors at %lu\n", head,
|
||||
"head: %llu sectors at %llu\n", head,
|
||||
start_write_sector);
|
||||
res = ps3flash_read_sectors(dev,
|
||||
start_write_sector,
|
||||
|
|
@ -247,7 +247,7 @@ static ssize_t ps3flash_write(struct file *file, const char __user *buf,
|
|||
start_write_sector+chunk_sectors) {
|
||||
/* Read tail */
|
||||
dev_dbg(&dev->sbd.core,
|
||||
"tail: %lu sectors at %lu\n", tail,
|
||||
"tail: %llu sectors at %llu\n", tail,
|
||||
start_read_sector);
|
||||
sec_off = start_read_sector-start_write_sector;
|
||||
res = ps3flash_read_sectors(dev,
|
||||
|
|
@ -258,7 +258,7 @@ static ssize_t ps3flash_write(struct file *file, const char __user *buf,
|
|||
}
|
||||
}
|
||||
|
||||
n = min(remaining, dev->bounce_size-offset);
|
||||
n = min_t(u64, remaining, dev->bounce_size-offset);
|
||||
dev_dbg(&dev->sbd.core,
|
||||
"%s:%u: copy %lu bytes from user 0x%p to 0x%p\n",
|
||||
__func__, __LINE__, n, buf, dev->bounce_buf+offset);
|
||||
|
|
@ -299,11 +299,11 @@ static irqreturn_t ps3flash_interrupt(int irq, void *data)
|
|||
|
||||
if (tag != dev->tag)
|
||||
dev_err(&dev->sbd.core,
|
||||
"%s:%u: tag mismatch, got %lx, expected %lx\n",
|
||||
"%s:%u: tag mismatch, got %llx, expected %llx\n",
|
||||
__func__, __LINE__, tag, dev->tag);
|
||||
|
||||
if (res) {
|
||||
dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%lx\n",
|
||||
dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%llx\n",
|
||||
__func__, __LINE__, res, status);
|
||||
} else {
|
||||
dev->lv1_status = status;
|
||||
|
|
|
|||
|
|
@ -732,7 +732,7 @@ static u64 pm_signal_group_to_ps3_lv1_signal_group(u64 group)
|
|||
case 8:
|
||||
return pm_translate_signal_group_number_on_island8(subgroup);
|
||||
default:
|
||||
dev_dbg(sbd_core(), "%s:%u: island not found: %lu\n", __func__,
|
||||
dev_dbg(sbd_core(), "%s:%u: island not found: %llu\n", __func__,
|
||||
__LINE__, group);
|
||||
BUG();
|
||||
break;
|
||||
|
|
@ -765,7 +765,7 @@ static int __ps3_set_signal(u64 lv1_signal_group, u64 bus_select,
|
|||
signal_select, attr1, attr2, attr3);
|
||||
if (ret)
|
||||
dev_err(sbd_core(),
|
||||
"%s:%u: error:%d 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n",
|
||||
"%s:%u: error:%d 0x%llx 0x%llx 0x%llx 0x%llx 0x%llx 0x%llx\n",
|
||||
__func__, __LINE__, ret, lv1_signal_group, bus_select,
|
||||
signal_select, attr1, attr2, attr3);
|
||||
|
||||
|
|
@ -908,7 +908,7 @@ void ps3_disable_pm(u32 cpu)
|
|||
|
||||
lpm_priv->tb_count = tmp;
|
||||
|
||||
dev_dbg(sbd_core(), "%s:%u: tb_count %lu (%lxh)\n", __func__, __LINE__,
|
||||
dev_dbg(sbd_core(), "%s:%u: tb_count %llu (%llxh)\n", __func__, __LINE__,
|
||||
lpm_priv->tb_count, lpm_priv->tb_count);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(ps3_disable_pm);
|
||||
|
|
@ -938,7 +938,7 @@ int ps3_lpm_copy_tb(unsigned long offset, void *buf, unsigned long count,
|
|||
if (offset >= lpm_priv->tb_count)
|
||||
return 0;
|
||||
|
||||
count = min(count, lpm_priv->tb_count - offset);
|
||||
count = min_t(u64, count, lpm_priv->tb_count - offset);
|
||||
|
||||
while (*bytes_copied < count) {
|
||||
const unsigned long request = count - *bytes_copied;
|
||||
|
|
@ -993,7 +993,7 @@ int ps3_lpm_copy_tb_to_user(unsigned long offset, void __user *buf,
|
|||
if (offset >= lpm_priv->tb_count)
|
||||
return 0;
|
||||
|
||||
count = min(count, lpm_priv->tb_count - offset);
|
||||
count = min_t(u64, count, lpm_priv->tb_count - offset);
|
||||
|
||||
while (*bytes_copied < count) {
|
||||
const unsigned long request = count - *bytes_copied;
|
||||
|
|
@ -1013,7 +1013,7 @@ int ps3_lpm_copy_tb_to_user(unsigned long offset, void __user *buf,
|
|||
result = copy_to_user(buf, lpm_priv->tb_cache, tmp);
|
||||
|
||||
if (result) {
|
||||
dev_dbg(sbd_core(), "%s:%u: 0x%lx bytes at 0x%p\n",
|
||||
dev_dbg(sbd_core(), "%s:%u: 0x%llx bytes at 0x%p\n",
|
||||
__func__, __LINE__, tmp, buf);
|
||||
dev_err(sbd_core(), "%s:%u: copy_to_user failed: %d\n",
|
||||
__func__, __LINE__, result);
|
||||
|
|
@ -1148,8 +1148,8 @@ int ps3_lpm_open(enum ps3_lpm_tb_type tb_type, void *tb_cache,
|
|||
lpm_priv->shadow.group_control = PS3_LPM_SHADOW_REG_INIT;
|
||||
lpm_priv->shadow.debug_bus_control = PS3_LPM_SHADOW_REG_INIT;
|
||||
|
||||
dev_dbg(sbd_core(), "%s:%u: lpm_id 0x%lx, outlet_id 0x%lx, "
|
||||
"tb_size 0x%lx\n", __func__, __LINE__, lpm_priv->lpm_id,
|
||||
dev_dbg(sbd_core(), "%s:%u: lpm_id 0x%llx, outlet_id 0x%llx, "
|
||||
"tb_size 0x%llx\n", __func__, __LINE__, lpm_priv->lpm_id,
|
||||
lpm_priv->outlet_id, tb_size);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ struct ports_bmp {
|
|||
static void __maybe_unused _dump_ports_bmp(
|
||||
const struct ports_bmp *bmp, const char *func, int line)
|
||||
{
|
||||
pr_debug("%s:%d: ports_bmp: %016lxh\n", func, line, bmp->status);
|
||||
pr_debug("%s:%d: ports_bmp: %016llxh\n", func, line, bmp->status);
|
||||
}
|
||||
|
||||
#define dump_port_params(_b) _dump_port_params(_b, __func__, __LINE__)
|
||||
|
|
@ -159,11 +159,13 @@ int ps3_vuart_get_triggers(struct ps3_system_bus_device *dev,
|
|||
struct vuart_triggers *trig)
|
||||
{
|
||||
int result;
|
||||
unsigned long size;
|
||||
unsigned long val;
|
||||
u64 size;
|
||||
u64 val;
|
||||
u64 tx;
|
||||
|
||||
result = lv1_get_virtual_uart_param(dev->port_number,
|
||||
PARAM_TX_TRIGGER, &trig->tx);
|
||||
PARAM_TX_TRIGGER, &tx);
|
||||
trig->tx = tx;
|
||||
|
||||
if (result) {
|
||||
dev_dbg(&dev->core, "%s:%d: tx_trigger failed: %s\n",
|
||||
|
|
@ -201,7 +203,7 @@ int ps3_vuart_set_triggers(struct ps3_system_bus_device *dev, unsigned int tx,
|
|||
unsigned int rx)
|
||||
{
|
||||
int result;
|
||||
unsigned long size;
|
||||
u64 size;
|
||||
|
||||
result = lv1_set_virtual_uart_param(dev->port_number,
|
||||
PARAM_TX_TRIGGER, tx);
|
||||
|
|
@ -248,7 +250,7 @@ static int ps3_vuart_get_rx_bytes_waiting(struct ps3_system_bus_device *dev,
|
|||
dev_dbg(&dev->core, "%s:%d: rx_bytes failed: %s\n",
|
||||
__func__, __LINE__, ps3_result(result));
|
||||
|
||||
dev_dbg(&dev->core, "%s:%d: %lxh\n", __func__, __LINE__,
|
||||
dev_dbg(&dev->core, "%s:%d: %llxh\n", __func__, __LINE__,
|
||||
*bytes_waiting);
|
||||
return result;
|
||||
}
|
||||
|
|
@ -295,7 +297,7 @@ static int ps3_vuart_get_interrupt_status(struct ps3_system_bus_device *dev,
|
|||
|
||||
*status = tmp & priv->interrupt_mask;
|
||||
|
||||
dev_dbg(&dev->core, "%s:%d: m %lxh, s %lxh, m&s %lxh\n",
|
||||
dev_dbg(&dev->core, "%s:%d: m %llxh, s %llxh, m&s %lxh\n",
|
||||
__func__, __LINE__, priv->interrupt_mask, tmp, *status);
|
||||
|
||||
return result;
|
||||
|
|
@ -363,7 +365,7 @@ int ps3_vuart_disable_interrupt_disconnect(struct ps3_system_bus_device *dev)
|
|||
*/
|
||||
|
||||
static int ps3_vuart_raw_write(struct ps3_system_bus_device *dev,
|
||||
const void *buf, unsigned int bytes, unsigned long *bytes_written)
|
||||
const void *buf, unsigned int bytes, u64 *bytes_written)
|
||||
{
|
||||
int result;
|
||||
struct ps3_vuart_port_priv *priv = to_port_priv(dev);
|
||||
|
|
@ -379,7 +381,7 @@ static int ps3_vuart_raw_write(struct ps3_system_bus_device *dev,
|
|||
|
||||
priv->stats.bytes_written += *bytes_written;
|
||||
|
||||
dev_dbg(&dev->core, "%s:%d: wrote %lxh/%xh=>%lxh\n", __func__, __LINE__,
|
||||
dev_dbg(&dev->core, "%s:%d: wrote %llxh/%xh=>%lxh\n", __func__, __LINE__,
|
||||
*bytes_written, bytes, priv->stats.bytes_written);
|
||||
|
||||
return result;
|
||||
|
|
@ -393,7 +395,7 @@ static int ps3_vuart_raw_write(struct ps3_system_bus_device *dev,
|
|||
*/
|
||||
|
||||
static int ps3_vuart_raw_read(struct ps3_system_bus_device *dev, void *buf,
|
||||
unsigned int bytes, unsigned long *bytes_read)
|
||||
unsigned int bytes, u64 *bytes_read)
|
||||
{
|
||||
int result;
|
||||
struct ps3_vuart_port_priv *priv = to_port_priv(dev);
|
||||
|
|
@ -411,7 +413,7 @@ static int ps3_vuart_raw_read(struct ps3_system_bus_device *dev, void *buf,
|
|||
|
||||
priv->stats.bytes_read += *bytes_read;
|
||||
|
||||
dev_dbg(&dev->core, "%s:%d: read %lxh/%xh=>%lxh\n", __func__, __LINE__,
|
||||
dev_dbg(&dev->core, "%s:%d: read %llxh/%xh=>%lxh\n", __func__, __LINE__,
|
||||
*bytes_read, bytes, priv->stats.bytes_read);
|
||||
|
||||
return result;
|
||||
|
|
@ -500,7 +502,7 @@ int ps3_vuart_write(struct ps3_system_bus_device *dev, const void *buf,
|
|||
spin_lock_irqsave(&priv->tx_list.lock, flags);
|
||||
|
||||
if (list_empty(&priv->tx_list.head)) {
|
||||
unsigned long bytes_written;
|
||||
u64 bytes_written;
|
||||
|
||||
result = ps3_vuart_raw_write(dev, buf, bytes, &bytes_written);
|
||||
|
||||
|
|
@ -592,7 +594,7 @@ static int ps3_vuart_queue_rx_bytes(struct ps3_system_bus_device *dev,
|
|||
list_add_tail(&lb->link, &priv->rx_list.head);
|
||||
priv->rx_list.bytes_held += bytes;
|
||||
|
||||
dev_dbg(&dev->core, "%s:%d: buf_%lu: queued %lxh bytes\n",
|
||||
dev_dbg(&dev->core, "%s:%d: buf_%lu: queued %llxh bytes\n",
|
||||
__func__, __LINE__, lb->dbg_number, bytes);
|
||||
|
||||
*bytes_queued = bytes;
|
||||
|
|
@ -745,7 +747,7 @@ static int ps3_vuart_handle_interrupt_tx(struct ps3_system_bus_device *dev)
|
|||
|
||||
list_for_each_entry_safe(lb, n, &priv->tx_list.head, link) {
|
||||
|
||||
unsigned long bytes_written;
|
||||
u64 bytes_written;
|
||||
|
||||
result = ps3_vuart_raw_write(dev, lb->head, lb->tail - lb->head,
|
||||
&bytes_written);
|
||||
|
|
@ -762,7 +764,7 @@ static int ps3_vuart_handle_interrupt_tx(struct ps3_system_bus_device *dev)
|
|||
if (bytes_written < lb->tail - lb->head) {
|
||||
lb->head += bytes_written;
|
||||
dev_dbg(&dev->core,
|
||||
"%s:%d cleared buf_%lu, %lxh bytes\n",
|
||||
"%s:%d cleared buf_%lu, %llxh bytes\n",
|
||||
__func__, __LINE__, lb->dbg_number,
|
||||
bytes_written);
|
||||
goto port_full;
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ static int ps3stor_probe_access(struct ps3_storage_device *dev)
|
|||
__func__, __LINE__, n);
|
||||
dev->region_idx = __ffs(dev->accessible_regions);
|
||||
dev_info(&dev->sbd.core,
|
||||
"First accessible region has index %u start %lu size %lu\n",
|
||||
"First accessible region has index %u start %llu size %llu\n",
|
||||
dev->region_idx, dev->regions[dev->region_idx].start,
|
||||
dev->regions[dev->region_idx].size);
|
||||
|
||||
|
|
@ -220,7 +220,7 @@ u64 ps3stor_read_write_sectors(struct ps3_storage_device *dev, u64 lpar,
|
|||
const char *op = write ? "write" : "read";
|
||||
int res;
|
||||
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: %s %lu sectors starting at %lu\n",
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: %s %llu sectors starting at %llu\n",
|
||||
__func__, __LINE__, op, sectors, start_sector);
|
||||
|
||||
init_completion(&dev->done);
|
||||
|
|
@ -238,7 +238,7 @@ u64 ps3stor_read_write_sectors(struct ps3_storage_device *dev, u64 lpar,
|
|||
|
||||
wait_for_completion(&dev->done);
|
||||
if (dev->lv1_status) {
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%lx\n", __func__,
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: %s failed 0x%llx\n", __func__,
|
||||
__LINE__, op, dev->lv1_status);
|
||||
return dev->lv1_status;
|
||||
}
|
||||
|
|
@ -268,7 +268,7 @@ u64 ps3stor_send_command(struct ps3_storage_device *dev, u64 cmd, u64 arg1,
|
|||
{
|
||||
int res;
|
||||
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: send device command 0x%lx\n", __func__,
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: send device command 0x%llx\n", __func__,
|
||||
__LINE__, cmd);
|
||||
|
||||
init_completion(&dev->done);
|
||||
|
|
@ -277,19 +277,19 @@ u64 ps3stor_send_command(struct ps3_storage_device *dev, u64 cmd, u64 arg1,
|
|||
arg2, arg3, arg4, &dev->tag);
|
||||
if (res) {
|
||||
dev_err(&dev->sbd.core,
|
||||
"%s:%u: send_device_command 0x%lx failed %d\n",
|
||||
"%s:%u: send_device_command 0x%llx failed %d\n",
|
||||
__func__, __LINE__, cmd, res);
|
||||
return -1;
|
||||
}
|
||||
|
||||
wait_for_completion(&dev->done);
|
||||
if (dev->lv1_status) {
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: command 0x%lx failed 0x%lx\n",
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: command 0x%llx failed 0x%llx\n",
|
||||
__func__, __LINE__, cmd, dev->lv1_status);
|
||||
return dev->lv1_status;
|
||||
}
|
||||
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: command 0x%lx completed\n", __func__,
|
||||
dev_dbg(&dev->sbd.core, "%s:%u: command 0x%llx completed\n", __func__,
|
||||
__LINE__, cmd);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -933,7 +933,7 @@ static void ibmvfc_get_host_speed(struct Scsi_Host *shost)
|
|||
fc_host_speed(shost) = FC_PORTSPEED_16GBIT;
|
||||
break;
|
||||
default:
|
||||
ibmvfc_log(vhost, 3, "Unknown port speed: %ld Gbit\n",
|
||||
ibmvfc_log(vhost, 3, "Unknown port speed: %lld Gbit\n",
|
||||
vhost->login_buf->resp.link_speed / 100);
|
||||
fc_host_speed(shost) = FC_PORTSPEED_UNKNOWN;
|
||||
break;
|
||||
|
|
@ -2149,8 +2149,8 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
|
|||
{
|
||||
const char *desc = ibmvfc_get_ae_desc(crq->event);
|
||||
|
||||
ibmvfc_log(vhost, 3, "%s event received. scsi_id: %lx, wwpn: %lx,"
|
||||
" node_name: %lx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
|
||||
ibmvfc_log(vhost, 3, "%s event received. scsi_id: %llx, wwpn: %llx,"
|
||||
" node_name: %llx\n", desc, crq->scsi_id, crq->wwpn, crq->node_name);
|
||||
|
||||
switch (crq->event) {
|
||||
case IBMVFC_AE_LINK_UP:
|
||||
|
|
@ -2184,7 +2184,7 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq,
|
|||
ibmvfc_link_down(vhost, IBMVFC_HALTED);
|
||||
break;
|
||||
default:
|
||||
dev_err(vhost->dev, "Unknown async event received: %ld\n", crq->event);
|
||||
dev_err(vhost->dev, "Unknown async event received: %lld\n", crq->event);
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
|
@ -2261,13 +2261,13 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost)
|
|||
* actually sent
|
||||
*/
|
||||
if (unlikely(!ibmvfc_valid_event(&vhost->pool, evt))) {
|
||||
dev_err(vhost->dev, "Returned correlation_token 0x%08lx is invalid!\n",
|
||||
dev_err(vhost->dev, "Returned correlation_token 0x%08llx is invalid!\n",
|
||||
crq->ioba);
|
||||
return;
|
||||
}
|
||||
|
||||
if (unlikely(atomic_read(&evt->free))) {
|
||||
dev_err(vhost->dev, "Received duplicate correlation_token 0x%08lx!\n",
|
||||
dev_err(vhost->dev, "Received duplicate correlation_token 0x%08llx!\n",
|
||||
crq->ioba);
|
||||
return;
|
||||
}
|
||||
|
|
@ -3259,7 +3259,7 @@ static int ibmvfc_alloc_target(struct ibmvfc_host *vhost, u64 scsi_id)
|
|||
|
||||
tgt = mempool_alloc(vhost->tgt_pool, GFP_KERNEL);
|
||||
if (!tgt) {
|
||||
dev_err(vhost->dev, "Target allocation failure for scsi id %08lx\n",
|
||||
dev_err(vhost->dev, "Target allocation failure for scsi id %08llx\n",
|
||||
scsi_id);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -691,13 +691,13 @@ struct ibmvfc_host {
|
|||
#define DBG_CMD(CMD) do { if (ibmvfc_debug) CMD; } while (0)
|
||||
|
||||
#define tgt_dbg(t, fmt, ...) \
|
||||
DBG_CMD(dev_info((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__))
|
||||
DBG_CMD(dev_info((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__))
|
||||
|
||||
#define tgt_info(t, fmt, ...) \
|
||||
dev_info((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
|
||||
dev_info((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
|
||||
|
||||
#define tgt_err(t, fmt, ...) \
|
||||
dev_err((t)->vhost->dev, "%lX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
|
||||
dev_err((t)->vhost->dev, "%llX: " fmt, (t)->scsi_id, ##__VA_ARGS__)
|
||||
|
||||
#define ibmvfc_dbg(vhost, ...) \
|
||||
DBG_CMD(dev_info((vhost)->dev, ##__VA_ARGS__))
|
||||
|
|
|
|||
|
|
@ -290,11 +290,11 @@ static irqreturn_t ps3rom_interrupt(int irq, void *data)
|
|||
|
||||
if (tag != dev->tag)
|
||||
dev_err(&dev->sbd.core,
|
||||
"%s:%u: tag mismatch, got %lx, expected %lx\n",
|
||||
"%s:%u: tag mismatch, got %llx, expected %llx\n",
|
||||
__func__, __LINE__, tag, dev->tag);
|
||||
|
||||
if (res) {
|
||||
dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%lx\n",
|
||||
dev_err(&dev->sbd.core, "%s:%u: res=%d status=0x%llx\n",
|
||||
__func__, __LINE__, res, status);
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
|
@ -364,7 +364,7 @@ static int __devinit ps3rom_probe(struct ps3_system_bus_device *_dev)
|
|||
|
||||
if (dev->blk_size != CD_FRAMESIZE) {
|
||||
dev_err(&dev->sbd.core,
|
||||
"%s:%u: cannot handle block size %lu\n", __func__,
|
||||
"%s:%u: cannot handle block size %llu\n", __func__,
|
||||
__LINE__, dev->blk_size);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = {
|
|||
{ .type = "serial", .compatible = "ns16450", .data = (void *)PORT_16450, },
|
||||
{ .type = "serial", .compatible = "ns16550", .data = (void *)PORT_16550, },
|
||||
{ .type = "serial", .compatible = "ns16750", .data = (void *)PORT_16750, },
|
||||
{ .type = "serial", .compatible = "ns16850", .data = (void *)PORT_16850, },
|
||||
#ifdef CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL
|
||||
{ .type = "serial", .compatible = "ibm,qpace-nwp-serial",
|
||||
.data = (void *)PORT_NWPSERIAL, },
|
||||
|
|
|
|||
|
|
@ -1006,7 +1006,7 @@ static int ps3fb_xdr_settings(u64 xdr_lpar, struct device *dev)
|
|||
__func__, status);
|
||||
return -ENXIO;
|
||||
}
|
||||
dev_dbg(dev, "video:%p ioif:%lx lpar:%lx size:%lx\n",
|
||||
dev_dbg(dev, "video:%p ioif:%lx lpar:%llx size:%lx\n",
|
||||
ps3fb_videomemory.address, GPU_IOIF, xdr_lpar,
|
||||
ps3fb_videomemory.size);
|
||||
|
||||
|
|
@ -1133,7 +1133,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
|
|||
__func__, status);
|
||||
goto err;
|
||||
}
|
||||
dev_dbg(&dev->core, "ddr:lpar:0x%lx\n", ddr_lpar);
|
||||
dev_dbg(&dev->core, "ddr:lpar:0x%llx\n", ddr_lpar);
|
||||
|
||||
status = lv1_gpu_context_allocate(ps3fb.memory_handle, 0,
|
||||
&ps3fb.context_handle,
|
||||
|
|
|
|||
Loading…
Reference in a new issue