From 1c7339265ded33c8097614ee117a1ec17fd551dd Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 4 Jun 2014 20:34:58 -0700 Subject: [PATCH] 3.4-stable patches added patches: b43-ensue-that-bcma-is-y-when-b43-is-y.patch cfg80211-check-wdev-netdev-in-connection-work.patch i2c-piix4-add-amd-cz-smbus-device-id.patch --- ...3-ensue-that-bcma-is-y-when-b43-is-y.patch | 48 +++++++++++++ ...check-wdev-netdev-in-connection-work.patch | 37 ++++++++++ ...i2c-piix4-add-amd-cz-smbus-device-id.patch | 67 +++++++++++++++++++ queue-3.4/series | 3 + 4 files changed, 155 insertions(+) create mode 100644 queue-3.4/b43-ensue-that-bcma-is-y-when-b43-is-y.patch create mode 100644 queue-3.4/cfg80211-check-wdev-netdev-in-connection-work.patch create mode 100644 queue-3.4/i2c-piix4-add-amd-cz-smbus-device-id.patch diff --git a/queue-3.4/b43-ensue-that-bcma-is-y-when-b43-is-y.patch b/queue-3.4/b43-ensue-that-bcma-is-y-when-b43-is-y.patch new file mode 100644 index 00000000000..7370f1ebfa4 --- /dev/null +++ b/queue-3.4/b43-ensue-that-bcma-is-y-when-b43-is-y.patch @@ -0,0 +1,48 @@ +From 51f2a0a803cd9cf31401610f40d5ab452b2b7e0a Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens +Date: Sun, 9 Jun 2013 18:53:58 +0200 +Subject: b43: ensue that BCMA is "y" when B43 is "y" + +From: Hauke Mehrtens + +commit 693026ef2e751fd94d2e6c71028e68343cc875d5 upstream. + +When b43 gets build into the kernel and it should use bcma we have to +ensure that bcma was also build into the kernel and not as a module. +In this patch this is also done for SSB, although you can not +build b43 without ssb support for now. + +This fixes a build problem reported by Randy Dunlap in +5187EB95.2060605@infradead.org + +Reported-By: Randy Dunlap +Signed-off-by: Hauke Mehrtens +Signed-off-by: John W. Linville +Signed-off-by: Ben Hutchings +Cc: Qiang Huang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/b43/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/b43/Kconfig ++++ b/drivers/net/wireless/b43/Kconfig +@@ -28,7 +28,7 @@ config B43 + + config B43_BCMA + bool "Support for BCMA bus" +- depends on B43 && BCMA ++ depends on B43 && (BCMA = y || BCMA = B43) + default y + + config B43_BCMA_EXTRA +@@ -39,7 +39,7 @@ config B43_BCMA_EXTRA + + config B43_SSB + bool +- depends on B43 && SSB ++ depends on B43 && (SSB = y || SSB = B43) + default y + + # Auto-select SSB PCI-HOST support, if possible diff --git a/queue-3.4/cfg80211-check-wdev-netdev-in-connection-work.patch b/queue-3.4/cfg80211-check-wdev-netdev-in-connection-work.patch new file mode 100644 index 00000000000..5555496a8af --- /dev/null +++ b/queue-3.4/cfg80211-check-wdev-netdev-in-connection-work.patch @@ -0,0 +1,37 @@ +From 71eac9d144bec44c29340b0d9905bcba3f4128e6 Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Thu, 23 May 2013 18:10:21 +0200 +Subject: cfg80211: check wdev->netdev in connection work + +From: Johannes Berg + +commit c815797663b72e3ac1736f1886538152bc48e4af upstream. + +If a P2P-Device is present and another virtual interface triggers +the connection work, the system crash because it tries to check +if the P2P-Device's netdev (which doesn't exist) is up. Skip any +wdevs that have no netdev to fix this. + +Reported-by: YanBo +Signed-off-by: Johannes Berg +[bwh: Backported to 3.2: adjust context] +Signed-off-by: Ben Hutchings +Cc: Qiang Huang +Signed-off-by: Greg Kroah-Hartman + +--- + net/wireless/sme.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/net/wireless/sme.c ++++ b/net/wireless/sme.c +@@ -222,6 +222,9 @@ void cfg80211_conn_work(struct work_stru + mutex_lock(&rdev->devlist_mtx); + + list_for_each_entry(wdev, &rdev->netdev_list, list) { ++ if (!wdev->netdev) ++ continue; ++ + wdev_lock(wdev); + if (!netif_running(wdev->netdev)) { + wdev_unlock(wdev); diff --git a/queue-3.4/i2c-piix4-add-amd-cz-smbus-device-id.patch b/queue-3.4/i2c-piix4-add-amd-cz-smbus-device-id.patch new file mode 100644 index 00000000000..7ed087d12a5 --- /dev/null +++ b/queue-3.4/i2c-piix4-add-amd-cz-smbus-device-id.patch @@ -0,0 +1,67 @@ +From 4e9169bee6bc9870277539a425c528584212e76c Mon Sep 17 00:00:00 2001 +From: Shane Huang +Date: Mon, 3 Jun 2013 18:24:55 +0800 +Subject: i2c-piix4: Add AMD CZ SMBus device ID + +From: Shane Huang + +commit b996ac90f595dda271cbd858b136b45557fc1a57 upstream. + +To add AMD CZ SMBus controller device ID. + +[bhelgaas: drop pci_ids.h update] +Signed-off-by: Shane Huang +Signed-off-by: Bjorn Helgaas +Reviewed-by: Tejun Heo +Reviewed-by: Jean Delvare +[bwh: Backported to 3.2: adjust context] +Signed-off-by: Ben Hutchings +Cc: Qiang Huang +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/i2c/busses/i2c-piix4 | 2 +- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-piix4.c | 3 ++- + 3 files changed, 4 insertions(+), 2 deletions(-) + +--- a/Documentation/i2c/busses/i2c-piix4 ++++ b/Documentation/i2c/busses/i2c-piix4 +@@ -8,7 +8,7 @@ Supported adapters: + Datasheet: Only available via NDA from ServerWorks + * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges + Datasheet: Not publicly available +- * AMD Hudson-2 ++ * AMD Hudson-2, CZ + Datasheet: Not publicly available + * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge + Datasheet: Publicly available at the SMSC website http://www.smsc.com +--- a/drivers/i2c/busses/Kconfig ++++ b/drivers/i2c/busses/Kconfig +@@ -138,6 +138,7 @@ config I2C_PIIX4 + ATI SB700 + ATI SB800 + AMD Hudson-2 ++ AMD CZ + Serverworks OSB4 + Serverworks CSB5 + Serverworks CSB6 +--- a/drivers/i2c/busses/i2c-piix4.c ++++ b/drivers/i2c/busses/i2c-piix4.c +@@ -22,7 +22,7 @@ + Intel PIIX4, 440MX + Serverworks OSB4, CSB5, CSB6, HT-1000, HT-1100 + ATI IXP200, IXP300, IXP400, SB600, SB700, SB800 +- AMD Hudson-2 ++ AMD Hudson-2, CZ + SMSC Victory66 + + Note: we assume there can only be one device, with one SMBus interface. +@@ -481,6 +481,7 @@ static DEFINE_PCI_DEVICE_TABLE(piix4_ids + { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) }, + { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, + PCI_DEVICE_ID_SERVERWORKS_OSB4) }, + { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, diff --git a/queue-3.4/series b/queue-3.4/series index 89ce7a068d7..018eefa7cd5 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -198,3 +198,6 @@ msi-wmi-fix-memory-leak.patch rapidio-tsi721-fix-bug-in-msi-interrupt-handling.patch rapidio-tsi721-fix-interrupt-mask-when-handling-msi.patch random-fix-accounting-race-condition-with-lockless-irq-entropy_count-update.patch +cfg80211-check-wdev-netdev-in-connection-work.patch +i2c-piix4-add-amd-cz-smbus-device-id.patch +b43-ensue-that-bcma-is-y-when-b43-is-y.patch -- 2.47.3