src-test2/sys/dev/fdc, branch release/5.3.0_cvs FreeBSD source tree https://cgit-dev.freebsd.org/src-test2/atom?h=release%2F5.3.0_cvs 2004-11-04T19:12:42Z This commit was manufactured by cvs2svn to create tag 2004-11-04T19:12:42Z cvs2svn cvs2svn@FreeBSD.org 2004-11-04T19:12:42Z urn:sha1:3f86d8a2ea3f3265afaa1fd263b0004c5c000e69 'RELENG_5_3_0_RELEASE'. This commit was manufactured to restore the state of the 5.3-RELEASE image. MF RELENG_5 1.9.2.4: another fdc resource layout 2004-10-28T19:40:40Z Warner Losh imp@FreeBSD.org 2004-10-28T19:40:40Z urn:sha1:8ef493b6bcfb7c7a6af1fdf4c251e2c85b5558d5 The RELENG_5_3_0_RELEASE tag will be slid forward to include this change. Approved by: re@ (kensmith) Forgtten by: imp@ Reminded by: bmah MFC of 1.296: 2004-10-10T23:49:38Z Peter Edwards peadar@FreeBSD.org 2004-10-10T23:49:38Z urn:sha1:aec9a222f05a0707ebc5694c162841b7b7edc78d Fix off-by-one error in fd_native_types that results in a panic on boot for machines with 2.88M floppies. Reviewed by: phk Approved by: re (scottl@) MFC: Fix the fdc_acpi attach function to only fall back to enumerating 2004-09-30T20:04:56Z John Baldwin jhb@FreeBSD.org 2004-09-30T20:04:56Z urn:sha1:dc4bdce23841be90032f3af4deec06cc7c88d72f drives via hints if the _FDE enumeration fails but earlier steps all succeeded. Approved by: re (scottl) MFC: Merge case 8 into the resource allocation from 1.15: 2004-09-29T05:17:26Z Warner Losh imp@FreeBSD.org 2004-09-29T05:17:26Z urn:sha1:2980b924b0da71f29257d28c1fed1e8854727625 >>revision 1.15 >>date: 2004/09/20 06:12:19; author: imp; state: Exp; lines: +14 -4 >>das@ has a ACPI bios that lists 0x3f0-0x3f1, 0x3f2-0x3f3, 0x3f4-0x3f5 >>and 0x3f7. fdc_isa_alloc_resource() didn't work right in this case >>(it accessed FDOUT correctly due to an overflow of the first resource. >>It accesed FDSTS and FDDATA incorrectly via the second resource (which >>wound up accessing FDOUT and the tape register at 0x3f3) and badly for >>the CTL register (at location 0x3f4). This is a minimal fix that just >>'eats' the first one if it covers two locations and has an offset of >>0. This confusion lead the floppy driver to think there'd been a disk >>change, which uncovered a deadlock in the floppy/geom code which lead >>to a panic. These changes fix that by fixing the underlying resource >>problem, but doesn't address the potential deadlock issue that might >>still be there. >> >>This is a minimal fix so it can more safely be merged into 5 w/o risk >>for known working configurations (hence the use of the ugly goto, >>which reduces case 8 to case 6 w/o affecting cases 1-7). A more >>invasive fix that will handle more ACPI resource list diversity is in >>the pipeline that should kill these issues once and for all, while >>staying within the resources that we allocate. >> >>Tested/Reported by: das >>Reviewed by: njl >>MFC before: re->next_release_name(5.3-BETA5); If you get floppy hangs on boot, please try after this patch and let me know if they are solved. Approved by: re@ (scottl) MFC: Use floppy drive unit number, not floppy controller unit number 2004-09-25T14:39:38Z Poul-Henning Kamp phk@FreeBSD.org 2004-09-25T14:39:38Z urn:sha1:ba3c188c63ce29e1b2c7a79841ff64272ba61d49 for creating /dev entries. Approved by: re::scottl MFC: Merge in phk's new floppy driver. 2004-09-18T04:57:55Z Warner Losh imp@FreeBSD.org 2004-09-18T04:57:55Z urn:sha1:a74ff8b7aa54690e7b83f46b7411ec5f44ba9d7c Approved by: re@ MFC rev 1.4, 1.5: Fix _FDE and _FDI probing. 2004-09-03T16:54:41Z Nate Lawson njl@FreeBSD.org 2004-09-03T16:54:41Z urn:sha1:649e5e0536185adccfe8670a69a244083fb6ba75 Approved by: re (scottl) MFC rev 1.11: Remove too-strict register offset check. 2004-08-23T05:11:05Z Nate Lawson njl@FreeBSD.org 2004-08-23T05:11:05Z urn:sha1:24c3bfd048f015c88c8bcd3877ec43ad99425b3f Approved by: re (kensmith) Remove confused comment. 2004-08-14T21:40:28Z Poul-Henning Kamp phk@FreeBSD.org 2004-08-14T21:40:28Z urn:sha1:3abefc9e5607417f51708dccd82deadaa1e4c924