66c66
< __FBSDID("$FreeBSD: head/sys/dev/mpt/mpt_pci.c 150007 2005-09-11 19:58:19Z mjacob $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mpt/mpt_pci.c 155521 2006-02-11 01:35:29Z mjacob $");
72,78d71
< #if __FreeBSD_version < 500000
< #include <pci/pcireg.h>
< #include <pci/pcivar.h>
< #else
< #include <dev/pci/pcireg.h>
< #include <dev/pci/pcivar.h>
< #endif
107a101,132
> #ifndef PCI_PRODUCT_LSI_SAS1064
> #define PCI_PRODUCT_LSI_SAS1064 0x0050
> #endif
>
> #ifndef PCI_PRODUCT_LSI_SAS1064A
> #define PCI_PRODUCT_LSI_SAS1064A 0x005C
> #endif
>
> #ifndef PCI_PRODUCT_LSI_SAS1064E
> #define PCI_PRODUCT_LSI_SAS1064E 0x0056
> #endif
>
> #ifndef PCI_PRODUCT_LSI_SAS1066
> #define PCI_PRODUCT_LSI_SAS1066 0x005E
> #endif
>
> #ifndef PCI_PRODUCT_LSI_SAS1066E
> #define PCI_PRODUCT_LSI_SAS1066E 0x005A
> #endif
>
> #ifndef PCI_PRODUCT_LSI_SAS1068
> #define PCI_PRODUCT_LSI_SAS1068 0x0054
> #endif
>
> #ifndef PCI_PRODUCT_LSI_SAS1068E
> #define PCI_PRODUCT_LSI_SAS1068E 0x0058
> #endif
>
> #ifndef PCI_PRODUCT_LSI_SAS1078
> #define PCI_PRODUCT_LSI_SAS1078 0x0060
> #endif
>
113d137
<
169a194,203
> case PCI_PRODUCT_LSI_SAS1064:
> case PCI_PRODUCT_LSI_SAS1064A:
> case PCI_PRODUCT_LSI_SAS1064E:
> case PCI_PRODUCT_LSI_SAS1066:
> case PCI_PRODUCT_LSI_SAS1066E:
> case PCI_PRODUCT_LSI_SAS1068:
> case PCI_PRODUCT_LSI_SAS1068E:
> case PCI_PRODUCT_LSI_SAS1078:
> desc = "LSILogic SAS Adapter";
> break;
270a305,314
> case PCI_PRODUCT_LSI_SAS1064:
> case PCI_PRODUCT_LSI_SAS1064A:
> case PCI_PRODUCT_LSI_SAS1064E:
> case PCI_PRODUCT_LSI_SAS1066:
> case PCI_PRODUCT_LSI_SAS1066E:
> case PCI_PRODUCT_LSI_SAS1068:
> case PCI_PRODUCT_LSI_SAS1068E:
> case PCI_PRODUCT_LSI_SAS1078:
> mpt->is_sas = 1;
> break;
278a323
> mpt->verbose = MPT_PRT_NONE;
280,282c325,329
< mpt->verbose = MPT_PRT_INFO;
< mpt->verbose += (bootverbose != 0)? 1 : 0;
<
---
> if (mpt->verbose == MPT_PRT_NONE) {
> mpt->verbose = MPT_PRT_WARN;
> /* Print INFO level (if any) if bootverbose is set */
> mpt->verbose += (bootverbose != 0)? 1 : 0;
> }
316c363,364
< * certain reset operations.
---
> * certain reset operations (but must be disabled for
> * some cards otherwise).
333a382,385
> if (mpt->is_sas) {
> device_printf(dev, "Giving Up.\n");
> goto bad;
> }
386a439,443
> /*
> * Disable PIO until we need it
> */
> pci_disable_io(dev, SYS_RES_IOPORT);
>
388a446
>
500c558
< int i, error;
---
> int i, error, nsegs;
529c587
< * Create a parent dma tag for this device
---
> * Create a parent dma tag for this device.
531,532c589,590
< * Align at byte boundaries, limit to 32-bit addressing
< * (The chip supports 64-bit addressing, but this driver doesn't)
---
> * Align at byte boundaries, limit to 32-bit addressing for
> * request/reply queues.
535c593
< /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
---
> /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR,
546,548c604,606
< if (mpt_dma_tag_create(mpt, mpt->parent_dmat, PAGE_SIZE,
< 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
< NULL, NULL, PAGE_SIZE, 1, BUS_SPACE_MAXSIZE_32BIT, 0,
---
> if (mpt_dma_tag_create(mpt, mpt->parent_dmat, 2 * PAGE_SIZE,
> 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR,
> NULL, NULL, 2 * PAGE_SIZE, 1, BUS_SPACE_MAXSIZE_32BIT, 0,
557,558c615,617
< device_printf(dev, "cannot allocate %lu bytes of reply memory\n",
< (u_long)PAGE_SIZE);
---
> device_printf(dev,
> "cannot allocate %lu bytes of reply memory\n",
> (u_long) (2 * PAGE_SIZE));
567c626
< PAGE_SIZE, mpt_map_rquest, &mi, 0);
---
> 2 * PAGE_SIZE, mpt_map_rquest, &mi, 0);
576a636,642
>
> /*
> * XXX: we should say that nsegs is 'unrestricted, but that
> * XXX: tickles a horrible bug in the busdma code. Instead,
> * XXX: we'll derive a reasonable segment limit from MAXPHYS
> */
> nsegs = (MAXPHYS / PAGE_SIZE) + 1;
579c645
< NULL, NULL, MAXBSIZE, MPT_SGL_MAX, BUS_SPACE_MAXSIZE_32BIT, 0,
---
> NULL, NULL, MAXBSIZE, nsegs, BUS_SPACE_MAXSIZE_32BIT, 0,
588c654
< 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
---
> 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR,