move variables in drivers/macintosh to bss
Subsystems (6)
PATCH 1/1 move variables in drivers/macintosh to bss
Move all the initialized variables to bss.
Mark a version string as const.
--- drivers/macintosh/adbhid.c | 4 ++-- drivers/macintosh/apm_emu.c | 2 +- drivers/macintosh/mac_hid.c | 4 ++-- drivers/macintosh/therm_adt746x.c | 6 +++--- drivers/macintosh/via-cuda.c | 2 +- drivers/macintosh/via-macii.c | 10 +++++----- drivers/macintosh/via-maciisi.c | 6 +++--- drivers/macintosh/via-pmu.c | 11 +++++------ drivers/macintosh/via-pmu68k.c | 4 ++-- 9 files changed, 24 insertions(+), 25 deletions(-)
drivers/macintosh/adbhid.c +2 -2
@@ -574,8 +574,8 @@ static struct adb_request led_request;static int leds_pending[16 ];static int leds_req_pending;static int pending_devs[16 ]; -static int pending_led_start=0 ; -static int pending_led_end=0 ; +static int pending_led_start; +static int pending_led_end;static DEFINE_SPINLOCK (leds_lock);static void leds_done (struct adb_request *req)
drivers/macintosh/apm_emu.c +1 -1
@@ -102,7 +102,7 @@ static struct pmu_sleep_notifier apm_sle SLEEP_LEVEL_USERLAND, }; -static char driver_version[] ="0.5" ;/* no spaces */ +static const char driver_version[] ="0.5" ;/* no spaces */ #ifdef DEBUG static char * apm_event_name[] = {
drivers/macintosh/mac_hid.c +2 -2
@@ -17,10 +17,10 @@static struct input_dev *emumousebtn;static int emumousebtn_input_register (void ); -static int mouse_emulate_buttons =0 ; +static int mouse_emulate_buttons;static int mouse_button2_keycode =KEY_RIGHTCTRL ;/* right control key */ static int mouse_button3_keycode =KEY_RIGHTALT ;/* right option key */ -static int mouse_last_keycode =0 ; +static int mouse_last_keycode;#if defined(CONFIG_SYSCTL )/* file(s) in /proc/sys/dev/mac_hid */
drivers/macintosh/therm_adt746x.c +3 -3
@@ -48,11 +48,11 @@ static u8 FAN_SPD_SET[2] = {0x30, 0x31};static u8 default_limits_local[3 ] = {70 ,50 ,70 };/* local, sensor1, sensor2 */ static u8 default_limits_chip[3 ] = {80 ,65 ,80 };/* local, sensor1, sensor2 */ -static const char *sensor_location[3 ] = {NULL ,NULL ,NULL }; +static const char *sensor_location[3 ]; -static int limit_adjust =0 ; +static int limit_adjust;static int fan_speed =-1 ; -static int verbose =0 ; +static int verbose;MODULE_AUTHOR ("Colin Leroy <[email protected]>" ); MODULE_DESCRIPTION("Driver for ADT746x thermostat in iBook G4 and "
drivers/macintosh/via-cuda.c +1 -1
@@ -86,7 +86,7 @@ static int data_index;#ifdef CONFIG_PPC static struct device_node *vias;#endif -static int cuda_fully_inited =0 ; +static int cuda_fully_inited;#ifdef CONFIG_ADB static int cuda_probe (void );
drivers/macintosh/via-macii.c +5 -5
@@ -107,10 +107,10 @@ static enum macii_state { awaiting_reply } macii_state; -static int need_poll =0 ; -static int command_byte =0 ; -static int last_reply =0 ; -static int last_active =0 ; +static int need_poll; +static int command_byte; +static int last_reply; +static int last_active;static struct adb_request *current_req;static struct adb_request *last_req;
@@ -124,7 +124,7 @@ static int first_byte;static int prefix_len;static int status =ST_IDLE |TREQ ;static int last_status; -static int driver_running =0 ; +static int driver_running;/* debug level 10 required for ADB logging (should be && debug_adb, ideally) */
drivers/macintosh/via-maciisi.c +3 -3
@@ -63,10 +63,10 @@ static volatile unsigned char *via;#undef DEBUG_MACIISI_ADB -static struct adb_request * current_req =NULL ; -static struct adb_request * last_req =NULL ; +static struct adb_request * current_req; +static struct adb_request * last_req;static unsigned char maciisi_rbuf[16 ]; -static unsigned char *reply_ptr =NULL ; +static unsigned char *reply_ptr;static int data_index;static int reading_reply;static int reply_len;
drivers/macintosh/via-pmu.c +5 -6
@@ -141,13 +141,13 @@ static volatile int adb_int_pending;static volatile int disable_poll;static struct device_node *vias;static int pmu_kind =PMU_UNKNOWN ; -static int pmu_fully_inited =0 ; +static int pmu_fully_inited;static int pmu_has_adb;static struct device_node *gpio_node; -static unsigned char __iomem *gpio_reg =NULL ; +static unsigned char __iomem *gpio_reg;static int gpio_irq =NO_IRQ ;static int gpio_irq_enabled =-1 ; -static volatile int pmu_suspended =0 ; +static volatile int pmu_suspended;static spinlock_t pmu_lock;static u8 pmu_intr_mask;static int pmu_version;
@@ -180,7 +180,7 @@ int asleep;BLOCKING_NOTIFIER_HEAD (sleep_notifier_list);#ifdef CONFIG_ADB -static int adb_dev_map =0 ; +static int adb_dev_map;static int pmu_adb_flags;static int pmu_probe (void );
@@ -2777,7 +2777,7 @@ pmu_polled_request(struct adb_request *r#if defined(CONFIG_PM ) && defined(CONFIG_PPC32 ) -static int pmu_sys_suspended =0 ; +static int pmu_sys_suspended;static int pmu_sys_suspend (struct sys_device *sysdev,pm_message_t state) {
@@ -2817,7 +2817,6 @@ static struct sysdev_class pmu_sysclass };static struct sys_device device_pmu = { - .id =0 , .cls = &pmu_sysclass, };
drivers/macintosh/via-pmu68k.c +2 -2
@@ -96,10 +96,10 @@ static int data_index;static int data_len;static int adb_int_pending;static int pmu_adb_flags; -static int adb_dev_map =0 ; +static int adb_dev_map;static struct adb_request bright_req_1, bright_req_2, bright_req_3;static int pmu_kind =PMU_UNKNOWN ; -static int pmu_fully_inited =0 ; +static int pmu_fully_inited;int asleep;BLOCKING_NOTIFIER_HEAD (sleep_notifier_list);
PATCH 1/1 add delay around sl82c105_reset_engine calls
The hald media changed polling does really confuse things. Noone knows why the delays are needed, but they give us access to the CD.
An udelay(50) will give reliable access to the drive, but there is still one (or more) EH reset. The drive works without EH resets with udelay(100).
--- drivers/ata/pata_sl82c105.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/ata/pata_sl82c105.c +3 -0
@@ -187,7 +187,9 @@ static void sl82c105_bmdma_start(struct {struct ata_port *ap = qc->ap; +udelay (100 );sl82c105_reset_engine (ap); +udelay (100 );/* Set the clocks for DMA */ sl82c105_configure_dmamode (ap, qc->dev);
@@ -216,6 +218,7 @@ static void sl82c105_bmdma_stop(struct aata_bmdma_stop (qc);sl82c105_reset_engine (ap); +udelay (100 );/* This will redo the initial setup of the DMA device to matching PIO timings */
PATCH 1/1 cleanup variable usage in mesh interrupt handler
convert void* to struct mesh_state*
remove unused irq argument from mesh_interrupt()
--- drivers/scsi/mesh.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/mesh.c +7 -7
@@ -185,7 +185,7 @@ struct mesh_state {* Driver is too messy, we need a few prototypes... */ static void mesh_done (struct mesh_state *ms,int start_next); -static void mesh_interrupt (int irq,void *dev_id); +static void mesh_interrupt (struct mesh_state *ms);static void cmd_complete (struct mesh_state *ms);static void set_dma_cmds (struct mesh_state *ms,struct scsi_cmnd *cmd);static void halt_dma (struct mesh_state *ms);
@@ -466,7 +466,7 @@ static void mesh_start_cmd(struct mesh_sdlog (ms,"intr b4 arb, intr/exc/err/fc=%.8x" ,MKWORD (mr->interrupt, mr->exception, mr->error, mr->fifo_count)); -mesh_interrupt (0 , (void *)ms); +mesh_interrupt (ms);if (ms->phase != arbitrating)return ; }
@@ -504,7 +504,7 @@ static void mesh_start_cmd(struct mesh_sdlog (ms,"intr after disresel, intr/exc/err/fc=%.8x" ,MKWORD (mr->interrupt, mr->exception, mr->error, mr->fifo_count)); -mesh_interrupt (0 , (void *)ms); +mesh_interrupt (ms);if (ms->phase != arbitrating)return ; dlog(ms, "after intr after disresel, intr/exc/err/fc=%.8x",
@@ -1018,10 +1018,11 @@ static void handle_reset(struct mesh_stastatic irqreturn_t do_mesh_interrupt (int irq,void *dev_id) {unsigned long flags; -struct Scsi_Host *dev = ((struct mesh_state *)dev_id)->host; +struct mesh_state *ms = dev_id; +struct Scsi_Host *dev = ms->host;spin_lock_irqsave (dev->host_lock, flags); -mesh_interrupt (irq, dev_id); +mesh_interrupt (ms);spin_unlock_irqrestore (dev->host_lock, flags);return IRQ_HANDLED ; }
@@ -1661,9 +1662,8 @@ static int mesh_queue(struct scsi_cmnd ** handler (do_mesh_interrupt) or by other functions in * exceptional circumstances */ -static void mesh_interrupt (int irq,void *dev_id) +static void mesh_interrupt (struct mesh_state *ms) { -struct mesh_state *ms = (struct mesh_state *) dev_id;volatile struct mesh_regs __iomem *mr = ms->mesh;int intr;
PATCH 1/1 mark winbond IDE PCI resources with start 0 as unassigned
libata calls pci_request_regions to claim PCI BAR 0 - 5 pci_request_regions fails if one of the regions cant be claimed. bar 5 has start == 0, __request_resource will fail.
Tested on a p630 in SMP mode with pata_sl82c105
00:03.1 IDE interface: Symphony Labs SL82c105 (rev 05) (prog-if 8f [Master SecP SecO PriP PriO])
Control: I/O+ Mem- BusMaster- SpecCycle- MemWINV- VGASnoop- ParErr+ Stepping- SERR+ FastB2B-
Status: Cap- 66MHz- UDF- FastB2B+ ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR-
Interrupt: pin A routed to IRQ 86
Region 0: I/O ports at 3fd3000f000 [size=8]
Region 1: I/O ports at 3fd3000f010 [size=4]
Region 2: I/O ports at 3fd3000f020 [size=8]
Region 3: I/O ports at 3fd3000f030 [size=4]
Region 4: I/O ports at 3fd3000f040 [size=16]
Region 5: I/O ports at 3fd30000000 [size=16] 00: ad 10 05 01 41 01 80 02 05 8f 01 01 08 48 80 00 10: 01 f0 00 00 11 f0 00 00 21 f0 00 00 31 f0 00 00 20: 41 f0 00 00 01 00 00 00 00 00 00 00 00 00 00 00 30: 00 00 00 00 00 00 00 00 00 00 00 00 56 01 02 28 40: b3 08 ff 00 09 09 00 00 09 09 00 00 09 09 00 00 50: 09 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 70: 00 00 00 00 00 00 00 00 00 00 00 00 ff 00 00 00 80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 90: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
name "ide"
linux,phandle 00d5cdc0 (14011840)
assigned-addresses 81001910 00000000 0000f000 00000000 00000008 81001914
00000000 0000f010 00000000 00000004 81001918 00000000
0000f020 00000000 00000008 8100191c 00000000 0000f030
00000000 00000004 81001920 00000000 0000f040 00000000
00000010 81001924 00000000 00000000 00000000 00000010
interrupts 00000003
built-in
#size-cells 00000000
#address-cells 00000001
device_type "ide"
reg 00001900 00000000 00000000 00000000 00000000
41001910 00000000 00000000 00000000 00000008
41001914 00000000 00000000 00000000 00000004
41001918 00000000 00000000 00000000 00000008
4100191c 00000000 00000000 00000000 00000004
41001920 00000000 00000000 00000000 00000010
41001924 00000000 00000000 00000000 00000010
compatible "pci10ad,105"
"pciclass,01018f"
ibm,fw-slot-number 00000000
fast-back-to-back
devsel-speed 00000001
max-latency 00000028 (40)
min-grant 00000002
class-code 0001018f (65935)
revision-id 00000005
device-id 00000105 (261)
vendor-id 000010ad (4269)
ibm,loc-code "U0.1-P1/Q6"--- arch/powerpc/platforms/pseries/pci.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/powerpc/platforms/pseries/pci.c +4 -0
@@ -98,6 +98,10 @@ static void fixup_winbond_82c105(structif (dev->resource[i].flags &IORESOURCE_IO && dev->bus->number ==0 && dev->devfn ==0x81 ) dev->resource[i].flags &= ~IORESOURCE_IO ; +if (dev->resource[i].start ==0 && dev->resource[i].end) { + dev->resource[i].flags =0 ; + dev->resource[i].end =0 ; + } } } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
PATCH 1/1 correct AC Power: in /proc/pmu/info on ibook1
/proc/pmu/info contains AC Power: 0 when booting without battery. Force AC Power, it will be updated whenever the battery state changes.
--- drivers/macintosh/via-pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/macintosh/via-pmu.c +1 -1
@@ -169,7 +169,7 @@ static int option_server_mode;int pmu_battery_count;int pmu_cur_battery; -unsigned int pmu_power_flags; +unsigned int pmu_power_flags =PMU_PWR_AC_PRESENT ;struct pmu_battery_info pmu_batteries[PMU_MAX_BATTERIES ];static int query_batt_timer =BATTERY_POLLING_COUNT ;static struct adb_request batt_req;
Jeff Garzik
AppliedRe: [PATCH] add delay around sl82c105_reset_engine calls
In reply to Olaf HeringQuoted 11 lines · Olaf Hering
The hald media changed polling does really confuse things. Noone knows why the delays are needed, but they give us access to the CD.
An udelay(50) will give reliable access to the drive, but there is still one (or more) EH reset. The drive works without EH resets with udelay(100).
Signed-off-by Olaf Hering <[email protected]>--- drivers/ata/pata_sl82c105.c | 3 +++ 1 file changed, 3 insertions(+)
applied
PATCH 1/1 use winbond libata instead of ide driver for pseries CD drives
Change the default for the built-in IDE on p610/p615/p630 from ide to libata. libata has better error handling and the drive can recover when hald does its CD media polling.
--- arch/powerpc/configs/ppc64_defconfig | 4 ++-- arch/powerpc/configs/pseries_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/powerpc/configs/ppc64_defconfig +2 -2
@@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y # CONFIG_BLK_DEV_PDC202XX_NEW is not set # CONFIG_BLK_DEV_SVWKS is not set # CONFIG_BLK_DEV_SIIMAGE is not set -CONFIG_BLK_DEV_SL82C105=y +# CONFIG_BLK_DEV_SL82C105 is not set # CONFIG_BLK_DEV_SLC90E66 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y # CONFIG_PATA_SIL680 is not set # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set +CONFIG_PATA_WINBOND=y # # Multi-device support (RAID and LVM)
arch/powerpc/configs/pseries_defconfig +2 -2
@@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y # CONFIG_BLK_DEV_PDC202XX_NEW is not set # CONFIG_BLK_DEV_SVWKS is not set # CONFIG_BLK_DEV_SIIMAGE is not set -CONFIG_BLK_DEV_SL82C105=y +# CONFIG_BLK_DEV_SL82C105 is not set # CONFIG_BLK_DEV_SLC90E66 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set
@@ -628,7 +628,7 @@ CONFIG_ATA=y # CONFIG_PATA_SIL680 is not set # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set +CONFIG_PATA_WINBOND=y # # Multi-device support (RAID and LVM)
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
Hello.
Quoted 47 lines · Olaf Hering
Change the default for the built-in IDE on p610/p615/p630 from ide to libata. libata has better error handling and the drive can recover when hald does its CD media polling.
Signed-off-by Olaf Hering <[email protected]>--- arch/powerpc/configs/ppc64_defconfig | 4 ++-- arch/powerpc/configs/pseries_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)Index: linux-2.6.20/arch/powerpc/configs/ppc64_defconfig
===================================================================arch/powerpc/configs/ppc64_defconfig +2
-2@@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y # CONFIG_BLK_DEV_PDC202XX_NEW is not set # CONFIG_BLK_DEV_SVWKS is not set # CONFIG_BLK_DEV_SIIMAGE is not set -CONFIG_BLK_DEV_SL82C105=y +# CONFIG_BLK_DEV_SL82C105 is not set # CONFIG_BLK_DEV_SLC90E66 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set@@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y # CONFIG_PATA_SIL680 is not set # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set +CONFIG_PATA_WINBOND=y # # Multi-device support (RAID and LVM)Index: linux-2.6.20/arch/powerpc/configs/pseries_defconfig
===================================================================arch/powerpc/configs/pseries_defconfig +1
-1@@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y # CONFIG_BLK_DEV_PDC202XX_NEW is not set # CONFIG_BLK_DEV_SVWKS is not set # CONFIG_BLK_DEV_SIIMAGE is not set -CONFIG_BLK_DEV_SL82C105=y +# CONFIG_BLK_DEV_SL82C105 is not set # CONFIG_BLK_DEV_SLC90E66 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set
arch/powerpc/configs/pseries_defconfig CONFIG_ATA=y · line 631
Quoted 5 lines
arch/powerpc/configs/pseries_defconfig +1
-1@@ -628,7 +628,7 @@ CONFIG_ATA=y # CONFIG_PATA_SIL680 is not set # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set +CONFIG_PATA_WINBOND=y
I'm sorry, how those 2 drivers can be equivalent?! The pata_winbond driver
is for VLB only, sl81c105 was for PCI only -- you certainly want to use pata_sl82c105 (indeed better version of sl82c105 driver).
WBR, Sergei
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
In reply to Olaf HeringHi,
Quoted 6 lines · Olaf Hering
Change the default for the built-in IDE on p610/p615/p630 from ide to libata. libata has better error handling and the drive can recover when hald does its CD media polling.
Signed-off-by Olaf Hering <[email protected]>
Does IDE sl82c105 need the same udelay() fix patch as done for pata_winbond?
Bart
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Hi,
Quoted 1 line · Olaf Hering
Quoted 8 lines
Quoted 5 lines
Change the default for the built-in IDE on p610/p615/p630 from ide to libata. libata has better error handling and the drive can recover when hald does its CD media polling.
Signed-off-by Olaf Hering <[email protected]>Does IDE sl82c105 need the same
udelay()fix patch as done forpata_winbond?
s/pata_winbond/pata_sl82c105/ of course
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
In reply to Sergei ShtylyovQuoted 3 lines · Sergei Shtylyov
I'm sorry, how those 2 drivers can be equivalent?! The
pata_winbonddriver
is for VLB only, sl81c105 was for PCI only -- you certainly want to usepata_sl82c105(indeed better version of sl82c105 driver).
I was under the impression that with your fixes these drivers (sl82c105 and pata_sl82c105) are functionally equivalent.
Did I miss something (i.e. some patches)?
Bart
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
In reply to Sergei ShtylyovQuoted 41 lines · Hello, I wrote:
Quoted 41 lines
Change the default for the built-in IDE on p610/p615/p630 from ide to libata. libata has better error handling and the drive can recover when hald does its CD media polling.
Signed-off-by Olaf Hering <[email protected]>Index: linux-2.6.20/arch/powerpc/configs/ppc64_defconfig
===================================================================arch/powerpc/configs/ppc64_defconfig +2
-2@@ -500,7 +500,7 @@ CONFIG_BLK_DEV_AMD74XX=y # CONFIG_BLK_DEV_PDC202XX_NEW is not set # CONFIG_BLK_DEV_SVWKS is not set # CONFIG_BLK_DEV_SIIMAGE is not set -CONFIG_BLK_DEV_SL82C105=y +# CONFIG_BLK_DEV_SL82C105 is not set # CONFIG_BLK_DEV_SLC90E66 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set@@ -646,7 +646,7 @@ CONFIG_SATA_SVW=y # CONFIG_PATA_SIL680 is not set # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set +CONFIG_PATA_WINBOND=y # # Multi-device support (RAID and LVM)Index: linux-2.6.20/arch/powerpc/configs/pseries_defconfig
===================================================================arch/powerpc/configs/pseries_defconfig +1
-1@@ -483,7 +483,7 @@ CONFIG_BLK_DEV_AMD74XX=y # CONFIG_BLK_DEV_PDC202XX_NEW is not set # CONFIG_BLK_DEV_SVWKS is not set # CONFIG_BLK_DEV_SIIMAGE is not set -CONFIG_BLK_DEV_SL82C105=y +# CONFIG_BLK_DEV_SL82C105 is not set # CONFIG_BLK_DEV_SLC90E66 is not set # CONFIG_BLK_DEV_TRM290 is not set # CONFIG_BLK_DEV_VIA82CXXX is not set
Quoted 8 lines
arch/powerpc/configs/pseries_defconfig CONFIG_ATA=y · line 631
Quoted 6 lines
arch/powerpc/configs/pseries_defconfig +1
-1@@ -628,7 +628,7 @@ CONFIG_ATA=y # CONFIG_PATA_SIL680 is not set # CONFIG_PATA_SIS is not set # CONFIG_PATA_VIA is not set -# CONFIG_PATA_WINBOND is not set +CONFIG_PATA_WINBOND=yI'm sorry, how those 2 drivers can be equivalent?! The
pata_winbonddriver
Sorry indeed -- I didn't realize PATA_WINBOND correscponds topata_sl82c105 (somewhat confusing, isn't it?).
WBR, Sergei
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
In reply to Bartlomiej ZolnierkiewiczHello.
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Quoted 2 lines
I'm sorry, how those 2 drivers can be equivalent?! The
pata_winbonddriver
is for VLB only, sl81c105 was for PCI only -- you certainly want to usepata_sl82c105(indeed better version of sl82c105 driver).I was under the impression that with your fixes these drivers (sl82c105 and
pata_sl82c105) are functionally equivalent.
They're not yet equivalent. pata_sl82c105 supports all MWDMA modes,
sl82c105 still supports only MWDMA2.
WBR, Sergei
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
Quoted 8 lines · Sergei Shtylyov
Hello.
Quoted 3 lines · Bartlomiej Zolnierkiewicz
Quoted 3 lines
I'm sorry, how those 2 drivers can be equivalent?! The
pata_winbonddriver
is for VLB only, sl81c105 was for PCI only -- you certainly want to usepata_sl82c105(indeed better version of sl82c105 driver).
Quoted 5 lines
Quoted 2 lines
I was under the impression that with your fixes these drivers (sl82c105 and
pata_sl82c105) are functionally equivalent.They're not yet equivalent.
pata_sl82c105supports all MWDMA modes,
sl82c105 still supports only MWDMA2.
Indeed and it seems that IDE core needs ->dma_mode to fix this.
Thanks,
Bart
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
Hello.
Quoted 10 lines · Bartlomiej Zolnierkiewicz
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
I'm sorry, how those 2 drivers can be equivalent?! The
pata_winbonddriver
is for VLB only, sl81c105 was for PCI only -- you certainly want to usepata_sl82c105(indeed better version of sl82c105 driver).I was under the impression that with your fixes these drivers (sl82c105 and
pata_sl82c105) are functionally equivalent.They're not yet equivalent.
pata_sl82c105supports all MWDMA modes,
sl82c105 still supports only MWDMA2.Indeed and it seems that IDE core needs ->dma_mode to fix this.
Not really. It just needs the proper DMA timings to be set by adding the
missing speedproc() method (and also DMA timings possibly merged with PIO like libata does generally -- except in this driver).
Quoted 2 lines
Thanks,
Bart
MBR, Sergei
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
Quoted 6 lines · Hello, I wrote:
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
I'm sorry, how those 2 drivers can be equivalent?! The
pata_winbonddriver
is for VLB only, sl81c105 was for PCI only -- you certainly want to usepata_sl82c105(indeed better version of sl82c105 driver).I was under the impression that with your fixes these drivers (sl82c105 and
pata_sl82c105) are functionally equivalent.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
They're not yet equivalent.
pata_sl82c105supports all MWDMA modes,
sl82c105 still supports only MWDMA2.Indeed and it seems that IDE core needs ->dma_mode to fix this.
Not really. It just needs the proper DMA timings to be set by adding the
missingspeedproc()method (and also DMA timings possibly merged with PIO like libata does generally -- except in this driver).
By "this driver" I meant pata_sl82c105 of course. :-)
Quoted 2 lines
Quoted 2 lines
Thanks,
Bart
MBR, Sergei
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
In reply to Bartlomiej ZolnierkiewiczQuoted 5 lines · Bartlomiej Zolnierkiewicz
Hi,
Quoted 1 line · Olaf Hering
Quoted 8 lines
Quoted 5 lines
Change the default for the built-in IDE on p610/p615/p630 from ide to libata. libata has better error handling and the drive can recover when hald does its CD media polling.
Signed-off-by Olaf Hering <[email protected]>Does IDE sl82c105 need the same
udelay()fix patch as done forpata_winbond?
I dont know, but I suspect a delay is required somewhere.
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
In reply to Sergei ShtylyovQuoted 8 lines · Sergei Shtylyov
Hello.
Quoted 3 lines · Bartlomiej Zolnierkiewicz
Quoted 3 lines
I'm sorry, how those 2 drivers can be equivalent?! The
pata_winbonddriver
is for VLB only, sl81c105 was for PCI only -- you certainly want to usepata_sl82c105(indeed better version of sl82c105 driver).
Quoted 5 lines
Quoted 2 lines
I was under the impression that with your fixes these drivers (sl82c105 and
pata_sl82c105) are functionally equivalent.They're not yet equivalent.
pata_sl82c105supports all MWDMA modes,
sl82c105 still supports only MWDMA2.
BTW, the "old ide" sl82c105 currently upstream produces warnings on 64 bits platforms about conversion between int and pointers of different sizes. I didn't have time to look closely yesterday though, could be harmless.
Ben.
Re: [PATCH] use winbond libata instead of ide driver for pseries CD drives
In reply to Olaf HeringQuoted 10 lines · Olaf Hering
Change the default for the built-in IDE on p610/p615/p630 from ide to libata. libata has better error handling and the drive can recover when hald does its CD media polling.
Signed-off-by Olaf Hering <[email protected]>--- arch/powerpc/configs/ppc64_defconfig | 4 ++-- arch/powerpc/configs/pseries_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
ACK the patch. I presume Paul will apply it, as its within his file hierarchy