From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
"Stefan Brüns" <stefan.bruens@rwth-aachen.de>,
"Rafał Miłecki" <zajec5@gmail.com>,
"John W. Linville" <linville@tuxdriver.com>
Subject: [ 28/42] ssb: implement spurious tone avoidance
Date: Tue, 23 Apr 2013 14:52:26 -0700 [thread overview]
Message-ID: <20130423215208.360572748@linuxfoundation.org> (raw)
In-Reply-To: <20130423215205.523980967@linuxfoundation.org>
3.8-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafał Miłecki <zajec5@gmail.com>
commit 46fc4c909339f5a84d1679045297d9d2fb596987 upstream.
And make use of it in b43. This fixes a regression introduced with
49d55cef5b1925a5c1efb6aaddaa40fc7c693335
b43: N-PHY: implement spurious tone avoidance
This commit made BCM4322 use only MCS 0 on channel 13, which of course
resulted in performance drop (down to 0.7Mb/s).
Reported-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/wireless/b43/phy_n.c | 3 ++-
drivers/ssb/driver_chipcommon_pmu.c | 29 +++++++++++++++++++++++++++++
include/linux/ssb/ssb_driver_chipcommon.h | 2 ++
3 files changed, 33 insertions(+), 1 deletion(-)
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -5165,7 +5165,8 @@ static void b43_nphy_pmu_spur_avoid(stru
#endif
#ifdef CONFIG_B43_SSB
case B43_BUS_SSB:
- /* FIXME */
+ ssb_pmu_spuravoid_pllupdate(&dev->dev->sdev->bus->chipco,
+ avoid);
break;
#endif
}
--- a/drivers/ssb/driver_chipcommon_pmu.c
+++ b/drivers/ssb/driver_chipcommon_pmu.c
@@ -675,3 +675,32 @@ u32 ssb_pmu_get_controlclock(struct ssb_
return 0;
}
}
+
+void ssb_pmu_spuravoid_pllupdate(struct ssb_chipcommon *cc, int spuravoid)
+{
+ u32 pmu_ctl = 0;
+
+ switch (cc->dev->bus->chip_id) {
+ case 0x4322:
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL0, 0x11100070);
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL1, 0x1014140a);
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL5, 0x88888854);
+ if (spuravoid == 1)
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x05201828);
+ else
+ ssb_chipco_pll_write(cc, SSB_PMU1_PLLCTL2, 0x05001828);
+ pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
+ break;
+ case 43222:
+ /* TODO: BCM43222 requires updating PLLs too */
+ return;
+ default:
+ ssb_printk(KERN_ERR PFX
+ "Unknown spuravoidance settings for chip 0x%04X, not changing PLL\n",
+ cc->dev->bus->chip_id);
+ return;
+ }
+
+ chipco_set32(cc, SSB_CHIPCO_PMU_CTL, pmu_ctl);
+}
+EXPORT_SYMBOL_GPL(ssb_pmu_spuravoid_pllupdate);
--- a/include/linux/ssb/ssb_driver_chipcommon.h
+++ b/include/linux/ssb/ssb_driver_chipcommon.h
@@ -219,6 +219,7 @@
#define SSB_CHIPCO_PMU_CTL 0x0600 /* PMU control */
#define SSB_CHIPCO_PMU_CTL_ILP_DIV 0xFFFF0000 /* ILP div mask */
#define SSB_CHIPCO_PMU_CTL_ILP_DIV_SHIFT 16
+#define SSB_CHIPCO_PMU_CTL_PLL_UPD 0x00000400
#define SSB_CHIPCO_PMU_CTL_NOILPONW 0x00000200 /* No ILP on wait */
#define SSB_CHIPCO_PMU_CTL_HTREQEN 0x00000100 /* HT req enable */
#define SSB_CHIPCO_PMU_CTL_ALPREQEN 0x00000080 /* ALP req enable */
@@ -667,5 +668,6 @@ enum ssb_pmu_ldo_volt_id {
void ssb_pmu_set_ldo_voltage(struct ssb_chipcommon *cc,
enum ssb_pmu_ldo_volt_id id, u32 voltage);
void ssb_pmu_set_ldo_paref(struct ssb_chipcommon *cc, bool on);
+void ssb_pmu_spuravoid_pllupdate(struct ssb_chipcommon *cc, int spuravoid);
#endif /* LINUX_SSB_CHIPCO_H_ */
next prev parent reply other threads:[~2013-04-23 21:53 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-23 21:51 [ 00/42] 3.8.9-stable review Greg Kroah-Hartman
2013-04-23 21:51 ` [ 01/42] powerpc: add a missing label in resume_kernel Greg Kroah-Hartman
2013-04-23 21:52 ` [ 02/42] kvm/powerpc/e500mc: fix tlb invalidation on cpu migration Greg Kroah-Hartman
2013-04-23 21:52 ` [ 03/42] ARM: Do 15e0d9e37c (ARM: pm: let platforms select cpu_suspend support) properly Greg Kroah-Hartman
2013-04-23 21:52 ` [ 04/42] kthread: Prevent unpark race which puts threads on the wrong cpu Greg Kroah-Hartman
2013-04-23 21:52 ` [ 05/42] hrtimer: Dont reinitialize a cpu_base lock on CPU_UP Greg Kroah-Hartman
2013-04-23 21:52 ` [ 06/42] can: mcp251x: add missing IRQF_ONESHOT to request_threaded_irq Greg Kroah-Hartman
2013-04-23 21:52 ` [ 07/42] can: sja1000: fix handling on dt properties on little endian systems Greg Kroah-Hartman
2013-04-23 21:52 ` [ 08/42] hugetlbfs: stop setting VM_DONTDUMP in initializing vma(VM_HUGETLB) Greg Kroah-Hartman
2013-04-23 21:52 ` [ 09/42] hugetlbfs: add swap entry check in follow_hugetlb_page() Greg Kroah-Hartman
2013-04-23 21:52 ` [ 10/42] fs/binfmt_elf.c: fix hugetlb memory check in vma_dump_size() Greg Kroah-Hartman
2013-04-23 21:52 ` [ 11/42] kernel/signal.c: stop info leak via the tkill and the tgkill syscalls Greg Kroah-Hartman
2013-04-23 21:52 ` [ 12/42] hfsplus: fix potential overflow in hfsplus_file_truncate() Greg Kroah-Hartman
2013-04-23 21:52 ` [ 13/42] md: raid1,10: Handle REQ_WRITE_SAME flag in write bios Greg Kroah-Hartman
2013-04-23 21:52 ` [ 14/42] KVM: x86: fix for buffer overflow in handling of MSR_KVM_SYSTEM_TIME (CVE-2013-1796) Greg Kroah-Hartman
2013-04-23 21:52 ` [ 15/42] KVM: x86: Convert MSR_KVM_SYSTEM_TIME to use gfn_to_hva_cache functions (CVE-2013-1797) Greg Kroah-Hartman
2013-04-23 21:52 ` [ 16/42] KVM: Fix bounds checking in ioapic indirect register reads (CVE-2013-1798) Greg Kroah-Hartman
2013-04-23 21:52 ` [ 17/42] KVM: Allow cross page reads and writes from cached translations Greg Kroah-Hartman
2013-04-23 21:52 ` [ 18/42] ARM: i.MX35: enable MAX clock Greg Kroah-Hartman
2013-04-23 21:52 ` [ 19/42] ARM: clk-imx35: Bugfix iomux clock Greg Kroah-Hartman
2013-04-23 21:52 ` [ 20/42] tg3: Add 57766 device support Greg Kroah-Hartman
2013-04-23 21:52 ` [ 21/42] sched: Convert BUG_ON()s in try_to_wake_up_local() to WARN_ON_ONCE()s Greg Kroah-Hartman
2013-04-23 21:52 ` [ 22/42] sched/debug: Fix sd->*_idx limit range avoiding overflow Greg Kroah-Hartman
2013-05-10 2:14 ` Ben Hutchings
2013-05-10 7:59 ` Ingo Molnar
2013-05-28 1:47 ` Ben Hutchings
2013-04-23 21:52 ` [ 23/42] ARM: 7696/1: Fix kexec by setting outer_cache.inv_all for Feroceon Greg Kroah-Hartman
2013-04-23 21:52 ` [ 24/42] ARM: 7698/1: perf: fix group validation when using enable_on_exec Greg Kroah-Hartman
2013-04-23 21:52 ` [ 25/42] ath9k_htc: accept 1.x firmware newer than 1.3 Greg Kroah-Hartman
2013-04-23 21:52 ` [ 26/42] ath9k_hw: change AR9580 initvals to fix a stability issue Greg Kroah-Hartman
2013-04-23 21:52 ` [ 27/42] mac80211: fix cfg80211 interaction on auth/assoc request Greg Kroah-Hartman
2013-04-23 21:52 ` Greg Kroah-Hartman [this message]
2013-04-23 21:52 ` [ 29/42] crypto: algif - suppress sending source address information in recvmsg Greg Kroah-Hartman
2013-04-23 21:52 ` Greg Kroah-Hartman
2013-04-23 21:52 ` [ 30/42] perf: Treat attr.config as u64 in perf_swevent_init() Greg Kroah-Hartman
2013-04-23 21:52 ` [ 31/42] perf/x86: Fix offcore_rsp valid mask for SNB/IVB Greg Kroah-Hartman
2013-04-23 21:52 ` [ 32/42] userns: Dont let unprivileged users trick privileged users into setting the id_map Greg Kroah-Hartman
2013-04-23 21:52 ` [ 33/42] userns: Check uid_maps openers fsuid, not the current fsuid Greg Kroah-Hartman
2013-04-23 21:52 ` [ 34/42] userns: Changing any namespace id mappings should require privileges Greg Kroah-Hartman
2013-04-23 21:52 ` [ 35/42] vm: add vm_iomap_memory() helper function Greg Kroah-Hartman
2013-04-23 21:52 ` [ 36/42] vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper Greg Kroah-Hartman
2013-04-23 21:52 ` [ 37/42] vm: convert fb_mmap " Greg Kroah-Hartman
2013-04-23 21:52 ` [ 38/42] vm: convert HPET mmap " Greg Kroah-Hartman
2013-04-23 21:52 ` [ 39/42] vm: convert mtdchar " Greg Kroah-Hartman
2013-04-23 21:52 ` [ 40/42] Btrfs: make sure nbytes are right after log replay Greg Kroah-Hartman
2013-04-23 21:52 ` [ 41/42] s390: move dummy io_remap_pfn_range() to asm/pgtable.h Greg Kroah-Hartman
2013-04-23 21:52 ` [ 42/42] Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK." Greg Kroah-Hartman
2013-04-24 16:23 ` [ 00/42] 3.8.9-stable review Shuah Khan
2013-04-24 16:23 ` Shuah Khan
2013-04-24 16:24 ` Greg Kroah-Hartman
2013-04-25 10:43 ` Satoru Takeuchi
2013-04-25 14:49 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130423215208.360572748@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=stable@vger.kernel.org \
--cc=stefan.bruens@rwth-aachen.de \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.