From owner-freebsd-hackers Thu Jul 26 12:46:50 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from smtp1.oskarmobil.cz (smtp1.oskarmobil.cz [217.77.161.133]) by hub.freebsd.org (Postfix) with ESMTP id EE91837B407; Thu, 26 Jul 2001 12:46:34 -0700 (PDT) (envelope-from Milon.Papezik@oskarmobil.cz) Received: from wh01ex01.ceskymobil.cz (wh01ex01.ceskymobil.cz [172.20.116.17]) by smtp1.oskarmobil.cz (8.11.2/8.11.1) with ESMTP id f6QJjwu58481; Thu, 26 Jul 2001 21:45:58 +0200 (CEST) (envelope-from Milon.Papezik@oskarmobil.cz) Received: by wh01ex01.ceskymobil.cz with Internet Mail Service (5.5.2653.19) id <39DWTX91>; Thu, 26 Jul 2001 21:44:29 +0200 Message-ID: From: Milon Papezik To: "'hardware@freebsd.org'" , "'hackers@freebsd.org'" Cc: "'Jeff Sapp'" , "'jlemon@freebsd.org'" Subject: RE: Compaq DL380 Date: Thu, 26 Jul 2001 21:44:21 +0200 MIME-Version: 1.0 X-Mailer: Internet Mail Service (5.5.2653.19) Content-Type: multipart/mixed; boundary="----_=_NextPart_000_01C1160B.5DE62620" Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This message is in MIME format. Since your mail reader does not understand this format, some or all of this message may not be legible. ------_=_NextPart_000_01C1160B.5DE62620 Content-Type: text/plain; charset="ISO-8859-2" Hi all, I finally got some time to do the simple MFC for ida driver. It enables the automatic drive rebuild on Integrated SmartArray controllers. I tested enclosed patch on DL380 (controller firmware 1.42) and it works fine. Could someone please have a look and commit this simple MFC into -stable ? Enjoy! ... and thanks in advance for occasinal commit ;-) Milon -- milon.papezik@oskarmobil.cz ------_=_NextPart_000_01C1160B.5DE62620 Content-Type: application/octet-stream; name="ida.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="ida.patch" *** sys/dev/ida.stable/ida_eisa.c Thu Mar 1 02:57:33 2001=0A= --- sys/dev/ida/ida_eisa.c Wed May 2 09:14:27 2001=0A= *************** static struct ida_access ida_v2_access =3D=0A= *** 180,192 ****=0A= };=0A= =0A= static struct ida_board board_id[] =3D {=0A= ! { 0x0e114001, "Compaq IDA controller", &ida_v1_access },=0A= ! { 0x0e114002, "Compaq IDA-2 controller", &ida_v1_access }, =0A= ! { 0x0e114010, "Compaq IAES controller", &ida_v1_access },=0A= ! { 0x0e114020, "Compaq SMART array controller", &ida_v1_access = },=0A= ! { 0x0e114030, "Compaq SMART-2/E array controller", &ida_v2_access = },=0A= =0A= ! { 0, "", 0 }=0A= };=0A= =0A= static struct ida_board *ida_eisa_match(eisa_id_t);=0A= --- 180,197 ----=0A= };=0A= =0A= static struct ida_board board_id[] =3D {=0A= ! { 0x0e114001, "Compaq IDA controller",=0A= ! &ida_v1_access, 0 },=0A= ! { 0x0e114002, "Compaq IDA-2 controller",=0A= ! &ida_v1_access, 0 }, =0A= ! { 0x0e114010, "Compaq IAES controller",=0A= ! &ida_v1_access, 0 },=0A= ! { 0x0e114020, "Compaq SMART array controller",=0A= ! &ida_v1_access, 0 },=0A= ! { 0x0e114030, "Compaq SMART-2/E array controller",=0A= ! &ida_v2_access, 0 },=0A= =0A= ! { 0, "", 0, 0 }=0A= };=0A= =0A= static struct ida_board *ida_eisa_match(eisa_id_t);=0A= *************** ida_eisa_attach(device_t dev)=0A= *** 274,279 ****=0A= --- 279,285 ----=0A= =0A= board =3D ida_eisa_match(eisa_get_id(dev));=0A= ida->cmd =3D *board->accessor;=0A= + ida->flags =3D board->flags;=0A= =0A= ida->regs_res_type =3D SYS_RES_IOPORT;=0A= ida->regs_res_id =3D 0;=0A= *************** ida_eisa_attach(device_t dev)=0A= *** 321,327 ****=0A= return (ENOMEM);=0A= }=0A= =0A= - ida->flags =3D 0;=0A= error =3D ida_init(ida);=0A= if (error) {=0A= ida_free(ida);=0A= --- 327,332 ----=0A= *** sys/dev/ida.stable/ida_pci.c Thu Mar 1 02:57:33 2001=0A= --- sys/dev/ida/ida_pci.c Thu May 3 05:34:19 2001=0A= *************** static struct ida_access ida_v4_access =3D=0A= *** 149,167 ****=0A= };=0A= =0A= static struct ida_board board_id[] =3D {=0A= ! { 0x40300E11, "Compaq SMART-2/P array controller", &ida_v3_access = },=0A= ! { 0x40310E11, "Compaq SMART-2SL array controller", &ida_v3_access = },=0A= ! { 0x40320E11, "Compaq Smart Array 3200 controller", &ida_v3_access = },=0A= ! { 0x40330E11, "Compaq Smart Array 3100ES controller", &ida_v3_access = },=0A= ! { 0x40340E11, "Compaq Smart Array 221 controller", &ida_v3_access = },=0A= ! =0A= ! { 0x40400E11, "Compaq Integrated Array controller", &ida_v4_access = },=0A= ! { 0x40480E11, "Compaq RAID LC2 controller", &ida_v4_access = },=0A= ! { 0x40500E11, "Compaq Smart Array 4200 controller", &ida_v4_access = },=0A= ! { 0x40510E11, "Compaq Smart Array 4250ES controller", &ida_v4_access = },=0A= ! { 0x40580E11, "Compaq Smart Array 431 controller", &ida_v4_access = },=0A= =0A= ! { 0, "", 0 },=0A= };=0A= =0A= static int ida_pci_probe(device_t dev);=0A= --- 149,177 ----=0A= };=0A= =0A= static struct ida_board board_id[] =3D {=0A= ! { 0x40300E11, "Compaq SMART-2/P array controller",=0A= ! &ida_v3_access, 0 },=0A= ! { 0x40310E11, "Compaq SMART-2SL array controller",=0A= ! &ida_v3_access, 0 },=0A= ! { 0x40320E11, "Compaq Smart Array 3200 controller",=0A= ! &ida_v3_access, 0 },=0A= ! { 0x40330E11, "Compaq Smart Array 3100ES controller",=0A= ! &ida_v3_access, 0 },=0A= ! { 0x40340E11, "Compaq Smart Array 221 controller",=0A= ! &ida_v3_access, 0 },=0A= ! =0A= ! { 0x40400E11, "Compaq Integrated Array controller",=0A= ! &ida_v4_access, IDA_FIRMWARE },=0A= ! { 0x40480E11, "Compaq RAID LC2 controller",=0A= ! &ida_v4_access, IDA_FIRMWARE },=0A= ! { 0x40500E11, "Compaq Smart Array 4200 controller",=0A= ! &ida_v4_access, 0 },=0A= ! { 0x40510E11, "Compaq Smart Array 4250ES controller",=0A= ! &ida_v4_access, 0 },=0A= ! { 0x40580E11, "Compaq Smart Array 431 controller",=0A= ! &ida_v4_access, 0 },=0A= =0A= ! { 0, "", 0, 0 },=0A= };=0A= =0A= static int ida_pci_probe(device_t dev);=0A= *************** ida_pci_attach(device_t dev)=0A= *** 238,243 ****=0A= --- 248,254 ----=0A= ida =3D (struct ida_softc *)device_get_softc(dev);=0A= ida->dev =3D dev;=0A= ida->cmd =3D *board->accessor;=0A= + ida->flags =3D board->flags;=0A= =0A= ida->regs_res_type =3D SYS_RES_MEMORY;=0A= ida->regs_res_id =3D IDA_PCI_MEMADDR;=0A= *************** ida_pci_attach(device_t dev)=0A= *** 279,285 ****=0A= return (ENOMEM);=0A= }=0A= =0A= - ida->flags =3D 0;=0A= error =3D ida_init(ida);=0A= if (error) {=0A= ida_free(ida);=0A= --- 290,295 ----=0A= *** sys/dev/ida.stable/idavar.h Thu Mar 1 02:57:33 2001=0A= --- sys/dev/ida/idavar.h Wed May 2 09:09:33 2001=0A= *************** struct ida_board {=0A= *** 185,190 ****=0A= --- 185,191 ----=0A= u_int32_t board;=0A= char *desc;=0A= struct ida_access *accessor;=0A= + int flags;=0A= };=0A= =0A= extern int ida_detach(device_t dev);=0A= ------_=_NextPart_000_01C1160B.5DE62620-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message