diff mbox

[LEDE-DEV] kernel: drop superflous b43 patch

Message ID 1482308468-29973-1-git-send-email-john@phrozen.org
State Rejected
Headers show

Commit Message

John Crispin Dec. 21, 2016, 8:21 a.m. UTC
This patch makes 3 symbols default, that get selected by the according code.

arch/mips/bcm47xx/Kconfig:	select SSB_B43_PCI_BRIDGE if PCI
drivers/net/wireless/broadcom/b43legacy/Kconfig:	select SSB_B43_PCI_BRIDGE
drivers/net/wireless/broadcom/b43/Kconfig:	select SSB_B43_PCI_BRIDGE
drivers/net/wireless/broadcom/b43/Kconfig:	select SSB_BLOCKIO
drivers/ssb/Kconfig:config SSB_BLOCKIO
drivers/net/wireless/broadcom/b43/Kconfig:	select BCMA_BLOCKIO

Signed-off-by: John Crispin <john@phrozen.org>
---
 .../patches-4.4/253-ssb_b43_default_on.patch       |   49 --------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 target/linux/generic/patches-4.4/253-ssb_b43_default_on.patch

Comments

Jonas Gorski Dec. 21, 2016, 8:31 a.m. UTC | #1
Hi,

On 21 December 2016 at 09:21, John Crispin <john@phrozen.org> wrote:
> This patch makes 3 symbols default, that get selected by the according code.
>
> arch/mips/bcm47xx/Kconfig:      select SSB_B43_PCI_BRIDGE if PCI
> drivers/net/wireless/broadcom/b43legacy/Kconfig:        select SSB_B43_PCI_BRIDGE
> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_B43_PCI_BRIDGE
> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_BLOCKIO
> drivers/ssb/Kconfig:config SSB_BLOCKIO
> drivers/net/wireless/broadcom/b43/Kconfig:      select BCMA_BLOCKIO

Except that we don't ever enable b43 within the kernel, so they would
then stay unselected.

So NAK ;p

Regards
Jonas
John Crispin Dec. 21, 2016, 8:34 a.m. UTC | #2
On 21/12/2016 09:31, Jonas Gorski wrote:
> Hi,
> 
> On 21 December 2016 at 09:21, John Crispin <john@phrozen.org> wrote:
>> This patch makes 3 symbols default, that get selected by the according code.
>>
>> arch/mips/bcm47xx/Kconfig:      select SSB_B43_PCI_BRIDGE if PCI
>> drivers/net/wireless/broadcom/b43legacy/Kconfig:        select SSB_B43_PCI_BRIDGE
>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_B43_PCI_BRIDGE
>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_BLOCKIO
>> drivers/ssb/Kconfig:config SSB_BLOCKIO
>> drivers/net/wireless/broadcom/b43/Kconfig:      select BCMA_BLOCKIO
> 
> Except that we don't ever enable b43 within the kernel, so they would
> then stay unselected.
> 
> So NAK ;p
> 
> Regards
> Jonas
> 

ok, so this is a hack patch not applicable for usptream or will you send
it upstream so that we can drop it ?

	John
Jonas Gorski Dec. 21, 2016, 8:39 a.m. UTC | #3
On 21 December 2016 at 09:34, John Crispin <john@phrozen.org> wrote:
>
>
> On 21/12/2016 09:31, Jonas Gorski wrote:
>> Hi,
>>
>> On 21 December 2016 at 09:21, John Crispin <john@phrozen.org> wrote:
>>> This patch makes 3 symbols default, that get selected by the according code.
>>>
>>> arch/mips/bcm47xx/Kconfig:      select SSB_B43_PCI_BRIDGE if PCI
>>> drivers/net/wireless/broadcom/b43legacy/Kconfig:        select SSB_B43_PCI_BRIDGE
>>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_B43_PCI_BRIDGE
>>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_BLOCKIO
>>> drivers/ssb/Kconfig:config SSB_BLOCKIO
>>> drivers/net/wireless/broadcom/b43/Kconfig:      select BCMA_BLOCKIO
>>
>> Except that we don't ever enable b43 within the kernel, so they would
>> then stay unselected.
>>
>> So NAK ;p
>>
>> Regards
>> Jonas
>>
>
> ok, so this is a hack patch not applicable for usptream or will you send
> it upstream so that we can drop it ?

