NetBSD Problem Report #39176
From kristerw@netbsd.org Sun Jul 20 23:39:15 2008
Return-Path: <kristerw@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
by narn.NetBSD.org (Postfix) with ESMTP id CBF9863BD06
for <gnats-bugs@gnats.NetBSD.org>; Sun, 20 Jul 2008 23:39:15 +0000 (UTC)
Message-Id: <20080720233915.A387963B100@mail.netbsd.org>
Date: Sun, 20 Jul 2008 23:39:15 +0000 (UTC)
From: kristerw@netbsd.org
Reply-To: kristerw@netbsd.org
To: gnats-bugs@gnats.NetBSD.org
Subject: ppcoea-renovation merge broke wdc1 on Mac mini
X-Send-Pr-Version: 3.95
>Number: 39176
>Category: port-macppc
>Synopsis: ppcoea-renovation merge broke wdc1 on Mac mini
>Confidential: no
>Severity: critical
>Priority: medium
>Responsible: port-macppc-maintainer
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sun Jul 20 23:40:00 +0000 2008
>Closed-Date: Sun Aug 17 21:06:28 +0000 2008
>Last-Modified: Sun Aug 17 21:06:28 +0000 2008
>Originator: Krister Walfridsson
>Release: NetBSD-current
>Organization:
>Environment:
>Description:
My old mac Mini has problems with interrups on wdc1. The problem started
when the ppcoea-renovation was merged.
The merge did change the dmesg output for the wdc0 in a way that
that may be relevant:
--- dmesg-before Mon Jul 21 01:18:36 2008
+++ dmesg-after Mon Jul 21 01:18:36 2008
@@ -4,12 +4,13 @@
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
-NetBSD 4.99.34 (GENERIC) #0: Sun Jul 20 18:33:25 CEST 2008
- cato@pc5:/usr/local/tmp/200710172100/src/sys/arch/macppc/compile/GENERIC
+NetBSD 4.99.34 (GENERIC) #0: Sun Jul 20 18:33:27 CEST 2008
+ cato@pc5:/usr/local/tmp/200710172200/src/sys/arch/macppc/compile/GENERIC
total memory = 512 MB
avail memory = 487 MB
timecounter: Timecounters tick every 10.000 msec
-init_interrupt: found OpenPIC @ pa 0x80040000, 0x80040000
+found openpic PIC at 80040000
+OpenPIC Version 1.2: Supports 4 CPUs and 64 interrupt sources.
mainbus0 (root)
cpu0 at mainbus0: 7447A (Revision 0.2), ID 0 (primary)
cpu0: HID0 8450c0bc<EMCP,EICE,NAP,DPM,ICE,DCE,SGE,BTIC,FBIOB,ABE,BHT>, powersave: 1
@@ -148,12 +149,15 @@
zstty0 at zsc0 channel 0
zstty1 at zsc0 channel 1
snapper0 at obio0 offset 0x10000: irq 30,1,2
-adb0 at obio0 offset 0x16000 irq 47: pmu: failed to read prim-info
-apm0 at adb0: battery flags 0x0, 0% charged
+pmu0 at obio0 offset 0x16000 irq 47: rev. 85
+pmu0: initializing IIC bus
+pmu0: initializing RTC
+pmu0: power-mgt not configured
+pmu0: pmu-pwm-fans not configured
ki2c1 at obio0
iic1 at ki2c1: I2C bus
cereal at ki2c1 address 0x1c0 not configured
-wdc0 at obio0 offset 0x20000 irq 24: DMA transfer
+wdc0 at obio0 offset 0x20000 irq 24, level triggered: DMA transfer
atabus0 at wdc0 channel 0
snapper0: software codec
audio0 at snapper0: full duplex
@@ -228,14 +232,65 @@
wd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 5 (Ultra/100)
wd0(wdc1:0:0): using PIO mode 4, DMA mode 2, Ultra-DMA mode 5 (Ultra/100) (using DMA)
cd0(wdc1:0:1): using PIO mode 4, DMA mode 2, Ultra-DMA mode 2 (Ultra/33) (using DMA)
-boot device: gem0
-root on gem0
-nfs_boot: trying DHCP/BOOTP
uhidev0 at uhub2 port 1 configuration 1 interface 0
uhidev0: Sun Microsystems Type 6 USB keyboard, rev 1.00/1.02, addr 2, iclass 3/1
ukbd0 at uhidev0
-wskbd1 at ukbd0 mux 1
-wskbd1: connecting to wsdisplay0
+wskbd0 at ukbd0 mux 1
+wskbd0: connecting to wsdisplay0
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 512 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 512 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 512 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 512 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
+wd0: soft error (corrected)
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 512 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 512 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 512 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 512 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
+wd0: soft error (corrected)
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 16384 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 1 of 1-32 (wd0 bn 1; cn 0 tn 0 sn 1), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 16384 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 1 of 1-32 (wd0 bn 1; cn 0 tn 0 sn 1), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 16384 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 1 of 1-32 (wd0 bn 1; cn 0 tn 0 sn 1), retrying
+wdc1:0:0: lost interrupt
+ type: ata tc_bcount: 16384 tc_skip: 0
+wdc1:0:0: intr with DRQ (st=0x58)
+wd0c: device timeout reading fsbn 1 of 1-32 (wd0 bn 1; cn 0 tn 0 sn 1), retrying
+wd0: soft error (corrected)
+boot device: gem0
+root on gem0
+nfs_boot: trying DHCP/BOOTP
nfs_boot: DHCP next-server: 171.16.4.140
nfs_boot: my_name=macppc
nfs_boot: my_domain=kwa
Here is the full dmesg (after the ppcoea-renovation merge):
Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007
The NetBSD Foundation, Inc. All rights reserved.
Copyright (c) 1982, 1986, 1989, 1991, 1993
The Regents of the University of California. All rights reserved.
NetBSD 4.99.34 (GENERIC) #0: Sun Jul 20 18:33:27 CEST 2008
cato@pc5:/usr/local/tmp/200710172200/src/sys/arch/macppc/compile/GENERIC
total memory = 512 MB
avail memory = 487 MB
timecounter: Timecounters tick every 10.000 msec
found openpic PIC at 80040000
OpenPIC Version 1.2: Supports 4 CPUs and 64 interrupt sources.
mainbus0 (root)
cpu0 at mainbus0: 7447A (Revision 0.2), ID 0 (primary)
cpu0: HID0 8450c0bc<EMCP,EICE,NAP,DPM,ICE,DCE,SGE,BTIC,FBIOB,ABE,BHT>, powersave: 1
cpu0: 1250.00 MHz, 512KB L2 cache
uni_n0 at mainbus0 address 0xf8000000
hw-clock at uni_n0 not configured
ki2c0 at uni_n0 address 0xf8001000
iic0 at ki2c0: I2C bus
cereal at ki2c0 address 0x1c0 not configured
uninorth0 at mainbus0
pci0 at uninorth0 bus 0
pci0: i/o space, memory space enabled
pchb0 at pci0 dev 11 function 0
pchb0: Apple Computer UniNorth AGP Bridge (rev. 0x00)
radeonfb0 at pci0 dev 16 function 0: ATI Technologies Radeon 9200 5962
radeonfb0: Video BIOS not present
radeonfb0: No video BIOS, using default clocks
radeonfb0: refclk = 27.000 MHz, refdiv = 12 minpll = 125000, maxpll = 350000
radeonfb0: using static EDID
max_dotclock according to supported modes: 108000
Vendor: [GVC]
Product: [06E9]
Serial number: 01000000
Manufactured 1998 Week 44
EDID Version 1.1
EDID Comment:
Video Input: 68
Analog
-0.7, 0.0V
Seperate syncs
Gamma: 0.24
Max Size: 32 cm x 24 cm
Features: e8
DPMS standby
DPMS suspend
DPMS active-off
RGB
Chroma Info:
Red X: 0.625
Red Y: 0.625
Grn X: 0.309
Grn Y: 0.591
Blu X: 0.150
Blu Y: 0.065
Wht X: 0.281
Wht Y: 0.310
Range:
Horizontal: 28 - 70 kHz
Vertical: 40 - 120 Hz
Max Dot Clock: 108 MHz
Video modes:
1024x768 @ 70Hz
1024x768 @ 60Hz
1024x768 @ 43Hz
800x600 @ 72Hz
800x600 @ 60Hz
800x600 @ 56Hz
640x480 @ 73Hz
640x480 @ 60Hz
640x480 @ 70Hz
640x480 @ 70Hz
640x480 @ 84Hz
640x480 @ 84Hz
1280x960 @ 60Hz
1024x768 @ 87Hz
640x350 @ 70Hz
640x350 @ 70Hz
1024x768 @ 72Hz
Preferred mode: 640x350 @ 70Hz
radeonfb0: using static EDID
max_dotclock according to supported modes: 108000
Vendor: [GVC]
Product: [06E9]
Serial number: 01000000
Manufactured 1998 Week 44
EDID Version 1.1
EDID Comment:
Video Input: 68
Analog
-0.7, 0.0V
Seperate syncs
Gamma: 0.24
Max Size: 32 cm x 24 cm
Features: e8
DPMS standby
DPMS suspend
DPMS active-off
RGB
Chroma Info:
Red X: 0.625
Red Y: 0.625
Grn X: 0.309
Grn Y: 0.591
Blu X: 0.150
Blu Y: 0.065
Wht X: 0.281
Wht Y: 0.310
Range:
Horizontal: 28 - 70 kHz
Vertical: 40 - 120 Hz
Max Dot Clock: 108 MHz
Video modes:
1024x768 @ 70Hz
1024x768 @ 60Hz
1024x768 @ 43Hz
800x600 @ 72Hz
800x600 @ 60Hz
800x600 @ 56Hz
640x480 @ 73Hz
640x480 @ 60Hz
640x480 @ 70Hz
640x480 @ 70Hz
640x480 @ 84Hz
640x480 @ 84Hz
1280x960 @ 60Hz
1024x768 @ 87Hz
640x350 @ 70Hz
640x350 @ 70Hz
1024x768 @ 72Hz
Preferred mode: 640x350 @ 70Hz
radeonfb0: 64 MB aperture at 0x98000000, 64 KB registers at 0x90000000
radeonfb0: display 0: initial virtual resolution 1280x960 at 32 bpp
radeonfb0: port 0: physical 640x350 70Hz
radeonfb0: port 1: physical 640x350 70Hz
init engine
wsdisplay0 at radeonfb0 kbdmux 1: console (fb, vt100 emulation)
wsmux1: connecting to wsdisplay0
direct rendering for radeonfb0 unsupported
uninorth1 at mainbus0
pci1 at uninorth1 bus 0
pci1: i/o space, memory space enabled
pchb1 at pci1 dev 11 function 0
pchb1: Apple Computer UniNorth Host-PCI Bridge (rev. 0x00)
obio0 at pci1 dev 23 function 0: addr 0x80000000
zsc0 at obio0: irq 22,23
zstty0 at zsc0 channel 0
zstty1 at zsc0 channel 1
snapper0 at obio0 offset 0x10000: irq 30,1,2
pmu0 at obio0 offset 0x16000 irq 47: rev. 85
pmu0: initializing IIC bus
pmu0: initializing RTC
pmu0: power-mgt not configured
pmu0: pmu-pwm-fans not configured
ki2c1 at obio0
iic1 at ki2c1: I2C bus
cereal at ki2c1 address 0x1c0 not configured
wdc0 at obio0 offset 0x20000 irq 24, level triggered: DMA transfer
atabus0 at wdc0 channel 0
snapper0: software codec
audio0 at snapper0: full duplex
ohci0 at pci1 dev 24 function 0: Apple Computer Intrepid USB Controller (rev. 0x00)
ohci0: can't map mem space
ohci1 at pci1 dev 25 function 0: Apple Computer Intrepid USB Controller (rev. 0x00)
ohci1: can't map mem space
ohci2 at pci1 dev 26 function 0: Apple Computer Intrepid USB Controller (rev. 0x00)
ohci2: interrupting at irq 29
ohci2: OHCI version 1.0, legacy support
usb0 at ohci2: USB revision 1.0
uhub0 at usb0
uhub0: Apple Computer OHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub0: 2 ports with 2 removable, self powered
ohci3 at pci1 dev 27 function 0: NEC USB Host Controller (rev. 0x43)
ohci3: interrupting at irq 63
ohci3: OHCI version 1.0
usb1 at ohci3: USB revision 1.0
uhub1 at usb1
uhub1: NEC OHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub1: 3 ports with 3 removable, self powered
ohci4 at pci1 dev 27 function 1: NEC USB Host Controller (rev. 0x43)
ohci4: interrupting at irq 63
ohci4: OHCI version 1.0
usb2 at ohci4: USB revision 1.0
uhub2 at usb2
uhub2: NEC OHCI root hub, class 9/0, rev 1.00/1.00, addr 1
uhub2: 2 ports with 2 removable, self powered
ehci0 at pci1 dev 27 function 2: NEC USB Host Controller (rev. 0x04)
ehci0: interrupting at irq 63
ehci0: BIOS has given up ownership
ehci0: EHCI version 1.0
ehci0: companion controllers, 3 ports each: ohci3 ohci4
usb3 at ehci0: USB revision 2.0
uhub3 at usb3
uhub3: NEC EHCI root hub, class 9/0, rev 2.00/1.00, addr 1
uhub3: 5 ports with 5 removable, self powered
uninorth2 at mainbus0
pci2 at uninorth2 bus 0
pci2: i/o space, memory space enabled
pchb2 at pci2 dev 11 function 0
pchb2: Apple Computer UniNorth Host-PCI Bridge (rev. 0x00)
wdc1 at pci2 dev 13 function 0: interrupting at irq 39
atabus1 at wdc1 channel 0
fwohci0 at pci2 dev 14 function 0: Apple Computer UniNorth Firewire (rev. 0x81)
fwohci0: interrupting at irq 40
fwohci0: OHCI version 1.10 (ROM=0)
fwohci0: No. of Isochronous channels is 8.
fwohci0: EUI64 00:11:24:ff:fe:75:1b:a6
fwohci0: Phy 1394a available S400, 2 ports.
fwohci0: Link S400, max_rec 2048 bytes.
ieee1394if0 at fwohci0: IEEE1394 bus
fwip0 at ieee1394if0: IP over IEEE1394
fwohci0: Initiate bus reset
gem0 at pci2 dev 15 function 0: Apple Computer GMAC Ethernet (rev. 0x80)
gem0: interrupting at irq 41
gem0: Ethernet address 00:11:24:75:1b:a6, 10KB RX fifo, 4KB TX fifo
bmtphy0 at gem0 phy 0: BCM5221 10/100 media interface, rev. 4
bmtphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
timecounter: Timecounter "clockinterrupt" frequency 100 Hz quality 0
timecounter: Timecounter "mftb" frequency 41620997 Hz quality 100
fwohci0: node_id=0xc800ffc0, gen=2, CYCLEMASTER mode
ieee1394if0: 1 nodes, maxhop <= 0, cable IRM = 0 (me)
ieee1394if0: bus manager 0 (me)
Kernelized RAIDframe activated
atapibus0 at atabus1: 2 targets
cd0 at atapibus0 drive 1: <MATSHITACD-RW CW-8124, , DACD> cdrom removable
cd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 2 (Ultra/33)
wd0 at atabus1 drive 0: <ST940110A>
wd0: drive supports 16-sector PIO transfers, LBA48 addressing
wd0: 38154 MB, 77520 cyl, 16 head, 63 sec, 512 bytes/sect x 78140160 sectors
wd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA mode 5 (Ultra/100)
wd0(wdc1:0:0): using PIO mode 4, DMA mode 2, Ultra-DMA mode 5 (Ultra/100) (using DMA)
cd0(wdc1:0:1): using PIO mode 4, DMA mode 2, Ultra-DMA mode 2 (Ultra/33) (using DMA)
uhidev0 at uhub2 port 1 configuration 1 interface 0
uhidev0: Sun Microsystems Type 6 USB keyboard, rev 1.00/1.02, addr 2, iclass 3/1
ukbd0 at uhidev0
wskbd0 at ukbd0 mux 1
wskbd0: connecting to wsdisplay0
wdc1:0:0: lost interrupt
type: ata tc_bcount: 512 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 512 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 512 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 512 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
wd0: soft error (corrected)
wdc1:0:0: lost interrupt
type: ata tc_bcount: 512 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 512 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 512 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 512 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
wd0: soft error (corrected)
wdc1:0:0: lost interrupt
type: ata tc_bcount: 16384 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 1 of 1-32 (wd0 bn 1; cn 0 tn 0 sn 1), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 16384 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 1 of 1-32 (wd0 bn 1; cn 0 tn 0 sn 1), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 16384 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 1 of 1-32 (wd0 bn 1; cn 0 tn 0 sn 1), retrying
wdc1:0:0: lost interrupt
type: ata tc_bcount: 16384 tc_skip: 0
wdc1:0:0: intr with DRQ (st=0x58)
wd0c: device timeout reading fsbn 1 of 1-32 (wd0 bn 1; cn 0 tn 0 sn 1), retrying
wd0: soft error (corrected)
boot device: gem0
root on gem0
nfs_boot: trying DHCP/BOOTP
nfs_boot: DHCP next-server: 171.16.4.140
nfs_boot: my_name=macppc
nfs_boot: my_domain=kwa
nfs_boot: my_addr=171.16.4.161
nfs_boot: my_mask=255.255.255.0
nfs_boot: gateway=171.16.4.173
root on 171.16.4.140:/diskless/macppc-current
root file system type: nfs
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
From: "Marco Trillo" <marcotrillo@gmail.com>
To: gnats-bugs@netbsd.org
Cc: kristerw@netbsd.org, port-macppc@netbsd.org
Subject: Re: port-macppc/39176
Date: Sun, 27 Jul 2008 15:50:39 +0200
------=_Part_9183_32054307.1217166639451
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Hi,
> My old mac Mini has problems with interrups on wdc1. The problem started
> when the ppcoea-renovation was merged.
> [...]
> The merge did change the dmesg output for the wdc0 in a way that
> that may be relevant:
> [...]
> +wdc1:0:0: lost interrupt
> + type: ata tc_bcount: 512 tc_skip: 0
> +wdc1:0:0: intr with DRQ (st=0x58)
> +wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
> +wdc1:0:0: lost interrupt
I don't know if it's related to your problem, but I think the timing
setting stuff on wdc at pci (src/sys/arch/macppc/dev/kauai.c) it's
currently broken.
Can you test the attached patch for kauai.c to see if your problems persist?
It works fine for me on a Intrepid Kauai controller.
Thanks!
Some comments with respect to the patch:
I think that the following lines in kauai.c (rev. 1.25):
58 #define PIO_CONFIG_REG (0x200 >> 4) /* PIO and DMA access timing */
59 #define DMA_CONFIG_REG (0x210 >> 4) /* UDMA access timing */
should read instead:
58 #define PIO_CONFIG_REG 0x200 /* PIO and DMA access timing */
59 #define DMA_CONFIG_REG 0x210 /* UDMA access timing */
Before the ppcoea-renovation branch was merged, kauai.c used
macppc_make_bus_space_tag(regbase, 4); to map the registers so the tag
included an automatic stride.
After the branch was merged, it does not create a private tag anymore
and this automatic stride is not done; so the definitions should be
updated to reflect that (the '>> 4' shift is no longer necessary).
Another issue is that the code in calc_timing_kauai() uses the
DMA_CONFIG_REG register to set both DMA and UDMA access timing; but
this register is only for UDMA; the DMA timings should go along with
the PIO timings into the PIO_CONFIG_REG register (as the comments in
the above lines 58-59 say).
This can be verified by looking at Mac OS X's AppleKauaiATA.cpp
driver, in lines 985 and 986 [1] .
(The patch also renames the DMA_CONFIG_REG to UDMA_CONFIG_REG to avoid
confussion.)
[1] http://www.opensource.apple.com/darwinsource/10.4.11.ppc/AppleKauaiATA-121.3.4/AppleKauaiATA.cpp
Greetings,
Marco.
------=_Part_9183_32054307.1217166639451
Content-Type: application/octet-stream; name=kauai.c.diff
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fj5pdc3r0
Content-Disposition: attachment; filename=kauai.c.diff
LS0tIGthdWFpLmMub3JpZwkyMDA4LTA3LTI3IDE0OjM5OjU4LjAwMDAwMDAwMCArMDIwMAorKysg
a2F1YWkuYwkyMDA4LTA3LTI3IDE0OjM5OjM0LjAwMDAwMDAwMCArMDIwMApAQCAtNTIsMTEgKzUy
LDE1IEBACiAjaW5jbHVkZSA8bWFjcHBjL2Rldi9kYmRtYS5oPgogCiAjZGVmaW5lIFdEQ19SRUdf
TlBPUlRTCQk4Ci0jZGVmaW5lIFdEQ19BVVhSRUdfT0ZGU0VUCTB4MTYKKyNkZWZpbmUgV0RDX0FV
WFJFR19PRkZTRVQJMHgxNjAKICNkZWZpbmUgV0RDX0FVWFJFR19OUE9SVFMJMQogCi0jZGVmaW5l
IFBJT19DT05GSUdfUkVHICgweDIwMCA+PiA0KQkvKiBQSU8gYW5kIERNQSBhY2Nlc3MgdGltaW5n
ICovCi0jZGVmaW5lIERNQV9DT05GSUdfUkVHICgweDIxMCA+PiA0KQkvKiBVRE1BIGFjY2VzcyB0
aW1pbmcgKi8KKyNkZWZpbmUgS0FVQUlfRkNSICAgICAgICAgICAgICAgMHgwMDAgICAvKiBGZWF0
dXJlIENvbnRyb2wgUmVnaXN0ZXIgKi8KKyNkZWZpbmUgUElPX0NPTkZJR19SRUcgICAgICAgICAg
MHgyMDAJLyogUElPIGFuZCBETUEgYWNjZXNzIHRpbWluZyAqLworI2RlZmluZSBVRE1BX0NPTkZJ
R19SRUcgICAgICAgICAweDIxMAkvKiBVRE1BIGFjY2VzcyB0aW1pbmcgKi8KKworI2RlZmluZSBN
QVhCWVRFUyAgICAgICAgICAgICAgICAoMSA8PCAoREVWX0JTSElGVCArIE5CQlkpKQorI2RlZmlu
ZSBNQVhQQUdFUyAgICAgICAgICAgICAgICAoKE1BWEJZVEVTICsgUEdPRlNFVCkgJiB+UEdPRlNF
VCkKIAogc3RydWN0IGthdWFpX3NvZnRjIHsKIAlzdHJ1Y3Qgd2RjX3NvZnRjIHNjX3dkY2RldjsK
QEAgLTY2LDEwICs3MCw4IEBACiAJc3RydWN0IGF0YV9xdWV1ZSBzY19xdWV1ZTsKIAlkYmRtYV9y
ZWdtYXBfdCAqc2NfZG1hcmVnOwogCWRiZG1hX2NvbW1hbmRfdAkqc2NfZG1hY21kOwotCXVfaW50
IHNjX3Bpb3RpbWluZ19yWzJdOwotCXVfaW50IHNjX3Bpb3RpbWluZ193WzJdOwotCXVfaW50IHNj
X2RtYXRpbWluZ19yWzJdOwotCXVfaW50IHNjX2RtYXRpbWluZ193WzJdOworCXVfaW50IHNjX3Bp
b3RpbWluZ1syXTsKKwl1X2ludCBzY191ZG1hdGltaW5nWzJdOwogCXZvaWQgKCpzY19jYWxjX3Rp
bWluZykoc3RydWN0IGthdWFpX3NvZnRjICosIGludCk7CiB9OwogCkBAIC04MCw5ICs4MiwxMCBA
QAogc3RhdGljIGludCBrYXVhaV9kbWFfZmluaXNoKHZvaWQgKiwgaW50LCBpbnQsIGludCk7CiBz
dGF0aWMgdm9pZCBrYXVhaV9zZXRfbW9kZXMoc3RydWN0IGF0YV9jaGFubmVsICopOwogc3RhdGlj
IHZvaWQgY2FsY190aW1pbmdfa2F1YWkoc3RydWN0IGthdWFpX3NvZnRjICosIGludCk7CitzdGF0
aWMgdm9pZCBjYWxjX3RpbWluZ19zaGFzdGEoc3RydWN0IGthdWFpX3NvZnRjICosIGludCk7CiAK
IENGQVRUQUNIX0RFQ0xfTkVXKGthdWFpLCBzaXplb2Yoc3RydWN0IGthdWFpX3NvZnRjKSwKLSAg
ICBrYXVhaV9tYXRjaCwga2F1YWlfYXR0YWNoLCBOVUxMLCB3ZGNhY3RpdmF0ZSk7CisgICAgICAg
ICAgICAgICAgICBrYXVhaV9tYXRjaCwga2F1YWlfYXR0YWNoLCBOVUxMLCB3ZGNhY3RpdmF0ZSk7
CiAKIGludAoga2F1YWlfbWF0Y2goZGV2aWNlX3QgcGFyZW50LCBjZmRhdGFfdCBtYXRjaCwgdm9p
ZCAqYXV4KQpAQCAtMTEyLDEwICsxMTUsMTEgQEAKIAlwY2lfaW50cl9oYW5kbGVfdCBpaDsKIAlw
YWRkcl90IHJlZ2Jhc2UsIGRtYWJhc2U7CiAJaW50IG5vZGUsIHJlZ1s1XSwgaTsKKyAgICAgICAg
Y2hhciBkZXZpbmZvWzEyOF07CiAKIAlzYy0+c2Nfd2RjZGV2LnNjX2F0YWMuYXRhY19kZXYgPSBz
ZWxmOwogCi0Jc2MtPnNjX2RtYWNtZCA9IGRiZG1hX2FsbG9jKHNpemVvZihkYmRtYV9jb21tYW5k
X3QpICogMjApOworCXNjLT5zY19kbWFjbWQgPSBkYmRtYV9hbGxvYygoTUFYUEFHRVMgKyA0KSAq
IHNpemVvZihkYmRtYV9jb21tYW5kX3QpKTsKIAogCW5vZGUgPSBwY2lkZXZfdG9fb2ZkZXYocGEt
PnBhX3BjLCBwYS0+cGFfdGFnKTsKIAlpZiAobm9kZSA9PSAwKSB7CkBAIC0xNDMsMjQgKzE0Nywy
NyBAQAogCQlhcHJpbnRfZXJyb3IoIjogdW5hYmxlIHRvIG1hcCBpbnRlcnJ1cHRcbiIpOwogCQly
ZXR1cm47CiAJfQotCWFwcmludF9ub3JtYWwoIjogaW50ZXJydXB0aW5nIGF0ICVzXG4iLCBwY2lf
aW50cl9zdHJpbmcocGEtPnBhX3BjLCBpaCkpOworICAgICAgICAKKyAgICAgICAgcGNpX2Rldmlu
Zm8ocGEtPnBhX2lkLCBwYS0+cGFfY2xhc3MsIDAsIGRldmluZm8sIHNpemVvZihkZXZpbmZvKSk7
CisgICAgICAgIGFwcmludF9ub3JtYWwoIjogJXNcbiIsIGRldmluZm8pOworCWFwcmludF9ub3Jt
YWwoIiVzOiBpbnRlcnJ1cHRpbmcgYXQgJXNcbiIsIGRldmljZV94bmFtZShzZWxmKSwKKyAgICAg
ICAgICAgICAgICAgICAgICBwY2lfaW50cl9zdHJpbmcocGEtPnBhX3BjLCBpaCkpOwogCiAJc2Mt
PnNjX3dkY2Rldi5yZWdzID0gd2RyID0gJnNjLT5zY193ZGNfcmVnczsKIAogCXdkci0+Y21kX2lv
dCA9IHdkci0+Y3RsX2lvdCA9IHBhLT5wYV9tZW10OwogCi0JaWYgKGJ1c19zcGFjZV9tYXAod2Ry
LT5jbWRfaW90LCByZWdiYXNlLCBXRENfUkVHX05QT1JUUyA8PCA0LCAwLAotCSAgICAmd2RyLT5j
bWRfYmFzZWlvaCkgfHwKLQkgICAgYnVzX3NwYWNlX3N1YnJlZ2lvbih3ZHItPmNtZF9pb3QsIHdk
ci0+Y21kX2Jhc2Vpb2gsCi0JCQlXRENfQVVYUkVHX09GRlNFVCA8PCA0LCAxLCAmd2RyLT5jdGxf
aW9oKSkgeworCWlmIChidXNfc3BhY2VfbWFwKHdkci0+Y21kX2lvdCwgcmVnYmFzZSwgTkJQRywg
MCwgJndkci0+Y21kX2Jhc2Vpb2gpIHx8CisJICAgIGJ1c19zcGFjZV9zdWJyZWdpb24od2RyLT5j
bWRfaW90LCB3ZHItPmNtZF9iYXNlaW9oLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgV0RDX0FVWFJFR19PRkZTRVQsIDEsICZ3ZHItPmN0bF9pb2gpKSB7CisKIAkJYXByaW50X2Vy
cm9yX2RldihzZWxmLCAiY291bGRuJ3QgbWFwIHJlZ2lzdGVyc1xuIik7CiAJCXJldHVybjsKIAl9
CiAJZm9yIChpID0gMDsgaSA8IFdEQ19OUkVHOyBpKyspIHsKIAkJaWYgKGJ1c19zcGFjZV9zdWJy
ZWdpb24od2RyLT5jbWRfaW90LCB3ZHItPmNtZF9iYXNlaW9oLCBpIDw8IDQsCiAJCSAgICBpID09
IDAgPyA0IDogMSwgJndkci0+Y21kX2lvaHNbaV0pICE9IDApIHsKLQkJCWJ1c19zcGFjZV91bm1h
cCh3ZHItPmNtZF9pb3QsIHdkci0+Y21kX2Jhc2Vpb2gsCi0JCQkgICAgV0RDX1JFR19OUE9SVFMg
PDwgNCk7CisJCQlidXNfc3BhY2VfdW5tYXAod2RyLT5jbWRfaW90LCB3ZHItPmNtZF9iYXNlaW9o
LCBOQlBHKTsKIAkJCWFwcmludF9lcnJvcl9kZXYoc2VsZiwKIAkJCSAgICAiY291bGRuJ3Qgc3Vi
cmVnaW9uIHJlZ2lzdGVyc1xuIik7CiAJCQlyZXR1cm47CkBAIC0xNzUsNyArMTgyLDEwIEBACiAK
IAlzYy0+c2Nfd2RjZGV2LnNjX2F0YWMuYXRhY19waW9fY2FwID0gNDsKIAlzYy0+c2Nfd2RjZGV2
LnNjX2F0YWMuYXRhY19kbWFfY2FwID0gMjsKLQlzYy0+c2Nfd2RjZGV2LnNjX2F0YWMuYXRhY191
ZG1hX2NhcCA9IDU7CisJaWYgKFBDSV9QUk9EVUNUKHBhLT5wYV9pZCkgPT0gUENJX1BST0RVQ1Rf
QVBQTEVfU0hBU1RBX0FUQSkKKyAgICAgICAgICAgICAgICBzYy0+c2Nfd2RjZGV2LnNjX2F0YWMu
YXRhY191ZG1hX2NhcCA9IDY7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBzYy0+c2Nf
d2RjZGV2LnNjX2F0YWMuYXRhY191ZG1hX2NhcCA9IDU7CiAJc2MtPnNjX3dkY2Rldi5zY19hdGFj
LmF0YWNfY2FwIHw9IEFUQUNfQ0FQX0RBVEExNjsKIAlzYy0+c2Nfd2RjZGV2LnNjX2F0YWMuYXRh
Y19jYXAgfD0gQVRBQ19DQVBfRE1BIHwgQVRBQ19DQVBfVURNQTsKIAlzYy0+c2NfY2hhbnB0ciA9
IGNocDsKQEAgLTE4Niw4ICsxOTYsMTMgQEAKIAlzYy0+c2Nfd2RjZGV2LmRtYV9zdGFydCA9IGth
dWFpX2RtYV9zdGFydDsKIAlzYy0+c2Nfd2RjZGV2LmRtYV9maW5pc2ggPSBrYXVhaV9kbWFfZmlu
aXNoOwogCXNjLT5zY193ZGNkZXYuc2NfYXRhYy5hdGFjX3NldF9tb2RlcyA9IGthdWFpX3NldF9t
b2RlczsKLQlzYy0+c2NfY2FsY190aW1pbmcgPSBjYWxjX3RpbWluZ19rYXVhaTsKLQlzYy0+c2Nf
ZG1hcmVnID0gKHZvaWQgKilkbWFiYXNlOworCQorICAgICAgICBpZiAoUENJX1BST0RVQ1QocGEt
PnBhX2lkKSA9PSBQQ0lfUFJPRFVDVF9BUFBMRV9TSEFTVEFfQVRBKQorICAgICAgICAgICAgICAg
IHNjLT5zY19jYWxjX3RpbWluZyA9IGNhbGNfdGltaW5nX3NoYXN0YTsKKyAgICAgICAgZWxzZQor
ICAgICAgICAgICAgICAgIHNjLT5zY19jYWxjX3RpbWluZyA9IGNhbGNfdGltaW5nX2thdWFpOwor
CQorICAgICAgICBzYy0+c2NfZG1hcmVnID0gbWFwaW9kZXYoZG1hYmFzZSwgMHgxMDAwKTsKIAog
CWNocC0+Y2hfY2hhbm5lbCA9IDA7CiAJY2hwLT5jaF9hdGFjID0gJnNjLT5zY193ZGNkZXYuc2Nf
YXRhYzsKQEAgLTE5OCwxMSArMjEzLDIzIEBACiAJd2RjYXR0YWNoKGNocCk7CiB9CiAKK3N0YXRp
YyB2b2lkCitrYXVhaV93cml0ZV90aW1pbmcoc3RydWN0IGthdWFpX3NvZnRjICpzYywgaW50IGRy
aXZlKQoreworICAgICAgICBzdHJ1Y3QgYXRhX2NoYW5uZWwgKmNocCA9ICZzYy0+c2NfY2hhbm5l
bDsKKyAgICAgICAgc3RydWN0IHdkY19yZWdzICp3ZHIgPSBDSEFOX1RPX1dEQ19SRUdTKGNocCk7
CisKKyAgICAgICAgYnVzX3NwYWNlX3dyaXRlXzQod2RyLT5jbWRfaW90LCB3ZHItPmNtZF9iYXNl
aW9oLCBLQVVBSV9GQ1IsIDB4Nyk7CisgICAgICAgIGJ1c19zcGFjZV93cml0ZV80KHdkci0+Y21k
X2lvdCwgd2RyLT5jbWRfYmFzZWlvaCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgUElPX0NP
TkZJR19SRUcsIHNjLT5zY19waW90aW1pbmdbZHJpdmVdKTsKKyAgICAgICAgYnVzX3NwYWNlX3dy
aXRlXzQod2RyLT5jbWRfaW90LCB3ZHItPmNtZF9iYXNlaW9oLCAKKyAgICAgICAgICAgICAgICAg
ICAgICAgICAgVURNQV9DT05GSUdfUkVHLCBzYy0+c2NfdWRtYXRpbWluZ1tkcml2ZV0pOyAKK30K
Kwogdm9pZAoga2F1YWlfc2V0X21vZGVzKHN0cnVjdCBhdGFfY2hhbm5lbCAqY2hwKQogewogCXN0
cnVjdCBrYXVhaV9zb2Z0YyAqc2MgPSAodm9pZCAqKWNocC0+Y2hfYXRhYzsKLQlzdHJ1Y3Qgd2Rj
X3JlZ3MgKndkciA9IENIQU5fVE9fV0RDX1JFR1MoY2hwKTsKIAlzdHJ1Y3QgYXRhX2RyaXZlX2Rh
dGFzICpkcnZwMCA9ICZjaHAtPmNoX2RyaXZlWzBdOwogCXN0cnVjdCBhdGFfZHJpdmVfZGF0YXMg
KmRydnAxID0gJmNocC0+Y2hfZHJpdmVbMV07CiAJc3RydWN0IGF0YV9kcml2ZV9kYXRhcyAqZHJ2
cDsKQEAgLTIxNywxMCArMjQ0LDcgQEAKIAkJZHJ2cCA9ICZjaHAtPmNoX2RyaXZlW2RyaXZlXTsK
IAkJaWYgKGRydnAtPmRyaXZlX2ZsYWdzICYgRFJJVkUpIHsKIAkJCSgqc2MtPnNjX2NhbGNfdGlt
aW5nKShzYywgZHJpdmUpOwotCQkJYnVzX3NwYWNlX3dyaXRlXzQod2RyLT5jbWRfaW90LCB3ZHIt
PmNtZF9iYXNlaW9oLAotCQkJICAgIFBJT19DT05GSUdfUkVHLCBzYy0+c2NfcGlvdGltaW5nX3Jb
ZHJpdmVdKTsKLQkJCWJ1c19zcGFjZV93cml0ZV80KHdkci0+Y21kX2lvdCwgd2RyLT5jbWRfYmFz
ZWlvaCwKLQkJCSAgICBETUFfQ09ORklHX1JFRywgc2MtPnNjX2RtYXRpbWluZ19yW2RyaXZlXSk7
CisgICAgICAgICAgICAgICAgICAgICAgICBrYXVhaV93cml0ZV90aW1pbmcoc2MsIGRyaXZlKTsK
IAkJfQogCX0KIH0KQEAgLTIzNSwxOSArMjU5LDQwIEBACiAJMHgwNTAwMDI0OSwJLyogICAgICAz
ICovCiAJMHgwNDAwMDE0OAkvKiAgICAgIDQgKi8KIH07CitzdGF0aWMgY29uc3QgdV9pbnQgcGlv
X3RpbWluZ19zaGFzdGFbXSA9IHsKKyAgICAgICAgMHgwQTAwMEM5NywgICAgIC8qIE1vZGUgMCAq
LworICAgICAgICAweDA3MDAwNzEyLCAgICAgLyogICAgICAxICovCisgICAgICAgIDB4MDQwMDAz
Q0QsICAgICAvKiAgICAgIDIgKi8KKyAgICAgICAgMHgwNDAwMDI4QiwgICAgIC8qICAgICAgMyAq
LworICAgICAgICAweDA0MDAwMTBBICAgICAgLyogICAgICA0ICovCit9Owogc3RhdGljIGNvbnN0
IHVfaW50IGRtYV90aW1pbmdfa2F1YWlbXSA9IHsJLyogMHgwMGZmZjAwMCAqLwogCTB4MDA2MTgw
MDAsCS8qIE1vZGUgMCAqLwogCTB4MDAyMDkwMDAsCS8qICAgICAgMSAqLwogCTB4MDAxNDgwMDAJ
LyogICAgICAyICovCiB9Oworc3RhdGljIGNvbnN0IHVfaW50IGRtYV90aW1pbmdfc2hhc3RhW10g
PSB7CisgICAgICAgIDB4MDA4MjA4MDAsICAgICAvKiBNb2RlIDAgKi8KKyAgICAgICAgMHgwMDI4
QjAwMCwgICAgIC8qICAgICAgMSAqLworICAgICAgICAweDAwMUNBMDAwICAgICAgLyogICAgICAy
ICovCit9Owogc3RhdGljIGNvbnN0IHVfaW50IHVkbWFfdGltaW5nX2thdWFpW10gPSB7CS8qIDB4
MDAwMGZmZmYgKi8KLQkweDAwMDA3MGMwLAkvKiBNb2RlIDAgKi8KLQkweDAwMDA1ZDgwLAkvKiAg
ICAgIDEgKi8KLQkweDAwMDA0YTYwLAkvKiAgICAgIDIgKi8KLQkweDAwMDAzYTUwLAkvKiAgICAg
IDMgKi8KLQkweDAwMDAyYTMwLAkvKiAgICAgIDQgKi8KKwkweDAwMDA3MGMxLAkvKiBNb2RlIDAg
Ki8KKwkweDAwMDA1ZDgxLAkvKiAgICAgIDEgKi8KKwkweDAwMDA0YTYxLAkvKiAgICAgIDIgKi8K
KwkweDAwMDAzYTUxLAkvKiAgICAgIDMgKi8KKwkweDAwMDAyYTMxLAkvKiAgICAgIDQgKi8KIAkw
eDAwMDAyOTIxCS8qICAgICAgNSAqLwogfTsKK3N0YXRpYyBjb25zdCB1X2ludCB1ZG1hX3RpbWlu
Z19zaGFzdGFbXSA9IHsKKyAgICAgICAgMHgwMDAzNTkwMSwgICAgIC8qIE1vZGUgMCAqLworICAg
ICAgICAweDAwMDM0OGIxLCAgICAgLyogICAgICAxICovCisgICAgICAgIDB4MDAwMzM4ODEsICAg
ICAvKiAgICAgIDIgKi8KKyAgICAgICAgMHgwMDAzMzg2MSwgICAgIC8qICAgICAgMyAqLworICAg
ICAgICAweDAwMDMzODQxLCAgICAgLyogICAgICA0ICovCisgICAgICAgIDB4MDAwMzMwMzEsICAg
ICAvKiAgICAgIDUgKi8KKyAgICAgICAgMHgwMDAzMzAyMSAgICAgIC8qICAgICAgNiAqLworfTsK
IAogLyoKICAqIFRpbWluZyBjYWxjdWxhdGlvbiBmb3IgS2F1YWkuCkBAIC0yNjAsMzkgKzMwNSw3
MiBAQAogCWludCBwaW9tb2RlID0gZHJ2cC0+UElPX21vZGU7CiAJaW50IGRtYW1vZGUgPSBkcnZw
LT5ETUFfbW9kZTsKIAlpbnQgdWRtYW1vZGUgPSBkcnZwLT5VRE1BX21vZGU7Ci0JdV9pbnQgcGlv
Y29uZiwgZG1hY29uZjsKKwl1X2ludCBwaW9kbWFjb25mLCB1ZG1hY29uZjsKIAotCXBpb2NvbmYg
PSBwaW9fdGltaW5nX2thdWFpW3Bpb21vZGVdOworI2lmZGVmIERJQUdOT1NUSUMKKyAgICAgICAg
aWYgKHBpb21vZGUgPiA0IHx8IGRtYW1vZGUgPiAyIHx8IHVkbWFtb2RlID4gNSkKKyAgICAgICAg
ICAgICAgICBwYW5pYygiY2FsY190aW1pbmdfa2F1YWk6IGJhZCBtb2RlIik7CisjZW5kaWYKIAot
CWRtYWNvbmYgPSAwOworCXBpb2RtYWNvbmYgPSBwaW9fdGltaW5nX2thdWFpW3Bpb21vZGVdOwog
CWlmIChkcnZwLT5kcml2ZV9mbGFncyAmIERSSVZFX0RNQSkKLQkJZG1hY29uZiB8PSBkbWFfdGlt
aW5nX2thdWFpW2RtYW1vZGVdOwotCWlmIChkcnZwLT5kcml2ZV9mbGFncyAmIERSSVZFX1VETUEp
Ci0JCWRtYWNvbmYgfD0gdWRtYV90aW1pbmdfa2F1YWlbdWRtYW1vZGVdOworCQlwaW9kbWFjb25m
IHw9IGRtYV90aW1pbmdfa2F1YWlbZG1hbW9kZV07CisgICAgICAgIAorICAgICAgICB1ZG1hY29u
ZiA9IDA7CQorICAgICAgICBpZiAoZHJ2cC0+ZHJpdmVfZmxhZ3MgJiBEUklWRV9VRE1BKQorCQl1
ZG1hY29uZiA9IHVkbWFfdGltaW5nX2thdWFpW3VkbWFtb2RlXTsKIAotCWlmIChkcnZwLT5kcml2
ZV9mbGFncyAmIERSSVZFX1VETUEpCi0JCWRtYWNvbmYgfD0gMTsKLQotCXNjLT5zY19waW90aW1p
bmdfcltkcml2ZV0gPSBzYy0+c2NfcGlvdGltaW5nX3dbZHJpdmVdID0gcGlvY29uZjsKLQlzYy0+
c2NfZG1hdGltaW5nX3JbZHJpdmVdID0gc2MtPnNjX2RtYXRpbWluZ193W2RyaXZlXSA9IGRtYWNv
bmY7CisJc2MtPnNjX3Bpb3RpbWluZ1tkcml2ZV0gPSBwaW9kbWFjb25mOworCXNjLT5zY191ZG1h
dGltaW5nW2RyaXZlXSA9IHVkbWFjb25mOwogfQogCisvKgorICogVGltaW5nIGNvbmZpZ3VyYXRp
b24gZm9yIFNoYXN0YS4KKyAqLwordm9pZAorY2FsY190aW1pbmdfc2hhc3RhKHN0cnVjdCBrYXVh
aV9zb2Z0YyAqc2MsIGludCBkcml2ZSkKK3sKKyAgICAgICAgc3RydWN0IGF0YV9jaGFubmVsICpj
aHAgPSAmc2MtPnNjX2NoYW5uZWw7CisgICAgICAgIHN0cnVjdCBhdGFfZHJpdmVfZGF0YXMgKmRy
dnAgPSAmY2hwLT5jaF9kcml2ZVtkcml2ZV07CisgICAgICAgIGludCBwaW9tb2RlID0gZHJ2cC0+
UElPX21vZGU7CisgICAgICAgIGludCBkbWFtb2RlID0gZHJ2cC0+RE1BX21vZGU7CisgICAgICAg
IGludCB1ZG1hbW9kZSA9IGRydnAtPlVETUFfbW9kZTsKKyAgICAgICAgdV9pbnQgcGlvZG1hY29u
ZiwgdWRtYWNvbmY7CisKKyNpZmRlZiBESUFHTk9TVElDCisgICAgICAgIGlmIChwaW9tb2RlID4g
NCB8fCBkbWFtb2RlID4gMiB8fCB1ZG1hbW9kZSA+IDYpCisgICAgICAgICAgICAgICAgcGFuaWMo
ImNhbGNfdGltaW5nX3NoYXN0YTogYmFkIG1vZGUiKTsKKyNlbmRpZgorCisgICAgICAgIHBpb2Rt
YWNvbmYgPSBwaW9fdGltaW5nX3NoYXN0YVtwaW9tb2RlXTsKKyAgICAgICAgaWYgKGRydnAtPmRy
aXZlX2ZsYWdzICYgRFJJVkVfRE1BKQorICAgICAgICAgICAgICAgIHBpb2RtYWNvbmYgfD0gZG1h
X3RpbWluZ19zaGFzdGFbZG1hbW9kZV07CisKKyAgICAgICAgdWRtYWNvbmYgPSAwOworICAgICAg
ICBpZiAoZHJ2cC0+ZHJpdmVfZmxhZ3MgJiBEUklWRV9VRE1BKQorICAgICAgICAgICAgICAgIHVk
bWFjb25mID0gdWRtYV90aW1pbmdfc2hhc3RhW3VkbWFtb2RlXTsKKworICAgICAgICBzYy0+c2Nf
cGlvdGltaW5nW2RyaXZlXSA9IHBpb2RtYWNvbmY7CisgICAgICAgIHNjLT5zY191ZG1hdGltaW5n
W2RyaXZlXSA9IHVkbWFjb25mOworfQorIAogaW50CiBrYXVhaV9kbWFfaW5pdCh2b2lkICp2LCBp
bnQgY2hhbm5lbCwgaW50IGRyaXZlLCB2b2lkICpkYXRhYnVmLAogCXNpemVfdCBkYXRhbGVuLCBp
bnQgZmxhZ3MpCiB7CiAJc3RydWN0IGthdWFpX3NvZnRjICpzYyA9IHY7CiAJZGJkbWFfY29tbWFu
ZF90ICpjbWRwID0gc2MtPnNjX2RtYWNtZDsKLQlzdHJ1Y3QgYXRhX2NoYW5uZWwgKmNocCA9ICZz
Yy0+c2NfY2hhbm5lbDsKLQlzdHJ1Y3Qgd2RjX3JlZ3MgKndkciA9IENIQU5fVE9fV0RDX1JFR1Mo
Y2hwKTsKIAl2YWRkcl90IHZhID0gKHZhZGRyX3QpZGF0YWJ1ZjsKIAlpbnQgcmVhZCA9IGZsYWdz
ICYgV0RDX0RNQV9SRUFEOwogCWludCBjbWQgPSByZWFkID8gREJETUFfQ01EX0lOX01PUkUgOiBE
QkRNQV9DTURfT1VUX01PUkU7CiAJdV9pbnQgb2Zmc2V0OwogCi0JYnVzX3NwYWNlX3dyaXRlXzQo
d2RyLT5jbWRfaW90LCB3ZHItPmNtZF9iYXNlaW9oLCBETUFfQ09ORklHX1JFRywKLQkgICAgcmVh
ZCA/IHNjLT5zY19kbWF0aW1pbmdfcltkcml2ZV0gOiBzYy0+c2NfZG1hdGltaW5nX3dbZHJpdmVd
KTsKLQlidXNfc3BhY2VfcmVhZF80KHdkci0+Y21kX2lvdCwgd2RyLT5jbWRfYmFzZWlvaCwgRE1B
X0NPTkZJR19SRUcpOworI2lmZGVmIERJQUdOT1NUSUMKKyAgICAgICAgaWYgKGRhdGFsZW4gPiBN
QVhCWVRFUykKKyAgICAgICAgICAgICAgICBwYW5pYygia2F1YWlfZG1hX2luaXQ6IGRhdGFsZW4g
PiBNQVhCWVRFUyIpOworI2VuZGlmCisgICAgICAgIAorICAgICAgICBrYXVhaV93cml0ZV90aW1p
bmcoc2MsIGRyaXZlKTsKIAogCW9mZnNldCA9IHZhICYgUEdPRlNFVDsKIAo=
------=_Part_9183_32054307.1217166639451--
From: Krister Walfridsson <krister.walfridsson@gmail.com>
To: gnats-bugs@NetBSD.org
Cc: marcotrillo@gmail.com
Subject: Re: port-macppc/39176
Date: Sun, 27 Jul 2008 19:51:20 +0200 (CEST)
On Sun, 27 Jul 2008, Marco Trillo wrote:
> > +wdc1:0:0: lost interrupt
> > + type: ata tc_bcount: 512 tc_skip: 0
> > +wdc1:0:0: intr with DRQ (st=0x58)
> > +wd0c: device timeout reading fsbn 0 (wd0 bn 0; cn 0 tn 0 sn 0), retrying
> > +wdc1:0:0: lost interrupt
>
> I don't know if it's related to your problem, but I think the timing
> setting stuff on wdc at pci (src/sys/arch/macppc/dev/kauai.c) it's
> currently broken.
>
> Can you test the attached patch for kauai.c to see if your problems persist?
It works. Thanks!
/Krister
From: Michael Lorenz <macallan@netbsd.org>
To: Marco Trillo <marcotrillo@gmail.com>
Cc: gnats-bugs@netbsd.org,
kristerw@netbsd.org,
port-macppc@netbsd.org
Subject: Re: port-macppc/39176
Date: Sun, 27 Jul 2008 17:00:39 -0400
> Some comments with respect to the patch:
> I think that the following lines in kauai.c (rev. 1.25):
> 58 #define PIO_CONFIG_REG (0x200 >> 4) /* PIO and DMA access
> timing */
> 59 #define DMA_CONFIG_REG (0x210 >> 4) /* UDMA access timing */
> should read instead:
> 58 #define PIO_CONFIG_REG 0x200 /* PIO and DMA access timing */
> 59 #define DMA_CONFIG_REG 0x210 /* UDMA access timing */
Sounds very plausible, I remember making similar changes at lots of
other places when bus_space-ifying kauai.c, guess I missed that one.
From: Michael Lorenz <macallan@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/39176 CVS commit: src/sys/arch/macppc/dev
Date: Mon, 28 Jul 2008 16:54:49 +0000 (UTC)
Module Name: src
Committed By: macallan
Date: Mon Jul 28 16:54:49 UTC 2008
Modified Files:
src/sys/arch/macppc/dev: kauai.c
Log Message:
Fix remaining register offset shifting left over from proper bus_space-ification
done a while ago. From Marco Trillo.
This should fix PR 39176.
To generate a diff of this commit:
cvs rdiff -r1.25 -r1.26 src/sys/arch/macppc/dev/kauai.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: kristerw@NetBSD.org
State-Changed-When: Sun, 17 Aug 2008 21:06:28 +0000
State-Changed-Why:
It works now.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.