commits November 2009

commits@lists.open-mesh.org

1 participants
989 discussions

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit af42f6c7c7e60c5a160b7b2dbb35d528a501fb58 Merge: d93dc92113ce51879f6b289382113f7b9e584658 2fdc246aaf9a7fa088451ad2a72e9119b5f7f029 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Oct 18 19:27:14 2009 +0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into linux -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 962f4b04ffc8c23d866ea2921ee3e72bedf0d2b7 Merge: af42f6c7c7e60c5a160b7b2dbb35d528a501fb58 b0e4cc81db8213bfdca376557cc35dcda9298364 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Oct 18 19:28:45 2009 +0800 Merge branch 'linux' of batman-git:/srv/git/batman into linux -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 2fdc246aaf9a7fa088451ad2a72e9119b5f7f029 Merge: 7c650a0a9dda405ba41df12cf106d1228e50e3ba 4997811e3b9e4d6f37380701894f063c62f14929 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Fri Oct 16 10:13:58 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: fix DRAM base and limit extraction masks, v2 -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 4997811e3b9e4d6f37380701894f063c62f14929 Author: Borislav Petkov <borislav.petkov(a)amd.com> Date: Mon Oct 12 17:23:03 2009 +0200 amd64_edac: fix DRAM base and limit extraction masks, v2 This is a proper fix as a follow-up to 66216a7 and 916d11b. Signed-off-by: Borislav Petkov <borislav.petkov(a)amd.com> diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 4f4ac82..d4560d9 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -1122,7 +1122,7 @@ static void k8_read_dram_base_limit(struct amd64_pvt *pvt, int dram) debugf0("Reading K8_DRAM_BASE_LOW failed\n"); /* Extract parts into separate data entries */ - pvt->dram_base[dram] = ((u64) low & 0xFFFF0000) << 24; + pvt->dram_base[dram] = ((u64) low & 0xFFFF0000) << 8; pvt->dram_IntlvEn[dram] = (low >> 8) & 0x7; pvt->dram_rw_en[dram] = (low & 0x3); @@ -1135,7 +1135,7 @@ static void k8_read_dram_base_limit(struct amd64_pvt *pvt, int dram) * Extract parts into separate data entries. Limit is the HIGHEST memory * location of the region, so lower 24 bits need to be all ones */ - pvt->dram_limit[dram] = (((u64) low & 0xFFFF0000) << 24) | 0x00FFFFFF; + pvt->dram_limit[dram] = (((u64) low & 0xFFFF0000) << 8) | 0x00FFFFFF; pvt->dram_IntlvSel[dram] = (low >> 8) & 0x7; pvt->dram_DstNode[dram] = (low & 0x7); } @@ -1369,7 +1369,7 @@ static void f10_read_dram_base_limit(struct amd64_pvt *pvt, int dram) pvt->dram_IntlvEn[dram] = (low_base >> 8) & 0x7; pvt->dram_base[dram] = (((u64)high_base & 0x000000FF) << 40) | - (((u64)low_base & 0xFFFF0000) << 24); + (((u64)low_base & 0xFFFF0000) << 8); low_offset = K8_DRAM_LIMIT_LOW + (dram << 3); high_offset = F10_DRAM_LIMIT_HIGH + (dram << 3); @@ -1391,7 +1391,7 @@ static void f10_read_dram_base_limit(struct amd64_pvt *pvt, int dram) * memory location of the region, so low 24 bits need to be all ones. */ pvt->dram_limit[dram] = (((u64)high_limit & 0x000000FF) << 40) | - (((u64) low_limit & 0xFFFF0000) << 24) | + (((u64) low_limit & 0xFFFF0000) << 8) | 0x00FFFFFF; } -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 7c650a0a9dda405ba41df12cf106d1228e50e3ba Merge: 012abeea669ea49636cf952d13298bb68654146a 159a7ff7a13f9a02c75006f40c0561a3a81aefcd Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Fri Oct 16 09:25:11 2009 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: sata_mv: Prevent PIO commands to be defered too long if traffic in progress. pata_sc1200: Fix crash on boot libata: fix internal command failure handling libata: fix PMP initialization sata_nv: make sure link is brough up online when skipping hardreset ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2 ahci: Add the AHCI controller Linux Device ID for NVIDIA chipsets. pata_via: extend the rev_max for VT6330 -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 159a7ff7a13f9a02c75006f40c0561a3a81aefcd Author: Gwendal Grignou <gwendal(a)google.com> Date: Mon Oct 12 15:44:00 2009 -0700 sata_mv: Prevent PIO commands to be defered too long if traffic in progress. Use excl_link when non NCQ commands are defered, to be sure they are processed as soon as outstanding commands are completed. It prevents some commands to be defered indifinitely when using a port multiplier. Signed-off-by: Gwendal Grignou <gwendal(a)google.com> Signed-off-by: Jeff Garzik <jgarzik(a)redhat.com> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 17f9ff9..6f5093b 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -1382,6 +1382,25 @@ static int mv_qc_defer(struct ata_queued_cmd *qc) */ if (pp->pp_flags & MV_PP_FLAG_DELAYED_EH) return ATA_DEFER_PORT; + + /* PIO commands need exclusive link: no other commands [DMA or PIO] + * can run concurrently. + * set excl_link when we want to send a PIO command in DMA mode + * or a non-NCQ command in NCQ mode. + * When we receive a command from that link, and there are no + * outstanding commands, mark a flag to clear excl_link and let + * the command go through. + */ + if (unlikely(ap->excl_link)) { + if (link == ap->excl_link) { + if (ap->nr_active_links) + return ATA_DEFER_PORT; + qc->flags |= ATA_QCFLAG_CLEAR_EXCL; + return 0; + } else + return ATA_DEFER_PORT; + } + /* * If the port is completely idle, then allow the new qc. */ @@ -1395,8 +1414,14 @@ static int mv_qc_defer(struct ata_queued_cmd *qc) * doesn't allow it. */ if ((pp->pp_flags & MV_PP_FLAG_EDMA_EN) && - (pp->pp_flags & MV_PP_FLAG_NCQ_EN) && ata_is_ncq(qc->tf.protocol)) - return 0; + (pp->pp_flags & MV_PP_FLAG_NCQ_EN)) { + if (ata_is_ncq(qc->tf.protocol)) + return 0; + else { + ap->excl_link = link; + return ATA_DEFER_PORT; + } + } return ATA_DEFER_PORT; } -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 6d4f950e9ea15816c6a4f266ce6b9e438346771e Author: Alan Cox <alan(a)linux.intel.com> Date: Tue Oct 6 16:07:51 2009 +0100 pata_sc1200: Fix crash on boot The SC1200 needs a NULL terminator or it may cause a crash on boot. Bug #14227 Also correct a bogus comment as the driver had serializing added so can run dual port. Signed-off-by: Alan Cox <alan(a)linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik(a)redhat.com> diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c index f49814d..3bbed83 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c @@ -235,8 +235,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) .udma_mask = ATA_UDMA2, .port_ops = &sc1200_port_ops }; - /* Can't enable port 2 yet, see top comments */ - const struct ata_port_info *ppi[] = { &info, }; + const struct ata_port_info *ppi[] = { &info, NULL }; return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL); } -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 4f7c2874995ac48a4622755b8bd159eb2fb6d8f4 Author: Tejun Heo <tj(a)kernel.org> Date: Thu Oct 15 23:37:32 2009 +0900 libata: fix PMP initialization Commit 842faa6c1a1d6faddf3377948e5cf214812c6c90 fixed error handling during attach by not committing detected device class to dev->class while attaching a new device. However, this change missed the PMP class check in the configuration loop causing a new PMP device to go through ata_dev_configure() as if it were an ATA or ATAPI device. As PMP device doesn't have a regular IDENTIFY data, this makes ata_dev_configure() tries to configure a PMP device using an invalid data. For the most part, it wasn't too harmful and went unnoticed but this ends up clearing dev->flags which may have ATA_DFLAG_AN set by sata_pmp_attach(). This means that SATA_PMP_FEAT_NOTIFY ends up being disabled on PMPs and on PMPs which honor the flag breaks hotplug support. This problem was discovered and reported by Ethan Hsiao. Signed-off-by: Tejun Heo <tj(a)kernel.org> Reported-by: Ethan Hsiao <ethanhsiao(a)jmicron.com> Cc: stable(a)kernel.org Signed-off-by: Jeff Garzik <jgarzik(a)redhat.com> diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 0a97822..bba2ae5 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c @@ -2981,12 +2981,14 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, * device detection messages backwards. */ ata_for_each_dev(dev, link, ALL) { - if (!(new_mask & (1 << dev->devno)) || - dev->class == ATA_DEV_PMP) + if (!(new_mask & (1 << dev->devno))) continue; dev->class = ehc->classes[dev->devno]; + if (dev->class == ATA_DEV_PMP) + continue; + ehc->i.flags |= ATA_EHI_PRINTINFO; rc = ata_dev_configure(dev); ehc->i.flags &= ~ATA_EHI_PRINTINFO; -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit f4b31db92d163df8a639f5a8c8633bdeb6e8432d Author: Tejun Heo <tj(a)kernel.org> Date: Fri Oct 16 13:00:51 2009 +0900 libata: fix internal command failure handling When an internal command fails, it should be failed directly without invoking EH. In the original implemetation, this was accomplished by letting internal command bypass failure handling in ata_qc_complete(). However, later changes added post-successful-completion handling to that code path and the success path is no longer adequate as internal command failure path. One of the visible problems is that internal command failure due to timeout or other freeze conditions would spuriously trigger WARN_ON_ONCE() in the success path. This patch updates failure path such that internal command failure handling is contained there. Signed-off-by: Tejun Heo <tj(a)kernel.org> Cc: stable(a)kernel.org Signed-off-by: Jeff Garzik <jgarzik(a)redhat.com> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b525a09..d7f0f1b 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -5028,12 +5028,14 @@ void ata_qc_complete(struct ata_queued_cmd *qc) qc->flags |= ATA_QCFLAG_FAILED; if (unlikely(qc->flags & ATA_QCFLAG_FAILED)) { - if (!ata_tag_internal(qc->tag)) { - /* always fill result TF for failed qc */ - fill_result_tf(qc); + /* always fill result TF for failed qc */ + fill_result_tf(qc); + + if (!ata_tag_internal(qc->tag)) ata_qc_schedule_eh(qc); - return; - } + else + __ata_qc_complete(qc); + return; } WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN); -- batman-adv

