From linux-kernel-owner+willy=40w.ods.org@vger.kernel.org Fri Apr 25 00:15:29 2003 Return-Path: Received: from vax.home.local (vax [10.2.1.2]) by alpha.home.local (8.12.4/8.12.1) with ESMTP id h3OMFSJ7021938 for ; Fri, 25 Apr 2003 00:15:28 +0200 Received: from vger.kernel.org (vger.kernel.org [209.116.70.75]) by vax.home.local (8.12.2/8.12.1) with ESMTP id h3OMFA1T021600 for ; Fri, 25 Apr 2003 00:15:26 +0200 (CEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264475AbTDXWBg (ORCPT ); Thu, 24 Apr 2003 18:01:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264482AbTDXWBf (ORCPT ); Thu, 24 Apr 2003 18:01:35 -0400 Received: from ztxmail03.ztx.compaq.com ([161.114.1.207]:21252 "EHLO ztxmail03.ztx.compaq.com") by vger.kernel.org with ESMTP id S264475AbTDXWBA (ORCPT ); Thu, 24 Apr 2003 18:01:00 -0400 Received: from taynzmail03.nz-tay.cpqcorp.net (taynzmail03.nz-tay.cpqcorp.net [16.47.4.103]) by ztxmail03.ztx.compaq.com (Postfix) with ESMTP id C1BA79703; Thu, 24 Apr 2003 17:13:04 -0500 (CDT) Received: from beardog.cca.cpqcorp.net (beardog.cca.cpqcorp.net [16.101.176.144]) by taynzmail03.nz-tay.cpqcorp.net (Postfix) with ESMTP id E829D1252; Thu, 24 Apr 2003 18:13:03 -0400 (EDT) Received: (from mikem@localhost) by beardog.cca.cpqcorp.net (8.11.6/8.11.6) id h3OMCgc01143; Thu, 24 Apr 2003 17:12:42 -0500 Date: Thu, 24 Apr 2003 17:12:42 -0500 From: mikem@beardog.cca.cpqcorp.net Message-Id: <200304242212.h3OMCgc01143@beardog.cca.cpqcorp.net> To: axboe@suse.de Subject: RE:cciss patches for 2.4.21-rc1, 4 of 4 Cc: linux-kernel@vger.kernel.org, mike.miller@hp.com, steve.cameron@hp.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1362 Lines: 40 20030424 Changes: 1. Sets the DMA mask to 64 bits. Removes RH's code for the DMA mask. diff -urN lx2421rc1-p3/drivers/block/cciss.c lx2421rc1/drivers/block/cciss.c --- lx2421rc1-p3/drivers/block/cciss.c Wed Apr 23 14:40:48 2003 +++ lx2421rc1/drivers/block/cciss.c Wed Apr 23 14:51:55 2003 @@ -106,7 +106,7 @@ #define NR_CMDS 128 /* #commands that can be outstanding */ #define MAX_CTLR 8 -#define CCISS_DMA_MASK 0xFFFFFFFF /* 32 bit DMA */ +#define CCISS_DMA_MASK 0xFFFFFFFFFFFFFFFF /* 64 bit DMA */ static ctlr_info_t *hba[MAX_CTLR]; @@ -2861,17 +2861,6 @@ hba[i]->ctlr = i; hba[i]->pdev = pdev; - /* configure PCI DMA stuff */ - if (!pci_set_dma_mask(pdev, (u64) 0xffffffffffffffff)) - printk("cciss: using DAC cycles\n"); - else if (!pci_set_dma_mask(pdev, (u64) 0xffffffff)) - printk("cciss: not using DAC cycles\n"); - else { - printk("cciss: no suitable DMA available\n"); - free_hba(i); - return -ENODEV; - } - if (register_blkdev(MAJOR_NR+i, hba[i]->devname, &cciss_fops)) { printk(KERN_ERR "cciss: Unable to get major number " "%d for %s\n", MAJOR_NR+i, hba[i]->devname); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/