]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'dsa-fixups'
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Dec 2021 12:45:16 +0000 (12:45 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Dec 2021 12:45:16 +0000 (12:45 +0000)
commitd94d8e167d5c2714f72993f29f7ab634d51ba6f3
tree86b5c674b1e58aef7d77b5b598831b61516e0c4f
parent4b6c839fcdc24761d730069e39cb2bab63bd8512
parent0ec0bbfc69f87bee862b674412b1582689207d20
Merge branch 'dsa-fixups'

Vladimir Oltean says:

====================
DSA tagger-owned storage fixups

It seems that the DSA tagger-owned storage changes were insufficiently
tested and do not work in all cases. Specifically, the NXP Bluebox 3
(arch/arm64/boot/dts/freescale/fsl-lx2160a-bluebox3.dts) got broken by
these changes, because
(a) I forgot that DSA_TAG_PROTO_SJA1110 exists and differs from
    DSA_TAG_PROTO_SJA1105
(b) the Bluebox 3 uses a DSA switch tree with 2 switches, and the
    tagger-owned storage patches don't cover that use case well, it
    seems

Therefore, I'm sorry to say that there needs to be an API fixup: tagging
protocol drivers will from now on connect to individual switches from a
tree, rather than to the tree as a whole. This is more robust against
various ordering constraints in the DSA probe and teardown paths, and is
also symmetrical with the connection API exposed to the switch drivers
themselves, which is also per switch.

With these changes, the Bluebox 3 also works fine.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>