* Re: Linux 2.6.23.1
2007-10-12 17:01 Linux 2.6.23.1 Greg Kroah-Hartman
@ 2007-10-12 17:02 ` Greg Kroah-Hartman
2007-10-15 11:08 ` [BUG] Linux 2.6.23.1 - Open Firmware exception handler invoked Kamalesh Babulal
1 sibling, 0 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2007-10-12 17:02 UTC (permalink / raw)
To: linux-kernel, Andrew Morton, torvalds, stable
diff --git a/Makefile b/Makefile
index 4635a64..c244a02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 23
-EXTRAVERSION =
+EXTRAVERSION = .1
NAME = Arr Matey! A Hairy Bilge Rat!
# *DOCUMENTATION*
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index cb7dec9..d9832e2 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -69,10 +69,11 @@
#include <linux/device.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_device.h>
#include <linux/libata.h>
#define DRV_NAME "sata_mv"
-#define DRV_VERSION "1.0"
+#define DRV_VERSION "1.01"
enum {
/* BAR's are enumerated in terms of pci_resource_start() terms */
@@ -420,6 +421,7 @@ static void mv_error_handler(struct ata_port *ap);
static void mv_post_int_cmd(struct ata_queued_cmd *qc);
static void mv_eh_freeze(struct ata_port *ap);
static void mv_eh_thaw(struct ata_port *ap);
+static int mv_slave_config(struct scsi_device *sdev);
static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
static void mv5_phy_errata(struct mv_host_priv *hpriv, void __iomem *mmio,
@@ -457,7 +459,7 @@ static struct scsi_host_template mv5_sht = {
.use_clustering = 1,
.proc_name = DRV_NAME,
.dma_boundary = MV_DMA_BOUNDARY,
- .slave_configure = ata_scsi_slave_config,
+ .slave_configure = mv_slave_config,
.slave_destroy = ata_scsi_slave_destroy,
.bios_param = ata_std_bios_param,
};
@@ -475,7 +477,7 @@ static struct scsi_host_template mv6_sht = {
.use_clustering = 1,
.proc_name = DRV_NAME,
.dma_boundary = MV_DMA_BOUNDARY,
- .slave_configure = ata_scsi_slave_config,
+ .slave_configure = mv_slave_config,
.slave_destroy = ata_scsi_slave_destroy,
.bios_param = ata_std_bios_param,
};
@@ -763,6 +765,17 @@ static void mv_irq_clear(struct ata_port *ap)
{
}
+static int mv_slave_config(struct scsi_device *sdev)
+{
+ int rc = ata_scsi_slave_config(sdev);
+ if (rc)
+ return rc;
+
+ blk_queue_max_phys_segments(sdev->request_queue, MV_MAX_SG_CT / 2);
+
+ return 0; /* scsi layer doesn't check return value, sigh */
+}
+
static void mv_set_edma_ptrs(void __iomem *port_mmio,
struct mv_host_priv *hpriv,
struct mv_port_priv *pp)
@@ -1130,10 +1143,9 @@ static void mv_port_stop(struct ata_port *ap)
* LOCKING:
* Inherited from caller.
*/
-static unsigned int mv_fill_sg(struct ata_queued_cmd *qc)
+static void mv_fill_sg(struct ata_queued_cmd *qc)
{
struct mv_port_priv *pp = qc->ap->private_data;
- unsigned int n_sg = 0;
struct scatterlist *sg;
struct mv_sg *mv_sg;
@@ -1151,7 +1163,7 @@ static unsigned int mv_fill_sg(struct ata_queued_cmd *qc)
mv_sg->addr = cpu_to_le32(addr & 0xffffffff);
mv_sg->addr_hi = cpu_to_le32((addr >> 16) >> 16);
- mv_sg->flags_size = cpu_to_le32(len);
+ mv_sg->flags_size = cpu_to_le32(len & 0xffff);
sg_len -= len;
addr += len;
@@ -1160,12 +1172,9 @@ static unsigned int mv_fill_sg(struct ata_queued_cmd *qc)
mv_sg->flags_size |= cpu_to_le32(EPRD_FLAG_END_OF_TBL);
mv_sg++;
- n_sg++;
}
}
-
- return n_sg;
}
static inline void mv_crqb_pack_cmd(__le16 *cmdw, u8 data, u8 addr, unsigned last)
^ permalink raw reply related [flat|nested] 3+ messages in thread* [BUG] Linux 2.6.23.1 - Open Firmware exception handler invoked
2007-10-12 17:01 Linux 2.6.23.1 Greg Kroah-Hartman
2007-10-12 17:02 ` Greg Kroah-Hartman
@ 2007-10-15 11:08 ` Kamalesh Babulal
1 sibling, 0 replies; 3+ messages in thread
From: Kamalesh Babulal @ 2007-10-15 11:08 UTC (permalink / raw)
To: linux-kernel; +Cc: Greg Kroah-Hartman, linuxppc-dev, stable
Hi,
The Open Firmware exception handler is begin invoked, on power5 lpar.
boot: 2.6.23.1
Please wait, loading kernel...
Allocated 03500000 bytes for kernel @ 01c00000
Elf64 kernel loaded...
Loading ramdisk...
ramdisk loaded 0020d000 @ 06b00000
DEFAULT CATCH!, exception-handler=fff00300
at %SRR0: c00000000202705c %SRR1: 8000000000003002
Open Firmware exception handler entered from non-OF code
Client's Fix Pt Regs:
00 0223100003080000 00000000018bfac0 0000000004bbeaf8 00000000018bfb48
04 00000000018bfc90 0000000000c39a48 0000000000000000 5c3a03080000a0fa
08 0000000000000001 0000000000000000 05910000194c0223 000000005cae0000
0c 0000000003f1eaf8 0000000000000000 0000000000000000 0000000000000000
10 0000000000000000 0000000000c39a48 0000000000000000 00000000018bfc90
14 0000000000c00000 000000000020d000 0000000000000000 0000000008b00000
18 0000000000280004 00000000018bff04 0000000000000001 0000000000000000
1c 0000000008b00000 0000000000c39a48 c000000004d1e530 0000000008b00000
Special Regs:
%IV: 00000300 %CR: 44000028 %XER: 00000000 %DSISR: 08000000
%SRR0: c00000000202705c %SRR1: 8000000000003002
%LR: c000000002027428 %CTR: c0000000020273f0
%DAR: 05910000194c02eb
Virtual PID = 0
PFW: Unable to send error log!
ofdbg
0 >
# cat /proc/cpuinfo
processor : 0
cpu : POWER5+ (gs)
clock : 1498.500000MHz
revision : 2.0 (pvr 003b 0200)
processor : 1
cpu : POWER5+ (gs)
clock : 1498.500000MHz
revision : 2.0 (pvr 003b 0200)
timebase : 187199000
platform : pSeries
machine : CHRP IBM,9133-55A
--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.
^ permalink raw reply [flat|nested] 3+ messages in thread