From 483d922a706a460718a06fa9e17078d65a645d03 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 Jun 2023 08:53:13 +0200 Subject: [PATCH] 6.3-stable patches added patches: arm64-dts-qcom-sm8550-use-the-correct-llcc-register-scheme.patch neighbour-delete-neigh_lookup_nodev-as-not-used.patch --- ...use-the-correct-llcc-register-scheme.patch | 47 ++++++++++++ ...elete-neigh_lookup_nodev-as-not-used.patch | 75 +++++++++++++++++++ queue-6.3/series | 2 + 3 files changed, 124 insertions(+) create mode 100644 queue-6.3/arm64-dts-qcom-sm8550-use-the-correct-llcc-register-scheme.patch create mode 100644 queue-6.3/neighbour-delete-neigh_lookup_nodev-as-not-used.patch diff --git a/queue-6.3/arm64-dts-qcom-sm8550-use-the-correct-llcc-register-scheme.patch b/queue-6.3/arm64-dts-qcom-sm8550-use-the-correct-llcc-register-scheme.patch new file mode 100644 index 00000000000..b2b27e592ce --- /dev/null +++ b/queue-6.3/arm64-dts-qcom-sm8550-use-the-correct-llcc-register-scheme.patch @@ -0,0 +1,47 @@ +From 661a4f089317c877aecd598fb70cd46510cc8d29 Mon Sep 17 00:00:00 2001 +From: Konrad Dybcio +Date: Wed, 17 May 2023 04:18:50 +0200 +Subject: arm64: dts: qcom: sm8550: Use the correct LLCC register scheme + +From: Konrad Dybcio + +commit 661a4f089317c877aecd598fb70cd46510cc8d29 upstream. + +During the ABI-breaking (for good reasons) conversion of the LLCC +register description, SM8550 was not taken into account, resulting +in LLCC being broken on any kernel containing the patch referenced +in the fixes tag. + +Fix it by describing the regions properly. + +Fixes: ee13b5008707 ("qcom: llcc/edac: Fix the base address used for accessing LLCC banks") +Signed-off-by: Konrad Dybcio +Acked-by: Manivannan Sadhasivam +Signed-off-by: Bjorn Andersson +Link: https://lore.kernel.org/r/20230517-topic-kailua-llcc-v1-2-d57bd860c43e@linaro.org +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi ++++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi +@@ -3423,9 +3423,16 @@ + + system-cache-controller@25000000 { + compatible = "qcom,sm8550-llcc"; +- reg = <0 0x25000000 0 0x800000>, ++ reg = <0 0x25000000 0 0x200000>, ++ <0 0x25200000 0 0x200000>, ++ <0 0x25400000 0 0x200000>, ++ <0 0x25600000 0 0x200000>, + <0 0x25800000 0 0x200000>; +- reg-names = "llcc_base", "llcc_broadcast_base"; ++ reg-names = "llcc0_base", ++ "llcc1_base", ++ "llcc2_base", ++ "llcc3_base", ++ "llcc_broadcast_base"; + interrupts = ; + }; + diff --git a/queue-6.3/neighbour-delete-neigh_lookup_nodev-as-not-used.patch b/queue-6.3/neighbour-delete-neigh_lookup_nodev-as-not-used.patch new file mode 100644 index 00000000000..0640cd89592 --- /dev/null +++ b/queue-6.3/neighbour-delete-neigh_lookup_nodev-as-not-used.patch @@ -0,0 +1,75 @@ +From 76b9bf965c98c9b53ef7420b3b11438dbd764f92 Mon Sep 17 00:00:00 2001 +From: Leon Romanovsky +Date: Wed, 8 Mar 2023 11:23:13 +0200 +Subject: neighbour: delete neigh_lookup_nodev as not used + +From: Leon Romanovsky + +commit 76b9bf965c98c9b53ef7420b3b11438dbd764f92 upstream. + +neigh_lookup_nodev isn't used in the kernel after removal +of DECnet. So let's remove it. + +Fixes: 1202cdd66531 ("Remove DECnet support from kernel") +Signed-off-by: Leon Romanovsky +Reviewed-by: Eric Dumazet +Reviewed-by: Nikolay Aleksandrov +Link: https://lore.kernel.org/r/eb5656200d7964b2d177a36b77efa3c597d6d72d.1678267343.git.leonro@nvidia.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + include/net/neighbour.h | 2 -- + net/core/neighbour.c | 31 ------------------------------- + 2 files changed, 33 deletions(-) + +--- a/include/net/neighbour.h ++++ b/include/net/neighbour.h +@@ -336,8 +336,6 @@ void neigh_table_init(int index, struct + int neigh_table_clear(int index, struct neigh_table *tbl); + struct neighbour *neigh_lookup(struct neigh_table *tbl, const void *pkey, + struct net_device *dev); +-struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net, +- const void *pkey); + struct neighbour *__neigh_create(struct neigh_table *tbl, const void *pkey, + struct net_device *dev, bool want_ref); + static inline struct neighbour *neigh_create(struct neigh_table *tbl, +--- a/net/core/neighbour.c ++++ b/net/core/neighbour.c +@@ -627,37 +627,6 @@ struct neighbour *neigh_lookup(struct ne + } + EXPORT_SYMBOL(neigh_lookup); + +-struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net, +- const void *pkey) +-{ +- struct neighbour *n; +- unsigned int key_len = tbl->key_len; +- u32 hash_val; +- struct neigh_hash_table *nht; +- +- NEIGH_CACHE_STAT_INC(tbl, lookups); +- +- rcu_read_lock_bh(); +- nht = rcu_dereference_bh(tbl->nht); +- hash_val = tbl->hash(pkey, NULL, nht->hash_rnd) >> (32 - nht->hash_shift); +- +- for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]); +- n != NULL; +- n = rcu_dereference_bh(n->next)) { +- if (!memcmp(n->primary_key, pkey, key_len) && +- net_eq(dev_net(n->dev), net)) { +- if (!refcount_inc_not_zero(&n->refcnt)) +- n = NULL; +- NEIGH_CACHE_STAT_INC(tbl, hits); +- break; +- } +- } +- +- rcu_read_unlock_bh(); +- return n; +-} +-EXPORT_SYMBOL(neigh_lookup_nodev); +- + static struct neighbour * + ___neigh_create(struct neigh_table *tbl, const void *pkey, + struct net_device *dev, u32 flags, diff --git a/queue-6.3/series b/queue-6.3/series index 06824a6f3dc..efd2c5f280a 100644 --- a/queue-6.3/series +++ b/queue-6.3/series @@ -181,3 +181,5 @@ selftests-ptp-fix-timestamp-printf-format-for-ptp_sy.patch octeon_ep-add-missing-check-for-ioremap.patch afs-fix-vlserver-probe-rtt-handling.patch parisc-delete-redundant-register-definitions-in-asm-assembly.h.patch +arm64-dts-qcom-sm8550-use-the-correct-llcc-register-scheme.patch +neighbour-delete-neigh_lookup_nodev-as-not-used.patch -- 2.47.2