diff for duplicates of <00a301c3e541$c13a6350$2987110a@lsd.css.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index a2e129c..d77200c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,7 +60,7 @@ diff -prN linux-2.6.1/drivers/message/fusion/mptbase.c linux-2.6.1.modified/driv + int fail = 0; + + for (retry = REG_READ_RETRY; retry; retry--) { -+ if (readl_check(d, a) = REG_READ_SUCCESS) { ++ if (readl_check(d, a) == REG_READ_SUCCESS) { + return (fail ? REG_READ_RETRY_OK : REG_READ_OK); + } + fail++; @@ -97,7 +97,7 @@ diff -prN linux-2.6.1/drivers/message/fusion/mptbase.c linux-2.6.1.modified/driv */ while (1) { - if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) = 0xFFFFFFFF) + if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) == 0xFFFFFFFF) return IRQ_HANDLED; ! cb_idx = 0; @@ -115,11 +115,11 @@ diff -prN linux-2.6.1/drivers/message/fusion/mptbase.c linux-2.6.1.modified/driv + printk("PCI PIO read error:%d\n", read_fail); + /* recovery code */ + } -+ if (pa = 0xFFFFFFFF) ++ if (pa == 0xFFFFFFFF) + return IRQ_HANDLED; + } + #else - if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) = 0xFFFFFFFF) + if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) == 0xFFFFFFFF) return IRQ_HANDLED; ! #endif cb_idx = 0; @@ -226,7 +226,7 @@ diff -prN linux-2.6.1/drivers/message/fusion/mptbase.c linux-2.6.1.modified/driv diag0val = CHIPREG_READ32(&ioc->chip->Diagnostic); + #endif + - while ((diag0val & MPI_DIAG_DRWE) = 0) { + while ((diag0val & MPI_DIAG_DRWE) == 0) { CHIPREG_WRITE32(&ioc->chip->WriteSequence, 0xFF); CHIPREG_WRITE32(&ioc->chip->WriteSequence, MPI_WRSEQ_1ST_KEY_VALUE); *************** mpt_downloadboot(MPT_ADAPTER *ioc, int s @@ -447,7 +447,7 @@ diff -prN linux-2.6.1/drivers/message/fusion/mptbase.c linux-2.6.1.modified/driv + doorbell &= MPI_IOC_STATE_MASK; - if (doorbell = MPI_IOC_STATE_READY) { + if (doorbell == MPI_IOC_STATE_READY) { *************** mpt_diag_reset(MPT_ADAPTER *ioc, int ign *** 3371,3380 **** --- 3615,3648 ---- @@ -505,7 +505,7 @@ diff -prN linux-2.6.1/drivers/message/fusion/mptbase.c linux-2.6.1.modified/driv + #endif + count = 0; - while ((diag0val & MPI_DIAG_DRWE) = 0) { + while ((diag0val & MPI_DIAG_DRWE) == 0) { /* Write magic sequence to WriteSequence register *************** mpt_diag_reset(MPT_ADAPTER *ioc, int ign *** 3408,3418 **** @@ -619,7 +619,7 @@ diff -prN linux-2.6.1/drivers/message/fusion/mptbase.c linux-2.6.1.modified/driv *** 3822,3828 **** --- 4164,4182 ---- - if (sleepFlag = CAN_SLEEP) { + if (sleepFlag == CAN_SLEEP) { while (--cntdn) { + #ifdef CONFIG_PCI_RECOVERY + { @@ -662,8 +662,8 @@ diff -prN linux-2.6.1/drivers/message/fusion/mptbase.c linux-2.6.1.modified/driv *************** WaitForDoorbellInt(MPT_ADAPTER *ioc, int *** 3872,3878 **** --- 4238,4256 ---- - cntdn = ((sleepFlag = CAN_SLEEP) ? HZ : 1000) * howlong; - if (sleepFlag = CAN_SLEEP) { + cntdn = ((sleepFlag == CAN_SLEEP) ? HZ : 1000) * howlong; + if (sleepFlag == CAN_SLEEP) { while (--cntdn) { + #ifdef CONFIG_PCI_RECOVERY + { @@ -889,12 +889,12 @@ diff -prN linux-2.6.1/drivers/message/fusion/read_check.S linux-2.6.1.modified/d + .readl_end: + {.mmi ld4.acq r14 = [r14] /* r14 = readl_mca */ + ;; -+ cmp4.ne p6, p7 = r14, r15 /* old readl_mca = readl_mca? */ ++ cmp4.ne p6, p7 = r14, r15 /* old readl_mca == readl_mca? */ + nop.i 0 + ;; + } -+ {.mmi (p7) st4 [r32] = r33 /* if (old=new) *valp(r32) = r33 */ -+ (p7) mov r8 = r0 /* if (old=new) ret = 0 */ ++ {.mmi (p7) st4 [r32] = r33 /* if (old==new) *valp(r32) = r33 */ ++ (p7) mov r8 = r0 /* if (old==new) ret = 0 */ + nop.i 0 + } + {.mmb (p6) addl r8 = 1, r0 /* if (old!=new) ret = 1 */ diff --git a/a/content_digest b/N1/content_digest index 4db9d49..b930682 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Hironobu Ishii <ishii.hironobu@jp.fujitsu.com>\0" "Subject\0[RFC/PATCH, 2/4] readX_check() performance evaluation\0" - "Date\0Wed, 28 Jan 2004 01:54:37 +0000\0" + "Date\0Wed, 28 Jan 2004 10:54:37 +0900\0" "To\0linux-kernel <linux-kernel@vger.kernel.org>" " linux-ia64 <linux-ia64@vger.kernel.org>\0" "\00:1\0" @@ -67,7 +67,7 @@ "+ int fail = 0;\n" "+ \n" "+ for (retry = REG_READ_RETRY; retry; retry--) {\n" - "+ if (readl_check(d, a) = REG_READ_SUCCESS) {\n" + "+ if (readl_check(d, a) == REG_READ_SUCCESS) {\n" "+ return (fail ? REG_READ_RETRY_OK : REG_READ_OK);\n" "+ }\n" "+ fail++;\n" @@ -104,7 +104,7 @@ " */\n" " while (1) {\n" " \n" - " if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) = 0xFFFFFFFF)\n" + " if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) == 0xFFFFFFFF)\n" " return IRQ_HANDLED;\n" "! \n" " cb_idx = 0;\n" @@ -122,11 +122,11 @@ "+ printk(\"PCI PIO read error:%d\\n\", read_fail);\n" "+ /* recovery code */\n" "+ }\n" - "+ if (pa = 0xFFFFFFFF)\n" + "+ if (pa == 0xFFFFFFFF)\n" "+ return IRQ_HANDLED;\n" "+ }\n" "+ #else\n" - " if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) = 0xFFFFFFFF)\n" + " if ((pa = CHIPREG_READ32(&ioc->chip->ReplyFifo)) == 0xFFFFFFFF)\n" " return IRQ_HANDLED;\n" "! #endif\n" " cb_idx = 0;\n" @@ -233,7 +233,7 @@ " diag0val = CHIPREG_READ32(&ioc->chip->Diagnostic);\n" "+ #endif\n" "+ \n" - " while ((diag0val & MPI_DIAG_DRWE) = 0) {\n" + " while ((diag0val & MPI_DIAG_DRWE) == 0) {\n" " CHIPREG_WRITE32(&ioc->chip->WriteSequence, 0xFF);\n" " CHIPREG_WRITE32(&ioc->chip->WriteSequence, MPI_WRSEQ_1ST_KEY_VALUE);\n" "*************** mpt_downloadboot(MPT_ADAPTER *ioc, int s\n" @@ -454,7 +454,7 @@ "+ \n" " doorbell &= MPI_IOC_STATE_MASK;\n" " \n" - " if (doorbell = MPI_IOC_STATE_READY) {\n" + " if (doorbell == MPI_IOC_STATE_READY) {\n" "*************** mpt_diag_reset(MPT_ADAPTER *ioc, int ign\n" "*** 3371,3380 ****\n" "--- 3615,3648 ----\n" @@ -512,7 +512,7 @@ "+ #endif\n" "+ \n" " count = 0;\n" - " while ((diag0val & MPI_DIAG_DRWE) = 0) {\n" + " while ((diag0val & MPI_DIAG_DRWE) == 0) {\n" " /* Write magic sequence to WriteSequence register\n" "*************** mpt_diag_reset(MPT_ADAPTER *ioc, int ign\n" "*** 3408,3418 ****\n" @@ -626,7 +626,7 @@ "*** 3822,3828 ****\n" "--- 4164,4182 ----\n" " \n" - " if (sleepFlag = CAN_SLEEP) {\n" + " if (sleepFlag == CAN_SLEEP) {\n" " while (--cntdn) {\n" "+ #ifdef CONFIG_PCI_RECOVERY\n" "+ {\n" @@ -669,8 +669,8 @@ "*************** WaitForDoorbellInt(MPT_ADAPTER *ioc, int\n" "*** 3872,3878 ****\n" "--- 4238,4256 ----\n" - " cntdn = ((sleepFlag = CAN_SLEEP) ? HZ : 1000) * howlong;\n" - " if (sleepFlag = CAN_SLEEP) {\n" + " cntdn = ((sleepFlag == CAN_SLEEP) ? HZ : 1000) * howlong;\n" + " if (sleepFlag == CAN_SLEEP) {\n" " while (--cntdn) {\n" "+ #ifdef CONFIG_PCI_RECOVERY\n" "+ {\n" @@ -896,12 +896,12 @@ "+ .readl_end:\n" "+ {.mmi ld4.acq r14 = [r14] /* r14 = readl_mca */\n" "+ ;;\n" - "+ cmp4.ne p6, p7 = r14, r15 /* old readl_mca = readl_mca? */\n" + "+ cmp4.ne p6, p7 = r14, r15 /* old readl_mca == readl_mca? */\n" "+ nop.i 0\n" "+ ;;\n" "+ }\n" - "+ {.mmi (p7) st4 [r32] = r33 /* if (old=new) *valp(r32) = r33 */\n" - "+ (p7) mov r8 = r0 /* if (old=new) ret = 0 */\n" + "+ {.mmi (p7) st4 [r32] = r33 /* if (old==new) *valp(r32) = r33 */\n" + "+ (p7) mov r8 = r0 /* if (old==new) ret = 0 */\n" "+ nop.i 0\n" "+ }\n" "+ {.mmb (p6) addl r8 = 1, r0 /* if (old!=new) ret = 1 */\n" @@ -912,4 +912,4 @@ "+ \n" + END(readl_check) -22a229aeabe930342ae64acf15122aca434c27acd49cf3df3bf512db14afef42 +c4870964099f11e52aa1807a53e059c6209e805f7b7ed3b275338cff55a9aa84
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.