From: David S. Miller Date: Tue, 14 Dec 2021 12:45:16 +0000 (+0000) Subject: Merge branch 'dsa-fixups' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=256f8d72a51e77d1eaab6094a3d6ae4978d1dbd0;p=linux.git 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 --- 256f8d72a51e77d1eaab6094a3d6ae4978d1dbd0