mirror of
https://github.com/qosmio/nss-packages.git
synced 2025-12-16 08:12:53 +00:00
8d54d726c2
To keep fork as closely synced with upstream, move NSS packages back into repository. Not sure why they were moved out from my original fork. * nss-firmware * qca-nss-crypto * qca-nss-cfi Removed the following: * mhz (already available in packages repo) * qrtr (unecessary, and has been broken for years) Also moved packages out of `qca` and back into root directory.
95 lines
3.8 KiB
Diff
95 lines
3.8 KiB
Diff
From 8baa8e747247403c6f814ea5dc3e463c70e0415f Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Tue, 8 Jun 2021 22:14:34 +0200
|
|
Subject: [PATCH 2/3] nss-crypto: replace ioremap_nocache() with ioremap
|
|
|
|
ioremap_nocache() was dropped in kernel 5.5 as regular
|
|
ioremap() was exactly the same.
|
|
|
|
So, simply replace all of the ioremap_nocache() calls
|
|
with ioremap().
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
v1.0/src/nss_crypto_dtsi.c | 4 ++--
|
|
v1.0/src/nss_crypto_platform.c | 4 ++--
|
|
v2.0/src/hal/ipq50xx/nss_crypto_ce5.c | 4 ++--
|
|
v2.0/src/hal/ipq60xx/nss_crypto_eip197.c | 2 +-
|
|
v2.0/src/hal/ipq807x/nss_crypto_eip197.c | 2 +-
|
|
5 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
--- a/v1.0/src/nss_crypto_dtsi.c
|
|
+++ b/v1.0/src/nss_crypto_dtsi.c
|
|
@@ -311,11 +311,11 @@ static int nss_crypto_probe(struct platf
|
|
e_ctrl->dev = &pdev->dev;
|
|
|
|
e_ctrl->cmd_base = crypto_res.start;
|
|
- e_ctrl->crypto_base = ioremap_nocache(e_ctrl->cmd_base, resource_size(&crypto_res));
|
|
+ e_ctrl->crypto_base = ioremap(e_ctrl->cmd_base, resource_size(&crypto_res));
|
|
nss_crypto_assert(e_ctrl->crypto_base);
|
|
|
|
e_ctrl->bam_pbase = bam_res.start;
|
|
- e_ctrl->bam_base = ioremap_nocache(e_ctrl->bam_pbase, resource_size(&bam_res));
|
|
+ e_ctrl->bam_base = ioremap(e_ctrl->bam_pbase, resource_size(&bam_res));
|
|
nss_crypto_assert(e_ctrl->bam_base);
|
|
|
|
e_ctrl->bam_ee = bam_ee;
|
|
--- a/v1.0/src/nss_crypto_platform.c
|
|
+++ b/v1.0/src/nss_crypto_platform.c
|
|
@@ -134,11 +134,11 @@ static int nss_crypto_probe(struct platf
|
|
e_ctrl->bam_ee = res->bam_ee;
|
|
|
|
e_ctrl->cmd_base = res->crypto_pbase;
|
|
- e_ctrl->crypto_base = ioremap_nocache(res->crypto_pbase, res->crypto_pbase_sz);
|
|
+ e_ctrl->crypto_base = ioremap(res->crypto_pbase, res->crypto_pbase_sz);
|
|
nss_crypto_assert(e_ctrl->crypto_base);
|
|
|
|
e_ctrl->bam_pbase = res->bam_pbase;
|
|
- e_ctrl->bam_base = ioremap_nocache(res->bam_pbase, res->bam_pbase_sz);
|
|
+ e_ctrl->bam_base = ioremap(res->bam_pbase, res->bam_pbase_sz);
|
|
nss_crypto_assert(e_ctrl->bam_base);
|
|
|
|
/*
|
|
--- a/v2.0/src/hal/ipq50xx/nss_crypto_ce5.c
|
|
+++ b/v2.0/src/hal/ipq50xx/nss_crypto_ce5.c
|
|
@@ -288,7 +288,7 @@ int nss_crypto_ce5_engine_init(struct pl
|
|
* remap the I/O addresses for crypto
|
|
*/
|
|
eng->crypto_paddr = crypto_res->start;
|
|
- eng->crypto_vaddr = ioremap_nocache(crypto_res->start, resource_size(crypto_res));
|
|
+ eng->crypto_vaddr = ioremap(crypto_res->start, resource_size(crypto_res));
|
|
if (!eng->crypto_vaddr) {
|
|
nss_crypto_warn("%px: unable to remap crypto_addr(0x%px)\n", node, (void *)eng->crypto_paddr);
|
|
nss_crypto_engine_free(eng);
|
|
@@ -299,7 +299,7 @@ int nss_crypto_ce5_engine_init(struct pl
|
|
* remap the I/O addresses for bam
|
|
*/
|
|
eng->dma_paddr = bam_res->start;
|
|
- eng->dma_vaddr = ioremap_nocache(bam_res->start, resource_size(bam_res));
|
|
+ eng->dma_vaddr = ioremap(bam_res->start, resource_size(bam_res));
|
|
if (!eng->dma_vaddr) {
|
|
iounmap(eng->crypto_vaddr);
|
|
nss_crypto_warn("%px: unable to remap dma_addr(0x%px)\n", node, (void *)eng->dma_paddr);
|
|
--- a/v2.0/src/hal/ipq60xx/nss_crypto_eip197.c
|
|
+++ b/v2.0/src/hal/ipq60xx/nss_crypto_eip197.c
|
|
@@ -490,7 +490,7 @@ int nss_crypto_eip197_engine_init(struct
|
|
* remap the I/O addresses
|
|
*/
|
|
paddr = res->start + offset;
|
|
- vaddr = ioremap_nocache(paddr, resource_size(res));
|
|
+ vaddr = ioremap(paddr, resource_size(res));
|
|
if (!vaddr) {
|
|
nss_crypto_warn("%px: unable to remap crypto_addr(0x%px)\n", node, (void *)paddr);
|
|
return -EIO;
|
|
--- a/v2.0/src/hal/ipq807x/nss_crypto_eip197.c
|
|
+++ b/v2.0/src/hal/ipq807x/nss_crypto_eip197.c
|
|
@@ -490,7 +490,7 @@ int nss_crypto_eip197_engine_init(struct
|
|
* remap the I/O addresses
|
|
*/
|
|
paddr = res->start + offset;
|
|
- vaddr = ioremap_nocache(paddr, resource_size(res));
|
|
+ vaddr = ioremap(paddr, resource_size(res));
|
|
if (!vaddr) {
|
|
nss_crypto_warn("%px: unable to remap crypto_addr(0x%px)\n", node, (void *)paddr);
|
|
return -EIO;
|