Module Name: src Committed By: jakllsch Date: Sun Apr 23 01:30:30 UTC 2017
Modified Files: src/sys/dev/ata [jdolecek-ncq]: ata.c Log Message: Use WDC_QUEUE_DEPTH_MASK to correctly mask the NCQ depth IDENTIFY data. To generate a diff of this commit: cvs rdiff -u -r1.132.8.6 -r1.132.8.7 src/sys/dev/ata/ata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/ata/ata.c diff -u src/sys/dev/ata/ata.c:1.132.8.6 src/sys/dev/ata/ata.c:1.132.8.7 --- src/sys/dev/ata/ata.c:1.132.8.6 Wed Apr 19 21:42:39 2017 +++ src/sys/dev/ata/ata.c Sun Apr 23 01:30:30 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: ata.c,v 1.132.8.6 2017/04/19 21:42:39 jdolecek Exp $ */ +/* $NetBSD: ata.c,v 1.132.8.7 2017/04/23 01:30:30 jakllsch Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.6 2017/04/19 21:42:39 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.7 2017/04/23 01:30:30 jakllsch Exp $"); #include "opt_ata.h" @@ -1744,7 +1744,8 @@ ata_probe_caps(struct ata_drive_datas *d if (params.atap_sata_caps & SATA_NATIVE_CMDQ) { if (atac->atac_cap & ATAC_CAP_NCQ) drvp->drive_flags |= ATA_DRIVE_NCQ; - drvp->drv_openings = (params.atap_queuedepth & 0x0f) + 1; + drvp->drv_openings = + (params.atap_queuedepth & WDC_QUEUE_DEPTH_MASK) + 1; aprint_verbose("%s NCQ (%d tags)", sep, drvp->drv_openings); sep = ","; }