From 1135d667fd71f3743e63a24b691db3d761d0a20c Mon Sep 17 00:00:00 2001 From: Jeff Skirvin Date: Wed, 4 Jan 2012 01:33:00 -0800 Subject: [PATCH] --- yaml --- r: 286351 b: refs/heads/master c: be168a3b89b43b8bb4ef71066e91439d400e20a6 h: refs/heads/master i: 286349: 41575792ebf127be619239f7a199d6aca52e257d 286347: 4216e1236ab27ab4bc82a725046130b1ca0e739c 286343: 8cba8d9fce9f6928edee1ac95eb1a4ebb43407cd 286335: cb4ee3ba0138d1066560cb07b5f88c1ac0bbc5a4 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/isci/host.c | 5 +++-- trunk/drivers/scsi/isci/init.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 42f23e0ca5c0..6cf9ee2e98e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6024d38b86ecc7943e398ef01b0dc2765870d444 +refs/heads/master: be168a3b89b43b8bb4ef71066e91439d400e20a6 diff --git a/trunk/drivers/scsi/isci/host.c b/trunk/drivers/scsi/isci/host.c index 670ecb456d48..7e4d709dc201 100644 --- a/trunk/drivers/scsi/isci/host.c +++ b/trunk/drivers/scsi/isci/host.c @@ -1676,8 +1676,9 @@ static void sci_controller_set_default_config_parameters(struct isci_host *ihost /* Initialize all of the phy parameter information. */ for (index = 0; index < SCI_MAX_PHYS; index++) { - /* Default to 6G (i.e. Gen 3) for now. */ - ihost->user_parameters.phys[index].max_speed_generation = 3; + /* Default to 3G (i.e. Gen 2). */ + ihost->user_parameters.phys[index].max_speed_generation = + SCIC_SDS_PARM_GEN2_SPEED; /* the frequencies cannot be 0 */ ihost->user_parameters.phys[index].align_insertion_frequency = 0x7f; diff --git a/trunk/drivers/scsi/isci/init.c b/trunk/drivers/scsi/isci/init.c index 3c4ddad97053..2bcfb40ae9ad 100644 --- a/trunk/drivers/scsi/isci/init.c +++ b/trunk/drivers/scsi/isci/init.c @@ -114,7 +114,7 @@ u16 stp_inactive_to = 5; module_param(stp_inactive_to, ushort, 0); MODULE_PARM_DESC(stp_inactive_to, "STP inactivity timeout (100us incr)"); -unsigned char phy_gen = 3; +unsigned char phy_gen = SCIC_SDS_PARM_GEN2_SPEED; module_param(phy_gen, byte, 0); MODULE_PARM_DESC(phy_gen, "PHY generation (1: 1.5Gbps 2: 3.0Gbps 3: 6.0Gbps)");