Loading Documentation/Changes +18 −6 Original line number Diff line number Diff line Loading @@ -44,9 +44,9 @@ running, the suggested command should tell you. Again, keep in mind that this list assumes you are already functionally running a Linux 2.4 kernel. Also, not all tools are necessary on all systems; obviously, if you don't have any PCMCIA (PC Card) hardware, for example, you probably needn't concern yourself with pcmcia-cs. necessary on all systems; obviously, if you don't have any ISDN hardware, for example, you probably needn't concern yourself with isdn4k-utils. o Gnu C 2.95.3 # gcc --version o Gnu make 3.79.1 # make --version Loading @@ -57,6 +57,7 @@ o e2fsprogs 1.29 # tune2fs o jfsutils 1.1.3 # fsck.jfs -V o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs o xfsprogs 2.6.0 # xfs_db -V o pcmciautils 001 o pcmcia-cs 3.1.21 # cardmgr -V o quota-tools 3.09 # quota -V o PPP 2.4.0 # pppd --version Loading Loading @@ -186,13 +187,20 @@ architecture independent and any version from 2.0.0 onward should work correctly with this version of the XFS kernel code (2.6.0 or later is recommended, due to some significant improvements). PCMCIAutils ----------- PCMCIAutils replaces pcmcia-cs (see below). It properly sets up PCMCIA sockets at system startup and loads the appropriate modules for 16-bit PCMCIA devices if the kernel is modularized and the hotplug subsystem is used. Pcmcia-cs --------- PCMCIA (PC Card) support is now partially implemented in the main kernel source. Pay attention when you recompile your kernel ;-). Also, be sure to upgrade to the latest pcmcia-cs release. kernel source. The "pcmciautils" package (see above) replaces pcmcia-cs for newest kernels. Quota-tools ----------- Loading Loading @@ -349,9 +357,13 @@ Xfsprogs -------- o <ftp://oss.sgi.com/projects/xfs/download/> Pcmciautils ----------- o <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/> Pcmcia-cs --------- o <ftp://pcmcia-cs.sourceforge.net/pub/pcmcia-cs/pcmcia-cs-3.1.21.tar.gz> o <http://pcmcia-cs.sourceforge.net/> Quota-tools ---------- Loading Documentation/pcmcia/devicetable.txt 0 → 100644 +64 −0 Original line number Diff line number Diff line Matching of PCMCIA devices to drivers is done using one or more of the following criteria: - manufactor ID - card ID - product ID strings _and_ hashes of these strings - function ID - device function (actual and pseudo) You should use the helpers in include/pcmcia/device_id.h for generating the struct pcmcia_device_id[] entries which match devices to drivers. If you want to match product ID strings, you also need to pass the crc32 hashes of the string to the macro, e.g. if you want to match the product ID string 1, you need to use PCMCIA_DEVICE_PROD_ID1("some_string", 0x(hash_of_some_string)), If the hash is incorrect, the kernel will inform you about this in "dmesg" upon module initialization, and tell you of the correct hash. You can determine the hash of the product ID strings by running "pcmcia-modalias %n.%m" [%n being replaced with the socket number and %m being replaced with the device function] from pcmciautils. It generates a string in the following form: pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000 The hex value after "pa" is the hash of product ID string 1, after "pb" for string 2 and so on. Alternatively, you can use this small tool to determine the crc32 hash. simply pass the string you want to evaluate as argument to this program, e.g. $ ./crc32hash "Dual Speed" ------------------------------------------------------------------------- /* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */ #include <string.h> #include <stdio.h> #include <ctype.h> #include <stdlib.h> unsigned int crc32(unsigned char const *p, unsigned int len) { int i; unsigned int crc = 0; while (len--) { crc ^= *p++; for (i = 0; i < 8; i++) crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0); } return crc; } int main(int argc, char **argv) { unsigned int result; if (argc != 2) { printf("no string passed as argument\n"); return -1; } result = crc32(argv[1], strlen(argv[1])); printf("0x%x\n", result); return 0; } Documentation/pcmcia/driver-changes.txt 0 → 100644 +51 −0 Original line number Diff line number Diff line This file details changes in 2.6 which affect PCMCIA card driver authors: * in-kernel device<->driver matching PCMCIA devices and their correct drivers can now be matched in kernelspace. See 'devicetable.txt' for details. * Device model integration (as of 2.6.11) A struct pcmcia_device is registered with the device model core, and can be used (e.g. for SET_NETDEV_DEV) by using handle_to_dev(client_handle_t * handle). * Convert internal I/O port addresses to unsigned long (as of 2.6.11) ioaddr_t should be replaced by kio_addr_t in PCMCIA card drivers. * irq_mask and irq_list parameters (as of 2.6.11) The irq_mask and irq_list parameters should no longer be used in PCMCIA card drivers. Instead, it is the job of the PCMCIA core to determine which IRQ should be used. Therefore, link->irq.IRQInfo2 is ignored. * client->PendingEvents is gone (as of 2.6.11) client->PendingEvents is no longer available. * client->Attributes are gone (as of 2.6.11) client->Attributes is unused, therefore it is removed from all PCMCIA card drivers * core functions no longer available (as of 2.6.11) The following functions have been removed from the kernel source because they are unused by all in-kernel drivers, and no external driver was reported to rely on them: pcmcia_get_first_region() pcmcia_get_next_region() pcmcia_modify_window() pcmcia_set_event_mask() pcmcia_get_first_window() pcmcia_get_next_window() * device list iteration upon module removal (as of 2.6.10) It is no longer necessary to iterate on the driver's internal client list and call the ->detach() function upon module removal. * Resource management. (as of 2.6.8) Although the PCMCIA subsystem will allocate resources for cards, it no longer marks these resources busy. This means that driver authors are now responsible for claiming your resources as per other drivers in Linux. You should use request_region() to mark your IO regions in-use, and request_mem_region() to mark your memory regions in-use. The name argument should be a pointer to your driver name. Eg, for pcnet_cs, name should point to the string "pcnet_cs". arch/sparc64/kernel/auxio.c +1 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ #include <asm/ebus.h> #include <asm/auxio.h> /* This cannot be static, as it is referenced in entry.S */ /* This cannot be static, as it is referenced in irq.c */ void __iomem *auxio_register = NULL; enum auxio_type { Loading arch/sparc64/kernel/entry.S +4 −112 Original line number Diff line number Diff line Loading @@ -271,8 +271,9 @@ cplus_fptrap_insn_1: fmuld %f0, %f2, %f26 faddd %f0, %f2, %f28 fmuld %f0, %f2, %f30 b,pt %xcc, fpdis_exit membar #Sync b,pt %xcc, fpdis_exit nop 2: andcc %g5, FPRS_DU, %g0 bne,pt %icc, 3f fzero %f32 Loading Loading @@ -301,8 +302,9 @@ cplus_fptrap_insn_2: fmuld %f32, %f34, %f58 faddd %f32, %f34, %f60 fmuld %f32, %f34, %f62 ba,pt %xcc, fpdis_exit membar #Sync ba,pt %xcc, fpdis_exit nop 3: mov SECONDARY_CONTEXT, %g3 add %g6, TI_FPREGS, %g1 ldxa [%g3] ASI_DMMU, %g5 Loading Loading @@ -699,116 +701,6 @@ utrap_ill: ba,pt %xcc, rtrap clr %l6 #ifdef CONFIG_BLK_DEV_FD .globl floppy_hardint floppy_hardint: wr %g0, (1 << 11), %clear_softint sethi %hi(doing_pdma), %g1 ld [%g1 + %lo(doing_pdma)], %g2 brz,pn %g2, floppy_dosoftint sethi %hi(fdc_status), %g3 ldx [%g3 + %lo(fdc_status)], %g3 sethi %hi(pdma_vaddr), %g5 ldx [%g5 + %lo(pdma_vaddr)], %g4 sethi %hi(pdma_size), %g5 ldx [%g5 + %lo(pdma_size)], %g5 next_byte: lduba [%g3] ASI_PHYS_BYPASS_EC_E, %g7 andcc %g7, 0x80, %g0 be,pn %icc, floppy_fifo_emptied andcc %g7, 0x20, %g0 be,pn %icc, floppy_overrun andcc %g7, 0x40, %g0 be,pn %icc, floppy_write sub %g5, 1, %g5 inc %g3 lduba [%g3] ASI_PHYS_BYPASS_EC_E, %g7 dec %g3 orcc %g0, %g5, %g0 stb %g7, [%g4] bne,pn %xcc, next_byte add %g4, 1, %g4 b,pt %xcc, floppy_tdone nop floppy_write: ldub [%g4], %g7 orcc %g0, %g5, %g0 inc %g3 stba %g7, [%g3] ASI_PHYS_BYPASS_EC_E dec %g3 bne,pn %xcc, next_byte add %g4, 1, %g4 floppy_tdone: sethi %hi(pdma_vaddr), %g1 stx %g4, [%g1 + %lo(pdma_vaddr)] sethi %hi(pdma_size), %g1 stx %g5, [%g1 + %lo(pdma_size)] sethi %hi(auxio_register), %g1 ldx [%g1 + %lo(auxio_register)], %g7 lduba [%g7] ASI_PHYS_BYPASS_EC_E, %g5 or %g5, AUXIO_AUX1_FTCNT, %g5 /* andn %g5, AUXIO_AUX1_MASK, %g5 */ stba %g5, [%g7] ASI_PHYS_BYPASS_EC_E andn %g5, AUXIO_AUX1_FTCNT, %g5 /* andn %g5, AUXIO_AUX1_MASK, %g5 */ nop; nop; nop; nop; nop; nop; nop; nop; nop; nop; nop; nop; stba %g5, [%g7] ASI_PHYS_BYPASS_EC_E sethi %hi(doing_pdma), %g1 b,pt %xcc, floppy_dosoftint st %g0, [%g1 + %lo(doing_pdma)] floppy_fifo_emptied: sethi %hi(pdma_vaddr), %g1 stx %g4, [%g1 + %lo(pdma_vaddr)] sethi %hi(pdma_size), %g1 stx %g5, [%g1 + %lo(pdma_size)] sethi %hi(irq_action), %g1 or %g1, %lo(irq_action), %g1 ldx [%g1 + (11 << 3)], %g3 ! irqaction[floppy_irq] ldx [%g3 + 0x08], %g4 ! action->flags>>48==ino sethi %hi(ivector_table), %g3 srlx %g4, 48, %g4 or %g3, %lo(ivector_table), %g3 sllx %g4, 5, %g4 ldx [%g3 + %g4], %g4 ! &ivector_table[ino] ldx [%g4 + 0x10], %g4 ! bucket->iclr stwa %g0, [%g4] ASI_PHYS_BYPASS_EC_E ! ICLR_IDLE membar #Sync ! probably not needed... retry floppy_overrun: sethi %hi(pdma_vaddr), %g1 stx %g4, [%g1 + %lo(pdma_vaddr)] sethi %hi(pdma_size), %g1 stx %g5, [%g1 + %lo(pdma_size)] sethi %hi(doing_pdma), %g1 st %g0, [%g1 + %lo(doing_pdma)] floppy_dosoftint: rdpr %pil, %g2 wrpr %g0, 15, %pil sethi %hi(109f), %g7 b,pt %xcc, etrap_irq 109: or %g7, %lo(109b), %g7 mov 11, %o0 mov 0, %o1 call sparc_floppy_irq add %sp, PTREGS_OFF, %o2 b,pt %xcc, rtrap_irq nop #endif /* CONFIG_BLK_DEV_FD */ /* XXX Here is stuff we still need to write... -DaveM XXX */ .globl netbsd_syscall netbsd_syscall: Loading Loading
Documentation/Changes +18 −6 Original line number Diff line number Diff line Loading @@ -44,9 +44,9 @@ running, the suggested command should tell you. Again, keep in mind that this list assumes you are already functionally running a Linux 2.4 kernel. Also, not all tools are necessary on all systems; obviously, if you don't have any PCMCIA (PC Card) hardware, for example, you probably needn't concern yourself with pcmcia-cs. necessary on all systems; obviously, if you don't have any ISDN hardware, for example, you probably needn't concern yourself with isdn4k-utils. o Gnu C 2.95.3 # gcc --version o Gnu make 3.79.1 # make --version Loading @@ -57,6 +57,7 @@ o e2fsprogs 1.29 # tune2fs o jfsutils 1.1.3 # fsck.jfs -V o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1|grep reiserfsprogs o xfsprogs 2.6.0 # xfs_db -V o pcmciautils 001 o pcmcia-cs 3.1.21 # cardmgr -V o quota-tools 3.09 # quota -V o PPP 2.4.0 # pppd --version Loading Loading @@ -186,13 +187,20 @@ architecture independent and any version from 2.0.0 onward should work correctly with this version of the XFS kernel code (2.6.0 or later is recommended, due to some significant improvements). PCMCIAutils ----------- PCMCIAutils replaces pcmcia-cs (see below). It properly sets up PCMCIA sockets at system startup and loads the appropriate modules for 16-bit PCMCIA devices if the kernel is modularized and the hotplug subsystem is used. Pcmcia-cs --------- PCMCIA (PC Card) support is now partially implemented in the main kernel source. Pay attention when you recompile your kernel ;-). Also, be sure to upgrade to the latest pcmcia-cs release. kernel source. The "pcmciautils" package (see above) replaces pcmcia-cs for newest kernels. Quota-tools ----------- Loading Loading @@ -349,9 +357,13 @@ Xfsprogs -------- o <ftp://oss.sgi.com/projects/xfs/download/> Pcmciautils ----------- o <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/> Pcmcia-cs --------- o <ftp://pcmcia-cs.sourceforge.net/pub/pcmcia-cs/pcmcia-cs-3.1.21.tar.gz> o <http://pcmcia-cs.sourceforge.net/> Quota-tools ---------- Loading
Documentation/pcmcia/devicetable.txt 0 → 100644 +64 −0 Original line number Diff line number Diff line Matching of PCMCIA devices to drivers is done using one or more of the following criteria: - manufactor ID - card ID - product ID strings _and_ hashes of these strings - function ID - device function (actual and pseudo) You should use the helpers in include/pcmcia/device_id.h for generating the struct pcmcia_device_id[] entries which match devices to drivers. If you want to match product ID strings, you also need to pass the crc32 hashes of the string to the macro, e.g. if you want to match the product ID string 1, you need to use PCMCIA_DEVICE_PROD_ID1("some_string", 0x(hash_of_some_string)), If the hash is incorrect, the kernel will inform you about this in "dmesg" upon module initialization, and tell you of the correct hash. You can determine the hash of the product ID strings by running "pcmcia-modalias %n.%m" [%n being replaced with the socket number and %m being replaced with the device function] from pcmciautils. It generates a string in the following form: pcmcia:m0149cC1ABf06pfn00fn00pa725B842DpbF1EFEE84pc0877B627pd00000000 The hex value after "pa" is the hash of product ID string 1, after "pb" for string 2 and so on. Alternatively, you can use this small tool to determine the crc32 hash. simply pass the string you want to evaluate as argument to this program, e.g. $ ./crc32hash "Dual Speed" ------------------------------------------------------------------------- /* crc32hash.c - derived from linux/lib/crc32.c, GNU GPL v2 */ #include <string.h> #include <stdio.h> #include <ctype.h> #include <stdlib.h> unsigned int crc32(unsigned char const *p, unsigned int len) { int i; unsigned int crc = 0; while (len--) { crc ^= *p++; for (i = 0; i < 8; i++) crc = (crc >> 1) ^ ((crc & 1) ? 0xedb88320 : 0); } return crc; } int main(int argc, char **argv) { unsigned int result; if (argc != 2) { printf("no string passed as argument\n"); return -1; } result = crc32(argv[1], strlen(argv[1])); printf("0x%x\n", result); return 0; }
Documentation/pcmcia/driver-changes.txt 0 → 100644 +51 −0 Original line number Diff line number Diff line This file details changes in 2.6 which affect PCMCIA card driver authors: * in-kernel device<->driver matching PCMCIA devices and their correct drivers can now be matched in kernelspace. See 'devicetable.txt' for details. * Device model integration (as of 2.6.11) A struct pcmcia_device is registered with the device model core, and can be used (e.g. for SET_NETDEV_DEV) by using handle_to_dev(client_handle_t * handle). * Convert internal I/O port addresses to unsigned long (as of 2.6.11) ioaddr_t should be replaced by kio_addr_t in PCMCIA card drivers. * irq_mask and irq_list parameters (as of 2.6.11) The irq_mask and irq_list parameters should no longer be used in PCMCIA card drivers. Instead, it is the job of the PCMCIA core to determine which IRQ should be used. Therefore, link->irq.IRQInfo2 is ignored. * client->PendingEvents is gone (as of 2.6.11) client->PendingEvents is no longer available. * client->Attributes are gone (as of 2.6.11) client->Attributes is unused, therefore it is removed from all PCMCIA card drivers * core functions no longer available (as of 2.6.11) The following functions have been removed from the kernel source because they are unused by all in-kernel drivers, and no external driver was reported to rely on them: pcmcia_get_first_region() pcmcia_get_next_region() pcmcia_modify_window() pcmcia_set_event_mask() pcmcia_get_first_window() pcmcia_get_next_window() * device list iteration upon module removal (as of 2.6.10) It is no longer necessary to iterate on the driver's internal client list and call the ->detach() function upon module removal. * Resource management. (as of 2.6.8) Although the PCMCIA subsystem will allocate resources for cards, it no longer marks these resources busy. This means that driver authors are now responsible for claiming your resources as per other drivers in Linux. You should use request_region() to mark your IO regions in-use, and request_mem_region() to mark your memory regions in-use. The name argument should be a pointer to your driver name. Eg, for pcnet_cs, name should point to the string "pcnet_cs".
arch/sparc64/kernel/auxio.c +1 −1 Original line number Diff line number Diff line Loading @@ -16,7 +16,7 @@ #include <asm/ebus.h> #include <asm/auxio.h> /* This cannot be static, as it is referenced in entry.S */ /* This cannot be static, as it is referenced in irq.c */ void __iomem *auxio_register = NULL; enum auxio_type { Loading
arch/sparc64/kernel/entry.S +4 −112 Original line number Diff line number Diff line Loading @@ -271,8 +271,9 @@ cplus_fptrap_insn_1: fmuld %f0, %f2, %f26 faddd %f0, %f2, %f28 fmuld %f0, %f2, %f30 b,pt %xcc, fpdis_exit membar #Sync b,pt %xcc, fpdis_exit nop 2: andcc %g5, FPRS_DU, %g0 bne,pt %icc, 3f fzero %f32 Loading Loading @@ -301,8 +302,9 @@ cplus_fptrap_insn_2: fmuld %f32, %f34, %f58 faddd %f32, %f34, %f60 fmuld %f32, %f34, %f62 ba,pt %xcc, fpdis_exit membar #Sync ba,pt %xcc, fpdis_exit nop 3: mov SECONDARY_CONTEXT, %g3 add %g6, TI_FPREGS, %g1 ldxa [%g3] ASI_DMMU, %g5 Loading Loading @@ -699,116 +701,6 @@ utrap_ill: ba,pt %xcc, rtrap clr %l6 #ifdef CONFIG_BLK_DEV_FD .globl floppy_hardint floppy_hardint: wr %g0, (1 << 11), %clear_softint sethi %hi(doing_pdma), %g1 ld [%g1 + %lo(doing_pdma)], %g2 brz,pn %g2, floppy_dosoftint sethi %hi(fdc_status), %g3 ldx [%g3 + %lo(fdc_status)], %g3 sethi %hi(pdma_vaddr), %g5 ldx [%g5 + %lo(pdma_vaddr)], %g4 sethi %hi(pdma_size), %g5 ldx [%g5 + %lo(pdma_size)], %g5 next_byte: lduba [%g3] ASI_PHYS_BYPASS_EC_E, %g7 andcc %g7, 0x80, %g0 be,pn %icc, floppy_fifo_emptied andcc %g7, 0x20, %g0 be,pn %icc, floppy_overrun andcc %g7, 0x40, %g0 be,pn %icc, floppy_write sub %g5, 1, %g5 inc %g3 lduba [%g3] ASI_PHYS_BYPASS_EC_E, %g7 dec %g3 orcc %g0, %g5, %g0 stb %g7, [%g4] bne,pn %xcc, next_byte add %g4, 1, %g4 b,pt %xcc, floppy_tdone nop floppy_write: ldub [%g4], %g7 orcc %g0, %g5, %g0 inc %g3 stba %g7, [%g3] ASI_PHYS_BYPASS_EC_E dec %g3 bne,pn %xcc, next_byte add %g4, 1, %g4 floppy_tdone: sethi %hi(pdma_vaddr), %g1 stx %g4, [%g1 + %lo(pdma_vaddr)] sethi %hi(pdma_size), %g1 stx %g5, [%g1 + %lo(pdma_size)] sethi %hi(auxio_register), %g1 ldx [%g1 + %lo(auxio_register)], %g7 lduba [%g7] ASI_PHYS_BYPASS_EC_E, %g5 or %g5, AUXIO_AUX1_FTCNT, %g5 /* andn %g5, AUXIO_AUX1_MASK, %g5 */ stba %g5, [%g7] ASI_PHYS_BYPASS_EC_E andn %g5, AUXIO_AUX1_FTCNT, %g5 /* andn %g5, AUXIO_AUX1_MASK, %g5 */ nop; nop; nop; nop; nop; nop; nop; nop; nop; nop; nop; nop; stba %g5, [%g7] ASI_PHYS_BYPASS_EC_E sethi %hi(doing_pdma), %g1 b,pt %xcc, floppy_dosoftint st %g0, [%g1 + %lo(doing_pdma)] floppy_fifo_emptied: sethi %hi(pdma_vaddr), %g1 stx %g4, [%g1 + %lo(pdma_vaddr)] sethi %hi(pdma_size), %g1 stx %g5, [%g1 + %lo(pdma_size)] sethi %hi(irq_action), %g1 or %g1, %lo(irq_action), %g1 ldx [%g1 + (11 << 3)], %g3 ! irqaction[floppy_irq] ldx [%g3 + 0x08], %g4 ! action->flags>>48==ino sethi %hi(ivector_table), %g3 srlx %g4, 48, %g4 or %g3, %lo(ivector_table), %g3 sllx %g4, 5, %g4 ldx [%g3 + %g4], %g4 ! &ivector_table[ino] ldx [%g4 + 0x10], %g4 ! bucket->iclr stwa %g0, [%g4] ASI_PHYS_BYPASS_EC_E ! ICLR_IDLE membar #Sync ! probably not needed... retry floppy_overrun: sethi %hi(pdma_vaddr), %g1 stx %g4, [%g1 + %lo(pdma_vaddr)] sethi %hi(pdma_size), %g1 stx %g5, [%g1 + %lo(pdma_size)] sethi %hi(doing_pdma), %g1 st %g0, [%g1 + %lo(doing_pdma)] floppy_dosoftint: rdpr %pil, %g2 wrpr %g0, 15, %pil sethi %hi(109f), %g7 b,pt %xcc, etrap_irq 109: or %g7, %lo(109b), %g7 mov 11, %o0 mov 0, %o1 call sparc_floppy_irq add %sp, PTREGS_OFF, %o2 b,pt %xcc, rtrap_irq nop #endif /* CONFIG_BLK_DEV_FD */ /* XXX Here is stuff we still need to write... -DaveM XXX */ .globl netbsd_syscall netbsd_syscall: Loading
