Commit cac8933f authored by David S. Miller's avatar David S. Miller

[ESP/QLOGICPTI]: Only set highmem_io on sparc64.

parent 189525bc
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#ifndef _SPARC_ESP_H #ifndef _SPARC_ESP_H
#define _SPARC_ESP_H #define _SPARC_ESP_H
#include <linux/config.h>
/* For dvma controller register definitions. */ /* For dvma controller register definitions. */
#include <asm/dma.h> #include <asm/dma.h>
...@@ -399,6 +401,7 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length, ...@@ -399,6 +401,7 @@ extern int esp_proc_info(char *buffer, char **start, off_t offset, int length,
int hostno, int inout); int hostno, int inout);
extern int esp_revoke(Scsi_Device* SDptr); extern int esp_revoke(Scsi_Device* SDptr);
#ifdef CONFIG_SPARC64
#define SCSI_SPARC_ESP { \ #define SCSI_SPARC_ESP { \
proc_name: "esp", \ proc_name: "esp", \
proc_info: &esp_proc_info, \ proc_info: &esp_proc_info, \
...@@ -417,6 +420,26 @@ extern int esp_revoke(Scsi_Device* SDptr); ...@@ -417,6 +420,26 @@ extern int esp_revoke(Scsi_Device* SDptr);
use_clustering: ENABLE_CLUSTERING, \ use_clustering: ENABLE_CLUSTERING, \
highmem_io: 1, \ highmem_io: 1, \
} }
#else
/* Sparc32's iommu code cannot handle highmem pages yet. */
#define SCSI_SPARC_ESP { \
proc_name: "esp", \
proc_info: &esp_proc_info, \
name: "Sun ESP 100/100a/200", \
detect: esp_detect, \
revoke: esp_revoke, \
info: esp_info, \
command: esp_command, \
queuecommand: esp_queue, \
abort: esp_abort, \
reset: esp_reset, \
can_queue: 7, \
this_id: 7, \
sg_tablesize: SG_ALL, \
cmd_per_lun: 1, \
use_clustering: ENABLE_CLUSTERING, \
}
#endif
/* For our interrupt engine. */ /* For our interrupt engine. */
#define for_each_esp(esp) \ #define for_each_esp(esp) \
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#ifndef _QLOGICPTI_H #ifndef _QLOGICPTI_H
#define _QLOGICPTI_H #define _QLOGICPTI_H
#include <linux/config.h>
/* Qlogic/SBUS controller registers. */ /* Qlogic/SBUS controller registers. */
#define SBUS_CFG1 0x006UL #define SBUS_CFG1 0x006UL
#define SBUS_CTRL 0x008UL #define SBUS_CTRL 0x008UL
...@@ -512,6 +514,7 @@ struct qlogicpti { ...@@ -512,6 +514,7 @@ struct qlogicpti {
#define HCCTRL_B1ENAB 0x0008 /* Breakpoint 1 enable */ #define HCCTRL_B1ENAB 0x0008 /* Breakpoint 1 enable */
#define HCCTRL_B0ENAB 0x0004 /* Breakpoint 0 enable */ #define HCCTRL_B0ENAB 0x0004 /* Breakpoint 0 enable */
#ifdef CONFIG_SPARC64
#define QLOGICPTI { \ #define QLOGICPTI { \
detect: qlogicpti_detect, \ detect: qlogicpti_detect, \
release: qlogicpti_release, \ release: qlogicpti_release, \
...@@ -526,6 +529,22 @@ struct qlogicpti { ...@@ -526,6 +529,22 @@ struct qlogicpti {
use_clustering: ENABLE_CLUSTERING, \ use_clustering: ENABLE_CLUSTERING, \
highmem_io: 1, \ highmem_io: 1, \
} }
#else
/* Sparc32's iommu code cannot handle highmem pages yet. */
#define QLOGICPTI { \
detect: qlogicpti_detect, \
release: qlogicpti_release, \
info: qlogicpti_info, \
queuecommand: qlogicpti_queuecommand_slow, \
abort: qlogicpti_abort, \
reset: qlogicpti_reset, \
can_queue: QLOGICPTI_REQ_QUEUE_LEN, \
this_id: 7, \
sg_tablesize: QLOGICPTI_MAX_SG(QLOGICPTI_REQ_QUEUE_LEN), \
cmd_per_lun: 1, \
use_clustering: ENABLE_CLUSTERING, \
}
#endif
/* For our interrupt engine. */ /* For our interrupt engine. */
#define for_each_qlogicpti(qp) \ #define for_each_qlogicpti(qp) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment