kernel: qca-nss-dp: update to 12.4.5.r1
[openwrt/staging/jow.git] / package / kernel / qca-nss-dp / patches / 0001-nss-dp-Drop-_nocache-variants-of-ioremap.patch
1 From 946381fd6fdabedf2b5a1d8647a49e3da8f1894e Mon Sep 17 00:00:00 2001
2 From: Baruch Siach <baruch@tkos.co.il>
3 Date: Fri, 23 Jun 2023 11:28:02 +0200
4 Subject: [PATCH 1/8] nss-dp: Drop _nocache variants of ioremap()
5
6 ioremap_nocache was made equivelant to ioremap and was dropped.
7
8 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
9 Signed-off-by: Robert Marko <robimarko@gmail.com>
10 ---
11 hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c | 2 +-
12 hal/gmac_ops/syn/gmac/syn_if.c | 2 +-
13 hal/soc_ops/ipq50xx/nss_ipq50xx.c | 2 +-
14 3 files changed, 3 insertions(+), 3 deletions(-)
15
16 --- a/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
17 +++ b/hal/dp_ops/edma_dp/edma_v1/edma_data_plane.c
18 @@ -279,7 +279,7 @@ int edma_init(void)
19 /*
20 * Remap register resource
21 */
22 - edma_hw.reg_base = ioremap_nocache((edma_hw.reg_resource)->start,
23 + edma_hw.reg_base = ioremap((edma_hw.reg_resource)->start,
24 resource_size(edma_hw.reg_resource));
25 if (!edma_hw.reg_base) {
26 pr_warn("Unable to remap EDMA register memory.\n");
27 --- a/hal/gmac_ops/syn/gmac/syn_if.c
28 +++ b/hal/gmac_ops/syn/gmac/syn_if.c
29 @@ -806,7 +806,7 @@ static void *syn_init(struct nss_gmac_ha
30 * Populate the mac base addresses
31 */
32 shd->nghd.mac_base =
33 - devm_ioremap_nocache(&dp_priv->pdev->dev, res->start,
34 + devm_ioremap(&dp_priv->pdev->dev, res->start,
35 resource_size(res));
36 if (!shd->nghd.mac_base) {
37 netdev_dbg(ndev, "ioremap fail.\n");
38 --- a/hal/soc_ops/ipq50xx/nss_ipq50xx.c
39 +++ b/hal/soc_ops/ipq50xx/nss_ipq50xx.c
40 @@ -89,7 +89,7 @@ static void nss_dp_hal_tcsr_set(void)
41 pr_err("%s: SCM TCSR write error: %d\n", __func__, err);
42 }
43 } else {
44 - tcsr_addr = ioremap_nocache((tcsr_base + TCSR_GMAC_AXI_CACHE_OVERRIDE_OFFSET),
45 + tcsr_addr = ioremap((tcsr_base + TCSR_GMAC_AXI_CACHE_OVERRIDE_OFFSET),
46 TCSR_GMAC_AXI_CACHE_OVERRIDE_REG_SIZE);
47 if (!tcsr_addr) {
48 pr_err("%s: ioremap failed\n", __func__);