1 0

[git] batman-adv branch, linux, updated. 5ff6d9f73e1a8751740bc537732d05a99dfbc01b
by postmaster＠open-mesh.net 09 Nov '09

09 Nov '09

The following commit has been merged in the linux branch: commit 6489e3262e6b188a1a009b65e8a94b7aa17645b7 Author: Tejun Heo <tj(a)kernel.org> Date: Wed Oct 14 11:18:28 2009 +0900 sata_nv: make sure link is brough up online when skipping hardreset prereset doesn't bring link online if hardreset is about to happen and nv_hardreset() may skip if conditions are not right so softreset may be entered with non-working link status if the system firmware didn't bring it up before entering OS code which can happen during resume. This patch makes nv_hardreset() to bring up the link if it's skipping reset. This bug was reported by frodone(a)gmail.com in the following bug entry. http://bugzilla.kernel.org/show_bug.cgi?id=14329 Signed-off-by: Tejun Heo <tj(a)kernel.org> Reported-by: frodone(a)gmail.com Cc: stable(a)kernel.org Signed-off-by: Jeff Garzik <jgarzik(a)redhat.com> diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 86a4058..1eb4e02 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -1594,9 +1594,21 @@ static int nv_hardreset(struct ata_link *link, unsigned int *class, !ata_dev_enabled(link->device)) sata_link_hardreset(link, sata_deb_timing_hotplug, deadline, NULL, NULL); - else if (!(ehc->i.flags & ATA_EHI_QUIET)) - ata_link_printk(link, KERN_INFO, - "nv: skipping hardreset on occupied port\n"); + else { + const unsigned long *timing = sata_ehc_deb_timing(ehc); + int rc; + + if (!(ehc->i.flags & ATA_EHI_QUIET)) + ata_link_printk(link, KERN_INFO, "nv: skipping " + "hardreset on occupied port\n"); + + /* make sure the link is online */ + rc = sata_link_resume(link, timing, deadline); + /* whine about phy resume failure but proceed */ + if (rc && rc != -EOPNOTSUPP) + ata_link_printk(link, KERN_WARNING, "failed to resume " + "link (errno=%d)\n", rc); + } /* device signature acquisition is unreliable */ return -EAGAIN; -- batman-adv

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
99
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2009