Date: Thu, 16 Feb 2017 21:57:14 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r313835 - in head: share/man/man4 sys/conf sys/dev/dpt sys/modules/dpt Message-ID: <201702162157.v1GLvEP5043775@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Thu Feb 16 21:57:13 2017 New Revision: 313835 URL: https://svnweb.freebsd.org/changeset/base/313835 Log: Remove EISA support from dpt. Remove known EISA models from dpt.4. Remove EISA-only bits from dpt_scsi.c. Deleted: head/sys/dev/dpt/dpt_eisa.c Modified: head/share/man/man4/dpt.4 head/sys/conf/files head/sys/dev/dpt/dpt.h head/sys/dev/dpt/dpt_scsi.c head/sys/modules/dpt/Makefile Modified: head/share/man/man4/dpt.4 ============================================================================== --- head/share/man/man4/dpt.4 Thu Feb 16 21:57:08 2017 (r313834) +++ head/share/man/man4/dpt.4 Thu Feb 16 21:57:13 2017 (r313835) @@ -37,9 +37,6 @@ kernel configuration file: .Cd "device scbus" .Cd "device dpt" .Pp -For one or more EISA cards: -.Cd "device eisa" -.Pp For one or more PCI cards: .Cd "device pci" .Pp @@ -78,15 +75,15 @@ driver provides support for the followin .It DPT Smart Cache Plus .It -Smart Cache II (PM2?2?, PM2022 [EISA], PM2024/PM2124 [PCI]) (Gen2) +Smart Cache II (PM2?2?, PM2024/PM2124 [PCI]) (Gen2) .It Smart RAID II (PM3?2?, PM3021, PM3222) .It Smart Cache III (PM2?3?) .It -Smart RAID III (PM3?3?, PM3332 [EISA], PM3334UW [PCI]) (Gen3) +Smart RAID III (PM3?3?, PM3334UW [PCI]) (Gen3) .It -Smart Cache IV (PM2?4?, PM2042 [EISA], PM2044/PM2144 [PCI]) (Gen4) +Smart Cache IV (PM2?4?, PM2044/PM2144 [PCI]) (Gen4) .It Smart RAID IV .El Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Thu Feb 16 21:57:08 2017 (r313834) +++ head/sys/conf/files Thu Feb 16 21:57:13 2017 (r313835) @@ -1439,7 +1439,6 @@ dev/dcons/dcons_crom.c optional dcons_c dev/dcons/dcons_os.c optional dcons dev/de/if_de.c optional de pci dev/dme/if_dme.c optional dme -dev/dpt/dpt_eisa.c optional dpt eisa dev/dpt/dpt_pci.c optional dpt pci dev/dpt/dpt_scsi.c optional dpt dev/drm/ati_pcigart.c optional drm Modified: head/sys/dev/dpt/dpt.h ============================================================================== --- head/sys/dev/dpt/dpt.h Thu Feb 16 21:57:08 2017 (r313834) +++ head/sys/dev/dpt/dpt.h Thu Feb 16 21:57:13 2017 (r313835) @@ -147,17 +147,13 @@ typedef void *physaddr; #define min(a,b) ((a<b)?(a):(b)) #define MAXISA 4 -#define MAXEISA 16 #define MAXPCI 16 #define MAXIRQ 16 #define MAXTARGET 16 #define IS_ISA 'I' -#define IS_EISA 'E' #define IS_PCI 'P' -#define BROKEN_INQUIRY 1 - #define BUSMASTER 0xff #define PIO 0xfe @@ -198,13 +194,6 @@ typedef void *physaddr; #define PCI_REG_ConfigParam1 0x50 #define PCI_REG_ConfigParam2 0x54 -#define EATA_CMD_PIO_SETUPTEST 0xc6 -#define EATA_CMD_PIO_READ_CONFIG 0xf0 -#define EATA_CMD_PIO_SET_CONFIG 0xf1 -#define EATA_CMD_PIO_SEND_CP 0xf2 -#define EATA_CMD_PIO_RECEIVE_SP 0xf3 -#define EATA_CMD_PIO_TRUNC 0xf4 - #define EATA_CMD_RESET 0xf9 #define EATA_COLD_BOOT 0x06 /* Last resort only! */ @@ -548,12 +537,9 @@ typedef struct driveParam_S driveParam_T #define SI_NO_SmartROM 0x8000 #define SI_ISA_BUS 0x00 -#define SI_MCA_BUS 0x01 -#define SI_EISA_BUS 0x02 #define SI_PCI_BUS 0x04 #define HBA_BUS_ISA 0x00 -#define HBA_BUS_EISA 0x01 #define HBA_BUS_PCI 0x02 typedef struct dpt_sysinfo { @@ -791,12 +777,9 @@ typedef struct eata_ccb { #define ADF_2001 0x0001 /* PM2001 */ #define ADF_2012A 0x0002 /* PM2012A */ #define ADF_PLUS_ISA 0x0004 /* PM2011,PM2021 */ -#define ADF_PLUS_EISA 0x0008 /* PM2012B,PM2022 */ #define ADF_SC3_ISA 0x0010 /* PM2021 */ -#define ADF_SC3_EISA 0x0020 /* PM2022,PM2122, etc */ #define ADF_SC3_PCI 0x0040 /* SmartCache III PCI */ #define ADF_SC4_ISA 0x0080 /* SmartCache IV ISA */ -#define ADF_SC4_EISA 0x0100 /* SmartCache IV EISA */ #define ADF_SC4_PCI 0x0200 /* SmartCache IV PCI */ #define ADF_ALL_MASTER 0xFFFE /* All bus mastering */ #define ADF_ALL_CACHE 0xFFFC /* All caching */ @@ -1114,8 +1097,7 @@ typedef struct dpt_softc { u_int8_t more_support :1, /* HBA supports MORE flag */ immediate_support :1, /* HBA supports IMMEDIATE */ - broken_INQUIRY :1, /* EISA HBA w/broken INQUIRY */ - spare2 :5; + spare2 :6; u_int8_t resetlevel[MAX_CHANNELS]; u_int32_t last_ccb; /* Last used ccb */ @@ -1201,8 +1183,7 @@ typedef struct dpt_user_softc { u_int8_t primary; u_int8_t more_support :1, immediate_support :1, - broken_INQUIRY :1, - spare2 :5; + spare2 :6; u_int8_t resetlevel[MAX_CHANNELS]; u_int32_t last_ccb; @@ -1277,10 +1258,6 @@ int dpt_init(struct dpt_softc *dpt); int dpt_attach(dpt_softc_t * dpt); void dpt_intr(void *arg); -#ifdef DEV_EISA -dpt_conf_t * dpt_pio_get_conf(u_int32_t); -#endif - #if 0 extern void hex_dump(u_char * data, int length, char *name, int no); Modified: head/sys/dev/dpt/dpt_scsi.c ============================================================================== --- head/sys/dev/dpt/dpt_scsi.c Thu Feb 16 21:57:08 2017 (r313834) +++ head/sys/dev/dpt/dpt_scsi.c Thu Feb 16 21:57:13 2017 (r313835) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #define _DPT_C_ #include "opt_dpt.h" -#include "opt_eisa.h" #include <sys/param.h> #include <sys/systm.h> @@ -79,7 +78,7 @@ __FBSDID("$FreeBSD$"); #include <dev/dpt/dpt.h> -/* dpt_isa.c, dpt_eisa.c, and dpt_pci.c need this in a central place */ +/* dpt_isa.c, and dpt_pci.c need this in a central place */ devclass_t dpt_devclass; #define microtime_now dpt_time_now() @@ -107,9 +106,6 @@ devclass_t dpt_devclass; /* ================= Private Inline Function declarations ===================*/ static __inline int dpt_just_reset(dpt_softc_t * dpt); static __inline int dpt_raid_busy(dpt_softc_t * dpt); -#ifdef DEV_EISA -static __inline int dpt_pio_wait (u_int32_t, u_int, u_int, u_int); -#endif static __inline int dpt_wait(dpt_softc_t *dpt, u_int bits, u_int state); static __inline struct dpt_ccb* dptgetccb(struct dpt_softc *dpt); @@ -185,24 +181,6 @@ dpt_raid_busy(dpt_softc_t * dpt) return (0); } -#ifdef DEV_EISA -static __inline int -dpt_pio_wait (u_int32_t base, u_int reg, u_int bits, u_int state) -{ - int i; - u_int c; - - for (i = 0; i < 20000; i++) { /* wait 20ms for not busy */ - c = inb(base + reg) & bits; - if (!(c == state)) - return (0); - else - DELAY(50); - } - return (-1); -} -#endif - static __inline int dpt_wait(dpt_softc_t *dpt, u_int bits, u_int state) { @@ -392,96 +370,6 @@ dptallocccbs(dpt_softc_t *dpt) return (i); } -#ifdef DEV_EISA -dpt_conf_t * -dpt_pio_get_conf (u_int32_t base) -{ - static dpt_conf_t * conf; - u_int16_t * p; - int i; - - /* - * Allocate a dpt_conf_t - */ - if (!conf) { - conf = (dpt_conf_t *)malloc(sizeof(dpt_conf_t), - M_DEVBUF, M_NOWAIT | M_ZERO); - } - - /* - * If we didn't get one then we probably won't ever get one. - */ - if (!conf) { - printf("dpt: unable to allocate dpt_conf_t\n"); - return (NULL); - } - - /* - * Reset the controller. - */ - outb((base + HA_WCOMMAND), EATA_CMD_RESET); - - /* - * Wait for the controller to become ready. - * For some reason there can be -no- delays after calling reset - * before we wait on ready status. - */ - if (dpt_pio_wait(base, HA_RSTATUS, HA_SBUSY, 0)) { - printf("dpt: timeout waiting for controller to become ready\n"); - return (NULL); - } - - if (dpt_pio_wait(base, HA_RAUXSTAT, HA_ABUSY, 0)) { - printf("dpt: timetout waiting for adapter ready.\n"); - return (NULL); - } - - /* - * Send the PIO_READ_CONFIG command. - */ - outb((base + HA_WCOMMAND), EATA_CMD_PIO_READ_CONFIG); - - /* - * Read the data into the struct. - */ - p = (u_int16_t *)conf; - for (i = 0; i < (sizeof(dpt_conf_t) / 2); i++) { - - if (dpt_pio_wait(base, HA_RSTATUS, HA_SDRQ, 0)) { - if (bootverbose) - printf("dpt: timeout in data read.\n"); - return (NULL); - } - - (*p) = inw(base + HA_RDATA); - p++; - } - - if (inb(base + HA_RSTATUS) & HA_SERROR) { - if (bootverbose) - printf("dpt: error reading configuration data.\n"); - return (NULL); - } - -#define BE_EATA_SIGNATURE 0x45415441 -#define LE_EATA_SIGNATURE 0x41544145 - - /* - * Test to see if we have a valid card. - */ - if ((conf->signature == BE_EATA_SIGNATURE) || - (conf->signature == LE_EATA_SIGNATURE)) { - - while (inb(base + HA_RSTATUS) & HA_SDRQ) { - inw(base + HA_RDATA); - } - - return (conf); - } - return (NULL); -} -#endif - /* * Read a configuration page into the supplied dpt_cont_t buffer. */ @@ -1352,8 +1240,6 @@ dpt_init(struct dpt_softc *dpt) else dpt->immediate_support = 0; - dpt->broken_INQUIRY = FALSE; - dpt->cplen = ntohl(conf.cplen); dpt->cppadlen = ntohs(conf.cppadlen); dpt->max_dccbs = ntohs(conf.queuesiz); Modified: head/sys/modules/dpt/Makefile ============================================================================== --- head/sys/modules/dpt/Makefile Thu Feb 16 21:57:08 2017 (r313834) +++ head/sys/modules/dpt/Makefile Thu Feb 16 21:57:13 2017 (r313835) @@ -7,10 +7,8 @@ SYSDIR?=${.CURDIR}/../.. KMOD= dpt SRCS= dpt_scsi.c dpt.h \ dpt_pci.c pci_if.h \ - opt_dpt.h opt_eisa.h \ + opt_dpt.h \ opt_cam.h opt_scsi.h \ device_if.h bus_if.h -SRCS.DEV_EISA= dpt_eisa.c eisa_if.h - .include <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702162157.v1GLvEP5043775>