From ab31355bd50083f27eff20bcfa9f36ae3e0157fe Mon Sep 17 00:00:00 2001 From: Ke Wei Date: Wed, 27 Feb 2008 20:50:25 +0800 Subject: [PATCH] --- yaml --- r: 86954 b: refs/heads/master c: 00da714b31b944400ee789e477f58247cff30b1b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mvsas.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) mode change 100644 => 100755 trunk/drivers/scsi/mvsas.c diff --git a/[refs] b/[refs] index f32208d39a0d..d35d6f41bf3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee54cc6af95a7fa09da298493b853a9e64fa8abd +refs/heads/master: 00da714b31b944400ee789e477f58247cff30b1b diff --git a/trunk/drivers/scsi/mvsas.c b/trunk/drivers/scsi/mvsas.c old mode 100644 new mode 100755 index d4a6ac3c9c47..5ec0665b3a3d --- a/trunk/drivers/scsi/mvsas.c +++ b/trunk/drivers/scsi/mvsas.c @@ -40,7 +40,7 @@ #include #define DRV_NAME "mvsas" -#define DRV_VERSION "0.5" +#define DRV_VERSION "0.5.1" #define _MV_DUMP 0 #define MVS_DISABLE_NVRAM #define MVS_DISABLE_MSI @@ -1005,7 +1005,7 @@ static int mvs_nvram_read(struct mvs_info *mvi, u32 addr, return rc; #else /* FIXME , For SAS target mode */ - memcpy(buf, "\x00\x00\xab\x11\x30\x04\x05\x50", 8); + memcpy(buf, "\x50\x05\x04\x30\x11\xab\x00\x00", 8); return 0; #endif } @@ -1330,7 +1330,7 @@ static int mvs_int_rx(struct mvs_info *mvi, bool self_clear) mvs_hba_cq_dump(mvi); - if (unlikely(rx_desc & RXQ_DONE)) + if (likely(rx_desc & RXQ_DONE)) mvs_slot_complete(mvi, rx_desc); if (rx_desc & RXQ_ATTN) { attn = true; @@ -2720,9 +2720,8 @@ static int __devinit mvs_hw_init(struct mvs_info *mvi) msleep(100); /* init and reset phys */ for (i = 0; i < mvi->chip->n_phy; i++) { - /* FIXME: is this the correct dword order? */ - u32 lo = *((u32 *)&mvi->sas_addr[0]); - u32 hi = *((u32 *)&mvi->sas_addr[4]); + u32 lo = be32_to_cpu(*(u32 *)&mvi->sas_addr[4]); + u32 hi = be32_to_cpu(*(u32 *)&mvi->sas_addr[0]); mvs_detect_porttype(mvi, i);