This is only required if you build ssb/bcma from the kernel, but build
b43 from kernel-backports (which can't affect the kernel config).
Since bcm47xx/bcm53xx requires ssb/bcma built-in into the kernel we
can't just build ssb/bcma from backports either.

So a hack patch not suitable for upstream, and rather specific for our use case.


Jonas
John Crispin Dec. 21, 2016, 9:42 a.m. UTC | #4
On 21/12/2016 09:39, Jonas Gorski wrote:
> On 21 December 2016 at 09:34, John Crispin <john@phrozen.org> wrote:
>>
>>
>> On 21/12/2016 09:31, Jonas Gorski wrote:
>>> Hi,
>>>
>>> On 21 December 2016 at 09:21, John Crispin <john@phrozen.org> wrote:
>>>> This patch makes 3 symbols default, that get selected by the according code.
>>>>
>>>> arch/mips/bcm47xx/Kconfig:      select SSB_B43_PCI_BRIDGE if PCI
>>>> drivers/net/wireless/broadcom/b43legacy/Kconfig:        select SSB_B43_PCI_BRIDGE
>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_B43_PCI_BRIDGE
>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_BLOCKIO
>>>> drivers/ssb/Kconfig:config SSB_BLOCKIO
>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select BCMA_BLOCKIO
>>>
>>> Except that we don't ever enable b43 within the kernel, so they would
>>> then stay unselected.
>>>
>>> So NAK ;p
>>>
>>> Regards
>>> Jonas
>>>
>>
>> ok, so this is a hack patch not applicable for usptream or will you send
>> it upstream so that we can drop it ?
> 
> This is only required if you build ssb/bcma from the kernel, but build
> b43 from kernel-backports (which can't affect the kernel config).
> Since bcm47xx/bcm53xx requires ssb/bcma built-in into the kernel we
> can't just build ssb/bcma from backports either.
> 
> So a hack patch not suitable for upstream, and rather specific for our use case.
> 
> 
> Jonas

Ok, so this is a requirement when building a kernel with a newer
compat-wireless driver. imho we could simply give the bools a prompt
instead of setting the default to y and then expalin that this is needed
when building compat-wireless drivers. i think this should be fine for
upstream ?

	John
Jonas Gorski Dec. 21, 2016, 9:48 a.m. UTC | #5
On 21 December 2016 at 10:42, John Crispin <john@phrozen.org> wrote:
>
>
> On 21/12/2016 09:39, Jonas Gorski wrote:
>> On 21 December 2016 at 09:34, John Crispin <john@phrozen.org> wrote:
>>>
>>>
>>> On 21/12/2016 09:31, Jonas Gorski wrote:
>>>> Hi,
>>>>
>>>> On 21 December 2016 at 09:21, John Crispin <john@phrozen.org> wrote:
>>>>> This patch makes 3 symbols default, that get selected by the according code.
>>>>>
>>>>> arch/mips/bcm47xx/Kconfig:      select SSB_B43_PCI_BRIDGE if PCI
>>>>> drivers/net/wireless/broadcom/b43legacy/Kconfig:        select SSB_B43_PCI_BRIDGE
>>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_B43_PCI_BRIDGE
>>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_BLOCKIO
>>>>> drivers/ssb/Kconfig:config SSB_BLOCKIO
>>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select BCMA_BLOCKIO
>>>>
>>>> Except that we don't ever enable b43 within the kernel, so they would
>>>> then stay unselected.
>>>>
>>>> So NAK ;p
>>>>
>>>> Regards
>>>> Jonas
>>>>
>>>
>>> ok, so this is a hack patch not applicable for usptream or will you send
>>> it upstream so that we can drop it ?
>>
>> This is only required if you build ssb/bcma from the kernel, but build
>> b43 from kernel-backports (which can't affect the kernel config).
>> Since bcm47xx/bcm53xx requires ssb/bcma built-in into the kernel we
>> can't just build ssb/bcma from backports either.
>>
>> So a hack patch not suitable for upstream, and rather specific for our use case.
>>
>>
>> Jonas
>
> Ok, so this is a requirement when building a kernel with a newer
> compat-wireless driver. imho we could simply give the bools a prompt
> instead of setting the default to y and then expalin that this is needed
> when building compat-wireless drivers. i think this should be fine for
> upstream ?

Usually if you do that you would also just build ssb/bcma from
compat-wireless as well. Building ssb/bcma from the kernel itself will
also require you to patch the in-kernel drivers to the ones matching
the compat-wireless release (more or less), so it really isn't just
allowing these to be set to y manually for that.


Jonas
John Crispin Dec. 21, 2016, 9:52 a.m. UTC | #6
On 21/12/2016 10:48, Jonas Gorski wrote:
> On 21 December 2016 at 10:42, John Crispin <john@phrozen.org> wrote:
>>
>>
>> On 21/12/2016 09:39, Jonas Gorski wrote:
>>> On 21 December 2016 at 09:34, John Crispin <john@phrozen.org> wrote:
>>>>
>>>>
>>>> On 21/12/2016 09:31, Jonas Gorski wrote:
>>>>> Hi,
>>>>>
>>>>> On 21 December 2016 at 09:21, John Crispin <john@phrozen.org> wrote:
>>>>>> This patch makes 3 symbols default, that get selected by the according code.
>>>>>>
>>>>>> arch/mips/bcm47xx/Kconfig:      select SSB_B43_PCI_BRIDGE if PCI
>>>>>> drivers/net/wireless/broadcom/b43legacy/Kconfig:        select SSB_B43_PCI_BRIDGE
>>>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_B43_PCI_BRIDGE
>>>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select SSB_BLOCKIO
>>>>>> drivers/ssb/Kconfig:config SSB_BLOCKIO
>>>>>> drivers/net/wireless/broadcom/b43/Kconfig:      select BCMA_BLOCKIO
>>>>>
>>>>> Except that we don't ever enable b43 within the kernel, so they would
>>>>> then stay unselected.
>>>>>
>>>>> So NAK ;p
>>>>>
>>>>> Regards
>>>>> Jonas
>>>>>
>>>>
>>>> ok, so this is a hack patch not applicable for usptream or will you send
>>>> it upstream so that we can drop it ?
>>>
>>> This is only required if you build ssb/bcma from the kernel, but build
>>> b43 from kernel-backports (which can't affect the kernel config).
>>> Since bcm47xx/bcm53xx requires ssb/bcma built-in into the kernel we
>>> can't just build ssb/bcma from backports either.
>>>
>>> So a hack patch not suitable for upstream, and rather specific for our use case.
>>>
>>>
>>> Jonas
>>
>> Ok, so this is a requirement when building a kernel with a newer
>> compat-wireless driver. imho we could simply give the bools a prompt
>> instead of setting the default to y and then expalin that this is needed
>> when building compat-wireless drivers. i think this should be fine for
>> upstream ?
> 
> Usually if you do that you would also just build ssb/bcma from
> compat-wireless as well. Building ssb/bcma from the kernel itself will
> also require you to patch the in-kernel drivers to the ones matching
> the compat-wireless release (more or less), so it really isn't just
> allowing these to be set to y manually for that.
> 
> 
> Jonas
> 

Ok, could you kindly provide a description about why we need the patch
and send it to me so i can update the patch in my local tree with the
other changes i made ? you can explain it much better than me. i will
move all these tree specific patches into a group and prefix them with
"hack:" or something similar

	John
diff mbox

Patch

diff --git a/target/linux/generic/patches-4.4/253-ssb_b43_default_on.patch b/target/linux/generic/patches-4.4/253-ssb_b43_default_on.patch
deleted file mode 100644
index 557fea1..0000000
--- a/target/linux/generic/patches-4.4/253-ssb_b43_default_on.patch
+++ /dev/null
@@ -1,49 +0,0 @@ 
-From 66118e4da4e9fb4778280b4708c8c10bb0ce3503 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <f.fainelli@gmail.com>
-Date: Tue, 20 Dec 2016 10:54:01 +0100
-Subject: [PATCH 106/243] Allow b43_pci_bridge to be default on, otherwise we
- can never enable it.
-
-lede-commit: 3fedfe9537497d4766efa1c163da9b38b026b2d4
-Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
----
- drivers/bcma/Kconfig |    1 +
- drivers/ssb/Kconfig  |    3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
-index b5c48a8..6cb5208 100644
---- a/drivers/bcma/Kconfig
-+++ b/drivers/bcma/Kconfig
-@@ -17,6 +17,7 @@ config BCMA
- config BCMA_BLOCKIO
- 	bool
- 	depends on BCMA
-+	default y
- 
- config BCMA_HOST_PCI_POSSIBLE
- 	bool
-diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig
-index 149214b..af5a880 100644
---- a/drivers/ssb/Kconfig
-+++ b/drivers/ssb/Kconfig
-@@ -29,6 +29,7 @@ config SSB_SPROM
- config SSB_BLOCKIO
- 	bool
- 	depends on SSB
-+	default y
- 
- config SSB_PCIHOST_POSSIBLE
- 	bool
-@@ -49,7 +50,7 @@ config SSB_PCIHOST
- config SSB_B43_PCI_BRIDGE
- 	bool
- 	depends on SSB_PCIHOST
--	default n
-+	default y
- 
- config SSB_PCMCIAHOST_POSSIBLE
- 	bool
--- 
-1.7.10.4
-