| History log of /src/sys/dev/pci/jmide.c |
| Revision | | Date | Author | Comments |
| 1.25 |
| 07-Aug-2021 |
thorpej | Merge thorpej-cfargs2.
|
| 1.24 |
| 24-Apr-2021 |
thorpej | branches: 1.24.8; Merge thorpej-cfargs branch:
Simplify and make extensible the config_search() / config_found() / config_attach() interfaces: rather than having different variants for which arguments you want pass along, just have a single call that takes a variadic list of tag-value arguments.
Adjust all call sites: - Simplify wherever possible; don't pass along arguments that aren't actually needed. - Don't be explicit about what interface attribute is attaching if the device only has one. (More simplification.) - Add a config_probe() function to be used in indirect configuiration situations, making is visibly easier to see when indirect config is in play, and allowing for future change in semantics. (As of now, this is just a wrapper around config_match(), but that is an implementation detail.)
Remove unnecessary or redundant interface attributes where they're not needed.
There are currently 5 "cfargs" defined: - CFARG_SUBMATCH (submatch function for direct config) - CFARG_SEARCH (search function for indirect config) - CFARG_IATTR (interface attribte) - CFARG_LOCATORS (locators array) - CFARG_DEVHANDLE (devhandle_t - wraps OFW, ACPI, etc. handles)
...and a sentinel value CFARG_EOL.
Add some extra sanity checking to ensure that interface attributes aren't ambiguous.
Use CFARG_DEVHANDLE in MI FDT, OFW, and ACPI code, and macppc and shark ports to associate those device handles with device_t instance. This will trickle trough to more places over time (need back-end for pre-OFW Sun OBP; any others?).
|
| 1.23 |
| 10-Nov-2019 |
chs | branches: 1.23.10; in many device attach paths, allocate memory with M_WAITOK instead of M_NOWAIT and remove code to handle failures that can no longer happen.
|
| 1.22 |
| 09-Dec-2018 |
jdolecek | use pci_intr_establish_xname() everywhere
|
| 1.21 |
| 14-Jul-2016 |
msaitoh | branches: 1.21.16; 1.21.18; - Use aprint*() more in xxx_attach(). - Add missing aprint_naive("\n"). - Remove extra spaces and tabs. - KNF.
|
| 1.20 |
| 14-Jul-2016 |
msaitoh | KNF. No functional change.
|
| 1.19 |
| 29-Mar-2014 |
christos | branches: 1.19.6; make pci_intr_string and eisa_intr_string take a buffer and a length instead of relying in local static storage.
|
| 1.18 |
| 31-Jul-2012 |
bouyer | branches: 1.18.2; 1.18.4; Apply back changes that were reverted on Jul 24 and Jul 26 (general ata/wdc cleanup and SATA PMP support), now that I'm back to fix the fallouts.
|
| 1.17 |
| 26-Jul-2012 |
jakllsch | Revert, with intention of restoring in a less invasive way, the SATA Port Multiplier code.
ok christos@
|
| 1.16 |
| 24-Jul-2012 |
jakllsch | Revert dsl@'s changes of Sun, 15 Jul 2012 10:55:35 +0000 and Sun, 15 Jul 2012 10:56:50 +0000, excepting the kernel version bump. First step in reverting regressions to ata(4) subsystem during the addition of port multiplier support.
|
| 1.15 |
| 15-Jul-2012 |
dsl | Some namespace protection (and add greppablity). Prefix the DRIVE_ and DRIVET_ constants from atavar.h with ATA_. Don't use an enum for drive_type - you don't know how big it will be. Move driver_type to avoid implicit structure padding (esp on arm). This change is purely lexical and mechanical.
Update to 6.99.9 - this wasn't done when the SATA PMP changes were made - I'm sure they warranted a bump.
|
| 1.14 |
| 02-Jul-2012 |
bouyer | Add sata Port MultiPlier (PMP) support to the ata bus layer, as described in http://mail-index.netbsd.org/tech-kern/2012/06/23/msg013442.html PMP support in integrated to the atabus layer. struct ata_channel's ch_drive[] is not dynamically allocated, and ch_ndrive (renamed to ch_ndrives) closely reflects the size of the ch_drive[] array. Add helper functions atabus_alloc_drives() and atabus_free_drives() to manage ch_drive[]/ch_ndrives. Add wdc_maxdrives to struct wdc_softc so that bus front-end can specify how much drive they really support (master/slave or single). ata_reset_drive() callback gains a uint32_t *sigp argument which, when not NULL, will contain the signature of the device being reset. While there, some cosmetic changes: - added a drive_type enum to ata_drive_datas, and stop encoding the probed drive type in drive_flags (we were out of drive flags anyway). - rename DRIVE_ATAPIST to DRIVE_ATAPIDSCW to better reflect what this really is - remove ata_channel->ata_drives, it's redundant with the pointer in ata_drive_datas - factor out the interpretation of SATA signatures in sata_interpet_sig()
propagate these changes to the ATA HBA drivers, and add support for PMP to ahcisata(4) and siisata(4).
Thanks to: - Protocase (http://www.protocase.com/) which provided a system with lots of controllers, SATA PMP and drive slots - Conservation Genomics Laboratory, Department of Biology, New Mexico State University for hosting the above system - Brook Milligan, who set up remote access and has been very responsive when SATA cable move was needed
|
| 1.13 |
| 29-Mar-2012 |
pgoyette | Add match for JMB362 (with two SATA ports).
|
| 1.12 |
| 30-Jan-2012 |
drochner | branches: 1.12.2; Use pci_aprint_devinfo(9) instead of pci_devinfo+aprint_{normal,naive} where it looks straightforward, and pci_aprint_devinfo_fancy in a few others where drivers want to supply their own device names instead of the pcidevs generated one. More complicated cases, where names are composed at runtime, are left alone for now. It certainly makes sense to simplify the drivers here rather than inventing a catch-all API. This should serve as as example for new drivers, and also ensure consistent output in the AB_QUIET ("boot -q") case. Also, it avoids excessive stack usage where drivers attach child devices because the buffer for the device name is not kept on the local stack anymore.
|
| 1.11 |
| 13-Aug-2011 |
jakllsch | branches: 1.11.2; 1.11.6; Make correct spelling in comments a higher priority.
|
| 1.10 |
| 04-Apr-2011 |
dyoung | Neither pci_dma64_available(), pci_probe_device(), pci_mapreg_map(9), pci_find_rom(), pci_intr_map(9), pci_enumerate_bus(), nor the match predicate passed to pciide_compat_intr_establish() should ever modify their pci_attach_args argument, so make their pci_attach_args arguments const and deal with the fallout throughout the kernel.
For the most part, these changes add a 'const' where there was no 'const' before, however, some drivers and MD code used to modify pci_attach_args. Now those drivers either copy their pci_attach_args and modify the copy, or refrain from modifying pci_attach_args:
Xen: according to Manuel Bouyer, writing to pci_attach_args in pci_intr_map() was a leftover from Xen 2. Probably a bug. I stopped writing it. I have not tested this change.
siside(4): sis_hostbr_match() needlessly wrote to pci_attach_args. Probably a bug. I use a temporary variable. I have not tested this change.
slide(4): sl82c105_chip_map() overwrote the caller's pci_attach_args. Probably a bug. Use a local pci_attach_args. I have not tested this change.
viaide(4): via_sata_chip_map() and via_sata_chip_map_new() overwrote the caller's pci_attach_args. Probably a bug. Make a local copy of the caller's pci_attach_args and modify the copy. I have not tested this change.
While I'm here, make pci_mapreg_submap() static.
With these changes in place, I have tested the compilation of these kernels:
alpha GENERIC amd64 GENERIC XEN3_DOM0 arc GENERIC atari HADES MILAN-PCIIDE bebox GENERIC cats GENERIC cobalt GENERIC evbarm-eb NSLU2 evbarm-el ADI_BRH ARMADILLO9 CP3100 GEMINI GEMINI_MASTER GEMINI_SLAVE GUMSTIX HDL_G IMX31LITE INTEGRATOR IQ31244 IQ80310 IQ80321 IXDP425 IXM1200 KUROBOX_PRO LUBBOCK MARVELL_NAS NAPPI SHEEVAPLUG SMDK2800 TEAMASA_NPWR TEAMASA_NPWR_FC TS7200 TWINTAIL ZAO425 evbmips-el AP30 DBAU1500 DBAU1550 MALTA MERAKI MTX-1 OMSAL400 RB153 WGT624V3 evbmips64-el XLSATX evbppc EV64260 MPC8536DS MPC8548CDS OPENBLOCKS200 OPENBLOCKS266 OPENBLOCKS266_OPT P2020RDB PMPPC RB800 WALNUT hp700 GENERIC i386 ALL XEN3_DOM0 XEN3_DOMU ibmnws GENERIC macppc GENERIC mvmeppc GENERIC netwinder GENERIC ofppc GENERIC prep GENERIC sandpoint GENERIC sgimips GENERIC32_IP2x sparc GENERIC_SUN4U KRUPS sparc64 GENERIC
As of Sun Apr 3 15:26:26 CDT 2011, I could not compile these kernels with or without my patches in place:
### evbmips-el GDIUM
nbmake: nbmake: don't know how to make /home/dyoung/pristine-nbsd/src/sys/arch/mips/mips/softintr.c. Stop
### evbarm-el MPCSA_GENERIC src/sys/arch/evbarm/conf/MPCSA_GENERIC:318: ds1672rtc*: unknown device `ds1672rtc'
### ia64 GENERIC
/tmp/genassym.28085/assym.c: In function 'f111': /tmp/genassym.28085/assym.c:67: error: invalid application of 'sizeof' to incomplete type 'struct pcb' /tmp/genassym.28085/assym.c:76: error: dereferencing pointer to incomplete type
### sgimips GENERIC32_IP3x
crmfb.o: In function `crmfb_attach': crmfb.c:(.text+0x2304): undefined reference to `ddc_read_edid' crmfb.c:(.text+0x2304): relocation truncated to fit: R_MIPS_26 against `ddc_read_edid' crmfb.c:(.text+0x234c): undefined reference to `edid_parse' crmfb.c:(.text+0x234c): relocation truncated to fit: R_MIPS_26 against `edid_parse' crmfb.c:(.text+0x2354): undefined reference to `edid_print' crmfb.c:(.text+0x2354): relocation truncated to fit: R_MIPS_26 against `edid_print'
|
| 1.9 |
| 05-Nov-2010 |
jakllsch | branches: 1.9.2; Pave the way for detachment of pciide(4)-family ATA controllers.
|
| 1.8 |
| 27-Jul-2010 |
jakllsch | Support detachment of ahcisata(4). Use use 64-bit DMA tag (where available) for ahcisata(4) at jmide(4). Beginnings of detach/resume support for jmide(4). Sprinkle static. Misc. little changes.
|
| 1.7 |
| 19-Oct-2009 |
bouyer | branches: 1.7.2; 1.7.4; Remove closes 3 & 4 from my licence. Lots of thanks to Soren Jacobsen for the booring work !
|
| 1.6 |
| 05-Jun-2008 |
bouyer | Call ahci_intr() with the device's softc, not the device_t. Should fix kern/38742
|
| 1.5 |
| 21-Mar-2008 |
xtraeme | branches: 1.5.2; 1.5.4; 1.5.6; Don't forget to set the atac dev pointer in the softc; ahcisata at jmide works again after that.
Also use CFATTACH_DECL_NEW, device_t and related changes for the NJMAHCI block.
|
| 1.4 |
| 18-Mar-2008 |
cube | Split device_t and softc for ATA devices, as well as wd(4). Other cosmetic changes where appropriate.
|
| 1.3 |
| 11-Feb-2008 |
xtraeme | branches: 1.3.2; 1.3.6; Attach ahcisata(4) to any RAID controller that supports AHCI, and make it pass the ATAC_CAP_RAID capability for them. ok'ed by bouyer@.
|
| 1.2 |
| 31-May-2007 |
bouyer | branches: 1.2.2; 1.2.4; 1.2.12; 1.2.14; 1.2.16; 1.2.18; 1.2.24; Move mapping of AHCI register so that jmide knows if it fails, and avoids calling ahci_intr() (which would cause a panic). Try to use the pciide function for SATA drives if attaching ahci fails (this doesn't seems to work though, it may be BIOS dependant). Thanks to Gary Duzan for testing multiple pacthes.
|
| 1.1 |
| 15-May-2007 |
bouyer | branches: 1.1.2; add jmide(4), a driver for the JMicron Technology JMB36x PCIe to SATA II/PATA controllers. These controllers can be found on add-on PCIe cards, or on some motherboards to provide the PATA connectivity (e.g. some intel ICH8-based motherboards).
Thanks to JMicron Technology for providing me documentation and different sample boards for this work.
|
| 1.1.2.2 |
| 17-May-2007 |
yamt | sync with head.
|
| 1.1.2.1 |
| 15-May-2007 |
yamt | file jmide.c was added on branch yamt-idlelwp on 2007-05-17 13:41:31 +0000
|
| 1.2.24.1 |
| 18-Feb-2008 |
mjf | Sync with HEAD.
|
| 1.2.18.4 |
| 24-Mar-2008 |
yamt | sync with head.
|
| 1.2.18.3 |
| 11-Feb-2008 |
yamt | sync with head.
|
| 1.2.18.2 |
| 03-Sep-2007 |
yamt | sync with head.
|
| 1.2.18.1 |
| 31-May-2007 |
yamt | file jmide.c was added on branch yamt-lazymbuf on 2007-09-03 14:37:10 +0000
|
| 1.2.16.2 |
| 03-Sep-2007 |
wrstuden | Sync w/ NetBSD-4-RC_1
|
| 1.2.16.1 |
| 31-May-2007 |
wrstuden | file jmide.c was added on branch wrstuden-fixsa on 2007-09-03 07:04:35 +0000
|
| 1.2.14.2 |
| 31-Aug-2007 |
pavel | Pull up following revision(s) (requested by bouyer in ticket #678): distrib/sets/lists/man/mi: revision 1.1001 doc/CHANGES: revision 1.853 via patch share/man/man4/Makefile: revision 1.428 share/man/man4/jmide.4: revision 1.1 sys/arch/amd64/conf/GENERIC: revision 1.143 sys/arch/amd64/conf/INSTALL: revision 1.69 sys/arch/i386/conf/GENERIC: revision 1.827 sys/arch/i386/conf/INSTALL_LARGE: revision 1.2 via patch sys/arch/i386/conf/XEN2_DOM0: revision 1.26 sys/conf/files: revision 1.844 via patch sys/dev/ic/ahcisata_core.c: revision 1.1 via patch sys/dev/ic/ahcisata_core.c: revision 1.3 sys/dev/ic/ahcisatareg.h: revision 1.1 sys/dev/ic/ahcisatavar.h: revision 1.1 sys/dev/pci/ahcisata.c: delete sys/dev/pci/ahcisatareg.h: delete sys/dev/pci/ahcisata_pci.c: revision 1.1 sys/dev/pci/files.pci: revision 1.287-1.288 sys/dev/pci/jmide.c: revision 1.1-1.2 sys/dev/pci/jmide_reg.h: revision 1.1 sys/dev/pci/pcidevs: revision 1.878 Add JMicron Technology vendor ID, and their current PCIe SATA/PATA controllers.
Split the ahcisata driver in pci front-end and bus-independant back-end. add jmide(4), a driver for the JMicron Technology JMB36x PCIe to SATA II/PATA controllers. These controllers can be found on add-on PCIe cards, or on some motherboards to provide the PATA connectivity (e.g. some intel ICH8-based motherboards). Thanks to JMicron Technology for providing me documentation and different sample boards for this work.
Move mapping of AHCI register so that jmide knows if it fails, and avoids calling ahci_intr() (which would cause a panic). Try to use the pciide function for SATA drives if attaching ahci fails (this doesn't seems to work though, it may be BIOS dependant). Thanks to Gary Duzan for testing multiple pacthes.
We're not ready to handle ATAPI yet so just claim there's no drive to the upper layer. This should work around a NULL pointer dereference when an ATAPI device is detected on a AHCI device.
|
| 1.2.14.1 |
| 31-May-2007 |
pavel | file jmide.c was added on branch netbsd-4 on 2007-08-31 20:09:25 +0000
|
| 1.2.12.1 |
| 23-Mar-2008 |
matt | sync with HEAD
|
| 1.2.4.2 |
| 11-Jul-2007 |
mjf | Sync with head.
|
| 1.2.4.1 |
| 31-May-2007 |
mjf | file jmide.c was added on branch mjf-ufs-trans on 2007-07-11 20:07:51 +0000
|
| 1.2.2.3 |
| 09-Jun-2007 |
ad | Sync with head.
|
| 1.2.2.2 |
| 09-Jun-2007 |
ad | Sync with head.
|
| 1.2.2.1 |
| 31-May-2007 |
ad | file jmide.c was added on branch vmlocking on 2007-06-09 21:37:24 +0000
|
| 1.3.6.2 |
| 05-Jun-2008 |
mjf | Sync with HEAD.
Also fix build.
|
| 1.3.6.1 |
| 03-Apr-2008 |
mjf | Sync with HEAD.
|
| 1.3.2.1 |
| 24-Mar-2008 |
keiichi | sync with head.
|
| 1.5.6.1 |
| 23-Jun-2008 |
wrstuden | Sync w/ -current. 34 merge conflicts to follow.
|
| 1.5.4.3 |
| 11-Aug-2010 |
yamt | sync with head.
|
| 1.5.4.2 |
| 11-Mar-2010 |
yamt | sync with head
|
| 1.5.4.1 |
| 04-May-2009 |
yamt | sync with head.
|
| 1.5.2.1 |
| 17-Jun-2008 |
yamt | sync with head.
|
| 1.7.4.2 |
| 21-Apr-2011 |
rmind | sync with head
|
| 1.7.4.1 |
| 05-Mar-2011 |
rmind | sync with head
|
| 1.7.2.2 |
| 06-Nov-2010 |
uebayasi | Sync with HEAD.
|
| 1.7.2.1 |
| 17-Aug-2010 |
uebayasi | Sync with HEAD.
|
| 1.9.2.1 |
| 06-Jun-2011 |
jruoho | Sync with HEAD.
|
| 1.11.6.2 |
| 05-Apr-2012 |
mrg | sync to latest -current.
|
| 1.11.6.1 |
| 18-Feb-2012 |
mrg | merge to -current.
|
| 1.11.2.3 |
| 22-May-2014 |
yamt | sync with head.
for a reference, the tree before this commit was tagged as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments")
|
| 1.11.2.2 |
| 30-Oct-2012 |
yamt | sync with head
|
| 1.11.2.1 |
| 17-Apr-2012 |
yamt | sync with head
|
| 1.12.2.1 |
| 03-Apr-2012 |
riz | Pull up following revision(s) (requested by pgoyette in ticket #149): sys/dev/pci/pcidevs: revision 1.1108 sys/dev/pci/jmide.c: revision 1.13 Add JMB 362 (as found on ASUS M5A99X motherboard) Add match for JMB362 (with two SATA ports).
|
| 1.18.4.1 |
| 18-May-2014 |
rmind | sync with head
|
| 1.18.2.3 |
| 03-Dec-2017 |
jdolecek | update from HEAD
|
| 1.18.2.2 |
| 20-Aug-2014 |
tls | Rebase to HEAD as of a few days ago.
|
| 1.18.2.1 |
| 09-Oct-2012 |
bouyer | Support transfers of up to MACHINE_MAXPHYS in all pciide variants, and ahci. wd(4) limits its maxphys depending on the drives's capability (64k sectors for LBA48, 256 sectors for LBA and 128 sectors for older devices).
I assumed all pciide controllers could do MACHINE_MAXPHYS transfers, but this may not be true. The capabilities of each controller variants should be looked at more closely.
|
| 1.19.6.1 |
| 05-Oct-2016 |
skrll | Sync with HEAD
|
| 1.21.18.2 |
| 13-Apr-2020 |
martin | Mostly merge changes from HEAD upto 20200411
|
| 1.21.18.1 |
| 10-Jun-2019 |
christos | Sync with HEAD
|
| 1.21.16.1 |
| 26-Dec-2018 |
pgoyette | Sync with HEAD, resolve a few conflicts
|
| 1.23.10.1 |
| 02-Apr-2021 |
thorpej | config_found_ia() -> config_found() w/ CFARG_IATTR.
|
| 1.24.8.1 |
| 04-Aug-2021 |
thorpej | Adapt to CFARGS().
|