rpms/kernel/F-9 linux-2.6-upstream-reverts.patch, 1.2, 1.3 patch-2.6.25.2.bz2.sign, NONE, 1.1 .cvsignore, 1.809, 1.810 kernel.spec, 1.633, 1.634 sources, 1.770, 1.771 upstream, 1.689, 1.690
Kyle McMartin (kyle)
fedora-extras-commits at redhat.com
Wed May 7 06:45:52 UTC 2008
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13043
Modified Files:
.cvsignore kernel.spec sources upstream
Added Files:
linux-2.6-upstream-reverts.patch patch-2.6.25.2.bz2.sign
Log Message:
* Wed May 07 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.25.2
linux-2.6-upstream-reverts.patch:
Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: linux-2.6-upstream-reverts.patch
diff -N linux-2.6-upstream-reverts.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ linux-2.6-upstream-reverts.patch 7 May 2008 06:45:07 -0000 1.3
@@ -0,0 +1,186 @@
+diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
+index 48e9124..4ec1915 100644
+--- a/drivers/net/wireless/b43/dma.c
++++ b/drivers/net/wireless/b43/dma.c
+@@ -822,6 +822,18 @@ static u64 supported_dma_mask(struct b43_wldev *dev)
+ return DMA_30BIT_MASK;
+ }
+
++static enum b43_dmatype dma_mask_to_engine_type(u64 dmamask)
++{
++ if (dmamask == DMA_30BIT_MASK)
++ return B43_DMA_30BIT;
++ if (dmamask == DMA_32BIT_MASK)
++ return B43_DMA_32BIT;
++ if (dmamask == DMA_64BIT_MASK)
++ return B43_DMA_64BIT;
++ B43_WARN_ON(1);
++ return B43_DMA_30BIT;
++}
++
+ /* Main initialization function. */
+ static
+ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
+@@ -982,6 +994,42 @@ void b43_dma_free(struct b43_wldev *dev)
+ dma->tx_ring0 = NULL;
+ }
+
++static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)
++{
++ u64 orig_mask = mask;
++ bool fallback = 0;
++ int err;
++
++ /* Try to set the DMA mask. If it fails, try falling back to a
++ * lower mask, as we can always also support a lower one. */
++ while (1) {
++ err = ssb_dma_set_mask(dev->dev, mask);
++ if (!err)
++ break;
++ if (mask == DMA_64BIT_MASK) {
++ mask = DMA_32BIT_MASK;
++ fallback = 1;
++ continue;
++ }
++ if (mask == DMA_32BIT_MASK) {
++ mask = DMA_30BIT_MASK;
++ fallback = 1;
++ continue;
++ }
++ b43err(dev->wl, "The machine/kernel does not support "
++ "the required %u-bit DMA mask\n",
++ (unsigned int)dma_mask_to_engine_type(orig_mask));
++ return -EOPNOTSUPP;
++ }
++ if (fallback) {
++ b43info(dev->wl, "DMA mask fallback from %u-bit to %u-bit\n",
++ (unsigned int)dma_mask_to_engine_type(orig_mask),
++ (unsigned int)dma_mask_to_engine_type(mask));
++ }
++
++ return 0;
++}
++
+ int b43_dma_init(struct b43_wldev *dev)
+ {
+ struct b43_dma *dma = &dev->dma;
+@@ -991,27 +1039,10 @@ int b43_dma_init(struct b43_wldev *dev)
+ enum b43_dmatype type;
+
+ dmamask = supported_dma_mask(dev);
+- switch (dmamask) {
+- default:
+- B43_WARN_ON(1);
+- case DMA_30BIT_MASK:
+- type = B43_DMA_30BIT;
+- break;
+- case DMA_32BIT_MASK:
+- type = B43_DMA_32BIT;
+- break;
+- case DMA_64BIT_MASK:
+- type = B43_DMA_64BIT;
+- break;
+- }
+- err = ssb_dma_set_mask(dev->dev, dmamask);
+- if (err) {
+- b43err(dev->wl, "The machine/kernel does not support "
+- "the required DMA mask (0x%08X%08X)\n",
+- (unsigned int)((dmamask & 0xFFFFFFFF00000000ULL) >> 32),
+- (unsigned int)(dmamask & 0x00000000FFFFFFFFULL));
+- return -EOPNOTSUPP;
+- }
++ type = dma_mask_to_engine_type(dmamask);
++ err = b43_dma_set_mask(dev, dmamask);
++ if (err)
++ return err;
+
+ err = -ENOMEM;
+ /* setup TX DMA channels. */
+diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
+index c73a75b..f23317e 100644
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -78,6 +78,11 @@ static int modparam_nohwcrypt;
+ module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444);
+ MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
+
++static int modparam_btcoex = 1;
++module_param_named(btcoex, modparam_btcoex, int, 0444);
++MODULE_PARM_DESC(btcoex, "Enable Bluetooth coexistance (default on)");
++
++
+ static const struct ssb_device_id b43_ssb_tbl[] = {
+ SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 5),
+ SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_80211, 6),
+@@ -3339,6 +3344,8 @@ static void b43_bluetooth_coext_enable(struct b43_wldev *dev)
+ struct ssb_sprom *sprom = &dev->dev->bus->sprom;
+ u32 hf;
+
++ if (!modparam_btcoex)
++ return;
+ if (!(sprom->boardflags_lo & B43_BFL_BTCOEXIST))
+ return;
+ if (dev->phy.type != B43_PHYTYPE_B && !dev->phy.gmode)
+@@ -3350,11 +3357,13 @@ static void b43_bluetooth_coext_enable(struct b43_wldev *dev)
+ else
+ hf |= B43_HF_BTCOEX;
+ b43_hf_write(dev, hf);
+- //TODO
+ }
+
+ static void b43_bluetooth_coext_disable(struct b43_wldev *dev)
+-{ //TODO
++{
++ if (!modparam_btcoex)
++ return;
++ //TODO
+ }
+
+ static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev)
+@@ -4000,8 +4009,16 @@ static int b43_one_core_attach(struct ssb_device *dev, struct b43_wl *wl)
+ return err;
+ }
+
++#define IS_PDEV(pdev, _vendor, _device, _subvendor, _subdevice) ( \
++ (pdev->vendor == PCI_VENDOR_ID_##_vendor) && \
++ (pdev->device == _device) && \
++ (pdev->subsystem_vendor == PCI_VENDOR_ID_##_subvendor) && \
++ (pdev->subsystem_device == _subdevice) )
++
+ static void b43_sprom_fixup(struct ssb_bus *bus)
+ {
++ struct pci_dev *pdev;
++
+ /* boardflags workarounds */
+ if (bus->boardinfo.vendor == SSB_BOARDVENDOR_DELL &&
+ bus->chip_id == 0x4301 && bus->boardinfo.rev == 0x74)
+@@ -4009,6 +4026,13 @@ static void b43_sprom_fixup(struct ssb_bus *bus)
+ if (bus->boardinfo.vendor == PCI_VENDOR_ID_APPLE &&
+ bus->boardinfo.type == 0x4E && bus->boardinfo.rev > 0x40)
+ bus->sprom.boardflags_lo |= B43_BFL_PACTRL;
++ if (bus->bustype == SSB_BUSTYPE_PCI) {
++ pdev = bus->host_pci;
++ if (IS_PDEV(pdev, BROADCOM, 0x4318, ASUSTEK, 0x100F) ||
++ IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0015) ||
++ IS_PDEV(pdev, BROADCOM, 0x4320, LINKSYS, 0x0013))
++ bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST;
++ }
+ }
+
+ static void b43_wireless_exit(struct ssb_device *dev, struct b43_wl *wl)
+diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
+index b434df7..274a448 100644
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -482,6 +482,11 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
+ goto unsupported;
+ }
+
++ if (out->boardflags_lo == 0xFFFF)
++ out->boardflags_lo = 0; /* per specs */
++ if (out->boardflags_hi == 0xFFFF)
++ out->boardflags_hi = 0; /* per specs */
++
+ return 0;
+ unsupported:
+ ssb_printk(KERN_WARNING PFX "Unsupported SPROM revision %d "
--- NEW FILE patch-2.6.25.2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBIIQkpyGugalF9Dw4RArs/AJwPgZHLQxresLyBN7JUPyvTauiQ/wCaAzTC
LOketKGqhREPQfxVJLlWiQ8=
=k863
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- .cvsignore 17 Apr 2008 04:38:59 -0000 1.809
+++ .cvsignore 7 May 2008 06:45:07 -0000 1.810
@@ -4,3 +4,4 @@
temp-*
kernel-2.6.25
linux-2.6.25.tar.bz2
+patch-2.6.25.2.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -r1.633 -r1.634
--- kernel.spec 1 May 2008 09:39:44 -0000 1.633
+++ kernel.spec 7 May 2008 06:45:07 -0000 1.634
@@ -31,7 +31,7 @@
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
-%define stable_update 0
+%define stable_update 2
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -556,6 +556,8 @@
# stable release candidate
# Patch03: patch-2.6.24.1-rc1.bz2
+Patch10: linux-2.6-upstream-reverts.patch
+
# we always need nonintconfig, even for -vanilla kernels
Patch06: linux-2.6-build-nonintconfig.patch
@@ -623,9 +625,6 @@
Patch750: linux-2.6-md-fix-oops-in-rdev_attr_store.patch
-# SELinux patches, will go upstream in .26
-Patch800: linux-2.6-selinux-ssinitialized-bugon.patch
-
Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
Patch1400: linux-2.6-smarter-relatime.patch
Patch1515: linux-2.6-lirc.patch
@@ -648,9 +647,6 @@
# atl2 network driver
Patch2020: linux-2.6-netdev-atl2.patch
-# CVE-2008-1675
-Patch2021: linux-2.6-netdev-tehuti-check-register-size.patch
-Patch2022: linux-2.6-netdev-tehuti-move-ioctl-perm-check-closer-to-function-start.patch
# ext4 patches
Patch2100: linux-2.6-ext4-stable-queue.patch
@@ -996,6 +992,8 @@
# builds (as used in the buildsystem).
ApplyPatch linux-2.6-build-nonintconfig.patch
+ApplyPatch linux-2.6-upstream-reverts.patch -R
+
#
# misc small stuff to make things compile
#
@@ -1180,8 +1178,6 @@
ApplyPatch linux-2.6-sata-eeepc-faster.patch
ApplyPatch linux-2.6-netdev-atl2.patch
-ApplyPatch linux-2.6-netdev-tehuti-check-register-size.patch
-ApplyPatch linux-2.6-netdev-tehuti-move-ioctl-perm-check-closer-to-function-start.patch
# Nouveau DRM + drm fixes
ApplyPatch linux-2.6-drm-git-mm.patch
@@ -1211,9 +1207,6 @@
# get rid of imacfb and make efifb work everywhere it was used
ApplyPatch linux-2.6-merge-efifb-imacfb.patch
-# I better appear in .26 and I was sent to stable....
-ApplyPatch linux-2.6-selinux-ssinitialized-bugon.patch
-
# ---------- below all scheduled for 2.6.24 -----------------
# END OF PATCH APPLICATIONS
@@ -1807,6 +1800,9 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Wed May 07 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Linux 2.6.25.2
+
* Thu May 01 2008 Dave Airlie <airlied at redhat.com> 2.6.25-14
- fix radeon fast-user-switch oops + i915 breadcrumb oops
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.770
retrieving revision 1.771
diff -u -r1.770 -r1.771
--- sources 17 Apr 2008 04:39:00 -0000 1.770
+++ sources 7 May 2008 06:45:07 -0000 1.771
@@ -1 +1,2 @@
db95a49a656a3247d4995a797d333153 linux-2.6.25.tar.bz2
+c1d1c1542d676ce3143e5713bab2cca4 patch-2.6.25.2.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.689
retrieving revision 1.690
diff -u -r1.689 -r1.690
--- upstream 17 Apr 2008 04:39:00 -0000 1.689
+++ upstream 7 May 2008 06:45:07 -0000 1.690
@@ -1 +1,2 @@
linux-2.6.25.tar.bz2
+patch-2.6.25.2.bz2
More information about the fedora-extras-commits
mailing list