From owner-svn-src-projects@FreeBSD.ORG Sun Nov 6 15:51:55 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3832106566B; Sun, 6 Nov 2011 15:51:55 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D3A5C8FC1C; Sun, 6 Nov 2011 15:51:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA6Fpt71028600; Sun, 6 Nov 2011 15:51:55 GMT (envelope-from andreast@svn.freebsd.org) Received: (from andreast@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6FptAG028598; Sun, 6 Nov 2011 15:51:55 GMT (envelope-from andreast@svn.freebsd.org) Message-Id: <201111061551.pA6FptAG028598@svn.freebsd.org> From: Andreas Tobler Date: Sun, 6 Nov 2011 15:51:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227218 - projects/pseries/powerpc/pseries X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 15:51:56 -0000 Author: andreast Date: Sun Nov 6 15:51:55 2011 New Revision: 227218 URL: http://svn.freebsd.org/changeset/base/227218 Log: Fix my previous commit and honor both, the HVTERM1 and the HVTERMPROT buffer size correctly when calling the phyp_hcall. Modified: projects/pseries/powerpc/pseries/phyp_console.c Modified: projects/pseries/powerpc/pseries/phyp_console.c ============================================================================== --- projects/pseries/powerpc/pseries/phyp_console.c Sun Nov 6 15:13:01 2011 (r227217) +++ projects/pseries/powerpc/pseries/phyp_console.c Sun Nov 6 15:51:55 2011 (r227218) @@ -168,6 +168,7 @@ static void phyp_uart_putc(struct uart_bas *bas, int c) { uint16_t seqno; + uint64_t len = 0; union { uint64_t u64; char bytes[8]; @@ -176,6 +177,7 @@ phyp_uart_putc(struct uart_bas *bas, int switch (bas->regshft) { case HVTERM1: cbuf.bytes[0] = c; + len = 1; break; case HVTERMPROT: seqno = phyp_outseqno++; @@ -184,9 +186,10 @@ phyp_uart_putc(struct uart_bas *bas, int cbuf.bytes[2] = (seqno >> 8) & 0xff; cbuf.bytes[3] = seqno & 0xff; cbuf.bytes[4] = c; + len = 5; break; } - phyp_hcall(H_PUT_TERM_CHAR, (uint64_t)bas->bsh, 5UL, cbuf.u64, 0); + phyp_hcall(H_PUT_TERM_CHAR, (uint64_t)bas->bsh, len, cbuf.u64, 0); } static int From owner-svn-src-projects@FreeBSD.ORG Sun Nov 6 19:05:42 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98BF2106566B; Sun, 6 Nov 2011 19:05:42 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 88DE08FC12; Sun, 6 Nov 2011 19:05:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA6J5g5g037401; Sun, 6 Nov 2011 19:05:42 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA6J5g5N037399; Sun, 6 Nov 2011 19:05:42 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201111061905.pA6J5g5N037399@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 6 Nov 2011 19:05:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227263 - projects/pseries/powerpc/pseries X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 19:05:42 -0000 Author: nwhitehorn Date: Sun Nov 6 19:05:42 2011 New Revision: 227263 URL: http://svn.freebsd.org/changeset/base/227263 Log: Register a per-CPU virtual processor area with the hypervisor telling it not to do things behind our back. Modified: projects/pseries/powerpc/pseries/platform_chrp.c Modified: projects/pseries/powerpc/pseries/platform_chrp.c ============================================================================== --- projects/pseries/powerpc/pseries/platform_chrp.c Sun Nov 6 19:03:07 2011 (r227262) +++ projects/pseries/powerpc/pseries/platform_chrp.c Sun Nov 6 19:05:42 2011 (r227263) @@ -57,6 +57,10 @@ __FBSDID("$FreeBSD$"); extern void *ap_pcpu; #endif +#ifdef __powerpc64__ +static uint8_t splpar_vpa[640] __aligned(64); +#endif + static vm_offset_t realmaxaddr = VM_MAX_ADDRESS; static int chrp_probe(platform_t); @@ -131,8 +135,19 @@ chrp_attach(platform_t plat) pmap_mmu_install("mmu_phyp", BUS_PROBE_SPECIFIC); cpu_idle_hook = phyp_cpu_idle; - /* Set interrupt priority */ - phyp_hcall(H_CPPR, 0xff); + /* Set up important VPA fields */ + bzero(splpar_vpa, sizeof(splpar_vpa)); + splpar_vpa[4] = (uint8_t)((sizeof(splpar_vpa) >> 8) & 0xff); + splpar_vpa[5] = (uint8_t)(sizeof(splpar_vpa) & 0xff); + splpar_vpa[0xba] = 1; /* Maintain FPRs */ + splpar_vpa[0xbb] = 1; /* Maintain PMCs */ + splpar_vpa[0xfc] = 0xff; /* Maintain full SLB */ + splpar_vpa[0xfd] = 0xff; + splpar_vpa[0xff] = 1; /* Maintain Altivec */ + mb(); + + /* Set up hypervisor CPU stuff */ + chrp_smp_ap_init(plat); } #endif @@ -382,6 +397,9 @@ chrp_smp_ap_init(platform_t platform) if (!(mfmsr() & PSL_HV)) { /* Set interrupt priority */ phyp_hcall(H_CPPR, 0xff); + + /* Register VPA */ + phyp_hcall(H_REGISTER_VPA, 1UL, PCPU_GET(cpuid), splpar_vpa); } } #endif From owner-svn-src-projects@FreeBSD.ORG Mon Nov 7 00:12:17 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 151A6106564A; Mon, 7 Nov 2011 00:12:17 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 05D0A8FC0C; Mon, 7 Nov 2011 00:12:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA70CGmP048448; Mon, 7 Nov 2011 00:12:16 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA70CGSr048446; Mon, 7 Nov 2011 00:12:16 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201111070012.pA70CGSr048446@svn.freebsd.org> From: Olivier Houchard Date: Mon, 7 Nov 2011 00:12:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227288 - projects/armv6/sys/arm/arm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Nov 2011 00:12:17 -0000 Author: cognet Date: Mon Nov 7 00:12:16 2011 New Revision: 227288 URL: http://svn.freebsd.org/changeset/base/227288 Log: - Ooops, we should check PGA_WRITEABLE agains aflags, not flags. - in pmap_fault_fixup(), don't assume the mapping as to be a user mapping only because the fault comes from userland. If we were faulting from copyin/copyout or friends, we would remove the userland access, and bad thing would happen. Modified: projects/armv6/sys/arm/arm/pmap-v6.c Modified: projects/armv6/sys/arm/arm/pmap-v6.c ============================================================================== --- projects/armv6/sys/arm/arm/pmap-v6.c Sun Nov 6 23:34:40 2011 (r227287) +++ projects/armv6/sys/arm/arm/pmap-v6.c Mon Nov 7 00:12:16 2011 (r227288) @@ -890,6 +890,7 @@ pmap_clearbit(struct vm_page *pg, u_int if (npte != opte) { count++; *ptep = npte; + PTE_SYNC(ptep); /* Flush the TLB entry if a current pmap. */ if (PV_BEEN_EXECD(oflags)) cpu_tlb_flushID_SE(pv->pv_va); @@ -1261,7 +1262,7 @@ pmap_fault_fixup(pmap_t pm, vm_offset_t /* Re-enable write permissions for the page */ *ptep = (pte & ~L2_TYPE_MASK) | L2_S_PROTO; - pmap_set_prot(ptep, VM_PROT_WRITE, user); + pmap_set_prot(ptep, VM_PROT_WRITE, *ptep & L2_S_PROT_U); CTR1(KTR_PMAP, "pmap_fault_fix: new pte:0x%x", pte); PTE_SYNC(ptep); rv = 1; @@ -3391,7 +3392,7 @@ pmap_clear_modify(vm_page_t m) * If the object containing the page is locked and the page is not * VPO_BUSY, then PGA_WRITEABLE cannot be concurrently set. */ - if ((m->flags & PGA_WRITEABLE) == 0) + if ((m->aflags & PGA_WRITEABLE) == 0) return; if (m->md.pvh_attrs & PVF_MOD) @@ -3431,7 +3432,7 @@ pmap_remove_write(vm_page_t m) */ VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if ((m->oflags & VPO_BUSY) != 0 || - (m->flags & PGA_WRITEABLE) != 0) + (m->aflags & PGA_WRITEABLE) != 0) pmap_clearbit(m, PVF_WRITE); } From owner-svn-src-projects@FreeBSD.ORG Mon Nov 7 00:27:26 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11F7E1065670; Mon, 7 Nov 2011 00:27:26 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 02D018FC13; Mon, 7 Nov 2011 00:27:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA70RPbZ048942; Mon, 7 Nov 2011 00:27:25 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA70RPW3048940; Mon, 7 Nov 2011 00:27:25 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201111070027.pA70RPW3048940@svn.freebsd.org> From: Olivier Houchard Date: Mon, 7 Nov 2011 00:27:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227289 - projects/armv6/sys/arm/arm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Nov 2011 00:27:26 -0000 Author: cognet Date: Mon Nov 7 00:27:25 2011 New Revision: 227289 URL: http://svn.freebsd.org/changeset/base/227289 Log: In pmap_modify_pv(), if we're removing the PVF_WRITE flag, don't forget to check if there's any writable mapping left for the page, and remove the PGA_WRITEABLE flag if there's not any. Modified: projects/armv6/sys/arm/arm/pmap-v6.c Modified: projects/armv6/sys/arm/arm/pmap-v6.c ============================================================================== --- projects/armv6/sys/arm/arm/pmap-v6.c Mon Nov 7 00:12:16 2011 (r227288) +++ projects/armv6/sys/arm/arm/pmap-v6.c Mon Nov 7 00:27:25 2011 (r227289) @@ -1103,6 +1103,16 @@ pmap_modify_pv(struct vm_page *pg, pmap_ else --pm->pm_stats.wired_count; } + if ((oflags & PVF_WRITE) && !(flags & PVF_WRITE)) { + TAILQ_FOREACH(npv, &pg->md.pv_list, pv_list) { + if (npv->pv_flags & PVF_WRITE) + break; + } + if (!npv) { + pg->md.pvh_attrs &= ~PVF_MOD; + vm_page_aflag_clear(pg, PGA_WRITEABLE); + } + } return (oflags); } From owner-svn-src-projects@FreeBSD.ORG Mon Nov 7 19:53:21 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 363D4106564A; Mon, 7 Nov 2011 19:53:21 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2722A8FC0C; Mon, 7 Nov 2011 19:53:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA7JrLDB093938; Mon, 7 Nov 2011 19:53:21 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA7JrLL3093936; Mon, 7 Nov 2011 19:53:21 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201111071953.pA7JrLL3093936@svn.freebsd.org> From: Peter Grehan Date: Mon, 7 Nov 2011 19:53:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227313 - projects/bhyve/sys/dev/bvm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Nov 2011 19:53:21 -0000 Author: grehan Date: Mon Nov 7 19:53:20 2011 New Revision: 227313 URL: http://svn.freebsd.org/changeset/base/227313 Log: Allow the paravirtualized debug port to override others. Obtained from: NetApp Modified: projects/bhyve/sys/dev/bvm/bvm_dbg.c Modified: projects/bhyve/sys/dev/bvm/bvm_dbg.c ============================================================================== --- projects/bhyve/sys/dev/bvm/bvm_dbg.c Mon Nov 7 18:26:38 2011 (r227312) +++ projects/bhyve/sys/dev/bvm/bvm_dbg.c Mon Nov 7 19:53:20 2011 (r227313) @@ -62,7 +62,11 @@ bvm_dbg_probe(void) if (resource_int_value("bvmdbg", 0, "port", &port) == 0) bvm_dbg_port = port; - return (0); + /* + * Return a higher priority than 0 to override other + * gdb dbgport providers that may be present (e.g. uart) + */ + return (1); } static void From owner-svn-src-projects@FreeBSD.ORG Wed Nov 9 20:12:59 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60941106564A; Wed, 9 Nov 2011 20:12:59 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 50FFA8FC1B; Wed, 9 Nov 2011 20:12:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA9KCxM5098125; Wed, 9 Nov 2011 20:12:59 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA9KCxZJ098123; Wed, 9 Nov 2011 20:12:59 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201111092012.pA9KCxZJ098123@svn.freebsd.org> From: Xin LI Date: Wed, 9 Nov 2011 20:12:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227406 - projects/head_mfi/sys/dev/mfi X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2011 20:12:59 -0000 Author: delphij Date: Wed Nov 9 20:12:59 2011 New Revision: 227406 URL: http://svn.freebsd.org/changeset/base/227406 Log: Incorporate Scott Long's patch for mfi(4) that fixes mfi(4) timeouts for our hardware: mfi0@pci0:2:0:0: class=0x010400 card=0x100a1000 chip=0x00601000 rev=0x04 hdr=0x00 vendor = 'LSI Logic / Symbios Logic' device = 'MegaRAID SAS 1078' Modified: projects/head_mfi/sys/dev/mfi/mfi.c Modified: projects/head_mfi/sys/dev/mfi/mfi.c ============================================================================== --- projects/head_mfi/sys/dev/mfi/mfi.c Wed Nov 9 19:09:03 2011 (r227405) +++ projects/head_mfi/sys/dev/mfi/mfi.c Wed Nov 9 20:12:59 2011 (r227406) @@ -1239,6 +1239,12 @@ mfi_intr(void *arg) if (sc->mfi_check_clear_intr(sc)) return; + /* + * Do a dummy read to flush the interrupt ACK that we just performed, + * ensuring that everything is really, truly consistent. + */ + (void)sc->mfi_read_fw_status(sc); + pi = sc->mfi_comms->hw_pi; ci = sc->mfi_comms->hw_ci; mtx_lock(&sc->mfi_io_lock); From owner-svn-src-projects@FreeBSD.ORG Wed Nov 9 21:08:12 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2FBA81065673; Wed, 9 Nov 2011 21:08:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 07C268FC17; Wed, 9 Nov 2011 21:08:12 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 9BFA246B37; Wed, 9 Nov 2011 16:08:11 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 2E7458A050; Wed, 9 Nov 2011 16:08:11 -0500 (EST) From: John Baldwin To: Xin LI Date: Wed, 9 Nov 2011 15:53:55 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p8; KDE/4.5.5; amd64; ; ) References: <201111092012.pA9KCxZJ098123@svn.freebsd.org> In-Reply-To: <201111092012.pA9KCxZJ098123@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201111091553.55037.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Wed, 09 Nov 2011 16:08:11 -0500 (EST) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r227406 - projects/head_mfi/sys/dev/mfi X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2011 21:08:12 -0000 On Wednesday, November 09, 2011 3:12:59 pm Xin LI wrote: > Author: delphij > Date: Wed Nov 9 20:12:59 2011 > New Revision: 227406 > URL: http://svn.freebsd.org/changeset/base/227406 > > Log: > Incorporate Scott Long's patch for mfi(4) that fixes mfi(4) timeouts for > our hardware: > > mfi0@pci0:2:0:0: class=0x010400 card=0x100a1000 chip=0x00601000 rev=0x04 hdr=0x00 > vendor = 'LSI Logic / Symbios Logic' > device = 'MegaRAID SAS 1078' > > Modified: > projects/head_mfi/sys/dev/mfi/mfi.c Hmm, beat me to committing the other version of this. The Linux LSI driver does a specific read in each implementation of check_clear_intr(), but this is fine. I do think we should start coordinating more on mfi(4) though. (I was literally writing a commit message in an editor when I got this e-mail.) I was planning on finishing up a patch to add optional MSI support. -- John Baldwin From owner-svn-src-projects@FreeBSD.ORG Fri Nov 11 21:56:33 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 599D11065674; Fri, 11 Nov 2011 21:56:33 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 308838FC17; Fri, 11 Nov 2011 21:56:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pABLuXSE010234; Fri, 11 Nov 2011 21:56:33 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pABLuXQv010233; Fri, 11 Nov 2011 21:56:33 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201111112156.pABLuXQv010233@svn.freebsd.org> From: Marcel Moolenaar Date: Fri, 11 Nov 2011 21:56:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227455 - projects/altix/sys/boot/powerpc/ps3 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2011 21:56:33 -0000 Author: marcel Date: Fri Nov 11 21:56:32 2011 New Revision: 227455 URL: http://svn.freebsd.org/changeset/base/227455 Log: Deal with tree conflicts (local add, incoming add) Deleted: projects/altix/sys/boot/powerpc/ps3/ From owner-svn-src-projects@FreeBSD.ORG Fri Nov 11 21:57:32 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DA12106566B; Fri, 11 Nov 2011 21:57:32 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 149258FC08; Fri, 11 Nov 2011 21:57:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pABLvVfq010318; Fri, 11 Nov 2011 21:57:31 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pABLvVk5010317; Fri, 11 Nov 2011 21:57:31 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201111112157.pABLvVk5010317@svn.freebsd.org> From: Marcel Moolenaar Date: Fri, 11 Nov 2011 21:57:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227456 - projects/altix/sys/boot/powerpc/ps3 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Nov 2011 21:57:32 -0000 Author: marcel Date: Fri Nov 11 21:57:31 2011 New Revision: 227456 URL: http://svn.freebsd.org/changeset/base/227456 Log: Deal with tree conflicts. Added: - copied from r227455, head/sys/boot/powerpc/ps3/ Directory Properties: projects/altix/sys/boot/powerpc/ps3/ (props changed)