From owner-p4-projects@FreeBSD.ORG Thu Feb 5 00:49:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D40471065675; Thu, 5 Feb 2009 00:49:05 +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 92B85106564A for ; Thu, 5 Feb 2009 00:49:05 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 808848FC14 for ; Thu, 5 Feb 2009 00:49:05 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n150n5kj039084 for ; Thu, 5 Feb 2009 00:49:05 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n150n5nY039082 for perforce@freebsd.org; Thu, 5 Feb 2009 00:49:05 GMT (envelope-from nwhitehorn@freebsd.org) Date: Thu, 5 Feb 2009 00:49:05 GMT Message-Id: <200902050049.n150n5nY039082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 157185 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, 05 Feb 2009 00:49:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=157185 Change 157185 by nwhitehorn@nwhitehorn_trantor on 2009/02/05 00:48:49 Use the 4-byte status word read on all Serverworks SATA controllers, instead of just K2. The Linux driver seems to get away with doing this, and it is necessary for a variety of SATA controllers on PowerPC. This should be tested on x86. Affected files ... .. //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/dev/ata/chipsets/ata-serverworks.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ static void ata_serverworks_tf_read(struct ata_request *request); static void ata_serverworks_tf_write(struct ata_request *request); static void ata_serverworks_setmode(device_t dev, int mode); -static int ata_serverworks_k2status(device_t dev); +static int ata_serverworks_status(device_t dev); /* misc defines */ #define SWKS_33 0 @@ -99,10 +99,15 @@ } static int -ata_serverworks_k2status(device_t dev) +ata_serverworks_status(device_t dev) { struct ata_channel *ch = device_get_softc(dev); + /* + * We need to do a 4-byte read on the status reg before the values + * will report correctly + */ + ATA_IDX_INL(ch,ATA_STATUS); return ata_pci_status(dev); @@ -193,14 +198,11 @@ ata_pci_hw(dev); ch->hw.tf_read = ata_serverworks_tf_read; ch->hw.tf_write = ata_serverworks_tf_write; + ch->hw.status = ata_serverworks_status; /* chip does not reliably do 64K DMA transfers */ ch->dma.max_iosize = 64 * DEV_BSIZE; - /* For K2, we need to do a 4-byte read on the status reg */ - if (ctlr->chip->chipid == ATA_K2) - ch->hw.status = ata_serverworks_k2status; - return 0; }