Commit d68780fb authored by Jeff Garzik's avatar Jeff Garzik

Merge redhat.com:/home/jgarzik/repo/linus-2.5

into redhat.com:/home/jgarzik/repo/net-drivers-2.5
parents c5265e0f eb0ad91a
...@@ -12,7 +12,7 @@ NM := $(NM) -B ...@@ -12,7 +12,7 @@ NM := $(NM) -B
LDFLAGS_vmlinux = -static -N #-relax LDFLAGS_vmlinux = -static -N #-relax
CFLAGS := $(CFLAGS) -pipe -mno-fp-regs -ffixed-8 CFLAGS := $(CFLAGS) -pipe -mno-fp-regs -ffixed-8
ARCHBLOBLFLAGS := -I binary -O elf64-alpha -B alpha LDFLAGS_BLOB := --format binary --oformat elf64-alpha
# Determine if we can use the BWX instructions with GAS. # Determine if we can use the BWX instructions with GAS.
old_gas := $(shell if $(AS) --version 2>&1 | grep 'version 2.7' > /dev/null; then echo y; else echo n; fi) old_gas := $(shell if $(AS) --version 2>&1 | grep 'version 2.7' > /dev/null; then echo y; else echo n; fi)
......
...@@ -69,7 +69,7 @@ SECTIONS ...@@ -69,7 +69,7 @@ SECTIONS
.init.ramfs ALIGN(8192): { .init.ramfs ALIGN(8192): {
__initramfs_start = .; __initramfs_start = .;
*(.init.initramfs) *(.init.ramfs)
__initramfs_end = .; __initramfs_end = .;
} }
......
...@@ -337,7 +337,6 @@ config PREEMPT ...@@ -337,7 +337,6 @@ config PREEMPT
config X86_UP_APIC config X86_UP_APIC
bool "Local APIC support on uniprocessors" if !SMP bool "Local APIC support on uniprocessors" if !SMP
default y if SMP
---help--- ---help---
A local APIC (Advanced Programmable Interrupt Controller) is an A local APIC (Advanced Programmable Interrupt Controller) is an
integrated interrupt controller in the CPU. If you have a single-CPU integrated interrupt controller in the CPU. If you have a single-CPU
...@@ -447,7 +446,7 @@ config X86_MCE ...@@ -447,7 +446,7 @@ config X86_MCE
the 386 and 486, so nearly everyone can say Y here. the 386 and 486, so nearly everyone can say Y here.
config X86_MCE_NONFATAL config X86_MCE_NONFATAL
bool "Check for non-fatal errors on Athlon/Duron" bool "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
depends on X86_MCE depends on X86_MCE
help help
Enabling this feature starts a timer that triggers every 5 seconds which Enabling this feature starts a timer that triggers every 5 seconds which
...@@ -456,12 +455,12 @@ config X86_MCE_NONFATAL ...@@ -456,12 +455,12 @@ config X86_MCE_NONFATAL
Disable this if you don't want to see these messages. Disable this if you don't want to see these messages.
Seeing the messages this option prints out may be indicative of dying hardware, Seeing the messages this option prints out may be indicative of dying hardware,
or out-of-spec (ie, overclocked) hardware. or out-of-spec (ie, overclocked) hardware.
This option only does something on hardware with Intel P6 style MCE. This option only does something on certain CPUs.
(Pentium Pro and above, AMD Athlon/Duron) (AMD Athlon/Duron and Intel Pentium 4)
config X86_MCE_P4THERMAL config X86_MCE_P4THERMAL
bool "check for P4 thermal throttling interrupt." bool "check for P4 thermal throttling interrupt."
depends on X86_MCE && X86_UP_APIC depends on X86_MCE && (X86_UP_APIC || SMP)
help help
Enabling this feature will cause a message to be printed when the P4 Enabling this feature will cause a message to be printed when the P4
enters thermal throttling. enters thermal throttling.
......
...@@ -42,7 +42,7 @@ cflags-$(CONFIG_MCRUSOE) += -march=i686 -malign-functions=0 -malign-jumps=0 -mal ...@@ -42,7 +42,7 @@ cflags-$(CONFIG_MCRUSOE) += -march=i686 -malign-functions=0 -malign-jumps=0 -mal
cflags-$(CONFIG_MWINCHIPC6) += $(call check_gcc,-march=winchip-c6,-march=i586) cflags-$(CONFIG_MWINCHIPC6) += $(call check_gcc,-march=winchip-c6,-march=i586)
cflags-$(CONFIG_MWINCHIP2) += $(call check_gcc,-march=winchip2,-march=i586) cflags-$(CONFIG_MWINCHIP2) += $(call check_gcc,-march=winchip2,-march=i586)
cflags-$(CONFIG_MWINCHIP3D) += -march=i586 cflags-$(CONFIG_MWINCHIP3D) += -march=i586
cflags-$(CONFIG_MCYRIXIII) += $(call check_gcc,-march=c3,-march=i586) cflags-$(CONFIG_MCYRIXIII) += $(call check_gcc,-march=c3,-march=i486) -malign-functions=0 -malign-jumps=0 -malign-loops=0
CFLAGS += $(cflags-y) CFLAGS += $(cflags-y)
......
...@@ -8,8 +8,7 @@ export-objs := mca.o i386_ksyms.o time.o ...@@ -8,8 +8,7 @@ export-objs := mca.o i386_ksyms.o time.o
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \ ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o bluesmoke.o dmi_scan.o \ pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o
bootflag.o
obj-y += cpu/ obj-y += cpu/
obj-y += timers/ obj-y += timers/
......
...@@ -13,7 +13,10 @@ obj-y += rise.o ...@@ -13,7 +13,10 @@ obj-y += rise.o
obj-y += nexgen.o obj-y += nexgen.o
obj-y += umc.o obj-y += umc.o
obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/ obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_CPU_FREQ) += cpufreq/
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -358,7 +358,9 @@ void __init identify_cpu(struct cpuinfo_x86 *c) ...@@ -358,7 +358,9 @@ void __init identify_cpu(struct cpuinfo_x86 *c)
boot_cpu_data.x86_capability[3]); boot_cpu_data.x86_capability[3]);
/* Init Machine Check Exception if available. */ /* Init Machine Check Exception if available. */
#ifdef CONFIG_X86_MCE
mcheck_init(c); mcheck_init(c);
#endif
} }
/* /*
* Perform early boot up checks for a valid TSC. See arch/i386/kernel/time.c * Perform early boot up checks for a valid TSC. See arch/i386/kernel/time.c
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/timer.h>
#include "cpu.h" #include "cpu.h"
...@@ -170,7 +171,7 @@ static void __init init_cyrix(struct cpuinfo_x86 *c) ...@@ -170,7 +171,7 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)
c->coma_bug = 1; c->coma_bug = 1;
break; break;
case 4: /* MediaGX/GXm */ case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* It isn't really a PCI quirk directly, but the cure is the /* It isn't really a PCI quirk directly, but the cure is the
same. The MediaGX has deep magic SMM stuff that handles the same. The MediaGX has deep magic SMM stuff that handles the
...@@ -188,29 +189,26 @@ static void __init init_cyrix(struct cpuinfo_x86 *c) ...@@ -188,29 +189,26 @@ static void __init init_cyrix(struct cpuinfo_x86 *c)
isa_dma_bridge_buggy = 2; isa_dma_bridge_buggy = 2;
#endif #endif
c->x86_cache_size=16; /* Yep 16K integrated cache thats it */ c->x86_cache_size=16; /* Yep 16K integrated cache thats it */
/*
* The 5510/5520 companion chips have a funky PIT.
*/
if (pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) ||
pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, NULL))
pit_latch_buggy = 1;
/* GXm supports extended cpuid levels 'ala' AMD */ /* GXm supports extended cpuid levels 'ala' AMD */
if (c->cpuid_level == 2) { if (c->cpuid_level == 2) {
/* Enable Natsemi MMX extensions */ /* Enable cxMMX extensions (GX1 Datasheet 54) */
setCx86(CX86_CCR7, getCx86(CX86_CCR7) | 1); setCx86(CX86_CCR7, getCx86(CX86_CCR7)|1);
get_model_name(c); /* get CPU marketing name */ get_model_name(c); /* get CPU marketing name */
/*
* The 5510/5520 companion chips have a funky PIT
* that breaks the TSC synchronizing, so turn it off
*/
if (pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5510, NULL) ||
pci_find_device(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5520, NULL))
clear_bit(X86_FEATURE_TSC, c->x86_capability);
return; return;
} }
else { /* MediaGX */ else { /* MediaGX */
Cx86_cb[2] = (dir0_lsn & 1) ? '3' : '4'; Cx86_cb[2] = (dir0_lsn & 1) ? '3' : '4';
p = Cx86_cb+2; p = Cx86_cb+2;
c->x86_model = (dir1 & 0x20) ? 1 : 2; c->x86_model = (dir1 & 0x20) ? 1 : 2;
#ifndef CONFIG_CS5520
clear_bit(X86_FEATURE_TSC, c->x86_capability);
#endif
} }
break; break;
......
obj-y = mce.o k7.o p4.o p5.o p6.o winchip.o
obj-$(CONFIG_X86_MCE_NONFATAL) += non-fatal.o
include $(TOPDIR)/Rules.make
/*
* Athlon specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
/* Machine Check Handler For AMD Athlon/Duron */
static void k7_machine_check(struct pt_regs * regs, long error_code)
{
int recover=1;
u32 alow, ahigh, high, low;
u32 mcgstl, mcgsth;
int i;
rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth);
if (mcgstl & (1<<0)) /* Recoverable ? */
recover=0;
printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
smp_processor_id(), mcgsth, mcgstl);
for (i=0; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
if (high&(1<<31)) {
if (high & (1<<29))
recover |= 1;
if (high & (1<<25))
recover |= 2;
printk (KERN_EMERG "Bank %d: %08x%08x", i, high, low);
high &= ~(1<<31);
if (high & (1<<27)) {
rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
printk ("[%08x%08x]", ahigh, alow);
}
if (high & (1<<26)) {
rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
printk (" at %08x%08x", ahigh, alow);
}
printk ("\n");
/* Clear it */
wrmsr (MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
/* Serialize */
wmb();
}
}
if (recover&2)
panic ("CPU context corrupt");
if (recover&1)
panic ("Unable to continue");
printk (KERN_EMERG "Attempting to continue.\n");
mcgstl &= ~(1<<2);
wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth);
}
/* AMD K7 machine check is Intel like */
void __init amd_mcheck_init(struct cpuinfo_x86 *c)
{
u32 l, h;
int i;
machine_check_vector = k7_machine_check;
wmb();
printk (KERN_INFO "Intel machine check architecture supported.\n");
rdmsr (MSR_IA32_MCG_CAP, l, h);
if (l & (1<<8)) /* Control register present ? */
wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff);
nr_mce_banks = l & 0xff;
for (i=0; i<nr_mce_banks; i++) {
wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff);
wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0);
}
set_in_cr4 (X86_CR4_MCE);
printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n",
smp_processor_id());
#ifdef CONFIG_X86_MCE_NONFATAL
init_nonfatal_mce_checker();
#endif
}
/*
* mce.c - x86 Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/config.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/thread_info.h>
#include "mce.h"
int mce_disabled __initdata = 0;
int nr_mce_banks;
/* Handle unconfigured int18 (should never happen) */
static void unexpected_machine_check(struct pt_regs * regs, long error_code)
{
printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id());
}
/* Call the installed machine check handler for this CPU setup. */
void (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
asmlinkage void do_machine_check(struct pt_regs * regs, long error_code)
{
machine_check_vector(regs, error_code);
}
/* This has to be run for each processor */
void __init mcheck_init(struct cpuinfo_x86 *c)
{
if (mce_disabled==1)
return;
switch (c->x86_vendor) {
case X86_VENDOR_AMD:
if (c->x86==6 || c->x86==15)
amd_mcheck_init(c);
break;
case X86_VENDOR_INTEL:
if (c->x86==5)
intel_p5_mcheck_init(c);
if (c->x86==6)
intel_p6_mcheck_init(c);
if (c->x86==15)
intel_p4_mcheck_init(c);
break;
case X86_VENDOR_CENTAUR:
if (c->x86==5)
winchip_mcheck_init(c);
break;
default:
break;
}
}
static int __init mcheck_disable(char *str)
{
mce_disabled = 1;
return 0;
}
static int __init mcheck_enable(char *str)
{
mce_disabled = -1;
return 0;
}
__setup("nomce", mcheck_disable);
__setup("mce", mcheck_enable);
#include <linux/init.h>
void amd_mcheck_init(struct cpuinfo_x86 *c);
void intel_p4_mcheck_init(struct cpuinfo_x86 *c);
void intel_p5_mcheck_init(struct cpuinfo_x86 *c);
void intel_p6_mcheck_init(struct cpuinfo_x86 *c);
void winchip_mcheck_init(struct cpuinfo_x86 *c);
void init_nonfatal_mce_checker(void);
/* Call the installed machine check handler for this CPU setup. */
extern void (*machine_check_vector)(struct pt_regs *, long error_code);
extern int mce_disabled __initdata;
extern int nr_mce_banks;
/*
* P4 specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/config.h>
#include <linux/irq.h>
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
static struct timer_list mce_timer;
static int timerset;
#define MCE_RATE 15*HZ /* timer rate is 15s */
static void mce_checkregs (void *info)
{
u32 low, high;
int i;
preempt_disable();
for (i=0; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4, low, high);
if (high & (1<<31)) {
printk (KERN_EMERG "MCE: The hardware reports a non fatal, correctable incident occured on CPU %d.\n",
smp_processor_id());
printk (KERN_EMERG "Bank %d: %08x%08x\n", i, high, low);
/* Scrub the error so we don't pick it up in MCE_RATE seconds time. */
wrmsr (MSR_IA32_MC0_STATUS+i*4, 0UL, 0UL);
/* Serialize */
wmb();
}
}
preempt_enable();
}
static void do_mce_timer(void *data)
{
mce_checkregs (NULL);
smp_call_function (mce_checkregs, NULL, 1, 1);
}
static DECLARE_WORK(mce_work, do_mce_timer, NULL);
static void mce_timerfunc (unsigned long data)
{
#ifdef CONFIG_SMP
if (num_online_cpus() > 1)
schedule_work (&mce_work);
#else
mce_checkregs (NULL);
#endif
mce_timer.expires = jiffies + MCE_RATE;
add_timer (&mce_timer);
}
void init_nonfatal_mce_checker()
{
if (timerset == 0) {
/* Set the timer to check for non-fatal
errors every MCE_RATE seconds */
init_timer (&mce_timer);
mce_timer.expires = jiffies + MCE_RATE;
mce_timer.data = 0;
mce_timer.function = &mce_timerfunc;
add_timer (&mce_timer);
timerset = 1;
printk(KERN_INFO "Machine check exception polling timer started.\n");
}
}
/*
* P5 specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
/* Machine check handler for Pentium class Intel */
static void pentium_machine_check(struct pt_regs * regs, long error_code)
{
u32 loaddr, hi, lotype;
rdmsr(MSR_IA32_P5_MC_ADDR, loaddr, hi);
rdmsr(MSR_IA32_P5_MC_TYPE, lotype, hi);
printk(KERN_EMERG "CPU#%d: Machine Check Exception: 0x%8X (type 0x%8X).\n", smp_processor_id(), loaddr, lotype);
if(lotype&(1<<5))
printk(KERN_EMERG "CPU#%d: Possible thermal failure (CPU on fire ?).\n", smp_processor_id());
}
/* Set up machine check reporting for processors with Intel style MCE */
void __init intel_p5_mcheck_init(struct cpuinfo_x86 *c)
{
u32 l, h;
/*Check for MCE support */
if( !cpu_has(c, X86_FEATURE_MCE) )
return;
/* Default P5 to off as its often misconnected */
if(mce_disabled != -1)
return;
machine_check_vector = pentium_machine_check;
wmb();
/* Read registers before enabling */
rdmsr(MSR_IA32_P5_MC_ADDR, l, h);
rdmsr(MSR_IA32_P5_MC_TYPE, l, h);
printk(KERN_INFO "Intel old style machine check architecture supported.\n");
/* Enable MCE */
set_in_cr4(X86_CR4_MCE);
printk(KERN_INFO "Intel old style machine check reporting enabled on CPU#%d.\n", smp_processor_id());
}
/*
* P6 specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/smp.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
/* Machine Check Handler For PII/PIII */
static void intel_machine_check(struct pt_regs * regs, long error_code)
{
int recover=1;
u32 alow, ahigh, high, low;
u32 mcgstl, mcgsth;
int i;
rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth);
if (mcgstl & (1<<0)) /* Recoverable ? */
recover=0;
printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
smp_processor_id(), mcgsth, mcgstl);
for (i=0; i<nr_mce_banks; i++) {
rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
if (high & (1<<31)) {
if (high & (1<<29))
recover |= 1;
if (high & (1<<25))
recover |= 2;
printk (KERN_EMERG "Bank %d: %08x%08x", i, high, low);
high &= ~(1<<31);
if (high & (1<<27)) {
rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
printk ("[%08x%08x]", ahigh, alow);
}
if (high & (1<<26)) {
rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
printk (" at %08x%08x", ahigh, alow);
}
printk ("\n");
}
}
if (recover & 2)
panic ("CPU context corrupt");
if (recover & 1)
panic ("Unable to continue");
printk (KERN_EMERG "Attempting to continue.\n");
/*
* Do not clear the MSR_IA32_MCi_STATUS if the error is not
* recoverable/continuable.This will allow BIOS to look at the MSRs
* for errors if the OS could not log the error.
*/
for (i=0; i<nr_mce_banks; i++) {
unsigned int msr;
msr = MSR_IA32_MC0_STATUS+i*4;
rdmsr (msr,low, high);
if (high & (1<<31)) {
/* Clear it */
wrmsr (msr, 0UL, 0UL);
/* Serialize */
wmb();
}
}
mcgstl &= ~(1<<2);
wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth);
}
/* Set up machine check reporting for processors with Intel style MCE */
void __init intel_p6_mcheck_init(struct cpuinfo_x86 *c)
{
u32 l, h;
int i;
/* Check for MCE support */
if (!cpu_has(c, X86_FEATURE_MCE))
return;
/* Check for PPro style MCA */
if (!cpu_has(c, X86_FEATURE_MCA))
return;
/* Ok machine check is available */
machine_check_vector = intel_machine_check;
wmb();
printk (KERN_INFO "Intel machine check architecture supported.\n");
rdmsr (MSR_IA32_MCG_CAP, l, h);
if (l & (1<<8)) /* Control register present ? */
wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff);
nr_mce_banks = l & 0xff;
/* Don't enable bank 0 on intel P6 cores, it goes bang quickly. */
for (i=1; i<nr_mce_banks; i++) {
wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff);
wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0);
}
set_in_cr4 (X86_CR4_MCE);
printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n",
smp_processor_id());
}
/*
* IDT Winchip specific Machine Check Exception Reporting
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <asm/processor.h>
#include <asm/system.h>
#include <asm/msr.h>
#include "mce.h"
/* Machine check handler for WinChip C6 */
static void winchip_machine_check(struct pt_regs * regs, long error_code)
{
printk(KERN_EMERG "CPU0: Machine Check Exception.\n");
}
/* Set up machine check reporting on the Winchip C6 series */
void __init winchip_mcheck_init(struct cpuinfo_x86 *c)
{
u32 lo, hi;
machine_check_vector = winchip_machine_check;
wmb();
rdmsr(MSR_IDT_FCR1, lo, hi);
lo|= (1<<2); /* Enable EIERRINT (int 18 MCE) */
lo&= ~(1<<4); /* Enable MCE */
wrmsr(MSR_IDT_FCR1, lo, hi);
set_in_cr4(X86_CR4_MCE);
printk(KERN_INFO "Winchip machine check reporting enabled on CPU#0.\n");
}
...@@ -471,10 +471,12 @@ ENTRY(page_fault) ...@@ -471,10 +471,12 @@ ENTRY(page_fault)
pushl $do_page_fault pushl $do_page_fault
jmp error_code jmp error_code
#ifdef CONFIG_X86_MCE
ENTRY(machine_check) ENTRY(machine_check)
pushl $0 pushl $0
pushl $do_machine_check pushl $do_machine_check
jmp error_code jmp error_code
#endif
ENTRY(spurious_interrupt_bug) ENTRY(spurious_interrupt_bug)
pushl $0 pushl $0
......
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
#include <asm/arch_hooks.h> #include <asm/arch_hooks.h>
extern spinlock_t i8259A_lock; extern spinlock_t i8259A_lock;
int pit_latch_buggy; /* extern */
#include "do_timer.h" #include "do_timer.h"
......
...@@ -60,6 +60,8 @@ static unsigned long get_offset_tsc(void) ...@@ -60,6 +60,8 @@ static unsigned long get_offset_tsc(void)
static void mark_offset_tsc(void) static void mark_offset_tsc(void)
{ {
int count; int count;
int countmp;
static int count1=0, count2=LATCH;
/* /*
* It is important that these two operations happen almost at * It is important that these two operations happen almost at
* the same time. We do the RDTSC stuff first, since it's * the same time. We do the RDTSC stuff first, since it's
...@@ -83,6 +85,20 @@ static void mark_offset_tsc(void) ...@@ -83,6 +85,20 @@ static void mark_offset_tsc(void)
count |= inb(0x40) << 8; count |= inb(0x40) << 8;
spin_unlock(&i8253_lock); spin_unlock(&i8253_lock);
if (pit_latch_buggy) {
/* get center value of last 3 time lutch */
if ((count2 >= count && count >= count1)
|| (count1 >= count && count >= count2)) {
count2 = count1; count1 = count;
} else if ((count1 >= count2 && count2 >= count)
|| (count >= count2 && count2 >= count1)) {
countmp = count;count = count2;
count2 = count1;count1 = countmp;
} else {
count2 = count1; count1 = count; count = count1;
}
}
count = ((LATCH-1) - count) * TICK_SIZE; count = ((LATCH-1) - count) * TICK_SIZE;
delay_at_last_interrupt = (count + LATCH/2) / LATCH; delay_at_last_interrupt = (count + LATCH/2) / LATCH;
} }
...@@ -111,10 +127,12 @@ static unsigned long __init calibrate_tsc(void) ...@@ -111,10 +127,12 @@ static unsigned long __init calibrate_tsc(void)
* Set the Gate high, program CTC channel 2 for mode 0, * Set the Gate high, program CTC channel 2 for mode 0,
* (interrupt on terminal count mode), binary count, * (interrupt on terminal count mode), binary count,
* load 5 * LATCH count, (LSB and MSB) to begin countdown. * load 5 * LATCH count, (LSB and MSB) to begin countdown.
*
* Some devices need a delay here.
*/ */
outb(0xb0, 0x43); /* binary, mode 0, LSB/MSB, Ch 2 */ outb(0xb0, 0x43); /* binary, mode 0, LSB/MSB, Ch 2 */
outb(CALIBRATE_LATCH & 0xff, 0x42); /* LSB of count */ outb_p(CALIBRATE_LATCH & 0xff, 0x42); /* LSB of count */
outb(CALIBRATE_LATCH >> 8, 0x42); /* MSB of count */ outb_p(CALIBRATE_LATCH >> 8, 0x42); /* MSB of count */
{ {
unsigned long startlow, starthigh; unsigned long startlow, starthigh;
...@@ -238,8 +256,6 @@ static int init_tsc(void) ...@@ -238,8 +256,6 @@ static int init_tsc(void)
* moaned if you have the only one in the world - you fix it! * moaned if you have the only one in the world - you fix it!
*/ */
dodgy_tsc();
if (cpu_has_tsc) { if (cpu_has_tsc) {
unsigned long tsc_quotient = calibrate_tsc(); unsigned long tsc_quotient = calibrate_tsc();
if (tsc_quotient) { if (tsc_quotient) {
......
...@@ -906,7 +906,9 @@ void __init trap_init(void) ...@@ -906,7 +906,9 @@ void __init trap_init(void)
set_trap_gate(15,&spurious_interrupt_bug); set_trap_gate(15,&spurious_interrupt_bug);
set_trap_gate(16,&coprocessor_error); set_trap_gate(16,&coprocessor_error);
set_trap_gate(17,&alignment_check); set_trap_gate(17,&alignment_check);
#ifdef CONFIG_X86_MCE
set_trap_gate(18,&machine_check); set_trap_gate(18,&machine_check);
#endif
set_trap_gate(19,&simd_coprocessor_error); set_trap_gate(19,&simd_coprocessor_error);
set_system_gate(SYSCALL_VECTOR,&system_call); set_system_gate(SYSCALL_VECTOR,&system_call);
......
...@@ -3139,12 +3139,12 @@ static int sbp2scsi_reset (Scsi_Cmnd *SCpnt) ...@@ -3139,12 +3139,12 @@ static int sbp2scsi_reset (Scsi_Cmnd *SCpnt)
*/ */
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44)
static int sbp2scsi_biosparam (struct scsi_device *sdev, static int sbp2scsi_biosparam (struct scsi_device *sdev,
struct block_device *dev, sector_t capacy, int geom[]) struct block_device *dev, sector_t capacity, int geom[])
{ {
#else #else
static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]) static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[])
{ {
sector_t capacy = disk->capacity; sector_t capacity = disk->capacity;
#endif #endif
int heads, sectors, cylinders; int heads, sectors, cylinders;
......
...@@ -549,10 +549,10 @@ static int sbp2_max_speed_and_size(struct sbp2scsi_host_info *hi, struct scsi_id ...@@ -549,10 +549,10 @@ static int sbp2_max_speed_and_size(struct sbp2scsi_host_info *hi, struct scsi_id
static int sbp2scsi_detect (Scsi_Host_Template *tpnt); static int sbp2scsi_detect (Scsi_Host_Template *tpnt);
static const char *sbp2scsi_info (struct Scsi_Host *host); static const char *sbp2scsi_info (struct Scsi_Host *host);
void sbp2scsi_setup(char *str, int *ints); void sbp2scsi_setup(char *str, int *ints);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,44)
static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]); static int sbp2scsi_biosparam (struct scsi_device *sdev, struct block_device *dev, sector_t capacity, int geom[]);
#else #else
static int sbp2scsi_biosparam (Scsi_Disk *disk, struct block_device *dev, int geom[]); static int sbp2scsi_biosparam (Scsi_Disk *disk, kdev_t dev, int geom[]);
#endif #endif
static int sbp2scsi_abort (Scsi_Cmnd *SCpnt); static int sbp2scsi_abort (Scsi_Cmnd *SCpnt);
static int sbp2scsi_reset (Scsi_Cmnd *SCpnt); static int sbp2scsi_reset (Scsi_Cmnd *SCpnt);
......
This diff is collapsed.
...@@ -677,22 +677,6 @@ static void wait_intr(void) ...@@ -677,22 +677,6 @@ static void wait_intr(void)
NCR53c406a_intr(0, NULL, NULL); NCR53c406a_intr(0, NULL, NULL);
} }
static int NCR53c406a_command(Scsi_Cmnd * SCpnt)
{
DEB(printk("NCR53c406a_command called\n"));
NCR53c406a_queue(SCpnt, internal_done);
if (irq_level)
while (!internal_done_flag)
cpu_relax();
else /* interrupts not supported */
while (!internal_done_flag)
wait_intr();
internal_done_flag = 0;
return internal_done_errcode;
}
static int NCR53c406a_queue(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *)) static int NCR53c406a_queue(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
{ {
int i; int i;
...@@ -726,6 +710,21 @@ static int NCR53c406a_queue(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *)) ...@@ -726,6 +710,21 @@ static int NCR53c406a_queue(Scsi_Cmnd * SCpnt, void (*done) (Scsi_Cmnd *))
return 0; return 0;
} }
static int NCR53c406a_command(Scsi_Cmnd * SCpnt)
{
DEB(printk("NCR53c406a_command called\n"));
NCR53c406a_queue(SCpnt, internal_done);
if (irq_level)
while (!internal_done_flag)
cpu_relax();
else /* interrupts not supported */
while (!internal_done_flag)
wait_intr();
internal_done_flag = 0;
return internal_done_errcode;
}
static int NCR53c406a_abort(Scsi_Cmnd * SCpnt) static int NCR53c406a_abort(Scsi_Cmnd * SCpnt)
{ {
DEB(printk("NCR53c406a_abort called\n")); DEB(printk("NCR53c406a_abort called\n"));
...@@ -755,7 +754,7 @@ static int NCR53c406a_bus_reset(Scsi_Cmnd * SCpnt) ...@@ -755,7 +754,7 @@ static int NCR53c406a_bus_reset(Scsi_Cmnd * SCpnt)
return FAILED; return FAILED;
} }
static int NCR53c406a_biosparm(struct scsi_disk *disk, static int NCR53c406a_biosparm(struct scsi_device *disk,
struct block_device *dev, struct block_device *dev,
sector_t capacity, int *info_array) sector_t capacity, int *info_array)
{ {
...@@ -1065,8 +1064,30 @@ static void __init calc_port_addr(void) ...@@ -1065,8 +1064,30 @@ static void __init calc_port_addr(void)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* Eventually this will go into an include file, but this will be later */ /* NOTE: scatter-gather support only works in PIO mode.
static Scsi_Host_Template driver_template = NCR53c406a; * Use SG_NONE if DMA mode is enabled!
*/
static Scsi_Host_Template driver_template =
{
proc_name: "NCR53c406a" /* proc_name */,
name: "NCR53c406a" /* name */,
detect: NCR53c406a_detect /* detect */,
info: NCR53c406a_info /* info */,
command: NCR53c406a_command /* command */,
queuecommand: NCR53c406a_queue /* queuecommand */,
eh_abort_handler: NCR53c406a_abort /* abort */,
eh_bus_reset_handler: NCR53c406a_bus_reset /* reset */,
eh_device_reset_handler: NCR53c406a_device_reset /* reset */,
eh_host_reset_handler: NCR53c406a_host_reset /* reset */,
bios_param: NCR53c406a_biosparm /* biosparm */,
can_queue: 1 /* can_queue */,
this_id: 7 /* SCSI ID of the chip */,
sg_tablesize: 32 /*SG_ALL*/ /*SG_NONE*/,
cmd_per_lun: 1 /* commands per lun */,
unchecked_isa_dma: 1 /* unchecked_isa_dma */,
use_clustering: ENABLE_CLUSTERING
};
#include "scsi_module.c" #include "scsi_module.c"
......
#ifndef _NCR53C406A_H
#define _NCR53C406A_H
/*
* NCR53c406a.h
*
* Copyright (C) 1994 Normunds Saumanis (normunds@rx.tech.swh.lv)
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2, or (at your option) any
* later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
*/
#ifndef NULL
#define NULL 0
#endif
/* NOTE: scatter-gather support only works in PIO mode.
* Use SG_NONE if DMA mode is enabled!
*/
#define NCR53c406a { \
proc_name: "NCR53c406a" /* proc_name */, \
name: "NCR53c406a" /* name */, \
detect: NCR53c406a_detect /* detect */, \
info: NCR53c406a_info /* info */, \
command: NCR53c406a_command /* command */, \
queuecommand: NCR53c406a_queue /* queuecommand */, \
eh_abort_handler: NCR53c406a_abort /* abort */, \
eh_bus_reset_handler: NCR53c406a_bus_reset /* reset */, \
eh_device_reset_handler: NCR53c406a_device_reset /* reset */, \
eh_host_reset_handler: NCR53c406a_host_reset /* reset */, \
bios_param: NCR53c406a_biosparm /* biosparm */, \
can_queue: 1 /* can_queue */, \
this_id: 7 /* SCSI ID of the chip */, \
sg_tablesize: 32 /*SG_ALL*/ /*SG_NONE*/, \
cmd_per_lun: 1 /* commands per lun */, \
unchecked_isa_dma: 1 /* unchecked_isa_dma */, \
use_clustering: ENABLE_CLUSTERING \
}
static int NCR53c406a_detect(Scsi_Host_Template *);
static const char *NCR53c406a_info(struct Scsi_Host *);
static int NCR53c406a_command(Scsi_Cmnd *);
static int NCR53c406a_queue(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
static int NCR53c406a_abort(Scsi_Cmnd *);
static int NCR53c406a_bus_reset(Scsi_Cmnd *);
static int NCR53c406a_device_reset(Scsi_Cmnd *);
static int NCR53c406a_host_reset(Scsi_Cmnd *);
static int NCR53c406a_biosparm(Disk *, struct block_device *, sector_t, int[]);
#endif /* _NCR53C406A_H */
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
* *
* aha1740_makecode may still need even more work * aha1740_makecode may still need even more work
* if it doesn't work for your devices, take a look. * if it doesn't work for your devices, take a look.
*
* Reworked for new_eh and new locking by Alan Cox <alan@redhat.com>
*
* For the avoidance of doubt the "preferred form" of this code is one which
* is in an open non patent encumbered format. Where cryptographic key signing
* forms part of the process of creating an executable the information
* including keys needed to generate an equivalently functional executable
* are deemed to be part of the source code.
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -68,7 +76,7 @@ static spinlock_t aha1740_lock = SPIN_LOCK_UNLOCKED; ...@@ -68,7 +76,7 @@ static spinlock_t aha1740_lock = SPIN_LOCK_UNLOCKED;
/* One for each IRQ level (9-15) */ /* One for each IRQ level (9-15) */
static struct Scsi_Host * aha_host[8] = {NULL, }; static struct Scsi_Host * aha_host[8] = {NULL, };
int aha1740_proc_info(char *buffer, char **start, off_t offset, static int aha1740_proc_info(char *buffer, char **start, off_t offset,
int length, int hostno, int inout) int length, int hostno, int inout)
{ {
int len; int len;
...@@ -76,7 +84,7 @@ int aha1740_proc_info(char *buffer, char **start, off_t offset, ...@@ -76,7 +84,7 @@ int aha1740_proc_info(char *buffer, char **start, off_t offset,
struct aha1740_hostdata *host; struct aha1740_hostdata *host;
if (inout) if (inout)
return(-ENOSYS); return-ENOSYS;
for (len = 0; len < 8; len++) { for (len = 0; len < 8; len++) {
shpnt = aha_host[len]; shpnt = aha_host[len];
...@@ -103,7 +111,7 @@ int aha1740_proc_info(char *buffer, char **start, off_t offset, ...@@ -103,7 +111,7 @@ int aha1740_proc_info(char *buffer, char **start, off_t offset,
} }
int aha1740_makecode(unchar *sense, unchar *status) static int aha1740_makecode(unchar *sense, unchar *status)
{ {
struct statusword struct statusword
{ {
...@@ -179,7 +187,7 @@ int aha1740_makecode(unchar *sense, unchar *status) ...@@ -179,7 +187,7 @@ int aha1740_makecode(unchar *sense, unchar *status)
return status[3] | retval << 16; return status[3] | retval << 16;
} }
int aha1740_test_port(unsigned int base) static int aha1740_test_port(unsigned int base)
{ {
char name[4], tmp; char name[4], tmp;
...@@ -212,7 +220,7 @@ int aha1740_test_port(unsigned int base) ...@@ -212,7 +220,7 @@ int aha1740_test_port(unsigned int base)
} }
/* A "high" level interrupt handler */ /* A "high" level interrupt handler */
void aha1740_intr_handle(int irq, void *dev_id, struct pt_regs * regs) static void aha1740_intr_handle(int irq, void *dev_id, struct pt_regs * regs)
{ {
struct Scsi_Host *host = aha_host[irq - 9]; struct Scsi_Host *host = aha_host[irq - 9];
void (*my_done)(Scsi_Cmnd *); void (*my_done)(Scsi_Cmnd *);
...@@ -303,7 +311,7 @@ void aha1740_intr_handle(int irq, void *dev_id, struct pt_regs * regs) ...@@ -303,7 +311,7 @@ void aha1740_intr_handle(int irq, void *dev_id, struct pt_regs * regs)
spin_unlock_irqrestore(host->host_lock, flags); spin_unlock_irqrestore(host->host_lock, flags);
} }
int aha1740_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *)) static int aha1740_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *))
{ {
unchar direction; unchar direction;
unchar *cmd = (unchar *) SCpnt->cmnd; unchar *cmd = (unchar *) SCpnt->cmnd;
...@@ -317,16 +325,6 @@ int aha1740_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *)) ...@@ -317,16 +325,6 @@ int aha1740_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *))
if(*cmd == REQUEST_SENSE) if(*cmd == REQUEST_SENSE)
{ {
#if 0
/* scsi_request_sense() provides a buffer of size 256,
so there is no reason to expect equality */
if (bufflen != sizeof(SCpnt->sense_buffer))
{
printk("Wrong buffer length supplied for request sense (%d)\n",
bufflen);
}
#endif
SCpnt->result = 0; SCpnt->result = 0;
done(SCpnt); done(SCpnt);
return 0; return 0;
...@@ -486,7 +484,7 @@ static void internal_done(Scsi_Cmnd * SCpnt) ...@@ -486,7 +484,7 @@ static void internal_done(Scsi_Cmnd * SCpnt)
SCpnt->SCp.Status++; SCpnt->SCp.Status++;
} }
int aha1740_command(Scsi_Cmnd * SCpnt) static int aha1740_command(Scsi_Cmnd * SCpnt)
{ {
aha1740_queuecommand(SCpnt, internal_done); aha1740_queuecommand(SCpnt, internal_done);
SCpnt->SCp.Status = 0; SCpnt->SCp.Status = 0;
...@@ -501,7 +499,7 @@ int aha1740_command(Scsi_Cmnd * SCpnt) ...@@ -501,7 +499,7 @@ int aha1740_command(Scsi_Cmnd * SCpnt)
/* Query the board for its irq_level. Nothing else matters /* Query the board for its irq_level. Nothing else matters
in enhanced mode on an EISA bus. */ in enhanced mode on an EISA bus. */
void aha1740_getconfig(unsigned int base, unsigned int *irq_level, static void aha1740_getconfig(unsigned int base, unsigned int *irq_level,
unsigned int *translation) unsigned int *translation)
{ {
static int intab[] = { 9, 10, 11, 12, 0, 14, 15, 0 }; static int intab[] = { 9, 10, 11, 12, 0, 14, 15, 0 };
...@@ -511,7 +509,7 @@ void aha1740_getconfig(unsigned int base, unsigned int *irq_level, ...@@ -511,7 +509,7 @@ void aha1740_getconfig(unsigned int base, unsigned int *irq_level,
outb(inb(INTDEF(base)) | 0x10, INTDEF(base)); outb(inb(INTDEF(base)) | 0x10, INTDEF(base));
} }
int aha1740_detect(Scsi_Host_Template * tpnt) static int aha1740_detect(Scsi_Host_Template * tpnt)
{ {
int count = 0, slot; int count = 0, slot;
...@@ -540,8 +538,8 @@ int aha1740_detect(Scsi_Host_Template * tpnt) ...@@ -540,8 +538,8 @@ int aha1740_detect(Scsi_Host_Template * tpnt)
outb(G2CNTRL_HRST, G2CNTRL(slotbase)); outb(G2CNTRL_HRST, G2CNTRL(slotbase));
outb(0, G2CNTRL(slotbase)); outb(0, G2CNTRL(slotbase));
} }
printk("Configuring aha174x at IO:%x, IRQ %d\n", slotbase, irq_level); printk(KERN_INFO "Configuring aha174x at IO:%x, IRQ %d\n", slotbase, irq_level);
printk("aha174x: Extended translation %sabled.\n", printk(KERN_INFO "aha174x: Extended translation %sabled.\n",
translation ? "en" : "dis"); translation ? "en" : "dis");
DEB(printk("aha1740_detect: enable interrupt channel %d\n",irq_level)); DEB(printk("aha1740_detect: enable interrupt channel %d\n",irq_level));
if (request_irq(irq_level,aha1740_intr_handle,0,"aha1740",NULL)) { if (request_irq(irq_level,aha1740_intr_handle,0,"aha1740",NULL)) {
...@@ -572,31 +570,7 @@ int aha1740_detect(Scsi_Host_Template * tpnt) ...@@ -572,31 +570,7 @@ int aha1740_detect(Scsi_Host_Template * tpnt)
return count; return count;
} }
/* Note: They following two functions do not apply very well to the Adaptec, static int aha1740_biosparam(struct scsi_device *sdev, struct block_device *dev,
which basically manages its own affairs quite well without our interference,
so I haven't put anything into them. I can faintly imagine someone with a
*very* badly behaved SCSI target (perhaps an old tape?) wanting the abort(),
but it hasn't happened yet, and doing aborts brings the Adaptec to its
knees. I cannot (at this moment in time) think of any reason to reset the
card once it's running. So there. */
int aha1740_abort(Scsi_Cmnd * SCpnt)
{
DEB(printk("aha1740_abort called\n"));
return SCSI_ABORT_SNOOZE;
}
/* We do not implement a reset function here, but the upper level code assumes
that it will get some kind of response for the command in SCpnt. We must
oblige, or the command will hang the scsi system */
int aha1740_reset(Scsi_Cmnd * SCpnt, unsigned int ignored)
{
DEB(printk("aha1740_reset called\n"));
return SCSI_RESET_PUNT;
}
int aha1740_biosparam(struct scsi_device *sdev, struct block_device *dev,
sector_t capacity, int* ip) sector_t capacity, int* ip)
{ {
int size = capacity; int size = capacity;
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include <linux/types.h> #include <linux/types.h>
/* Eisa Enhanced mode operation - slot locating and addressing */ /* Eisa Enhanced mode operation - slot locating and addressing */
#define MINEISA 1 /* I don't have an EISA Spec to know these ranges, so I */ #define MINEISA 1 /* I don't have an EISA Spec to know these ranges, so I */
#define MAXEISA 8 /* Just took my machine's specifications. Adjust to fit.*/ #define MAXEISA 8 /* Just took my machine's specifications. Adjust to fit. */
/* I just saw an ad, and bumped this from 6 to 8 */ /* I just saw an ad, and bumped this from 6 to 8 */
#define SLOTBASE(x) ((x << 12) + 0xc80) #define SLOTBASE(x) ((x << 12) + 0xc80)
#define SLOTSIZE 0x5c #define SLOTSIZE 0x5c
...@@ -75,14 +75,14 @@ ...@@ -75,14 +75,14 @@
#define ATTN_START 0x40 /* Start CCB */ #define ATTN_START 0x40 /* Start CCB */
#define ATTN_ABORT 0x50 /* Abort CCB */ #define ATTN_ABORT 0x50 /* Abort CCB */
#define G2CNTRL_HRST 0x80 /* Hard Reset */ #define G2CNTRL_HRST 0x80 /* Hard Reset */
#define G2CNTRL_IRST 0x40 /* Clear EISA Interrupt */ #define G2CNTRL_IRST 0x40 /* Clear EISA Interrupt */
#define G2CNTRL_HRDY 0x20 /* Sets HOST ready */ #define G2CNTRL_HRDY 0x20 /* Sets HOST ready */
/* This is used with scatter-gather */ /* This is used with scatter-gather */
struct aha1740_chain { struct aha1740_chain {
u32 dataptr; /* Location of data */ u32 dataptr; /* Location of data */
u32 datalen; /* Size of this part of chain */ u32 datalen; /* Size of this part of chain */
}; };
/* These belong in scsi.h */ /* These belong in scsi.h */
...@@ -107,40 +107,40 @@ struct aha1740_chain { ...@@ -107,40 +107,40 @@ struct aha1740_chain {
#define MAX_STATUS 32 #define MAX_STATUS 32
struct ecb { /* Enhanced Control Block 6.1 */ struct ecb { /* Enhanced Control Block 6.1 */
u16 cmdw; /* Command Word */ u16 cmdw; /* Command Word */
/* Flag Word 1 */ /* Flag Word 1 */
u16 cne:1, /* Control Block Chaining */ u16 cne:1, /* Control Block Chaining */
:6, di:1, /* Disable Interrupt */ :6, di:1, /* Disable Interrupt */
:2, ses:1, /* Suppress Underrun error */ :2, ses:1, /* Suppress Underrun error */
:1, sg:1, /* Scatter/Gather */ :1, sg:1, /* Scatter/Gather */
:1, dsb:1, /* Disable Status Block */ :1, dsb:1, /* Disable Status Block */
ars:1; /* Automatic Request Sense */ ars:1; /* Automatic Request Sense */
/* Flag Word 2 */ /* Flag Word 2 */
u16 lun:3, /* Logical Unit */ u16 lun:3, /* Logical Unit */
tag:1, /* Tagged Queuing */ tag:1, /* Tagged Queuing */
tt:2, /* Tag Type */ tt:2, /* Tag Type */
nd:1, /* No Disconnect */ nd:1, /* No Disconnect */
:1, dat:1, /* Data transfer - check direction */ :1, dat:1, /* Data transfer - check direction */
dir:1, /* Direction of transfer 1 = datain */ dir:1, /* Direction of transfer 1 = datain */
st:1, /* Suppress Transfer */ st:1, /* Suppress Transfer */
chk:1, /* Calculate Checksum */ chk:1, /* Calculate Checksum */
:2, rec:1, :1; /* Error Recovery */ :2, rec:1,:1; /* Error Recovery */
u16 nil0; /* nothing */ u16 nil0; /* nothing */
u32 dataptr; /* Data or Scatter List ptr */ u32 dataptr; /* Data or Scatter List ptr */
u32 datalen; /* Data or Scatter List len */ u32 datalen; /* Data or Scatter List len */
u32 statusptr; /* Status Block ptr */ u32 statusptr; /* Status Block ptr */
u32 linkptr; /* Chain Address */ u32 linkptr; /* Chain Address */
u32 nil1; /* nothing */ u32 nil1; /* nothing */
u32 senseptr; /* Sense Info Pointer */ u32 senseptr; /* Sense Info Pointer */
u8 senselen; /* Sense Length */ u8 senselen; /* Sense Length */
u8 cdblen; /* CDB Length */ u8 cdblen; /* CDB Length */
u16 datacheck; /* Data checksum */ u16 datacheck; /* Data checksum */
u8 cdb[MAX_CDB]; /* CDB area */ u8 cdb[MAX_CDB]; /* CDB area */
/* Hardware defined portion ends here, rest is driver defined */ /* Hardware defined portion ends here, rest is driver defined */
u8 sense[MAX_SENSE]; /* Sense area */ u8 sense[MAX_SENSE]; /* Sense area */
u8 status[MAX_STATUS]; /* Status area */ u8 status[MAX_STATUS]; /* Status area */
Scsi_Cmnd *SCpnt; /* Link to the SCSI Command Block */ Scsi_Cmnd *SCpnt; /* Link to the SCSI Command Block */
void (*done)(Scsi_Cmnd *); /* Completion Function */ void (*done) (Scsi_Cmnd *); /* Completion Function */
}; };
#define AHA1740CMD_NOP 0x00 /* No OP */ #define AHA1740CMD_NOP 0x00 /* No OP */
...@@ -152,32 +152,22 @@ struct ecb { /* Enhanced Control Block 6.1 */ ...@@ -152,32 +152,22 @@ struct ecb { /* Enhanced Control Block 6.1 */
#define AHA1740CMD_RINQ 0x0a /* Read Host Adapter Inquiry Data */ #define AHA1740CMD_RINQ 0x0a /* Read Host Adapter Inquiry Data */
#define AHA1740CMD_TARG 0x10 /* Target SCSI Command */ #define AHA1740CMD_TARG 0x10 /* Target SCSI Command */
int aha1740_detect(Scsi_Host_Template *); static int aha1740_detect(Scsi_Host_Template *);
int aha1740_command(Scsi_Cmnd *); static int aha1740_command(Scsi_Cmnd *);
int aha1740_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int aha1740_queuecommand(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
int aha1740_abort(Scsi_Cmnd *); static int aha1740_biosparam(struct scsi_device *, struct block_device *, sector_t, int *);
int aha1740_reset(Scsi_Cmnd *, unsigned int); static int aha1740_proc_info(char *buffer, char **start, off_t offset, int length, int hostno, int inout);
int aha1740_biosparam(struct scsi_device *, struct block_device *,
sector_t, int*);
int aha1740_proc_info(char *buffer, char **start, off_t offset,
int length, int hostno, int inout);
#define AHA1740_ECBS 32 #define AHA1740_ECBS 32
#define AHA1740_SCATTER 16 #define AHA1740_SCATTER 16
#define AHA1740_CMDLUN 1 #define AHA1740_CMDLUN 1
#ifndef NULL
#define NULL 0
#endif
#define AHA1740 { proc_name: "aha1740", \ #define AHA1740 { proc_name: "aha1740", \
proc_info: aha1740_proc_info, \ proc_info: aha1740_proc_info, \
name: "Adaptec 174x (EISA)", \ name: "Adaptec 174x (EISA)", \
detect: aha1740_detect, \ detect: aha1740_detect, \
command: aha1740_command, \ command: aha1740_command, \
queuecommand: aha1740_queuecommand, \ queuecommand: aha1740_queuecommand, \
abort: aha1740_abort, \
reset: aha1740_reset, \
bios_param: aha1740_biosparam, \ bios_param: aha1740_biosparam, \
can_queue: AHA1740_ECBS, \ can_queue: AHA1740_ECBS, \
this_id: 7, \ this_id: 7, \
......
...@@ -476,7 +476,6 @@ MODULE_AUTHOR("Dario Ballabio"); ...@@ -476,7 +476,6 @@ MODULE_AUTHOR("Dario Ballabio");
#include <linux/blk.h> #include <linux/blk.h>
#include "scsi.h" #include "scsi.h"
#include "hosts.h" #include "hosts.h"
#include "sd.h"
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/irq.h> #include <asm/irq.h>
#include "eata.h" #include "eata.h"
...@@ -1838,7 +1837,7 @@ int eata2x_bios_param(struct scsi_device *sdev, struct block_device *bdev, ...@@ -1838,7 +1837,7 @@ int eata2x_bios_param(struct scsi_device *sdev, struct block_device *bdev,
sector_t capacity, int *dkinfo) { sector_t capacity, int *dkinfo) {
int size = capacity; int size = capacity;
if (ext_tran || (scsicam_bios_param(disk, bdev, dkinfo) < 0)) { if (ext_tran || (scsicam_bios_param(bdev, capacity, dkinfo) < 0)) {
dkinfo[0] = 255; dkinfo[0] = 255;
dkinfo[1] = 63; dkinfo[1] = 63;
dkinfo[2] = size / (dkinfo[0] * dkinfo[1]); dkinfo[2] = size / (dkinfo[0] * dkinfo[1]);
......
...@@ -18,8 +18,6 @@ static int eata2x_slave_attach(Scsi_Device *); ...@@ -18,8 +18,6 @@ static int eata2x_slave_attach(Scsi_Device *);
detect: eata2x_detect, \ detect: eata2x_detect, \
release: eata2x_release, \ release: eata2x_release, \
queuecommand: eata2x_queuecommand, \ queuecommand: eata2x_queuecommand, \
abort: NULL, \
reset: NULL, \
eh_abort_handler: eata2x_eh_abort, \ eh_abort_handler: eata2x_eh_abort, \
eh_device_reset_handler: NULL, \ eh_device_reset_handler: NULL, \
eh_bus_reset_handler: NULL, \ eh_bus_reset_handler: NULL, \
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* Header file for eata_pio.c Linux EATA-PIO SCSI driver * * Header file for eata_pio.c Linux EATA-PIO SCSI driver *
* (c) 1993-96 Michael Neuffer * * (c) 1993-96 Michael Neuffer *
********************************************************* *********************************************************
* last change: 96/05/05 * * last change: 2002/11/02 *
********************************************************/ ********************************************************/
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "hosts.h" #include "hosts.h"
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#ifndef HOSTS_C
#include "eata_generic.h" #include "eata_generic.h"
#define VER_MAJOR 0 #define VER_MAJOR 0
...@@ -25,82 +24,55 @@ ...@@ -25,82 +24,55 @@
* Here you can switch parts of the code on and of * * Here you can switch parts of the code on and of *
************************************************************************/ ************************************************************************/
#define VERBOSE_SETUP /* show startup screen of 2001 */ #define VERBOSE_SETUP /* show startup screen of 2001 */
#define ALLOW_DMA_BOARDS 1 #define ALLOW_DMA_BOARDS 1
/************************************************************************ /************************************************************************
* Debug options. * * Debug options. *
* Enable DEBUG and whichever options you require. * * Enable DEBUG and whichever options you require. *
************************************************************************/ ************************************************************************/
#define DEBUG_EATA 1 /* Enable debug code. */ #define DEBUG_EATA 1 /* Enable debug code. */
#define DPT_DEBUG 0 /* Bobs special */ #define DPT_DEBUG 0 /* Bobs special */
#define DBG_DELAY 0 /* Build in delays so debug messages can be #define DBG_DELAY 0 /* Build in delays so debug messages can be
* be read before they vanish of the top of * be read before they vanish of the top of
* the screen! * the screen!
*/ */
#define DBG_PROBE 0 /* Debug probe routines. */ #define DBG_PROBE 0 /* Debug probe routines. */
#define DBG_ISA 0 /* Trace ISA routines */ #define DBG_ISA 0 /* Trace ISA routines */
#define DBG_EISA 0 /* Trace EISA routines */ #define DBG_EISA 0 /* Trace EISA routines */
#define DBG_PCI 0 /* Trace PCI routines */ #define DBG_PCI 0 /* Trace PCI routines */
#define DBG_PIO 0 /* Trace get_config_PIO */ #define DBG_PIO 0 /* Trace get_config_PIO */
#define DBG_COM 0 /* Trace command call */ #define DBG_COM 0 /* Trace command call */
#define DBG_QUEUE 0 /* Trace command queueing. */ #define DBG_QUEUE 0 /* Trace command queueing. */
#define DBG_INTR 0 /* Trace interrupt service routine. */ #define DBG_INTR 0 /* Trace interrupt service routine. */
#define DBG_INTR2 0 /* Trace interrupt service routine. */ #define DBG_INTR2 0 /* Trace interrupt service routine. */
#define DBG_PROC 0 /* Debug proc-fs related statistics */ #define DBG_PROC 0 /* Debug proc-fs related statistics */
#define DBG_PROC_WRITE 0 #define DBG_PROC_WRITE 0
#define DBG_REGISTER 0 /* */ #define DBG_REGISTER 0 /* */
#define DBG_ABNORM 1 /* Debug abnormal actions (reset, abort) */ #define DBG_ABNORM 1 /* Debug abnormal actions (reset, abort) */
#if DEBUG_EATA #if DEBUG_EATA
#define DBG(x, y) if ((x)) {y;} #define DBG(x, y) if ((x)) {y;}
#else #else
#define DBG(x, y) #define DBG(x, y)
#endif #endif
#endif /* !HOSTS_C */ static int eata_pio_detect(Scsi_Host_Template *);
static int eata_pio_queue(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
static int eata_pio_abort(Scsi_Cmnd *);
static int eata_pio_host_reset(Scsi_Cmnd *);
static int eata_pio_proc_info(char *, char **, off_t, int, int, int);
static int eata_pio_release(struct Scsi_Host *);
int eata_pio_detect(Scsi_Host_Template *); #define EATA_PIO { \
const char *eata_pio_info(struct Scsi_Host *); proc_info: eata_pio_proc_info, /* procinfo */ \
int eata_pio_command(Scsi_Cmnd *); name: "EATA (Extended Attachment) PIO driver",\
int eata_pio_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); detect: eata_pio_detect, \
int eata_pio_abort(Scsi_Cmnd *); release: eata_pio_release, \
int eata_pio_reset(Scsi_Cmnd *, unsigned int); queuecommand: eata_pio_queue, \
int eata_pio_proc_info(char *, char **, off_t, int, int, int); eh_abort_handler: eata_pio_abort, \
#ifdef MODULE eh_host_reset_handler: eata_pio_host_reset, \
int eata_pio_release(struct Scsi_Host *); use_clustering: ENABLE_CLUSTERING \
#else }
#define eata_pio_release NULL
#endif
#define EATA_PIO { \
proc_info: eata_pio_proc_info, /* procinfo */ \
name: "EATA (Extended Attachment) PIO driver", \
detect: eata_pio_detect, \
release: eata_pio_release, \
queuecommand: eata_pio_queue, \
abort: eata_pio_abort, \
reset: eata_pio_reset, \
unchecked_isa_dma: 1, /* True if ISA */ \
use_clustering: ENABLE_CLUSTERING }
#endif /* _EATA_PIO_H */
/* #endif /* _EATA_PIO_H */
* Overrides for Emacs so that we almost follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-indent-level: 4
* c-brace-imaginary-offset: 0
* c-brace-offset: -4
* c-argdecl-indent: 4
* c-label-offset: -4
* c-continued-statement-offset: 4
* c-continued-brace-offset: 0
* tab-width: 8
* End:
*/
...@@ -1325,118 +1325,115 @@ static int fd_mcs_host_reset(Scsi_Cmnd * SCpnt) ...@@ -1325,118 +1325,115 @@ static int fd_mcs_host_reset(Scsi_Cmnd * SCpnt)
return FAILED; return FAILED;
} }
static int fd_mcs_device_reset(Scsi_Cmnd * SCpnt) { static int fd_mcs_device_reset(Scsi_Cmnd * SCpnt)
return FAILED; {
} return FAILED;
}
static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) { static int fd_mcs_bus_reset(Scsi_Cmnd * SCpnt) {
struct Scsi_Host *shpnt = SCpnt->host; struct Scsi_Host *shpnt = SCpnt->host;
unsigned long flags;
#if DEBUG_RESET #if DEBUG_RESET
static int called_once = 0; static int called_once = 0;
#endif #endif
#if ERRORS_ONLY #if ERRORS_ONLY
if (SCpnt) if (SCpnt)
printk("fd_mcs: SCSI Bus Reset\n"); printk("fd_mcs: SCSI Bus Reset\n");
#endif #endif
#if DEBUG_RESET #if DEBUG_RESET
if (called_once) if (called_once)
fd_mcs_print_info(current_SC); fd_mcs_print_info(current_SC);
called_once = 1; called_once = 1;
#endif #endif
spin_lock_irqsave(shpnt->host_lock, flags); outb(1, SCSI_Cntl_port);
do_pause(2);
outb(1, SCSI_Cntl_port); outb(0, SCSI_Cntl_port);
do_pause(2); do_pause(115);
outb(0, SCSI_Cntl_port); outb(0, SCSI_Mode_Cntl_port);
do_pause(115); outb(PARITY_MASK, TMC_Cntl_port);
outb(0, SCSI_Mode_Cntl_port);
outb(PARITY_MASK, TMC_Cntl_port);
/* Unless this is the very first call (i.e., SCPnt == NULL), everything
is probably hosed at this point. We will, however, try to keep
things going by informing the high-level code that we need help. */
spin_unlock_irqrestore(shpnt->host_lock, flags); /* Unless this is the very first call (i.e., SCPnt == NULL), everything
is probably hosed at this point. We will, however, try to keep
things going by informing the high-level code that we need help. */
return SUCCESS; return SUCCESS;
} }
#include <scsi/scsi_ioctl.h> #include <scsi/scsi_ioctl.h>
static int fd_mcs_biosparam(Scsi_Disk * disk, struct block_device *bdev, static int fd_mcs_biosparam(struct scsi_device * disk, struct block_device *bdev,
sector_t capacity, int *info_array) { sector_t capacity, int *info_array)
unsigned char buf[512 + sizeof(int) * 2]; {
int size = capacity; unsigned char buf[512 + sizeof(int) * 2];
int *sizes = (int *) buf; int size = capacity;
unsigned char *data = (unsigned char *) (sizes + 2); int *sizes = (int *) buf;
unsigned char do_read[] = { READ_6, 0, 0, 0, 1, 0 }; unsigned char *data = (unsigned char *) (sizes + 2);
int retcode; unsigned char do_read[] = { READ_6, 0, 0, 0, 1, 0 };
int retcode;
/* BIOS >= 3.4 for MCA cards */
/* This algorithm was provided by Future Domain (much thanks!). */ /* BIOS >= 3.4 for MCA cards */
/* This algorithm was provided by Future Domain (much thanks!). */
sizes[0] = 0; /* zero bytes out */
sizes[1] = 512; /* one sector in */ sizes[0] = 0; /* zero bytes out */
memcpy(data, do_read, sizeof(do_read)); sizes[1] = 512; /* one sector in */
retcode = kernel_scsi_ioctl(disk->device, SCSI_IOCTL_SEND_COMMAND, (void *) buf); memcpy(data, do_read, sizeof(do_read));
if (!retcode /* SCSI command ok */ retcode = kernel_scsi_ioctl(disk, SCSI_IOCTL_SEND_COMMAND, (void *) buf);
&& data[511] == 0xaa && data[510] == 0x55 /* Partition table valid */ if (!retcode /* SCSI command ok */
&& data[0x1c2]) { /* Partition type */ && data[511] == 0xaa && data[510] == 0x55 /* Partition table valid */
&& data[0x1c2]) { /* Partition type */
/* The partition table layout is as follows: /* The partition table layout is as follows:
Start: 0x1b3h Start: 0x1b3h
Offset: 0 = partition status Offset: 0 = partition status
1 = starting head 1 = starting head
2 = starting sector and cylinder (word, encoded) 2 = starting sector and cylinder (word, encoded)
4 = partition type 4 = partition type
5 = ending head 5 = ending head
6 = ending sector and cylinder (word, encoded) 6 = ending sector and cylinder (word, encoded)
8 = starting absolute sector (double word) 8 = starting absolute sector (double word)
c = number of sectors (double word) c = number of sectors (double word)
Signature: 0x1fe = 0x55aa Signature: 0x1fe = 0x55aa
So, this algorithm assumes: So, this algorithm assumes:
1) the first partition table is in use, 1) the first partition table is in use,
2) the data in the first entry is correct, and 2) the data in the first entry is correct, and
3) partitions never divide cylinders 3) partitions never divide cylinders
Note that (1) may be FALSE for NetBSD (and other BSD flavors), Note that (1) may be FALSE for NetBSD (and other BSD flavors),
as well as for Linux. Note also, that Linux doesn't pay any as well as for Linux. Note also, that Linux doesn't pay any
attention to the fields that are used by this algorithm -- it attention to the fields that are used by this algorithm -- it
only uses the absolute sector data. Recent versions of Linux's only uses the absolute sector data. Recent versions of Linux's
fdisk(1) will fill this data in correctly, and forthcoming fdisk(1) will fill this data in correctly, and forthcoming
versions will check for consistency. versions will check for consistency.
Checking for a non-zero partition type is not part of the Checking for a non-zero partition type is not part of the
Future Domain algorithm, but it seemed to be a reasonable thing Future Domain algorithm, but it seemed to be a reasonable thing
to do, especially in the Linux and BSD worlds. */ to do, especially in the Linux and BSD worlds. */
info_array[0] = data[0x1c3] + 1; /* heads */ info_array[0] = data[0x1c3] + 1; /* heads */
info_array[1] = data[0x1c4] & 0x3f; /* sectors */ info_array[1] = data[0x1c4] & 0x3f; /* sectors */
} else {
/* Note that this new method guarantees that there will always be
less than 1024 cylinders on a platter. This is good for drives
up to approximately 7.85GB (where 1GB = 1024 * 1024 kB). */
if ((unsigned int) size >= 0x7e0000U)
{
info_array[0] = 0xff; /* heads = 255 */
info_array[1] = 0x3f; /* sectors = 63 */
} else if ((unsigned int) size >= 0x200000U) {
info_array[0] = 0x80; /* heads = 128 */
info_array[1] = 0x3f; /* sectors = 63 */
} else { } else {
info_array[0] = 0x40; /* heads = 64 */
/* Note that this new method guarantees that there will always be info_array[1] = 0x20; /* sectors = 32 */
less than 1024 cylinders on a platter. This is good for drives
up to approximately 7.85GB (where 1GB = 1024 * 1024 kB). */
if ((unsigned int) size >= 0x7e0000U) {
info_array[0] = 0xff; /* heads = 255 */
info_array[1] = 0x3f; /* sectors = 63 */
} else if ((unsigned int) size >= 0x200000U) {
info_array[0] = 0x80; /* heads = 128 */
info_array[1] = 0x3f; /* sectors = 63 */
} else {
info_array[0] = 0x40; /* heads = 64 */
info_array[1] = 0x20; /* sectors = 32 */
}
} }
/* For both methods, compute the cylinders */ }
info_array[2] = (unsigned int) size / (info_array[0] * info_array[1]); /* For both methods, compute the cylinders */
info_array[2] = (unsigned int) size / (info_array[0] * info_array[1]);
return 0;
}
/* Eventually this will go into an include file, but this will be later */ /* Eventually this will go into an include file, but this will be later */
static Scsi_Host_Template driver_template = FD_MCS; static Scsi_Host_Template driver_template = FD_MCS;
......
...@@ -30,7 +30,7 @@ static int fd_mcs_bus_reset(Scsi_Cmnd *); ...@@ -30,7 +30,7 @@ static int fd_mcs_bus_reset(Scsi_Cmnd *);
static int fd_mcs_device_reset(Scsi_Cmnd *); static int fd_mcs_device_reset(Scsi_Cmnd *);
static int fd_mcs_host_reset(Scsi_Cmnd *); static int fd_mcs_host_reset(Scsi_Cmnd *);
static int fd_mcs_queue(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); static int fd_mcs_queue(Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
static int fd_mcs_biosparam(Disk *, struct block_device *, static int fd_mcs_biosparam(struct scsi_device *, struct block_device *,
sector_t, int *); sector_t, int *);
static int fd_mcs_proc_info(char *, char **, off_t, int, int, int); static int fd_mcs_proc_info(char *, char **, off_t, int, int, int);
static const char *fd_mcs_info(struct Scsi_Host *); static const char *fd_mcs_info(struct Scsi_Host *);
......
...@@ -54,7 +54,7 @@ static int generic_NCR5380_device_reset(Scsi_Cmnd *); ...@@ -54,7 +54,7 @@ static int generic_NCR5380_device_reset(Scsi_Cmnd *);
static int notyet_generic_proc_info (char *buffer ,char **start, off_t offset, static int notyet_generic_proc_info (char *buffer ,char **start, off_t offset,
int length, int hostno, int inout); int length, int hostno, int inout);
static const char* generic_NCR5380_info(struct Scsi_Host *); static const char* generic_NCR5380_info(struct Scsi_Host *);
static int generic_NCR5380_biosparam(Disk *, struct block_device *, sector_t, int *); static int generic_NCR5380_biosparam(struct scsi_device *, struct block_device *, sector_t, int *);
static int generic_NCR5380_proc_info(char* buffer, char** start, off_t offset, int length, int hostno, int inout); static int generic_NCR5380_proc_info(char* buffer, char** start, off_t offset, int length, int hostno, int inout);
#ifndef CMD_PER_LUN #ifndef CMD_PER_LUN
......
...@@ -192,7 +192,7 @@ typedef struct SHT ...@@ -192,7 +192,7 @@ typedef struct SHT
/* /*
* Old EH handlers, no longer used. Make them warn the user of old * Old EH handlers, no longer used. Make them warn the user of old
* drivers by using a wrogn type * drivers by using a wrong type
*/ */
int (*abort)(int); int (*abort)(int);
int (*reset)(int,int); int (*reset)(int,int);
......
This diff is collapsed.
...@@ -10,18 +10,14 @@ ...@@ -10,18 +10,14 @@
/* Common forward declarations for all Linux-versions: */ /* Common forward declarations for all Linux-versions: */
/* Interfaces to the midlevel Linux SCSI driver */ /* Interfaces to the midlevel Linux SCSI driver */
extern int ibmmca_proc_info (char *, char **, off_t, int, int, int); static int ibmmca_proc_info (char *, char **, off_t, int, int, int);
extern int ibmmca_detect (Scsi_Host_Template *); static int ibmmca_detect (Scsi_Host_Template *);
extern int ibmmca_release (struct Scsi_Host *); static int ibmmca_release (struct Scsi_Host *);
extern int ibmmca_command (Scsi_Cmnd *); static int ibmmca_command (Scsi_Cmnd *);
extern int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); static int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *));
extern int ibmmca_abort (Scsi_Cmnd *); static int ibmmca_abort (Scsi_Cmnd *);
extern int ibmmca_reset (Scsi_Cmnd *, unsigned int); static int ibmmca_host_reset (Scsi_Cmnd *);
extern int ibmmca_biosparam (struct scsi_device *, struct block_device *, static int ibmmca_biosparam (struct scsi_device *, struct block_device *, sector_t, int *);
sector_t, int *);
/*structure for /proc filesystem */
extern struct proc_dir_entry proc_scsi_ibmmca;
/* /*
* 2/8/98 * 2/8/98
...@@ -37,8 +33,8 @@ extern struct proc_dir_entry proc_scsi_ibmmca; ...@@ -37,8 +33,8 @@ extern struct proc_dir_entry proc_scsi_ibmmca;
release: ibmmca_release, /*release fn*/ \ release: ibmmca_release, /*release fn*/ \
command: ibmmca_command, /*command fn*/ \ command: ibmmca_command, /*command fn*/ \
queuecommand: ibmmca_queuecommand, /*queuecommand fn*/ \ queuecommand: ibmmca_queuecommand, /*queuecommand fn*/ \
abort: ibmmca_abort, /*abort fn*/ \ eh_abort_handler:ibmmca_abort, /*abort fn*/ \
reset: ibmmca_reset, /*reset fn*/ \ eh_host_reset_handler:ibmmca_host_reset, /*reset fn*/ \
bios_param: ibmmca_biosparam, /*bios fn*/ \ bios_param: ibmmca_biosparam, /*bios fn*/ \
can_queue: 16, /*can_queue*/ \ can_queue: 16, /*can_queue*/ \
this_id: 7, /*set by detect*/ \ this_id: 7, /*set by detect*/ \
......
This diff is collapsed.
This diff is collapsed.
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
=========================================================*/ =========================================================*/
/* $Id: nsp_cs.h,v 1.3 2002/10/10 11:07:52 elca Exp $ */ /* $Id: nsp_cs.h,v 1.4 2002/11/05 12:06:29 elca Exp $ */
#ifndef __nsp_cs__ #ifndef __nsp_cs__
#define __nsp_cs__ #define __nsp_cs__
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/************************************ /************************************
* Some useful macros... * Some useful macros...
*/ */
#define Number(arr) ((int) (sizeof(arr) / sizeof(arr[0]))) #define NUMBER(arr) ((int) (sizeof(arr) / sizeof(arr[0]))) /* from XtNumber() in /usr/X11R6/include/X11/Intrinsic.h */
#define BIT(x) (1L << (x)) #define BIT(x) (1L << (x))
#define MIN(a,b) ((a) > (b) ? (b) : (a)) #define MIN(a,b) ((a) > (b) ? (b) : (a))
...@@ -270,10 +270,10 @@ typedef struct _nsp_hw_data { ...@@ -270,10 +270,10 @@ typedef struct _nsp_hw_data {
static void nsp_cs_release(u_long arg); static void nsp_cs_release(u_long arg);
static int nsp_cs_event(event_t event, int priority, event_callback_args_t *args); static int nsp_cs_event(event_t event, int priority, event_callback_args_t *args);
static dev_link_t *nsp_cs_attach(void); static dev_link_t *nsp_cs_attach(void);
static void nsp_cs_detach(dev_link_t *); static void nsp_cs_detach(dev_link_t *);
static unsigned int nsphw_start_selection(Scsi_Cmnd *SCpnt, nsp_hw_data *data); static unsigned int nsphw_start_selection(Scsi_Cmnd *SCpnt, nsp_hw_data *data);
static void nsp_start_timer(Scsi_Cmnd *SCpnt, nsp_hw_data *data, int time); static void nsp_start_timer(Scsi_Cmnd *SCpnt, nsp_hw_data *data, int time);
...@@ -285,9 +285,6 @@ static int nsp_proc_info(char *buffer, char **start, off_t offset, ...@@ -285,9 +285,6 @@ static int nsp_proc_info(char *buffer, char **start, off_t offset,
int length, int hostno, int inout); int length, int hostno, int inout);
static int nsp_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *)); static int nsp_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
static int nsp_abort(Scsi_Cmnd *);
static int nsp_reset(Scsi_Cmnd *, unsigned int);
/*static int nsp_eh_abort(Scsi_Cmnd * SCpnt);*/ /*static int nsp_eh_abort(Scsi_Cmnd * SCpnt);*/
/*static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt);*/ /*static int nsp_eh_device_reset(Scsi_Cmnd *SCpnt);*/
static int nsp_eh_bus_reset(Scsi_Cmnd *SCpnt); static int nsp_eh_bus_reset(Scsi_Cmnd *SCpnt);
......
...@@ -64,7 +64,7 @@ static void nsp_message_out(Scsi_Cmnd *SCpnt, nsp_hw_data *data) ...@@ -64,7 +64,7 @@ static void nsp_message_out(Scsi_Cmnd *SCpnt, nsp_hw_data *data)
DEBUG(0, " msgout loop\n"); DEBUG(0, " msgout loop\n");
do { do {
if (nsp_xfer(SCpnt, data, BUSPHASE_MESSAGE_OUT)) { if (nsp_xfer(SCpnt, data, BUSPHASE_MESSAGE_OUT)) {
printk(KERN_DEBUG " %s msgout: xfer short\n", __FUNCTION__); printk(KERN_DEBUG " %s: msgout: xfer short\n", __FUNCTION__);
} }
/* catch a next signal */ /* catch a next signal */
......
...@@ -613,7 +613,7 @@ int qlogicfas_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) ...@@ -613,7 +613,7 @@ int qlogicfas_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
#ifdef PCMCIA #ifdef PCMCIA
/* /*
* Allow PCMCIA code to preset the port */ * Allow PCMCIA code to preset the port
* port should be 0 and irq to -1 respectively for autoprobing * port should be 0 and irq to -1 respectively for autoprobing
*/ */
......
...@@ -1486,16 +1486,16 @@ static int u14_34f_eh_host_reset(Scsi_Cmnd *SCarg) { ...@@ -1486,16 +1486,16 @@ static int u14_34f_eh_host_reset(Scsi_Cmnd *SCarg) {
return SUCCESS; return SUCCESS;
} }
static int u14_34f_bios_param(Disk *disk, struct block_device *bdev, static int u14_34f_bios_param(struct scsi_device *disk, struct block_device *bdev,
int *dkinfo) { sector_t capacity, int *dkinfo) {
unsigned int j = 0; unsigned int j = 0;
int size = disk->capacity; unsigned int size = capacity;
dkinfo[0] = HD(j)->heads; dkinfo[0] = HD(j)->heads;
dkinfo[1] = HD(j)->sectors; dkinfo[1] = HD(j)->sectors;
dkinfo[2] = size / (HD(j)->heads * HD(j)->sectors); dkinfo[2] = size / (HD(j)->heads * HD(j)->sectors);
if (ext_tran && (scsicam_bios_param(disk, bdev, dkinfo) < 0)) { if (ext_tran && (scsicam_bios_param(bdev, capacity, dkinfo) < 0)) {
dkinfo[0] = 255; dkinfo[0] = 255;
dkinfo[1] = 63; dkinfo[1] = 63;
dkinfo[2] = size / (dkinfo[0] * dkinfo[1]); dkinfo[2] = size / (dkinfo[0] * dkinfo[1]);
......
...@@ -7,7 +7,7 @@ static int u14_34f_release(struct Scsi_Host *); ...@@ -7,7 +7,7 @@ static int u14_34f_release(struct Scsi_Host *);
static int u14_34f_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int u14_34f_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
static int u14_34f_eh_abort(Scsi_Cmnd *); static int u14_34f_eh_abort(Scsi_Cmnd *);
static int u14_34f_eh_host_reset(Scsi_Cmnd *); static int u14_34f_eh_host_reset(Scsi_Cmnd *);
static int u14_34f_bios_param(Disk *, struct block_device *, int *); static int u14_34f_bios_param(struct scsi_device *, struct block_device *, sector_t, int *);
static int u14_34f_slave_attach(Scsi_Device *); static int u14_34f_slave_attach(Scsi_Device *);
#define U14_34F_VERSION "8.00.00" #define U14_34F_VERSION "8.00.00"
...@@ -17,8 +17,6 @@ static int u14_34f_slave_attach(Scsi_Device *); ...@@ -17,8 +17,6 @@ static int u14_34f_slave_attach(Scsi_Device *);
detect: u14_34f_detect, \ detect: u14_34f_detect, \
release: u14_34f_release, \ release: u14_34f_release, \
queuecommand: u14_34f_queuecommand, \ queuecommand: u14_34f_queuecommand, \
abort: NULL, \
reset: NULL, \
eh_abort_handler: u14_34f_eh_abort, \ eh_abort_handler: u14_34f_eh_abort, \
eh_device_reset_handler: NULL, \ eh_device_reset_handler: NULL, \
eh_bus_reset_handler: NULL, \ eh_bus_reset_handler: NULL, \
......
This diff is collapsed.
...@@ -13,13 +13,12 @@ ...@@ -13,13 +13,12 @@
#ifndef _ULTRASTOR_H #ifndef _ULTRASTOR_H
#define _ULTRASTOR_H #define _ULTRASTOR_H
int ultrastor_detect(Scsi_Host_Template *); static int ultrastor_detect(Scsi_Host_Template *);
const char *ultrastor_info(struct Scsi_Host * shpnt); static const char *ultrastor_info(struct Scsi_Host * shpnt);
int ultrastor_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int ultrastor_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
int ultrastor_abort(Scsi_Cmnd *); static int ultrastor_abort(Scsi_Cmnd *);
int ultrastor_reset(Scsi_Cmnd *, unsigned int); static int ultrastor_host_reset(Scsi_Cmnd *);
int ultrastor_biosparam(struct scsi_device *, struct block_device *, static int ultrastor_biosparam(struct scsi_device *, struct block_device *, sector_t, int *);
sector_t, int *);
#define ULTRASTOR_14F_MAX_SG 16 #define ULTRASTOR_14F_MAX_SG 16
...@@ -35,8 +34,8 @@ int ultrastor_biosparam(struct scsi_device *, struct block_device *, ...@@ -35,8 +34,8 @@ int ultrastor_biosparam(struct scsi_device *, struct block_device *,
detect: ultrastor_detect, \ detect: ultrastor_detect, \
info: ultrastor_info, \ info: ultrastor_info, \
queuecommand: ultrastor_queuecommand, \ queuecommand: ultrastor_queuecommand, \
abort: ultrastor_abort, \ eh_abort_handler: ultrastor_abort, \
reset: ultrastor_reset, \ eh_host_reset_handler: ultrastor_host_reset, \
bios_param: ultrastor_biosparam, \ bios_param: ultrastor_biosparam, \
can_queue: ULTRASTOR_MAX_CMDS, \ can_queue: ULTRASTOR_MAX_CMDS, \
this_id: 0, \ this_id: 0, \
......
...@@ -1240,7 +1240,7 @@ static int wd7000_adapter_reset(Adapter * host) ...@@ -1240,7 +1240,7 @@ static int wd7000_adapter_reset(Adapter * host)
host->control = 0; /* this must always shadow ASC_CONTROL */ host->control = 0; /* this must always shadow ASC_CONTROL */
if (WAIT(host->iobase + ASC_STAT, ASC_STATMASK, CMD_RDY, 0)) { if (WAIT(host->iobase + ASC_STAT, ASC_STATMASK, CMD_RDY, 0)) {
printk("wd7000_init: WAIT timed out.\n"); printk(KERN_ERR "wd7000_init: WAIT timed out.\n");
return -1; /* -1 = not ok */ return -1; /* -1 = not ok */
} }
...@@ -1249,25 +1249,25 @@ static int wd7000_adapter_reset(Adapter * host) ...@@ -1249,25 +1249,25 @@ static int wd7000_adapter_reset(Adapter * host)
switch (diag) { switch (diag) {
case 2: case 2:
printk("RAM failure.\n"); printk(KERN_ERR "RAM failure.\n");
break; break;
case 3: case 3:
printk("FIFO R/W failed\n"); printk(KERN_ERR "FIFO R/W failed\n");
break; break;
case 4: case 4:
printk("SBIC register R/W failed\n"); printk(KERN_ERR "SBIC register R/W failed\n");
break; break;
case 5: case 5:
printk("Initialization D-FF failed.\n"); printk(KERN_ERR "Initialization D-FF failed.\n");
break; break;
case 6: case 6:
printk("Host IRQ D-FF failed.\n"); printk(KERN_ERR "Host IRQ D-FF failed.\n");
break; break;
case 7: case 7:
printk("ROM checksum error.\n"); printk(KERN_ERR "ROM checksum error.\n");
break; break;
default: default:
printk("diagnostic code 0x%02Xh received.\n", diag); printk(KERN_ERR "diagnostic code 0x%02Xh received.\n", diag);
} }
return -1; return -1;
} }
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
#ifdef CONFIG_FS_EXT_ATTR #ifdef CONFIG_FS_EXT_ATTR
# include <linux/ext_attr.h> # include <linux/ext_attr.h>
# ifdef CONFIG_FS_POSIX_ACL # if 0 /* was a broken check for Posix ACLs */
# include <linux/posix_acl.h> # include <linux/posix_acl.h>
# endif # endif
#endif #endif
...@@ -466,7 +466,7 @@ int lento_setattr(const char *name, struct iattr *iattr, ...@@ -466,7 +466,7 @@ int lento_setattr(const char *name, struct iattr *iattr,
struct dentry *dentry; struct dentry *dentry;
struct presto_file_set *fset; struct presto_file_set *fset;
int error; int error;
#ifdef CONFIG_FS_POSIX_ACL #if 0 /* was a broken check for Posix ACLs */
int (*set_posix_acl)(struct inode *, int type, posix_acl_t *)=NULL; int (*set_posix_acl)(struct inode *, int type, posix_acl_t *)=NULL;
#endif #endif
...@@ -507,7 +507,7 @@ int lento_setattr(const char *name, struct iattr *iattr, ...@@ -507,7 +507,7 @@ int lento_setattr(const char *name, struct iattr *iattr,
(dentry->d_inode->i_mode & ~S_IALLUGO); (dentry->d_inode->i_mode & ~S_IALLUGO);
CDEBUG(D_PIOCTL, "chmod: orig %#o, set %#o, result %#o\n", CDEBUG(D_PIOCTL, "chmod: orig %#o, set %#o, result %#o\n",
dentry->d_inode->i_mode, set_mode, iattr->ia_mode); dentry->d_inode->i_mode, set_mode, iattr->ia_mode);
#ifdef CONFIG_FS_POSIX_ACL #if 0 /* was a broken check for Posix ACLs */
/* ACl code interacts badly with setattr /* ACl code interacts badly with setattr
* since it tries to modify the ACL using * since it tries to modify the ACL using
* set_ext_attr which recurses back into presto. * set_ext_attr which recurses back into presto.
...@@ -535,7 +535,7 @@ int lento_setattr(const char *name, struct iattr *iattr, ...@@ -535,7 +535,7 @@ int lento_setattr(const char *name, struct iattr *iattr,
} }
} }
#ifdef CONFIG_FS_POSIX_ACL #if 0 /* was a broken check for Posix ACLs */
/* restore the inode_operations if we changed them*/ /* restore the inode_operations if we changed them*/
if (iattr->ia_valid & ATTR_MODE) if (iattr->ia_valid & ATTR_MODE)
dentry->d_inode->i_op->set_posix_acl=set_posix_acl; dentry->d_inode->i_op->set_posix_acl=set_posix_acl;
...@@ -2252,7 +2252,7 @@ int lento_iopen(const char *name, ino_t ino, unsigned int generation, ...@@ -2252,7 +2252,7 @@ int lento_iopen(const char *name, ino_t ino, unsigned int generation,
#ifdef CONFIG_FS_EXT_ATTR #ifdef CONFIG_FS_EXT_ATTR
#ifdef CONFIG_FS_POSIX_ACL #if 0 /* was a broken check for Posix ACLs */
/* Posix ACL code changes i_mode without using a notify_change (or /* Posix ACL code changes i_mode without using a notify_change (or
* a mark_inode_dirty!). We need to duplicate this at the reintegrator * a mark_inode_dirty!). We need to duplicate this at the reintegrator
* which is done by this function. This function also takes care of * which is done by this function. This function also takes care of
...@@ -2395,7 +2395,7 @@ int presto_do_set_ext_attr(struct presto_file_set *fset, ...@@ -2395,7 +2395,7 @@ int presto_do_set_ext_attr(struct presto_file_set *fset,
goto exit; goto exit;
} }
#ifdef CONFIG_FS_POSIX_ACL #if 0 /* was a broken check for Posix ACLs */
/* Reset mode if specified*/ /* Reset mode if specified*/
/* XXX: when we do native acl support, move this code out! */ /* XXX: when we do native acl support, move this code out! */
if (mode != NULL) { if (mode != NULL) {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment