From owner-p4-projects@FreeBSD.ORG Thu Feb 7 04:38:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC1A016A41B; Thu, 7 Feb 2008 04:38:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68F1216A417 for ; Thu, 7 Feb 2008 04:38:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48CB213C45B for ; Thu, 7 Feb 2008 04:38:58 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m174cwKS002930 for ; Thu, 7 Feb 2008 04:38:58 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m174cw9X002927 for perforce@freebsd.org; Thu, 7 Feb 2008 04:38:58 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 7 Feb 2008 04:38:58 GMT Message-Id: <200802070438.m174cw9X002927@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 134957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Feb 2008 04:38:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=134957 Change 134957 by kmacy@kmacy:storage:toehead on 2008/02/07 04:38:26 improve formatting Affected files ... .. //depot/projects/toehead/sys/dev/cxgb/common/cxgb_t3_hw.c#3 edit Differences ... ==== //depot/projects/toehead/sys/dev/cxgb/common/cxgb_t3_hw.c#3 (text+ko) ==== @@ -1084,9 +1084,11 @@ { int ret = 0; - if (t3_read_reg(adap, A_CIM_HOST_ACC_CTRL) & F_HOSTBUSY) + if (t3_read_reg(adap, A_CIM_HOST_ACC_CTRL) & F_HOSTBUSY) { + printf("host busy\n"); return -EBUSY; - + } + for ( ; !ret && n--; addr += 4) { t3_write_reg(adap, A_CIM_HOST_ACC_CTRL, CIM_CTL_BASE + addr); ret = t3_wait_op_done(adap, A_CIM_HOST_ACC_CTRL, F_HOSTBUSY, @@ -1538,8 +1540,8 @@ if (cause & F_CE) { mc7->stats.corr_err++; - CH_WARN(adapter, "%s MC7 correctable error at addr 0x%x, " - "data 0x%x 0x%x 0x%x\n", mc7->name, + CH_WARN(adapter, "%s MC7 correctable error at addr 0x%08x, " + "data 0x%08x 0x%08x 0x%08x\n", mc7->name, t3_read_reg(adapter, mc7->offset + A_MC7_CE_ADDR), t3_read_reg(adapter, mc7->offset + A_MC7_CE_DATA0), t3_read_reg(adapter, mc7->offset + A_MC7_CE_DATA1), @@ -1548,8 +1550,8 @@ if (cause & F_UE) { mc7->stats.uncorr_err++; - CH_ALERT(adapter, "%s MC7 uncorrectable error at addr 0x%x, " - "data 0x%x 0x%x 0x%x\n", mc7->name, + CH_ALERT(adapter, "%s MC7 uncorrectable error at addr 0x%08x, " + "data 0x%08x 0x%08x 0x%08x\n", mc7->name, t3_read_reg(adapter, mc7->offset + A_MC7_UE_ADDR), t3_read_reg(adapter, mc7->offset + A_MC7_UE_DATA0), t3_read_reg(adapter, mc7->offset + A_MC7_UE_DATA1), @@ -1569,7 +1571,7 @@ addr = t3_read_reg(adapter, mc7->offset + A_MC7_ERR_ADDR); mc7->stats.addr_err++; - CH_ALERT(adapter, "%s MC7 address error: 0x%x\n", + CH_ALERT(adapter, "%s MC7 address error: 0x%08x\n", mc7->name, addr); }