Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
ccf944bd
Commit
ccf944bd
authored
Sep 11, 2002
by
Jens Axboe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ppc low level ide driver updates
parent
8afb2f5f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
551 additions
and
464 deletions
+551
-464
drivers/ide/ppc/mpc8xx.c
drivers/ide/ppc/mpc8xx.c
+23
-23
drivers/ide/ppc/pmac.c
drivers/ide/ppc/pmac.c
+496
-437
drivers/ide/ppc/swarm.c
drivers/ide/ppc/swarm.c
+32
-4
No files found.
drivers/ide/ppc/mpc8xx.c
View file @
ccf944bd
...
@@ -44,13 +44,13 @@
...
@@ -44,13 +44,13 @@
#include <asm/irq.h>
#include <asm/irq.h>
#include "ide_modes.h"
#include "ide_modes.h"
static
int
identify
(
volatile
u
nsigned
char
*
p
);
static
int
identify
(
volatile
u
8
*
p
);
static
void
print_fixed
(
volatile
u
nsigned
char
*
p
);
static
void
print_fixed
(
volatile
u
8
*
p
);
static
void
print_funcid
(
int
func
);
static
void
print_funcid
(
int
func
);
static
int
check_ide_device
(
unsigned
long
base
);
static
int
check_ide_device
(
unsigned
long
base
);
static
void
ide_interrupt_ack
(
void
*
dev
);
static
void
ide_interrupt_ack
(
void
*
dev
);
static
void
m8xx_ide_tuneproc
(
ide_drive_t
*
drive
,
byte
pio
);
static
void
m8xx_ide_tuneproc
(
ide_drive_t
*
drive
,
u8
pio
);
typedef
struct
ide_ioport_desc
{
typedef
struct
ide_ioport_desc
{
unsigned
long
base_off
;
/* Offset to PCMCIA memory */
unsigned
long
base_off
;
/* Offset to PCMCIA memory */
...
@@ -433,7 +433,7 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
...
@@ -433,7 +433,7 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
/* Calculate PIO timings */
/* Calculate PIO timings */
static
void
static
void
m8xx_ide_tuneproc
(
ide_drive_t
*
drive
,
byte
pio
)
m8xx_ide_tuneproc
(
ide_drive_t
*
drive
,
u8
pio
)
{
{
ide_pio_data_t
d
;
ide_pio_data_t
d
;
#if defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT)
#if defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT)
...
@@ -617,12 +617,12 @@ ide_interrupt_ack (void *dev)
...
@@ -617,12 +617,12 @@ ide_interrupt_ack (void *dev)
static
int
check_ide_device
(
unsigned
long
base
)
static
int
check_ide_device
(
unsigned
long
base
)
{
{
volatile
u
nsigned
char
*
ident
=
NULL
;
volatile
u
8
*
ident
=
NULL
;
volatile
u
nsigned
char
*
feature_p
[
MAX_FEATURES
];
volatile
u
8
*
feature_p
[
MAX_FEATURES
];
volatile
u
nsigned
char
*
p
,
*
start
;
volatile
u
8
*
p
,
*
start
;
int
n_features
=
0
;
int
n_features
=
0
;
u
nsigned
char
func_id
=
~
0
;
u
8
func_id
=
~
0
;
u
nsigned
char
code
,
len
;
u
8
code
,
len
;
unsigned
short
config_base
=
0
;
unsigned
short
config_base
=
0
;
int
found
=
0
;
int
found
=
0
;
int
i
;
int
i
;
...
@@ -630,7 +630,7 @@ static int check_ide_device (unsigned long base)
...
@@ -630,7 +630,7 @@ static int check_ide_device (unsigned long base)
#ifdef DEBUG
#ifdef DEBUG
printk
(
"PCMCIA MEM: %08lX
\n
"
,
base
);
printk
(
"PCMCIA MEM: %08lX
\n
"
,
base
);
#endif
#endif
start
=
p
=
(
volatile
u
nsigned
char
*
)
base
;
start
=
p
=
(
volatile
u
8
*
)
base
;
while
((
p
-
start
)
<
MAX_TUPEL_SZ
)
{
while
((
p
-
start
)
<
MAX_TUPEL_SZ
)
{
...
@@ -642,7 +642,7 @@ static int check_ide_device (unsigned long base)
...
@@ -642,7 +642,7 @@ static int check_ide_device (unsigned long base)
len
=
*
p
;
p
+=
2
;
len
=
*
p
;
p
+=
2
;
#ifdef DEBUG_PCMCIA
#ifdef DEBUG_PCMCIA
{
volatile
u
nsigned
char
*
q
=
p
;
{
volatile
u
8
*
q
=
p
;
printk
(
"
\n
Tuple code %02x length %d
\n\t
Data:"
,
printk
(
"
\n
Tuple code %02x length %d
\n\t
Data:"
,
code
,
len
);
code
,
len
);
...
@@ -673,7 +673,7 @@ static int check_ide_device (unsigned long base)
...
@@ -673,7 +673,7 @@ static int check_ide_device (unsigned long base)
found
=
identify
(
ident
);
found
=
identify
(
ident
);
if
(
func_id
!=
((
u
nsigned
char
)
~
0
))
{
if
(
func_id
!=
((
u
8
)
~
0
))
{
print_funcid
(
func_id
);
print_funcid
(
func_id
);
if
(
func_id
==
CISTPL_FUNCID_FIXED
)
if
(
func_id
==
CISTPL_FUNCID_FIXED
)
...
@@ -692,7 +692,7 @@ static int check_ide_device (unsigned long base)
...
@@ -692,7 +692,7 @@ static int check_ide_device (unsigned long base)
}
}
/* set level mode irq and I/O mapped device in config reg*/
/* set level mode irq and I/O mapped device in config reg*/
*
((
u
nsigned
char
*
)(
base
+
config_base
))
=
0x41
;
*
((
u
8
*
)(
base
+
config_base
))
=
0x41
;
return
(
0
);
return
(
0
);
}
}
...
@@ -738,14 +738,14 @@ static void print_funcid (int func)
...
@@ -738,14 +738,14 @@ static void print_funcid (int func)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
static
void
print_fixed
(
volatile
u
nsigned
char
*
p
)
static
void
print_fixed
(
volatile
u
8
*
p
)
{
{
if
(
p
==
NULL
)
if
(
p
==
NULL
)
return
;
return
;
switch
(
*
p
)
{
switch
(
*
p
)
{
case
CISTPL_FUNCE_IDE_IFACE
:
case
CISTPL_FUNCE_IDE_IFACE
:
{
u
nsigned
char
iface
=
*
(
p
+
2
);
{
u
8
iface
=
*
(
p
+
2
);
printk
((
iface
==
CISTPL_IDE_INTERFACE
)
?
" IDE"
:
" unknown"
);
printk
((
iface
==
CISTPL_IDE_INTERFACE
)
?
" IDE"
:
" unknown"
);
printk
(
" interface "
);
printk
(
" interface "
);
...
@@ -753,8 +753,8 @@ static void print_fixed (volatile unsigned char *p)
...
@@ -753,8 +753,8 @@ static void print_fixed (volatile unsigned char *p)
}
}
case
CISTPL_FUNCE_IDE_MASTER
:
case
CISTPL_FUNCE_IDE_MASTER
:
case
CISTPL_FUNCE_IDE_SLAVE
:
case
CISTPL_FUNCE_IDE_SLAVE
:
{
u
nsigned
char
f1
=
*
(
p
+
2
);
{
u
8
f1
=
*
(
p
+
2
);
u
nsigned
char
f2
=
*
(
p
+
4
);
u
8
f2
=
*
(
p
+
4
);
printk
((
f1
&
CISTPL_IDE_SILICON
)
?
" [silicon]"
:
" [rotating]"
);
printk
((
f1
&
CISTPL_IDE_SILICON
)
?
" [silicon]"
:
" [rotating]"
);
...
@@ -796,17 +796,17 @@ static void print_fixed (volatile unsigned char *p)
...
@@ -796,17 +796,17 @@ static void print_fixed (volatile unsigned char *p)
#define MAX_IDENT_CHARS 64
#define MAX_IDENT_CHARS 64
#define MAX_IDENT_FIELDS 4
#define MAX_IDENT_FIELDS 4
static
u
nsigned
char
*
known_cards
[]
=
{
static
u
8
*
known_cards
[]
=
{
"ARGOSY PnPIDE D5"
,
"ARGOSY PnPIDE D5"
,
NULL
NULL
};
};
static
int
identify
(
volatile
u
nsigned
char
*
p
)
static
int
identify
(
volatile
u
8
*
p
)
{
{
u
nsigned
char
id_str
[
MAX_IDENT_CHARS
];
u
8
id_str
[
MAX_IDENT_CHARS
];
u
nsigned
char
data
;
u
8
data
;
u
nsigned
char
*
t
;
u
8
*
t
;
u
nsigned
char
**
card
;
u
8
**
card
;
int
i
,
done
;
int
i
,
done
;
if
(
p
==
NULL
)
if
(
p
==
NULL
)
...
...
drivers/ide/ppc/pmac.c
View file @
ccf944bd
...
@@ -50,13 +50,14 @@ extern void ide_do_request(ide_hwgroup_t *hwgroup, int masked_irq);
...
@@ -50,13 +50,14 @@ extern void ide_do_request(ide_hwgroup_t *hwgroup, int masked_irq);
#define DMA_WAIT_TIMEOUT 500
#define DMA_WAIT_TIMEOUT 500
struct
pmac_ide_hwif
{
typedef
struct
pmac_ide_hwif
{
ide_ioreg_t
regbase
;
ide_ioreg_t
regbase
;
int
irq
;
int
irq
;
int
kind
;
int
kind
;
int
aapl_bus_id
;
int
aapl_bus_id
;
struct
device_node
*
node
;
struct
device_node
*
node
;
u32
timings
[
2
];
u32
timings
[
2
];
int
index
;
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
/* Those fields are duplicating what is in hwif. We currently
/* Those fields are duplicating what is in hwif. We currently
* can't use the hwif ones because of some assumptions that are
* can't use the hwif ones because of some assumptions that are
...
@@ -71,8 +72,9 @@ struct pmac_ide_hwif {
...
@@ -71,8 +72,9 @@ struct pmac_ide_hwif {
int
sg_dma_direction
;
int
sg_dma_direction
;
#endif
#endif
}
pmac_ide
[
MAX_HWIFS
]
__pmacdata
;
}
pmac_ide
_hwif_t
;
static
pmac_ide_hwif_t
pmac_ide
[
MAX_HWIFS
]
__pmacdata
;
static
int
pmac_ide_count
;
static
int
pmac_ide_count
;
enum
{
enum
{
...
@@ -244,11 +246,11 @@ struct {
...
@@ -244,11 +246,11 @@ struct {
#define IDE_WAKEUP_DELAY_MS 2000
#define IDE_WAKEUP_DELAY_MS 2000
static
void
pmac_ide_setup_dma
(
struct
device_node
*
np
,
int
ix
);
static
void
pmac_ide_setup_dma
(
struct
device_node
*
np
,
int
ix
);
static
int
pmac_ide_dmaproc
(
ide_dma_action_t
func
,
ide_drive_t
*
drive
);
static
int
pmac_ide_build_dmatable
(
ide_drive_t
*
drive
,
int
wr
);
static
int
pmac_ide_build_dmatable
(
ide_drive_t
*
drive
,
int
ix
,
int
wr
);
static
int
pmac_ide_tune_chipset
(
ide_drive_t
*
drive
,
u8
speed
);
static
int
pmac_ide_tune_chipset
(
ide_drive_t
*
drive
,
byte
speed
);
static
void
pmac_ide_tuneproc
(
ide_drive_t
*
drive
,
u8
pio
);
static
void
pmac_ide_tuneproc
(
ide_drive_t
*
drive
,
byte
pio
);
static
void
pmac_ide_selectproc
(
ide_drive_t
*
drive
);
static
void
pmac_ide_selectproc
(
ide_drive_t
*
drive
);
static
int
pmac_ide_dma_begin
(
ide_drive_t
*
drive
);
#endif
/* CONFIG_BLK_DEV_IDEDMA_PMAC */
#endif
/* CONFIG_BLK_DEV_IDEDMA_PMAC */
...
@@ -259,28 +261,6 @@ struct pmu_sleep_notifier idepmac_sleep_notifier = {
...
@@ -259,28 +261,6 @@ struct pmu_sleep_notifier idepmac_sleep_notifier = {
};
};
#endif
/* CONFIG_PMAC_PBOOK */
#endif
/* CONFIG_PMAC_PBOOK */
static
int
pmac_ide_notify_reboot
(
struct
notifier_block
*
,
unsigned
long
,
void
*
);
static
struct
notifier_block
pmac_ide_reboot_notifier
=
{
pmac_ide_notify_reboot
,
NULL
,
0
};
static
int
__pmac
pmac_ide_find
(
ide_drive_t
*
drive
)
{
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
ide_ioreg_t
base
;
int
i
;
for
(
i
=
0
;
i
<
pmac_ide_count
;
i
++
)
{
base
=
pmac_ide
[
i
].
regbase
;
if
(
base
&&
base
==
hwif
->
io_ports
[
0
])
return
i
;
}
return
-
1
;
}
/*
/*
* N.B. this can't be an initfunc, because the media-bay task can
* N.B. this can't be an initfunc, because the media-bay task can
* call ide_[un]register at any time.
* call ide_[un]register at any time.
...
@@ -313,33 +293,7 @@ pmac_ide_init_hwif_ports(hw_regs_t *hw,
...
@@ -313,33 +293,7 @@ pmac_ide_init_hwif_ports(hw_regs_t *hw,
if
(
irq
!=
NULL
)
if
(
irq
!=
NULL
)
*
irq
=
pmac_ide
[
ix
].
irq
;
*
irq
=
pmac_ide
[
ix
].
irq
;
ide_hwifs
[
ix
].
tuneproc
=
pmac_ide_tuneproc
;
ide_hwifs
[
ix
].
selectproc
=
pmac_ide_selectproc
;
ide_hwifs
[
ix
].
speedproc
=
&
pmac_ide_tune_chipset
;
if
(
pmac_ide
[
ix
].
dma_regs
&&
pmac_ide
[
ix
].
dma_table_cpu
)
{
ide_hwifs
[
ix
].
dmaproc
=
&
pmac_ide_dmaproc
;
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO
if
(
!
noautodma
)
ide_hwifs
[
ix
].
autodma
=
1
;
#endif
}
}
#if 0
/* This one could be later extended to handle CMD IDE and be used by some kind
* of /proc interface. I want to be able to get the devicetree path of a block
* device for yaboot configuration
*/
struct device_node*
pmac_ide_get_devnode(ide_drive_t *drive)
{
int i = pmac_ide_find(drive);
if (i < 0)
return NULL;
return pmac_ide[i].node;
}
}
#endif
/* Setup timings for the selected drive (master/slave). I still need to verify if this
/* Setup timings for the selected drive (master/slave). I still need to verify if this
* is enough, I beleive selectproc will be called whenever an IDE command is started,
* is enough, I beleive selectproc will be called whenever an IDE command is started,
...
@@ -347,70 +301,88 @@ pmac_ide_get_devnode(ide_drive_t *drive)
...
@@ -347,70 +301,88 @@ pmac_ide_get_devnode(ide_drive_t *drive)
static
void
__pmac
static
void
__pmac
pmac_ide_selectproc
(
ide_drive_t
*
drive
)
pmac_ide_selectproc
(
ide_drive_t
*
drive
)
{
{
int
i
=
pmac_ide_find
(
drive
);
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
if
(
i
<
0
)
if
(
pmif
==
NULL
)
return
;
return
;
if
(
drive
->
select
.
b
.
unit
&
0x01
)
if
(
drive
->
select
.
b
.
unit
&
0x01
)
out_le32
((
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
+
_IO_BASE
)
,
writel
(
pmif
->
timings
[
1
]
,
pmac_ide
[
i
].
timings
[
1
]
);
(
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
)
);
else
else
out_le32
((
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
+
_IO_BASE
)
,
writel
(
pmif
->
timings
[
0
]
,
pmac_ide
[
i
].
timings
[
0
]
);
(
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
)
);
(
void
)
in_le32
((
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
+
_IO_BASE
));
(
void
)
readl
((
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
));
}
}
static
int
__pmac
static
int
__pmac
pmac_ide_do_setfeature
(
ide_drive_t
*
drive
,
byte
command
)
pmac_ide_do_setfeature
(
ide_drive_t
*
drive
,
u8
command
)
{
{
int
result
=
1
;
unsigned
long
flags
;
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
int
result
=
1
;
disable_irq
(
hwif
->
irq
);
/* disable_irq_nosync ?? */
disable_irq
(
hwif
->
irq
);
/* disable_irq_nosync ?? */
udelay
(
1
);
udelay
(
1
);
SELECT_DRIVE
(
HWIF
(
drive
),
drive
);
SELECT_DRIVE
(
drive
);
SELECT_MASK
(
HWIF
(
drive
),
drive
,
0
);
SELECT_MASK
(
drive
,
0
);
udelay
(
1
);
udelay
(
1
);
(
void
)
GET_STAT
();
/* Get rid of pending error state */
/* Get rid of pending error state */
if
(
wait_for_ready
(
drive
,
2000
))
{
/* Timeout bumped for some powerbooks */
(
void
)
hwif
->
INB
(
IDE_STATUS_REG
);
printk
(
KERN_ERR
"pmac_ide_do_setfeature disk not ready before SET_FEATURE!
\n
"
);
/* Timeout bumped for some powerbooks */
if
(
wait_for_ready
(
drive
,
2000
))
{
/* Timeout bumped for some powerbooks */
printk
(
KERN_ERR
"pmac_ide_do_setfeature disk not ready "
"before SET_FEATURE!
\n
"
);
goto
out
;
goto
out
;
}
}
udelay
(
10
);
udelay
(
10
);
OUT_BYTE
(
drive
->
ctl
|
2
,
IDE_CONTROL_REG
);
hwif
->
OUTB
(
drive
->
ctl
|
2
,
IDE_CONTROL_REG
);
OUT_BYTE
(
command
,
IDE_NSECTOR_REG
);
hwif
->
OUTB
(
command
,
IDE_NSECTOR_REG
);
OUT_BYTE
(
SETFEATURES_XFER
,
IDE_FEATURE_REG
);
hwif
->
OUTB
(
SETFEATURES_XFER
,
IDE_FEATURE_REG
);
OUT_BYTE
(
WIN_SETFEATURES
,
IDE_COMMAND_REG
);
hwif
->
OUTB
(
WIN_SETFEATURES
,
IDE_COMMAND_REG
);
udelay
(
1
);
udelay
(
1
);
local_irq_set
(
flags
);
/* Timeout bumped for some powerbooks */
result
=
wait_for_ready
(
drive
,
2000
);
/* Timeout bumped for some powerbooks */
result
=
wait_for_ready
(
drive
,
2000
);
local_irq_restore
(
flags
);
hwif
->
OUTB
(
drive
->
ctl
,
IDE_CONTROL_REG
);
OUT_BYTE
(
drive
->
ctl
,
IDE_CONTROL_REG
);
if
(
result
)
if
(
result
)
printk
(
KERN_ERR
"pmac_ide_do_setfeature disk not ready after SET_FEATURE !
\n
"
);
printk
(
KERN_ERR
"pmac_ide_do_setfeature disk not ready "
"after SET_FEATURE !
\n
"
);
out:
out:
SELECT_MASK
(
HWIF
(
drive
),
drive
,
0
);
SELECT_MASK
(
drive
,
0
);
if
(
result
==
0
)
{
if
(
result
==
0
)
{
drive
->
id
->
dma_ultra
&=
~
0xFF00
;
drive
->
id
->
dma_ultra
&=
~
0xFF00
;
drive
->
id
->
dma_mword
&=
~
0x0F00
;
drive
->
id
->
dma_mword
&=
~
0x0F00
;
drive
->
id
->
dma_1word
&=
~
0x0F00
;
drive
->
id
->
dma_1word
&=
~
0x0F00
;
switch
(
command
)
{
switch
(
command
)
{
case
XFER_UDMA_7
:
drive
->
id
->
dma_ultra
|=
0x8080
;
break
;
case
XFER_UDMA_7
:
case
XFER_UDMA_6
:
drive
->
id
->
dma_ultra
|=
0x4040
;
break
;
drive
->
id
->
dma_ultra
|=
0x8080
;
break
;
case
XFER_UDMA_5
:
drive
->
id
->
dma_ultra
|=
0x2020
;
break
;
case
XFER_UDMA_6
:
case
XFER_UDMA_4
:
drive
->
id
->
dma_ultra
|=
0x1010
;
break
;
drive
->
id
->
dma_ultra
|=
0x4040
;
break
;
case
XFER_UDMA_3
:
drive
->
id
->
dma_ultra
|=
0x0808
;
break
;
case
XFER_UDMA_5
:
case
XFER_UDMA_2
:
drive
->
id
->
dma_ultra
|=
0x0404
;
break
;
drive
->
id
->
dma_ultra
|=
0x2020
;
break
;
case
XFER_UDMA_1
:
drive
->
id
->
dma_ultra
|=
0x0202
;
break
;
case
XFER_UDMA_4
:
case
XFER_UDMA_0
:
drive
->
id
->
dma_ultra
|=
0x0101
;
break
;
drive
->
id
->
dma_ultra
|=
0x1010
;
break
;
case
XFER_MW_DMA_2
:
drive
->
id
->
dma_mword
|=
0x0404
;
break
;
case
XFER_UDMA_3
:
case
XFER_MW_DMA_1
:
drive
->
id
->
dma_mword
|=
0x0202
;
break
;
drive
->
id
->
dma_ultra
|=
0x0808
;
break
;
case
XFER_MW_DMA_0
:
drive
->
id
->
dma_mword
|=
0x0101
;
break
;
case
XFER_UDMA_2
:
case
XFER_SW_DMA_2
:
drive
->
id
->
dma_1word
|=
0x0404
;
break
;
drive
->
id
->
dma_ultra
|=
0x0404
;
break
;
case
XFER_SW_DMA_1
:
drive
->
id
->
dma_1word
|=
0x0202
;
break
;
case
XFER_UDMA_1
:
case
XFER_SW_DMA_0
:
drive
->
id
->
dma_1word
|=
0x0101
;
break
;
drive
->
id
->
dma_ultra
|=
0x0202
;
break
;
case
XFER_UDMA_0
:
drive
->
id
->
dma_ultra
|=
0x0101
;
break
;
case
XFER_MW_DMA_2
:
drive
->
id
->
dma_mword
|=
0x0404
;
break
;
case
XFER_MW_DMA_1
:
drive
->
id
->
dma_mword
|=
0x0202
;
break
;
case
XFER_MW_DMA_0
:
drive
->
id
->
dma_mword
|=
0x0101
;
break
;
case
XFER_SW_DMA_2
:
drive
->
id
->
dma_1word
|=
0x0404
;
break
;
case
XFER_SW_DMA_1
:
drive
->
id
->
dma_1word
|=
0x0202
;
break
;
case
XFER_SW_DMA_0
:
drive
->
id
->
dma_1word
|=
0x0101
;
break
;
default:
break
;
default:
break
;
}
}
}
}
...
@@ -420,32 +392,31 @@ pmac_ide_do_setfeature(ide_drive_t *drive, byte command)
...
@@ -420,32 +392,31 @@ pmac_ide_do_setfeature(ide_drive_t *drive, byte command)
/* Calculate PIO timings */
/* Calculate PIO timings */
static
void
__pmac
static
void
__pmac
pmac_ide_tuneproc
(
ide_drive_t
*
drive
,
byte
pio
)
pmac_ide_tuneproc
(
ide_drive_t
*
drive
,
u8
pio
)
{
{
ide_pio_data_t
d
;
ide_pio_data_t
d
;
int
i
;
u32
*
timings
;
u32
*
timings
;
unsigned
accessTicks
,
recTicks
;
unsigned
accessTicks
,
recTicks
;
unsigned
accessTime
,
recTime
;
unsigned
accessTime
,
recTime
;
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
i
=
pmac_ide_find
(
drive
);
if
(
pmif
==
NULL
)
if
(
i
<
0
)
return
;
return
;
pio
=
ide_get_best_pio_mode
(
drive
,
pio
,
4
,
&
d
);
pio
=
ide_get_best_pio_mode
(
drive
,
pio
,
4
,
&
d
);
accessTicks
=
SYSCLK_TICKS
(
ide_pio_timings
[
pio
].
active_time
);
accessTicks
=
SYSCLK_TICKS
(
ide_pio_timings
[
pio
].
active_time
);
if
(
drive
->
select
.
b
.
unit
&
0x01
)
if
(
drive
->
select
.
b
.
unit
&
0x01
)
timings
=
&
pm
ac_ide
[
i
].
timings
[
1
];
timings
=
&
pm
if
->
timings
[
1
];
else
else
timings
=
&
pm
ac_ide
[
i
].
timings
[
0
];
timings
=
&
pm
if
->
timings
[
0
];
recTime
=
d
.
cycle_time
-
ide_pio_timings
[
pio
].
active_time
recTime
=
d
.
cycle_time
-
ide_pio_timings
[
pio
].
active_time
-
ide_pio_timings
[
pio
].
setup_time
;
-
ide_pio_timings
[
pio
].
setup_time
;
recTime
=
max
(
recTime
,
150U
);
recTime
=
max
(
recTime
,
150U
);
accessTime
=
ide_pio_timings
[
pio
].
active_time
;
accessTime
=
ide_pio_timings
[
pio
].
active_time
;
accessTime
=
max
(
accessTime
,
150U
);
accessTime
=
max
(
accessTime
,
150U
);
if
(
pm
ac_ide
[
i
].
kind
==
controller_kl_ata4
||
if
(
pm
if
->
kind
==
controller_kl_ata4
||
pm
ac_ide
[
i
].
kind
==
controller_kl_ata4_80
)
{
pm
if
->
kind
==
controller_kl_ata4_80
)
{
/* 66Mhz cell */
/* 66Mhz cell */
accessTicks
=
SYSCLK_TICKS_66
(
accessTime
);
accessTicks
=
SYSCLK_TICKS_66
(
accessTime
);
accessTicks
=
min
(
accessTicks
,
0x1fU
);
accessTicks
=
min
(
accessTicks
,
0x1fU
);
...
@@ -478,14 +449,14 @@ pmac_ide_tuneproc(ide_drive_t *drive, byte pio)
...
@@ -478,14 +449,14 @@ pmac_ide_tuneproc(ide_drive_t *drive, byte pio)
printk
(
KERN_ERR
"ide_pmac: Set PIO timing for mode %d, reg: 0x%08x
\n
"
,
printk
(
KERN_ERR
"ide_pmac: Set PIO timing for mode %d, reg: 0x%08x
\n
"
,
pio
,
*
timings
);
pio
,
*
timings
);
#endif
#endif
if
(
drive
->
select
.
all
==
IN_BYTE
(
IDE_SELECT_REG
))
if
(
drive
->
select
.
all
==
HWIF
(
drive
)
->
INB
(
IDE_SELECT_REG
))
pmac_ide_selectproc
(
drive
);
pmac_ide_selectproc
(
drive
);
}
}
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
static
int
__pmac
static
int
__pmac
set_timings_udma
(
u32
*
timings
,
byte
speed
)
set_timings_udma
(
u32
*
timings
,
u8
speed
)
{
{
unsigned
rdyToPauseTicks
,
wrDataSetupTicks
,
addrTicks
;
unsigned
rdyToPauseTicks
,
wrDataSetupTicks
,
addrTicks
;
...
@@ -507,7 +478,7 @@ set_timings_udma(u32 *timings, byte speed)
...
@@ -507,7 +478,7 @@ set_timings_udma(u32 *timings, byte speed)
}
}
static
int
__pmac
static
int
__pmac
set_timings_mdma
(
int
intf_type
,
u32
*
timings
,
byte
speed
,
int
drive_cycle_time
)
set_timings_mdma
(
int
intf_type
,
u32
*
timings
,
u8
speed
,
int
drive_cycle_time
)
{
{
int
cycleTime
,
accessTime
,
recTime
;
int
cycleTime
,
accessTime
,
recTime
;
unsigned
accessTicks
,
recTicks
;
unsigned
accessTicks
,
recTicks
;
...
@@ -620,36 +591,36 @@ set_timings_mdma(int intf_type, u32 *timings, byte speed, int drive_cycle_time)
...
@@ -620,36 +591,36 @@ set_timings_mdma(int intf_type, u32 *timings, byte speed, int drive_cycle_time)
* our, normal mdma function is supposed to be more precise
* our, normal mdma function is supposed to be more precise
*/
*/
static
int
__pmac
static
int
__pmac
pmac_ide_tune_chipset
(
ide_drive_t
*
drive
,
byte
speed
)
pmac_ide_tune_chipset
(
ide_drive_t
*
drive
,
u8
speed
)
{
{
int
intf
=
pmac_ide_find
(
drive
);
int
unit
=
(
drive
->
select
.
b
.
unit
&
0x01
);
int
unit
=
(
drive
->
select
.
b
.
unit
&
0x01
)
;
int
ret
=
0
;
int
ret
=
0
;
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
u32
*
timings
;
u32
*
timings
;
if
(
intf
<
0
)
if
(
pmif
==
NULL
)
return
1
;
return
1
;
timings
=
&
pm
ac_ide
[
intf
].
timings
[
unit
];
timings
=
&
pm
if
->
timings
[
unit
];
switch
(
speed
)
{
switch
(
speed
)
{
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
case
XFER_UDMA_4
:
case
XFER_UDMA_4
:
case
XFER_UDMA_3
:
case
XFER_UDMA_3
:
if
(
pm
ac_ide
[
intf
].
kind
!=
controller_kl_ata4_80
)
if
(
pm
if
->
kind
!=
controller_kl_ata4_80
)
return
1
;
return
1
;
case
XFER_UDMA_2
:
case
XFER_UDMA_2
:
case
XFER_UDMA_1
:
case
XFER_UDMA_1
:
case
XFER_UDMA_0
:
case
XFER_UDMA_0
:
if
(
pm
ac_ide
[
intf
].
kind
!=
controller_kl_ata4
&&
if
(
pm
if
->
kind
!=
controller_kl_ata4
&&
pm
ac_ide
[
intf
].
kind
!=
controller_kl_ata4_80
)
pm
if
->
kind
!=
controller_kl_ata4_80
)
return
1
;
return
1
;
ret
=
set_timings_udma
(
timings
,
speed
);
ret
=
set_timings_udma
(
timings
,
speed
);
break
;
break
;
case
XFER_MW_DMA_2
:
case
XFER_MW_DMA_2
:
case
XFER_MW_DMA_1
:
case
XFER_MW_DMA_1
:
case
XFER_MW_DMA_0
:
case
XFER_MW_DMA_0
:
ret
=
set_timings_mdma
(
pm
ac_ide
[
intf
].
kind
,
timings
,
speed
,
0
);
ret
=
set_timings_mdma
(
pm
if
->
kind
,
timings
,
speed
,
0
);
break
;
break
;
case
XFER_SW_DMA_2
:
case
XFER_SW_DMA_2
:
case
XFER_SW_DMA_1
:
case
XFER_SW_DMA_1
:
...
@@ -680,11 +651,11 @@ pmac_ide_tune_chipset (ide_drive_t *drive, byte speed)
...
@@ -680,11 +651,11 @@ pmac_ide_tune_chipset (ide_drive_t *drive, byte speed)
}
}
static
void
__pmac
static
void
__pmac
sanitize_timings
(
int
i
)
sanitize_timings
(
pmac_ide_hwif_t
*
pmif
)
{
{
unsigned
value
;
unsigned
value
;
switch
(
pm
ac_ide
[
i
].
kind
)
{
switch
(
pm
if
->
kind
)
{
case
controller_kl_ata4
:
case
controller_kl_ata4
:
case
controller_kl_ata4_80
:
case
controller_kl_ata4_80
:
value
=
0x0008438c
;
value
=
0x0008438c
;
...
@@ -698,7 +669,7 @@ sanitize_timings(int i)
...
@@ -698,7 +669,7 @@ sanitize_timings(int i)
value
=
0x00074526
;
value
=
0x00074526
;
break
;
break
;
}
}
pm
ac_ide
[
i
].
timings
[
0
]
=
pmac_ide
[
i
].
timings
[
1
]
=
value
;
pm
if
->
timings
[
0
]
=
pmif
->
timings
[
1
]
=
value
;
}
}
ide_ioreg_t
__pmac
ide_ioreg_t
__pmac
...
@@ -793,7 +764,7 @@ pmac_ide_probe(void)
...
@@ -793,7 +764,7 @@ pmac_ide_probe(void)
for
(
i
=
0
,
np
=
atas
;
i
<
MAX_HWIFS
&&
np
!=
NULL
;
np
=
np
->
next
)
{
for
(
i
=
0
,
np
=
atas
;
i
<
MAX_HWIFS
&&
np
!=
NULL
;
np
=
np
->
next
)
{
struct
device_node
*
tp
;
struct
device_node
*
tp
;
struct
pmac_ide_hwif
*
pm
hw
;
struct
pmac_ide_hwif
*
pm
if
;
int
*
bidp
;
int
*
bidp
;
int
in_bay
=
0
;
int
in_bay
=
0
;
u8
pbus
,
pid
;
u8
pbus
,
pid
;
...
@@ -833,7 +804,7 @@ pmac_ide_probe(void)
...
@@ -833,7 +804,7 @@ pmac_ide_probe(void)
++
i
;
++
i
;
if
(
i
>=
MAX_HWIFS
)
if
(
i
>=
MAX_HWIFS
)
break
;
break
;
pm
hw
=
&
pmac_ide
[
i
];
pm
if
=
&
pmac_ide
[
i
];
/*
/*
* Some older OFs have bogus sizes, causing request_OF_resource
* Some older OFs have bogus sizes, causing request_OF_resource
...
@@ -849,7 +820,7 @@ pmac_ide_probe(void)
...
@@ -849,7 +820,7 @@ pmac_ide_probe(void)
continue
;
continue
;
}
}
base
=
(
unsigned
long
)
ioremap
(
np
->
addrs
[
0
].
address
,
0x400
)
-
_IO_BASE
;
base
=
(
unsigned
long
)
ioremap
(
np
->
addrs
[
0
].
address
,
0x400
);
/* XXX This is bogus. Should be fixed in the registry by checking
/* XXX This is bogus. Should be fixed in the registry by checking
the kind of host interrupt controller, a bit like gatwick
the kind of host interrupt controller, a bit like gatwick
...
@@ -862,30 +833,31 @@ pmac_ide_probe(void)
...
@@ -862,30 +833,31 @@ pmac_ide_probe(void)
}
else
{
}
else
{
irq
=
np
->
intrs
[
0
].
line
;
irq
=
np
->
intrs
[
0
].
line
;
}
}
pmhw
->
regbase
=
base
;
pmif
->
regbase
=
base
;
pmhw
->
irq
=
irq
;
pmif
->
irq
=
irq
;
pmhw
->
node
=
np
;
pmif
->
node
=
np
;
pmif
->
index
=
i
;
if
(
device_is_compatible
(
np
,
"keylargo-ata"
))
{
if
(
device_is_compatible
(
np
,
"keylargo-ata"
))
{
if
(
strcmp
(
np
->
name
,
"ata-4"
)
==
0
)
if
(
strcmp
(
np
->
name
,
"ata-4"
)
==
0
)
pm
hw
->
kind
=
controller_kl_ata4
;
pm
if
->
kind
=
controller_kl_ata4
;
else
else
pm
hw
->
kind
=
controller_kl_ata3
;
pm
if
->
kind
=
controller_kl_ata3
;
}
else
if
(
device_is_compatible
(
np
,
"heathrow-ata"
))
}
else
if
(
device_is_compatible
(
np
,
"heathrow-ata"
))
pm
hw
->
kind
=
controller_heathrow
;
pm
if
->
kind
=
controller_heathrow
;
else
else
pm
hw
->
kind
=
controller_ohare
;
pm
if
->
kind
=
controller_ohare
;
bidp
=
(
int
*
)
get_property
(
np
,
"AAPL,bus-id"
,
NULL
);
bidp
=
(
int
*
)
get_property
(
np
,
"AAPL,bus-id"
,
NULL
);
pm
hw
->
aapl_bus_id
=
bidp
?
*
bidp
:
0
;
pm
if
->
aapl_bus_id
=
bidp
?
*
bidp
:
0
;
if
(
pm
hw
->
kind
==
controller_kl_ata4
)
{
if
(
pm
if
->
kind
==
controller_kl_ata4
)
{
char
*
cable
=
get_property
(
np
,
"cable-type"
,
NULL
);
char
*
cable
=
get_property
(
np
,
"cable-type"
,
NULL
);
if
(
cable
&&
!
strncmp
(
cable
,
"80-"
,
3
))
if
(
cable
&&
!
strncmp
(
cable
,
"80-"
,
3
))
pm
hw
->
kind
=
controller_kl_ata4_80
;
pm
if
->
kind
=
controller_kl_ata4_80
;
}
}
/* Make sure we have sane timings */
/* Make sure we have sane timings */
sanitize_timings
(
i
);
sanitize_timings
(
pmif
);
if
(
np
->
parent
&&
np
->
parent
->
name
if
(
np
->
parent
&&
np
->
parent
->
name
&&
strcasecmp
(
np
->
parent
->
name
,
"media-bay"
)
==
0
)
{
&&
strcasecmp
(
np
->
parent
->
name
,
"media-bay"
)
==
0
)
{
...
@@ -894,8 +866,8 @@ pmac_ide_probe(void)
...
@@ -894,8 +866,8 @@ pmac_ide_probe(void)
#endif
/* CONFIG_PMAC_PBOOK */
#endif
/* CONFIG_PMAC_PBOOK */
in_bay
=
1
;
in_bay
=
1
;
if
(
!
bidp
)
if
(
!
bidp
)
pm
hw
->
aapl_bus_id
=
1
;
pm
if
->
aapl_bus_id
=
1
;
}
else
if
(
pm
hw
->
kind
==
controller_ohare
)
{
}
else
if
(
pm
if
->
kind
==
controller_ohare
)
{
/* The code below is having trouble on some ohare machines
/* The code below is having trouble on some ohare machines
* (timing related ?). Until I can put my hand on one of these
* (timing related ?). Until I can put my hand on one of these
* units, I keep the old way
* units, I keep the old way
...
@@ -904,21 +876,31 @@ pmac_ide_probe(void)
...
@@ -904,21 +876,31 @@ pmac_ide_probe(void)
}
else
{
}
else
{
/* This is necessary to enable IDE when net-booting */
/* This is necessary to enable IDE when net-booting */
printk
(
KERN_INFO
"pmac_ide: enabling IDE bus ID %d
\n
"
,
printk
(
KERN_INFO
"pmac_ide: enabling IDE bus ID %d
\n
"
,
pm
hw
->
aapl_bus_id
);
pm
if
->
aapl_bus_id
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_RESET
,
np
,
pm
hw
->
aapl_bus_id
,
1
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_RESET
,
np
,
pm
if
->
aapl_bus_id
,
1
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_ENABLE
,
np
,
pm
hw
->
aapl_bus_id
,
1
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_ENABLE
,
np
,
pm
if
->
aapl_bus_id
,
1
);
mdelay
(
10
);
mdelay
(
10
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_RESET
,
np
,
pm
hw
->
aapl_bus_id
,
0
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_RESET
,
np
,
pm
if
->
aapl_bus_id
,
0
);
big_delay
=
1
;
big_delay
=
1
;
}
}
hwif
=
&
ide_hwifs
[
i
];
hwif
=
&
ide_hwifs
[
i
];
/* Setup MMIO ops */
default_hwif_mmiops
(
hwif
);
/* Tell common code _not_ to mess with resources */
hwif
->
mmio
=
2
;
hwif
->
hwif_data
=
pmif
;
pmac_ide_init_hwif_ports
(
&
hwif
->
hw
,
base
,
0
,
&
hwif
->
irq
);
pmac_ide_init_hwif_ports
(
&
hwif
->
hw
,
base
,
0
,
&
hwif
->
irq
);
memcpy
(
hwif
->
io_ports
,
hwif
->
hw
.
io_ports
,
sizeof
(
hwif
->
io_ports
));
memcpy
(
hwif
->
io_ports
,
hwif
->
hw
.
io_ports
,
sizeof
(
hwif
->
io_ports
));
hwif
->
chipset
=
ide_pmac
;
hwif
->
chipset
=
ide_pmac
;
hwif
->
noprobe
=
!
hwif
->
io_ports
[
IDE_DATA_OFFSET
]
||
in_bay
;
hwif
->
noprobe
=
!
hwif
->
io_ports
[
IDE_DATA_OFFSET
]
||
in_bay
;
hwif
->
udma_four
=
(
pm
hw
->
kind
==
controller_kl_ata4_80
);
hwif
->
udma_four
=
(
pm
if
->
kind
==
controller_kl_ata4_80
);
hwif
->
pci_dev
=
pdev
;
hwif
->
pci_dev
=
pdev
;
hwif
->
drives
[
0
].
unmask
=
1
;
hwif
->
drives
[
1
].
unmask
=
1
;
hwif
->
tuneproc
=
pmac_ide_tuneproc
;
hwif
->
selectproc
=
pmac_ide_selectproc
;
hwif
->
speedproc
=
pmac_ide_tune_chipset
;
#ifdef CONFIG_PMAC_PBOOK
#ifdef CONFIG_PMAC_PBOOK
if
(
in_bay
&&
check_media_bay_by_base
(
base
,
MB_CD
)
==
0
)
if
(
in_bay
&&
check_media_bay_by_base
(
base
,
MB_CD
)
==
0
)
hwif
->
noprobe
=
0
;
hwif
->
noprobe
=
0
;
...
@@ -929,6 +911,11 @@ pmac_ide_probe(void)
...
@@ -929,6 +911,11 @@ pmac_ide_probe(void)
/* has a DBDMA controller channel */
/* has a DBDMA controller channel */
pmac_ide_setup_dma
(
np
,
i
);
pmac_ide_setup_dma
(
np
,
i
);
}
}
hwif
->
atapi_dma
=
1
;
hwif
->
ultra_mask
=
0x1f
;
hwif
->
mwdma_mask
=
0x07
;
hwif
->
swdma_mask
=
0x07
;
#endif
/* CONFIG_BLK_DEV_IDEDMA_PMAC */
#endif
/* CONFIG_BLK_DEV_IDEDMA_PMAC */
++
i
;
++
i
;
...
@@ -940,59 +927,14 @@ pmac_ide_probe(void)
...
@@ -940,59 +927,14 @@ pmac_ide_probe(void)
#ifdef CONFIG_PMAC_PBOOK
#ifdef CONFIG_PMAC_PBOOK
pmu_register_sleep_notifier
(
&
idepmac_sleep_notifier
);
pmu_register_sleep_notifier
(
&
idepmac_sleep_notifier
);
#endif
/* CONFIG_PMAC_PBOOK */
#endif
/* CONFIG_PMAC_PBOOK */
register_reboot_notifier
(
&
pmac_ide_reboot_notifier
);
}
}
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
static
void
__init
pmac_ide_setup_dma
(
struct
device_node
*
np
,
int
ix
)
{
struct
pmac_ide_hwif
*
pmif
=
&
pmac_ide
[
ix
];
if
(
request_OF_resource
(
np
,
1
,
" (mac-io IDE DMA)"
)
==
NULL
)
{
printk
(
KERN_ERR
"ide-pmac(%s): can't request DMA resource !
\n
"
,
np
->
name
);
return
;
}
pmif
->
dma_regs
=
(
volatile
struct
dbdma_regs
*
)
ioremap
(
np
->
addrs
[
1
].
address
,
0x200
);
/*
* Allocate space for the DBDMA commands.
* The +2 is +1 for the stop command and +1 to allow for
* aligning the start address to a multiple of 16 bytes.
*/
pmif
->
dma_table_cpu
=
(
struct
dbdma_cmd
*
)
pci_alloc_consistent
(
ide_hwifs
[
ix
].
pci_dev
,
(
MAX_DCMDS
+
2
)
*
sizeof
(
struct
dbdma_cmd
),
&
pmif
->
dma_table_dma
);
if
(
pmif
->
dma_table_cpu
==
NULL
)
{
printk
(
KERN_ERR
"%s: unable to allocate DMA command list
\n
"
,
ide_hwifs
[
ix
].
name
);
return
;
}
pmif
->
sg_table
=
kmalloc
(
sizeof
(
struct
scatterlist
)
*
MAX_DCMDS
,
GFP_KERNEL
);
if
(
pmif
->
sg_table
==
NULL
)
{
pci_free_consistent
(
ide_hwifs
[
ix
].
pci_dev
,
(
MAX_DCMDS
+
2
)
*
sizeof
(
struct
dbdma_cmd
),
pmif
->
dma_table_cpu
,
pmif
->
dma_table_dma
);
return
;
}
ide_hwifs
[
ix
].
dmaproc
=
&
pmac_ide_dmaproc
;
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO
if
(
!
noautodma
)
ide_hwifs
[
ix
].
autodma
=
1
;
#endif
}
static
int
static
int
pmac_ide_build_sglist
(
int
ix
,
struct
request
*
rq
)
pmac_ide_build_sglist
(
ide_hwif_t
*
hwif
,
struct
request
*
rq
)
{
{
ide_hwif_t
*
hwif
=
&
ide_hwifs
[
ix
];
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
hwif
->
hwif_data
;
struct
pmac_ide_hwif
*
pmif
=
&
pmac_ide
[
ix
];
struct
buffer_head
*
bh
;
struct
buffer_head
*
bh
;
struct
scatterlist
*
sg
=
pmif
->
sg_table
;
struct
scatterlist
*
sg
=
pmif
->
sg_table
;
int
nents
=
0
;
int
nents
=
0
;
...
@@ -1027,10 +969,9 @@ pmac_ide_build_sglist (int ix, struct request *rq)
...
@@ -1027,10 +969,9 @@ pmac_ide_build_sglist (int ix, struct request *rq)
}
}
static
int
static
int
pmac_ide_raw_build_sglist
(
int
ix
,
struct
request
*
rq
)
pmac_ide_raw_build_sglist
(
ide_hwif_t
*
hwif
,
struct
request
*
rq
)
{
{
ide_hwif_t
*
hwif
=
&
ide_hwifs
[
ix
];
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
hwif
->
hwif_data
;
struct
pmac_ide_hwif
*
pmif
=
&
pmac_ide
[
ix
];
struct
scatterlist
*
sg
=
hwif
->
sg_table
;
struct
scatterlist
*
sg
=
hwif
->
sg_table
;
int
nents
=
0
;
int
nents
=
0
;
ide_task_t
*
args
=
rq
->
special
;
ide_task_t
*
args
=
rq
->
special
;
...
@@ -1063,33 +1004,35 @@ pmac_ide_raw_build_sglist (int ix, struct request *rq)
...
@@ -1063,33 +1004,35 @@ pmac_ide_raw_build_sglist (int ix, struct request *rq)
* for a transfer and sets the DBDMA channel to point to it.
* for a transfer and sets the DBDMA channel to point to it.
*/
*/
static
int
static
int
pmac_ide_build_dmatable
(
ide_drive_t
*
drive
,
int
ix
,
int
wr
)
pmac_ide_build_dmatable
(
ide_drive_t
*
drive
,
int
wr
)
{
{
struct
dbdma_cmd
*
table
;
struct
dbdma_cmd
*
table
;
int
i
,
count
=
0
;
int
i
,
count
=
0
;
struct
request
*
rq
=
HWGROUP
(
drive
)
->
rq
;
struct
request
*
rq
=
HWGROUP
(
drive
)
->
rq
;
volatile
struct
dbdma_regs
*
dma
=
pmac_ide
[
ix
].
dma_regs
;
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
hwif
->
hwif_data
;
volatile
struct
dbdma_regs
*
dma
=
pmif
->
dma_regs
;
struct
scatterlist
*
sg
;
struct
scatterlist
*
sg
;
/* DMA table is already aligned */
/* DMA table is already aligned */
table
=
(
struct
dbdma_cmd
*
)
pm
ac_ide
[
ix
].
dma_table_cpu
;
table
=
(
struct
dbdma_cmd
*
)
pm
if
->
dma_table_cpu
;
/* Make sure DMA controller is stopped (necessary ?) */
/* Make sure DMA controller is stopped (necessary ?) */
out_le32
(
&
dma
->
control
,
(
RUN
|
PAUSE
|
FLUSH
|
WAKE
|
DEAD
)
<<
16
);
writel
((
RUN
|
PAUSE
|
FLUSH
|
WAKE
|
DEAD
)
<<
16
,
&
dma
->
control
);
while
(
in_le32
(
&
dma
->
status
)
&
RUN
)
while
(
readl
(
&
dma
->
status
)
&
RUN
)
udelay
(
1
);
udelay
(
1
);
/* Build sglist */
/* Build sglist */
if
(
HWGROUP
(
drive
)
->
rq
->
cmd
==
IDE_DRIVE_TASKFILE
)
if
(
rq
->
cmd
==
IDE_DRIVE_TASKFILE
)
pm
ac_ide
[
ix
].
sg_nents
=
i
=
pmac_ide_raw_build_sglist
(
ix
,
rq
);
pm
if
->
sg_nents
=
i
=
pmac_ide_raw_build_sglist
(
hwif
,
rq
);
else
else
pm
ac_ide
[
ix
].
sg_nents
=
i
=
pmac_ide_build_sglist
(
ix
,
rq
);
pm
if
->
sg_nents
=
i
=
pmac_ide_build_sglist
(
hwif
,
rq
);
if
(
!
i
)
if
(
!
i
)
return
0
;
return
0
;
/* Build DBDMA commands list */
/* Build DBDMA commands list */
sg
=
pm
ac_ide
[
ix
].
sg_table
;
sg
=
pm
if
->
sg_table
;
while
(
i
)
{
while
(
i
&&
sg_dma_len
(
sg
)
)
{
u32
cur_addr
;
u32
cur_addr
;
u32
cur_len
;
u32
cur_len
;
...
@@ -1126,23 +1069,24 @@ pmac_ide_build_dmatable(ide_drive_t *drive, int ix, int wr)
...
@@ -1126,23 +1069,24 @@ pmac_ide_build_dmatable(ide_drive_t *drive, int ix, int wr)
/* add the stop command to the end of the list */
/* add the stop command to the end of the list */
memset
(
table
,
0
,
sizeof
(
struct
dbdma_cmd
));
memset
(
table
,
0
,
sizeof
(
struct
dbdma_cmd
));
ou
t_le16
(
&
table
->
command
,
DBDMA_STOP
);
s
t_le16
(
&
table
->
command
,
DBDMA_STOP
);
mb
();
out_le32
(
&
dma
->
cmdptr
,
pmac_ide
[
ix
].
dma_table_dma
);
writel
(
pmif
->
dma_table_dma
,
&
dma
->
cmdptr
);
return
1
;
return
1
;
}
}
/* Teardown mappings after DMA has completed. */
/* Teardown mappings after DMA has completed. */
static
void
static
void
pmac_ide_destroy_dmatable
(
ide_drive_t
*
drive
,
int
ix
)
pmac_ide_destroy_dmatable
(
ide_drive_t
*
drive
)
{
{
struct
pci_dev
*
dev
=
HWIF
(
drive
)
->
pci_dev
;
struct
pci_dev
*
dev
=
HWIF
(
drive
)
->
pci_dev
;
struct
scatterlist
*
sg
=
pmac_ide
[
ix
].
sg_table
;
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
int
nents
=
pmac_ide
[
ix
].
sg_nents
;
struct
scatterlist
*
sg
=
pmif
->
sg_table
;
int
nents
=
pmif
->
sg_nents
;
if
(
nents
)
{
if
(
nents
)
{
pci_unmap_sg
(
dev
,
sg
,
nents
,
pm
ac_ide
[
ix
].
sg_dma_direction
);
pci_unmap_sg
(
dev
,
sg
,
nents
,
pm
if
->
sg_dma_direction
);
pm
ac_ide
[
ix
].
sg_nents
=
0
;
pm
if
->
sg_nents
=
0
;
}
}
}
}
...
@@ -1178,13 +1122,14 @@ udma_bits_to_command(unsigned char bits, int high_speed)
...
@@ -1178,13 +1122,14 @@ udma_bits_to_command(unsigned char bits, int high_speed)
/* Calculate MultiWord DMA timings */
/* Calculate MultiWord DMA timings */
static
int
__pmac
static
int
__pmac
pmac_ide_mdma_enable
(
ide_drive_t
*
drive
,
int
idx
)
pmac_ide_mdma_enable
(
ide_drive_t
*
drive
)
{
{
byte
bits
=
drive
->
id
->
dma_mword
&
0x07
;
u8
bits
=
drive
->
id
->
dma_mword
&
0x07
;
byte
feature
=
dma_bits_to_command
(
bits
);
u8
feature
=
dma_bits_to_command
(
bits
);
u32
*
timings
;
u32
*
timings
;
int
drive_cycle_time
;
int
drive_cycle_time
;
struct
hd_driveid
*
id
=
drive
->
id
;
struct
hd_driveid
*
id
=
drive
->
id
;
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
int
ret
;
int
ret
;
/* Set feature on drive */
/* Set feature on drive */
...
@@ -1200,9 +1145,9 @@ pmac_ide_mdma_enable(ide_drive_t *drive, int idx)
...
@@ -1200,9 +1145,9 @@ pmac_ide_mdma_enable(ide_drive_t *drive, int idx)
/* which drive is it ? */
/* which drive is it ? */
if
(
drive
->
select
.
b
.
unit
&
0x01
)
if
(
drive
->
select
.
b
.
unit
&
0x01
)
timings
=
&
pm
ac_ide
[
idx
].
timings
[
1
];
timings
=
&
pm
if
->
timings
[
1
];
else
else
timings
=
&
pm
ac_ide
[
idx
].
timings
[
0
];
timings
=
&
pm
if
->
timings
[
0
];
/* Check if drive provide explicit cycle time */
/* Check if drive provide explicit cycle time */
if
((
id
->
field_valid
&
2
)
&&
(
id
->
eide_dma_time
))
if
((
id
->
field_valid
&
2
)
&&
(
id
->
eide_dma_time
))
...
@@ -1211,7 +1156,7 @@ pmac_ide_mdma_enable(ide_drive_t *drive, int idx)
...
@@ -1211,7 +1156,7 @@ pmac_ide_mdma_enable(ide_drive_t *drive, int idx)
drive_cycle_time
=
0
;
drive_cycle_time
=
0
;
/* Calculate controller timings */
/* Calculate controller timings */
set_timings_mdma
(
pm
ac_ide
[
idx
].
kind
,
timings
,
feature
,
drive_cycle_time
);
set_timings_mdma
(
pm
if
->
kind
,
timings
,
feature
,
drive_cycle_time
);
drive
->
current_speed
=
feature
;
drive
->
current_speed
=
feature
;
return
1
;
return
1
;
...
@@ -1219,10 +1164,11 @@ pmac_ide_mdma_enable(ide_drive_t *drive, int idx)
...
@@ -1219,10 +1164,11 @@ pmac_ide_mdma_enable(ide_drive_t *drive, int idx)
/* Calculate Ultra DMA timings */
/* Calculate Ultra DMA timings */
static
int
__pmac
static
int
__pmac
pmac_ide_udma_enable
(
ide_drive_t
*
drive
,
int
idx
,
int
high_speed
)
pmac_ide_udma_enable
(
ide_drive_t
*
drive
,
int
high_speed
)
{
{
byte
bits
=
drive
->
id
->
dma_ultra
&
0x1f
;
u8
bits
=
drive
->
id
->
dma_ultra
&
0x1f
;
byte
feature
=
udma_bits_to_command
(
bits
,
high_speed
);
u8
feature
=
udma_bits_to_command
(
bits
,
high_speed
);
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
u32
*
timings
;
u32
*
timings
;
int
ret
;
int
ret
;
...
@@ -1239,9 +1185,9 @@ pmac_ide_udma_enable(ide_drive_t *drive, int idx, int high_speed)
...
@@ -1239,9 +1185,9 @@ pmac_ide_udma_enable(ide_drive_t *drive, int idx, int high_speed)
/* which drive is it ? */
/* which drive is it ? */
if
(
drive
->
select
.
b
.
unit
&
0x01
)
if
(
drive
->
select
.
b
.
unit
&
0x01
)
timings
=
&
pm
ac_ide
[
idx
].
timings
[
1
];
timings
=
&
pm
if
->
timings
[
1
];
else
else
timings
=
&
pm
ac_ide
[
idx
].
timings
[
0
];
timings
=
&
pm
if
->
timings
[
0
];
set_timings_udma
(
timings
,
feature
);
set_timings_udma
(
timings
,
feature
);
...
@@ -1249,187 +1195,346 @@ pmac_ide_udma_enable(ide_drive_t *drive, int idx, int high_speed)
...
@@ -1249,187 +1195,346 @@ pmac_ide_udma_enable(ide_drive_t *drive, int idx, int high_speed)
return
1
;
return
1
;
}
}
static
int
__pmac
int
pmac_ide_dma_check
(
ide_drive_t
*
drive
)
pmac_ide_check_dma
(
ide_drive_t
*
drive
)
{
{
int
ata4
,
udma
,
idx
;
int
ata4
,
udma
;
struct
hd_driveid
*
id
=
drive
->
id
;
struct
hd_driveid
*
id
=
drive
->
id
;
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
hwif
->
hwif_data
;
int
enable
=
1
;
int
enable
=
1
;
drive
->
using_dma
=
0
;
drive
->
using_dma
=
0
;
idx
=
pmac_ide_find
(
drive
);
if
(
pmif
==
NULL
)
if
(
idx
<
0
)
return
0
;
return
0
;
if
(
drive
->
media
==
ide_floppy
)
if
(
drive
->
media
==
ide_floppy
)
enable
=
0
;
enable
=
0
;
if
(((
id
->
capability
&
1
)
==
0
)
&&
!
check_drive_lists
(
drive
,
GOOD_DMA_DRIVE
))
if
(((
id
->
capability
&
1
)
==
0
)
&&
!
HWIF
(
drive
)
->
ide_dma_good_drive
(
drive
))
enable
=
0
;
enable
=
0
;
if
(
check_drive_lists
(
drive
,
BAD_DMA_DRIVE
))
if
(
HWIF
(
drive
)
->
ide_dma_bad_drive
(
drive
))
enable
=
0
;
enable
=
0
;
udma
=
0
;
udma
=
0
;
ata4
=
(
pm
ac_ide
[
idx
].
kind
==
controller_kl_ata4
||
ata4
=
(
pm
if
->
kind
==
controller_kl_ata4
||
pm
ac_ide
[
idx
].
kind
==
controller_kl_ata4_80
);
pm
if
->
kind
==
controller_kl_ata4_80
);
if
(
enable
)
{
if
(
enable
)
{
if
(
ata4
&&
(
drive
->
media
==
ide_disk
)
&&
if
(
ata4
&&
(
drive
->
media
==
ide_disk
)
&&
(
id
->
field_valid
&
0x0004
)
&&
(
id
->
dma_ultra
&
0x1f
))
{
(
id
->
field_valid
&
0x0004
)
&&
(
id
->
dma_ultra
&
0x1f
))
{
/* UltraDMA modes. */
/* UltraDMA modes. */
drive
->
using_dma
=
pmac_ide_udma_enable
(
drive
,
idx
,
drive
->
using_dma
=
pmac_ide_udma_enable
(
drive
,
pm
ac_ide
[
idx
].
kind
==
controller_kl_ata4_80
);
pm
if
->
kind
==
controller_kl_ata4_80
);
}
}
if
(
!
drive
->
using_dma
&&
(
id
->
dma_mword
&
0x0007
))
{
if
(
!
drive
->
using_dma
&&
(
id
->
dma_mword
&
0x0007
))
{
/* Normal MultiWord DMA modes. */
/* Normal MultiWord DMA modes. */
drive
->
using_dma
=
pmac_ide_mdma_enable
(
drive
,
idx
);
drive
->
using_dma
=
pmac_ide_mdma_enable
(
drive
);
}
}
OUT_BYTE
(
0
,
IDE_CONTROL_REG
);
hwif
->
OUTB
(
0
,
IDE_CONTROL_REG
);
/* Apply settings to controller */
/* Apply settings to controller */
pmac_ide_selectproc
(
drive
);
pmac_ide_selectproc
(
drive
);
}
}
return
0
;
return
0
;
}
}
static
int
__pmac
static
int
pmac_ide_dma
proc
(
ide_dma_action_t
func
,
ide_drive_t
*
drive
)
pmac_ide_dma
_read
(
ide_drive_t
*
drive
)
{
{
// ide_task_t *args = HWGROUP(drive)->rq->special;
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
int
ix
,
dstat
;
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
hwif
->
hwif_data
;
volatile
struct
dbdma_regs
*
dma
;
struct
request
*
rq
=
HWGROUP
(
drive
)
->
rq
;
byte
unit
=
(
drive
->
select
.
b
.
unit
&
0x01
);
// ide_task_t *args = rq->special;
byte
ata4
;
u8
unit
=
(
drive
->
select
.
b
.
unit
&
0x01
);
int
reading
=
0
;
u8
ata4
;
u8
lba48
=
(
drive
->
addressing
==
1
)
?
1
:
0
;
task_ioreg_t
command
=
WIN_NOP
;
if
(
pmif
==
NULL
)
return
1
;
ata4
=
(
pmif
->
kind
==
controller_kl_ata4
||
pmif
->
kind
==
controller_kl_ata4_80
);
/* Can we stuff a pointer to our intf structure in config_data
if
(
!
pmac_ide_build_dmatable
(
drive
,
0
))
* or select_data in hwif ?
return
1
;
/* Apple adds 60ns to wrDataSetup on reads */
if
(
ata4
&&
(
pmif
->
timings
[
unit
]
&
TR_66_UDMA_EN
))
{
writel
(
pmif
->
timings
[
unit
]
+
0x00800000UL
,
(
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
));
(
void
)
readl
((
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
));
}
drive
->
waiting_for_dma
=
1
;
if
(
drive
->
media
!=
ide_disk
)
return
0
;
if
(
HWGROUP
(
drive
)
->
handler
!=
NULL
)
/* paranoia check */
BUG
();
ide_set_handler
(
drive
,
&
ide_dma_intr
,
WAIT_CMD
,
NULL
);
/*
* FIX ME to use only ACB ide_task_t args Struct
*/
*/
ix
=
pmac_ide_find
(
drive
);
if
(
ix
<
0
)
return
0
;
dma
=
pmac_ide
[
ix
].
dma_regs
;
ata4
=
(
pmac_ide
[
ix
].
kind
==
controller_kl_ata4
||
pmac_ide
[
ix
].
kind
==
controller_kl_ata4_80
);
switch
(
func
)
{
case
ide_dma_off
:
printk
(
KERN_INFO
"%s: DMA disabled
\n
"
,
drive
->
name
);
case
ide_dma_off_quietly
:
drive
->
using_dma
=
0
;
break
;
case
ide_dma_on
:
case
ide_dma_check
:
pmac_ide_check_dma
(
drive
);
break
;
case
ide_dma_read
:
reading
=
1
;
case
ide_dma_write
:
SELECT_READ_WRITE
(
HWIF
(
drive
),
drive
,
func
);
if
(
!
pmac_ide_build_dmatable
(
drive
,
ix
,
!
reading
))
return
1
;
/* Apple adds 60ns to wrDataSetup on reads */
if
(
ata4
&&
(
pmac_ide
[
ix
].
timings
[
unit
]
&
TR_66_UDMA_EN
))
{
out_le32
((
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
+
_IO_BASE
),
pmac_ide
[
ix
].
timings
[
unit
]
+
(
reading
?
0x00800000UL
:
0
));
(
void
)
in_le32
((
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
+
_IO_BASE
));
}
drive
->
waiting_for_dma
=
1
;
if
(
drive
->
media
!=
ide_disk
)
return
0
;
if
(
HWGROUP
(
drive
)
->
handler
!=
NULL
)
/* paranoia check */
BUG
();
ide_set_handler
(
drive
,
&
ide_dma_intr
,
WAIT_CMD
,
NULL
);
#if 0
#if 0
{
{
ide_task_t *args =
HWGROUP(drive)->
rq->special;
ide_task_t *args = rq->special;
OUT_BYTE(args->tfRegister[IDE_COMMAND_OFFSET], IDE_COMMAND_REG)
;
command = args->tfRegister[IDE_COMMAND_OFFSET]
;
}
}
#else
#else
if
(
HWGROUP
(
drive
)
->
rq
->
cmd
==
IDE_DRIVE_TASKFILE
)
{
command
=
(
lba48
)
?
WIN_READDMA_EXT
:
WIN_READDMA
;
ide_task_t
*
args
=
HWGROUP
(
drive
)
->
rq
->
special
;
if
(
rq
->
cmd
==
IDE_DRIVE_TASKFILE
)
{
OUT_BYTE
(
args
->
tfRegister
[
IDE_COMMAND_OFFSET
],
IDE_COMMAND_REG
);
ide_task_t
*
args
=
rq
->
special
;
}
else
if
(
drive
->
addressing
==
1
)
command
=
args
->
tfRegister
[
IDE_COMMAND_OFFSET
];
OUT_BYTE
(
reading
?
WIN_READDMA_EXT
:
WIN_WRITEDMA_EXT
,
IDE_COMMAND_REG
);
}
else
OUT_BYTE
(
reading
?
WIN_READDMA
:
WIN_WRITEDMA
,
IDE_COMMAND_REG
);
#endif
#endif
case
ide_dma_begin
:
/* issue cmd to drive */
out_le32
(
&
dma
->
control
,
(
RUN
<<
16
)
|
RUN
);
hwif
->
OUTB
(
command
,
IDE_COMMAND_REG
);
/* Make sure it gets to the controller right now */
(
void
)
in_le32
(
&
dma
->
control
);
return
pmac_ide_dma_begin
(
drive
);
break
;
}
case
ide_dma_end
:
/* returns 1 on error, 0 otherwise */
drive
->
waiting_for_dma
=
0
;
static
int
dstat
=
in_le32
(
&
dma
->
status
);
pmac_ide_dma_write
(
ide_drive_t
*
drive
)
out_le32
(
&
dma
->
control
,
((
RUN
|
WAKE
|
DEAD
)
<<
16
));
{
pmac_ide_destroy_dmatable
(
drive
,
ix
);
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
/* verify good dma status */
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
hwif
->
hwif_data
;
return
(
dstat
&
(
RUN
|
DEAD
|
ACTIVE
))
!=
RUN
;
struct
request
*
rq
=
HWGROUP
(
drive
)
->
rq
;
case
ide_dma_test_irq
:
/* returns 1 if dma irq issued, 0 otherwise */
// ide_task_t *args = rq->special;
/* We have to things to deal with here:
u8
unit
=
(
drive
->
select
.
b
.
unit
&
0x01
);
*
u8
ata4
;
* - The dbdma won't stop if the command was started
u8
lba48
=
(
drive
->
addressing
==
1
)
?
1
:
0
;
* but completed with an error without transfering all
task_ioreg_t
command
=
WIN_NOP
;
* datas. This happens when bad blocks are met during
* a multi-block transfer.
if
(
pmif
==
NULL
)
*
return
1
;
* - The dbdma fifo hasn't yet finished flushing to
* to system memory when the disk interrupt occurs.
ata4
=
(
pmif
->
kind
==
controller_kl_ata4
||
*
pmif
->
kind
==
controller_kl_ata4_80
);
* The trick here is to increment drive->waiting_for_dma,
* and return as if no interrupt occured. If the counter
if
(
!
pmac_ide_build_dmatable
(
drive
,
1
))
* reach a certain timeout value, we then return 1. If
return
1
;
* we really got the interrupt, it will happen right away
/* Apple adds 60ns to wrDataSetup on reads */
* again.
if
(
ata4
&&
(
pmif
->
timings
[
unit
]
&
TR_66_UDMA_EN
))
{
* Apple's solution here may be more elegant. They issue
writel
(
pmif
->
timings
[
unit
],
* a DMA channel interrupt (a separate irq line) via a DBDMA
(
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
));
* NOP command just before the STOP, and wait for both the
(
void
)
readl
((
unsigned
*
)(
IDE_DATA_REG
+
IDE_TIMING_CONFIG
));
* disk and DBDMA interrupts to have completed.
}
*/
drive
->
waiting_for_dma
=
1
;
if
(
drive
->
media
!=
ide_disk
)
/* If ACTIVE is cleared, the STOP command have passed and
return
0
;
* transfer is complete.
if
(
HWGROUP
(
drive
)
->
handler
!=
NULL
)
/* paranoia check */
*/
BUG
();
if
(
!
(
in_le32
(
&
dma
->
status
)
&
ACTIVE
))
ide_set_handler
(
drive
,
&
ide_dma_intr
,
WAIT_CMD
,
NULL
);
return
1
;
/*
if
(
!
drive
->
waiting_for_dma
)
* FIX ME to use only ACB ide_task_t args Struct
printk
(
KERN_WARNING
"ide%d, ide_dma_test_irq \
*/
called while not waiting
\n
"
,
ix
);
#if 0
{
/* If dbdma didn't execute the STOP command yet, the
ide_task_t *args = rq->special;
* active bit is still set */
command = args->tfRegister[IDE_COMMAND_OFFSET];
drive
->
waiting_for_dma
++
;
}
if
(
drive
->
waiting_for_dma
>=
DMA_WAIT_TIMEOUT
)
{
#else
printk
(
KERN_WARNING
"ide%d, timeout waiting \
command
=
(
lba48
)
?
WIN_WRITEDMA_EXT
:
WIN_WRITEDMA
;
for dbdma command stop
\n
"
,
ix
);
if
(
rq
->
cmd
==
IDE_DRIVE_TASKFILE
)
{
return
1
;
ide_task_t
*
args
=
rq
->
special
;
}
command
=
args
->
tfRegister
[
IDE_COMMAND_OFFSET
];
udelay
(
1
);
}
#endif
/* issue cmd to drive */
hwif
->
OUTB
(
command
,
IDE_COMMAND_REG
);
return
pmac_ide_dma_begin
(
drive
);
}
static
int
pmac_ide_dma_count
(
ide_drive_t
*
drive
)
{
return
HWIF
(
drive
)
->
ide_dma_begin
(
drive
);
}
static
int
pmac_ide_dma_begin
(
ide_drive_t
*
drive
)
{
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
volatile
struct
dbdma_regs
*
dma
;
if
(
pmif
==
NULL
)
return
1
;
dma
=
pmif
->
dma_regs
;
writel
((
RUN
<<
16
)
|
RUN
,
&
dma
->
control
);
/* Make sure it gets to the controller right now */
(
void
)
readl
(
&
dma
->
control
);
return
0
;
}
static
int
pmac_ide_dma_end
(
ide_drive_t
*
drive
)
{
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
volatile
struct
dbdma_regs
*
dma
;
u32
dstat
;
if
(
pmif
==
NULL
)
return
0
;
return
0
;
dma
=
pmif
->
dma_regs
;
drive
->
waiting_for_dma
=
0
;
dstat
=
readl
(
&
dma
->
status
);
writel
(((
RUN
|
WAKE
|
DEAD
)
<<
16
),
&
dma
->
control
);
pmac_ide_destroy_dmatable
(
drive
);
/* verify good dma status */
return
(
dstat
&
(
RUN
|
DEAD
|
ACTIVE
))
!=
RUN
;
}
static
int
pmac_ide_dma_test_irq
(
ide_drive_t
*
drive
)
{
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
volatile
struct
dbdma_regs
*
dma
;
unsigned
long
status
;
/* Let's implement tose just in case someone wants them */
if
(
pmif
==
NULL
)
case
ide_dma_bad_drive
:
return
0
;
case
ide_dma_good_drive
:
dma
=
pmif
->
dma_regs
;
return
check_drive_lists
(
drive
,
(
func
==
ide_dma_good_drive
));
case
ide_dma_verbose
:
/* We have to things to deal with here:
return
report_drive_dmaing
(
drive
);
*
case
ide_dma_retune
:
* - The dbdma won't stop if the command was started
case
ide_dma_lostirq
:
* but completed with an error without transfering all
case
ide_dma_timeout
:
* datas. This happens when bad blocks are met during
printk
(
KERN_WARNING
"ide_pmac_dmaproc: chipset supported %s func only: %d
\n
"
,
ide_dmafunc_verbose
(
func
),
func
);
* a multi-block transfer.
*
* - The dbdma fifo hasn't yet finished flushing to
* to system memory when the disk interrupt occurs.
*
* The trick here is to increment drive->waiting_for_dma,
* and return as if no interrupt occured. If the counter
* reach a certain timeout value, we then return 1. If
* we really got the interrupt, it will happen right away
* again.
* Apple's solution here may be more elegant. They issue
* a DMA channel interrupt (a separate irq line) via a DBDMA
* NOP command just before the STOP, and wait for both the
* disk and DBDMA interrupts to have completed.
*/
/* If ACTIVE is cleared, the STOP command have passed and
* transfer is complete.
*/
status
=
readl
(
&
dma
->
status
);
if
(
!
(
status
&
ACTIVE
))
return
1
;
return
1
;
default:
if
(
!
drive
->
waiting_for_dma
)
printk
(
KERN_WARNING
"ide_pmac_dmaproc: unsupported %s func: %d
\n
"
,
ide_dmafunc_verbose
(
func
),
func
);
printk
(
KERN_WARNING
"ide%d, ide_dma_test_irq \
called while not waiting
\n
"
,
pmif
->
index
);
/* If dbdma didn't execute the STOP command yet, the
* active bit is still set */
drive
->
waiting_for_dma
++
;
if
(
drive
->
waiting_for_dma
>=
DMA_WAIT_TIMEOUT
)
{
printk
(
KERN_WARNING
"ide%d, timeout waiting \
for dbdma command stop
\n
"
,
pmif
->
index
);
return
1
;
return
1
;
}
}
udelay
(
1
);
return
0
;
}
static
int
pmac_ide_dma_host_off
(
ide_drive_t
*
drive
)
{
return
0
;
return
0
;
}
}
static
int
pmac_ide_dma_host_on
(
ide_drive_t
*
drive
)
{
return
0
;
}
static
int
pmac_ide_dma_lostirq
(
ide_drive_t
*
drive
)
{
pmac_ide_hwif_t
*
pmif
=
(
pmac_ide_hwif_t
*
)
HWIF
(
drive
)
->
hwif_data
;
volatile
struct
dbdma_regs
*
dma
;
unsigned
long
status
;
if
(
pmif
==
NULL
)
return
0
;
dma
=
pmif
->
dma_regs
;
status
=
readl
(
&
dma
->
status
);
printk
(
KERN_ERR
"ide-pmac lost interrupt, dma status: %lx
\n
"
,
status
);
return
0
;
}
static
void
__init
pmac_ide_setup_dma
(
struct
device_node
*
np
,
int
ix
)
{
struct
pmac_ide_hwif
*
pmif
=
&
pmac_ide
[
ix
];
if
(
request_OF_resource
(
np
,
1
,
" (mac-io IDE DMA)"
)
==
NULL
)
{
printk
(
KERN_ERR
"ide-pmac(%s): can't request DMA resource !
\n
"
,
np
->
name
);
return
;
}
pmif
->
dma_regs
=
(
volatile
struct
dbdma_regs
*
)
ioremap
(
np
->
addrs
[
1
].
address
,
0x200
);
/*
* Allocate space for the DBDMA commands.
* The +2 is +1 for the stop command and +1 to allow for
* aligning the start address to a multiple of 16 bytes.
*/
pmif
->
dma_table_cpu
=
(
struct
dbdma_cmd
*
)
pci_alloc_consistent
(
ide_hwifs
[
ix
].
pci_dev
,
(
MAX_DCMDS
+
2
)
*
sizeof
(
struct
dbdma_cmd
),
&
pmif
->
dma_table_dma
);
if
(
pmif
->
dma_table_cpu
==
NULL
)
{
printk
(
KERN_ERR
"%s: unable to allocate DMA command list
\n
"
,
ide_hwifs
[
ix
].
name
);
return
;
}
pmif
->
sg_table
=
kmalloc
(
sizeof
(
struct
scatterlist
)
*
MAX_DCMDS
,
GFP_KERNEL
);
if
(
pmif
->
sg_table
==
NULL
)
{
pci_free_consistent
(
ide_hwifs
[
ix
].
pci_dev
,
(
MAX_DCMDS
+
2
)
*
sizeof
(
struct
dbdma_cmd
),
pmif
->
dma_table_cpu
,
pmif
->
dma_table_dma
);
return
;
}
ide_hwifs
[
ix
].
ide_dma_off
=
&
__ide_dma_off
;
ide_hwifs
[
ix
].
ide_dma_off_quietly
=
&
__ide_dma_off_quietly
;
ide_hwifs
[
ix
].
ide_dma_on
=
&
__ide_dma_on
;
ide_hwifs
[
ix
].
ide_dma_check
=
&
pmac_ide_dma_check
;
ide_hwifs
[
ix
].
ide_dma_read
=
&
pmac_ide_dma_read
;
ide_hwifs
[
ix
].
ide_dma_write
=
&
pmac_ide_dma_write
;
ide_hwifs
[
ix
].
ide_dma_count
=
&
pmac_ide_dma_count
;
ide_hwifs
[
ix
].
ide_dma_begin
=
&
pmac_ide_dma_begin
;
ide_hwifs
[
ix
].
ide_dma_end
=
&
pmac_ide_dma_end
;
ide_hwifs
[
ix
].
ide_dma_test_irq
=
&
pmac_ide_dma_test_irq
;
ide_hwifs
[
ix
].
ide_dma_host_off
=
&
pmac_ide_dma_host_off
;
ide_hwifs
[
ix
].
ide_dma_host_on
=
&
pmac_ide_dma_host_on
;
ide_hwifs
[
ix
].
ide_dma_good_drive
=
&
__ide_dma_good_drive
;
ide_hwifs
[
ix
].
ide_dma_bad_drive
=
&
__ide_dma_bad_drive
;
ide_hwifs
[
ix
].
ide_dma_verbose
=
&
__ide_dma_verbose
;
ide_hwifs
[
ix
].
ide_dma_timeout
=
&
__ide_dma_timeout
;
ide_hwifs
[
ix
].
ide_dma_retune
=
&
__ide_dma_retune
;
ide_hwifs
[
ix
].
ide_dma_lostirq
=
&
pmac_ide_dma_lostirq
;
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO
if
(
!
noautodma
)
ide_hwifs
[
ix
].
autodma
=
1
;
#endif
ide_hwifs
[
ix
].
drives
[
0
].
autodma
=
ide_hwifs
[
ix
].
autodma
;
ide_hwifs
[
ix
].
drives
[
1
].
autodma
=
ide_hwifs
[
ix
].
autodma
;
}
#endif
/* CONFIG_BLK_DEV_IDEDMA_PMAC */
#endif
/* CONFIG_BLK_DEV_IDEDMA_PMAC */
static
void
__pmac
static
void
__pmac
idepmac_sleep_device
(
ide_drive_t
*
drive
,
int
i
,
unsigned
base
)
idepmac_sleep_device
(
ide_drive_t
*
drive
,
unsigned
base
)
{
{
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
int
j
;
int
j
;
/* FIXME: We only handle the master IDE disk, we shoud
/* FIXME: We only handle the master IDE disk, we shoud
...
@@ -1438,19 +1543,19 @@ idepmac_sleep_device(ide_drive_t *drive, int i, unsigned base)
...
@@ -1438,19 +1543,19 @@ idepmac_sleep_device(ide_drive_t *drive, int i, unsigned base)
switch
(
drive
->
media
)
{
switch
(
drive
->
media
)
{
case
ide_disk
:
case
ide_disk
:
/* Spin down the drive */
/* Spin down the drive */
OUT_BYTE
(
drive
->
select
.
all
,
base
+
0x60
);
hwif
->
OUTB
(
drive
->
select
.
all
,
base
+
0x60
);
(
void
)
IN_BYTE
(
base
+
0x60
);
(
void
)
hwif
->
INB
(
base
+
0x60
);
udelay
(
100
);
udelay
(
100
);
OUT_BYTE
(
0x0
,
base
+
0x30
);
hwif
->
OUTB
(
0x0
,
base
+
0x30
);
OUT_BYTE
(
0x0
,
base
+
0x20
);
hwif
->
OUTB
(
0x0
,
base
+
0x20
);
OUT_BYTE
(
0x0
,
base
+
0x40
);
hwif
->
OUTB
(
0x0
,
base
+
0x40
);
OUT_BYTE
(
0x0
,
base
+
0x50
);
hwif
->
OUTB
(
0x0
,
base
+
0x50
);
OUT_BYTE
(
0xe0
,
base
+
0x70
);
hwif
->
OUTB
(
0xe0
,
base
+
0x70
);
OUT_BYTE
(
0x2
,
base
+
0x160
);
hwif
->
OUTB
(
0x2
,
base
+
0x160
);
for
(
j
=
0
;
j
<
10
;
j
++
)
{
for
(
j
=
0
;
j
<
10
;
j
++
)
{
int
status
;
u8
status
;
mdelay
(
100
);
mdelay
(
100
);
status
=
IN_BYTE
(
base
+
0x70
);
status
=
hwif
->
INB
(
base
+
0x70
);
if
(
!
(
status
&
BUSY_STAT
)
&&
(
status
&
DRQ_STAT
))
if
(
!
(
status
&
BUSY_STAT
)
&&
(
status
&
DRQ_STAT
))
break
;
break
;
}
}
...
@@ -1478,7 +1583,7 @@ idepmac_wake_device(ide_drive_t *drive, int used_dma)
...
@@ -1478,7 +1583,7 @@ idepmac_wake_device(ide_drive_t *drive, int used_dma)
DRIVER
(
drive
)
->
media_change
(
drive
);
DRIVER
(
drive
)
->
media_change
(
drive
);
/* We kick the VFS too (see fix in ide.c revalidate) */
/* We kick the VFS too (see fix in ide.c revalidate) */
__
check_disk_change
(
MKDEV
(
HWIF
(
drive
)
->
major
,
(
drive
->
select
.
b
.
unit
)
<<
PARTN_BITS
));
check_disk_change
(
MKDEV
(
HWIF
(
drive
)
->
major
,
(
drive
->
select
.
b
.
unit
)
<<
PARTN_BITS
));
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
/* We re-enable DMA on the drive if it was active. */
/* We re-enable DMA on the drive if it was active. */
...
@@ -1489,48 +1594,48 @@ idepmac_wake_device(ide_drive_t *drive, int used_dma)
...
@@ -1489,48 +1594,48 @@ idepmac_wake_device(ide_drive_t *drive, int used_dma)
if
(
used_dma
&&
!
ide_spin_wait_hwgroup
(
drive
))
{
if
(
used_dma
&&
!
ide_spin_wait_hwgroup
(
drive
))
{
/* Lock HW group */
/* Lock HW group */
HWGROUP
(
drive
)
->
busy
=
1
;
HWGROUP
(
drive
)
->
busy
=
1
;
pmac_ide_
check_dma
(
drive
);
pmac_ide_
dma_check
(
drive
);
HWGROUP
(
drive
)
->
busy
=
0
;
HWGROUP
(
drive
)
->
busy
=
0
;
if
(
!
list_empty
(
&
drive
->
queue
.
queue_head
))
if
(
!
list_empty
(
&
drive
->
queue
.
queue_head
))
ide_do_request
(
HWGROUP
(
drive
),
0
);
ide_do_request
(
HWGROUP
(
drive
),
0
);
spin_unlock_irq
(
&
i
de
_lock
);
spin_unlock_irq
(
&
i
o_request
_lock
);
}
}
#endif
/* CONFIG_BLK_DEV_IDEDMA_PMAC */
#endif
/* CONFIG_BLK_DEV_IDEDMA_PMAC */
}
}
static
void
__pmac
static
void
__pmac
idepmac_sleep_interface
(
int
i
,
unsigned
base
,
int
mediabay
)
idepmac_sleep_interface
(
pmac_ide_hwif_t
*
pmif
,
unsigned
base
,
int
mediabay
)
{
{
struct
device_node
*
np
=
pm
ac_ide
[
i
].
node
;
struct
device_node
*
np
=
pm
if
->
node
;
/* We clear the timings */
/* We clear the timings */
pm
ac_ide
[
i
].
timings
[
0
]
=
0
;
pm
if
->
timings
[
0
]
=
0
;
pm
ac_ide
[
i
].
timings
[
1
]
=
0
;
pm
if
->
timings
[
1
]
=
0
;
/* The media bay will handle itself just fine */
/* The media bay will handle itself just fine */
if
(
mediabay
)
if
(
mediabay
)
return
;
return
;
/* Disable the bus */
/* Disable the bus */
ppc_md
.
feature_call
(
PMAC_FTR_IDE_ENABLE
,
np
,
pm
ac_ide
[
i
].
aapl_bus_id
,
0
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_ENABLE
,
np
,
pm
if
->
aapl_bus_id
,
0
);
}
}
static
void
__pmac
static
void
__pmac
idepmac_wake_interface
(
int
i
,
unsigned
long
base
,
int
mediabay
)
idepmac_wake_interface
(
pmac_ide_hwif_t
*
pmif
,
unsigned
long
base
,
int
mediabay
)
{
{
struct
device_node
*
np
=
pm
ac_ide
[
i
].
node
;
struct
device_node
*
np
=
pm
if
->
node
;
if
(
!
mediabay
)
{
if
(
!
mediabay
)
{
/* Revive IDE disk and controller */
/* Revive IDE disk and controller */
ppc_md
.
feature_call
(
PMAC_FTR_IDE_RESET
,
np
,
pm
ac_ide
[
i
].
aapl_bus_id
,
1
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_RESET
,
np
,
pm
if
->
aapl_bus_id
,
1
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_ENABLE
,
np
,
pm
ac_ide
[
i
].
aapl_bus_id
,
1
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_ENABLE
,
np
,
pm
if
->
aapl_bus_id
,
1
);
mdelay
(
10
);
mdelay
(
10
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_RESET
,
np
,
pm
ac_ide
[
i
].
aapl_bus_id
,
0
);
ppc_md
.
feature_call
(
PMAC_FTR_IDE_RESET
,
np
,
pm
if
->
aapl_bus_id
,
0
);
}
}
}
}
static
void
static
void
idepmac_sleep_drive
(
ide_drive_t
*
drive
,
int
idx
,
unsigned
long
base
)
idepmac_sleep_drive
(
ide_drive_t
*
drive
,
unsigned
long
base
)
{
{
int
unlock
=
0
;
int
unlock
=
0
;
...
@@ -1543,15 +1648,16 @@ idepmac_sleep_drive(ide_drive_t *drive, int idx, unsigned long base)
...
@@ -1543,15 +1648,16 @@ idepmac_sleep_drive(ide_drive_t *drive, int idx, unsigned long base)
/* Lock HW group */
/* Lock HW group */
HWGROUP
(
drive
)
->
busy
=
1
;
HWGROUP
(
drive
)
->
busy
=
1
;
/* Stop the device */
/* Stop the device */
idepmac_sleep_device
(
drive
,
idx
,
base
);
idepmac_sleep_device
(
drive
,
base
);
}
}
if
(
unlock
)
if
(
unlock
)
spin_unlock_irq
(
&
i
de
_lock
);
spin_unlock_irq
(
&
i
o_request
_lock
);
}
}
static
void
static
void
idepmac_wake_drive
(
ide_drive_t
*
drive
,
unsigned
long
base
)
idepmac_wake_drive
(
ide_drive_t
*
drive
,
unsigned
long
base
)
{
{
ide_hwif_t
*
hwif
=
HWIF
(
drive
);
unsigned
long
flags
;
unsigned
long
flags
;
int
j
;
int
j
;
...
@@ -1561,22 +1667,22 @@ idepmac_wake_drive(ide_drive_t *drive, unsigned long base)
...
@@ -1561,22 +1667,22 @@ idepmac_wake_drive(ide_drive_t *drive, unsigned long base)
/* Wait up to 20 seconds for the drive to be ready */
/* Wait up to 20 seconds for the drive to be ready */
for
(
j
=
0
;
j
<
200
;
j
++
)
{
for
(
j
=
0
;
j
<
200
;
j
++
)
{
int
status
;
u8
status
=
0
;
mdelay
(
100
);
mdelay
(
100
);
OUT_BYTE
(
drive
->
select
.
all
,
base
+
0x60
);
hwif
->
OUTB
(
drive
->
select
.
all
,
base
+
0x60
);
if
(
IN_BYTE
(
base
+
0x60
)
!=
drive
->
select
.
all
)
if
(
(
hwif
->
INB
(
base
+
0x60
)
)
!=
drive
->
select
.
all
)
continue
;
continue
;
status
=
IN_BYTE
(
base
+
0x70
);
status
=
hwif
->
INB
(
base
+
0x70
);
if
(
!
(
status
&
BUSY_STAT
))
if
(
!
(
status
&
BUSY_STAT
))
break
;
break
;
}
}
/* We resume processing on the HW group */
/* We resume processing on the HW group */
spin_lock_irqsave
(
&
i
de
_lock
,
flags
);
spin_lock_irqsave
(
&
i
o_request
_lock
,
flags
);
HWGROUP
(
drive
)
->
busy
=
0
;
HWGROUP
(
drive
)
->
busy
=
0
;
if
(
!
list_empty
(
&
drive
->
queue
.
queue_head
))
if
(
!
list_empty
(
&
drive
->
queue
.
queue_head
))
ide_do_request
(
HWGROUP
(
drive
),
0
);
ide_do_request
(
HWGROUP
(
drive
),
0
);
spin_unlock_irqrestore
(
&
i
de
_lock
,
flags
);
spin_unlock_irqrestore
(
&
i
o_request
_lock
,
flags
);
}
}
/* Note: We support only master drives for now. This will have to be
/* Note: We support only master drives for now. This will have to be
...
@@ -1607,7 +1713,7 @@ idepmac_notify_sleep(struct pmu_sleep_notifier *self, int when)
...
@@ -1607,7 +1713,7 @@ idepmac_notify_sleep(struct pmu_sleep_notifier *self, int when)
for
(
dn
=
0
;
dn
<
MAX_DRIVES
;
dn
++
)
{
for
(
dn
=
0
;
dn
<
MAX_DRIVES
;
dn
++
)
{
if
(
!
hwif
->
drives
[
dn
].
present
)
if
(
!
hwif
->
drives
[
dn
].
present
)
continue
;
continue
;
idepmac_sleep_drive
(
&
hwif
->
drives
[
dn
],
i
,
base
);
idepmac_sleep_drive
(
&
hwif
->
drives
[
dn
],
base
);
}
}
/* Disable irq during sleep */
/* Disable irq during sleep */
disable_irq
(
pmac_ide
[
i
].
irq
);
disable_irq
(
pmac_ide
[
i
].
irq
);
...
@@ -1617,7 +1723,7 @@ idepmac_notify_sleep(struct pmu_sleep_notifier *self, int when)
...
@@ -1617,7 +1723,7 @@ idepmac_notify_sleep(struct pmu_sleep_notifier *self, int when)
*/
*/
ret
=
check_media_bay_by_base
(
base
,
MB_CD
);
ret
=
check_media_bay_by_base
(
base
,
MB_CD
);
if
((
ret
==
0
)
||
(
ret
==
-
ENODEV
))
if
((
ret
==
0
)
||
(
ret
==
-
ENODEV
))
idepmac_sleep_interface
(
i
,
base
,
(
ret
==
0
));
idepmac_sleep_interface
(
&
pmac_ide
[
i
]
,
base
,
(
ret
==
0
));
}
}
break
;
break
;
case
PBOOK_WAKE
:
case
PBOOK_WAKE
:
...
@@ -1628,14 +1734,14 @@ idepmac_notify_sleep(struct pmu_sleep_notifier *self, int when)
...
@@ -1628,14 +1734,14 @@ idepmac_notify_sleep(struct pmu_sleep_notifier *self, int when)
continue
;
continue
;
/* Make sure we have sane timings */
/* Make sure we have sane timings */
sanitize_timings
(
i
);
sanitize_timings
(
&
pmac_ide
[
i
]
);
/* Check if this is a media bay with an IDE device or not
/* Check if this is a media bay with an IDE device or not
* a media bay
* a media bay
*/
*/
ret
=
check_media_bay_by_base
(
base
,
MB_CD
);
ret
=
check_media_bay_by_base
(
base
,
MB_CD
);
if
((
ret
==
0
)
||
(
ret
==
-
ENODEV
))
{
if
((
ret
==
0
)
||
(
ret
==
-
ENODEV
))
{
idepmac_wake_interface
(
i
,
base
,
(
ret
==
0
));
idepmac_wake_interface
(
&
pmac_ide
[
i
]
,
base
,
(
ret
==
0
));
big_delay
=
1
;
big_delay
=
1
;
}
}
...
@@ -1675,50 +1781,3 @@ idepmac_notify_sleep(struct pmu_sleep_notifier *self, int when)
...
@@ -1675,50 +1781,3 @@ idepmac_notify_sleep(struct pmu_sleep_notifier *self, int when)
return
PBOOK_SLEEP_OK
;
return
PBOOK_SLEEP_OK
;
}
}
#endif
/* CONFIG_PMAC_PBOOK */
#endif
/* CONFIG_PMAC_PBOOK */
static
int
__pmac
pmac_ide_notify_reboot
(
struct
notifier_block
*
this
,
unsigned
long
code
,
void
*
x
)
{
int
i
,
gotone
;
unsigned
long
base
;
if
(
code
!=
SYS_HALT
&&
code
!=
SYS_POWER_OFF
)
return
0
;
gotone
=
0
;
for
(
i
=
0
;
i
<
pmac_ide_count
;
++
i
)
{
ide_hwif_t
*
hwif
;
ide_drive_t
*
drive
;
int
unlock
=
0
;
int
dn
;
if
((
base
=
pmac_ide
[
i
].
regbase
)
==
0
)
continue
;
hwif
=
&
ide_hwifs
[
i
];
for
(
dn
=
0
;
dn
<
MAX_DRIVES
;
dn
++
)
{
drive
=
&
hwif
->
drives
[
dn
];
if
(
drive
->
present
)
{
gotone
=
1
;
/* Wait for HW group to complete operations */
if
(
ide_spin_wait_hwgroup
(
drive
))
{
// What can we do here ? Wake drive we had already
// put to sleep and return an error ?
}
else
{
unlock
=
1
;
/* Lock HW group */
HWGROUP
(
drive
)
->
busy
=
1
;
/* Stop the device */
idepmac_sleep_device
(
drive
,
i
,
base
);
}
}
if
(
unlock
)
spin_unlock_irq
(
&
ide_lock
);
}
}
if
(
gotone
)
mdelay
(
1000
);
return
NOTIFY_DONE
;
}
drivers/ide/ppc/swarm.c
View file @
ccf944bd
...
@@ -31,6 +31,9 @@
...
@@ -31,6 +31,9 @@
#include <asm/irq.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/io.h>
#include <asm/sibyte/sb1250_int.h>
#include <asm/sibyte/sb1250_int.h>
#define __IDE_SWARM_C
#include <asm/sibyte/swarm_ide.h>
#include <asm/sibyte/swarm_ide.h>
void
__init
swarm_ide_probe
(
void
)
void
__init
swarm_ide_probe
(
void
)
...
@@ -62,12 +65,37 @@ void __init swarm_ide_probe(void)
...
@@ -62,12 +65,37 @@ void __init swarm_ide_probe(void)
hwif
->
hw
.
io_ports
[
IDE_STATUS_OFFSET
]
=
SWARM_IDE_REG
(
0x1f7
);
hwif
->
hw
.
io_ports
[
IDE_STATUS_OFFSET
]
=
SWARM_IDE_REG
(
0x1f7
);
hwif
->
hw
.
io_ports
[
IDE_CONTROL_OFFSET
]
=
SWARM_IDE_REG
(
0x3f6
);
hwif
->
hw
.
io_ports
[
IDE_CONTROL_OFFSET
]
=
SWARM_IDE_REG
(
0x3f6
);
hwif
->
hw
.
io_ports
[
IDE_IRQ_OFFSET
]
=
SWARM_IDE_REG
(
0x3f7
);
hwif
->
hw
.
io_ports
[
IDE_IRQ_OFFSET
]
=
SWARM_IDE_REG
(
0x3f7
);
// hwif->hw->ack_intr
= swarm_ide_ack_intr;
// hwif->hw->ack_intr = swarm_ide_ack_intr;
hwif
->
hw
.
irq
=
SWARM_IDE_INT
;
hwif
->
hw
.
irq
=
SWARM_IDE_INT
;
hwif
->
ideproc
=
swarm_ideproc
;
#if 0
hwif->iops = swarm_iops;
#else
hwif
->
OUTB
=
hwif
->
OUTBP
=
swarm_outb
;
hwif
->
OUTW
=
hwif
->
OUTWP
=
swarm_outw
;
hwif
->
OUTL
=
hwif
->
OUTLP
=
swarm_outl
;
hwif
->
OUTSW
=
hwif
->
OUTSWP
=
swarm_outsw
;
hwif
->
OUTSL
=
hwif
->
OUTSLP
=
swarm_outsl
;
hwif
->
INB
=
hwif
->
INBP
=
swarm_inb
;
hwif
->
INW
=
hwif
->
INWP
=
swarm_inw
;
hwif
->
INL
=
hwif
->
INLP
=
swarm_inl
;
hwif
->
INSW
=
hwif
->
INSWP
=
swarm_insw
;
hwif
->
INSL
=
hwif
->
INSLP
=
swarm_insl
;
#endif
#if 0
hwif->pioops = swarm_pio_ops;
#else
hwif
->
ata_input_data
=
swarm_ata_input_data
;
hwif
->
ata_output_data
=
swarm_ata_output_data
;
hwif
->
atapi_input_bytes
=
swarm_atapi_input_bytes
;
hwif
->
atapi_output_bytes
=
swarm_atapi_output_bytes
;
#endif
memcpy
(
hwif
->
io_ports
,
hwif
->
hw
.
io_ports
,
sizeof
(
hwif
->
io_ports
));
memcpy
(
hwif
->
io_ports
,
hwif
->
hw
.
io_ports
,
sizeof
(
hwif
->
io_ports
));
hwif
->
irq
=
hwif
->
hw
.
irq
;
hwif
->
irq
=
hwif
->
hw
.
irq
;
printk
(
"SWARM onboard IDE configured as device %i
\n
"
,
i
);
printk
(
"SWARM onboard IDE configured as device %i
\n
"
,
i
);
#ifndef HWIF_PROBE_CLASSIC_METHOD
probe_hwif_init
(
hwif
->
index
);
#endif
/* HWIF_PROBE_CLASSIC_METHOD */
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment