hostapd: add CUI to ACL RADIUS Access-Request

When radius_request_cui=1 is configured, the EAP path includes a
Chargeable-User-Identity attribute (RFC 4372) but the ACL path used
by psk2-radius / mpsk-radius does not.  Add a nul CUI to
hostapd_radius_acl_query() so the RADIUS server is solicited for CUI
in Access-Accept, matching the EAP initial-request behaviour.

Signed-off-by: John Crispin <john@phrozen.org>

.github/actions/create-ami-from-image/action.yml

@@ -0,0 +1,39 @@
+name: Create AMI from firmware image in S3 bucket
+
+inputs:
+  firmware_image_name:
+    description: Name of the firmware image
+    required: true
+  firmware_image_s3_bucket:
+    description: Name of the S3 bucket where the image resides
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Import snapshot based on firmware image
+      id: import_snapshot
+      shell: bash
+      run: |
+        echo "import_task_id=$(aws ec2 import-snapshot --description '${{ inputs.firmware_image_name }}' --disk-container 'Format=raw,UserBucket={S3Bucket=${{ inputs.firmware_image_s3_bucket }},S3Key=${{ inputs.firmware_image_name }}}' | jq -r '.ImportTaskId')" >> $GITHUB_OUTPUT
+
+    - name: Wait for import task to complete and get snapshot ID
+      id: get_snapshot_id
+      shell: bash
+      run: |
+        IMPORT_TASK_STATUS=""
+        while [[ $IMPORT_TASK_STATUS != 'completed' ]]; do
+          IMPORT_TASK_STATUS=$(aws ec2 describe-import-snapshot-tasks --import-task-ids ${{ steps.import_snapshot.outputs.import_task_id }} | jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail.Status')
+          echo "Import task status is $IMPORT_TASK_STATUS, waiting for completion."
+        done
+        echo "id=$(aws ec2 describe-import-snapshot-tasks --import-task-ids ${{ steps.import_snapshot.outputs.import_task_id }} | jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail.SnapshotId')" >> $GITHUB_OUTPUT
+
+    - name: Tag snapshot with image name
+      shell: bash
+      run: |
+        aws ec2 create-tags --resources ${{ steps.get_snapshot_id.outputs.id }} --tags 'Key=Name,Value=${{ inputs.firmware_image_name }}'
+
+    - name: Register AMI based on snapshot
+      shell: bash
+      run: |
+        aws ec2 register-image --name '${{ inputs.firmware_image_name }}' --root-device-name /dev/xvda --block-device-mappings 'DeviceName=/dev/xvda,Ebs={SnapshotId=${{ steps.get_snapshot_id.outputs.id }}}'

.github/workflows/build-dev.yml

@@ -1,5 +1,13 @@
 name: Build OpenWrt/uCentral images
 
+env:
+  AWS_DEFAULT_OUTPUT: json
+  AWS_DEFAULT_REGION: us-east-1
+  AWS_S3_BUCKET_NAME: ucentral-ap-firmware
+  AWS_ACCOUNT_ID: ${{ secrets.UCENTRAL_S3_ACCOUNT_ID }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.UCENTRAL_S3_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.UCENTRAL_S3_ACCESS_KEY_SECRET }}
+
 on:
   push:
     branches: [ main, next, staging-* ]
@@ -7,14 +15,20 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    outputs:
+      x64_vm_image_name: ${{ steps.package_and_upload_image.outputs.x64_vm_image_name }}
     strategy:
       fail-fast: false
       matrix:
-        target: ['cig_wf188n', 'cig_wf194c', 'cig_wf194c4', 'cig_wf160d', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'edgecore_ecw5410', 'edgecore_oap100', 'edgecore_ssw2ac2600', 'edgecore_spw2ac1200', 'edgecore_spw2ac1200-lan-poe', 'hfcl_ion4', 'indio_um-305ac', 'linksys_ea6350-v4', 'linksys_e8450-ubi', 'linksys_ea8300', 'tp-link_ec420-g1', 'tplink_ex227', 'tplink_ex228', 'tplink_ex447', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4' ]
-
+        target: [ 'cig_wf189h', 'cig_wf189w', 'cig_wf660a', 'cig_wf672', 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750e-s', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'zyxel_nwa130be', 'sercomm_ap72tip-v4', 'asterfusion_ap7330']
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+
+    # Clean unnecessary files to save disk space
+    - name: clean unncessary files to save space
+      run: |
+        docker rmi `docker images -q` || true
 
     - name: Build image for ${{ matrix.target }}
       id: build
@@ -24,17 +38,12 @@ jobs:
         make -j TARGET=${{ matrix.target }}
 
     - name: Package and upload image for ${{ matrix.target }}
+      id: package_and_upload_image
       env:
           GH_BUILD_USERNAME: ${{ secrets.GH_BUILD_USERNAME }}
           GH_BUILD_PASSWORD: ${{ secrets.GH_BUILD_PASSWORD }}
           ARTIFACTORY_USERNAME: cicd-indoor-main
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          AWS_S3_BUCKET_NAME: ucentral-ap-firmware
-          AWS_DEFAULT_OUTPUT: json
-          AWS_DEFAULT_REGION: us-east-1
-          AWS_ACCOUNT_ID: ${{ secrets.UCENTRAL_S3_ACCOUNT_ID }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.UCENTRAL_S3_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.UCENTRAL_S3_ACCESS_KEY_SECRET }}
       run: |
         LOWERCASE_TARGET=`echo ${{ matrix.target }} | tr '[:upper:]' '[:lower:]'`
         HASH=$(git rev-parse --short HEAD)
@@ -42,8 +51,10 @@ jobs:
         if [[ ${GITHUB_REF} == "refs/heads/"* ]]
         then
           REF=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')
+          IS_RELEASE="false"
         else
           REF=$(echo ${GITHUB_REF#refs/tags/} | tr '/' '-')
+          IS_RELEASE="true"
         fi
 
         BASENAME="$(date +%Y%m%d)-$LOWERCASE_TARGET-$REF-$HASH"
@@ -60,10 +71,16 @@ jobs:
         [ -f openwrt/tmp/image-file ] && curl -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "latest-upgrade.json" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/latest-upgrade.json"
 
         [ -f openwrt/tmp/image-file ] && aws s3 cp --acl public-read --content-type "application/octet-stream" "openwrt/$(cat openwrt/tmp/image-file)" "s3://$AWS_S3_BUCKET_NAME/$IMG_NAME"
+        [ -f openwrt/tmp/image-file ] && aws s3api put-object-tagging --bucket "$AWS_S3_BUCKET_NAME" --key "$IMG_NAME" --tagging "{\"TagSet\":[{\"Key\":\"release\",\"Value\":\"$IS_RELEASE\"}]}"
         [ -f openwrt/tmp/image-file ] && aws s3 cp --acl public-read --content-type "application/json" "latest-upgrade.json" "s3://$AWS_S3_BUCKET_NAME/$JSON_NAME"
+        [ -f openwrt/tmp/image-file ] && aws s3api put-object-tagging --bucket "$AWS_S3_BUCKET_NAME" --key "$JSON_NAME" --tagging "{\"TagSet\":[{\"Key\":\"release\",\"Value\":\"$IS_RELEASE\"}]}"
+
+        if [ ${{ matrix.target }} == 'x64_vm' ]; then
+          echo "x64_vm_image_name=$(echo $IMG_NAME)" >> $GITHUB_OUTPUT
+        fi
 
   trigger-testing:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: build
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
@@ -74,3 +91,16 @@ jobs:
         repository: Telecominfraproject/wlan-testing
         event-type: new-ap-release
         client-payload: '{"ref": "${GITHUB_REF#refs/tags/}", "sha": "${{ github.sha }}"}'
+
+  create-x64_vm-ami:
+    runs-on: ubuntu-22.04
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Use create-ami-from-image composite action
+      uses: ./.github/actions/create-ami-from-image
+      with:
+        firmware_image_name: ${{ needs.build.outputs.x64_vm_image_name }}
+        firmware_image_s3_bucket: ${{ env.AWS_S3_BUCKET_NAME }}

.github/workflows/x64_vm-build-test.yml

@@ -0,0 +1,88 @@
+name: Test x64_vm build and AMI creation
+
+env:
+  AWS_DEFAULT_OUTPUT: json
+  AWS_DEFAULT_REGION: us-east-1
+  AWS_S3_BUCKET_NAME: ucentral-ap-firmware
+  AWS_ACCOUNT_ID: ${{ secrets.UCENTRAL_S3_ACCOUNT_ID }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.UCENTRAL_S3_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.UCENTRAL_S3_ACCESS_KEY_SECRET }}
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    outputs:
+      x64_vm_image_name: ${{ steps.package_and_upload_image.outputs.x64_vm_image_name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ['x64_vm']
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Build image for ${{ matrix.target }}
+      id: build
+      run: |
+        git config --global user.email "you@example.com"
+        git config --global user.name "Your Name"
+        make -j TARGET=${{ matrix.target }}        make -j TARGET=${{ matrix.target }}
+
+    - name: Package and upload image for ${{ matrix.target }}
+      id: package_and_upload_image
+      env:
+        GH_BUILD_USERNAME: ${{ secrets.GH_BUILD_USERNAME }}
+        GH_BUILD_PASSWORD: ${{ secrets.GH_BUILD_PASSWORD }}
+        ARTIFACTORY_USERNAME: cicd-indoor-main
+        ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
+      run: |
+        LOWERCASE_TARGET=`echo ${{ matrix.target }} | tr '[:upper:]' '[:lower:]'`
+        HASH=$(git rev-parse --short HEAD)
+
+        if [[ ${GITHUB_REF} == "refs/heads/"* ]]
+        then
+          REF=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')
+          IS_RELEASE="false"
+        else
+          REF=$(echo ${GITHUB_REF#refs/tags/} | tr '/' '-')
+          IS_RELEASE="true"
+        fi
+
+        BASENAME="$(date +%Y%m%d)-$LOWERCASE_TARGET-$REF-$HASH"
+        TAR_NAME="$BASENAME.tar.gz"
+        IMG_NAME="$BASENAME-upgrade.bin";
+        JSON_NAME="$BASENAME.json";
+
+        tar cfz "$TAR_NAME" -C openwrt/bin/targets/ .
+        curl -s -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "$TAR_NAME" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/"$TAR_NAME""
+        IMG_NAME="$BASENAME-upgrade.bin";
+        TIP_VERSION="$(grep DISTRIB_TIP= openwrt/tmp/openwrt_release | cut -d\' -f2)"
+        echo -e "{\n\t\"image\":\""${IMG_NAME}"\",\n\t\"revision\": \""${TIP_VERSION}"\",\n\t\"timestamp\":\""$(date +%s)"\",\n\t\"compatible\": \""${LOWERCASE_TARGET}"\"\n}" > latest-upgrade.json
+        [ -f openwrt/tmp/image-file ] && curl -s -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "openwrt/$(cat openwrt/tmp/image-file)" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/"$IMG_NAME""
+        [ -f openwrt/tmp/image-file ] && curl -s -u $GH_BUILD_USERNAME:$GH_BUILD_PASSWORD -T "latest-upgrade.json" "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/$LOWERCASE_TARGET/latest-upgrade.json"
+
+        [ -f openwrt/tmp/image-file ] && aws s3 cp --acl public-read --content-type "application/octet-stream" "openwrt/$(cat openwrt/tmp/image-file)" "s3://$AWS_S3_BUCKET_NAME/$IMG_NAME"
+        [ -f openwrt/tmp/image-file ] && aws s3api put-object-tagging --bucket "$AWS_S3_BUCKET_NAME" --key "$IMG_NAME" --tagging "{\"TagSet\":[{\"Key\":\"release\",\"Value\":\"$IS_RELEASE\"}]}"
+        [ -f openwrt/tmp/image-file ] && aws s3 cp --acl public-read --content-type "application/json" "latest-upgrade.json" "s3://$AWS_S3_BUCKET_NAME/$JSON_NAME"
+        [ -f openwrt/tmp/image-file ] && aws s3api put-object-tagging --bucket "$AWS_S3_BUCKET_NAME" --key "$JSON_NAME" --tagging "{\"TagSet\":[{\"Key\":\"release\",\"Value\":\"$IS_RELEASE\"}]}"
+
+        if [[ ${{ matrix.target }} == 'x64_vm' ]]; then
+            echo "x64_vm_image_name=$(echo $IMG_NAME)" >> $GITHUB_OUTPUT
+        fi
+
+  create-x64_vm-ami:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        ref: WIFI-7206-add-workflow-to-build-virtual-ap-image
+
+    - name: Use create-ami-from-image composite action
+      uses: ./.github/actions/create-ami-from-image
+      with:
+        firmware_image_name: ${{ needs.build.outputs.x64_vm_image_name }}
+        firmware_image_s3_bucket: ${{ env.AWS_S3_BUCKET_NAME }}

LICENSE

@@ -0,0 +1,28 @@
+BSD 3-Clause License
+
+Copyright (c) 2024, Telecom Infra Project
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,20 +1,83 @@
-# Setting up your build machine
+# OpenWiFi AP NOS
 
-Requires a recent linux installation. Older systems without python 3.7 will have trouble.  See this link for details: https://openwrt.org/docs/guide-developer/quickstart-build-images
+OpenWrt-based access point network operating system (AP NOS) for TIP OpenWiFi.
+Read more at [openwifi.tip.build](https://openwifi.tip.build/).
 
-Install build packages:  sudo apt install build-essential libncurses5-dev gawk git libssl-dev gettext zlib1g-dev swig unzip time rsync python3 python3-setuptools python3-yaml.
+## Building
 
-# Doing a native build on Linux
-First we need to clone and setup our tree. This will result in an openwrt/.
+### Setting up your build machine
+
+Building requires a recent Linux installation. Older systems without Python 3.7
+will have trouble. See this guide for details:
+https://openwrt.org/docs/guide-developer/toolchain/beginners-build-guide
+
+Install build packages on Debian/Ubuntu (or see above guide for other systems):
 ```
-./setup.py --setup
+sudo apt install build-essential libncurses5-dev gawk git libssl-dev gettext zlib1g-dev swig unzip time rsync python3 python3-setuptools python3-yaml
 ```
-Next we need to select the profile and base package selection. This setup will install the feeds, packages and generate the .config file.
+
+### Doing a native build on Linux
+
+Use `./build.sh <target>`, or follow the manual steps below:
+
+1. Clone and set up the tree. This will create an `openwrt/` directory.
+```shell
+./setup.py --setup    # for subsequent builds, use --rebase instead
 ```
+
+2. Select the profile and base package selection. This setup will install the
+   feeds and packages and generate the `.config` file.
+```shell
 cd openwrt
-./scripts/gen_config.py ea8300
+./scripts/gen_config.py linksys_ea8300
 ```
-Finally we can build the tree.
-```
-make -j X V=s
+
+3. Build the tree (replace `-j 8` with the number of cores to use).
+```shell
+make -j 8 V=s
 ```
+
+### Build output
+
+The build results are located in the `openwrt/bin/` directory:
+
+| Type             | Path                                                 |
+| ---------------- | ---------------------------------------------------- |
+| Firmware images  | `openwrt/bin/targets/<target>/<subtarget>/`          |
+| Kernel modules   | `openwrt/bin/targets/<target>/<subtarget>/packages/` |
+| Package binaries | `openwrt/bin/packages/<platform>/<feed>/`            |
+
+## Developer Notes
+
+### Branching model
+
+- `main` - Stable dev branch
+- `next` - Integration branch
+- `staging-*` - Feature/bug branches
+- `release/v#.#.#` - Release branches (*major.minor.patch*)
+
+### Repository structure
+
+Build files:
+- `Makefile` - Calls Docker environment per target
+- `dock-run.sh` - Dockerized build environment
+- `docker/Dockerfile` - Dockerfile for build image
+- `build.sh` - Build script
+- `setup.py` - Clone and set up the tree
+- `config.yml` - Specifies OpenWrt version and patches to apply
+
+Directories:
+- `feeds/` - OpenWiFi feeds
+- `patches/` - OpenWiFi patches applied during builds
+- `profiles/` - Per-target kernel configs, packages, and feeds
+    - [wifi-ax](profiles/wifi-ax.yml): Wi-Fi AX packages
+    - [ucentral-ap](profiles/ucentral-ap.yml): uCentral packages
+    - [x64_vm](profiles/x64_vm.yml): x86-64 VM image
+
+### uCentral packages
+
+AP-NOS packages implementing the uCentral protocol include the following
+repositories (refer to the [ucentral](feeds/ucentral/) feed for a full list):
+- ucentral-client: https://github.com/Telecominfraproject/wlan-ucentral-client
+- ucentral-schema: https://github.com/Telecominfraproject/wlan-ucentral-schema
+- ucentral-wifi: https://github.com/blogic/ucentral-wifi

backports/0001-build-build-kernel-image-before-building-modules-pac.patch

@@ -1,48 +0,0 @@
-From c51ac602aff1a9b0093687fe39164a3b895fd4a2 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Thu, 22 Oct 2020 10:29:34 +0200
-Subject: [PATCH 01/27] build: build kernel image before building
- modules/packages
-
-This is needed for linux 5.10, where modules.builtin is generated from
-vmlinux.o
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/kernel-defaults.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
-index 3aa1baa761..c02e0d34ca 100644
---- a/include/kernel-defaults.mk
-+++ b/include/kernel-defaults.mk
-@@ -115,7 +115,7 @@ endef
- 
- define Kernel/CompileModules/Default
- 	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
--	+$(KERNEL_MAKE) modules
-+	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all) modules
- endef
- 
- OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
-@@ -139,7 +139,7 @@ endef
- 
- define Kernel/CompileImage/Default
- 	rm -f $(TARGET_DIR)/init
--	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all) modules
-+	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all)
- 	$(call Kernel/CopyImage)
- endef
- 
-@@ -149,7 +149,7 @@ define Kernel/CompileImage/Initramfs
- 	$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
- 	$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR)/init)
- 	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
--	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all) modules
-+	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all)
- 	$(call Kernel/CopyImage,-initramfs)
- endef
- else
--- 
-2.25.1
-

backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch

@@ -1,46 +0,0 @@
-From 6c50e27b166b30c0b3f7b730717ab4b7f446e4d0 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Wed, 17 Feb 2021 13:49:14 +0100
-Subject: [PATCH 02/27] build: fix build with CONFIG_STRIP_KERNEL_EXPORTS
-
-Only use symtab.h on the final kernel link
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/kernel-defaults.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
-index c02e0d34ca..f9316fc3f9 100644
---- a/include/kernel-defaults.mk
-+++ b/include/kernel-defaults.mk
-@@ -3,7 +3,7 @@
- # Copyright (C) 2006-2020 OpenWrt.org
- 
- ifdef CONFIG_STRIP_KERNEL_EXPORTS
--  KERNEL_MAKEOPTS += \
-+  KERNEL_MAKEOPTS_IMAGE += \
- 	EXTRA_LDSFLAGS="-I$(KERNEL_BUILD_DIR) -include symtab.h"
- endif
- 
-@@ -139,7 +139,7 @@ endef
- 
- define Kernel/CompileImage/Default
- 	rm -f $(TARGET_DIR)/init
--	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all)
-+	+$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all)
- 	$(call Kernel/CopyImage)
- endef
- 
-@@ -149,7 +149,7 @@ define Kernel/CompileImage/Initramfs
- 	$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
- 	$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR)/init)
- 	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
--	+$(KERNEL_MAKE) $(if $(KERNELNAME),$(KERNELNAME),all)
-+	+$(KERNEL_MAKE) $(KERNEL_MAKEOPTS_IMAGE) $(if $(KERNELNAME),$(KERNELNAME),all)
- 	$(call Kernel/CopyImage,-initramfs)
- endef
- else
--- 
-2.25.1
-

backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch

@@ -1,74 +0,0 @@
-From 7ed003d57f1c5273fecddabcdc7bd6845c3854a0 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sat, 20 Feb 2021 08:36:43 +0100
-Subject: [PATCH 05/27] sysupgrade-nand: allow limiting rootfs_data by setting
- env variable
-
-Check if firmware environment variable 'rootfs_data_max' exists and is
-set to a numerical value greater than 0. If so, limit rootfs_data
-volume to that size instead of using the maximum available size.
-
-This is useful on devices with lots of flash where users may want to
-have eg. a volume for persistent logs and statistics or for external
-applications/containers. Persistence on rootfs overlay is limited by
-the size of memory available during the sysugprade process as that
-data needs to be copied to RAM while the volume is being recreated
-during sysupgrade. Hence it is unsuitable for keeping larger amounts
-of data accross upgrade which makes additional volume(s) for
-application data desirable.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- package/base-files/files/lib/upgrade/nand.sh | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
-index 5bc9ff83f9..e335d940ed 100644
---- a/package/base-files/files/lib/upgrade/nand.sh
-+++ b/package/base-files/files/lib/upgrade/nand.sh
-@@ -117,6 +117,9 @@ nand_restore_config() {
- nand_upgrade_prepare_ubi() {
- 	local rootfs_length="$1"
- 	local rootfs_type="$2"
-+	local rootfs_data_max="$(fw_printenv -n rootfs_data_max 2>/dev/null)"
-+	[ -n "$rootfs_data_max" ] && rootfs_data_max=$(printf %d "$rootfs_data_max")
-+
- 	local kernel_length="$3"
- 	local has_env="${4:-0}"
- 
-@@ -176,11 +179,11 @@ nand_upgrade_prepare_ubi() {
- 
- 	# update rootfs
- 	if [ -n "$rootfs_length" ]; then
--		local root_size_param
-+		local rootfs_size_param
- 		if [ "$rootfs_type" = "ubifs" ]; then
--			root_size_param="-m"
-+			rootfs_size_param="-m"
- 		else
--			root_size_param="-s $rootfs_length"
-+			rootfs_size_param="-s $rootfs_length"
- 		fi
- 		if ! ubimkvol /dev/$ubidev -N $CI_ROOTPART $rootfs_size_param; then
- 			echo "cannot create rootfs volume"
-@@ -190,7 +193,16 @@ nand_upgrade_prepare_ubi() {
- 
- 	# create rootfs_data for non-ubifs rootfs
- 	if [ "$rootfs_type" != "ubifs" ]; then
--		if ! ubimkvol /dev/$ubidev -N rootfs_data -m; then
-+		local availeb=$(cat /sys/devices/virtual/ubi/$ubidev/avail_eraseblocks)
-+		local ebsize=$(cat /sys/devices/virtual/ubi/$ubidev/eraseblock_size)
-+		local avail_size=$(( $availeb * $ebsize ))
-+		local rootfs_data_size_param="-m"
-+		if [ -n "$rootfs_data_max" ] &&
-+		   [ "$rootfs_data_max" != "0" ] &&
-+		   [ "$rootfs_data_max" -le "$avail_size" ]; then
-+			rootfs_data_size_param="-s $rootfs_data_max"
-+		fi
-+		if ! ubimkvol /dev/$ubidev -N rootfs_data $rootfs_data_size_param; then
- 			echo "cannot initialize rootfs_data volume"
- 			return 1
- 		fi
--- 
-2.25.1
-

backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch

@@ -1,70 +0,0 @@
-From 1a9921bab861dd2c89337c3e4833c716a0474653 Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel@makrotopia.org>
-Date: Fri, 12 Feb 2021 03:09:39 +0000
-Subject: [PATCH 07/27] uboot-envtools: add defaults for linksys-e8450-ubi
-
-Add U-Boot environment configuration for the Linksys E8450 (UBI) to
-allow access to the bootloader environment from OpenWrt via
-'fw_printenv' and 'fw_setenv'.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- package/boot/uboot-envtools/files/mediatek | 46 ++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
- create mode 100644 package/boot/uboot-envtools/files/mediatek
-
-diff --git a/package/boot/uboot-envtools/files/mediatek b/package/boot/uboot-envtools/files/mediatek
-new file mode 100644
-index 0000000000..495a837274
---- /dev/null
-+++ b/package/boot/uboot-envtools/files/mediatek
-@@ -0,0 +1,46 @@
-+#
-+# Copyright (C) 2021 OpenWrt.org
-+#
-+
-+[ -e /etc/config/ubootenv ] && exit 0
-+
-+touch /etc/config/ubootenv
-+
-+. /lib/uboot-envtools.sh
-+. /lib/functions.sh
-+
-+board=$(board_name)
-+
-+case "$board" in
-+linksys,e8450-ubi)
-+	ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
-+	ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
-+	;;
-+bananapi,bpi-r64)
-+	. /lib/upgrade/common.sh
-+	export_bootdevice
-+	export_partdevice rootdev 0
-+	case "$rootdev" in
-+	mmc*)
-+		local envdev=/dev/$(get_partition_by_name $rootdev ubootenv)
-+		ubootenv_add_uci_config "$envdev" "0x0" "0x80000" "0x80000" "1"
-+		ubootenv_add_uci_config "$envdev" "0x80000" "0x80000" "0x80000" "1"
-+		;;
-+	*)
-+		ubootenv_add_uci_config "/dev/ubi0_0" "0x0" "0x1f000" "0x1f000" "1"
-+		ubootenv_add_uci_config "/dev/ubi0_1" "0x0" "0x1f000" "0x1f000" "1"
-+		;;
-+	esac
-+	;;
-+buffalo,wsr-2533dhp2)
-+	ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x1000" "0x20000"
-+	;;
-+ubnt,unifi-6-lr-ubootmod)
-+	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x4000" "0x10000"
-+	;;
-+esac
-+
-+config_load ubootenv
-+config_foreach ubootenv_add_app_config ubootenv
-+
-+exit 0
--- 
-2.25.1
-

backports/0009-include-set-kernel-version.mk.patch

@@ -1,33 +0,0 @@
-From 4ed9b7d04405d5109681643f3ceebbd25f3f28e2 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Wed, 7 Apr 2021 10:46:26 +0200
-Subject: [PATCH 09/27] include: set kernel-version.mk
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- include/kernel-version.mk | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/include/kernel-version.mk b/include/kernel-version.mk
-index fe81dbf603..3c109c13c8 100644
---- a/include/kernel-version.mk
-+++ b/include/kernel-version.mk
-@@ -6,9 +6,15 @@ ifdef CONFIG_TESTING_KERNEL
-   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
- endif
- 
-+LINUX_VERSION-4.4 = .60
-+LINUX_VERSION-4.14 = .193
- LINUX_VERSION-5.4 = .142
-+LINUX_VERSION-5.10 = .27
- 
-+LINUX_KERNEL_HASH-4.4.60 = 2cd8df6f1ac6a5329c5a286ec9b5956215977221a1b731597ed169fff74a9659
-+LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
- LINUX_KERNEL_HASH-5.4.142 = 99785728968564ba27c7e552d024b560072dcbc885540912eabb5c021e231451
-+LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
- 
- remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
- sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
--- 
-2.25.1
-

backports/0011-backport-mkits.sh.patch

@@ -1,266 +0,0 @@
-From ad860cb413d1934332de60658d5eb8fb64d19663 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sun, 9 May 2021 12:23:00 +0200
-Subject: [PATCH 11/27] backport: mkits.sh
-
-969083634481c3ab5fb80509f385ef10ab45b55f
-e991c1b8a2385397fc1e657ed73878938997d951
-9f714398e060c6338fbfad44cdbfa8c940dbb84b
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- include/image-commands.mk           |   2 +-
- include/image.mk                    |   2 +-
- scripts/mkits.sh                    | 101 +++++++++++++++++++++++++---
- target/linux/ipq40xx/image/Makefile |   1 +
- target/linux/ipq806x/image/Makefile |   1 +
- 5 files changed, 95 insertions(+), 12 deletions(-)
-
-diff --git a/include/image-commands.mk b/include/image-commands.mk
-index 2c917d613e..c6e8eb0293 100644
---- a/include/image-commands.mk
-+++ b/include/image-commands.mk
-@@ -203,7 +203,7 @@ define Build/fit
- 		$(if $(word 3,$(1)),-r $(IMAGE_ROOTFS) -f $(subst _,$(comma),$(DEVICE_NAME))) \
- 		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
- 		$(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \
--		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config@1") \
-+		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \
- 		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
- 	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(word 3,$(1)),-E -B 0x1000 -p 0x1000) -f $@.its $@.new
- 	@mv $@.new $@
-diff --git a/include/image.mk b/include/image.mk
-index b6e8ab3c84..7c2dcf0e8b 100644
---- a/include/image.mk
-+++ b/include/image.mk
-@@ -139,7 +139,7 @@ endef
- define Image/BuildKernel/MkFIT
- 	$(TOPDIR)/scripts/mkits.sh \
- 		-D $(1) -o $(KDIR)/fit-$(1).its -k $(2) $(if $(3),-d $(3)) -C $(4) -a $(5) -e $(6) \
--		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config@1") \
-+		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \
- 		-A $(LINUX_KARCH) -v $(LINUX_VERSION)
- 	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $(KDIR)/fit-$(1).its $(KDIR)/fit-$(1)$(7).itb
- endef
-diff --git a/scripts/mkits.sh b/scripts/mkits.sh
-index 3d68fdacbc..7533baf799 100755
---- a/scripts/mkits.sh
-+++ b/scripts/mkits.sh
-@@ -24,22 +24,29 @@ usage() {
- 	printf "\n\t-a ==> set load address to 'addr' (hex)"
- 	printf "\n\t-e ==> set entry point to 'entry' (hex)"
- 	printf "\n\t-f ==> set device tree compatible string"
-+	printf "\n\t-i ==> include initrd Blob 'initrd'"
- 	printf "\n\t-v ==> set kernel version to 'version'"
- 	printf "\n\t-k ==> include kernel image 'kernel'"
- 	printf "\n\t-D ==> human friendly Device Tree Blob 'name'"
- 	printf "\n\t-n ==> fdt unit-address 'address'"
- 	printf "\n\t-d ==> include Device Tree Blob 'dtb'"
--	printf "\n\t-r ==> include RootFS blob"
-+	printf "\n\t-r ==> include RootFS blob 'rootfs'"
- 	printf "\n\t-H ==> specify hash algo instead of SHA1"
--	printf "\n\t-o ==> create output file 'its_file'\n"
-+	printf "\n\t-o ==> create output file 'its_file'"
-+	printf "\n\t-O ==> create config with dt overlay 'name:dtb'"
-+	printf "\n\t\t(can be specified more than once)\n"
- 	exit 1
- }
- 
- FDTNUM=1
- ROOTFSNUM=1
-+INITRDNUM=1
- HASH=sha1
-+LOADABLES=
-+DTOVERLAY=
-+DTADDR=
- 
--while getopts ":A:a:c:C:D:d:e:f:k:n:o:v:r:S" OPTION
-+while getopts ":A:a:c:C:D:d:e:f:i:k:n:o:O:v:r:S" OPTION
- do
- 	case $OPTION in
- 		A ) ARCH=$OPTARG;;
-@@ -50,9 +57,11 @@ do
- 		d ) DTB=$OPTARG;;
- 		e ) ENTRY_ADDR=$OPTARG;;
- 		f ) COMPATIBLE=$OPTARG;;
-+		i ) INITRD=$OPTARG;;
- 		k ) KERNEL=$OPTARG;;
- 		n ) FDTNUM=$OPTARG;;
- 		o ) OUTPUT=$OPTARG;;
-+		O ) DTOVERLAY="$DTOVERLAY ${OPTARG}";;
- 		r ) ROOTFS=$OPTARG;;
- 		S ) HASH=$OPTARG;;
- 		v ) VERSION=$OPTARG;;
-@@ -74,14 +83,20 @@ if [ -n "${COMPATIBLE}" ]; then
- 	COMPATIBLE_PROP="compatible = \"${COMPATIBLE}\";"
- fi
- 
-+[ "$DTOVERLAY" ] && {
-+	dtbsize=$(wc -c "$DTB" | cut -d' ' -f1)
-+	DTADDR=$(printf "0x%08x" $(($LOAD_ADDR - $dtbsize)) )
-+}
-+
- # Conditionally create fdt information
- if [ -n "${DTB}" ]; then
- 	FDT_NODE="
--		fdt@$FDTNUM {
-+		fdt-$FDTNUM {
- 			description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
- 			${COMPATIBLE_PROP}
- 			data = /incbin/(\"${DTB}\");
- 			type = \"flat_dt\";
-+			${DTADDR:+load = <${DTADDR}>;}
- 			arch = \"${ARCH}\";
- 			compression = \"none\";
- 			hash@1 {
-@@ -92,13 +107,34 @@ if [ -n "${DTB}" ]; then
- 			};
- 		};
- "
--	FDT_PROP="fdt = \"fdt@$FDTNUM\";"
-+	FDT_PROP="fdt = \"fdt-$FDTNUM\";"
- fi
- 
-+if [ -n "${INITRD}" ]; then
-+	INITRD_NODE="
-+		initrd-$INITRDNUM {
-+			description = \"${ARCH_UPPER} OpenWrt ${DEVICE} initrd\";
-+			${COMPATIBLE_PROP}
-+			data = /incbin/(\"${INITRD}\");
-+			type = \"ramdisk\";
-+			arch = \"${ARCH}\";
-+			os = \"linux\";
-+			hash@1 {
-+				algo = \"crc32\";
-+			};
-+			hash@2 {
-+				algo = \"${HASH}\";
-+			};
-+		};
-+"
-+	INITRD_PROP="ramdisk=\"initrd-${INITRDNUM}\";"
-+fi
-+
-+
- if [ -n "${ROOTFS}" ]; then
- 	dd if="${ROOTFS}" of="${ROOTFS}.pagesync" bs=4096 conv=sync
- 	ROOTFS_NODE="
--		rootfs@$ROOTFSNUM {
-+		rootfs-$ROOTFSNUM {
- 			description = \"${ARCH_UPPER} OpenWrt ${DEVICE} rootfs\";
- 			${COMPATIBLE_PROP}
- 			data = /incbin/(\"${ROOTFS}.pagesync\");
-@@ -113,9 +149,50 @@ if [ -n "${ROOTFS}" ]; then
- 			};
- 		};
- "
--	ROOTFS_PROP="loadables = \"rootfs@${ROOTFSNUM}\";"
-+	LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs-${ROOTFSNUM}\""
- fi
- 
-+# add DT overlay blobs
-+FDTOVERLAY_NODE=""
-+OVCONFIGS=""
-+[ "$DTOVERLAY" ] && for overlay in $DTOVERLAY ; do
-+	overlay_blob=${overlay##*:}
-+	ovname=${overlay%%:*}
-+	ovnode="fdt-$ovname"
-+	ovsize=$(wc -c "$overlay_blob" | cut -d' ' -f1)
-+	echo "$ovname ($overlay_blob) : $ovsize" >&2
-+	DTADDR=$(printf "0x%08x" $(($DTADDR - $ovsize)))
-+	FDTOVERLAY_NODE="$FDTOVERLAY_NODE
-+
-+		$ovnode {
-+			description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree overlay $ovname\";
-+			${COMPATIBLE_PROP}
-+			data = /incbin/(\"${overlay_blob}\");
-+			type = \"flat_dt\";
-+			arch = \"${ARCH}\";
-+			load = <${DTADDR}>;
-+			compression = \"none\";
-+			hash@1 {
-+				algo = \"crc32\";
-+			};
-+			hash@2 {
-+				algo = \"${HASH}\";
-+			};
-+		};
-+"
-+	OVCONFIGS="$OVCONFIGS
-+
-+		config-$ovname {
-+			description = \"OpenWrt ${DEVICE} with $ovname\";
-+			kernel = \"kernel-1\";
-+			fdt = \"fdt-$FDTNUM\", \"$ovnode\";
-+			${LOADABLES:+loadables = ${LOADABLES};}
-+			${COMPATIBLE_PROP}
-+			${INITRD_PROP}
-+		};
-+	"
-+done
-+
- # Create a default, fully populated DTS file
- DATA="/dts-v1/;
- 
-@@ -124,7 +201,7 @@ DATA="/dts-v1/;
- 	#address-cells = <1>;
- 
- 	images {
--		kernel@1 {
-+		kernel-1 {
- 			description = \"${ARCH_UPPER} OpenWrt Linux-${VERSION}\";
- 			data = /incbin/(\"${KERNEL}\");
- 			type = \"kernel\";
-@@ -140,7 +217,9 @@ DATA="/dts-v1/;
- 				algo = \"$HASH\";
- 			};
- 		};
-+${INITRD_NODE}
- ${FDT_NODE}
-+${FDTOVERLAY_NODE}
- ${ROOTFS_NODE}
- 	};
- 
-@@ -148,11 +227,13 @@ ${ROOTFS_NODE}
- 		default = \"${CONFIG}\";
- 		${CONFIG} {
- 			description = \"OpenWrt ${DEVICE}\";
--			kernel = \"kernel@1\";
-+			kernel = \"kernel-1\";
- 			${FDT_PROP}
--			${ROOTFS_PROP}
-+			${LOADABLES:+loadables = ${LOADABLES};}
- 			${COMPATIBLE_PROP}
-+			${INITRD_PROP}
- 		};
-+		${OVCONFIGS}
- 	};
- };"
- 
-diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
-index 2be262936f..a0d6242a28 100644
---- a/target/linux/ipq40xx/image/Makefile
-+++ b/target/linux/ipq40xx/image/Makefile
-@@ -8,6 +8,7 @@ define Device/Default
- 	KERNEL_PREFIX := $$(IMAGE_PREFIX)
- 	KERNEL_LOADADDR := 0x80208000
- 	DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
-+	DEVICE_DTS_CONFIG := config@1
- 	IMAGES := sysupgrade.bin
- 	IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
- 	IMAGE/sysupgrade.bin/squashfs :=
-diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
-index bab1da0090..3bc60fa931 100644
---- a/target/linux/ipq806x/image/Makefile
-+++ b/target/linux/ipq806x/image/Makefile
-@@ -30,6 +30,7 @@ define Device/Default
- 	KERNEL_PREFIX := $$(IMAGE_PREFIX)
- 	KERNEL_LOADADDR = 0x42208000
- 	DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
-+	DEVICE_DTS_CONFIG := config@1
- 	IMAGES := sysupgrade.bin
- 	IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
- 	IMAGE/sysupgrade.bin/squashfs :=
--- 
-2.25.1
-

backports/0012-libubox-update-to-latest-HEAD.patch

@@ -1,39 +0,0 @@
-From bb797fc82f8ade2a1c0b7a68dd7c920eae2f531f Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 18 May 2021 10:46:43 +0200
-Subject: [PATCH 01/74] libubox: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/libs/libubox/Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
-index d2c07783e1..3b01930d6c 100644
---- a/package/libs/libubox/Makefile
-+++ b/package/libs/libubox/Makefile
-@@ -5,9 +5,9 @@ PKG_RELEASE=2
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
--PKG_MIRROR_HASH:=7dd1db1e0074a9c7c722db654cce3111b3bd3cff0bfd791c4497cb0f6c22d3ca
--PKG_SOURCE_DATE:=2021-05-16
--PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e
-+PKG_MIRROR_HASH:=82d84fb97e725b0a18ceac639cae0c17d922754bb648ff58c62069d92798a6cd
-+PKG_SOURCE_DATE:=2021-08-19
-+PKG_SOURCE_VERSION:=c86a894ec63d83ecf2c373bbf9dc8fba9713d942
- PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
- CMAKE_INSTALL:=1
- 
-@@ -67,7 +67,7 @@ define Package/libubox-lua
- endef
- 
- TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
--CMAKE_OPTIONS = \
-+CMAKE_OPTIONS += \
- 	-DLUAPATH=/usr/lib/lua \
- 	-DABIVERSION="$(PKG_ABI_VERSION)"
- 
--- 
-2.25.1
-

backports/0013-umdns-update-to-latest-HEAD.patch

@@ -1,30 +0,0 @@
-From 41db6b8282d09bd9d7ee453f54e592003904ab0e Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Wed, 30 Jun 2021 14:21:23 +0200
-Subject: [PATCH 13/27] umdns: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/network/services/umdns/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package/network/services/umdns/Makefile b/package/network/services/umdns/Makefile
-index 9a5f46a705..908758e44b 100644
---- a/package/network/services/umdns/Makefile
-+++ b/package/network/services/umdns/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
- 
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/mdnsd.git
- PKG_SOURCE_PROTO:=git
--PKG_SOURCE_DATE:=2021-01-26
--PKG_SOURCE_VERSION:=78aa36b0e9808e801c527c6dc47320e593309522
--PKG_MIRROR_HASH:=241833f2bf2f3366f356703159be386862ef747d9b253af6c13555f252cc970d
-+PKG_SOURCE_DATE:=2021-06-30
-+PKG_SOURCE_VERSION:=4a8747193ab2b8f2d68a9d26334545e19d89cbe2
-+PKG_MIRROR_HASH:=bdddec2793303e4cc1a90cb2ed2241c04fdd0a736b6c0cbbb1fab9de5527566a
- 
- PKG_MAINTAINER:=John Crispin <john@phrozen.org>
- PKG_LICENSE:=LGPL-2.1
--- 
-2.25.1
-

backports/0014-kernel-add-bdpu-filter-support.patch

@@ -1,242 +0,0 @@
-From 9df1500bde8e609dcbbecbefa0eb5a29d9e6f7f5 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 27 Aug 2021 16:52:34 +0200
-Subject: [PATCH 14/27] kernel: add bdpu filter support
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- ...l-knob-for-filtering-rx-tx-BPDU-pack.patch | 107 ++++++++++++++++++
- ...l-knob-for-filtering-rx-tx-BPDU-pack.patch | 107 ++++++++++++++++++
- 2 files changed, 214 insertions(+)
- create mode 100644 target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
- create mode 100644 target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
-
-diff --git a/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
-new file mode 100644
-index 0000000000..918ae05d12
---- /dev/null
-+++ b/target/linux/generic/pending-5.10/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
-@@ -0,0 +1,107 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Fri, 27 Aug 2021 12:22:32 +0200
-+Subject: [PATCH] bridge: add sysctl knob for filtering rx/tx BPDU packets on a
-+ port
-+
-+Some devices (e.g. wireless APs) can't have devices behind them be part of
-+a bridge topology with redundant links, due to address limitations.
-+Additionally, broadcast traffic on these devices is somewhat expensive, due to
-+the low data rate and wakeups of clients in powersave mode.
-+This sysctl knob can be used to ensure that BPDU packets are never sent
-+or forwarded to/from these devices
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/include/linux/if_bridge.h
-++++ b/include/linux/if_bridge.h
-+@@ -56,6 +56,7 @@ struct br_ip_list {
-+ #define BR_MRP_AWARE		BIT(17)
-+ #define BR_MRP_LOST_CONT	BIT(18)
-+ #define BR_MRP_LOST_IN_CONT	BIT(19)
-++#define BR_BPDU_FILTER		BIT(20)
-+ 
-+ #define BR_DEFAULT_AGEING_TIME	(300 * HZ)
-+ 
-+--- a/net/bridge/br_forward.c
-++++ b/net/bridge/br_forward.c
-+@@ -191,6 +191,7 @@ out:
-+ void br_flood(struct net_bridge *br, struct sk_buff *skb,
-+ 	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
-+ {
-++	const unsigned char *dest = eth_hdr(skb)->h_dest;
-+ 	struct net_bridge_port *prev = NULL;
-+ 	struct net_bridge_port *p;
-+ 
-+@@ -206,6 +207,10 @@ void br_flood(struct net_bridge *br, str
-+ 		case BR_PKT_MULTICAST:
-+ 			if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
-+ 				continue;
-++			if ((p->flags & BR_BPDU_FILTER) &&
-++			    unlikely(is_link_local_ether_addr(dest) &&
-++				     dest[5] == 0))
-++				continue;
-+ 			break;
-+ 		case BR_PKT_BROADCAST:
-+ 			if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)
-+--- a/net/bridge/br_input.c
-++++ b/net/bridge/br_input.c
-+@@ -305,6 +305,8 @@ static rx_handler_result_t br_handle_fra
-+ 		fwd_mask |= p->group_fwd_mask;
-+ 		switch (dest[5]) {
-+ 		case 0x00:	/* Bridge Group Address */
-++			if (p->flags & BR_BPDU_FILTER)
-++				goto drop;
-+ 			/* If STP is turned off,
-+ 			   then must forward to keep loop detection */
-+ 			if (p->br->stp_enabled == BR_NO_STP ||
-+--- a/net/bridge/br_sysfs_if.c
-++++ b/net/bridge/br_sysfs_if.c
-+@@ -233,6 +233,7 @@ BRPORT_ATTR_FLAG(multicast_flood, BR_MCA
-+ BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
-+ BRPORT_ATTR_FLAG(neigh_suppress, BR_NEIGH_SUPPRESS);
-+ BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);
-++BRPORT_ATTR_FLAG(bpdu_filter, BR_BPDU_FILTER);
-+ 
-+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
-+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
-+@@ -285,6 +286,7 @@ static const struct brport_attribute *br
-+ 	&brport_attr_group_fwd_mask,
-+ 	&brport_attr_neigh_suppress,
-+ 	&brport_attr_isolated,
-++	&brport_attr_bpdu_filter,
-+ 	&brport_attr_backup_port,
-+ 	NULL
-+ };
-+--- a/net/bridge/br_stp_bpdu.c
-++++ b/net/bridge/br_stp_bpdu.c
-+@@ -80,7 +80,8 @@ void br_send_config_bpdu(struct net_brid
-+ {
-+ 	unsigned char buf[35];
-+ 
-+-	if (p->br->stp_enabled != BR_KERNEL_STP)
-++	if (p->br->stp_enabled != BR_KERNEL_STP ||
-++	    (p->flags & BR_BPDU_FILTER))
-+ 		return;
-+ 
-+ 	buf[0] = 0;
-+@@ -127,7 +128,8 @@ void br_send_tcn_bpdu(struct net_bridge_
-+ {
-+ 	unsigned char buf[4];
-+ 
-+-	if (p->br->stp_enabled != BR_KERNEL_STP)
-++	if (p->br->stp_enabled != BR_KERNEL_STP ||
-++	    (p->flags & BR_BPDU_FILTER))
-+ 		return;
-+ 
-+ 	buf[0] = 0;
-+@@ -172,6 +174,9 @@ void br_stp_rcv(const struct stp_proto *
-+ 	if (!(br->dev->flags & IFF_UP))
-+ 		goto out;
-+ 
-++	if (p->flags & BR_BPDU_FILTER)
-++		goto out;
-++
-+ 	if (p->state == BR_STATE_DISABLED)
-+ 		goto out;
-+ 
-diff --git a/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
-new file mode 100644
-index 0000000000..586d264cd5
---- /dev/null
-+++ b/target/linux/generic/pending-5.4/710-bridge-add-sysctl-knob-for-filtering-rx-tx-BPDU-pack.patch
-@@ -0,0 +1,107 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Fri, 27 Aug 2021 12:22:32 +0200
-+Subject: [PATCH] bridge: add sysctl knob for filtering rx/tx BPDU packets on a
-+ port
-+
-+Some devices (e.g. wireless APs) can't have devices behind them be part of
-+a bridge topology with redundant links, due to address limitations.
-+Additionally, broadcast traffic on these devices is somewhat expensive, due to
-+the low data rate and wakeups of clients in powersave mode.
-+This sysctl knob can be used to ensure that BPDU packets are never sent
-+or forwarded to/from these devices
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/include/linux/if_bridge.h
-++++ b/include/linux/if_bridge.h
-+@@ -47,6 +47,7 @@ struct br_ip_list {
-+ #define BR_BCAST_FLOOD		BIT(14)
-+ #define BR_NEIGH_SUPPRESS	BIT(15)
-+ #define BR_ISOLATED		BIT(16)
-++#define BR_BPDU_FILTER		BIT(17)
-+ 
-+ #define BR_DEFAULT_AGEING_TIME	(300 * HZ)
-+ 
-+--- a/net/bridge/br_forward.c
-++++ b/net/bridge/br_forward.c
-+@@ -191,6 +191,7 @@ out:
-+ void br_flood(struct net_bridge *br, struct sk_buff *skb,
-+ 	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)
-+ {
-++	const unsigned char *dest = eth_hdr(skb)->h_dest;
-+ 	struct net_bridge_port *prev = NULL;
-+ 	struct net_bridge_port *p;
-+ 
-+@@ -206,6 +207,10 @@ void br_flood(struct net_bridge *br, str
-+ 		case BR_PKT_MULTICAST:
-+ 			if (!(p->flags & BR_MCAST_FLOOD) && skb->dev != br->dev)
-+ 				continue;
-++			if ((p->flags & BR_BPDU_FILTER) &&
-++			    unlikely(is_link_local_ether_addr(dest) &&
-++				     dest[5] == 0))
-++				continue;
-+ 			break;
-+ 		case BR_PKT_BROADCAST:
-+ 			if (!(p->flags & BR_BCAST_FLOOD) && skb->dev != br->dev)
-+--- a/net/bridge/br_input.c
-++++ b/net/bridge/br_input.c
-+@@ -300,6 +300,8 @@ rx_handler_result_t br_handle_frame(stru
-+ 		fwd_mask |= p->group_fwd_mask;
-+ 		switch (dest[5]) {
-+ 		case 0x00:	/* Bridge Group Address */
-++			if (p->flags & BR_BPDU_FILTER)
-++				goto drop;
-+ 			/* If STP is turned off,
-+ 			   then must forward to keep loop detection */
-+ 			if (p->br->stp_enabled == BR_NO_STP ||
-+--- a/net/bridge/br_sysfs_if.c
-++++ b/net/bridge/br_sysfs_if.c
-+@@ -233,6 +233,7 @@ BRPORT_ATTR_FLAG(multicast_flood, BR_MCA
-+ BRPORT_ATTR_FLAG(broadcast_flood, BR_BCAST_FLOOD);
-+ BRPORT_ATTR_FLAG(neigh_suppress, BR_NEIGH_SUPPRESS);
-+ BRPORT_ATTR_FLAG(isolated, BR_ISOLATED);
-++BRPORT_ATTR_FLAG(bpdu_filter, BR_BPDU_FILTER);
-+ 
-+ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
-+ static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
-+@@ -285,6 +286,7 @@ static const struct brport_attribute *br
-+ 	&brport_attr_group_fwd_mask,
-+ 	&brport_attr_neigh_suppress,
-+ 	&brport_attr_isolated,
-++	&brport_attr_bpdu_filter,
-+ 	&brport_attr_backup_port,
-+ 	NULL
-+ };
-+--- a/net/bridge/br_stp_bpdu.c
-++++ b/net/bridge/br_stp_bpdu.c
-+@@ -80,7 +80,8 @@ void br_send_config_bpdu(struct net_brid
-+ {
-+ 	unsigned char buf[35];
-+ 
-+-	if (p->br->stp_enabled != BR_KERNEL_STP)
-++	if (p->br->stp_enabled != BR_KERNEL_STP ||
-++	    (p->flags & BR_BPDU_FILTER))
-+ 		return;
-+ 
-+ 	buf[0] = 0;
-+@@ -125,7 +126,8 @@ void br_send_tcn_bpdu(struct net_bridge_
-+ {
-+ 	unsigned char buf[4];
-+ 
-+-	if (p->br->stp_enabled != BR_KERNEL_STP)
-++	if (p->br->stp_enabled != BR_KERNEL_STP ||
-++	    (p->flags & BR_BPDU_FILTER))
-+ 		return;
-+ 
-+ 	buf[0] = 0;
-+@@ -168,6 +170,9 @@ void br_stp_rcv(const struct stp_proto *
-+ 	if (!(br->dev->flags & IFF_UP))
-+ 		goto out;
-+ 
-++	if (p->flags & BR_BPDU_FILTER)
-++		goto out;
-++
-+ 	if (p->state == BR_STATE_DISABLED)
-+ 		goto out;
-+ 
--- 
-2.25.1
-

backports/0015-uhttpd-add-config-option-for-json_script.patch

@@ -1,33 +0,0 @@
-From 8ba5feb6aaba50bda126db027490c7d37e428e3b Mon Sep 17 00:00:00 2001
-From: Stijn Tintel <stijn@linux-ipv6.be>
-Date: Fri, 20 Aug 2021 16:11:12 +0300
-Subject: [PATCH 15/27] uhttpd: add config option for json_script
-
-Add a config option for json_script instead of unconditionally including
-all json files in /etc/uhttpd in every uhttpd instance. This makes it
-possible to configure a single instance with an unconditional redirect,
-which is currently not possible as it would render all other uhttpd
-instances unusable.
-
-Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
----
- package/network/services/uhttpd/files/uhttpd.init | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
-index 869f79bea2..7020912c6c 100755
---- a/package/network/services/uhttpd/files/uhttpd.init
-+++ b/package/network/services/uhttpd/files/uhttpd.init
-@@ -195,7 +195,8 @@ start_instance()
- 		append_bool "$cfg" redirect_https "-q" 0
- 	}
- 
--	for file in /etc/uhttpd/*.json; do
-+	config_get json_script "$cfg" json_script
-+	for file in $json_script; do
- 		[ -s "$file" ] && procd_append_param command -H "$file"
- 	done
- 
--- 
-2.25.1
-

backports/0016-iwinfo-update-to-latest-git-HEAD.patch

@@ -1,41 +0,0 @@
-From 63281b982b3692828ff453dcb9e68b8e43d628e5 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 21 Jun 2021 12:53:28 +0200
-Subject: [PATCH 16/27] iwinfo: update to latest git HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/network/utils/iwinfo/Makefile | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
-index 815c477988..d235f07da9 100644
---- a/package/network/utils/iwinfo/Makefile
-+++ b/package/network/utils/iwinfo/Makefile
-@@ -11,12 +11,20 @@ PKG_RELEASE:=2.1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
--PKG_SOURCE_DATE:=2021-04-30
--PKG_SOURCE_VERSION:=c45f0b584b4b86f8250f90ea19afca271c114fa2
--PKG_MIRROR_HASH:=24ad04791254a0523cd15a4fec6116d9ff121e006c93e5e41459f91347b33ec2
-+PKG_SOURCE_DATE:=2021-06-09
-+PKG_SOURCE_VERSION:=c0414642fead263a4a6a686ad3cb7e965ec8a23a
-+PKG_MIRROR_HASH:=c5686bbae86753c53db03a686b034bbb80d31107cc359ebd8522ea1c82db35ea
- PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
- PKG_LICENSE:=GPL-2.0
- 
-+PKG_FLAGS := nonshared
-+
-+PKG_CONFIG_DEPENDS := \
-+	CONFIG_PACKAGE_kmod-brcm-wl \
-+	CONFIG_PACKAGE_kmod-brcm-wl-mini \
-+	CONFIG_PACKAGE_kmod-brcm-wl-mimo \
-+	CONFIG_PACKAGE_kmod-cfg80211
-+
- IWINFO_ABI_VERSION:=20210430
- 
- include $(INCLUDE_DIR)/package.mk
--- 
-2.25.1
-

backports/0017-netifd-update-to-latest-HEAD.patch

@@ -1,111 +0,0 @@
-From 1496ca5ceb941ba725311c6c0366193092035f32 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 27 May 2021 13:24:47 +0200
-Subject: [PATCH 01/60] netifd: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/network/config/netifd/Makefile        |  8 ++--
- .../config/netifd/patches/100-script.patch    | 21 +++++++++++
- .../config/netifd/patches/hairpin.patch       | 37 +++++++++++++++++++
- 3 files changed, 61 insertions(+), 5 deletions(-)
- create mode 100644 package/network/config/netifd/patches/100-script.patch
- create mode 100644 package/network/config/netifd/patches/hairpin.patch
-
-diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
-index 4b5f110da2..d41bddfd56 100644
---- a/package/network/config/netifd/Makefile
-+++ b/package/network/config/netifd/Makefile
-@@ -5,16 +5,14 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
--PKG_SOURCE_DATE:=2021-07-26
--PKG_SOURCE_VERSION:=440eb0647708274cc8d7d9e7c2bb0cfdfba90023
--PKG_MIRROR_HASH:=eed957036ab608fdc49bdf801fc5b4405fcd2a3a5e5d3343ec39898e156c10e9
-+PKG_SOURCE_DATE:=2021-10-20
-+PKG_SOURCE_VERSION:=c61a1d432b34babe230e49a82712608b07410fc3
-+PKG_MIRROR_HASH:=2b040d039c560cbc04dfe1e496aa81f714a032db88986803728dd6b724c11cd2
- PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- 
- PKG_LICENSE:=GPL-2.0
- PKG_LICENSE_FILES:=
- 
--PKG_BUILD_PARALLEL:=1
--
- include $(INCLUDE_DIR)/package.mk
- include $(INCLUDE_DIR)/cmake.mk
- 
-diff --git a/package/network/config/netifd/patches/100-script.patch b/package/network/config/netifd/patches/100-script.patch
-new file mode 100644
-index 0000000000..e7ba83f4bb
---- /dev/null
-+++ b/package/network/config/netifd/patches/100-script.patch
-@@ -0,0 +1,21 @@
-+Index: a/scripts/netifd-wireless.sh
-+===================================================================
-+--- a/scripts/netifd-wireless.sh
-++++ b/scripts/netifd-wireless.sh
-+@@ -252,11 +252,14 @@ wireless_vif_parse_encryption() {
-+ 			auth_type=owe
-+ 		;;
-+ 		wpa3-mixed*)
-+-			auth_type=eap-eap192
-++			auth_type=eap-eap256
-+ 		;;
-+-		wpa3*)
-++		wpa3-192*)
-+ 			auth_type=eap192
-+ 		;;
-++		wpa3*)
-++			auth_type=eap256
-++		;;
-+ 		psk3-mixed*|sae-mixed*)
-+ 			auth_type=psk-sae
-+ 		;;
-diff --git a/package/network/config/netifd/patches/hairpin.patch b/package/network/config/netifd/patches/hairpin.patch
-new file mode 100644
-index 0000000000..25515d75d4
---- /dev/null
-+++ b/package/network/config/netifd/patches/hairpin.patch
-@@ -0,0 +1,37 @@
-+diff --git a/wireless.c b/wireless.c
-+index b26c4e8c8f0b..bd847e72ab40 100644
-+--- a/wireless.c
-++++ b/wireless.c
-+@@ -804,20 +804,13 @@ wireless_interface_init_config(struct wireless_interface *vif)
-+ 		vif->network = cur;
-+ 
-+ 	cur = tb[VIF_ATTR_MODE];
-+-	if (cur)
-+-		vif->ap_mode = !strcmp(blobmsg_get_string(cur), "ap");
-+-
-+-	if (!vif->ap_mode)
-+-		return;
-++	vif->ap_mode = cur && !strcmp(blobmsg_get_string(cur), "ap");
-+ 
-+ 	cur = tb[VIF_ATTR_ISOLATE];
-+-	if (cur)
-+-		vif->isolate = blobmsg_get_bool(cur);
-++	vif->isolate = vif->ap_mode && cur && blobmsg_get_bool(cur);
-+ 
-+ 	cur = tb[VIF_ATTR_PROXYARP];
-+-	if (cur)
-+-		vif->proxyarp = blobmsg_get_bool(cur);
-+-
-++	vif->proxyarp = vif->ap_mode && cur && blobmsg_get_bool(cur);
-+ }
-+ 
-+ /* vlist update call for wireless interface list */
-+@@ -846,8 +839,6 @@ vif_update(struct vlist_tree *tree, struct vlist_node *node_new,
-+ 		wireless_interface_handle_link(vif_old, NULL, false);
-+ 		free(vif_old->config);
-+ 		vif_old->config = blob_memdup(vif_new->config);
-+-		vif_old->isolate = vif_new->isolate;
-+-		vif_old->ap_mode = vif_new->ap_mode;
-+ 		wireless_interface_init_config(vif_old);
-+ 		free(vif_new);
-+ 	} else if (vif_new) {
--- 
-2.25.1
-

backports/0020-procd-add-uxc-support.patch

@@ -1,179 +0,0 @@
-From 006abf1773051ad355b52d70095f63f44a496b13 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Sun, 25 Jul 2021 13:32:37 +0200
-Subject: [PATCH 02/70] procd: add uxc support
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/system/procd/Makefile       | 15 +++---
- package/system/procd/files/procd.sh | 79 +++++++++++++++++++++++++++++
- package/system/procd/files/uxc.init |  4 ++
- 3 files changed, 90 insertions(+), 8 deletions(-)
-
-diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index 30d5adf427..b831f86639 100644
---- a/package/system/procd/Makefile
-+++ b/package/system/procd/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
--PKG_SOURCE_DATE:=2021-02-23
--PKG_SOURCE_VERSION:=37eed131e9967a35f47bacb3437a9d3c8a57b3f4
--PKG_MIRROR_HASH:=2b0131ff9055ccf987cbeb5f36c2c2585dc780999df6be312fbbbcd61ce676d4
-+PKG_MIRROR_HASH:=0d51642d82d7bb4150355a6986e54504dce171c6fcb7eeff312d20a5d106bad8
-+PKG_SOURCE_DATE:=2021-11-04
-+PKG_SOURCE_VERSION:=0ee8e734a7f67220cf4a3412b60ff674b5fb20dd
- CMAKE_INSTALL:=1
- 
- PKG_LICENSE:=GPL-2.0
-@@ -32,7 +32,7 @@ include $(INCLUDE_DIR)/package.mk
- include $(INCLUDE_DIR)/cmake.mk
- 
- ifeq ($(DUMP),)
--  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(CONFIG_TARGET_INIT_PATH) | mkhash md5)
-+  STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(CONFIG_TARGET_INIT_PATH) | $(MKHASH) md5)
- endif
- 
- CMAKE_OPTIONS += -DEARLY_PATH="$(TARGET_INIT_PATH)"
-@@ -68,7 +68,7 @@ define Package/procd-ujail
-   SECTION:=base
-   CATEGORY:=Base system
-   DEPENDS:=@KERNEL_NAMESPACES +@KERNEL_UTS_NS +@KERNEL_IPC_NS +@KERNEL_PID_NS \
--	  +libubox +libubus +libblobmsg-json
-+	  +libubox +libubus +libuci +libblobmsg-json
-   TITLE:=OpenWrt process jail helper
- endef
- 
-@@ -82,15 +82,14 @@ endef
- define Package/procd-seccomp
-   SECTION:=base
-   CATEGORY:=Base system
--  DEPENDS:=@(arm||armeb||mips||mipsel||i386||powerpc||x86_64) @!TARGET_uml \
--	  @KERNEL_SECCOMP +libubox +libblobmsg-json
-+  DEPENDS:=@SECCOMP +libubox +libblobmsg-json
-   TITLE:=OpenWrt process seccomp helper + utrace
- endef
- 
- define Package/uxc
-   SECTION:=base
-   CATEGORY:=Base system
--  DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json
-+  DEPENDS:=+procd-ujail +libubus +libubox +libblobmsg-json +blockd +PACKAGE_uxc:rpcd
-   TITLE:=OpenWrt container management
-   MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
- endef
-diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh
-index d86b7219da..3549a5a914 100644
---- a/package/system/procd/files/procd.sh
-+++ b/package/system/procd/files/procd.sh
-@@ -329,6 +329,82 @@ _procd_add_config_trigger() {
- 	json_close_array
- }
- 
-+_procd_add_mount_trigger() {
-+	json_add_array
-+	_procd_add_array_data "$1"
-+	local action="$2"
-+	local multi=0
-+	shift ; shift
-+
-+	json_add_array
-+	_procd_add_array_data "if"
-+
-+	if [ "$2" ]; then
-+		json_add_array
-+		_procd_add_array_data "or"
-+		multi=1
-+	fi
-+
-+	while [ "$1" ]; do
-+		json_add_array
-+		_procd_add_array_data "eq" "target" "$1"
-+		shift
-+		json_close_array
-+	done
-+
-+	[ $multi = 1 ] && json_close_array
-+
-+	json_add_array
-+	_procd_add_array_data "run_script" /etc/init.d/$name $action
-+	json_close_array
-+
-+	json_close_array
-+	_procd_add_timeout
-+	json_close_array
-+}
-+
-+_procd_add_action_mount_trigger() {
-+	local script=$(readlink "$initscript")
-+	local name=$(basename ${script:-$initscript})
-+	local action="$1"
-+	local mpath
-+	shift
-+
-+	_procd_open_trigger
-+	_procd_add_mount_trigger mount.add $action "$@"
-+	_procd_close_trigger
-+}
-+
-+procd_get_mountpoints() {
-+	(
-+		__procd_check_mount() {
-+			local cfg="$1"
-+			local path="${2%%/}/"
-+			local target
-+			config_get target "$cfg" target
-+			target="${target%%/}/"
-+			[ "$path" != "${path##$target}" ] && echo "${target%%/}"
-+		}
-+
-+		config_load fstab
-+		for mpath in "$@"; do
-+			config_foreach __procd_check_mount mount "$mpath"
-+		done
-+	) | sort -u
-+}
-+
-+_procd_add_restart_mount_trigger() {
-+	local mountpoints="$(procd_get_mountpoints "$@")"
-+	[ "${mountpoints//[[:space:]]}" ] &&
-+		_procd_add_action_mount_trigger restart $mountpoints
-+}
-+
-+_procd_add_reload_mount_trigger() {
-+	local mountpoints="$(procd_get_mountpoints "$@")"
-+	[ "${mountpoints//[[:space:]]}" ] &&
-+		_procd_add_action_mount_trigger reload $mountpoints
-+}
-+
- _procd_add_raw_trigger() {
- 	json_add_array
- 	_procd_add_array_data "$1"
-@@ -560,8 +636,11 @@ _procd_wrapper \
- 	procd_add_raw_trigger \
- 	procd_add_config_trigger \
- 	procd_add_interface_trigger \
-+	procd_add_mount_trigger \
- 	procd_add_reload_trigger \
- 	procd_add_reload_interface_trigger \
-+	procd_add_reload_mount_trigger \
-+	procd_add_restart_mount_trigger \
- 	procd_open_trigger \
- 	procd_close_trigger \
- 	procd_open_instance \
-diff --git a/package/system/procd/files/uxc.init b/package/system/procd/files/uxc.init
-index 035c8b0b9e..1e75b796f8 100644
---- a/package/system/procd/files/uxc.init
-+++ b/package/system/procd/files/uxc.init
-@@ -16,3 +16,7 @@ boot() {
- 	__BOOT_UXC=1
- 	start
- }
-+
-+service_triggers() {
-+	procd_add_raw_trigger "mount.add" 3000 /etc/init.d/uxc boot
-+}
--- 
-2.25.1
-

backports/0021-build-create-APK-files-parrallel-to-IPK.patch

@@ -1,174 +0,0 @@
-From 23c15e2536d0fa5ed81c5bdfe7623d3370dca997 Mon Sep 17 00:00:00 2001
-From: Paul Spooren <mail@aparcar.org>
-Date: Fri, 2 Oct 2020 23:30:30 -1000
-Subject: [PATCH 21/27] build: create APK files parrallel to IPK
-
-Create APK files based on the folder and control files of IPK packages.
-
-Signed-off-by: Paul Spooren <mail@aparcar.org>
----
- include/package-ipkg.mk     | 48 +++++++++++++++++++++++++------------
- package/Makefile            |  2 ++
- package/base-files/Makefile |  4 ++++
- rules.mk                    |  2 ++
- scripts/apk-make-index.sh   | 20 ++++++++++++++++
- 5 files changed, 61 insertions(+), 15 deletions(-)
- create mode 100755 scripts/apk-make-index.sh
-
-diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
-index e972b7de0b..5c31b1774f 100644
---- a/include/package-ipkg.mk
-+++ b/include/package-ipkg.mk
-@@ -102,6 +102,7 @@ ifeq ($(DUMP),)
-     ABIV_$(1):=$(call FormatABISuffix,$(1),$(ABI_VERSION))
-     PDIR_$(1):=$(call FeedPackageDir,$(1))
-     IPKG_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk
-+    APK_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).apk
-     IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1)
-     KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))
- 
-@@ -200,7 +201,7 @@ $(_endef)
-     $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk
- 	@rm -rf $$(IDIR_$(1)); \
- 		$$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1))))
--	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR)
-+	mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1)) $(PKG_INFO_DIR)
- 	$(call Package/$(1)/install,$$(IDIR_$(1)))
- 	$(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay)
- 	$(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay)
-@@ -226,6 +227,37 @@ $(_endef)
- 		) || true \
- 	)
-     endif
-+
-+    ifneq ($$(KEEP_$(1)),)
-+		@( \
-+			keepfiles=""; \
-+			for x in $$(KEEP_$(1)); do \
-+				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
-+			done; \
-+			[ -z "$$$$keepfiles" ] || { \
-+				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
-+				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
-+			}; \
-+		)
-+    endif
-+
-+	$(INSTALL_DIR) $$(PDIR_$(1))
-+
-+	$(FAKEROOT) apk mkpkg \
-+	  --info "name:$(1)" \
-+	  --info "version:$(VERSION)" \
-+	  --info "description:$()" \
-+	  --info "arch:$(PKGARCH)" \
-+	  --info "license:$(LICENSE)" \
-+	  --info "origin:$(SOURCE)" \
-+	  --info "maintainer:$(MAINTAINER)" \
-+	  $$(foreach dep,$$(Package/$(1)/DEPENDS),--info "depends:$$(subst $$(comma),,$$(dep))") \
-+	  --files "$$(IDIR_$(1))" \
-+	  --output "$$(APK_$(1))" \
-+	  --sign "$(BUILD_KEY_APK_SEC)"
-+
-+	mkdir -p $$(IDIR_$(1))/CONTROL
-+
- 	(cd $$(IDIR_$(1))/CONTROL; \
- 		( \
- 			echo "$$$$CONTROL"; \
-@@ -249,20 +281,6 @@ $(_endef)
- 		$($(1)_COMMANDS) \
- 	)
- 
--    ifneq ($$(KEEP_$(1)),)
--		@( \
--			keepfiles=""; \
--			for x in $$(KEEP_$(1)); do \
--				[ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \
--			done; \
--			[ -z "$$$$keepfiles" ] || { \
--				mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \
--				for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \
--			}; \
--		)
--    endif
--
--	$(INSTALL_DIR) $$(PDIR_$(1))
- 	$(FAKEROOT) $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1))
- 	@[ -f $$(IPKG_$(1)) ]
- 
-diff --git a/package/Makefile b/package/Makefile
-index ec503dc527..18a19fff13 100644
---- a/package/Makefile
-+++ b/package/Makefile
-@@ -60,6 +60,7 @@ $(curdir)/merge-index: $(curdir)/merge
- 
- ifndef SDK
-   $(curdir)/compile: $(curdir)/system/opkg/host/compile
-+  $(patsubst %,$(curdir)/%/compile,$(filter-out %/apk/host,$($(curdir)/builddirs))): $(curdir)/system/apk/host/compile
- endif
- 
- $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index)
-@@ -84,6 +85,7 @@ $(curdir)/index: FORCE
- 	@for d in $(PACKAGE_SUBDIRS); do ( \
- 		mkdir -p $$d; \
- 		cd $$d || continue; \
-+		$(SCRIPT_DIR)/apk-make-index.sh . 2>&1; \
- 		$(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages.manifest; \
- 		grep -vE '^(Maintainer|LicenseFiles|Source|SourceName|Require|SourceDateEpoch)' Packages.manifest > Packages; \
- 		case "$$(((64 + $$(stat -L -c%s Packages)) % 128))" in 110|111) \
-diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index 8a1ddf96f5..9db4812981 100644
---- a/package/base-files/Makefile
-+++ b/package/base-files/Makefile
-@@ -107,6 +107,10 @@ ifdef CONFIG_SIGNED_PACKAGES
- 	[ -s $(BUILD_KEY).ucert ] || \
- 		$(STAGING_DIR_HOST)/bin/ucert -I -c $(BUILD_KEY).ucert -p $(BUILD_KEY).pub -s $(BUILD_KEY)
- 
-+	[ -s $(BUILD_KEY_APK_SEC) -a -s $(BUILD_KEY_APK_PUB) ] || \
-+		openssl ecparam -name prime256v1 -genkey -noout -out $(BUILD_KEY_APK_SEC); \
-+		openssl ec -in $(BUILD_KEY_APK_SEC) -pubout > $(BUILD_KEY_APK_PUB)
-+
-   endef
- 
- ifndef CONFIG_BUILDBOT
-diff --git a/rules.mk b/rules.mk
-index f31d9bb113..de81b65d46 100644
---- a/rules.mk
-+++ b/rules.mk
-@@ -258,6 +258,8 @@ else
- endif
- 
- BUILD_KEY=$(TOPDIR)/key-build
-+BUILD_KEY_APK_SEC=$(TOPDIR)/private-key.pem
-+BUILD_KEY_APK_PUB=$(TOPDIR)/public-key.pem
- 
- FAKEROOT:=$(STAGING_DIR_HOST)/bin/fakeroot
- 
-diff --git a/scripts/apk-make-index.sh b/scripts/apk-make-index.sh
-new file mode 100755
-index 0000000000..df1f1a2e2b
---- /dev/null
-+++ b/scripts/apk-make-index.sh
-@@ -0,0 +1,20 @@
-+#!/usr/bin/env bash
-+set -e
-+
-+pkg_dir=$1
-+
-+if [ -z "$pkg_dir" ] || [ ! -d "$pkg_dir" ]; then
-+	echo "Usage: apk-make-index <package_directory>" >&2
-+	exit 1
-+fi
-+
-+(
-+	cd "$pkg_dir" || exit 1
-+	GLOBIGNORE="kernel*:libc*"
-+	set -- *.apk
-+	if [ "$1" = '*.apk' ]; then
-+		echo "No APK packages found"
-+	fi
-+	apk index --output APKINDEX.tar.gz "$@"
-+	unset GLOBIGNORE
-+)
--- 
-2.25.1
-

backports/0022-fstools-update-to-git-HEAD.patch

@@ -1,69 +0,0 @@
-From 8e8b3e443a7f1d0644f43888c8683698f26d4d13 Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel@makrotopia.org>
-Date: Sun, 25 Jul 2021 01:20:31 +0100
-Subject: [PATCH 22/27] fstools: update to git HEAD
-
- bad1835 fstools: add partname volume driver
- 19d7d93 libfstools: partname: several fixes
- 3c38f0c libfstools: fix build with glibc
- d05ad93 libfstools: remove superflus include
- 964d1e3 partname: allow skipping existing 'rootfs_data' partition
- c44b40b overlay: fix syncronizing typo
- b5397a1 fstools: block: fix segfault on mount with no target
- bd7cc8d block: use dynamically allocated target string
- 6d8450e blockd: use allocated strings instead of fixed buffers
- d47909e libblkid-tiny: fix buffer overflow
- 67d2297 block: match device path instead of assuming /dev/%s
- 2aeba88 block: allow autofs and umount commands also on MTD/UBI
- 3d40a1b blockd: add missing #define _GNU_SOURCE
- 4d4dcfb blockd: detect mountpoint of /dev/mapper/*
- 2f42515 block: resolve /dev/mapper/* name for /dev/dm-0 when hotplugging
- 39558a1 blockd: also send ubus notification on mount hotplug
- 3386b6b blockd: fix trigger name
- cdc9939 blockd: move to its own POSIX process group
- 59f7c11 blockd: create mountpoint parent folder if needed
- 9cc96af Revert "block: resolve /dev/mapper/* name for /dev/dm-0 when hotplugging"
- 06334ac Revert "blockd: detect mountpoint of /dev/mapper/*"
- 9ab3551 block: use /dev/dm-* instead of /dev/mapper/*
- 5114595 block: allow remove hotplug event to arrive at blockd
- a846c6b blockd: fix length of timeout int passed to ioctl
- 1d681ca block: support umount device basename
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- package/system/fstools/Makefile          | 6 +++---
- package/system/fstools/files/blockd.init | 1 +
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
-index 2da508d541..b582a17bae 100644
---- a/package/system/fstools/Makefile
-+++ b/package/system/fstools/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
--PKG_MIRROR_HASH:=a485792d90c71cd4fb396ce97f42a57ee4d2a3d78e5f3fd0748270ffb14209e6
--PKG_SOURCE_DATE:=2021-01-04
--PKG_SOURCE_VERSION:=c53b18820756f6f32ad0782d3bf489422b7c4ad3
-+PKG_MIRROR_HASH:=6a457b812166e04e2244ee1be92a4957666b5d1554315c0e18db1b30376cc617
-+PKG_SOURCE_DATE:=2021-07-28
-+PKG_SOURCE_VERSION:=cc63933faedd8d4fcdabb872cf4661ac04fe4ba2
- CMAKE_INSTALL:=1
- 
- PKG_LICENSE:=GPL-2.0
-diff --git a/package/system/fstools/files/blockd.init b/package/system/fstools/files/blockd.init
-index a4ce57d40d..bdd8bbf622 100755
---- a/package/system/fstools/files/blockd.init
-+++ b/package/system/fstools/files/blockd.init
-@@ -16,6 +16,7 @@ reload_service() {
- start_service() {
- 	procd_open_instance
- 	procd_set_param command "$PROG"
-+	procd_set_param watch block
- 	procd_set_param respawn
- 	procd_close_instance
- }
--- 
-2.25.1
-

backports/0023-tools-libressl-update-to-3.3.3.patch

@@ -1,40 +0,0 @@
-From 873052b99d6597209957ec32898fa56324cf34a4 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Sat, 19 Jun 2021 14:45:11 -0700
-Subject: [PATCH 23/27] tools/libressl: update to 3.3.3
-
-Fix wrong FPIC variable usage. Fixes compilation under sparc64 host.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
-(cherry picked from commit bf4dbbb55e2b8e23f186e1334f1e9ce6a3a8ddfe)
----
- tools/libressl/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile
-index 2b5a33450c..e25b5661ee 100644
---- a/tools/libressl/Makefile
-+++ b/tools/libressl/Makefile
-@@ -8,8 +8,8 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=libressl
--PKG_VERSION:=3.3.1
--PKG_HASH:=a6d331865e0164a13ac85a228e52517f7cf8f8488f2f95f34e7857302f97cfdb
-+PKG_VERSION:=3.3.3
-+PKG_HASH:=a471565b36ccd1a70d0bd7d37c6e95c43a26a62829b487d9d2cdebfe58be3066
- PKG_RELEASE:=1
- 
- PKG_CPE_ID:=cpe:/a:openbsd:libressl
-@@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/host-build.mk
- 
- HOSTCC := $(HOSTCC_NOCACHE)
- HOST_CONFIGURE_ARGS += --enable-static --disable-shared --disable-tests
--HOST_CFLAGS += $(FPIC)
-+HOST_CFLAGS += $(HOST_FPIC)
- 
- ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32)
- HOST_CONFIGURE_ARGS += --disable-asm
--- 
-2.25.1
-

backports/0025-apk-backport-package.patch

@@ -1,312 +0,0 @@
-From bf98d3c1de524ca50cbc09f825a4b0648e353624 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 13 Aug 2021 08:47:11 +0200
-Subject: [PATCH 25/27] apk: backport package
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/system/apk/Makefile                   | 93 +++++++++++++++++++
- ...vel@lists.alpinelinux.org-4a6a0840.rsa.pub |  9 ++
- ...vel@lists.alpinelinux.org-5243ef4b.rsa.pub |  9 ++
- ...vel@lists.alpinelinux.org-5261cecb.rsa.pub |  9 ++
- package/system/apk/files/alpine-repositories  |  3 +
- .../apk/patches/000-Makefile-version.patch    | 11 +++
- .../patches/0001-remove-doc-generation.patch  | 21 +++++
- package/system/apk/patches/100-link.patch     | 16 ++++
- package/system/apk/patches/100-phtread.patch  | 12 +++
- ...ude-limits.h-to-fix-build-with-glibc.patch | 20 ++++
- package/system/apk/test.sh                    |  9 ++
- 11 files changed, 212 insertions(+)
- create mode 100644 package/system/apk/Makefile
- create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
- create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
- create mode 100644 package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
- create mode 100644 package/system/apk/files/alpine-repositories
- create mode 100644 package/system/apk/patches/000-Makefile-version.patch
- create mode 100644 package/system/apk/patches/0001-remove-doc-generation.patch
- create mode 100644 package/system/apk/patches/100-link.patch
- create mode 100644 package/system/apk/patches/100-phtread.patch
- create mode 100644 package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
- create mode 100644 package/system/apk/test.sh
-
-diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile
-new file mode 100644
-index 0000000000..335f50c155
---- /dev/null
-+++ b/package/system/apk/Makefile
-@@ -0,0 +1,93 @@
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=apk
-+PKG_VERSION:=3.0.0_pre0
-+
-+PKG_SOURCE_PROTO:=git
-+PKG_SOURCE_URL:=https://git.alpinelinux.org/apk-tools.git
-+PKG_SOURCE_DATE:=2021-08-17
-+PKG_SOURCE_VERSION:=a46043bcc4cc15b456ef1eac5c5f9d93bd905d53
-+PKG_MIRROR_HASH:=e16fd04b18043e78a177acd8c6958fa03fd1484b62c879c2dd0bed8ce9c50625
-+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))
-+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR)
-+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz
-+PKG_RELEASE:=r$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))-$(AUTORELEASE)
-+
-+PKG_MAINTAINER:=Paul Spooren <mail@aparcar.org>
-+PKG_LICENSE:=GPL-2.0-only
-+PKG_LICENSE_FILES:=LICENSE
-+
-+PKG_INSTALL:=1
-+PKG_BUILD_PARALLEL:=1
-+
-+HOST_BUILD_DEPENDS:=lua/host lua-lzlib/host
-+PKG_BUILD_DEPENDS:=$(HOST_BUILD_DEPENDS)
-+
-+include $(INCLUDE_DIR)/package.mk
-+include $(INCLUDE_DIR)/host-build.mk
-+
-+define Package/apk
-+  SECTION:=utils
-+  CATEGORY:=Utilities
-+  TITLE:=apk package manager
-+  DEPENDS:=+liblua +libopenssl +zlib @!arc
-+  URL:=$(PKG_SOURCE_URL)
-+endef
-+
-+define Package/alpine-keys
-+  SECTION:=utils
-+  CATEGORY:=Utilities
-+  TITLE:=Alpine apk public signing keys
-+  DEPENDS:=apk
-+endef
-+
-+define Package/alpine-repositories
-+  SECTION:=utils
-+  CATEGORY:=Utilities
-+  TITLE:=Official Alpine repositories
-+  DEPENDS:=apk
-+endef
-+
-+MAKE_FLAGS += \
-+	LUA=$(STAGING_DIR_HOSTPKG)/bin/lua \
-+	LUA_VERSION=5.1 \
-+	LUA_PC=lua
-+
-+HOST_MAKE_FLAGS += \
-+	LUA=$(STAGING_DIR_HOSTPKG)/bin/lua \
-+	LUA_VERSION=5.1 \
-+	DESTDIR=$(STAGING_DIR_HOSTPKG) \
-+	SBINDIR=/bin \
-+	PREFIX=
-+
-+HOST_LDFLAGS+=-Wl,-rpath=$(STAGING_DIR_HOSTPKG)/lib -lpthread
-+
-+define Package/apk/install
-+	$(INSTALL_DIR) $(1)/lib/apk/db
-+
-+	$(INSTALL_DIR) $(1)/bin
-+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/apk $(1)/bin/apk
-+
-+	$(INSTALL_DIR) $(1)/usr/lib
-+	$(CP) $(PKG_INSTALL_DIR)/lib/*.so.* $(1)/usr/lib/
-+
-+	$(INSTALL_DIR) $(1)/etc/apk/
-+	echo $(ARCH) > $(1)/etc/apk/arch
-+	touch $(1)/etc/apk/world
-+endef
-+
-+define Package/alpine-keys/install
-+	$(INSTALL_DIR) $(1)/etc/apk/keys
-+	$(INSTALL_DATA) ./files/alpine-keys/* $(1)/etc/apk/keys
-+endef
-+
-+define Package/alpine-repositories/install
-+	$(INSTALL_DIR) $(1)/etc/apk/keys
-+	$(INSTALL_DATA) ./files/alpine-repositories $(1)/etc/apk/repositories
-+endef
-+
-+$(eval $(call BuildPackage,apk))
-+$(eval $(call BuildPackage,alpine-keys))
-+$(eval $(call BuildPackage,alpine-repositories))
-+$(eval $(call HostBuild))
-diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
-new file mode 100644
-index 0000000000..bb4bdc80fd
---- /dev/null
-+++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
-@@ -0,0 +1,9 @@
-+-----BEGIN PUBLIC KEY-----
-+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1yHJxQgsHQREclQu4Ohe
-+qxTxd1tHcNnvnQTu/UrTky8wWvgXT+jpveroeWWnzmsYlDI93eLI2ORakxb3gA2O
-+Q0Ry4ws8vhaxLQGC74uQR5+/yYrLuTKydFzuPaS1dK19qJPXB8GMdmFOijnXX4SA
-+jixuHLe1WW7kZVtjL7nufvpXkWBGjsfrvskdNA/5MfxAeBbqPgaq0QMEfxMAn6/R
-+L5kNepi/Vr4S39Xvf2DzWkTLEK8pcnjNkt9/aafhWqFVW7m3HCAII6h/qlQNQKSo
-+GuH34Q8GsFG30izUENV9avY7hSLq7nggsvknlNBZtFUcmGoQrtx3FmyYsIC8/R+B
-+ywIDAQAB
-+-----END PUBLIC KEY-----
-diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
-new file mode 100644
-index 0000000000..6cbfad7441
---- /dev/null
-+++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
-@@ -0,0 +1,9 @@
-+-----BEGIN PUBLIC KEY-----
-+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNijDxJ8kloskKQpJdx+
-+mTMVFFUGDoDCbulnhZMJoKNkSuZOzBoFC94omYPtxnIcBdWBGnrm6ncbKRlR+6oy
-+DO0W7c44uHKCFGFqBhDasdI4RCYP+fcIX/lyMh6MLbOxqS22TwSLhCVjTyJeeH7K
-+aA7vqk+QSsF4TGbYzQDDpg7+6aAcNzg6InNePaywA6hbT0JXbxnDWsB+2/LLSF2G
-+mnhJlJrWB1WGjkz23ONIWk85W4S0XB/ewDefd4Ly/zyIciastA7Zqnh7p3Ody6Q0
-+sS2MJzo7p3os1smGjUF158s6m/JbVh4DN6YIsxwl2OjDOz9R0OycfJSDaBVIGZzg
-+cQIDAQAB
-+-----END PUBLIC KEY-----
-diff --git a/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
-new file mode 100644
-index 0000000000..83f0658e9c
---- /dev/null
-+++ b/package/system/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
-@@ -0,0 +1,9 @@
-+-----BEGIN PUBLIC KEY-----
-+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlzMkl7b5PBdfMzGdCT0
-+cGloRr5xGgVmsdq5EtJvFkFAiN8Ac9MCFy/vAFmS8/7ZaGOXoCDWbYVLTLOO2qtX
-+yHRl+7fJVh2N6qrDDFPmdgCi8NaE+3rITWXGrrQ1spJ0B6HIzTDNEjRKnD4xyg4j
-+g01FMcJTU6E+V2JBY45CKN9dWr1JDM/nei/Pf0byBJlMp/mSSfjodykmz4Oe13xB
-+Ca1WTwgFykKYthoLGYrmo+LKIGpMoeEbY1kuUe04UiDe47l6Oggwnl+8XD1MeRWY
-+sWgj8sF4dTcSfCMavK4zHRFFQbGp/YFJ/Ww6U9lA3Vq0wyEI6MCMQnoSMFwrbgZw
-+wwIDAQAB
-+-----END PUBLIC KEY-----
-diff --git a/package/system/apk/files/alpine-repositories b/package/system/apk/files/alpine-repositories
-new file mode 100644
-index 0000000000..5babbb23b4
---- /dev/null
-+++ b/package/system/apk/files/alpine-repositories
-@@ -0,0 +1,3 @@
-+https://dl-cdn.alpinelinux.org/alpine/edge/main
-+https://dl-cdn.alpinelinux.org/alpine/edge/community
-+
-diff --git a/package/system/apk/patches/000-Makefile-version.patch b/package/system/apk/patches/000-Makefile-version.patch
-new file mode 100644
-index 0000000000..2e7f5b0f15
---- /dev/null
-+++ b/package/system/apk/patches/000-Makefile-version.patch
-@@ -0,0 +1,11 @@
-+--- a/Makefile
-++++ b/Makefile
-+@@ -4,7 +4,7 @@
-+ -include config.mk
-+ 
-+ PACKAGE := apk-tools
-+-VERSION := 2.12.0
-++VERSION := 3.0.0_pre0
-+ 
-+ export VERSION
-+ 
-diff --git a/package/system/apk/patches/0001-remove-doc-generation.patch b/package/system/apk/patches/0001-remove-doc-generation.patch
-new file mode 100644
-index 0000000000..dee05c56f2
---- /dev/null
-+++ b/package/system/apk/patches/0001-remove-doc-generation.patch
-@@ -0,0 +1,21 @@
-+From b05a93c48fdbb50f0c464310dc2ce45777d32ea2 Mon Sep 17 00:00:00 2001
-+From: Paul Spooren <mail@aparcar.org>
-+Date: Fri, 2 Oct 2020 14:08:52 -1000
-+Subject: [PATCH] remove doc generation
-+
-+Signed-off-by: Paul Spooren <mail@aparcar.org>
-+---
-+ Makefile | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+--- a/Makefile
-++++ b/Makefile
-+@@ -25,7 +25,7 @@ export DESTDIR SBINDIR LIBDIR CONFDIR MA
-+ ##
-+ # Top-level subdirs
-+ 
-+-subdirs		:= libfetch/ src/ doc/
-++subdirs		:= libfetch/ src/
-+ 
-+ ##
-+ # Include all rules and stuff
-diff --git a/package/system/apk/patches/100-link.patch b/package/system/apk/patches/100-link.patch
-new file mode 100644
-index 0000000000..9cae2787d9
---- /dev/null
-+++ b/package/system/apk/patches/100-link.patch
-@@ -0,0 +1,16 @@
-+diff -urN apk-2021-08-17-a46043bc.orig/src/Makefile apk-2021-08-17-a46043bc/src/Makefile
-+--- apk-2021-08-17-a46043bc.orig/src/Makefile	2021-08-17 14:21:04.117760513 +0200
-++++ apk-2021-08-17-a46043bc/src/Makefile	2021-08-17 14:21:16.653830180 +0200
-+@@ -65,7 +65,11 @@
-+ 	app_convdb.o app_convndx.o app_del.o app_dot.o app_extract.o app_fetch.o \
-+ 	app_fix.o app_index.o app_info.o app_list.o app_manifest.o app_mkndx.o \
-+ 	app_mkpkg.o app_policy.o app_update.o app_upgrade.o app_search.o \
-+-	app_stats.o app_verify.o app_version.o app_vertest.o applet.o
-++	app_stats.o app_verify.o app_version.o app_vertest.o applet.o \
-++	adb.o adb_comp.o adb_walk_adb.o adb_walk_genadb.o adb_walk_gentext.o adb_walk_text.o apk_adb.o \
-++	atom.o blob.o commit.o common.o context.o crypto_openssl.o database.o hash.o \
-++	extract.o extract_v2.o extract_v3.o io.o io_gunzip.o io_url.o tar.o \
-++	package.o pathbuilder.o print.o solver.o trust.o version.o
-+ 
-+ ifeq ($(ADB),y)
-+ libapk.so.$(libapk_soname)-objs += apk_adb.o
-diff --git a/package/system/apk/patches/100-phtread.patch b/package/system/apk/patches/100-phtread.patch
-new file mode 100644
-index 0000000000..c252e14dc1
---- /dev/null
-+++ b/package/system/apk/patches/100-phtread.patch
-@@ -0,0 +1,12 @@
-+diff -urN apk-2021-07-23-3d203e8f.orig/src/Makefile apk-2021-07-23-3d203e8f/src/Makefile
-+--- apk-2021-07-23-3d203e8f.orig/src/Makefile	2021-07-25 12:55:05.576564663 +0200
-++++ apk-2021-07-23-3d203e8f/src/Makefile	2021-07-25 12:55:48.660862181 +0200
-+@@ -87,7 +87,7 @@
-+ apk.static-libs		:= $(apk-static-libs)
-+ LDFLAGS_apk.static	:= -static
-+ LIBS_apk.static		:= -Wl,--as-needed -ldl -Wl,--no-as-needed
-+-LDFLAGS_apk		+= -L$(obj)
-++LDFLAGS_apk		+= -L$(obj) -pthread
-+ LDFLAGS_apk-test	+= -L$(obj)
-+ 
-+ CFLAGS_ALL		+= $(OPENSSL_CFLAGS) $(ZLIB_CFLAGS)
-diff --git a/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch b/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
-new file mode 100644
-index 0000000000..43ec7d5f1a
---- /dev/null
-+++ b/package/system/apk/patches/100-tar-include-limits.h-to-fix-build-with-glibc.patch
-@@ -0,0 +1,20 @@
-+From c72ea983e287ec1d8b1f2b3aab1bf40aa7a30b03 Mon Sep 17 00:00:00 2001
-+From: Daniel Golle <daniel@makrotopia.org>
-+Date: Wed, 4 Aug 2021 21:37:40 +0100
-+Subject: [PATCH] tar: include <limits.h> to fix build with glibc
-+
-+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-+---
-+ src/tar.c | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+--- a/src/tar.c
-++++ b/src/tar.c
-+@@ -9,6 +9,7 @@
-+ 
-+ #include <sys/stat.h>
-+ #include <sys/sysmacros.h>
-++#include <limits.h> /* for SSIZE_MAX with glibc */
-+ 
-+ #include "apk_defines.h"
-+ #include "apk_tar.h"
-diff --git a/package/system/apk/test.sh b/package/system/apk/test.sh
-new file mode 100644
-index 0000000000..814777fd70
---- /dev/null
-+++ b/package/system/apk/test.sh
-@@ -0,0 +1,9 @@
-+#!/bin/sh
-+
-+case "$1" in
-+    "apk")
-+        apk --version | grep "${2/-r*/}"
-+        ;;
-+    *)
-+        return 0;
-+esac
--- 
-2.25.1
-

backports/0026-lua-lzlib-backport-package.patch

@@ -1,104 +0,0 @@
-From ec862d472fca676cc04ce71b640e880ecefdd477 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 13 Aug 2021 08:48:02 +0200
-Subject: [PATCH 26/27] lua-lzlib: backport package
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/libs/lua-lzlib/Makefile               | 64 +++++++++++++++++++
- .../patches/001-allow_optim_flags.patch       | 12 ++++
- 2 files changed, 76 insertions(+)
- create mode 100644 package/libs/lua-lzlib/Makefile
- create mode 100644 package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
-
-diff --git a/package/libs/lua-lzlib/Makefile b/package/libs/lua-lzlib/Makefile
-new file mode 100644
-index 0000000000..5e0a16b135
---- /dev/null
-+++ b/package/libs/lua-lzlib/Makefile
-@@ -0,0 +1,64 @@
-+#
-+# Copyright (C) 2015 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=lua-lzlib
-+PKG_VERSION:=0.4.3
-+PKG_RELEASE:=1
-+PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
-+PKG_LICENSE:=MIT
-+
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-+PKG_MIRROR_HASH:=b6ef5e3f04b7f2137b39931a175ee802489a2486e70537770919bcccca10e723
-+PKG_SOURCE_URL:=https://github.com/LuaDist/lzlib.git
-+PKG_SOURCE_PROTO:=git
-+PKG_SOURCE_VERSION:=79329a07d8f79c19eadd7ea2752b4c4e1574b015
-+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-+
-+HOST_BUILD_DEPENDS:=lua/host
-+
-+include $(INCLUDE_DIR)/package.mk
-+include $(INCLUDE_DIR)/host-build.mk
-+
-+define Package/lua-lzlib
-+  SUBMENU:=Lua
-+  SECTION:=lang
-+  CATEGORY:=Languages
-+  TITLE:=Lua zlib binding
-+  URL:=http://github.com/LuaDist/lzlib
-+  DEPENDS:= +lua +zlib
-+endef
-+
-+define Package/lua-lzlib/description
-+	A library to access zlib library functions and also to read/write gzip files using an interface similar to the base io package. 
-+endef
-+
-+MAKE_FLAGS += \
-+	LUA="$(STAGING_DIR)/usr" \
-+	OFLAGS="$(TARGET_CFLAGS)" \
-+
-+HOST_MAKE_FLAGS += \
-+	LUA="$(STAGING_DIR_HOSTPKG)" \
-+	OFLAGS="$(HOST_CFLAGS)" \
-+
-+define Package/lua-lzlib/install
-+	$(INSTALL_DIR) $(1)/usr/lib/lua
-+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/zlib.so $(1)/usr/lib/lua/
-+
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/gzip.lua $(1)/usr/lib/lua/
-+endef
-+
-+define Host/Install
-+	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
-+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/zlib.so $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
-+
-+	$(INSTALL_DATA) $(HOST_BUILD_DIR)/gzip.lua $(STAGING_DIR_HOSTPKG)/lib/lua/5.1
-+endef
-+
-+$(eval $(call BuildPackage,lua-lzlib))
-+$(eval $(call HostBuild))
-diff --git a/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch b/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
-new file mode 100644
-index 0000000000..78f981d237
---- /dev/null
-+++ b/package/libs/lua-lzlib/patches/001-allow_optim_flags.patch
-@@ -0,0 +1,12 @@
-+--- a/Makefile
-++++ b/Makefile
-+@@ -14,7 +14,8 @@ LUABIN= $(LUA)/bin
-+ ZLIB=../zlib-1.2.3
-+ 
-+ # no need to change anything below here
-+-CFLAGS= $(INCS) $(DEFS) $(WARN) -O0 -fPIC
-++CFLAGS= $(INCS) $(DEFS) $(WARN) $(OFLAGS) -fPIC
-++OFLAGS= -O0
-+ WARN= -g -Werror -Wall -pedantic #-ansi
-+ INCS= -I$(LUAINC) -I$(ZLIB)
-+ LIBS= -L$(ZLIB) -lz -L$(LUALIB) -L$(LUABIN) #-llua51
--- 
-2.25.1
-

backports/0027-lua-make-it-easier-to-detect-host-built-Lua.patch

@@ -1,35 +0,0 @@
-From 5fc717aa60b36934892d6d77c0637fc53aa7f761 Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel@makrotopia.org>
-Date: Sat, 10 Jul 2021 20:21:26 +0100
-Subject: [PATCH 27/27] lua: make it easier to detect host-built Lua
-
-Install pkg-config file also for host-build, clean up Lua symlinks.
-
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-(cherry picked from commit 315f52e0f3bfa3d65ad14ca21a696c6d31c4edcd)
----
- package/utils/lua/Makefile | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
-index d262d1e1fc..e15142d8d2 100644
---- a/package/utils/lua/Makefile
-+++ b/package/utils/lua/Makefile
-@@ -134,8 +134,12 @@ define Host/Install
- 		INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \
- 		install
- 
--	$(LN) $(STAGING_DIR_HOSTPKG)/bin/lua5.1 $(STAGING_DIR_HOSTPKG)/bin/lua
--	$(LN) $(STAGING_DIR_HOSTPKG)/bin/luac5.1 $(STAGING_DIR_HOSTPKG)/bin/luac
-+	$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib/pkgconfig
-+	$(CP) $(HOST_BUILD_DIR)/etc/lua.pc $(STAGING_DIR_HOSTPKG)/lib/pkgconfig/lua5.1.pc
-+
-+	$(LN) lua5.1 $(STAGING_DIR_HOSTPKG)/bin/lua
-+	$(LN) luac5.1 $(STAGING_DIR_HOSTPKG)/bin/luac
-+	$(LN) lua5.1.pc $(STAGING_DIR_HOSTPKG)/lib/pkgconfig/lua.pc
- endef
- 
- define Build/InstallDev
--- 
-2.25.1
-

backports/0028-mt76-update-to-latest-HEAD.patch

@@ -1,247 +0,0 @@
-From 99b9f524e94b98ce8fd3e141bf7e07bfa96bbea0 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Tue, 14 Sep 2021 09:19:08 +0200
-Subject: [PATCH] mt76: update to latest HEAD
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/kernel/mt76/Makefile                  |   7 +-
- ...the-dst-buffer-to-of_get_mac_address.patch | 206 ++++++++++++++++++
- 2 files changed, 210 insertions(+), 3 deletions(-)
- create mode 100644 package/kernel/mt76/patches/001-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
-
-diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index e4051d8347..431c57a240 100644
---- a/package/kernel/mt76/Makefile
-+++ b/package/kernel/mt76/Makefile
-@@ -8,11 +8,12 @@ PKG_LICENSE_FILES:=
- 
- PKG_SOURCE_URL:=https://github.com/openwrt/mt76
- PKG_SOURCE_PROTO:=git
--PKG_SOURCE_DATE:=2021-06-06
--PKG_SOURCE_VERSION:=22b690334c0f49b11534cc2e331c9d5e17c4a0bc
--PKG_MIRROR_HASH:=ff5e563935919d2e40c1e7254ef3bc06f7ecc5e69f8ddd12903e8f5de942d630
-+PKG_SOURCE_DATE:=2021-07-15
-+PKG_SOURCE_VERSION:=bbebea7d6dc64313132226adc3f7369d36e9359d
-+PKG_MIRROR_HASH:=17cd74e72c1f6c8742b698bf6772afacc6fba71b233af8c4d59530600cf44d5b
- 
- PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-+PKG_USE_NINJA:=0
- PKG_BUILD_PARALLEL:=1
- 
- PKG_CONFIG_DEPENDS += \
-diff --git a/package/kernel/mt76/patches/001-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/package/kernel/mt76/patches/001-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
-new file mode 100644
-index 0000000000..66075f2771
---- /dev/null
-+++ b/package/kernel/mt76/patches/001-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
-@@ -0,0 +1,206 @@
-+From 83216e3988cd196183542937c9bd58b279f946af Mon Sep 17 00:00:00 2001
-+From: Michael Walle <michael@walle.cc>
-+Date: Mon, 12 Apr 2021 19:47:17 +0200
-+Subject: of: net: pass the dst buffer to of_get_mac_address()
-+
-+of_get_mac_address() returns a "const void*" pointer to a MAC address.
-+Lately, support to fetch the MAC address by an NVMEM provider was added.
-+But this will only work with platform devices. It will not work with
-+PCI devices (e.g. of an integrated root complex) and esp. not with DSA
-+ports.
-+
-+There is an of_* variant of the nvmem binding which works without
-+devices. The returned data of a nvmem_cell_read() has to be freed after
-+use. On the other hand the return of_get_mac_address() points to some
-+static data without a lifetime. The trick for now, was to allocate a
-+device resource managed buffer which is then returned. This will only
-+work if we have an actual device.
-+
-+Change it, so that the caller of of_get_mac_address() has to supply a
-+buffer where the MAC address is written to. Unfortunately, this will
-+touch all drivers which use the of_get_mac_address().
-+
-+Usually the code looks like:
-+
-+  const char *addr;
-+  addr = of_get_mac_address(np);
-+  if (!IS_ERR(addr))
-+    ether_addr_copy(ndev->dev_addr, addr);
-+
-+This can then be simply rewritten as:
-+
-+  of_get_mac_address(np, ndev->dev_addr);
-+
-+Sometimes is_valid_ether_addr() is used to test the MAC address.
-+of_get_mac_address() already makes sure, it just returns a valid MAC
-+address. Thus we can just test its return code. But we have to be
-+careful if there are still other sources for the MAC address before the
-+of_get_mac_address(). In this case we have to keep the
-+is_valid_ether_addr() call.
-+
-+The following coccinelle patch was used to convert common cases to the
-+new style. Afterwards, I've manually gone over the drivers and fixed the
-+return code variable: either used a new one or if one was already
-+available use that. Mansour Moufid, thanks for that coccinelle patch!
-+
-+<spml>
-+@a@
-+identifier x;
-+expression y, z;
-+@@
-+- x = of_get_mac_address(y);
-++ x = of_get_mac_address(y, z);
-+  <...
-+- ether_addr_copy(z, x);
-+  ...>
-+
-+@@
-+identifier a.x;
-+@@
-+- if (<+... x ...+>) {}
-+
-+@@
-+identifier a.x;
-+@@
-+  if (<+... x ...+>) {
-+      ...
-+  }
-+- else {}
-+
-+@@
-+identifier a.x;
-+expression e;
-+@@
-+- if (<+... x ...+>@e)
-+-     {}
-+- else
-++ if (!(e))
-+      {...}
-+
-+@@
-+expression x, y, z;
-+@@
-+- x = of_get_mac_address(y, z);
-++ of_get_mac_address(y, z);
-+  ... when != x
-+</spml>
-+
-+All drivers, except drivers/net/ethernet/aeroflex/greth.c, were
-+compile-time tested.
-+
-+Suggested-by: Andrew Lunn <andrew@lunn.ch>
-+Signed-off-by: Michael Walle <michael@walle.cc>
-+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+---
-+ arch/arm/mach-mvebu/kirkwood.c                     |  3 +-
-+ arch/powerpc/sysdev/tsi108_dev.c                   |  5 +-
-+ drivers/net/ethernet/aeroflex/greth.c              |  6 +--
-+ drivers/net/ethernet/allwinner/sun4i-emac.c        | 10 ++--
-+ drivers/net/ethernet/altera/altera_tse_main.c      |  7 +--
-+ drivers/net/ethernet/arc/emac_main.c               |  8 +--
-+ drivers/net/ethernet/atheros/ag71xx.c              |  7 +--
-+ drivers/net/ethernet/broadcom/bcm4908_enet.c       |  7 +--
-+ drivers/net/ethernet/broadcom/bcmsysport.c         |  7 +--
-+ drivers/net/ethernet/broadcom/bgmac-bcma.c         | 10 ++--
-+ drivers/net/ethernet/broadcom/bgmac-platform.c     | 11 ++--
-+ drivers/net/ethernet/cadence/macb_main.c           | 11 ++--
-+ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c   |  8 +--
-+ drivers/net/ethernet/cavium/thunder/thunder_bgx.c  |  5 +-
-+ drivers/net/ethernet/davicom/dm9000.c              | 10 ++--
-+ drivers/net/ethernet/ethoc.c                       |  6 +--
-+ drivers/net/ethernet/ezchip/nps_enet.c             |  7 +--
-+ drivers/net/ethernet/freescale/fec_main.c          |  7 +--
-+ drivers/net/ethernet/freescale/fec_mpc52xx.c       |  7 +--
-+ drivers/net/ethernet/freescale/fman/mac.c          |  9 ++--
-+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c  |  5 +-
-+ drivers/net/ethernet/freescale/gianfar.c           |  8 +--
-+ drivers/net/ethernet/freescale/ucc_geth.c          |  5 +-
-+ drivers/net/ethernet/hisilicon/hisi_femac.c        |  7 +--
-+ drivers/net/ethernet/hisilicon/hix5hd2_gmac.c      |  7 +--
-+ drivers/net/ethernet/lantiq_xrx200.c               |  7 +--
-+ drivers/net/ethernet/marvell/mv643xx_eth.c         |  5 +-
-+ drivers/net/ethernet/marvell/mvneta.c              |  6 +--
-+ .../net/ethernet/marvell/prestera/prestera_main.c  | 11 ++--
-+ drivers/net/ethernet/marvell/pxa168_eth.c          |  9 +---
-+ drivers/net/ethernet/marvell/sky2.c                |  8 ++-
-+ drivers/net/ethernet/mediatek/mtk_eth_soc.c        | 11 ++--
-+ drivers/net/ethernet/micrel/ks8851_common.c        |  7 ++-
-+ drivers/net/ethernet/microchip/lan743x_main.c      |  5 +-
-+ drivers/net/ethernet/nxp/lpc_eth.c                 |  4 +-
-+ drivers/net/ethernet/qualcomm/qca_spi.c            | 10 ++--
-+ drivers/net/ethernet/qualcomm/qca_uart.c           |  9 +---
-+ drivers/net/ethernet/renesas/ravb_main.c           | 12 +++--
-+ drivers/net/ethernet/renesas/sh_eth.c              |  5 +-
-+ .../net/ethernet/samsung/sxgbe/sxgbe_platform.c    | 13 ++---
-+ drivers/net/ethernet/socionext/sni_ave.c           | 10 ++--
-+ .../net/ethernet/stmicro/stmmac/dwmac-anarion.c    |  2 +-
-+ .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c    |  2 +-
-+ .../net/ethernet/stmicro/stmmac/dwmac-generic.c    |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c    |  2 +-
-+ .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c |  2 +-
-+ .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c    |  2 +-
-+ .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c    |  2 +-
-+ .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c   |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c  |  2 +-
-+ .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c    |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c  |  2 +-
-+ .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c    |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c     |  2 +-
-+ .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c    |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c    |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c  |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c  |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c  |  2 +-
-+ .../net/ethernet/stmicro/stmmac/dwmac-visconti.c   |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/stmmac.h       |  2 +-
-+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  2 +-
-+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c  | 14 ++---
-+ .../net/ethernet/stmicro/stmmac/stmmac_platform.h  |  2 +-
-+ drivers/net/ethernet/ti/am65-cpsw-nuss.c           | 19 ++++---
-+ drivers/net/ethernet/ti/cpsw.c                     |  7 +--
-+ drivers/net/ethernet/ti/cpsw_new.c                 |  7 +--
-+ drivers/net/ethernet/ti/davinci_emac.c             |  8 +--
-+ drivers/net/ethernet/ti/netcp_core.c               |  7 +--
-+ drivers/net/ethernet/wiznet/w5100-spi.c            |  8 ++-
-+ drivers/net/ethernet/wiznet/w5100.c                |  2 +-
-+ drivers/net/ethernet/xilinx/ll_temac_main.c        |  8 +--
-+ drivers/net/ethernet/xilinx/xilinx_axienet_main.c  | 15 +++---
-+ drivers/net/ethernet/xilinx/xilinx_emaclite.c      |  8 +--
-+ drivers/net/wireless/ath/ath9k/init.c              |  5 +-
-+ drivers/net/wireless/mediatek/mt76/eeprom.c        |  9 +---
-+ drivers/net/wireless/ralink/rt2x00/rt2x00dev.c     |  6 +--
-+ drivers/of/of_net.c                                | 60 ++++++++++------------
-+ drivers/staging/octeon/ethernet.c                  | 10 ++--
-+ drivers/staging/wfx/main.c                         |  7 ++-
-+ include/linux/of_net.h                             |  6 +--
-+ include/net/dsa.h                                  |  2 +-
-+ net/dsa/dsa2.c                                     |  2 +-
-+ net/dsa/slave.c                                    |  2 +-
-+ net/ethernet/eth.c                                 | 11 ++--
-+ 85 files changed, 218 insertions(+), 364 deletions(-)
-+
-+diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
-+index 665b54c5c8ae5..6d895738222ad 100644
-+--- a/eeprom.c
-++++ b/eeprom.c
-+@@ -91,15 +91,9 @@ void
-+ {
-+ 	struct mt76_dev *dev = phy->dev;
-+ 
-+-#ifdef CONFIG_OF
-+ 	struct device_node *np = dev->dev->of_node;
-+-	const u8 *mac = NULL;
-+ 
-+-	if (np)
-+-		mac = of_get_mac_address(np);
-+-	if (!IS_ERR_OR_NULL(mac))
-+-		ether_addr_copy(phy->macaddr, mac);
-+-#endif
-++	of_get_mac_address(np, phy->macaddr);
-+ 
-+ 	if (!is_valid_ether_addr(phy->macaddr)) {
-+ 		eth_random_addr(phy->macaddr);
-+-- 
-+cgit 1.2.3-1.el7
-+
--- 
-2.25.1
-

backports/0030-iproute2-m_xt.so-depends-on-dynsyms.list.patch

@@ -1,47 +0,0 @@
-From 4b2e6bb352b400e244646a7bc59bc5ca3ca6f5df Mon Sep 17 00:00:00 2001
-From: Roman Yeryomin <roman@advem.lv>
-Date: Fri, 3 Sep 2021 17:31:11 +0300
-Subject: [PATCH 32/32] iproute2: m_xt.so depends on dynsyms.list
-
-When doing parallel build on a fast machine with bottleneck in i/o,
-m_xt.so may start linking faster than dynsyms.list gets populated,
-resulting in error:
-
-ld:dynsyms.list:0: syntax error in dynamic list
-
-Fix this by adding dynsyms.list as make dependency to m_xt.so
-Described also here:
-https://bugs.openwrt.org/index.php?do=details&task_id=3353
-
-Change from v1:
-- add dynsysms.list dependancy only when shared libs are enabled
-
-Signed-off-by: Roman Yeryomin <roman@advem.lv>
-Fixes: FS#3353
----
- .../utils/iproute2/patches/175-reduce-dynamic-syms.patch       | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
-index da961a183b..c3892e5a0e 100644
---- a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
-+++ b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch
-@@ -26,13 +26,14 @@
-  
-  q_atm.so: q_atm.c
-  	$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
--@@ -205,4 +206,15 @@ static-syms.h: $(wildcard *.c)
-+@@ -205,4 +206,16 @@ static-syms.h: $(wildcard *.c)
-  		sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
-  	done > $@
-  
- +else
- +
- +tc: dynsyms.list
-++m_xt.so: dynsyms.list
- +dynsyms.list: $(wildcard *.c)
- +	files="$(filter-out $(patsubst %.so,%.c,$(TCSO)), $^)" ; \
- +	echo "{" > $@ ; \
--- 
-2.25.1
-

backports/0031-ubus-update-to-the-latest-version.patch

@@ -1,35 +0,0 @@
-From d4e24006e05474b6dbe582f7c56a505cc0c45e81 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 1 Nov 2021 11:59:41 +0100
-Subject: [PATCH] ubus: update to the latest version
-
-b743a331421d ubusd: log ACL init errors
-2099bb3ad997 libubus: use list_empty/list_first_entry in ubus_process_pending_msg
-ef038488edc3 libubus: process pending messages in data handler if stack depth is 0
-a72457b61df0 libubus: increase stack depth for processing obj msgs
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- package/system/ubus/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
-index 8a3fd1de7b..d5f86b6850 100644
---- a/package/system/ubus/Makefile
-+++ b/package/system/ubus/Makefile
-@@ -5,9 +5,9 @@ PKG_RELEASE:=2
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git
--PKG_SOURCE_DATE:=2021-06-30
--PKG_SOURCE_VERSION:=4fc532c8a55ba8217ad67d7fd47c5eb9a8aba044
--PKG_MIRROR_HASH:=a5c8205f2e2b2f1f9ad687592e66a6e2bf8900dc54cfe3ceefe6c297d18971a8
-+PKG_SOURCE_DATE:=2021-08-09
-+PKG_SOURCE_VERSION:=a72457b61df045d3c499a6211362b751710590d7
-+PKG_MIRROR_HASH:=ac617577bcb2ff3dbc3039ad67200afcce910840223a2de15977d3224e6557fd
- PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
- CMAKE_INSTALL:=1
- 
--- 
-2.25.1
-

backports/0032-rpcd-bump-to-git-HEAD.patch

@@ -1,34 +0,0 @@
-From 49ceb8a8d7009e5c81599c68b8aacc16d17d2e62 Mon Sep 17 00:00:00 2001
-From: Stijn Tintel <stijn@linux-ipv6.be>
-Date: Tue, 9 Nov 2021 17:20:41 +0100
-Subject: [PATCH] rpcd: bump to git HEAD
-
- 20bf958 session: use uloop_timeout_remaining64
- d11ffe9 session: use blobmsg_get_u64 for RPC_DUMP_EXPIRES
-
-Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
----
- package/system/rpcd/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile
-index 0896a7dada..af788dcfaa 100644
---- a/package/system/rpcd/Makefile
-+++ b/package/system/rpcd/Makefile
-@@ -12,10 +12,10 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git
--PKG_SOURCE_DATE:=2021-03-11
--PKG_SOURCE_VERSION:=ccb75178cf6a726896729c6904bd623636aa0b29
-+PKG_MIRROR_HASH:=98071b4a1ce983a0e738d7e4a2f6e52b7f6db19f99510ddef430093314134ca4
-+PKG_SOURCE_DATE:=2021-11-04
-+PKG_SOURCE_VERSION:=d11ffe9383ae0ec34836421926364b24c1d891ca
- PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
--PKG_MIRROR_HASH:=87b1839275c209f9767057d6da5272cae973a064767fa28f380a37fb65e2e643
- 
- PKG_LICENSE:=ISC
- PKG_LICENSE_FILES:=
--- 
-2.25.1
-

backports/0050-bpf-headers-add-a-package-with-kernel-headers-for-eb.patch

@@ -1,221 +0,0 @@
-From 3937223beab0c3e4284fd916c0c3b6548c287e03 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 26 Oct 2021 20:41:22 +0200
-Subject: [PATCH 050/102] bpf-headers: add a package with kernel headers for
- ebpf
-
-In order to genererate suitable kernel headers, a 5.10 kernel tree is
-prepared with a default config for mips. The arch is forced to mips in
-order to avoid issues with inline asm on various architectures in a way
-that doesn't involve relying on the host toolchain/headers.
-It also has the advantage of supporting both endian types
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/bpf.mk                                | 65 ++++++++++++
- package/kernel/bpf-headers/Makefile           | 99 +++++++++++++++++++
- .../src/include/generated/bounds.h            | 14 +++
- 3 files changed, 178 insertions(+)
- create mode 100644 include/bpf.mk
- create mode 100644 package/kernel/bpf-headers/Makefile
- create mode 100644 package/kernel/bpf-headers/src/include/generated/bounds.h
-
-diff --git a/include/bpf.mk b/include/bpf.mk
-new file mode 100644
-index 0000000000..3dc65c7685
---- /dev/null
-+++ b/include/bpf.mk
-@@ -0,0 +1,65 @@
-+ifneq ($(CONFIG_BPF_TOOLCHAIN_HOST),)
-+  BPF_TOOLCHAIN_HOST_PATH:=$(call qstrip,$(CONFIG_BPF_TOOLCHAIN_HOST_PATH))
-+  ifneq ($(BPF_TOOLCHAIN_HOST_PATH),)
-+    BPF_PATH:=$(BPF_TOOLCHAIN_HOST_PATH)/bin:$(PATH)
-+  else
-+    BPF_PATH:=$(BPF_PATH)
-+  endif
-+  CLANG:=$(firstword $(shell PATH='$(BPF_PATH)' which clang clang-13 clang-12 clang-11))
-+  LLVM_VER:=$(subst clang,,$(notdir $(CLANG)))
-+else
-+  CLANG:=$(STAGING_DIR_HOST)/bin/clang
-+  LLVM_VER:=
-+endif
-+
-+LLVM_PATH:=$(dir $(CLANG))
-+LLVM_LLC:=$(LLVM_PATH)/llc$(LLVM_VER)
-+LLVM_DIS:=$(LLVM_PATH)/llvm-dis$(LLVM_VER)
-+LLVM_OPT:=$(LLVM_PATH)/opt$(LLVM_VER)
-+LLVM_STRIP:=$(LLVM_PATH)/llvm-strip$(LLVM_VER)
-+
-+BPF_KARCH:=mips
-+BPF_ARCH:=mips$(if $(CONFIG_BIG_ENDIAN),,el)
-+
-+BPF_HEADERS_DIR:=$(STAGING_DIR)/bpf-headers
-+
-+BPF_KERNEL_INCLUDE := \
-+	-nostdinc -isystem $(TOOLCHAIN_DIR)/include \
-+	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include \
-+	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/asm/mach-generic \
-+	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/generated \
-+	-I$(BPF_HEADERS_DIR)/include \
-+	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/uapi \
-+	-I$(BPF_HEADERS_DIR)/arch/$(BPF_KARCH)/include/generated/uapi \
-+	-I$(BPF_HEADERS_DIR)/include/uapi \
-+	-I$(BPF_HEADERS_DIR)/include/generated/uapi \
-+	-I$(BPF_HEADERS_DIR)/tools/lib \
-+	-I$(BPF_HEADERS_DIR)/tools/testing/selftests \
-+	-I$(BPF_HEADERS_DIR)/samples/bpf \
-+	-include linux/kconfig.h -include asm_goto_workaround.h
-+
-+BPF_CFLAGS := \
-+	$(BPF_KERNEL_INCLUDE) -I$(PKG_BUILD_DIR) \
-+	-D__KERNEL__ -D__BPF_TRACING__ \
-+	-D__TARGET_ARCH_${BPF_KARCH} \
-+	-m$(if $(CONFIG_BIG_ENDIAN),big,little)-endian \
-+	-fno-stack-protector -Wall \
-+	-Wno-unused-value -Wno-pointer-sign \
-+	-Wno-compare-distinct-pointer-types \
-+	-Wno-gnu-variable-sized-type-not-at-end \
-+	-Wno-address-of-packed-member -Wno-tautological-compare \
-+	-Wno-unknown-warning-option \
-+	-fno-asynchronous-unwind-tables \
-+	-Wno-uninitialized -Wno-unused-variable \
-+	-Wno-unused-label \
-+	-O2 -emit-llvm -Xclang -disable-llvm-passes
-+
-+define CompileBPF
-+	$(CLANG) -g -target $(BPF_ARCH)-linux-gnu $(BPF_CFLAGS) $(2) \
-+		-c $(1) -o $(patsubst %.c,%.bc,$(1))
-+	$(LLVM_OPT) -O2 -mtriple=bpf-pc-linux < $(patsubst %.c,%.bc,$(1)) > $(patsubst %.c,%.opt,$(1))
-+	$(LLVM_DIS) < $(patsubst %.c,%.opt,$(1)) > $(patsubst %.c,%.S,$(1))
-+	$(LLVM_LLC) -march=bpf -filetype=obj -o $(patsubst %.c,%.o,$(1)) < $(patsubst %.c,%.S,$(1))
-+	$(LLVM_STRIP) --strip-debug $(patsubst %.c,%.o,$(1))
-+endef
-+
-diff --git a/package/kernel/bpf-headers/Makefile b/package/kernel/bpf-headers/Makefile
-new file mode 100644
-index 0000000000..5f5b89370d
---- /dev/null
-+++ b/package/kernel/bpf-headers/Makefile
-@@ -0,0 +1,99 @@
-+#
-+# Copyright (C) 2006-2009 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+include $(TOPDIR)/rules.mk
-+
-+override QUILT:=
-+override HOST_QUILT:=
-+
-+include $(INCLUDE_DIR)/kernel.mk
-+
-+
-+PKG_NAME:=linux
-+PKG_PATCHVER:=5.10
-+PKG_VERSION:=$(PKG_PATCHVER)$(strip $(LINUX_VERSION-$(PKG_PATCHVER)))
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-+PKG_SOURCE_URL:=$(LINUX_SITE)
-+PKG_HASH:=$(LINUX_KERNEL_HASH-$(strip $(PKG_VERSION)))
-+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/bpf-headers/$(PKG_NAME)-$(PKG_VERSION)
-+
-+GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(PKG_PATCHVER)),-$(PKG_PATCHVER))
-+GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(PKG_PATCHVER)),-$(PKG_PATCHVER))
-+GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(PKG_PATCHVER)),-$(PKG_PATCHVER))
-+GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(PKG_PATCHVER)),"$(dir)")
-+PATCH_DIR := $(CURDIR)/patches
-+FILES_DIR :=
-+
-+REAL_LINUX_DIR := $(LINUX_DIR)
-+LINUX_DIR := $(PKG_BUILD_DIR)
-+
-+include $(INCLUDE_DIR)/bpf.mk
-+include $(INCLUDE_DIR)/package.mk
-+
-+define Package/bpf-headers
-+  SECTION:=kernel
-+  CATEGORY:=Kernel
-+  TITLE:=eBPF kernel headers
-+  BUILDONLY:=1
-+  HIDDEN:=1
-+endef
-+
-+export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include
-+
-+KERNEL_MAKE := \
-+	$(MAKE) -C $(PKG_BUILD_DIR) \
-+		ARCH=$(BPF_KARCH) \
-+		CROSS_COMPILE=$(BPF_ARCH)-linux- \
-+		LLVM=1 CC="$(CLANG)" LD="$(TARGET_CROSS)ld" \
-+		HOSTCC="$(HOSTCC)" \
-+		HOSTCXX="$(HOSTCXX)" \
-+		HOST_LOADLIBES="-L$(STAGING_DIR_HOST)/lib" \
-+		KBUILD_HOSTLDLIBS="-L$(STAGING_DIR_HOST)/lib" \
-+		CONFIG_SHELL="$(BASH)" \
-+		INSTALL_HDR_PATH="$(PKG_BUILD_DIR)/user_headers"
-+
-+define Build/Patch
-+	$(Kernel/Patch/Default)
-+endef
-+
-+BPF_DOC = $(PKG_BUILD_DIR)/scripts/bpf_helpers_doc.py
-+
-+define Build/Configure
-+	grep -vE 'CONFIG_(CPU_.*ENDIAN|HZ)' $(PKG_BUILD_DIR)/arch/mips/configs/generic_defconfig > $(PKG_BUILD_DIR)/.config
-+	echo 'CONFIG_CPU_$(if $(CONFIG_BIG_ENDIAN),BIG,LITTLE)_ENDIAN=y' >> $(PKG_BUILD_DIR)/.config
-+	grep CONFIG_HZ $(REAL_LINUX_DIR)/.config >> $(PKG_BUILD_DIR)/.config
-+	yes '' | $(KERNEL_MAKE) oldconfig
-+	grep 'CONFIG_HZ=' $(REAL_LINUX_DIR)/.config | \
-+		cut -d= -f2 | \
-+		bc -q $(LINUX_DIR)/kernel/time/timeconst.bc \
-+		> $(LINUX_DIR)/include/generated/timeconst.h
-+	$(BPF_DOC) --header \
-+		--file $(LINUX_DIR)/tools/include/uapi/linux/bpf.h \
-+		> $(PKG_BUILD_DIR)/tools/lib/bpf/bpf_helper_defs.h
-+endef
-+
-+define Build/Compile
-+	$(KERNEL_MAKE) archprepare headers_install
-+endef
-+
-+define Build/InstallDev
-+	mkdir -p $(1)/bpf-headers/arch $(1)/bpf-headers/tools
-+	$(CP) \
-+		$(PKG_BUILD_DIR)/arch/$(BPF_KARCH) \
-+		$(1)/bpf-headers/arch/
-+	$(CP) \
-+		$(PKG_BUILD_DIR)/tools/lib \
-+		$(PKG_BUILD_DIR)/tools/testing \
-+		$(1)/bpf-headers/tools/
-+	$(CP) \
-+		$(PKG_BUILD_DIR)/include \
-+		$(PKG_BUILD_DIR)/samples \
-+		$(PKG_BUILD_DIR)/scripts \
-+		$(PKG_BUILD_DIR)/user_headers \
-+		$(1)/bpf-headers
-+endef
-+
-+$(eval $(call BuildPackage,bpf-headers))
-diff --git a/package/kernel/bpf-headers/src/include/generated/bounds.h b/package/kernel/bpf-headers/src/include/generated/bounds.h
-new file mode 100644
-index 0000000000..82ff01043c
---- /dev/null
-+++ b/package/kernel/bpf-headers/src/include/generated/bounds.h
-@@ -0,0 +1,14 @@
-+#ifndef __LINUX_BOUNDS_H__
-+#define __LINUX_BOUNDS_H__
-+/*
-+ * DO NOT MODIFY.
-+ *
-+ * This file was generated by Kbuild
-+ */
-+
-+#define NR_PAGEFLAGS 23 /* __NR_PAGEFLAGS */
-+#define MAX_NR_ZONES 4 /* __MAX_NR_ZONES */
-+#define NR_CPUS_BITS 1 /* ilog2(CONFIG_NR_CPUS) */
-+#define SPINLOCK_SIZE 64 /* sizeof(spinlock_t) */
-+
-+#endif
--- 
-2.25.1
-

backports/0051-bpf-headers-unset-PKG_CONFIG_PATH.patch

@@ -1,29 +0,0 @@
-From 32243b2148fd0dacd0630affaea59345c64df79a Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 2 Nov 2021 10:36:14 +0100
-Subject: [PATCH 051/102] bpf-headers: unset PKG_CONFIG_PATH
-
-This fixes an issue where the kernel would pick up an incompatible target
-libyaml for building host tools
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- package/kernel/bpf-headers/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/package/kernel/bpf-headers/Makefile b/package/kernel/bpf-headers/Makefile
-index 5f5b89370d..df24bfa13f 100644
---- a/package/kernel/bpf-headers/Makefile
-+++ b/package/kernel/bpf-headers/Makefile
-@@ -41,6 +41,8 @@ define Package/bpf-headers
-   HIDDEN:=1
- endef
- 
-+PKG_CONFIG_PATH:=
-+
- export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include
- 
- KERNEL_MAKE := \
--- 
-2.25.1
-

backports/0052-tools-llvm-bpf-add-llvm-clang-build-suitable-for-com.patch

@@ -1,99 +0,0 @@
-From 1eb36bc2be4b54e4e4e4ceffc01be78d996205f0 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Sun, 17 Oct 2021 17:50:53 +0200
-Subject: [PATCH 052/102] tools/llvm-bpf: add llvm+clang build suitable for
- compiling code to eBPF
-
-Preparation for building packages that ship eBPF code
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- toolchain/Config.in     |  7 +++++++
- tools/Makefile          |  2 ++
- tools/llvm-bpf/Makefile | 36 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 45 insertions(+)
- create mode 100644 tools/llvm-bpf/Makefile
-
-diff --git a/toolchain/Config.in b/toolchain/Config.in
-index 6dda9af92d..9062d6f65e 100644
---- a/toolchain/Config.in
-+++ b/toolchain/Config.in
-@@ -37,6 +37,13 @@ menuconfig TARGET_OPTIONS
- 
- 		  Most people will answer N.
- 
-+config BUILD_LLVM_BPF
-+	bool "Build LLVM toolchain for eBPF" if DEVEL
-+	help
-+	  If enabled, a LLVM toolchain for building eBPF binaries will be built.
-+	  If this is not enabled, eBPF packages can only be built if the host
-+	  has a suitable toolchain
-+
- 
- menuconfig EXTERNAL_TOOLCHAIN
- 	bool
-diff --git a/tools/Makefile b/tools/Makefile
-index a2665dbc9a..83147014c6 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -35,6 +35,7 @@ tools-$(CONFIG_TARGET_mxs) += elftosb sdimage
- tools-$(CONFIG_TARGET_tegra) += cbootimage cbootimage-configs
- tools-$(CONFIG_USES_MINOR) += kernel2minor
- tools-$(CONFIG_USE_SPARSE) += sparse
-+tools-$(CONFIG_BUILD_LLVM_BPF) += llvm-bpf
- 
- # builddir dependencies
- $(curdir)/autoconf/compile := $(curdir)/m4/compile
-@@ -57,6 +58,7 @@ $(curdir)/libelf/compile := $(curdir)/libtool/compile
- $(curdir)/libressl/compile := $(curdir)/pkgconf/compile
- $(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile
- $(curdir)/lzma-old/compile := $(curdir)/zlib/compile
-+$(curdir)/llvm-bpf/compile := $(curdir)/cmake/compile
- $(curdir)/make-ext4fs/compile := $(curdir)/zlib/compile
- $(curdir)/missing-macros/compile := $(curdir)/autoconf/compile
- $(curdir)/mkimage/compile += $(curdir)/libressl/compile
-diff --git a/tools/llvm-bpf/Makefile b/tools/llvm-bpf/Makefile
-new file mode 100644
-index 0000000000..a5ba2a4cb7
---- /dev/null
-+++ b/tools/llvm-bpf/Makefile
-@@ -0,0 +1,36 @@
-+#
-+# Copyright (C) 2006-2016 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=llvm-project
-+PKG_VERSION:=13.0.0
-+PKG_RELEASE:=1
-+
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.xz
-+PKG_SOURCE_URL:=https://github.com/llvm/llvm-project/releases/download/llvmorg-$(PKG_VERSION)
-+PKG_HASH:=6075ad30f1ac0e15f07c1bf062c1e1268c241d674f11bd32cdf0e040c71f2bf3
-+
-+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION).src
-+
-+HOST_BUILD_PARALLEL:=1
-+
-+CMAKE_BINARY_SUBDIR := build
-+CMAKE_SOURCE_SUBDIR := llvm
-+
-+include $(INCLUDE_DIR)/host-build.mk
-+include $(INCLUDE_DIR)/cmake.mk
-+
-+CMAKE_HOST_OPTIONS += \
-+	-DLLVM_ENABLE_BINDINGS=OFF \
-+	-DLLVM_INCLUDE_DOCS=OFF \
-+	-DLLVM_INCLUDE_EXAMPLES=OFF \
-+	-DLLVM_INCLUDE_TESTS=OFF \
-+	-DLLVM_ENABLE_PROJECTS="clang;lld" \
-+	-DLLVM_TARGETS_TO_BUILD=BPF \
-+	-DCLANG_BUILD_EXAMPLES=OFF
-+
-+$(eval $(call HostBuild))
--- 
-2.25.1
-

backports/0053-llvm-bpf-move-to-staging_dir-host-llvm-bpf.patch

@@ -1,40 +0,0 @@
-From 103a743e7ca4a2e98969d0f60d8aeb6cc7641f67 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 2 Nov 2021 19:38:12 +0100
-Subject: [PATCH 053/102] llvm-bpf: move to staging_dir/host/llvm-bpf
-
-This makes it easier to package it up for the download server
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- tools/llvm-bpf/Makefile | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/tools/llvm-bpf/Makefile b/tools/llvm-bpf/Makefile
-index a5ba2a4cb7..ae279d26d2 100644
---- a/tools/llvm-bpf/Makefile
-+++ b/tools/llvm-bpf/Makefile
-@@ -24,6 +24,8 @@ CMAKE_SOURCE_SUBDIR := llvm
- include $(INCLUDE_DIR)/host-build.mk
- include $(INCLUDE_DIR)/cmake.mk
- 
-+CMAKE_HOST_INSTALL_PREFIX = $(STAGING_DIR_HOST)/llvm-bpf
-+
- CMAKE_HOST_OPTIONS += \
- 	-DLLVM_ENABLE_BINDINGS=OFF \
- 	-DLLVM_INCLUDE_DOCS=OFF \
-@@ -31,6 +33,10 @@ CMAKE_HOST_OPTIONS += \
- 	-DLLVM_INCLUDE_TESTS=OFF \
- 	-DLLVM_ENABLE_PROJECTS="clang;lld" \
- 	-DLLVM_TARGETS_TO_BUILD=BPF \
--	-DCLANG_BUILD_EXAMPLES=OFF
-+	-DCLANG_BUILD_EXAMPLES=OFF \
-+	-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON \
-+	-DLLVM_LINK_LLVM_DYLIB=ON \
-+	-DLLVM_TOOLCHAIN_TOOLS="llvm-objcopy;llvm-objdump;llvm-readelf;llvm-strip;llvm-ar;llvm-as;llvm-dis;llvm-link;llvm-nm;llvm-ranlib;llc;opt" \
-+	-DCMAKE_SKIP_RPATH=OFF
- 
- $(eval $(call HostBuild))
--- 
-2.25.1
-

backports/0054-build-fix-bpf-toolchain-dependency-for-qosify.patch

@@ -1,103 +0,0 @@
-From a368d456ba1e9198fd8f473b7e82c0e066e4eb82 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Mon, 1 Nov 2021 18:40:03 +0100
-Subject: [PATCH 054/102] build: fix bpf toolchain dependency for qosify
-
-Add hidden symbols to fix defaults with CONFIG_DEVEL unset
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/bpf.mk      |  2 ++
- toolchain/Config.in | 45 +++++++++++++++++++++++++++++++++++++++++++++
- tools/Makefile      |  2 +-
- 3 files changed, 48 insertions(+), 1 deletion(-)
-
-diff --git a/include/bpf.mk b/include/bpf.mk
-index 3dc65c7685..5211ec4434 100644
---- a/include/bpf.mk
-+++ b/include/bpf.mk
-@@ -1,3 +1,5 @@
-+BPF_DEPENDS := @HAS_BPF_TOOLCHAIN
-+
- ifneq ($(CONFIG_BPF_TOOLCHAIN_HOST),)
-   BPF_TOOLCHAIN_HOST_PATH:=$(call qstrip,$(CONFIG_BPF_TOOLCHAIN_HOST_PATH))
-   ifneq ($(BPF_TOOLCHAIN_HOST_PATH),)
-diff --git a/toolchain/Config.in b/toolchain/Config.in
-index 9062d6f65e..997cff59e4 100644
---- a/toolchain/Config.in
-+++ b/toolchain/Config.in
-@@ -44,6 +44,32 @@ config BUILD_LLVM_BPF
- 	  If this is not enabled, eBPF packages can only be built if the host
- 	  has a suitable toolchain
- 
-+	choice BPF_TOOLCHAIN
-+		prompt "BPF toolchain" if DEVEL
-+		default BPF_TOOLCHAIN_NONE
-+
-+		config BPF_TOOLCHAIN_NONE
-+			bool "None"
-+
-+		config BPF_TOOLCHAIN_HOST
-+			select USE_LLVM_HOST
-+			bool "Use host LLVM toolchain"
-+
-+		config BPF_TOOLCHAIN_BUILD_LLVM
-+			select USE_LLVM_BUILD
-+			bool "Build LLVM toolchain for eBPF"
-+			help
-+			  If enabled, a LLVM toolchain for building eBPF binaries will be built.
-+			  If this is not enabled, eBPF packages can only be built if the host
-+			  has a suitable toolchain
-+	endchoice
-+
-+	config BPF_TOOLCHAIN_HOST_PATH
-+		string
-+		depends on BPF_TOOLCHAIN_HOST
-+		prompt "Host LLVM toolchain path (prefix)" if DEVEL
-+		default "/usr/local/opt/llvm" if HOST_OS_MACOS
-+		default ""
- 
- menuconfig EXTERNAL_TOOLCHAIN
- 	bool
-@@ -266,6 +292,25 @@ config GDB
- 	help
- 	  Enable if you want to build the gdb.
- 
-+config GDB_PYTHON
-+	bool
-+	depends on GDB
-+	prompt "Build gdb with python binding"
-+	
-+	help
-+	  Enable the python bindings for GDB to allow using python in the gdb shell.
-+
-+config HAS_BPF_TOOLCHAIN
-+	bool
-+
-+config USE_LLVM_HOST
-+	select HAS_BPF_TOOLCHAIN
-+	bool
-+
-+config USE_LLVM_BUILD
-+	select HAS_BPF_TOOLCHAIN
-+	bool
-+
- config USE_GLIBC
- 	default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc)
- 	bool
-diff --git a/tools/Makefile b/tools/Makefile
-index 83147014c6..ae3cc5dfd6 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -35,7 +35,7 @@ tools-$(CONFIG_TARGET_mxs) += elftosb sdimage
- tools-$(CONFIG_TARGET_tegra) += cbootimage cbootimage-configs
- tools-$(CONFIG_USES_MINOR) += kernel2minor
- tools-$(CONFIG_USE_SPARSE) += sparse
--tools-$(CONFIG_BUILD_LLVM_BPF) += llvm-bpf
-+tools-$(CONFIG_USE_LLVM_BUILD) += llvm-bpf
- 
- # builddir dependencies
- $(curdir)/autoconf/compile := $(curdir)/m4/compile
--- 
-2.25.1
-

backports/0055-include-bpf.mk-fix-typo.patch

@@ -1,26 +0,0 @@
-From 2ae5b19a52da190ea342ec4210523407837c58ea Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 2 Nov 2021 09:56:10 +0100
-Subject: [PATCH 055/102] include/bpf.mk: fix typo
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/bpf.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/bpf.mk b/include/bpf.mk
-index 5211ec4434..6223648c5d 100644
---- a/include/bpf.mk
-+++ b/include/bpf.mk
-@@ -5,7 +5,7 @@ ifneq ($(CONFIG_BPF_TOOLCHAIN_HOST),)
-   ifneq ($(BPF_TOOLCHAIN_HOST_PATH),)
-     BPF_PATH:=$(BPF_TOOLCHAIN_HOST_PATH)/bin:$(PATH)
-   else
--    BPF_PATH:=$(BPF_PATH)
-+    BPF_PATH:=$(PATH)
-   endif
-   CLANG:=$(firstword $(shell PATH='$(BPF_PATH)' which clang clang-13 clang-12 clang-11))
-   LLVM_VER:=$(subst clang,,$(notdir $(CLANG)))
--- 
-2.25.1
-

backports/0056-include-bpf.mk-fix-compile-for-big-endian-targets.patch

@@ -1,39 +0,0 @@
-From aff796bf3e60d7f09e5ca500cbf59221211dd218 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 2 Nov 2021 10:39:35 +0100
-Subject: [PATCH 056/102] include/bpf.mk: fix compile for big-endian targets
-
-llvm-opt and llc need endian flags in the target as well
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
- include/bpf.mk | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/include/bpf.mk b/include/bpf.mk
-index 6223648c5d..9636ad5165 100644
---- a/include/bpf.mk
-+++ b/include/bpf.mk
-@@ -22,6 +22,7 @@ LLVM_STRIP:=$(LLVM_PATH)/llvm-strip$(LLVM_VER)
- 
- BPF_KARCH:=mips
- BPF_ARCH:=mips$(if $(CONFIG_BIG_ENDIAN),,el)
-+BPF_TARGET:=bpf$(if $(CONFIG_BIG_ENDIAN),eb,el)
- 
- BPF_HEADERS_DIR:=$(STAGING_DIR)/bpf-headers
- 
-@@ -59,9 +60,9 @@ BPF_CFLAGS := \
- define CompileBPF
- 	$(CLANG) -g -target $(BPF_ARCH)-linux-gnu $(BPF_CFLAGS) $(2) \
- 		-c $(1) -o $(patsubst %.c,%.bc,$(1))
--	$(LLVM_OPT) -O2 -mtriple=bpf-pc-linux < $(patsubst %.c,%.bc,$(1)) > $(patsubst %.c,%.opt,$(1))
-+	$(LLVM_OPT) -O2 -mtriple=$(BPF_TARGET) < $(patsubst %.c,%.bc,$(1)) > $(patsubst %.c,%.opt,$(1))
- 	$(LLVM_DIS) < $(patsubst %.c,%.opt,$(1)) > $(patsubst %.c,%.S,$(1))
--	$(LLVM_LLC) -march=bpf -filetype=obj -o $(patsubst %.c,%.o,$(1)) < $(patsubst %.c,%.S,$(1))
-+	$(LLVM_LLC) -march=$(BPF_TARGET) -filetype=obj -o $(patsubst %.c,%.o,$(1)) < $(patsubst %.c,%.S,$(1))
- 	$(LLVM_STRIP) --strip-debug $(patsubst %.c,%.o,$(1))
- endef
- 
--- 
-2.25.1
-

backports/0057-include-bpf.mk-add-LD_LIBRARY_PATH.patch

@@ -1,34 +0,0 @@
-From d05fae42794c5fe76509935b1e8f900e1d17d9f0 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Fri, 5 Nov 2021 10:46:00 +0100
-Subject: [PATCH] include/bpf.mk: add LD_LIBRARY_PATH
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- include/bpf.mk | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/include/bpf.mk b/include/bpf.mk
-index 9636ad5165..2f797625b6 100644
---- a/include/bpf.mk
-+++ b/include/bpf.mk
-@@ -58,11 +58,16 @@ BPF_CFLAGS := \
- 	-O2 -emit-llvm -Xclang -disable-llvm-passes
- 
- define CompileBPF
-+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(STAGING_DIR_HOST)/lib \
- 	$(CLANG) -g -target $(BPF_ARCH)-linux-gnu $(BPF_CFLAGS) $(2) \
- 		-c $(1) -o $(patsubst %.c,%.bc,$(1))
-+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(STAGING_DIR_HOST)/lib \
- 	$(LLVM_OPT) -O2 -mtriple=$(BPF_TARGET) < $(patsubst %.c,%.bc,$(1)) > $(patsubst %.c,%.opt,$(1))
-+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(STAGING_DIR_HOST)/lib \
- 	$(LLVM_DIS) < $(patsubst %.c,%.opt,$(1)) > $(patsubst %.c,%.S,$(1))
-+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(STAGING_DIR_HOST)/lib \
- 	$(LLVM_LLC) -march=$(BPF_TARGET) -filetype=obj -o $(patsubst %.c,%.o,$(1)) < $(patsubst %.c,%.S,$(1))
-+	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(STAGING_DIR_HOST)/lib \
- 	$(LLVM_STRIP) --strip-debug $(patsubst %.c,%.o,$(1))
- endef
- 
--- 
-2.25.1
-

config.yml

@@ -1,8 +1,7 @@
 repo:  https://github.com/openwrt/openwrt.git
-branch: openwrt-21.02
-revision: 378769b5551714ccaa821b481bfeecbf362f351e
+branch: openwrt-25.12
+revision: 1353227ad391b0008b8365eebd38495e01ed7577 
 output_dir: ./output
 
 patch_folders:
-  - backports/
-  - patches/
+  - patches-25.12

docker/Dockerfile

@@ -5,8 +5,7 @@ RUN apt-get update \
     && apt-get install -y \
             time git-core build-essential gcc-multilib clang \
             libncurses5-dev zlib1g-dev gawk flex gettext wget unzip python \
-            python3 python3-pip python3-yaml libssl-dev rsync llvm llvm-12 \
-            clang-12 \
+            python3 python3-pip python3-yaml libssl-dev rsync \
     && apt-get clean
 RUN git config --global user.email "you@example.com"
 RUN git config --global user.name "Your Name"

feeds/bluetooth/bluetooth-6lowpand/Makefile

@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2016 Nordic Semiconductor ASA.
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bluetooth-6lowpand
-PKG_VERSION:=0.0.1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://github.com/NordicSemiconductor/Linux-ble-6lowpan-joiner.git
-PKG_SOURCE_VERSION:=5ce5b248846a6d4ac4a609eb0e8d023cf920b247
-PKG_SOURCE_PROTO:=git
-
-BLUEZ_DIR:=$(wildcard $(BUILD_DIR)/bluez-*)
-
-TARGET_CFLAGS += -I$(BLUEZ_DIR)
-TARGET_LDFLAGS += -L$(BLUEZ_DIR)/lib/.libs/ -L$(BLUEZ_DIR)/src/.libs/ -lshared-mainloop -lbluetooth-internal
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bluetooth-6lowpand
-  SECTION:=base
-  CATEGORY:=Network
-  TITLE:=Bluetooth LE 6lowpan joiner daemon
-  URL:=http://www.nordicsemi.com/
-  DEPENDS:=+libusb-1.0 +bluez-libs
-endef
-
-define Package/bluetooth-6lowpand/description
-  Bluetooth Low Energy IPSP device scanner and connection daemon. 
-  The Daemon can be used to whitelist certain IPSP Bluetooth LE MAC
-  addresses, or autoconnect using SSID and Key derived from Wifi AP 
-  setup to authenticate the devices in order to connect. Also, manual 
-  configuration of software SSID and Key can be used.
-endef
-
-define Package/bluetooth-6lowpand/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/bluetooth_6lowpand.init $(1)/etc/init.d/bluetooth_6lowpand
-
-	$(INSTALL_DIR) $(1)/etc/bluetooth
-	$(INSTALL_DATA) ./files/bluetooth_6lowpand.conf $(1)/etc/bluetooth
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/bluetooth_6lowpand $(1)/usr/sbin
-endef
-
-$(eval $(call BuildPackage,bluetooth-6lowpand))

feeds/bluetooth/bluetooth-6lowpand/files/bluetooth_6lowpand.init

@@ -1,24 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=63
-PROG=/usr/sbin/bluetooth_6lowpand
-HCICONFIG=/usr/bin/hciconfig
-
-start() {
-	config_load btle
-	config_get enable bluetooth_6lowpand enable 0
-	[ "$enable" -eq 1 ] || return
-	echo "start bluetooth_6lowpand"
-	sleep 1
-	echo 1 > /sys/kernel/debug/bluetooth/6lowpan_enable
-	sleep 1
-	killall bluetoothd
-	sleep 1
-	$HCICONFIG hci0 reset
-	$PROG -w 3 -t 5 -a -d
-}
-
-stop() {
-	echo "stop bluetooth_6lowpand"
-	killall -9 bluetooth_6lowpand
-}

feeds/bluetooth/bluez-ibeacon/Makefile

@@ -1,33 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bluez-ibeacon
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL=https://github.com/blogic/bluez-ibeacon
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2022-10-31
-PKG_SOURCE_VERSION:=07c082bf3e139ce061ff62a42b7876860256f4ea
-
-PKG_MAINTAINER:=John Crispin <john@phrozen.org>
-PKG_LICENSE:=MIT
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bluez-ibeacon
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=bluez-ibeacon
-  DEPENDS:=+bluez-libs
-endef
-
-define Build/Compile
-	$(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/bluez-beacon $(MAKE_FLAGS)
-endef
-
-define Package/bluez-ibeacon/install
-	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bluez-beacon/ibeacon $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/ibeacon $(1)/etc/init.d/ibeacon
-endef
-
-$(eval $(call BuildPackage,bluez-ibeacon))

feeds/bluetooth/bluez-ibeacon/files/ibeacon

@@ -1,25 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=80
-
-USE_PROCD=1
-PROG=/usr/sbin/ibeacon
-
-service_triggers() {
-	procd_add_reload_trigger btle
-}
-
-start_service() {
-	config_load btle
-	config_get enable ibeacon enable 0
-	config_get uuid ibeacon uuid 0
-	config_get major ibeacon major 0
-	config_get minor ibeacon minor 0
-
-	[ "$enable" -eq 1 ] || return
-
-	procd_open_instance
-	procd_set_param command "$PROG" 200 "${uuid}" "${major}" "${minor}" -29
-	procd_set_param respawn
-	procd_close_instance
-}

feeds/bluetooth/ubtled/Makefile

@@ -1,32 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ubtled
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL=https://github.com/blogic/ubtled.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2022-10-31
-PKG_SOURCE_VERSION:=7e01ab86c562fc8ab3777d04e60b8dce596a4c5f
-
-PKG_MAINTAINER:=John Crispin <john@phrozen.org>
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/ubtled
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=OpenWrt BTLE daemon
-  DEPENDS:=+libubox +libubus +bluez-libs
-endef
-
-define Package/ubtled/install
-	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/{config,init.d,uci-defaults}
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ubtled $(1)/usr/sbin/
-	$(INSTALL_BIN) ./files/ubtled.init $(1)/etc/init.d/ubtled
-	$(INSTALL_DATA) ./files/btle.config $(1)/etc/config/btle
-	$(INSTALL_DATA) ./files/99-btle $(1)/etc/uci-defaults/
-endef
-
-$(eval $(call BuildPackage,ubtled))

feeds/bluetooth/ubtled/files/99-btle

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cat >> /etc/bluetooth/main.conf <<EOF
-[General]
-Name = TIP AP
-[GATT]
-[Policy]
-EOF

feeds/bluetooth/ubtled/files/btle.config

@@ -1,11 +0,0 @@
-config ubtled ubtled
-	option enable		0
-
-config bluetooth_6lowpand bluetooth_6lowpand
-	option enable		0
-
-config ubtled ibeacon
-	option enable		0
-	option uuid		0
-	option major		0
-	option minor		0

feeds/bluetooth/ubtled/files/ubtled.init

@@ -1,24 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=80
-
-USE_PROCD=1
-PROG=/usr/sbin/ubtled
-
-service_triggers() {
-	procd_add_reload_trigger btle
-}
-
-start_service() {
-	config_load btle
-	config_get enable ubtled enable 0
-
-	[ "$enable" -eq 1 ] || return
-
-	hciconfig hci0 up
-
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_set_param respawn
-	procd_close_instance
-}

feeds/facebook/fbwifi/Makefile

@@ -1,77 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-# All rights reserved.
-#
-# This source code is licensed under the license found in the
-# LICENSE file in the root directory of this source tree.
-#
-
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fbwifi
-PKG_VERSION:=2
-PKG_RELEASE:=0
-PKG_LICENSE:=GPL-2.0
-
-PKG_MAINTAINER:=Simon Kinane <skinane@fb.com>
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fbwifi
-  SUBMENU:=Captive Portals
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+iptables +luasec +luasocket \
-	+libuci-lua +luaposix \
-	+lua-cjson +uhttpd
-  TITLE:=Facebook Wi-Fi
-  PKGARCH:=all
-endef
-
-define Package/fbwifi/description
-  Facebook Wi-Fi, an AP authorisation solution
-endef
-
-
-define Package/luci-app-fbwifi
-  SUBMENU:=3. Applications
-  SECTION:=luci
-  CATEGORY:=LuCI
-  TITLE:=LuCI support for Facebook Wi-Fi
-  DEPENDS:= \
-	+fbwifi \
-	+luci-base +luci-mod-network +luci-mod-status +luci-theme-bootstrap
-endef
-
-define Package/luci-app-fbwifi/description
-  LuCI support for Facebook Wi-Fi
-endef
-
-
-define Package/fbwifi/conffiles
-/etc/config/fbwifi
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/fbwifi/install
-	$(INSTALL_DIR) $(1)
-	$(CP) ./files/fbwifi/* $(1)/
-endef
-
-define Package/luci-app-fbwifi/install
-	$(INSTALL_DIR) $(1)
-	$(CP) ./files/luci-app-fbwifi/* $(1)
-endef
-
-$(eval $(call BuildPackage,fbwifi))
-$(eval $(call BuildPackage,luci-app-fbwifi))

feeds/facebook/fbwifi/README.md

@@ -1,22 +0,0 @@
-# Facebook Wi-Fi v2.0 Reference Implementation for OpenWrt 
-
-## Getting started
-
-Case studies for OEM customers are available at the official page of [Facebook Wi-Fi](https://www.facebook.com/facebook-wifi).
-
-For OEM engineers, start by reading the init script in [files/etc/init.d/fbwifi](https://github.com/facebookincubator/fbc_owrt_feed/blob/master/fbwifi/files/etc/init.d/fbwifi)
-
-To enable Facebook Wi-Fi, configure the gateway_token in `/etc/config/fbwifi`, and run `fbwifi enable`.
-To disable Facebook Wi-Fi, run `fbwifi disable`.
-
-## Contents
-
-The 'files' subdirectory contains two subdirectories, one for the fbwifi
-package that implements the Facebook Wi-Fi v2.0 standard for OpenWrt, and
-another one containing a LuCI application to configure Facebook Wi-Fi.
-
-The folder structures follow *nix conventions:
-- 'etc' is the boot time scripts and configuration
-- 'usr' contains procedural scripts, lua common code module and GUI prototype for luci
-- 'www' contains the HTTP endpoints as CGI handlers 
-

feeds/facebook/fbwifi/files/fbwifi/etc/config/fbwifi

@@ -1,6 +0,0 @@
-config fbwifi 'main'
-	option enabled '0'
-	option gateway_token 'FBWIFI:GATEWAY|123456789|0123456789|abcdeABCDE123456789'
-	option http_port '2060'
-	option https_port '2061'
-	option zone 'lan'

feeds/facebook/fbwifi/files/fbwifi/etc/hotplug.d/iface/50-fbwifi

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" = ifup ] || exit 0
-
-/etc/init.d/fbwifi enabled || exit 0
-
-ip route get fibmatch 1.1.1.1 | grep -q "$DEVICE" || exit 0
-
-logger -t fbwifi "Reloading fbwifi due to $ACTION of $INTERFACE ($DEVICE)"
-/etc/init.d/fbwifi restart

feeds/facebook/fbwifi/files/fbwifi/etc/init.d/fbwifi

@@ -1,43 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=90
-
-USE_PROCD=1
-
-reload_service() {
-	restart
-}
-
-service_triggers() {
-	procd_add_reload_trigger fbwifi
-}
-
-start_service() {
-
-	config_load fbwifi
-	config_get_bool enabled 'main' 'enabled' '0'
-	[ "$enabled" -eq 0 ] && return
-
-	config_get http_port main http_port
-	[ -z "$http_port" ] && {
-		logger -t fbwifi "required option http_port not set"
-		exit 1
-	}
-
-	config_get https_port main https_port
-	[ -z "$https_port" ] && {
-		logger -t fbwifi "required option https_port not set"
-		exit 1
-	}
-
-	logger "[fbwifi] Enabled; starting"
-
-	mkdir -p /tmp/fbwifi
-
-	/usr/sbin/fbwifi reload
-
-	procd_open_instance
-	procd_set_param command /usr/sbin/fbwifi_validate_token_db
-	procd_set_param respawn 1 300 0
-	procd_close_instance
-}

feeds/facebook/fbwifi/files/fbwifi/usr/lib/lua/fbwifi.lua

@@ -1,156 +0,0 @@
--- SPDX-License-Identifier: GPL-2.0-only
--- Copyright (c) Facebook, Inc. and its affiliates.
---
--- FBWIFI Lua library
--- function table
-local fbwifi = {}
-
-local http = require("ssl.https")
-local json = require("cjson")
-local log = require("posix.syslog")
-local uci = require("uci")
-
-function fbwifi.gateway_token()
-	token = uci.get("fbwifi.main.gateway_token")
-	if token and string.len(token) > 0 then
-		return token
-	else
-		log.syslog( log.LOG_WARNING, "[fbwifi] UCI option fbwifi.main.gateway_token is missing" )
-		return nil
-	end 
-end
-
-function fbwifi.validate_token( token )
-
-	local valid = false
-
-	if string.len(token or '' ) > 0 then
-
-	        GATEWAY_TOKEN = fbwifi.gateway_token()
-
-	        URL="https://api.fbwifi.com/v2.0/token"
-	        BODY="token="..token
-	        body, code, headers = http.request(URL.."?access_token="..GATEWAY_TOKEN, BODY)
-
-	        if code==200 then
-	                valid = true
-	        else
-	                log.syslog(log.LOG_WARNING, "[fbwifi] validate_token:"..body)
-	        end
-
-	end
-
-	return valid
-end
-
-local mac_to_purge=''
-function remove_client_by_mac(client)
-	state = uci.cursor("/var/state", "/tmp/fbwifi")
-
-	for key, value in pairs(client) do
-		if
-			key == 'mac' and
-			value == mac_to_purge
-		then
-			log.syslog(log.LOG_INFO, string.format("[fbwifi] Purging DB entry %s for MAC %s", client['.name'] or 'unknown', mac_to_purge) )
-			state:delete("fbwifi", client['.name'])
-			return
-		end
-	end
-end
-
-function fbwifi.instate_client_rule( token, client_mac )
-
-	log.syslog(log.LOG_INFO, "[fbwifi] Validating client "..client_mac)
-
-	state = uci.cursor("/var/state", "/tmp/fbwifi")
-	state_name = "token_" .. token
-
-	RULE_COND="iptables -w -L FBWIFI_CLIENT_TO_INTERNET -t mangle | grep -i -q \"%s\""
-	RULE_FMT="iptables -w -t mangle -%s FBWIFI_CLIENT_TO_INTERNET -m mac --mac-source \"%s\" -j MARK --set-mark 0xfb"
-	local RULE
-
-	log.syslog(log.LOG_INFO, string.format("[fbwifi] Cleaning DB for MAC %s", client_mac) )
-	mac_to_purge = client_mac
-	state:foreach("fbwifi", "client", remove_client_by_mac)
-	
-		
-	log.syslog(log.LOG_INFO, string.format("[fbwifi] Adding DB entry %s for MAC %s", state_name, client_mac) )
-	state:set("fbwifi", state_name, "client")
-	state:set("fbwifi", state_name, "token", token)
-	state:set("fbwifi", state_name, "mac", client_mac)
-	state:set("fbwifi", state_name, "authenticated", "true")
-				
-	-- verify a rule exists for the given client MAC, 
-	--   OR install it
-	RULE=string.format(RULE_COND.." || "..RULE_FMT, client_mac, "A", client_mac)
-
-	log.syslog(log.LOG_INFO, string.format( "[fbwifi] Opening iptables for %s", client_mac ) )
-	res = os.execute(RULE)
-	if res ~= 0 then 
-		log.syslog(log.LOG_WARNING, string.format( "[fbwifi] Failed to update iptables (%s)", res ) )
-	end
-	log.syslog(log.LOG_INFO, "[fbwifi] "..RULE)
-
-	state:save('fbwifi')
-	state:commit('fbwifi')
-end
-
-function fbwifi.revoke_client_rule( token )
-        
-        if (token == nil) then
-                log.syslog(log.LOG_INFO, "[fbwifi] Invalidating token, but token is Nil")
-                return
-        end
-
-	log.syslog(log.LOG_INFO, string.format( "[fbwifi] Invalidating token (%s)", token) )
-
-	state = uci.cursor("/var/state", "/tmp/fbwifi")
-	state_name = "token_" .. token
-	
-	client_mac = state:get("fbwifi", state_name, "mac")
-
-	if client_mac then
-		RULE_COND="iptables -w -L FBWIFI_CLIENT_TO_INTERNET -t mangle | grep -i -q \"%s\""
-		RULE_FMT="iptables -w -t mangle -%s FBWIFI_CLIENT_TO_INTERNET -m mac --mac-source \"%s\" -j MARK --set-mark 0xfb"
-
-		-- verify a rule exists for the given client MAC, 
-		--  AND delete it
-		RULE=string.format(RULE_COND.." && "..RULE_FMT, client_mac, "D", client_mac)
-
-		res = os.execute(RULE)
-		if res ~= 0 then 
-			log.syslog(log.LOG_WARNING, string.format( "[fbwifi] Failed to update iptables (%s)", res ) )
-		end
-		log.syslog(log.LOG_INFO, "[fbwifi] "..RULE)
-
-		state:delete("fbwifi", state_name)
-		state:save('fbwifi')
-		state:commit('fbwifi')
-	else
-		log.syslog(log.LOG_WARNING, string.format( "[fbwifi] Client MAC not found in DB (%s)", state_name ) )
-	end
-end
-
-function fbwifi.reset()
-
-	local success = false
-        GATEWAY_TOKEN = fbwifi.gateway_token()
-        URL="https://api.fbwifi.com/v2.0/gateway/reset"
-	BODY="{}"
-        body, code, headers = http.request(URL.."?access_token="..GATEWAY_TOKEN, BODY)
-
-        if code==200 then
-                log.syslog(log.LOG_INFO, "[fbwifi] Reset committed")
-                success = true
-        else
-                log.syslog(log.LOG_WARNING, "[fbwifi] Reset failed : "..body)
-        end
-
-	return success
-end
-
---
--- Return the function table to the host script
---
-return fbwifi

feeds/facebook/fbwifi/files/fbwifi/usr/sbin/fbwifi

@@ -1,58 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-disable)
-	uci set fbwifi.main.enabled=0
-
-	uci delete firewall.fbwifi
-
-	uci delete uhttpd.fbwifi_redirect
-
-	uci delete uhttpd.main.json_script
-	uci set uhttpd.main.cert='/etc/uhttpd.crt'
-	uci set uhttpd.main.key='/etc/uhttpd.key'
-	uci set uhttpd.main.rfc1918_filter=1
-	;;
-enable)
-	uci set fbwifi.main.enabled=1
-
-	uci set firewall.fbwifi=include
-	uci set firewall.fbwifi.enabled=1
-	uci set firewall.fbwifi.family=ipv4
-	uci set firewall.fbwifi.path=/usr/share/fbwifi/firewall.include
-	uci set firewall.fbwifi.reload=1
-	uci set firewall.fbwifi.type=script
-
-	uci set uhttpd.fbwifi_redirect=uhttpd
-	uci set uhttpd.fbwifi_redirect.enabled=1
-	uci set uhttpd.fbwifi_redirect.cert='/tmp/fbwifi/https_server_cert'
-	uci set uhttpd.fbwifi_redirect.home='/dev/null'
-	uci set uhttpd.fbwifi_redirect.json_script='/tmp/fbwifi/uhttpd-redirect.json'
-	uci set uhttpd.fbwifi_redirect.key='/tmp/fbwifi/https_server_key'
-	uci set uhttpd.fbwifi_redirect.listen_http='0.0.0.0:2060'
-	uci set uhttpd.fbwifi_redirect.listen_https='0.0.0.0:2061'
-
-	uci set uhttpd.main.cert='/tmp/fbwifi/https_server_cert'
-	uci set uhttpd.main.json_script='/usr/share/fbwifi/uhttpd.json'
-	uci set uhttpd.main.key='/tmp/fbwifi/https_server_key'
-	uci set uhttpd.main.rfc1918_filter=0
-	;;
-reload)
-	/usr/sbin/fbwifi_get_config
-
-	login_url=$(uci -c /var/state get fbwifi.main.captive_portal_url)
-	[ -z "$login_url" ] && {
-		logger -t fbwifi "captive_portal_url not available yet"
-		exit 1
-	}
-	printf '{ "request": [ ["redirect", "%s", 302] ] }' "$login_url" > /tmp/fbwifi/uhttpd-redirect.json
-
-	/etc/init.d/uhttpd restart
-
-	exit 0
-	;;
-esac
-
-uci commit
-/etc/init.d/uhttpd restart
-reload_config

feeds/facebook/fbwifi/files/fbwifi/usr/sbin/fbwifi_debug_dump

@@ -1,8 +0,0 @@
-echo -e "Runtime configuration and token DB\n"
-uci -c /var/state export fbwifi
-
-echo -e "\nDynamic firewall flow rules\n"
-iptables -t mangle -L FBWIFI_CLIENT_TO_INTERNET
-
-echo -e "\nDHCP leases\n"
-cat /tmp/dhcp.leases

feeds/facebook/fbwifi/files/fbwifi/usr/sbin/fbwifi_gateway_info_update

@@ -1,39 +0,0 @@
-#!/usr/bin/lua
-
-http = require("ssl.https")
-json = require("cjson")
-log = require("posix.syslog")
-socket = require("socket")
-require("uci")
-fbwifi = require("fbwifi")
-
-GATEWAY_TOKEN = fbwifi.gateway_token()
-state = uci.cursor("/var/state", "/tmp/fbwifi")
-
-payload="name="..socket.dns.gethostname()
-
-function queue_ssid_update(iface)
-	bssid_file="/sys/class/net/br-"..iface["network"].."/address"
-	local file = io.open(bssid_file)
-        if file then
-            for line in file:lines() do
-		payload=payload.."&bssid[]="..line
-            end
-	    file:close()
-	    payload=payload.."ssid[]="..iface["ssid"]
-        else
-	    log.syslog(log.LOG_WARNING, "[fbwifi] Failed to find BSSID for interface br-"..iface["network"])
-        end
-end
-
-state:foreach("wireless", "wifi-iface", queue_ssid_update)
-
-URL="https://api.fbwifi.com/v2.0/gateway"
-body, code, headers = http.request(URL.."?access_token="..GATEWAY_TOKEN, payload)
-if code == 200 then 
-	log.syslog(log.LOG_INFO, "[fbwifi] gateway information updated "..body)
-	os.exit(0)
-else
-	log.syslog(log.LOG_WARNING, "[fbwifi] gateway API failed "..body)
-	os.exit(code)
-end

feeds/facebook/fbwifi/files/fbwifi/usr/sbin/fbwifi_get_config

@@ -1,111 +0,0 @@
-#!/usr/bin/lua
-http = require("ssl.https")
-json = require("cjson")
-require("uci")
-log = require("posix.syslog")
-fbwifi = require("fbwifi")
-
-GATEWAY_TOKEN = fbwifi.gateway_token()
-
-http_port = uci.get("fbwifi.main.http_port")
-https_port = uci.get("fbwifi.main.https_port")
-
-statefile = assert(io.open("/var/state/fbwifi", "a"), "could not create state file")
-statefile:close()
-
-state = uci.cursor("/var/state", "/tmp/fbwifi")
-
-URL="https://api.fbwifi.com/v2.0/gateway"
-body, code, headers = http.request(URL.."?access_token="..GATEWAY_TOKEN.."&fields=config,config_version")
-
-if code == 200 then
-	log.syslog(log.LOG_INFO, "[fbwifi] Got gateway config ("..code..")")
-else
-	log.syslog(log.LOG_CRIT, "[fbwifi] Failed to get gateway config ("..code..")")
-	os.exit(1)
-end
-
-obj = json.decode(body)
-
-function save_cert(name, value)
-	log.syslog(log.LOG_INFO, "[fbwifi] Saving cert "..name)
-	local f = assert(io.open("/tmp/fbwifi/"..name, "w"))
-	f:write(value)
-	f:close()
-end
-
-function process_redirect(ix, host)
-	IP_SET = "ip addr replace dev lo "..host
-	local result = os.execute(IP_SET)
-	if result == 0 then
-		log.syslog(log.LOG_INFO, "[fbwifi] Redirect address applied "..host)
-	else
-		log.syslog(log.LOG_WARNING, "[fbwifi] Failed to apply redirect address "..host)
-	end
-
-	ip = string.match(host, '([0-9\.]*)/([0-9]*)')
-	RULE_FMT="grep -q \"%s\" /etc/hosts || echo \"%s\tstar.fbwifigateway.net\" >> /etc/hosts"
-	HOSTS_RULE = string.format(RULE_FMT, ip, ip)
-	result = os.execute(HOSTS_RULE)
-	if result == 0 then
-		log.syslog(log.LOG_INFO, "[fbwifi] Cached redirect host for DNS")
-	else
-		log.syslog(log.LOG_WARNING, "[fbwifi] Failed to amend /etc/hosts")
-		log.syslog(log.LOG_INFO, "[fbwifi] "..HOSTS_RULE)
-	end
-
-	result = os.execute("iptables -t nat -A FBWIFI_HOST_REDIRLIST -p tcp --dport 80 -d "..ip.." -j ACCEPT # REDIRECT --to-ports "..http_port)
-	--print(result)
-	result = os.execute("iptables -t nat -A FBWIFI_HOST_REDIRLIST -p tcp --dport 443 -d "..ip.."  -j ACCEPT # REDIRECT --to-ports "..https_port)
-	--print(result)
-end
-
-save_cert("https_server_cert", obj['config']['https_server_cert'])
-save_cert("https_server_key", obj['config']['https_server_key'])
-
-result = os.execute("iptables -t nat -F FBWIFI_HOST_REDIRLIST")
---print(result)
-table.foreach(obj['config']['host_redirect_ips'], process_redirect)
-
-RULE_FORMAT = "iptables -t mangle -A FBWIFI_TRAFFIC_ALLOWLIST -d %s -p %s --dport %s -j MARK --set-mark 0xfb"
-function process_traffic_rule(ix, rule)
-	log.syslog(log.LOG_INFO, "[fbwifi] Traffic rule "..ix)
-	
-	if rule["protocol"] == 6 then
-		PROTO = "tcp"
-	elseif rule["protocol"] == 17 then
-		PROTO = "udp"
-	end
-	RULE = string.format(RULE_FORMAT, rule["ip"], PROTO, rule["port"])
-	local result = os.execute(RULE)
-	if result == 0 then
-		log.syslog(log.LOG_INFO, "[fbwifi] Traffic rule "..ix)
-	else
-		log.syslog(log.LOG_WARNING, "[fbwifi] Failed to install traffic rule ; "..RULE)
-	end
-end
-
-local cross_origin_list = {}
-function process_cross_origin_rule(ix, url)
-	log.syslog(log.LOG_INFO, "[fbwifi] Cross origin rule "..url)
-	table.insert(cross_origin_list, url)
-end
-
-function process_url(url_purpose, fqdn)
-	log.syslog(log.LOG_INFO, "[fbwifi] Caching "..url_purpose)
-	state:set("fbwifi", "main", url_purpose, fqdn)	
-end
-
-state:set("fbwifi", "main", "config")
-
-result = os.execute("iptables -t mangle -F FBWIFI_TRAFFIC_ALLOWLIST ")
---print(result)
-table.foreach(obj['config']['traffic_allowlist'], process_traffic_rule)
-table.foreach(obj['config']['cross_origin_allowlist'], process_cross_origin_rule)
-table.foreach(obj['config']['urls'], process_url)
-
-state:set("fbwifi", "main", "cross_origin_allow_rules", cross_origin_list)
-state:set("fbwifi", "main", "config_version", obj['config_version'])
-
-state:save('fbwifi')
-state:commit('fbwifi')

feeds/facebook/fbwifi/files/fbwifi/usr/sbin/fbwifi_validate_token_db

@@ -1,75 +0,0 @@
-#!/usr/bin/lua
-
-https = require("ssl.https")
-json = require("cjson")
-log = require("posix.syslog")
-fbwifi = require("fbwifi")
-require("uci")
-
-state = uci.cursor("/var/state", "/tmp/fbwifi")
-GATEWAY_TOKEN = fbwifi.gateway_token()
-
-request = { 
-	tokens = {}, 
-	traffic_type = "total",
-	config_version = state:get("fbwifi", "main", "config_version")
-}
-
-function queue_token(client)
-
-	request.tokens[client.token]={
-		incoming = json.null,
-		outgoing = json.null,
-		connected_time_sec = json.null,
-		inactive_time_sec = json.null,
-		signal_rssi_dbm = json.null,
-		--expected_tpus_mbps = json.null,
-		is_connected = true
-	}
-
-end
-
-state:foreach("fbwifi", "client", queue_token)
-print( "\nRequest:\n"..json.encode(request) )
-
-URL="https://api.fbwifi.com/v2.0/tokens"
-BODY=string.format(
-	"tokens=%s&traffic_type=%s&config_version=%s",
-	json.encode(request.tokens),
-	"total",
-	state:get("fbwifi", "main", "config_version")
-)
-
-body, code, headers = https.request(URL.."?access_token="..GATEWAY_TOKEN, BODY)
-
-if code then
-	print( "\nResponse:\n"..body )
-end
-
-response = json.decode(body)
---print(response)
---table.foreach(response,print)
---table.foreach(response.tokens,print)
-
-if response.config_valid then
-	log.syslog(log.LOG_INFO, "[fbwifi] Config validated")
-else
-	log.syslog(log.LOG_WARNING, "[fbwifi] config is stale, refreshing config")
-        local result = os.execute("/usr/sbin/fbwifi reload")
-        if result == 0 then
-                log.syslog(log.LOG_INFO, "[fbwifi] successfully fetched and loaded new config ")
-        else
-                log.syslog(log.LOG_WARNING, "[fbwifi] failed to fetch and load new config, possible stale config")
-        end
-end
-
-function process_token(token, metadata)
-	table.foreach(metadata,print)
-	if metadata.valid then
-		print("OK: "..token)	
-	else
-		print("Nok: "..token)	
-		fbwifi.revoke_client_rule( token )
-	end
-end
-table.foreach(response.tokens,process_token)

feeds/facebook/fbwifi/files/fbwifi/usr/share/fbwifi/firewall.include

@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0-only
-# Copyright (c) Facebook, Inc. and its affiliates.
-
-IPT4="/usr/sbin/iptables"
-
-set -- --wait 1 --wait-interval 100
-
-fbwifi_http_port="$(uci get fbwifi.main.http_port)"
-[ -n "$fbwifi_http_port" ] || {
-	logger -t fbwifi "required option http_port not set"
-	exit 1
-}
-
-fbwifi_https_port="$(uci get fbwifi.main.https_port)"
-[ -n "$fbwifi_https_port" ] || {
-	logger -t fbwifi "required option https_port not set"
-	exit 1
-}
-
-fbwifi_zone="$(uci get fbwifi.main.zone)"
-[ -n "$fbwifi_zone" ] || {
-	logger -t fbwifi "required option zone  not set"
-	exit 1
-}
-
-fbwifi_ifaces="$(fw3 -q zone "$fbwifi_zone")"
-
-## Create custom chains
-"$IPT4" "$@" -t filter -N FBWIFI_FORWARD 2>/dev/null
-"$IPT4" "$@" -t filter -N FBWIFI_INPUT 2>/dev/null
-"$IPT4" "$@" -t mangle -N FBWIFI_CLIENT_TO_INTERNET 2>/dev/null
-"$IPT4" "$@" -t mangle -N FBWIFI_PREROUTING 2>/dev/null
-"$IPT4" "$@" -t mangle -N FBWIFI_TRAFFIC_ALLOWLIST 2>/dev/null
-"$IPT4" "$@" -t nat -N FBWIFI_CLIENT_TO_INTERNET 2>/dev/null
-"$IPT4" "$@" -t nat -N FBWIFI_PREROUTING 2>/dev/null
-"$IPT4" "$@" -t nat -N FBWIFI_HOST_REDIRLIST 2>/dev/null
-
-## Flush custom chains
-"$IPT4" "$@" -t filter -F FBWIFI_FORWARD
-"$IPT4" "$@" -t filter -F FBWIFI_INPUT
-"$IPT4" "$@" -t mangle -F FBWIFI_CLIENT_TO_INTERNET
-"$IPT4" "$@" -t mangle -F FBWIFI_PREROUTING
-"$IPT4" "$@" -t mangle -F FBWIFI_TRAFFIC_ALLOWLIST
-"$IPT4" "$@" -t nat -F FBWIFI_CLIENT_TO_INTERNET
-"$IPT4" "$@" -t nat -F FBWIFI_PREROUTING
-"$IPT4" "$@" -t nat -F FBWIFI_HOST_REDIRLIST
-
-## Populate custom chains
-"$IPT4" "$@" -t filter -A FBWIFI_FORWARD -p udp --dport 53 -m conntrack --ctstate NEW -j ACCEPT
-"$IPT4" "$@" -t filter -A FBWIFI_FORWARD -m conntrack --ctstate NEW -m mark --mark 0xfb -j ACCEPT
-"$IPT4" "$@" -t filter -A FBWIFI_FORWARD -j REJECT
-"$IPT4" "$@" -t filter -A FBWIFI_INPUT -p tcp --dport "$fbwifi_http_port" -m conntrack --ctstate NEW -j ACCEPT
-"$IPT4" "$@" -t filter -A FBWIFI_INPUT -p tcp --dport "$fbwifi_https_port"  -m conntrack --ctstate NEW -j ACCEPT
-"$IPT4" "$@" -t filter -A FBWIFI_INPUT -p tcp --dport 443 -m conntrack --ctstate NEW -j ACCEPT
-"$IPT4" "$@" -t mangle -A FBWIFI_PREROUTING -j FBWIFI_CLIENT_TO_INTERNET
-"$IPT4" "$@" -t mangle -A FBWIFI_PREROUTING -j FBWIFI_TRAFFIC_ALLOWLIST
-"$IPT4" "$@" -t nat -A FBWIFI_PREROUTING -j FBWIFI_CLIENT_TO_INTERNET
-"$IPT4" "$@" -t nat -A FBWIFI_CLIENT_TO_INTERNET -p tcp --dport 80 -m conntrack --ctstate NEW -j FBWIFI_HOST_REDIRLIST
-"$IPT4" "$@" -t nat -A FBWIFI_CLIENT_TO_INTERNET -p tcp --dport 443 -m conntrack --ctstate NEW -j FBWIFI_HOST_REDIRLIST
-"$IPT4" "$@" -t nat -A FBWIFI_CLIENT_TO_INTERNET -p udp --dport 443 -m conntrack --ctstate NEW -j FBWIFI_HOST_REDIRLIST
-"$IPT4" "$@" -t nat -A FBWIFI_CLIENT_TO_INTERNET -p tcp --dport 80 -m conntrack --ctstate NEW -m mark --mark 0xfb -j ACCEPT
-"$IPT4" "$@" -t nat -A FBWIFI_CLIENT_TO_INTERNET -p tcp --dport 443 -m conntrack --ctstate NEW -m mark --mark 0xfb -j ACCEPT
-"$IPT4" "$@" -t nat -A FBWIFI_CLIENT_TO_INTERNET -p udp --dport 443 -m conntrack --ctstate NEW -m mark --mark 0xfb -j ACCEPT
-"$IPT4" "$@" -t nat -A FBWIFI_CLIENT_TO_INTERNET -p tcp --dport 80 -m conntrack --ctstate NEW -j REDIRECT --to-ports "$fbwifi_http_port"
-
-## Hook custom chains in firewall3 chains
-"$IPT4" "$@" -t filter -I "zone_${fbwifi_zone}_input" 2 -j FBWIFI_INPUT
-"$IPT4" "$@" -t filter -I "zone_${fbwifi_zone}_forward" 2 -j FBWIFI_FORWARD
-"$IPT4" "$@" -t nat -I "zone_${fbwifi_zone}_prerouting" 2 -j FBWIFI_PREROUTING
-# There are no firewall3 zone chains in the mangle table so we need to do this for all interfaces in the zone
-for iface in $fbwifi_ifaces; do
-	"$IPT4" "$@" -t mangle -I PREROUTING -i "$iface" -j FBWIFI_PREROUTING
-done

feeds/facebook/fbwifi/files/fbwifi/usr/share/fbwifi/uhttpd.json

@@ -1,8 +0,0 @@
-{
-  "request": [
-    [ "if",
-      [ "regex", "REQUEST_URI", "^/fbwifi" ],
-      [ "rewrite", "/cgi-bin%REQUEST_URI%" ]
-    ]
-  ]
-}

feeds/facebook/fbwifi/files/fbwifi/www/cgi-bin/fbwifi/v2.0/auth

@@ -1,70 +0,0 @@
-#!/usr/bin/lua
-require("uci")
-log = require("posix.syslog")
-fbwifi = require("fbwifi")
-
-state = uci.cursor("/var/state", "/tmp/fbwifi")
-function process_cors()
-	origin = os.getenv("HTTP_ORIGIN")
-	log.syslog(log.LOG_INFO, string.format("[fbwifi] [auth] process_cors origin %s", origin or 'not found') )
-	if string.len(origin or '') > 0 then
-		allow_list = state:get("fbwifi", "main", "cross_origin_allow_rules")
-		for _, value in pairs(allow_list) do
-    			if value == origin then
-				log.syslog(log.LOG_INFO, "[fbwifi] [auth] process_cors Appending CORS Headers to HTTP")
-				print("Access-Control-Allow-Origin: "..origin)
-				print("Vary: Origin")
-				break
-			end
-		end
-	else	
-		log.syslog(log.LOG_INFO, "[fbwifi] [auth] process_cors No CORS Headers added to Response")
-	end
-end
-
-method = os.getenv("REQUEST_METHOD")
-if method == 'GET' then
-	log.syslog(log.LOG_INFO, "[fbwifi] [auth] GET handler")
-	print("Status: 302 Found")
-	print("Location: "..state:get("fbwifi", "main", "landing_page_url"))
-	process_cors()
-	print ('\n')
-
-elseif method == 'POST' then
-	local token
-	
-	log.syslog(log.LOG_INFO, "[fbwifi] [auth] POST handler")
-	process_cors()
-	print("Status: 200 OK")
-
-	form_data=io.read()
-	while form_data do
-		token = string.match(form_data, '[%d]+')
-		if string.len(token or '') > 14 then
-
-			client = os.getenv("REMOTE_ADDR")
-			f = io.popen("awk '/"..client..".*0x2/ { printf(\"%s\", $4) }' /proc/net/arp", 'r')
-			client_mac = assert(f:read('*a'))
-			f:close()
-
-			if fbwifi.validate_token(token) then
-                                log.syslog(log.LOG_INFO, string.format( "[fbwifi] [auth] POST handler : Validating Token (%s) for MAC (%s)", token or 'nil', client_mac or 'nil') )
-				fbwifi.instate_client_rule(token, client_mac)
-				print("\n{\"valid\":true}\n")
-			else
-                                log.syslog(log.LOG_WARNING, string.format( "[fbwifi] [auth] POST handler : ! Invalid token (%s) for mac (%s) !", token or 'nil', client_mac or 'nil') )
-				fbwifi.revoke_client_rule(token)
-				print("\n{\"valid\":false}\n")
-			end
-			log.syslog(log.LOG_INFO, "[fbwifi] [auth] POST handler completed")
-			return
-		end
-
-		form_data=io.read()
-	end
-	print ('\n')
-
-	log.syslog(log.LOG_WARNING, string.format("[fbwifi] [auth] POST handler : token not found" ))
-	fbwifi.revoke_client_rule(token)
-	print("\n{\"valid\":false}\n")
-end

feeds/facebook/fbwifi/files/fbwifi/www/cgi-bin/fbwifi/v2.0/capport

@@ -1,42 +0,0 @@
-#!/usr/bin/lua
-json = require("cjson")
-require("uci")
-
-state = uci.cursor("/var/state", "/tmp/fbwifi")
-client_mac = ""
-token = ""
-
-response = {}
-response['venue-info-url'] = state:get("fbwifi", "main", "capport_venue_info_url")
-
-function map_remote_mac_to_token(client)
-        for key, value in pairs(client) do
-                if
-                        key == 'mac' and
-                        value == client_mac
-                then
-			token = client.token
-                        return false
-                end
-        end
-end
-
-function hasValidToken(client_ip)
-	f = io.popen("awk '/"..client_ip..".*0x2/ { printf(\"%s\", $4) }' /proc/net/arp", 'r')
-	client_mac = assert(f:read('*a'))
-	f:close()
-	state:foreach("fbwifi", "client", map_remote_mac_to_token)
-
-	return 0 < string.len(token)
-end
-
-print("Content-type: application/captive+json; charset=utf-8\n")
-
-client = os.getenv("REMOTE_ADDR")
-response['captive'] = not hasValidToken(client)
-
-if response['captive'] then
-	response['user-portal-url'] = state:get("fbwifi", "main", "captive_portal_url")
-end
-
-print( json.encode(response) )

feeds/facebook/fbwifi/files/fbwifi/www/cgi-bin/fbwifi/v2.0/info

@@ -1,57 +0,0 @@
-#!/usr/bin/lua
-json = require("cjson")
-fbwifi = require("fbwifi")
-
-state = uci.cursor("/var/state", "/tmp/fbwifi")
-GATEWAY_TOKEN = fbwifi.gateway_token()
-
-response = { api_version = "2.0", token = json.null }
-client_mac = ""
-
-function process_cors()
-        origin = os.getenv("HTTP_ORIGIN")
-        if string.len(origin or '') > 0 then
-                allow_list = state:get("fbwifi", "main", "cross_origin_allow_rules")
-                for _, value in pairs(allow_list) do
-                        if value == origin then
-                                print("Access-Control-Allow-Origin: "..origin)
-                                print("Vary: Origin")
-                                break
-                        end
-                end
-        end
-end
-
-function map_remote_mac_to_token(client)
-
-	for key, value in pairs(client) do
-		if
-			key == 'mac' and
-			value == client_mac
-		then
-			response.token = client.token
-			return false -- escape outer loop
-		end
-	end
-end
-
-function getClientToken(client_ip)
-	f = io.popen("awk '/"..client_ip..".*0x2/ { printf(\"%s\", $4) }' /proc/net/arp", 'r')
-	client_mac = assert(f:read('*a'))
-	f:close()
-
-	state:foreach("fbwifi", "client", map_remote_mac_to_token)
-end
-
-function getGatewayId()
-	id = string.match(GATEWAY_TOKEN, 'FBWIFI:GATEWAY|[0-9]*|([0-9]*)')
-	return id
-end
-
-process_cors()
-print("Content-type: application/json; charset=utf-8\n")
-
-getClientToken(os.getenv("REMOTE_ADDR"))
-response.gateway_id = getGatewayId()
-
-print( json.encode(response) )

feeds/facebook/fbwifi/files/luci-app-fbwifi/usr/lib/lua/luci/controller/fbwifi.lua

@@ -1,12 +0,0 @@
--- SPDX-License-Identifier: GPL-2.0-only
--- Copyright (c) Facebook, Inc. and its affiliates.
-
-module("luci.controller.fbwifi", package.seeall)
-
-sys = require "luci.sys"
-ut = require "luci.util"
-
-function index()
-    entry({"admin", "network", "fbwifi"}, template("fbwifi"), "Facebook Wi-Fi", 90).dependent=false
-end
-

feeds/facebook/fbwifi/files/luci-app-fbwifi/usr/lib/lua/luci/view/fbwifi.htm

@@ -1,16 +0,0 @@
-<%#
- Copyright
- Licensed to the public under the GNU General Public License v2.
--%>
-
-<%+header%>
-
-<h1>Facebook Wi-Fi</h1>
-<%
-	require("uci")
-	state = uci.cursor("/var/state", "/tmp/fbwifi")
-	url = state:get("fbwifi", "main", "captive_portal_config_url")
-%>
-<a href="<% print(url) %>">Configure FB business page</a>
-
-<%+footer%>

feeds/ipq807x/kmod-sched-cake/Makefile

@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2016 LEDE
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=sched-cake
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git
-PKG_SOURCE_DATE:=2021-07-09
-PKG_SOURCE_VERSION:=d9e1398cc9091e9e7c7a740361e4617b75c24427
-#PKG_MIRROR_HASH:=5bf06a804824db36ae393fc174aeec7b12633176e05a765c0931b39df5bd34df
-PKG_MAINTAINER:=Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/sched-cake
-  SUBMENU:=Network Support
-  TITLE:=Cake fq_codel/blue derived shaper
-  URL:=https://github.com/dtaht/sch_cake
-  FILES:=$(PKG_BUILD_DIR)/sch_cake.ko
-  AUTOLOAD:=$(call AutoLoad,75,sch_cake)
-  DEPENDS:=+kmod-ipt-conntrack
-endef
-
-include $(INCLUDE_DIR)/kernel-defaults.mk
-
-define KernelPackage/sched-cake/description
-  Common Applications Kept Enhanced fq_codel/blue derived shaper
-endef
-
-define Build/Compile
-	$(KERNEL_MAKE) SUBDIRS="$(PKG_BUILD_DIR)" modules
-endef
-
-$(eval $(call KernelPackage,sched-cake))

feeds/ipq807x/kmod-sched-cake/patches/100-compat.patch

@@ -1,20 +0,0 @@
-Index: sched-cake-2021-07-09-d9e1398c/cobalt_compat.h
-===================================================================
---- sched-cake-2021-07-09-d9e1398c.orig/cobalt_compat.h
-+++ sched-cake-2021-07-09-d9e1398c/cobalt_compat.h
-@@ -95,15 +95,6 @@ static inline unsigned int __tcp_hdrlen(
- }
- #endif
- 
--#if KERNEL_VERSION(4, 6, 0) > LINUX_VERSION_CODE
--static inline int skb_try_make_writable(struct sk_buff *skb,
--					unsigned int write_len)
--{
--	return skb_cloned(skb) && !skb_clone_writable(skb, write_len) &&
--	       pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
--}
--#endif
--
- #if KERNEL_VERSION(4, 11, 0) > LINUX_VERSION_CODE
- static inline int skb_mac_offset(const struct sk_buff *skb)
- {

feeds/ipq807x/protobuf-c/Makefile

@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libprotobuf-c
-PKG_VERSION:=1.3.1
-PKG_RELEASE:=2
-
-PKG_SOURCE:=protobuf-c-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/protobuf-c/protobuf-c/releases/download/v$(PKG_VERSION)
-PKG_HASH:=51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267
-PKG_BUILD_DIR:=$(BUILD_DIR)/protobuf-c-$(PKG_VERSION)
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/protobuf-c-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
-PKG_LICENSE:=BSD-2c
-
-PKG_BUILD_DEPENDS:=protobuf-c/host
-HOST_BUILD_DEPENDS:=protobuf/host
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
-define Package/libprotobuf-c
-  TITLE:=Protocol Buffers library
-  SECTION:=libs
-  CATEGORY:=Libraries
-  URL:=https://github.com/protobuf-c/protobuf-c
-endef
-
-define Package/libprotobuf-c/description
-  Runtime library to use Google Protocol Buffers from C applications.
-  Protocol Buffers are a way of encoding structured data in an efficient yet
-  extensible format. Google uses Protocol Buffers for almost all of its
-  internal RPC protocols and file formats.
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--disable-protoc
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-c.{a,la,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libprotobuf-c/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-c.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libprotobuf-c))
-$(eval $(call HostBuild))
-

feeds/ipq807x/protobuf-c/patches/001-t-generated-code2-cxx-generate-packed-data-fix.patch

@@ -1,13 +0,0 @@
-Index: protobuf-c-1.3.1/t/generated-code2/cxx-generate-packed-data.cc
-===================================================================
---- protobuf-c-1.3.1.orig/t/generated-code2/cxx-generate-packed-data.cc
-+++ protobuf-c-1.3.1/t/generated-code2/cxx-generate-packed-data.cc
-@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_en
- static void dump_test_unknown_fields (void)
- {
-   EmptyMess mess;
--  const google::protobuf::Message::Reflection *reflection = mess.GetReflection();
-+  const google::protobuf::Reflection *reflection = mess.GetReflection();
-   google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess);
- 
- #if GOOGLE_PROTOBUF_VERSION >= 2001000

feeds/ipq807x/protobuf/Makefile

@@ -1,110 +0,0 @@
-#
-# Copyright (C) 2007-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=protobuf
-PKG_VERSION:=3.7.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION)
-PKG_HASH:=97f6cdaa0724d5a8cd3375d5f5cf4bd253d5ad5291154f533ed0d94a9d501ef3
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-PKG_CPE_ID:=cpe:/a:google:protobuf
-
-PKG_BUILD_DEPENDS:=protobuf/host
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-
-define Package/protobuf/Default
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A structured data encoding library
-  URL:=https://github.com/google/protobuf
-  DEPENDS:=+zlib +libpthread +libatomic +libstdcpp
-  MAINTAINER:=Ken Keys <kkeys@caida.org>
-endef
-
-define Package/protobuf
-  $(call Package/protobuf/Default)
-  DEPENDS+=+protobuf-lite
-endef
-
-define Package/protobuf-lite
-  $(call Package/protobuf/Default)
-endef
-
-define Package/protobuf/description/Default
-Protocol Buffers are a way of encoding structured data in an efficient
-yet extensible format. Google uses Protocol Buffers for almost all
-of its internal RPC protocols and file formats.
-endef
-
-define Package/protobuf/description
-$(call Package/protobuf/description/Default)
-
-This package provides the libprotoc, libprotobuf, and libprotobuf-lite
-libraries.  For a much smaller protobuf package, see "protobuf-lite".
-
-endef
-
-define Package/protobuf-lite/description
-$(call Package/protobuf/description/Default)
-
-This package provides the libprotobuf-lite library.
-
-endef
-
-EXTRA_CPPFLAGS+=-std=c++11
-CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOSTPKG)/bin/protoc
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/lib \
-		$(1)/usr/include
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/* \
-		$(1)/usr/lib/
-endef
-
-define Package/protobuf-lite/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libprotobuf-lite.so* \
-		$(1)/usr/lib/
-endef
-
-define Package/protobuf/install
-	$(INSTALL_DIR) \
-		$(1)/usr/lib
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libprotoc.so*  \
-		$(1)/usr/lib/
-
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libprotobuf.so* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,protobuf))
-$(eval $(call BuildPackage,protobuf-lite))
-$(eval $(call HostBuild))

feeds/ipq807x/qca-nss-clients/Makefile

@@ -1,634 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=qca-nss-clients
-PKG_SOURCE_PROTO:=git
-PKG_BRANCH:=master
-PKG_RELEASE:=2
-PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/nss-clients/
-PKG_VERSION:=153998d70fdba508a59a28c13a606032cbf32686
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_VERSION)
-
-#PKG_BUILD_DEPENDS := PACKAGE_kmod-qca-nss-crypto:kmod-qca-nss-crypto
-MAKE_OPTS:=
-
-include $(INCLUDE_DIR)/package.mk
-
-# Keep default as ipq806x for branches that does not have subtarget framework
-subtarget:=$(SUBTARGET)
-
-# DTLS Manager v2.0 for Hawkeye/Cypress
-  DTLSMGR_DIR:=v2.0
-# IPsec Manager v2.0 for Hawkeye/Cypress
-  IPSECMGR_DIR:=v2.0
-
-define KernelPackage/qca-nss-drv-tun6rd
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - tun6rd
-  DEPENDS:=+kmod-qca-nss-drv +kmod-sit @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/qca-nss-tun6rd.ko
-  AUTOLOAD:=$(call AutoLoad,60,qca-nss-tun6rd)
-endef
-
-define KernelPackage/qca-nss-drv-tun6rd/Description
-Kernel modules for NSS connection manager - Support for 6rd tunnel
-endef
-
-define KernelPackage/qca-nss-drv-dtlsmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - dtlsmgr
-  DEPENDS:=+kmod-qca-nss-drv +kmod-qca-nss-cfi-cryptoapi @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/dtls/$(DTLSMGR_DIR)/qca-nss-dtlsmgr.ko
-endef
-
-define KernelPackage/qca-nss-drv-dtls/Description
-Kernel modules for NSS connection manager - Support for DTLS sessions
-endef
-
-define KernelPackage/qca-nss-drv-tlsmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - tlsmgr
-  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq807x||TARGET_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx +kmod-qca-nss-drv +kmod-qca-nss-cfi @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/tls/qca-nss-tlsmgr.ko
-endef
-
-define KernelPackage/qca-nss-drv-tls/Description
-Kernel modules for NSS connection manager - Support for TLS sessions
-endef
-
-define KernelPackage/qca-nss-drv-l2tpv2
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - l2tp
-  DEPENDS:=+kmod-qca-nss-drv +kmod-ppp +kmod-l2tp @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/l2tp/l2tpv2/qca-nss-l2tpv2.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-l2tpv2)
-endef
-
-define KernelPackage/qca-nss-drv-l2tp/Description
-Kernel modules for NSS connection manager - Support for l2tp tunnel
-endef
-
-define KernelPackage/qca-nss-drv-pptp
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - PPTP
-  DEPENDS:=+kmod-qca-nss-drv +kmod-pptp @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/pptp/qca-nss-pptp.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-pptp)
-endef
-
-define KernelPackage/qca-nss-drv-pptp/Description
-Kernel modules for NSS connection manager - Support for PPTP tunnel
-endef
-
-define KernelPackage/qca-nss-drv-pppoe
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - PPPoE
-  DEPENDS:=+kmod-qca-nss-drv +kmod-pppoe @!LINUX_3_18 \
-		+!(TARGET_ipq_ipq807x_QSDK_256||TARGET_ipq_ipq60xx_QSDK_256):kmod-bonding
-  FILES:=$(PKG_BUILD_DIR)/pppoe/qca-nss-pppoe.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-pppoe)
-endef
-
-define KernelPackage/qca-nss-drv-pppoe/Description
-Kernel modules for NSS connection manager - Support for PPPoE
-endef
-
-define KernelPackage/qca-nss-drv-map-t
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - MAP-T
-  DEPENDS:=+kmod-qca-nss-drv +kmod-nat46 @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/map/map-t/qca-nss-map-t.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-map-t)
-endef
-
-define KernelPackage/qca-nss-drv-map-t/Description
-Kernel modules for NSS connection manager - Support for MAP-T
-endef
-
-define KernelPackage/qca-nss-drv-gre
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - GRE
-  DEPENDS:=@TARGET_ipq_ipq806x||TARGET_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq807x||TARGET_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64 \
-	   +kmod-qca-nss-drv @!LINUX_3_18 +kmod-gre6
-  FILES:=$(PKG_BUILD_DIR)/gre/qca-nss-gre.ko $(PKG_BUILD_DIR)/gre/test/qca-nss-gre-test.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-gre)
-endef
-
-define KernelPackage/qca-nss-drv-gre/Description
-Kernel modules for NSS connection manager - Support for GRE
-endef
-
-define KernelPackage/qca-nss-drv-tunipip6
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (connection manager) - DS-lite and ipip6 Tunnel
-  DEPENDS:=+kmod-qca-nss-drv +kmod-iptunnel6 +kmod-ip6-tunnel @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/tunipip6/qca-nss-tunipip6.ko
-  AUTOLOAD:=$(call AutoLoad,60,qca-nss-tunipip6)
-endef
-
-define KernelPackage/qca-nss-drv-tunipip6/Description
-Kernel modules for NSS connection manager
-Add support for DS-lite and ipip6 tunnel
-endef
-
-define KernelPackage/qca-nss-drv-profile
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+kmod-qca-nss-drv @!LINUX_3_18
-  TITLE:=Profiler for QCA NSS driver (IPQ806x)
-  FILES:=$(PKG_BUILD_DIR)/profiler/qca-nss-profile-drv.ko
-endef
-
-define KernelPackage/qca-nss-drv-profile/Description
-This package contains a NSS driver profiler for QCA chipset
-endef
-
-define KernelPackage/qca-nss-drv-ipsecmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (ipsec manager) - ipsecmgr
-  DEPENDS:=@TARGET_ipq806x||TARGET_ipq_ipq806x||TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq807x||TARGET_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx \
-		+kmod-qca-nss-drv +kmod-qca-nss-cfi-cryptoapi +kmod-qca-nss-cfi-ocf @!LINUX_3_18
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2),)
-  DEPENDS:=+kmod-qca-nss-drv-l2tpv2
-endif
-  FILES:=$(PKG_BUILD_DIR)/ipsecmgr/$(IPSECMGR_DIR)/qca-nss-ipsecmgr.ko
-  AUTOLOAD:=$(call AutoLoad,60,qca-nss-ipsecmgr)
-endef
-
-define KernelPackage/qca-nss-drv-ipsecmgr/Description
-Kernel module for NSS IPsec offload manager
-endef
-
-define KernelPackage/qca-nss-drv-ipsecmgr-klips
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS (ipsec klips)
-  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx \
-		+kmod-qca-nss-drv-ipsecmgr kmod-qca-nss-ecm
-  FILES:=$(PKG_BUILD_DIR)/ipsecmgr/$(IPSECMGR_DIR)/plugins/klips/qca-nss-ipsec-klips.ko
-endef
-
-define KernelPackage/qca-nss-drv-ipsecmgr-klips/Description
-NSS Kernel module for IPsec klips offload
-endef
-
-
-define KernelPackage/qca-nss-drv-capwapmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+kmod-qca-nss-drv +kmod-qca-nss-drv-dtlsmgr @!LINUX_3_18
-  TITLE:=NSS CAPWAP Manager for QCA NSS driver (IPQ806x)
-  FILES:=$(PKG_BUILD_DIR)/capwapmgr/qca-nss-capwapmgr.ko
-endef
-
-define KernelPackage/qca-nss-drv-capwapmgr/Description
-This package contains a NSS CAPWAP Manager
-endef
-
-define KernelPackage/qca-nss-drv-bridge-mgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS bridge manager
-  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq807x||TARGET_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx \
-		+TARGET_ipq_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq_ipq807x_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq807x_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq_ipq60xx:kmod-qca-nss-drv-vlan-mgr \
-		+TARGET_ipq807x_ipq60xx:kmod-qca-nss-drv-vlan-mgr @!LINUX_3_18 \
-		+!(TARGET_ipq_ipq807x_QSDK_256||TARGET_ipq_ipq60xx_QSDK_256):kmod-bonding
-  FILES:=$(PKG_BUILD_DIR)/bridge/qca-nss-bridge-mgr.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-bridge-mgr)
-endef
-
-define KernelPackage/qca-nss-drv-bridge-mgr/Description
-Kernel modules for NSS bridge manager
-endef
-
-define KernelPackage/qca-nss-drv-vlan-mgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS vlan manager
-  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq807x||TARGET_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx +kmod-qca-nss-drv @!LINUX_3_18 \
-		+!(TARGET_ipq_ipq807x_QSDK_256||TARGET_ipq_ipq60xx_QSDK_256):kmod-bonding
-  FILES:=$(PKG_BUILD_DIR)/vlan/qca-nss-vlan.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-vlan)
-endef
-
-define KernelPackage/qca-nss-drv-vlan-mgr/Description
-Kernel modules for NSS vlan manager
-endef
-
-define KernelPackage/qca-nss-drv-qdisc
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  TITLE:=Qdisc for configuring shapers in NSS
-  DEPENDS:=+kmod-qca-nss-drv @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/nss_qdisc/qca-nss-qdisc.ko
-  AUTOLOAD:=$(call AutoLoad,58,qca-nss-qdisc)
-endef
-
-define KernelPackage/qca-nss-drv-qdisc/Description
-Linux qdisc that aids in configuring shapers in the NSS
-endef
-
-define KernelPackage/qca-nss-drv-igs
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  TITLE:=Action for offloading traffic to an IFB interface to perform ingress shaping.
-  DEPENDS:=@TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64 \
-	+kmod-qca-nss-drv +kmod-sched-core +kmod-ifb +kmod-qca-nss-drv-qdisc @!LINUX_3_18
-  FILES:=$(PKG_BUILD_DIR)/nss_qdisc/igs/act_nssmirred.ko
-endef
-
-define KernelPackage/qca-nss-drv-igs/Description
-Linux action that helps in offloading traffic to an IFB interface to perform ingress shaping.
-endef
-
-define KernelPackage/qca-nss-drv-lag-mgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS LAG manager
-  DEPENDS:=+kmod-qca-nss-drv  @!LINUX_3_18 \
-	   +TARGET_ipq_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-	   +TARGET_ipq_ipq807x_ipq807x:kmod-qca-nss-drv-vlan-mgr @!LINUX_3_18 \
-	   +TARGET_ipq807x:kmod-qca-nss-drv-vlan-mgr \
-	   +TARGET_ipq807x_ipq807x:kmod-qca-nss-drv-vlan-mgr @!LINUX_3_18 \
-	   +TARGET_ipq_ipq60xx:kmod-qca-nss-drv-vlan-mgr @!LINUX_3_18 \
-	   +TARGET_ipq807x_ipq60xx:kmod-qca-nss-drv-vlan-mgr @!LINUX_3_18 \
-	   +kmod-bonding
-  FILES:=$(PKG_BUILD_DIR)/lag/qca-nss-lag-mgr.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-lag-mgr)
-endef
-
-define KernelPackage/qca-nss-drv-lag-mgr/Description
-Kernel modules for NSS LAG manager
-endef
-
-define KernelPackage/qca-nss-drv-netlink
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=@TARGET_ipq807x||TARGET_ipq_ipq807x||TARGET_ipq807x_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx||TARGET_ipq_ipq50xx||TARGET_ipq_ipq50xx_64 \
-		+kmod-qca-nss-drv @!LINUX_3_18 \
-		+PACKAGE_kmod-qca-nss-drv-ipsecmgr:kmod-qca-nss-drv-ipsecmgr \
-		+PACKAGE_kmod-qca-nss-drv-dtlsmgr:kmod-qca-nss-drv-dtlsmgr \
-		+PACKAGE_kmod-qca-nss-drv-capwapmgr:kmod-qca-nss-drv-capwapmgr @!LINUX_3_18
-  TITLE:=NSS NETLINK Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/netlink/qca-nss-netlink.ko
-endef
-
-define KernelPackage/qca-nss-drv-netlink/Description
-Kernel module for NSS netlink manager
-endef
-
-define KernelPackage/qca-nss-drv-ovpn-mgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for NSS OpenVPN manager
-  DEPENDS:=+kmod-qca-nss-drv +kmod-qca-nss-cfi +kmod-tun +kmod-ipt-conntrack @!LINUX_3_18 \
-	  @TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx
-  FILES:=$(PKG_BUILD_DIR)/openvpn/src/qca-nss-ovpn-mgr.ko
-endef
-
-define KernelPackage/qca-nss-drv-ovpn-mgr/Description
-Kernel module for NSS OpenVPN manager
-endef
-
-define KernelPackage/qca-nss-drv-ovpn-link
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  TITLE:=Kernel driver for interfacing NSS OpenVPN manager with ECM
-  DEPENDS:=+kmod-qca-nss-drv-ovpn-mgr +kmod-qca-nss-ecm-premium @!LINUX_3_18 \
-	  @TARGET_ipq_ipq807x||TARGET_ipq_ipq807x_ipq807x||TARGET_ipq_ipq60xx||TARGET_ipq807x_ipq60xx
-  FILES:=$(PKG_BUILD_DIR)/openvpn/plugins/qca-nss-ovpn-link.ko
-endef
-
-define KernelPackage/qca-nss-drv-ovpn-link/Description
-This module registers with ECM and communicates with NSS OpenVPN manager for supporting OpenVPN offload.
-endef
-
-define KernelPackage/qca-nss-drv-pvxlanmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+kmod-qca-nss-drv @!LINUX_3_18
-  TITLE:=NSS PVXLAN Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/pvxlanmgr/qca-nss-pvxlanmgr.ko
-endef
-
-define KernelPackage/qca-nss-drv-pvxlanmgr/Description
-Kernel module for managing NSS PVxLAN
-endef
-
-define KernelPackage/qca-nss-drv-eogremgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+kmod-qca-nss-drv +kmod-qca-nss-drv-gre @!LINUX_3_18
-  TITLE:=NSS EOGRE Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/eogremgr/qca-nss-eogremgr.ko
-endef
-
-define KernelPackage/qca-nss-drv-eogremgr/Description
-Kernel module for managing NSS EoGRE
-endef
-
-define KernelPackage/qca-nss-drv-clmapmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+kmod-qca-nss-drv +kmod-qca-nss-drv-eogremgr @!LINUX_3_18
-  TITLE:=NSS clmap Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/clmapmgr/qca-nss-clmapmgr.ko
-endef
-
-define KernelPackage/qca-nss-drv-clmapmgr/Description
-Kernel module for managing NSS clmap
-endef
-
-define KernelPackage/qca-nss-drv-vxlanmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+kmod-qca-nss-drv +kmod-vxlan @!LINUX_3_18
-  TITLE:=NSS VxLAN Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/vxlanmgr/qca-nss-vxlanmgr.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-vxlanmgr)
-endef
-
-define KernelPackage/qca-nss-drv-vxlanmgr/Description
-Kernel module for managing NSS VxLAN
-endef
-
-define KernelPackage/qca-nss-drv-match
- SECTION:=kernel
- CATEGORY:=Kernel modules
- SUBMENU:=Network Devices
- DEPENDS:=+kmod-qca-nss-drv @!LINUX_3_18
- TITLE:=NSS Match for QCA NSS driver
- FILES:=$(PKG_BUILD_DIR)/match/qca-nss-match.ko
-endef
-
-define KernelPackage/qca-nss-drv-match/Description
-Kernel module for managing NSS Match
-endef
-
-define KernelPackage/qca-nss-drv-mirror
- SECTION:=kernel
- CATEGORY:=Kernel modules
- SUBMENU:=Network Support
- TITLE:=Module for mirroring packets from NSS to host.
- DEPENDS:=+kmod-qca-nss-drv @!LINUX_3_18
- FILES:=$(PKG_BUILD_DIR)/mirror/qca-nss-mirror.ko
-endef
-
-define KernelPackage/qca-nss-drv-mirror/Description
-Kernel module for managing NSS Mirror
-endef
-
-define Build/InstallDev/qca-nss-clients
-	$(INSTALL_DIR) $(1)/usr/include/qca-nss-clients
-	$(CP) $(PKG_BUILD_DIR)/netlink/include/* $(1)/usr/include/qca-nss-clients/
-	$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-clients/
-endef
-
-define KernelPackage/qca-nss-drv-wifi-meshmgr
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=+kmod-qca-nss-drv @!LINUX_3_18
-  TITLE:=NSS WiFi-Mesh Manager for QCA NSS driver
-  FILES:=$(PKG_BUILD_DIR)/wifi_meshmgr/qca-nss-wifi-meshmgr.ko
-  AUTOLOAD:=$(call AutoLoad,51,qca-nss-wifi-meshmgr)
-endef
-
-define KernelPackage/qca-nss-drv-wifi-meshmgr/Description
-Kernel module for WiFi Mesh manager
-endef
-
-define Build/InstallDev
-	$(call Build/InstallDev/qca-nss-clients,$(1))
-endef
-
-define KernelPackage/qca-nss-drv-ovpn-mgr/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/qca-nss-ovpn.init $(1)/etc/init.d/qca-nss-ovpn
-endef
-
-define KernelPackage/qca-nss-drv-ipsecmgr-klips/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/qca-nss-ipsec $(1)/etc/init.d/qca-nss-ipsec
-endef
-
-define KernelPackage/qca-nss-drv-igs/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/qca-nss-mirred.init $(1)/etc/init.d/qca-nss-mirred
-endef
-
-EXTRA_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/include/qca-nss-drv \
-	-I$(STAGING_DIR)/usr/include/qca-nss-crypto \
-	-I$(STAGING_DIR)/usr/include/qca-nss-cfi \
-	-I$(STAGING_DIR)/usr/include/qca-nss-gmac \
-	-I$(STAGING_DIR)/usr/include/qca-ssdk \
-	-I$(STAGING_DIR)/usr/include/qca-ssdk/fal \
-	-I$(STAGING_DIR)/usr/include/nat46
-
-# Build individual packages if selected
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-profile),)
-MAKE_OPTS+=profile=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-capwapmgr),)
-MAKE_OPTS+=capwapmgr=y
-EXTRA_CFLAGS += -DNSS_CAPWAPMGR_ONE_NETDEV
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tun6rd),)
-MAKE_OPTS+=tun6rd=m
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-dtlsmgr),)
-MAKE_OPTS+=dtlsmgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tlsmgr),)
-MAKE_OPTS+=tlsmgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-l2tpv2),)
-MAKE_OPTS+=l2tpv2=y
-EXTRA_CFLAGS += -DNSS_L2TPV2_ENABLED
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pptp),)
-MAKE_OPTS+=pptp=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-map-t),)
-MAKE_OPTS+=map-t=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-tunipip6),)
-MAKE_OPTS+=tunipip6=m
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-qdisc),)
-MAKE_OPTS+=qdisc=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-igs),)
-MAKE_OPTS+=igs=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-ipsecmgr),)
-EXTRA_CFLAGS+= -I$(PKG_BUILD_DIR)/exports
-MAKE_OPTS+=ipsecmgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-ipsecmgr-klips),)
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-nss-ecm
-MAKE_OPTS+=ipsecmgr-klips=m
-endif
-
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-bridge-mgr),)
-MAKE_OPTS+=bridge-mgr=y
-#enable OVS bridge if ovsmgr is enabled
-ifneq ($(CONFIG_PACKAGE_kmod-qca-ovsmgr),)
-MAKE_OPTS+= NSS_BRIDGE_MGR_OVS_ENABLE=y
-EXTRA_CFLAGS+= -I$(STAGING_DIR)/usr/include/qca-ovsmgr
-endif
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vlan-mgr),)
-MAKE_OPTS+=vlan-mgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-lag-mgr),)
-MAKE_OPTS+=lag-mgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-gre),)
-EXTRA_CFLAGS+= -I$(PKG_BUILD_DIR)/exports
-MAKE_OPTS+=gre=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pppoe),)
-MAKE_OPTS+=pppoe=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-netlink),)
-MAKE_OPTS+=netlink=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-ovpn-mgr),)
-MAKE_OPTS+=ovpn-mgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-ovpn-link),)
-MAKE_OPTS+=ovpn-link=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-pvxlanmgr),)
-MAKE_OPTS+=pvxlanmgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-eogremgr),)
-MAKE_OPTS+=eogremgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-clmapmgr),)
-MAKE_OPTS+=clmapmgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-vxlanmgr),)
-MAKE_OPTS+=vxlanmgr=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-match),)
-MAKE_OPTS+=match=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-mirror),)
-MAKE_OPTS+=mirror=y
-endif
-
-ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-drv-wifi-meshmgr),)
-MAKE_OPTS+=wifi-meshmgr=y
-endif
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" $(strip $(MAKE_OPTS)) \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		M="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-		SoC="$(subtarget)" \
-		DTLSMGR_DIR="$(DTLSMGR_DIR)" \
-		IPSECMGR_DIR="$(IPSECMGR_DIR)" \
-		modules
-endef
-
-$(eval $(call KernelPackage,qca-nss-drv-profile))
-#$(eval $(call KernelPackage,qca-nss-drv-capwapmgr))
-$(eval $(call KernelPackage,qca-nss-drv-tun6rd))
-#$(eval $(call KernelPackage,qca-nss-drv-dtlsmgr))
-$(eval $(call KernelPackage,qca-nss-drv-l2tpv2))
-$(eval $(call KernelPackage,qca-nss-drv-pptp))
-$(eval $(call KernelPackage,qca-nss-drv-pppoe))
-$(eval $(call KernelPackage,qca-nss-drv-map-t))
-$(eval $(call KernelPackage,qca-nss-drv-tunipip6))
-$(eval $(call KernelPackage,qca-nss-drv-qdisc))
-$(eval $(call KernelPackage,qca-nss-drv-igs))
-#$(eval $(call KernelPackage,qca-nss-drv-netlink))
-#$(eval $(call KernelPackage,qca-nss-drv-ipsecmgr))
-#$(eval $(call KernelPackage,qca-nss-drv-ipsecmgr-klips))
-$(eval $(call KernelPackage,qca-nss-drv-bridge-mgr))
-$(eval $(call KernelPackage,qca-nss-drv-vlan-mgr))
-$(eval $(call KernelPackage,qca-nss-drv-lag-mgr))
-$(eval $(call KernelPackage,qca-nss-drv-gre))
-#$(eval $(call KernelPackage,qca-nss-drv-ovpn-mgr))
-#$(eval $(call KernelPackage,qca-nss-drv-ovpn-link))
-$(eval $(call KernelPackage,qca-nss-drv-pvxlanmgr))
-$(eval $(call KernelPackage,qca-nss-drv-eogremgr))
-$(eval $(call KernelPackage,qca-nss-drv-clmapmgr))
-$(eval $(call KernelPackage,qca-nss-drv-vxlanmgr))
-$(eval $(call KernelPackage,qca-nss-drv-match))
-#$(eval $(call KernelPackage,qca-nss-drv-tlsmgr))
-$(eval $(call KernelPackage,qca-nss-drv-mirror))
-$(eval $(call KernelPackage,qca-nss-drv-wifi-meshmgr))

feeds/ipq807x/qca-nss-clients/files/qca-nss-ipsec

@@ -1,92 +0,0 @@
-#!/bin/sh  /etc/rc.common
-#
-# Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-NSS_IPSEC_LOG_FILE=/tmp/.nss_ipsec_log
-NSS_IPSEC_LOG_STR_ECM="ECM_Loaded"
-
-ecm_load () {
-	if [ ! -d /sys/module/ecm ]; then
-		/etc/init.d/qca-nss-ecm start
-		if [ -d /sys/module/ecm ]; then
-			echo ${NSS_IPSEC_LOG_STR_ECM} >> ${NSS_IPSEC_LOG_FILE}
-		fi
-	fi
-}
-
-ecm_unload () {
-	if [ -f /tmp/.nss_ipsec_log ]; then
-		str=`grep ${NSS_IPSEC_LOG_STR_ECM} ${NSS_IPSEC_LOG_FILE}`
-		if [[ $str == ${NSS_IPSEC_LOG_STR_ECM} ]]; then
-			/etc/init.d/qca-nss-ecm stop
-			`sed 's/${NSS_IPSEC_LOG_STR_ECM}/ /g' $NSS_IPSEC_LOG_FILE >  $NSS_IPSEC_LOG_FILE`
-		fi
-	fi
-}
-
-ecm_disable() {
-
-	if [ ! -d /sys/module/ecm ]; then
-		return;
-	fi
-
-	echo 1 > /sys/kernel/debug/ecm/front_end_ipv4_stop
-	echo 1 > /sys/kernel/debug/ecm/front_end_ipv6_stop
-	echo 1 > /sys/kernel/debug/ecm/ecm_db/defunct_all
-	sleep 2
-}
-
-ecm_enable() {
-	if [ ! -d /sys/module/ecm ]; then
-		return;
-	fi
-
-	echo 0 > /sys/kernel/debug/ecm/ecm_db/defunct_all
-	echo 0 > /sys/kernel/debug/ecm/front_end_ipv4_stop
-	echo 0 > /sys/kernel/debug/ecm/front_end_ipv6_stop
-}
-
-start() {
-	ecm_load
-
-	local kernel_version=$(uname -r)
-
-	insmod /lib/modules/${kernel_version}/qca-nss-ipsec-klips.ko
-	if [ "$?" -gt 0 ]; then
-		echo "Failed to load plugin. Please start ecm if not done already"
-		ecm_enable
-		return
-	fi
-
-	/etc/init.d/ipsec start
-	sleep 2
-	ipsec eroute
-
-	ecm_enable
-}
-
-stop() {
-	ecm_disable
-
-	/etc/init.d/ipsec stop
-	rmmod qca-nss-ipsec-klips
-
-	ecm_unload
-}
-
-restart() {
-	stop
-	start
-}

feeds/ipq807x/qca-nss-dp/Makefile

@@ -1,52 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=qca-nss-dp
-PKG_SOURCE_PROTO:=git
-PKG_BRANCH:=master
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/qca-nss-dp
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Devices
-  DEPENDS:=@TARGET_ipq807x +kmod-qca-ssdk
-  TITLE:=Kernel driver for NSS data plane
-  FILES:=$(PKG_BUILD_DIR)/qca-nss-dp.ko
-  AUTOLOAD:=$(call AutoLoad,31,qca-nss-dp)
-endef
-
-define KernelPackage/qca-nss-dp/Description
-This package contains a NSS data plane driver for QCA chipset
-endef
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/include/qca-nss-dp
-	$(CP) $(PKG_BUILD_DIR)/exports/* $(1)/usr/include/qca-nss-dp/
-endef
-
-EXTRA_CFLAGS+= \
-	-I$(STAGING_DIR)/usr/include/qca-ssdk
-
-subtarget:=$(SUBTARGET)
-
-NSS_DP_HAL_DIR:=$(PKG_BUILD_DIR)/hal
-hal_arch:=$(subtarget)
-
-define Build/Configure
-	$(LN) $(NSS_DP_HAL_DIR)/arch/$(hal_arch)/nss_$(hal_arch).h \
-		$(PKG_BUILD_DIR)/exports/nss_dp_arch.h
-endef
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		M="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" SoC="$(subtarget)" \
-		modules
-endef
-
-$(eval $(call KernelPackage,qca-nss-dp))

feeds/ipq807x/qca-nss-dp/src/Makefile

@@ -1,56 +0,0 @@
-###################################################
-# Makefile for the NSS data plane driver
-###################################################
-
-obj ?= .
-
-obj-m += qca-nss-dp.o
-
-qca-nss-dp-objs += nss_dp_attach.o \
-		   nss_dp_ethtools.o \
-		   nss_dp_main.o
-
-ifneq ($(CONFIG_NET_SWITCHDEV),)
-qca-nss-dp-objs += nss_dp_switchdev.o
-endif
-
-ifeq ($(SoC),$(filter $(SoC),ipq807x ipq807x_64 ipq60xx ipq60xx_64))
-qca-nss-dp-objs += hal/edma/edma_cfg.o \
-		   hal/edma/edma_data_plane.o \
-		   hal/edma/edma_tx_rx.o \
-		   hal/gmac_hal_ops/qcom/qcom_if.o \
-		   hal/gmac_hal_ops/syn/xgmac/syn_if.o
-endif
-
-NSS_DP_INCLUDE = -I$(obj)/include -I$(obj)/exports -I$(obj)/gmac_hal_ops/include \
-		 -I$(obj)/hal/include
-
-ifeq ($(SoC),$(filter $(SoC),ipq50xx ipq50xx_64))
-NSS_DP_INCLUDE += -I$(obj)/hal/gmac_hal_ops/syn/gmac
-endif
-
-ccflags-y += $(NSS_DP_INCLUDE)
-ccflags-y += -Wall -Werror
-
-ifeq ($(SoC),$(filter $(SoC),ipq807x ipq807x_64 ipq60xx ipq60xx_64))
-ccflags-y += -DNSS_DP_PPE_SUPPORT
-endif
-
-ifeq ($(SoC),$(filter $(SoC),ipq60xx ipq60xx_64))
-qca-nss-dp-objs += hal/arch/ipq60xx/nss_ipq60xx.o
-ccflags-y += -DNSS_DP_IPQ60XX
-endif
-
-ifeq ($(SoC),$(filter $(SoC),ipq807x ipq807x_64))
-qca-nss-dp-objs += hal/arch/ipq807x/nss_ipq807x.o
-ccflags-y += -DNSS_DP_IPQ807X -DNSS_DP_EDMA_TX_SMALL_PKT_WAR
-endif
-
-ifeq ($(SoC),$(filter $(SoC),ipq50xx ipq50xx_64))
-qca-nss-dp-objs += hal/arch/ipq50xx/nss_ipq50xx.o \
-		   hal/gmac_hal_ops/syn/gmac/syn_if.o \
-		   hal/syn_gmac_dp/syn_data_plane.o \
-		   hal/syn_gmac_dp/syn_dp_tx_rx.o \
-		   hal/syn_gmac_dp/syn_dp_cfg.o
-ccflags-y += -DNSS_DP_IPQ50XX
-endif

feeds/ipq807x/qca-nss-dp/src/exports/nss_dp_api_if.h

@@ -1,219 +0,0 @@
-/*
- **************************************************************************
- * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************
- */
-
-/**
- * @file nss_dp_api_if.h
- *	nss-dp exported structures/apis.
- *
- * This file declares all the public interfaces
- * for NSS data-plane driver.
- */
-
-#ifndef __NSS_DP_API_IF_H
-#define __NSS_DP_API_IF_H
-
-#include "nss_dp_arch.h"
-
-/**
- * @addtogroup nss_dp_subsystem
- * @{
- */
-
-/*
- * NSS DP status
- */
-#define NSS_DP_SUCCESS	0
-#define NSS_DP_FAILURE	-1
-
-/*
- * NSS DP platform specific defines
- */
-#define NSS_DP_START_IFNUM	NSS_DP_HAL_START_IFNUM
-			/**< First GMAC interface number (0/1) depending on SoC. */
-#define NSS_DP_MAX_MTU_SIZE	NSS_DP_HAL_MAX_MTU_SIZE
-#define NSS_DP_MAX_PACKET_LEN	NSS_DP_HAL_MAX_PACKET_LEN
-#define NSS_DP_MAX_INTERFACES	(NSS_DP_HAL_MAX_PORTS + NSS_DP_HAL_START_IFNUM)
-			/**< Last interface index for the SoC, to be used by qca-nss-drv. */
-
-/*
- * NSS PTP service code
- */
-#define NSS_PTP_EVENT_SERVICE_CODE	0x9
-
-/**
- * nss_dp_data_plane_ctx
- *	Data plane context base class.
- */
-struct nss_dp_data_plane_ctx {
-	struct net_device *dev;
-};
-
-/**
- * nss_dp_gmac_stats
- *	The per-GMAC statistics structure.
- */
-struct nss_dp_gmac_stats {
-	struct nss_dp_hal_gmac_stats stats;
-};
-
-/**
- * nss_dp_data_plane_ops
- *	Per data-plane ops structure.
- *
- * Default would be slowpath and can be overridden by nss-drv
- */
-struct nss_dp_data_plane_ops {
-	int (*init)(struct nss_dp_data_plane_ctx *dpc);
-	int (*open)(struct nss_dp_data_plane_ctx *dpc, uint32_t tx_desc_ring,
-		    uint32_t rx_desc_ring, uint32_t mode);
-	int (*close)(struct nss_dp_data_plane_ctx *dpc);
-	int (*link_state)(struct nss_dp_data_plane_ctx *dpc,
-			  uint32_t link_state);
-	int (*mac_addr)(struct nss_dp_data_plane_ctx *dpc, uint8_t *addr);
-	int (*change_mtu)(struct nss_dp_data_plane_ctx *dpc, uint32_t mtu);
-	netdev_tx_t (*xmit)(struct nss_dp_data_plane_ctx *dpc, struct sk_buff *os_buf);
-	void (*set_features)(struct nss_dp_data_plane_ctx *dpc);
-	int (*pause_on_off)(struct nss_dp_data_plane_ctx *dpc,
-			    uint32_t pause_on);
-	int (*vsi_assign)(struct nss_dp_data_plane_ctx *dpc, uint32_t vsi);
-	int (*vsi_unassign)(struct nss_dp_data_plane_ctx *dpc, uint32_t vsi);
-	int (*rx_flow_steer)(struct nss_dp_data_plane_ctx *dpc, struct sk_buff *skb,
-				uint32_t cpu, bool is_add);
-	void (*get_stats)(struct nss_dp_data_plane_ctx *dpc, struct nss_dp_gmac_stats *stats);
-	int (*deinit)(struct nss_dp_data_plane_ctx *dpc);
-};
-
-/**
- * nss_dp_receive
- *	Called by overlay drivers to deliver packets to nss-dp.
- *
- * @datatypes
- * net_device
- * sk_buff
- * napi_struct
- *
- * @param[in] netdev Pointer to netdev structure on which packet is received.
- * @param[in] skb Pointer to the received packet.
- * @param[in] napi Pointer to napi context.
- */
-void nss_dp_receive(struct net_device *netdev, struct sk_buff *skb,
-						struct napi_struct *napi);
-
-/**
- * nss_dp_is_in_open_state
- *	Returns if a data plane is opened or not.
- *
- * @datatypes
- * net_device
- *
- * @param[in] netdev Pointer to netdev structure.
- *
- * @return
- * bool
- */
-bool nss_dp_is_in_open_state(struct net_device *netdev);
-
-/**
- * nss_dp_override_data_palne
- *	API to allow overlay drivers to override the data plane.
- *
- * @datatypes
- * net_device
- * nss_dp_data_plane_ops
- * nss_dp_data_plane_ctx
- *
- * @param[in] netdev Pointer to netdev structure.
- * @param[in] dp_ops Pointer to respective data plane ops structure.
- * @param[in] dpc Pointer to data plane context.
- *
- * @return
- * int
- */
-int nss_dp_override_data_plane(struct net_device *netdev,
-			       struct nss_dp_data_plane_ops *dp_ops,
-			       struct nss_dp_data_plane_ctx *dpc);
-
-/**
- * nss_dp_start_data_plane
- *	Dataplane API to inform netdev when it is ready to start.
- *
- * @datatypes
- * net_device
- * nss_dp_data_plane_ctx
- *
- * @param[in] netdev Pointer to netdev structure.
- * @param[in] dpc Pointer to data plane context.
- */
-void nss_dp_start_data_plane(struct net_device *netdev,
-			     struct nss_dp_data_plane_ctx *dpc);
-
-/**
- * nss_dp_restore_data_plane
- *	Called by overlay drivers to detach itself from nss-dp.
- *
- * @datatypes
- * net_device
- *
- * @param[in] netdev Pointer to netdev structure.
- */
-void nss_dp_restore_data_plane(struct net_device *netdev);
-
-/**
- * nss_dp_get_netdev_by_nss_if_num
- *	Returns the net device of the corresponding id if it exists.
- *
- * @datatypes
- * int
- *
- * @param[in] interface ID of the physical mac port.
- *
- * @return
- * Pointer to netdev structure.
- */
-struct net_device *nss_dp_get_netdev_by_nss_if_num(int if_num);
-
-/**
- * nss_phy_tstamp_rx_buf
- *	Receive timestamp packet.
- *
- * @datatypes
- * sk_buff
- *
- * @param[in] app_data Pointer to the application context of the message.
- * @param[in] skb Pointer to the packet.
- */
-void nss_phy_tstamp_rx_buf(void *app_data, struct sk_buff *skb);
-
-/**
- * nss_phy_tstamp_tx_buf
- *	Transmit timestamp packet
- *
- * @datatypes
- * net_device
- * sk_buff
- *
- * @param[in] net_device Pointer to netdev structure.
- * @param[in] skb Pointer to the packet.
- */
-void nss_phy_tstamp_tx_buf(struct net_device *ndev, struct sk_buff *skb);
-
-/**
- *@}
- */
-
-#endif	/** __NSS_DP_API_IF_H */

feeds/ipq807x/qca-nss-dp/src/hal/arch/ipq50xx/nss_ipq50xx.c

@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <linux/of.h>
-#include <linux/clk.h>
-#include <linux/ioport.h>
-#include <linux/qcom_scm.h>
-#include "nss_dp_hal.h"
-
-/*
- * nss_dp_hal_tcsr_base_get
- *	Reads TCSR base address from DTS
- */
-static uint32_t nss_dp_hal_tcsr_base_get(void)
-{
-	uint32_t tcsr_base_addr = 0;
-	struct device_node *dp_cmn;
-
-	/*
-	 * Get reference to NSS dp common device node
-	 */
-	dp_cmn = of_find_node_by_name(NULL, "nss-dp-common");
-	if (!dp_cmn) {
-		pr_info("%s: NSS DP common node not found\n", __func__);
-		return 0;
-	}
-
-	if (of_property_read_u32(dp_cmn, "qcom,tcsr-base", &tcsr_base_addr)) {
-		pr_err("%s: error reading TCSR base\n", __func__);
-	}
-	of_node_put(dp_cmn);
-
-	return tcsr_base_addr;
-}
-
-/*
- * nss_dp_hal_tcsr_set
- *	Sets the TCSR axi cache override register
- */
-static void nss_dp_hal_tcsr_set(void)
-{
-	void __iomem *tcsr_addr = NULL;
-	uint32_t tcsr_base;
-	int err;
-
-	tcsr_base = nss_dp_hal_tcsr_base_get();
-	if (!tcsr_base) {
-		pr_err("%s: Unable to get TCSR base address\n", __func__);
-		return;
-	}
-
-	/*
-	 * Check if Trust Zone is enabled in the system.
-	 * If yes, we need to go through SCM API call to program TCSR register.
-	 * If TZ is not enabled, we can write to the register directly.
-	 */
-	if (qcom_scm_is_available()) {
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0))
-		err = qcom_scm_tcsr_reg_write((tcsr_base + TCSR_GMAC_AXI_CACHE_OVERRIDE_OFFSET),
-						TCSR_GMAC_AXI_CACHE_OVERRIDE_VALUE);
-#else
-		err = qti_scm_tcsr_reg_write((tcsr_base + TCSR_GMAC_AXI_CACHE_OVERRIDE_OFFSET),
-						TCSR_GMAC_AXI_CACHE_OVERRIDE_VALUE);
-#endif
-		if (err) {
-			pr_err("%s: SCM TCSR write error: %d\n", __func__, err);
-		}
-	} else {
-		tcsr_addr = ioremap_nocache((tcsr_base + TCSR_GMAC_AXI_CACHE_OVERRIDE_OFFSET),
-						TCSR_GMAC_AXI_CACHE_OVERRIDE_REG_SIZE);
-		if (!tcsr_addr) {
-			pr_err("%s: ioremap failed\n", __func__);
-			return;
-		}
-		writel(TCSR_GMAC_AXI_CACHE_OVERRIDE_VALUE, tcsr_addr);
-		iounmap(tcsr_addr);
-	}
-}
-
-/*
- * nss_dp_hal_get_data_plane_ops
- *	Return the data plane ops for GMAC data plane.
- */
-struct nss_dp_data_plane_ops *nss_dp_hal_get_data_plane_ops(void)
-{
-	return &nss_dp_gmac_ops;
-}
-
-/*
- * nss_dp_hal_clk_enable
- *	Function to enable GCC_SNOC_GMAC_AXI_CLK.
- *
- * These clocks are required for GMAC operations.
- */
-void nss_dp_hal_clk_enable(struct nss_dp_dev *dp_priv)
-{
-	struct platform_device *pdev = dp_priv->pdev;
-	struct device *dev = &pdev->dev;
-	struct clk *gmac_clk = NULL;
-	int err;
-
-	gmac_clk = devm_clk_get(dev, NSS_SNOC_GMAC_AXI_CLK);
-	if (IS_ERR(gmac_clk)) {
-		pr_err("%s: cannot get clock: %s\n", __func__,
-						NSS_SNOC_GMAC_AXI_CLK);
-		return;
-	}
-
-	err = clk_prepare_enable(gmac_clk);
-	if (err) {
-		pr_err("%s: cannot enable clock: %s, err: %d\n", __func__,
-						NSS_SNOC_GMAC_AXI_CLK, err);
-		return;
-	}
-}
-
-/*
- * nss_dp_hal_init
- *	Sets the gmac ops based on the GMAC type.
- */
-bool nss_dp_hal_init(void)
-{
-	nss_dp_hal_set_gmac_ops(&syn_hal_ops, GMAC_HAL_TYPE_SYN_GMAC);
-
-	/*
-	 * Program the global GMAC AXI Cache override register
-	 * for optimized AXI DMA operation.
-	 */
-	nss_dp_hal_tcsr_set();
-	return true;
-}
-
-/*
- * nss_dp_hal_cleanup
- *	Sets the gmac ops to NULL.
- */
-void nss_dp_hal_cleanup(void)
-{
-	nss_dp_hal_set_gmac_ops(NULL, GMAC_HAL_TYPE_SYN_GMAC);
-}

feeds/ipq807x/qca-nss-dp/src/hal/arch/ipq50xx/nss_ipq50xx.h

@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __NSS_DP_ARCH_H__
-#define __NSS_DP_ARCH_H__
-
-#define NSS_DP_HAL_MAX_PORTS			2
-#define NSS_DP_HAL_CPU_NUM			2
-#define NSS_DP_HAL_START_IFNUM			0
-#define NSS_DP_GMAC_NORMAL_FRAME_MTU		1500
-#define NSS_DP_GMAC_MINI_JUMBO_FRAME_MTU	1978
-#define NSS_DP_GMAC_FULL_JUMBO_FRAME_MTU	9000
-#define NSS_DP_HAL_MAX_MTU_SIZE			NSS_DP_GMAC_FULL_JUMBO_FRAME_MTU
-#define NSS_DP_HAL_MAX_PACKET_LEN		65535
-
-/*
- * TCSR_GMAC_AXI_CACHE_OVERRIDE register size
- */
-#define TCSR_GMAC_AXI_CACHE_OVERRIDE_REG_SIZE	4
-
-/*
- * TCSR_GMAC_AXI_CACHE_OVERRIDE Register offset
- */
-#define TCSR_GMAC_AXI_CACHE_OVERRIDE_OFFSET	0x6224
-
-/*
- * Value for TCSR_GMAC_AXI_CACHE_OVERRIDE register
- */
-#define TCSR_GMAC_AXI_CACHE_OVERRIDE_VALUE	0x05050505
-
-/*
- * GCC_SNOC_GMAC_AXI_CLOCK
- */
-#define NSS_SNOC_GMAC_AXI_CLK			"nss-snoc-gmac-axi-clk"
-
-/**
- * nss_dp_hal_gmac_stats
- *	The per-GMAC statistics structure.
- */
-struct nss_dp_hal_gmac_stats {
-	uint64_t rx_bytes;		/**< Number of RX bytes */
-	uint64_t rx_packets;		/**< Number of RX packets */
-	uint64_t rx_errors;		/**< Number of RX errors */
-	uint64_t rx_receive_errors;	/**< Number of RX receive errors */
-	uint64_t rx_descriptor_errors;	/**< Number of RX descriptor errors */
-	uint64_t rx_late_collision_errors;
-					/**< Number of RX late collision errors */
-	uint64_t rx_dribble_bit_errors;	/**< Number of RX dribble bit errors */
-	uint64_t rx_length_errors;	/**< Number of RX length errors */
-	uint64_t rx_ip_header_errors;	/**< Number of RX IP header errors read from rxdec */
-	uint64_t rx_ip_payload_errors;	/**< Number of RX IP payload errors */
-	uint64_t rx_no_buffer_errors;	/**< Number of RX no-buffer errors */
-	uint64_t rx_transport_csum_bypassed;
-					/**< Number of RX packets where the transport checksum was bypassed */
-	uint64_t tx_bytes;		/**< Number of TX bytes */
-	uint64_t tx_packets;		/**< Number of TX packets */
-	uint64_t tx_collisions;		/**< Number of TX collisions */
-	uint64_t tx_errors;		/**< Number of TX errors */
-	uint64_t tx_jabber_timeout_errors;
-					/**< Number of TX jabber timeout errors */
-	uint64_t tx_frame_flushed_errors;
-					/**< Number of TX frame flushed errors */
-	uint64_t tx_loss_of_carrier_errors;
-					/**< Number of TX loss of carrier errors */
-	uint64_t tx_no_carrier_errors;	/**< Number of TX no carrier errors */
-	uint64_t tx_late_collision_errors;
-					/**< Number of TX late collision errors */
-	uint64_t tx_excessive_collision_errors;
-					/**< Number of TX excessive collision errors */
-	uint64_t tx_excessive_deferral_errors;
-					/**< Number of TX excessive deferral errors */
-	uint64_t tx_underflow_errors;	/**< Number of TX underflow errors */
-	uint64_t tx_ip_header_errors;	/**< Number of TX IP header errors */
-	uint64_t tx_ip_payload_errors;	/**< Number of TX IP payload errors */
-	uint64_t tx_dropped;		/**< Number of TX dropped packets */
-	uint64_t hw_errs[10];		/**< GMAC DMA error counters */
-	uint64_t rx_missed;		/**< Number of RX packets missed by the DMA */
-	uint64_t fifo_overflows;	/**< Number of RX FIFO overflows signalled by the DMA */
-	uint64_t rx_scatter_errors;	/**< Number of scattered frames received by the DMA */
-	uint64_t tx_ts_create_errors;	/**< Number of tx timestamp creation errors */
-	uint64_t gmac_total_ticks;	/**< Total clock ticks spend inside the GMAC */
-	uint64_t gmac_worst_case_ticks;	/**< Worst case iteration of the GMAC in ticks */
-	uint64_t gmac_iterations;	/**< Number of iterations around the GMAC */
-	uint64_t tx_pause_frames;	/**< Number of pause frames sent by the GMAC */
-	uint64_t mmc_rx_overflow_errors;
-					/**< Number of RX overflow errors */
-	uint64_t mmc_rx_watchdog_timeout_errors;
-					/**< Number of RX watchdog timeout errors */
-	uint64_t mmc_rx_crc_errors;	/**< Number of RX CRC errors */
-	uint64_t mmc_rx_ip_header_errors;
-					/**< Number of RX IP header errors read from MMC counter*/
-	uint64_t mmc_rx_octets_g;
-					/**< Number of good octets received */
-	uint64_t mmc_rx_ucast_frames;	/**< Number of Unicast frames received */
-	uint64_t mmc_rx_bcast_frames;	/**< Number of Bcast frames received */
-	uint64_t mmc_rx_mcast_frames;	/**< Number of Mcast frames received */
-	uint64_t mmc_rx_undersize;
-					/**< Number of RX undersize frames */
-	uint64_t mmc_rx_oversize;
-					/**< Number of RX oversize frames */
-	uint64_t mmc_rx_jabber;		/**< Number of jabber frames */
-	uint64_t mmc_rx_octets_gb;
-					/**< Number of good/bad octets */
-	uint64_t mmc_rx_frag_frames_g;	/**< Number of good ipv4 frag frames */
-	uint64_t mmc_tx_octets_g;	/**< Number of good octets sent */
-	uint64_t mmc_tx_ucast_frames;	/**< Number of Unicast frames sent*/
-	uint64_t mmc_tx_bcast_frames;	/**< Number of Broadcast frames sent */
-	uint64_t mmc_tx_mcast_frames;	/**< Number of Multicast frames sent */
-	uint64_t mmc_tx_deferred;	/**< Number of Deferred frames sent */
-	uint64_t mmc_tx_single_col;	/**< Number of single collisions */
-	uint64_t mmc_tx_multiple_col;	/**< Number of multiple collisions */
-	uint64_t mmc_tx_octets_gb;	/**< Number of good/bad octets sent*/
-};
-
-extern struct nss_dp_data_plane_ops nss_dp_gmac_ops;
-
-#endif /* __NSS_DP_ARCH_H__ */

feeds/ipq807x/qca-nss-dp/src/hal/arch/ipq60xx/nss_ipq60xx.c

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "nss_dp_hal.h"
-#include "edma.h"
-
-/*
- * nss_dp_hal_get_data_plane_ops()
- *	Return the data plane ops for edma data plane.
- */
-struct nss_dp_data_plane_ops *nss_dp_hal_get_data_plane_ops(void)
-{
-	return &nss_dp_edma_ops;
-}
-
-/*
- * nss_dp_hal_init()
- *	Initialize EDMA and set gmac ops.
- */
-bool nss_dp_hal_init(void)
-{
-	nss_dp_hal_set_gmac_ops(&qcom_hal_ops, GMAC_HAL_TYPE_QCOM);
-	nss_dp_hal_set_gmac_ops(&syn_hal_ops, GMAC_HAL_TYPE_SYN_XGMAC);
-
-	if (edma_init()) {
-		return false;
-	}
-	return true;
-}
-
-/*
- * nss_dp_hal_cleanup()
- *	Cleanup EDMA and set gmac ops to NULL.
- */
-void nss_dp_hal_cleanup(void)
-{
-	nss_dp_hal_set_gmac_ops(NULL, GMAC_HAL_TYPE_QCOM);
-	nss_dp_hal_set_gmac_ops(NULL, GMAC_HAL_TYPE_SYN_XGMAC);
-	edma_cleanup(false);
-}

feeds/ipq807x/qca-nss-dp/src/hal/arch/ipq60xx/nss_ipq60xx.h

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __NSS_DP_ARCH_H__
-#define __NSS_DP_ARCH_H__
-
-#define NSS_DP_HAL_MAX_PORTS		5
-#define NSS_DP_HAL_CPU_NUM		4
-#define NSS_DP_HAL_START_IFNUM		1
-#define NSS_DP_HAL_MAX_MTU_SIZE		9216
-#define NSS_DP_HAL_MAX_PACKET_LEN	65535
-#define NSS_DP_PREHEADER_SIZE		32
-
-/**
- * nss_dp_hal_gmac_stats
- *	The per-GMAC statistics structure.
- */
-struct nss_dp_hal_gmac_stats {
-};
-
-#endif /* __NSS_DP_ARCH_H__ */

feeds/ipq807x/qca-nss-dp/src/hal/arch/ipq807x/nss_ipq807x.c

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "nss_dp_hal.h"
-#include "edma.h"
-
-/*
- * nss_dp_hal_get_data_plane_ops()
- *	Return the data plane ops for edma data plane.
- */
-struct nss_dp_data_plane_ops *nss_dp_hal_get_data_plane_ops(void)
-{
-	return &nss_dp_edma_ops;
-}
-
-/*
- * nss_dp_hal_init()
- *	Initialize EDMA and set gmac ops.
- */
-bool nss_dp_hal_init(void)
-{
-	nss_dp_hal_set_gmac_ops(&qcom_hal_ops, GMAC_HAL_TYPE_QCOM);
-	nss_dp_hal_set_gmac_ops(&syn_hal_ops, GMAC_HAL_TYPE_SYN_XGMAC);
-
-	if (edma_init()) {
-		return false;
-	}
-	return true;
-}
-
-/*
- * nss_dp_hal_cleanup()
- *	Cleanup EDMA and set gmac ops to NULL.
- */
-void nss_dp_hal_cleanup(void)
-{
-	nss_dp_hal_set_gmac_ops(NULL, GMAC_HAL_TYPE_QCOM);
-	nss_dp_hal_set_gmac_ops(NULL, GMAC_HAL_TYPE_SYN_XGMAC);
-	edma_cleanup(false);
-}

feeds/ipq807x/qca-nss-dp/src/hal/arch/ipq807x/nss_ipq807x.h

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __NSS_DP_ARCH_H__
-#define __NSS_DP_ARCH_H__
-
-#define NSS_DP_HAL_MAX_PORTS		6
-#define NSS_DP_HAL_CPU_NUM		4
-#define NSS_DP_HAL_START_IFNUM		1
-#define NSS_DP_HAL_MAX_MTU_SIZE		9216
-#define NSS_DP_HAL_MAX_PACKET_LEN	65535
-#define NSS_DP_PREHEADER_SIZE		32
-
-/**
- * nss_dp_hal_gmac_stats
- *	The per-GMAC statistics structure.
- */
-struct nss_dp_hal_gmac_stats {
-};
-
-#endif /* __NSS_DP_ARCH_H__ */

feeds/ipq807x/qca-nss-dp/src/hal/edma/edma_cfg.c

@@ -1,967 +0,0 @@
-/*
- * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
- * USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <linux/interrupt.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-#include <linux/debugfs.h>
-#include <linux/reset.h>
-
-#include "nss_dp_dev.h"
-#include "edma_regs.h"
-#include "edma_data_plane.h"
-
-#define EDMA_HW_RESET_ID "edma_rst"
-
-/*
- * edma_cleanup_rxfill_ring_res()
- *	Cleanup resources for one RxFill ring
- */
-static void edma_cleanup_rxfill_ring_res(struct edma_hw *ehw,
-				struct edma_rxfill_ring *rxfill_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-	struct sk_buff *skb;
-	uint16_t cons_idx, curr_idx;
-	struct edma_rxfill_desc *rxfill_desc;
-	uint32_t reg_data = 0;
-	struct edma_rx_preheader *rxph = NULL;
-	int store_idx;
-
-	/*
-	 * Read RXFILL ring producer index
-	 */
-	reg_data = edma_reg_read(EDMA_REG_RXFILL_PROD_IDX(rxfill_ring->id));
-	curr_idx = reg_data & EDMA_RXFILL_PROD_IDX_MASK;
-
-	/*
-	 * Read RXFILL ring consumer index
-	 */
-	reg_data = edma_reg_read(EDMA_REG_RXFILL_CONS_IDX(rxfill_ring->id));
-	cons_idx = reg_data & EDMA_RXFILL_CONS_IDX_MASK;
-
-	while (curr_idx != cons_idx) {
-		/*
-		 * Get RXFILL descriptor
-		 */
-		rxfill_desc = EDMA_RXFILL_DESC(rxfill_ring, cons_idx);
-
-		/*
-		 * Get Rx preheader
-		 */
-		rxph = (struct edma_rx_preheader *)
-			phys_to_virt(rxfill_desc->buffer_addr);
-
-		dma_unmap_single(&pdev->dev, rxfill_desc->buffer_addr,
-					EDMA_RX_BUFF_SIZE, DMA_FROM_DEVICE);
-
-		/*
-		 * Get sk_buff and free it
-		 */
-		store_idx = rxph->opaque;
-		skb = ehw->rx_skb_store[store_idx];
-		ehw->rx_skb_store[store_idx] = NULL;
-		dev_kfree_skb_any(skb);
-		cons_idx++;
-		if (cons_idx == rxfill_ring->count)
-			cons_idx = 0;
-	}
-
-	/*
-	 * Free RXFILL ring descriptors
-	 */
-	dma_free_coherent(&pdev->dev,
-				(sizeof(struct edma_rxfill_desc)
-				* rxfill_ring->count),
-				rxfill_ring->desc, rxfill_ring->dma);
-}
-
-/*
- * edma_setup_rxfill_ring_res()
- *	Setup resources for one RxFill ring
- */
-static int edma_setup_rxfill_ring_res(struct edma_hw *ehw,
-				struct edma_rxfill_ring *rxfill_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-
-	/*
-	 * Allocate RxFill ring descriptors
-	 */
-	rxfill_ring->desc = dma_alloc_coherent(&pdev->dev,
-				(sizeof(struct edma_rxfill_desc)
-				* rxfill_ring->count),
-				&rxfill_ring->dma, GFP_KERNEL);
-	if (!rxfill_ring->desc) {
-		pr_warn("Descriptor alloc for RXFILL ring %u failed\n",
-				rxfill_ring->id);
-		return -ENOMEM;
-	}
-
-	spin_lock_init(&rxfill_ring->lock);
-	return 0;
-}
-
-/*
- * edma_setup_rxdesc_ring_res()
- *	Setup resources for one RxDesc ring
- */
-static int edma_setup_rxdesc_ring_res(struct edma_hw *ehw,
-				struct edma_rxdesc_ring *rxdesc_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-
-	/*
-	 * Allocate RxDesc ring descriptors
-	 */
-	rxdesc_ring->desc = dma_alloc_coherent(&pdev->dev,
-				(sizeof(struct edma_rxdesc_desc)
-				* rxdesc_ring->count),
-				&rxdesc_ring->dma, GFP_KERNEL);
-	if (!rxdesc_ring->desc) {
-		pr_warn("Descriptor alloc for RXDESC ring %u failed\n",
-				rxdesc_ring->id);
-		return -ENOMEM;
-	}
-
-	return 0;
-}
-
-/*
- * edma_cleanup_rxdesc_ring_res()
- *	Cleanup resources for RxDesc ring
- */
-static void edma_cleanup_rxdesc_ring_res(struct edma_hw *ehw,
-				struct edma_rxdesc_ring *rxdesc_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-	struct sk_buff *skb;
-	struct edma_rxdesc_desc *rxdesc_desc;
-	struct edma_rx_preheader *rxph = NULL;
-	uint16_t prod_idx = 0;
-	uint16_t cons_idx = 0;
-	int store_idx;
-
-	cons_idx = edma_reg_read(EDMA_REG_RXDESC_CONS_IDX(rxdesc_ring->id))
-					& EDMA_RXDESC_CONS_IDX_MASK;
-
-	prod_idx = edma_reg_read(EDMA_REG_RXDESC_PROD_IDX(rxdesc_ring->id))
-					& EDMA_RXDESC_PROD_IDX_MASK;
-
-	/*
-	 * Free any buffers assigned to any descriptors
-	 */
-	while (cons_idx != prod_idx) {
-		rxdesc_desc = EDMA_RXDESC_DESC(rxdesc_ring, cons_idx);
-
-		rxph = (struct edma_rx_preheader *)
-			phys_to_virt(rxdesc_desc->buffer_addr);
-
-		dma_unmap_single(&pdev->dev, rxdesc_desc->buffer_addr,
-					EDMA_RX_BUFF_SIZE, DMA_FROM_DEVICE);
-		store_idx = rxph->opaque;
-		skb = ehw->rx_skb_store[store_idx];
-		ehw->rx_skb_store[store_idx] = NULL;
-		dev_kfree_skb_any(skb);
-
-		/*
-		 * Update consumer index
-		 */
-		if (++cons_idx == rxdesc_ring->count)
-			cons_idx = 0;
-	}
-
-	/*
-	 * Free RXDESC ring descriptors
-	 */
-	dma_free_coherent(&pdev->dev,
-				(sizeof(struct edma_rxdesc_desc)
-				* rxdesc_ring->count),
-				rxdesc_ring->desc, rxdesc_ring->dma);
-}
-
-/*
- * edma_cleanup_txcmpl_ring_res()
- *	Cleanup resources for one TxCmpl ring
- */
-static void edma_cleanup_txcmpl_ring_res(struct edma_hw *ehw,
-				struct edma_txcmpl_ring *txcmpl_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-
-	/*
-	 * Free any buffers assigned to any descriptors
-	 */
-	edma_clean_tx(ehw, txcmpl_ring);
-
-	/*
-	 * Free TxCmpl ring descriptors
-	 */
-	dma_free_coherent(&pdev->dev,
-				(sizeof(struct edma_txcmpl_desc)
-				* txcmpl_ring->count),
-				txcmpl_ring->desc, txcmpl_ring->dma);
-}
-
-/*
- * edma_setup_txcmpl_ring_res()
- *	Setup resources for one TxCmpl ring
- */
-static int edma_setup_txcmpl_ring_res(struct edma_hw *ehw,
-				struct edma_txcmpl_ring *txcmpl_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-
-	/*
-	 * Allocate TxCmpl ring descriptors
-	 */
-	txcmpl_ring->desc = dma_alloc_coherent(&pdev->dev,
-					(sizeof(struct edma_txcmpl_desc)
-					* txcmpl_ring->count),
-					&txcmpl_ring->dma, GFP_KERNEL);
-
-	if (!txcmpl_ring->desc) {
-		pr_warn("Descriptor alloc for TXCMPL ring %u failed\n",
-				txcmpl_ring->id);
-
-		return -ENOMEM;
-	}
-
-	return 0;
-}
-
-/*
- * edma_cleanup_txdesc_ring_res()
- *	Cleanup resources for one TxDesc ring
- */
-static void edma_cleanup_txdesc_ring_res(struct edma_hw *ehw,
-				struct edma_txdesc_ring *txdesc_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-	struct sk_buff *skb = NULL;
-	struct edma_txdesc_desc *txdesc = NULL;
-	uint16_t prod_idx, cons_idx;
-	size_t buf_len;
-	uint32_t data;
-	int store_idx;
-
-	/*
-	 * Free any buffers assigned to any descriptors
-	 */
-	data = edma_reg_read(EDMA_REG_TXDESC_PROD_IDX(txdesc_ring->id));
-	prod_idx = data & EDMA_TXDESC_PROD_IDX_MASK;
-
-	data = edma_reg_read(EDMA_REG_TXDESC_CONS_IDX(txdesc_ring->id));
-	cons_idx = data & EDMA_TXDESC_CONS_IDX_MASK;
-
-	while (cons_idx != prod_idx) {
-		txdesc = EDMA_TXDESC_DESC(txdesc_ring, cons_idx);
-		store_idx = txdesc->buffer_addr;
-		skb = ehw->tx_skb_store[store_idx];
-		ehw->tx_skb_store[store_idx] = NULL;
-
-		buf_len = (txdesc->word1 & EDMA_TXDESC_DATA_LENGTH_MASK) >>
-				EDMA_TXDESC_DATA_LENGTH_SHIFT;
-
-		dma_unmap_single(&pdev->dev, (dma_addr_t)skb->data,
-				buf_len + EDMA_TX_PREHDR_SIZE, DMA_TO_DEVICE);
-
-		dev_kfree_skb_any(skb);
-		cons_idx = (cons_idx + 1) & (txdesc_ring->count - 1);
-		cons_idx++;
-		if (cons_idx == txdesc_ring->count)
-			cons_idx = 0;
-
-	}
-
-	/*
-	 * Free Tx ring descriptors
-	 */
-	dma_free_coherent(&pdev->dev,
-			  (sizeof(struct edma_txdesc_desc)
-			   * txdesc_ring->count),
-			   txdesc_ring->desc, txdesc_ring->dma);
-
-}
-
-/*
- * edma_setup_txdesc_ring_res()
- *	Setup resources for one TxDesc ring
- */
-static int edma_setup_txdesc_ring_res(struct edma_hw *ehw,
-				struct edma_txdesc_ring *txdesc_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-
-	/*
-	 * Allocate Tx ring descriptors
-	 */
-	txdesc_ring->desc = dma_alloc_coherent(&pdev->dev,
-					(sizeof(struct edma_txdesc_desc)
-					* txdesc_ring->count),
-					&txdesc_ring->dma, GFP_KERNEL);
-	if (!txdesc_ring->desc) {
-		pr_warn("Descriptor alloc for TXDESC ring %u failed\n",
-				txdesc_ring->id);
-		return -ENOMEM;
-	}
-
-	spin_lock_init(&txdesc_ring->tx_lock);
-
-	return 0;
-}
-
-/*
- * edma_setup_ring_resources()
- *	Allocate/setup resources for EDMA rings
- */
-static int edma_setup_ring_resources(struct edma_hw *ehw)
-{
-	struct edma_txcmpl_ring *txcmpl_ring = NULL;
-	struct edma_txdesc_ring *txdesc_ring = NULL;
-	struct edma_rxfill_ring *rxfill_ring = NULL;
-	struct edma_rxdesc_ring *rxdesc_ring = NULL;
-	int i;
-	int ret;
-	int index;
-
-	/*
-	 * Allocate TxDesc ring descriptors
-	 */
-	for (i = 0; i < ehw->txdesc_rings; i++) {
-		txdesc_ring = &ehw->txdesc_ring[i];
-		txdesc_ring->count = EDMA_RING_SIZE;
-		txdesc_ring->id = ehw->txdesc_ring_start + i;
-
-		ret = edma_setup_txdesc_ring_res(ehw, txdesc_ring);
-		if (ret != 0) {
-			while (i-- >= 0)
-				edma_cleanup_txdesc_ring_res(ehw,
-					&ehw->txdesc_ring[i]);
-
-			return -ENOMEM;
-
-		}
-	}
-
-	/*
-	 * Allocate TxCmpl ring descriptors
-	 */
-	for (i = 0; i < ehw->txcmpl_rings; i++) {
-		txcmpl_ring = &ehw->txcmpl_ring[i];
-		txcmpl_ring->count = EDMA_RING_SIZE;
-		txcmpl_ring->id = ehw->txcmpl_ring_start + i;
-
-		ret = edma_setup_txcmpl_ring_res(ehw, txcmpl_ring);
-
-		if (ret != 0) {
-			while (i-- >= 0)
-				edma_cleanup_txcmpl_ring_res(ehw,
-						&ehw->txcmpl_ring[i]);
-
-			goto txcmpl_mem_alloc_fail;
-		}
-	}
-
-	/*
-	 * Allocate Rx fill ring descriptors
-	 */
-	for (i = 0; i < ehw->rxfill_rings; i++) {
-		rxfill_ring = &ehw->rxfill_ring[i];
-		rxfill_ring->count = EDMA_RING_SIZE;
-		rxfill_ring->id = ehw->rxfill_ring_start + i;
-
-		ret = edma_setup_rxfill_ring_res(ehw, rxfill_ring);
-		if (ret != 0) {
-			while (--i >= 0)
-				edma_cleanup_rxfill_ring_res(ehw,
-					&ehw->rxfill_ring[i]);
-
-			goto rxfill_mem_alloc_fail;
-		}
-	}
-
-	/*
-	 * Allocate RxDesc ring descriptors
-	 */
-	for (i = 0; i < ehw->rxdesc_rings; i++) {
-		rxdesc_ring = &ehw->rxdesc_ring[i];
-		rxdesc_ring->count = EDMA_RING_SIZE;
-		rxdesc_ring->id = ehw->rxdesc_ring_start + i;
-
-		/*
-		 * Create a mapping between RX Desc ring and Rx fill ring.
-		 * Number of fill rings are lesser than the descriptor rings
-		 * Share the fill rings across descriptor rings.
-		 */
-
-		index = ehw->rxfill_ring_start + (i % ehw->rxfill_rings);
-		rxdesc_ring->rxfill =
-			&ehw->rxfill_ring[index - ehw->rxfill_ring_start];
-
-		ret = edma_setup_rxdesc_ring_res(ehw, rxdesc_ring);
-		if (ret != 0) {
-			while (--i >= 0)
-				edma_cleanup_rxdesc_ring_res(ehw,
-						&ehw->rxdesc_ring[i]);
-
-			goto rxdesc_mem_alloc_fail;
-		}
-	}
-
-	return 0;
-
-rxdesc_mem_alloc_fail:
-	for (i = 0; i < ehw->rxfill_rings; i++)
-		edma_cleanup_rxfill_ring_res(ehw, &ehw->rxfill_ring[i]);
-
-rxfill_mem_alloc_fail:
-	for (i = 0; i < ehw->txcmpl_rings; i++)
-		edma_cleanup_txcmpl_ring_res(ehw, &ehw->txcmpl_ring[i]);
-
-txcmpl_mem_alloc_fail:
-	for (i = 0; i < ehw->txdesc_rings; i++)
-		edma_cleanup_txdesc_ring_res(ehw, &ehw->txdesc_ring[i]);
-
-	return -ENOMEM;
-}
-
-/*
- * edma_free_rings()
- *	Free EDMA software rings
- */
-static void edma_free_rings(struct edma_hw *ehw)
-{
-	kfree(ehw->rxfill_ring);
-	kfree(ehw->rxdesc_ring);
-	kfree(ehw->txdesc_ring);
-	kfree(ehw->txcmpl_ring);
-}
-
-/*
- * edma_alloc_rings()
- *	Allocate EDMA software rings
- */
-static int edma_alloc_rings(struct edma_hw *ehw)
-{
-	ehw->rxfill_ring = kzalloc((sizeof(struct edma_rxfill_ring) *
-				ehw->rxfill_rings), GFP_KERNEL);
-	if (!ehw->rxfill_ring)
-		return -ENOMEM;
-
-	ehw->rxdesc_ring = kzalloc((sizeof(struct edma_rxdesc_ring) *
-				ehw->rxdesc_rings), GFP_KERNEL);
-	if (!ehw->rxdesc_ring)
-		goto rxdesc_ring_alloc_fail;
-
-	ehw->txdesc_ring = kzalloc((sizeof(struct edma_txdesc_ring) *
-				ehw->txdesc_rings), GFP_KERNEL);
-	if (!ehw->txdesc_ring)
-		goto txdesc_ring_alloc_fail;
-
-	ehw->txcmpl_ring = kzalloc((sizeof(struct edma_txcmpl_ring) *
-				ehw->txcmpl_rings), GFP_KERNEL);
-	if (!ehw->txcmpl_ring)
-		goto txcmpl_ring_alloc_fail;
-
-	pr_info("Num rings - TxDesc:%u (%u-%u) TxCmpl:%u (%u-%u)\n",
-			ehw->txdesc_rings, ehw->txdesc_ring_start,
-			(ehw->txdesc_ring_start + ehw->txdesc_rings - 1),
-			ehw->txcmpl_rings, ehw->txcmpl_ring_start,
-			(ehw->txcmpl_ring_start + ehw->txcmpl_rings - 1));
-
-	pr_info("RxDesc:%u (%u-%u) RxFill:%u (%u-%u)\n",
-		ehw->rxdesc_rings, ehw->rxdesc_ring_start,
-		(ehw->rxdesc_ring_start + ehw->rxdesc_rings - 1),
-		ehw->rxfill_rings, ehw->rxfill_ring_start,
-		(ehw->rxfill_ring_start + ehw->rxfill_rings - 1));
-
-	return 0;
-txcmpl_ring_alloc_fail:
-	kfree(ehw->txdesc_ring);
-txdesc_ring_alloc_fail:
-	kfree(ehw->rxdesc_ring);
-rxdesc_ring_alloc_fail:
-	kfree(ehw->rxfill_ring);
-	return -ENOMEM;
-}
-
-/*
- * edma_cleanup_rings()
- *	Cleanup EDMA rings
- */
-void edma_cleanup_rings(struct edma_hw *ehw)
-{
-	int i;
-
-	/*
-	 * Free any buffers assigned to any descriptors
-	 */
-	for (i = 0; i < ehw->txdesc_rings; i++)
-		edma_cleanup_txdesc_ring_res(ehw, &ehw->txdesc_ring[i]);
-
-	/*
-	 * Free Tx completion descriptors
-	 */
-	for (i = 0; i < ehw->txcmpl_rings; i++)
-		edma_cleanup_txcmpl_ring_res(ehw, &ehw->txcmpl_ring[i]);
-
-	/*
-	 * Free Rx fill ring descriptors
-	 */
-	for (i = 0; i < ehw->rxfill_rings; i++)
-		edma_cleanup_rxfill_ring_res(ehw, &ehw->rxfill_ring[i]);
-
-	/*
-	 * Free Rx completion ring descriptors
-	 */
-	for (i = 0; i < ehw->rxdesc_rings; i++)
-		edma_cleanup_rxdesc_ring_res(ehw, &ehw->rxdesc_ring[i]);
-
-	edma_free_rings(ehw);
-}
-
-/*
- * edma_init_rings()
- *	Initialize EDMA rings
- */
-static int edma_init_rings(struct edma_hw *ehw)
-{
-	int ret = 0;
-
-	ret = edma_alloc_rings(ehw);
-	if (ret)
-		return ret;
-
-	ret = edma_setup_ring_resources(ehw);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-/*
- * edma_configure_txdesc_ring()
- *	Configure one TxDesc ring
- */
-static void edma_configure_txdesc_ring(struct edma_hw *ehw,
-					struct edma_txdesc_ring *txdesc_ring)
-{
-	uint32_t data = 0;
-	uint16_t hw_cons_idx = 0;
-
-	/*
-	 * Configure TXDESC ring
-	 */
-	edma_reg_write(EDMA_REG_TXDESC_BA(txdesc_ring->id),
-			(uint32_t)(txdesc_ring->dma &
-			EDMA_RING_DMA_MASK));
-
-	edma_reg_write(EDMA_REG_TXDESC_RING_SIZE(txdesc_ring->id),
-			(uint32_t)(txdesc_ring->count &
-			EDMA_TXDESC_RING_SIZE_MASK));
-
-	data = edma_reg_read(EDMA_REG_TXDESC_CONS_IDX(txdesc_ring->id));
-	data &= ~(EDMA_TXDESC_CONS_IDX_MASK);
-	hw_cons_idx = data;
-
-	data = edma_reg_read(EDMA_REG_TXDESC_PROD_IDX(txdesc_ring->id));
-	data &= ~(EDMA_TXDESC_PROD_IDX_MASK);
-	data |= hw_cons_idx & EDMA_TXDESC_PROD_IDX_MASK;
-	edma_reg_write(EDMA_REG_TXDESC_PROD_IDX(txdesc_ring->id), data);
-}
-
-/*
- * edma_configure_txcmpl_ring()
- *	Configure one TxCmpl ring
- */
-static void edma_configure_txcmpl_ring(struct edma_hw *ehw,
-					struct edma_txcmpl_ring *txcmpl_ring)
-{
-	uint32_t tx_mod_timer;
-
-	/*
-	 * Configure TxCmpl ring base address
-	 */
-	edma_reg_write(EDMA_REG_TXCMPL_BA(txcmpl_ring->id),
-			(uint32_t)(txcmpl_ring->dma & EDMA_RING_DMA_MASK));
-	edma_reg_write(EDMA_REG_TXCMPL_RING_SIZE(txcmpl_ring->id),
-			(uint32_t)(txcmpl_ring->count
-			& EDMA_TXDESC_RING_SIZE_MASK));
-
-	/*
-	 * Set TxCmpl ret mode to opaque
-	 */
-	edma_reg_write(EDMA_REG_TXCMPL_CTRL(txcmpl_ring->id),
-			EDMA_TXCMPL_RETMODE_OPAQUE);
-
-	tx_mod_timer = (EDMA_TX_MOD_TIMER & EDMA_TX_MOD_TIMER_INIT_MASK)
-			<< EDMA_TX_MOD_TIMER_INIT_SHIFT;
-	edma_reg_write(EDMA_REG_TX_MOD_TIMER(txcmpl_ring->id),
-				tx_mod_timer);
-
-	edma_reg_write(EDMA_REG_TX_INT_CTRL(txcmpl_ring->id), 0x2);
-}
-
-/*
- * edma_configure_rxdesc_ring()
- *	Configure one RxDesc ring
- */
-static void edma_configure_rxdesc_ring(struct edma_hw *ehw,
-					struct edma_rxdesc_ring *rxdesc_ring)
-{
-	uint32_t data;
-
-	edma_reg_write(EDMA_REG_RXDESC_BA(rxdesc_ring->id),
-			(uint32_t)(rxdesc_ring->dma & 0xffffffff));
-
-	data = rxdesc_ring->count & EDMA_RXDESC_RING_SIZE_MASK;
-	data |= (ehw->rx_payload_offset & EDMA_RXDESC_PL_OFFSET_MASK)
-		 << EDMA_RXDESC_PL_OFFSET_SHIFT;
-	edma_reg_write(EDMA_REG_RXDESC_RING_SIZE(rxdesc_ring->id), data);
-
-	data = (EDMA_RX_MOD_TIMER_INIT & EDMA_RX_MOD_TIMER_INIT_MASK)
-			<< EDMA_RX_MOD_TIMER_INIT_SHIFT;
-	edma_reg_write(EDMA_REG_RX_MOD_TIMER(rxdesc_ring->id), data);
-
-	/*
-	 * Enable ring. Set ret mode to 'opaque'.
-	 */
-	edma_reg_write(EDMA_REG_RX_INT_CTRL(rxdesc_ring->id), 0x2);
-}
-
-/*
- * edma_configure_rxfill_ring()
- *	Configure one RxFill ring
- */
-static void edma_configure_rxfill_ring(struct edma_hw *ehw,
-					struct edma_rxfill_ring *rxfill_ring)
-{
-	uint32_t data = 0;
-
-	edma_reg_write(EDMA_REG_RXFILL_BA(rxfill_ring->id),
-			(uint32_t)(rxfill_ring->dma & EDMA_RING_DMA_MASK));
-
-	data = rxfill_ring->count & EDMA_RXFILL_RING_SIZE_MASK;
-	edma_reg_write(EDMA_REG_RXFILL_RING_SIZE(rxfill_ring->id), data);
-
-	/*
-	 * Alloc Rx buffers
-	 */
-	edma_alloc_rx_buffer(ehw, rxfill_ring);
-}
-
-/*
- * edma_configure_rings()
- *	Configure EDMA rings
- */
-static void edma_configure_rings(struct edma_hw *ehw)
-{
-	int i = 0;
-
-	/*
-	 * Initialize the store
-	 */
-	for (i = 0; i < EDMA_RING_SIZE; i++) {
-		ehw->tx_skb_store[i] = NULL;
-		ehw->rx_skb_store[i] = NULL;
-	}
-
-	/*
-	 * Configure TXDESC ring
-	 */
-	for (i = 0; i < ehw->txdesc_rings; i++)
-		edma_configure_txdesc_ring(ehw, &ehw->txdesc_ring[i]);
-
-	/*
-	 * Configure TXCMPL ring
-	 */
-	for (i = 0; i < ehw->txcmpl_rings; i++)
-		edma_configure_txcmpl_ring(ehw, &ehw->txcmpl_ring[i]);
-
-	/*
-	 * Configure RXFILL rings
-	 */
-	for (i = 0; i < ehw->rxfill_rings; i++)
-		edma_configure_rxfill_ring(ehw, &ehw->rxfill_ring[i]);
-
-	/*
-	 * Configure RXDESC ring
-	 */
-	for (i = 0; i < ehw->rxdesc_rings; i++)
-		edma_configure_rxdesc_ring(ehw, &ehw->rxdesc_ring[i]);
-}
-
-/*
- * edma_hw_reset()
- *	Reset EDMA Hardware during initialization
- */
-int edma_hw_reset(struct edma_hw *ehw)
-{
-	struct reset_control *rst;
-	struct platform_device *pdev = ehw->pdev;
-
-	rst = devm_reset_control_get(&pdev->dev, EDMA_HW_RESET_ID);
-	if (IS_ERR(rst)) {
-		pr_warn("DTS Node: %s does not exist\n", EDMA_HW_RESET_ID);
-		return -EINVAL;
-	}
-
-	reset_control_assert(rst);
-	udelay(100);
-
-	reset_control_deassert(rst);
-	udelay(100);
-
-	pr_info("EDMA HW Reset completed succesfully\n");
-
-	return 0;
-}
-
-/*
- * edma_hw_init()
- *	EDMA hw init
- */
-int edma_hw_init(struct edma_hw *ehw)
-{
-	int ret = 0;
-	int desc_index;
-	uint32_t i, data, reg = 0;
-	struct edma_rxdesc_ring *rxdesc_ring = NULL;
-
-	data = edma_reg_read(EDMA_REG_MAS_CTRL);
-	pr_info("EDMA ver %d hw init\n", data);
-
-	/*
-	 * Setup private data structure
-	 */
-	ehw->misc_intr_mask = 0x0;
-	ehw->rxfill_intr_mask = EDMA_RXFILL_INT_MASK;
-	ehw->rxdesc_intr_mask = EDMA_RXDESC_INT_MASK_PKT_INT;
-	ehw->txcmpl_intr_mask = EDMA_TX_INT_MASK_PKT_INT |
-				EDMA_TX_INT_MASK_UGT_INT;
-	ehw->rx_payload_offset = EDMA_RX_PREHDR_SIZE;
-	ehw->active = 0;
-	ehw->edma_initialized = false;
-
-	/* Reset EDMA */
-	ret = edma_hw_reset(ehw);
-	if (ret)
-		return ret;
-
-	/*
-	 * Disable interrupts
-	 */
-	for (i = 0; i < EDMA_MAX_TXCMPL_RINGS; i++)
-		edma_reg_write(EDMA_REG_TX_INT_MASK(i), 0);
-
-	for (i = 0; i < EDMA_MAX_RXFILL_RINGS; i++)
-		edma_reg_write(EDMA_REG_RXFILL_INT_MASK(i), 0);
-
-	for (i = 0; i < EDMA_MAX_RXDESC_RINGS; i++)
-		edma_reg_write(EDMA_REG_RX_INT_CTRL(i), 0);
-
-	/*
-	 * Disable Rx rings
-	 */
-	for (i = 0; i < EDMA_MAX_RXDESC_RINGS; i++) {
-		data = edma_reg_read(EDMA_REG_RXDESC_CTRL(i));
-		data &= ~EDMA_RXDESC_RX_EN;
-		edma_reg_write(EDMA_REG_RXDESC_CTRL(i), data);
-	}
-
-	/*
-	 * Disable RxFill Rings
-	 */
-	for (i = 0; i < EDMA_MAX_RXFILL_RINGS; i++) {
-		data = edma_reg_read(EDMA_REG_RXFILL_RING_EN(i));
-		data &= ~EDMA_RXFILL_RING_EN;
-		edma_reg_write(EDMA_REG_RXFILL_RING_EN(i), data);
-	}
-
-	/*
-	 * Disable Tx rings
-	 */
-	for (desc_index = 0; desc_index < EDMA_MAX_TXDESC_RINGS; desc_index++) {
-		data = edma_reg_read(EDMA_REG_TXDESC_CTRL(desc_index));
-		data &= ~EDMA_TXDESC_TX_EN;
-		edma_reg_write(EDMA_REG_TXDESC_CTRL(desc_index), data);
-	}
-
-#if defined(NSS_DP_IPQ807X)
-	/*
-	 * Clear the TXDESC2CMPL_MAP_xx reg before setting up
-	 * the mapping. This register holds TXDESC to TXFILL ring
-	 * mapping.
-	 */
-	edma_reg_write(EDMA_REG_TXDESC2CMPL_MAP_0, 0);
-	edma_reg_write(EDMA_REG_TXDESC2CMPL_MAP_1, 0);
-	edma_reg_write(EDMA_REG_TXDESC2CMPL_MAP_2, 0);
-	desc_index = ehw->txcmpl_ring_start;
-
-	/*
-	 * 3 registers to hold the completion mapping for total 24
-	 * TX desc rings (0-9,10-19 and rest). In each entry 3 bits hold
-	 * the mapping for a particular TX desc ring.
-	 */
-	for (i = ehw->txdesc_ring_start;
-		i < ehw->txdesc_ring_end; i++) {
-		if (i >= 0 && i <= 9)
-			reg = EDMA_REG_TXDESC2CMPL_MAP_0;
-		else if (i >= 10 && i <= 19)
-			reg = EDMA_REG_TXDESC2CMPL_MAP_1;
-		else
-			reg = EDMA_REG_TXDESC2CMPL_MAP_2;
-
-		pr_debug("Configure TXDESC:%u to use TXCMPL:%u\n",
-				i, desc_index);
-
-		data = edma_reg_read(reg);
-		data |= (desc_index & 0x7) << ((i % 10) * 3);
-		edma_reg_write(reg, data);
-
-		desc_index++;
-		if (desc_index == ehw->txcmpl_ring_end)
-				desc_index = ehw->txcmpl_ring_start;
-	}
-#endif
-
-	/*
-	 * Set PPE QID to EDMA Rx ring mapping.
-	 * When coming up use only queue 0.
-	 * HOST EDMA rings. FW EDMA comes up and overwrites as required.
-	 * Each entry can hold mapping for 8 PPE queues and entry size is
-	 * 4 bytes
-	 */
-	desc_index = ehw->rxdesc_ring_start;
-	data = 0;
-	data |= (desc_index & 0xF);
-	edma_reg_write(EDMA_QID2RID_TABLE_MEM(0), data);
-	pr_debug("Configure QID2RID reg:0x%x to 0x%x\n", reg, data);
-
-	ret = edma_init_rings(ehw);
-	if (ret)
-		return ret;
-
-	edma_configure_rings(ehw);
-
-	/*
-	 * Set RXDESC2FILL_MAP_xx reg.
-	 * There are two registers RXDESC2FILL_0 and RXDESC2FILL_1
-	 * 3 bits holds the rx fill ring mapping for each of the
-	 * rx descriptor ring.
-	 */
-	edma_reg_write(EDMA_REG_RXDESC2FILL_MAP_0, 0);
-	edma_reg_write(EDMA_REG_RXDESC2FILL_MAP_1, 0);
-	for (i = ehw->rxdesc_ring_start;
-			i < ehw->rxdesc_ring_end; i++) {
-		if ((i >= 0) && (i <= 9))
-			reg = EDMA_REG_RXDESC2FILL_MAP_0;
-		else
-			reg = EDMA_REG_RXDESC2FILL_MAP_1;
-
-		rxdesc_ring = &ehw->rxdesc_ring[i - ehw->rxdesc_ring_start];
-
-		pr_debug("Configure RXDESC:%u to use RXFILL:%u\n",
-				rxdesc_ring->id, rxdesc_ring->rxfill->id);
-
-		data = edma_reg_read(reg);
-		data |= (rxdesc_ring->rxfill->id & 0x7) << ((i % 10) * 3);
-		edma_reg_write(reg, data);
-	}
-
-	reg = EDMA_REG_RXDESC2FILL_MAP_0;
-	pr_debug("EDMA_REG_RXDESC2FILL_MAP_0: 0x%x\n", edma_reg_read(reg));
-	reg = EDMA_REG_RXDESC2FILL_MAP_1;
-	pr_debug("EDMA_REG_RXDESC2FILL_MAP_1: 0x%x\n", edma_reg_read(reg));
-
-#if defined(NSS_DP_IPQ807X)
-	reg = EDMA_REG_TXDESC2CMPL_MAP_0;
-	pr_debug("EDMA_REG_TXDESC2CMPL_MAP_0: 0x%x\n", edma_reg_read(reg));
-	reg = EDMA_REG_TXDESC2CMPL_MAP_1;
-	pr_debug("EDMA_REG_TXDESC2CMPL_MAP_1: 0x%x\n", edma_reg_read(reg));
-	reg = EDMA_REG_TXDESC2CMPL_MAP_2;
-	pr_debug("EDMA_REG_TXDESC2CMPL_MAP_2: 0x%x\n", edma_reg_read(reg));
-#endif
-
-	/*
-	 * Configure DMA request priority, DMA read burst length,
-	 * and AXI write size.
-	 */
-	data = EDMA_DMAR_BURST_LEN_SET(EDMA_BURST_LEN_ENABLE)
-		| EDMA_DMAR_REQ_PRI_SET(0)
-		| EDMA_DMAR_TXDATA_OUTSTANDING_NUM_SET(31)
-		| EDMA_DMAR_TXDESC_OUTSTANDING_NUM_SET(7)
-		| EDMA_DMAR_RXFILL_OUTSTANDING_NUM_SET(7);
-	edma_reg_write(EDMA_REG_DMAR_CTRL, data);
-#if defined(NSS_DP_IPQ60XX)
-	data = edma_reg_read(EDMA_REG_AXIW_CTRL);
-	data |= EDMA_AXIW_MAX_WR_SIZE_EN;
-	edma_reg_write(EDMA_REG_AXIW_CTRL, data);
-#endif
-
-	/*
-	 * Misc error mask
-	 */
-	data = EDMA_MISC_AXI_RD_ERR_MASK_EN |
-		EDMA_MISC_AXI_WR_ERR_MASK_EN |
-		EDMA_MISC_RX_DESC_FIFO_FULL_MASK_EN |
-		EDMA_MISC_RX_ERR_BUF_SIZE_MASK_EN |
-		EDMA_MISC_TX_SRAM_FULL_MASK_EN |
-		EDMA_MISC_TX_CMPL_BUF_FULL_MASK_EN |
-		EDMA_MISC_DATA_LEN_ERR_MASK_EN;
-#if defined(NSS_DP_IPQ807X)
-	data |= EDMA_MISC_PKT_LEN_LA_64K_MASK_EN |
-		 EDMA_MISC_PKT_LEN_LE_40_MASK_EN;
-#else
-	data |= EDMA_MISC_TX_TIMEOUT_MASK_EN;
-#endif
-	edma_reg_write(EDMA_REG_MISC_INT_MASK, data);
-
-	/*
-	 * Global EDMA enable and padding enable
-	 */
-	data = EDMA_PORT_PAD_EN | EDMA_PORT_EDMA_EN;
-	edma_reg_write(EDMA_REG_PORT_CTRL, data);
-
-	/*
-	 * Enable Rx rings
-	 */
-	for (i = ehw->rxdesc_ring_start; i < ehw->rxdesc_ring_end; i++) {
-		data = edma_reg_read(EDMA_REG_RXDESC_CTRL(i));
-		data |= EDMA_RXDESC_RX_EN;
-		edma_reg_write(EDMA_REG_RXDESC_CTRL(i), data);
-	}
-
-	for (i = ehw->rxfill_ring_start; i < ehw->rxfill_ring_end; i++) {
-		data = edma_reg_read(EDMA_REG_RXFILL_RING_EN(i));
-		data |= EDMA_RXFILL_RING_EN;
-		edma_reg_write(EDMA_REG_RXFILL_RING_EN(i), data);
-	}
-
-	/*
-	 * Enable Tx rings
-	 */
-	for (i = ehw->txdesc_ring_start; i < ehw->txdesc_ring_end; i++) {
-		data = edma_reg_read(EDMA_REG_TXDESC_CTRL(i));
-		data |= EDMA_TXDESC_TX_EN;
-		edma_reg_write(EDMA_REG_TXDESC_CTRL(i), data);
-	}
-
-	ehw->edma_initialized = true;
-
-	return 0;
-}

feeds/ipq807x/qca-nss-dp/src/hal/edma/edma_data_plane.c

@@ -1,962 +0,0 @@
-/*
- * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
- * USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <linux/interrupt.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_platform.h>
-#include <linux/debugfs.h>
-#include <fal/fal_vsi.h>
-
-#include "nss_dp_dev.h"
-#include "edma_regs.h"
-#include "edma_data_plane.h"
-
-/*
- * EDMA hardware instance
- */
-struct edma_hw edma_hw;
-
-/*
- * edma_get_port_num_from_netdev()
- *	Get port number from net device
- */
-static int edma_get_port_num_from_netdev(struct net_device *netdev)
-{
-	int i;
-
-	for (i = 0; i < EDMA_MAX_GMACS; i++) {
-		/* In the port-id to netdev mapping table, port-id
-		 * starts from 1 and table index starts from 0.
-		 * So we return index + 1 for port-id
-		 */
-		if (edma_hw.netdev_arr[i] == netdev)
-			return i+1;
-	}
-
-	return -1;
-}
-
-/*
- * edma_reg_read()
- *	Read EDMA register
- */
-uint32_t edma_reg_read(uint32_t reg_off)
-{
-	return (uint32_t)readl(edma_hw.reg_base + reg_off);
-}
-
-/*
- * edma_reg_write()
- *	Write EDMA register
- */
-void edma_reg_write(uint32_t reg_off, uint32_t val)
-{
-	writel(val, edma_hw.reg_base + reg_off);
-}
-
-/*
- * edma_disable_interrupts()
- *	Disable EDMA RX/TX interrupt masks.
- */
-static void edma_disable_interrupts(void)
-{
-	struct edma_rxdesc_ring *rxdesc_ring = NULL;
-	struct edma_rxfill_ring *rxfill_ring = NULL;
-	struct edma_txcmpl_ring *txcmpl_ring = NULL;
-	int i;
-
-	for (i = 0; i < edma_hw.rxdesc_rings; i++) {
-		rxdesc_ring = &edma_hw.rxdesc_ring[i];
-		edma_reg_write(EDMA_REG_RXDESC_INT_MASK(rxdesc_ring->id),
-			       EDMA_MASK_INT_CLEAR);
-	}
-
-	for (i = 0; i < edma_hw.txcmpl_rings; i++) {
-		txcmpl_ring = &edma_hw.txcmpl_ring[i];
-		edma_reg_write(EDMA_REG_TX_INT_MASK(txcmpl_ring->id),
-			       EDMA_MASK_INT_CLEAR);
-	}
-
-	for (i = 0; i < edma_hw.rxfill_rings; i++) {
-		rxfill_ring = &edma_hw.rxfill_ring[i];
-		edma_reg_write(EDMA_REG_RXFILL_INT_MASK(rxfill_ring->id),
-			       EDMA_MASK_INT_CLEAR);
-	}
-
-	/*
-	 * Clear MISC interrupt mask.
-	 */
-	edma_reg_write(EDMA_REG_MISC_INT_MASK, EDMA_MASK_INT_CLEAR);
-}
-
-/*
- * edma_enable_interrupts()
- *	Enable RX/TX EDMA interrupt masks.
- */
-static void edma_enable_interrupts(void)
-{
-	struct edma_rxdesc_ring *rxdesc_ring = NULL;
-	struct edma_rxfill_ring *rxfill_ring = NULL;
-	struct edma_txcmpl_ring *txcmpl_ring = NULL;
-	int i;
-
-	for (i = 0; i < edma_hw.rxfill_rings; i++) {
-		rxfill_ring = &edma_hw.rxfill_ring[i];
-		edma_reg_write(EDMA_REG_RXFILL_INT_MASK(rxfill_ring->id),
-				edma_hw.rxfill_intr_mask);
-	}
-
-	for (i = 0; i < edma_hw.txcmpl_rings; i++) {
-		txcmpl_ring = &edma_hw.txcmpl_ring[i];
-		edma_reg_write(EDMA_REG_TX_INT_MASK(txcmpl_ring->id),
-				edma_hw.txcmpl_intr_mask);
-	}
-
-	for (i = 0; i < edma_hw.rxdesc_rings; i++) {
-		rxdesc_ring = &edma_hw.rxdesc_ring[i];
-		edma_reg_write(EDMA_REG_RXDESC_INT_MASK(rxdesc_ring->id),
-				edma_hw.rxdesc_intr_mask);
-	}
-
-	/*
-	 * Enable MISC interrupt mask.
-	 */
-	edma_reg_write(EDMA_REG_MISC_INT_MASK, edma_hw.misc_intr_mask);
-}
-
-/*
- * nss_dp_edma_if_open()
- *	Do slow path data plane open
- */
-static int edma_if_open(struct nss_dp_data_plane_ctx *dpc,
-			uint32_t tx_desc_ring, uint32_t rx_desc_ring,
-			uint32_t mode)
-{
-	if (!dpc->dev)
-		return NSS_DP_FAILURE;
-
-	/*
-	 * Enable NAPI
-	 */
-	if (edma_hw.active++ != 0)
-		return NSS_DP_SUCCESS;
-
-	napi_enable(&edma_hw.napi);
-
-	/*
-	 * Enable the interrupt masks.
-	 */
-	edma_enable_interrupts();
-
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * edma_if_close()
- *	Do slow path data plane close
- */
-static int edma_if_close(struct nss_dp_data_plane_ctx *dpc)
-{
-	if (--edma_hw.active != 0)
-		return NSS_DP_SUCCESS;
-
-	/*
-	 * Disable the interrupt masks.
-	 */
-	edma_disable_interrupts();
-
-	/*
-	 * Disable NAPI
-	 */
-	napi_disable(&edma_hw.napi);
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * edma_if_link_state()
- */
-static int edma_if_link_state(struct nss_dp_data_plane_ctx *dpc,
-			      uint32_t link_state)
-{
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * edma_if_mac_addr()
- */
-static int edma_if_mac_addr(struct nss_dp_data_plane_ctx *dpc, uint8_t *addr)
-{
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * edma_if_change_mtu()
- */
-static int edma_if_change_mtu(struct nss_dp_data_plane_ctx *dpc, uint32_t mtu)
-{
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * edma_if_xmit()
- *	Transmit a packet using EDMA
- */
-static netdev_tx_t edma_if_xmit(struct nss_dp_data_plane_ctx *dpc,
-				struct sk_buff *skb)
-{
-	struct net_device *netdev = dpc->dev;
-	int ret;
-	uint32_t tx_ring, skbq, nhead, ntail;
-	bool expand_skb = false;
-
-	if (skb->len < ETH_HLEN) {
-		netdev_dbg(netdev, "skb->len < ETH_HLEN\n");
-		goto drop;
-	}
-
-	/*
-	 * Select a Tx ring
-	 */
-	skbq = skb_get_queue_mapping(skb);
-	tx_ring = 0;
-	if ((edma_hw.txdesc_rings > 1) && (skbq > 0))
-		tx_ring = edma_hw.txdesc_rings % skbq;
-
-	/*
-	 * Check for non-linear skb
-	 */
-	if (skb_is_nonlinear(skb)) {
-		netdev_dbg(netdev, "cannot Tx non-linear skb:%px\n", skb);
-		goto drop;
-	}
-
-	/*
-	 * Check for headroom/tailroom and clone
-	 */
-	nhead = netdev->needed_headroom;
-	ntail = netdev->needed_tailroom;
-
-	if (skb_cloned(skb) ||
-		(skb_headroom(skb) < nhead) ||
-		(skb_headroom(skb) < ntail)) {
-		expand_skb = true;
-	}
-
-	/*
-	 * Expand the skb. This also unclones a cloned skb.
-	 */
-	if (expand_skb && pskb_expand_head(skb, nhead, ntail, GFP_ATOMIC)) {
-		netdev_dbg(netdev, "cannot expand skb:%px\n", skb);
-		goto drop;
-	}
-
-	/*
-	 * Transmit the packet
-	 */
-	ret = edma_ring_xmit(&edma_hw, netdev, skb,
-			&edma_hw.txdesc_ring[tx_ring]);
-	if (ret == EDMA_TX_OK)
-		return NETDEV_TX_OK;
-
-	/*
-	 * Not enough descriptors. Stop netdev Tx queue.
-	 */
-	if (ret == EDMA_TX_DESC) {
-		netif_stop_queue(netdev);
-		return NETDEV_TX_BUSY;
-	}
-
-drop:
-	dev_kfree_skb_any(skb);
-	netdev->stats.tx_dropped++;
-
-	return NETDEV_TX_OK;
-}
-
-/*
- * edma_if_set_features()
- *	Set the supported net_device features
- */
-static void edma_if_set_features(struct nss_dp_data_plane_ctx *dpc)
-{
-	/*
-	 * TODO - add flags to support HIGHMEM/cksum offload VLAN
-	 * the features are enabled.
-	 */
-}
-
-/* TODO - check if this is needed */
-/*
- * edma_if_pause_on_off()
- *	Set pause frames on or off
- *
- * No need to send a message if we defaulted to slow path.
- */
-static int edma_if_pause_on_off(struct nss_dp_data_plane_ctx *dpc,
-				uint32_t pause_on)
-{
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * edma_if_vsi_assign()
- *	assign vsi of the data plane
- *
- */
-static int edma_if_vsi_assign(struct nss_dp_data_plane_ctx *dpc, uint32_t vsi)
-{
-	struct net_device *netdev = dpc->dev;
-	int32_t port_num;
-
-	port_num = edma_get_port_num_from_netdev(netdev);
-
-	if (port_num < 0)
-		return NSS_DP_FAILURE;
-
-	if (fal_port_vsi_set(0, port_num, vsi) < 0)
-		return NSS_DP_FAILURE;
-
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * edma_if_vsi_unassign()
- *	unassign vsi of the data plane
- *
- */
-static int edma_if_vsi_unassign(struct nss_dp_data_plane_ctx *dpc, uint32_t vsi)
-{
-	struct net_device *netdev = dpc->dev;
-	uint32_t port_num;
-
-	port_num = edma_get_port_num_from_netdev(netdev);
-
-	if (port_num < 0)
-		return NSS_DP_FAILURE;
-
-	if (fal_port_vsi_set(0, port_num, 0xffff) < 0)
-		return NSS_DP_FAILURE;
-
-	return NSS_DP_SUCCESS;
-}
-
-#ifdef CONFIG_RFS_ACCEL
-/*
- * edma_if_rx_flow_steer()
- *	Flow steer of the data plane
- *
- * Initial receive flow steering function for data plane operation.
- */
-static int edma_if_rx_flow_steer(struct nss_dp_data_plane_ctx *dpc, struct sk_buff *skb,
-					uint32_t cpu, bool is_add)
-{
-	return NSS_DP_SUCCESS;
-}
-#endif
-
-/*
- * edma_if_deinit()
- *	Free edma resources
- */
-static int edma_if_deinit(struct nss_dp_data_plane_ctx *dpc)
-{
-	/*
-	 * Free up resources used by EDMA if all the
-	 * interfaces have been overridden
-	 * */
-	if (edma_hw.dp_override_cnt == EDMA_MAX_GMACS - 1) {
-		edma_cleanup(true);
-	} else {
-		edma_hw.dp_override_cnt++;
-	}
-
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * edma_irq_init()
- *	Initialize interrupt handlers for the driver
- */
-static int edma_irq_init(void)
-{
-	int err;
-	uint32_t entry_num, i;
-
-	/*
-	 * Get TXCMPL rings IRQ numbers
-	 */
-	entry_num = 0;
-	for (i = 0; i < edma_hw.txcmpl_rings; i++, entry_num++) {
-		edma_hw.txcmpl_intr[i] =
-			platform_get_irq(edma_hw.pdev, entry_num);
-		if (edma_hw.txcmpl_intr[i] < 0) {
-			pr_warn("%s: txcmpl_intr[%u] irq get failed\n",
-					(edma_hw.device_node)->name, i);
-			return -1;
-		}
-
-		pr_debug("%s: txcmpl_intr[%u] = %u\n",
-				 (edma_hw.device_node)->name,
-				 i, edma_hw.txcmpl_intr[i]);
-	}
-
-	/*
-	 * Get RXFILL rings IRQ numbers
-	 */
-	for (i = 0; i < edma_hw.rxfill_rings; i++, entry_num++) {
-		edma_hw.rxfill_intr[i] =
-			platform_get_irq(edma_hw.pdev, entry_num);
-		if (edma_hw.rxfill_intr[i] < 0) {
-			pr_warn("%s: rxfill_intr[%u] irq get failed\n",
-					(edma_hw.device_node)->name, i);
-			return -1;
-		}
-
-		pr_debug("%s: rxfill_intr[%u] = %u\n",
-				 (edma_hw.device_node)->name,
-				 i, edma_hw.rxfill_intr[i]);
-	}
-
-	/*
-	 * Get RXDESC rings IRQ numbers
-	 *
-	 */
-	for (i = 0; i < edma_hw.rxdesc_rings; i++, entry_num++) {
-		edma_hw.rxdesc_intr[i] =
-			platform_get_irq(edma_hw.pdev, entry_num);
-		if (edma_hw.rxdesc_intr[i] < 0) {
-			pr_warn("%s: rxdesc_intr[%u] irq get failed\n",
-					(edma_hw.device_node)->name, i);
-			return -1;
-		}
-
-		pr_debug("%s: rxdesc_intr[%u] = %u\n",
-				 (edma_hw.device_node)->name,
-				 i, edma_hw.rxdesc_intr[i]);
-	}
-
-	/*
-	 * Get misc IRQ number
-	 */
-	edma_hw.misc_intr = platform_get_irq(edma_hw.pdev, entry_num);
-	pr_debug("%s: misc IRQ:%u\n",
-			  (edma_hw.device_node)->name,
-			  edma_hw.misc_intr);
-
-	/*
-	 * Request IRQ for TXCMPL rings
-	 */
-	for (i = 0; i < edma_hw.txcmpl_rings; i++) {
-		err = request_irq(edma_hw.txcmpl_intr[i],
-				  edma_handle_irq, IRQF_SHARED,
-				  "edma_txcmpl", (void *)edma_hw.pdev);
-		if (err) {
-			pr_debug("TXCMPL ring IRQ:%d request failed\n",
-					edma_hw.txcmpl_intr[i]);
-			return -1;
-
-		}
-	}
-
-	/*
-	 * Request IRQ for RXFILL rings
-	 */
-	for (i = 0; i < edma_hw.rxfill_rings; i++) {
-		err = request_irq(edma_hw.rxfill_intr[i],
-				  edma_handle_irq, IRQF_SHARED,
-				  "edma_rxfill", (void *)edma_hw.pdev);
-		if (err) {
-			pr_debug("RXFILL ring IRQ:%d request failed\n",
-					edma_hw.rxfill_intr[i]);
-			goto rx_fill_ring_intr_req_fail;
-		}
-	}
-
-	/*
-	 * Request IRQ for RXDESC rings
-	 */
-	for (i = 0; i < edma_hw.rxdesc_rings; i++) {
-		err = request_irq(edma_hw.rxdesc_intr[i],
-				  edma_handle_irq, IRQF_SHARED,
-				  "edma_rxdesc", (void *)edma_hw.pdev);
-		if (err) {
-			pr_debug("RXDESC ring IRQ:%d request failed\n",
-					edma_hw.rxdesc_intr[i]);
-			goto rx_desc_ring_intr_req_fail;
-		}
-	}
-
-	/*
-	 * Request Misc IRQ
-	 */
-	err = request_irq(edma_hw.misc_intr, edma_handle_misc_irq,
-			  IRQF_SHARED, "edma_misc",
-			  (void *)edma_hw.pdev);
-	if (err) {
-		pr_debug("MISC IRQ:%d request failed\n",
-				edma_hw.misc_intr);
-		goto misc_intr_req_fail;
-	}
-
-	return 0;
-
-misc_intr_req_fail:
-
-	/*
-	 * Free IRQ for RXDESC rings
-	 */
-	for (i = 0; i < edma_hw.rxdesc_rings; i++) {
-		synchronize_irq(edma_hw.rxdesc_intr[i]);
-		free_irq(edma_hw.rxdesc_intr[i],
-				(void *)&(edma_hw.pdev)->dev);
-	}
-
-rx_desc_ring_intr_req_fail:
-
-	/*
-	 * Free IRQ for RXFILL rings
-	 */
-	for (i = 0; i < edma_hw.rxfill_rings; i++) {
-		synchronize_irq(edma_hw.rxfill_intr[i]);
-		free_irq(edma_hw.rxfill_intr[i],
-				(void *)&(edma_hw.pdev)->dev);
-	}
-
-rx_fill_ring_intr_req_fail:
-
-	/*
-	 * Free IRQ for TXCMPL rings
-	 */
-	for (i = 0; i < edma_hw.txcmpl_rings; i++) {
-
-		synchronize_irq(edma_hw.txcmpl_intr[i]);
-		free_irq(edma_hw.txcmpl_intr[i],
-				(void *)&(edma_hw.pdev)->dev);
-	}
-
-	return -1;
-}
-
-/*
- * edma_register_netdevice()
- *	Register netdevice with EDMA
- */
-static int edma_register_netdevice(struct net_device *netdev, uint32_t macid)
-{
-	if (!netdev) {
-		pr_info("nss_dp_edma: Invalid netdev pointer %px\n", netdev);
-		return -EINVAL;
-	}
-
-	if ((macid < EDMA_START_GMACS) || (macid > EDMA_MAX_GMACS)) {
-		netdev_dbg(netdev, "nss_dp_edma: Invalid macid(%d) for %s\n",
-			macid, netdev->name);
-		return -EINVAL;
-	}
-
-	netdev_info(netdev, "nss_dp_edma: Registering netdev %s(qcom-id:%d) with EDMA\n",
-		netdev->name, macid);
-
-	/*
-	 * We expect 'macid' to correspond to ports numbers on
-	 * IPQ807x. These begin from '1' and hence we subtract
-	 * one when using it as an array index.
-	 */
-	edma_hw.netdev_arr[macid - 1] = netdev;
-
-	/*
-	 * NAPI add
-	 */
-	if (!edma_hw.napi_added) {
-		netif_napi_add(netdev, &edma_hw.napi, edma_napi,
-				EDMA_NAPI_WORK);
-		/*
-		 * Register the interrupt handlers and enable interrupts
-		 */
-		if (edma_irq_init() < 0)
-			return -EINVAL;
-
-		edma_hw.napi_added = 1;
-	}
-
-	return 0;
-}
-
-/*
- * edma_if_init()
- */
-
-static int edma_if_init(struct nss_dp_data_plane_ctx *dpc)
-{
-
-	struct net_device *netdev = dpc->dev;
-	struct nss_dp_dev *dp_dev = (struct nss_dp_dev *)netdev_priv(netdev);
-	int ret = 0;
-
-	/*
-	 * Register the netdev
-	 */
-	ret = edma_register_netdevice(netdev, dp_dev->macid);
-	if (ret) {
-		netdev_dbg(netdev,
-				"Error registering netdevice with EDMA %s\n",
-				netdev->name);
-		return NSS_DP_FAILURE;
-	}
-
-	/*
-	 * Headroom needed for Tx preheader
-	 */
-	netdev->needed_headroom += EDMA_TX_PREHDR_SIZE;
-
-	return NSS_DP_SUCCESS;
-}
-
-/*
- * nss_dp_edma_ops
- */
-struct nss_dp_data_plane_ops nss_dp_edma_ops = {
-	.init		= edma_if_init,
-	.open		= edma_if_open,
-	.close		= edma_if_close,
-	.link_state	= edma_if_link_state,
-	.mac_addr	= edma_if_mac_addr,
-	.change_mtu	= edma_if_change_mtu,
-	.xmit		= edma_if_xmit,
-	.set_features	= edma_if_set_features,
-	.pause_on_off	= edma_if_pause_on_off,
-	.vsi_assign	= edma_if_vsi_assign,
-	.vsi_unassign	= edma_if_vsi_unassign,
-#ifdef CONFIG_RFS_ACCEL
-	.rx_flow_steer	= edma_if_rx_flow_steer,
-#endif
-	.deinit		= edma_if_deinit,
-};
-
-/*
- * edma_of_get_pdata()
- *	Read the device tree details for EDMA
- */
-static int edma_of_get_pdata(struct resource *edma_res)
-{
-	/*
-	 * Find EDMA node in device tree
-	 */
-	edma_hw.device_node = of_find_node_by_name(NULL,
-				EDMA_DEVICE_NODE_NAME);
-	if (!edma_hw.device_node) {
-		pr_warn("EDMA device tree node (%s) not found\n",
-				EDMA_DEVICE_NODE_NAME);
-		return -EINVAL;
-	}
-
-	/*
-	 * Get EDMA device node
-	 */
-	edma_hw.pdev = of_find_device_by_node(edma_hw.device_node);
-	if (!edma_hw.pdev) {
-		pr_warn("Platform device for node %px(%s) not found\n",
-				edma_hw.device_node,
-				(edma_hw.device_node)->name);
-		return -EINVAL;
-	}
-
-	/*
-	 * Get EDMA register resource
-	 */
-	if (of_address_to_resource(edma_hw.device_node, 0, edma_res) != 0) {
-		pr_warn("Unable to get register address for edma device: "
-			  EDMA_DEVICE_NODE_NAME"\n");
-		return -EINVAL;
-	}
-
-	/*
-	 * Get id of first TXDESC ring
-	 */
-	if (of_property_read_u32(edma_hw.device_node, "qcom,txdesc-ring-start",
-				      &edma_hw.txdesc_ring_start) != 0) {
-		pr_warn("Read error 1st TXDESC ring (txdesc_ring_start)\n");
-		return -EINVAL;
-	}
-
-	/*
-	 * Get number of TXDESC rings
-	 */
-	if (of_property_read_u32(edma_hw.device_node, "qcom,txdesc-rings",
-				 &edma_hw.txdesc_rings) != 0) {
-		pr_warn("Unable to read number of txdesc rings.\n");
-		return -EINVAL;
-	}
-	edma_hw.txdesc_ring_end = edma_hw.txdesc_ring_start +
-					edma_hw.txdesc_rings;
-
-	/*
-	 * Get id of first TXCMPL ring
-	 */
-	if (of_property_read_u32(edma_hw.device_node, "qcom,txcmpl-ring-start",
-				&edma_hw.txcmpl_ring_start) != 0) {
-		pr_warn("Read error 1st TXCMPL ring (txcmpl_ring_start)\n");
-		return -EINVAL;
-	}
-
-	/*
-	 * Get number of TXCMPL rings
-	 */
-	if (of_property_read_u32(edma_hw.device_node, "qcom,txcmpl-rings",
-				&edma_hw.txcmpl_rings) != 0) {
-		pr_warn("Unable to read number of txcmpl rings.\n");
-		return -EINVAL;
-	}
-	edma_hw.txcmpl_ring_end = edma_hw.txcmpl_ring_start +
-					edma_hw.txcmpl_rings;
-
-	/*
-	 * Get id of first RXFILL ring
-	 */
-	if (of_property_read_u32(edma_hw.device_node, "qcom,rxfill-ring-start",
-				      &edma_hw.rxfill_ring_start) != 0) {
-		pr_warn("Read error 1st RXFILL ring (rxfill-ring-start)\n");
-		return -EINVAL;
-	}
-
-	/*
-	 * Get number of RXFILL rings
-	 */
-	if (of_property_read_u32(edma_hw.device_node, "qcom,rxfill-rings",
-					&edma_hw.rxfill_rings) != 0) {
-		pr_warn("Unable to read number of rxfill rings.\n");
-		return -EINVAL;
-	}
-	edma_hw.rxfill_ring_end = edma_hw.rxfill_ring_start +
-					edma_hw.rxfill_rings;
-
-	/*
-	 * Get id of first RXDESC ring
-	 */
-	if (of_property_read_u32(edma_hw.device_node, "qcom,rxdesc-ring-start",
-				      &edma_hw.rxdesc_ring_start) != 0) {
-		pr_warn("Read error 1st RXDESC ring (rxdesc-ring-start)\n");
-		return -EINVAL;
-	}
-
-	/*
-	 * Get number of RXDESC rings
-	 */
-	if (of_property_read_u32(edma_hw.device_node, "qcom,rxdesc-rings",
-					&edma_hw.rxdesc_rings) != 0) {
-		pr_warn("Unable to read number of rxdesc rings.\n");
-		return -EINVAL;
-	}
-	edma_hw.rxdesc_ring_end = edma_hw.rxdesc_ring_start +
-					edma_hw.rxdesc_rings;
-
-	return 0;
-}
-
-/*
- * edma_init()
- *	EDMA init
- */
-int edma_init(void)
-{
-	int ret = 0;
-	struct resource res_edma;
-
-	/*
-	 * Get all the DTS data needed
-	 */
-	if (edma_of_get_pdata(&res_edma) < 0) {
-		pr_warn("Unable to get EDMA DTS data.\n");
-		return -EINVAL;
-	}
-
-	/*
-	 * Request memory region for EDMA registers
-	 */
-	edma_hw.reg_resource = request_mem_region(res_edma.start,
-				resource_size(&res_edma),
-				EDMA_DEVICE_NODE_NAME);
-	if (!edma_hw.reg_resource) {
-		pr_warn("Unable to request EDMA register memory.\n");
-		return -EFAULT;
-	}
-
-	/*
-	 * Remap register resource
-	 */
-	edma_hw.reg_base = ioremap_nocache((edma_hw.reg_resource)->start,
-				resource_size(edma_hw.reg_resource));
-	if (!edma_hw.reg_base) {
-		pr_warn("Unable to remap EDMA register memory.\n");
-		ret = -EFAULT;
-		goto edma_init_remap_fail;
-	}
-
-	if (edma_hw_init(&edma_hw) != 0) {
-		ret = -EFAULT;
-		goto edma_init_hw_init_fail;
-	}
-
-	platform_set_drvdata(edma_hw.pdev, (void *)&edma_hw);
-
-	edma_hw.napi_added = 0;
-
-	return 0;
-
-edma_init_hw_init_fail:
-	iounmap(edma_hw.reg_base);
-
-edma_init_remap_fail:
-	release_mem_region((edma_hw.reg_resource)->start,
-			   resource_size(edma_hw.reg_resource));
-	return ret;
-}
-
-/*
- * edma_disable_port()
- * 	EDMA disable port
- */
-static void edma_disable_port(void)
-{
-	edma_reg_write(EDMA_REG_PORT_CTRL, EDMA_DISABLE);
-}
-
-/*
- * edma_cleanup()
- *	EDMA cleanup
- */
-void edma_cleanup(bool is_dp_override)
-{
-	int i;
-	struct edma_txcmpl_ring *txcmpl_ring = NULL;
-	struct edma_rxdesc_ring *rxdesc_ring = NULL;
-
-	/*
-	 * The cleanup can happen from data plane override
-	 * or from module_exit, we want to cleanup only once
-	 */
-	if (!edma_hw.edma_initialized) {
-		/*
-		 * Disable EDMA only at module exit time, since NSS firmware
-		 * depends on this setting.
-		 */
-		if (!is_dp_override) {
-			edma_disable_port();
-		}
-		return;
-	}
-
-	/*
-	 * Disable Rx rings used by this driver
-	 */
-	for (i = edma_hw.rxdesc_ring_start; i < edma_hw.rxdesc_ring_end; i++)
-		edma_reg_write(EDMA_REG_RXDESC_CTRL(i), EDMA_RING_DISABLE);
-
-	/*
-	 * Disable Tx rings used by this driver
-	 */
-	for (i = edma_hw.txdesc_ring_start; i < edma_hw.txdesc_ring_end; i++) {
-		txcmpl_ring = &edma_hw.txcmpl_ring[i];
-		edma_reg_write(EDMA_REG_TXDESC_CTRL(i),
-				EDMA_RING_DISABLE);
-	}
-
-	/*
-	 * Disable RxFill Rings used by this driver
-	 */
-	for (i = edma_hw.rxfill_ring_start; i < edma_hw.rxfill_ring_end; i++)
-		edma_reg_write(EDMA_REG_RXFILL_RING_EN(i), EDMA_RING_DISABLE);
-
-	/*
-	 * Clear interrupt mask
-	 */
-	for (i = 0; i < edma_hw.rxdesc_rings; i++) {
-		rxdesc_ring = &edma_hw.rxdesc_ring[i];
-		edma_reg_write(EDMA_REG_RXDESC_INT_MASK(rxdesc_ring->id),
-			       EDMA_MASK_INT_CLEAR);
-	}
-
-	for (i = 0; i < edma_hw.txcmpl_rings; i++) {
-		txcmpl_ring = &edma_hw.txcmpl_ring[i];
-		edma_reg_write(EDMA_REG_TX_INT_MASK(txcmpl_ring->id),
-			       EDMA_MASK_INT_CLEAR);
-	}
-
-	edma_reg_write(EDMA_REG_MISC_INT_MASK, EDMA_MASK_INT_CLEAR);
-	/*
-	 * Remove interrupt handlers and NAPI
-	 */
-	if (edma_hw.napi_added) {
-
-		/*
-		 * Free IRQ for TXCMPL rings
-		 */
-		for (i = 0; i < edma_hw.txcmpl_rings; i++) {
-			synchronize_irq(edma_hw.txcmpl_intr[i]);
-			free_irq(edma_hw.txcmpl_intr[i],
-					(void *)(edma_hw.pdev));
-		}
-
-		/*
-		 * Free IRQ for RXFILL rings
-		 */
-		for (i = 0; i < edma_hw.rxfill_rings; i++) {
-			synchronize_irq(edma_hw.rxfill_intr[i]);
-			free_irq(edma_hw.rxfill_intr[i],
-					(void *)(edma_hw.pdev));
-		}
-
-		/*
-		 * Free IRQ for RXDESC rings
-		 */
-		for (i = 0; i < edma_hw.rxdesc_rings; i++) {
-			synchronize_irq(edma_hw.rxdesc_intr[i]);
-			free_irq(edma_hw.rxdesc_intr[i],
-					(void *)(edma_hw.pdev));
-		}
-
-		/*
-		 * Free Misc IRQ
-		 */
-		synchronize_irq(edma_hw.misc_intr);
-		free_irq(edma_hw.misc_intr, (void *)(edma_hw.pdev));
-
-		netif_napi_del(&edma_hw.napi);
-		edma_hw.napi_added = 0;
-	}
-
-	/*
-	 * Disable EDMA only at module exit time, since NSS firmware
-	 * depends on this setting.
-	 */
-	if (!is_dp_override) {
-		edma_disable_port();
-	}
-
-	/*
-	 * cleanup rings and free
-	 */
-	edma_cleanup_rings(&edma_hw);
-	iounmap(edma_hw.reg_base);
-	release_mem_region((edma_hw.reg_resource)->start,
-			   resource_size(edma_hw.reg_resource));
-
-	/*
-	 * Mark initialize false, so that we do not
-	 * try to cleanup again
-	 */
-	edma_hw.edma_initialized = false;
-}

feeds/ipq807x/qca-nss-dp/src/hal/edma/edma_data_plane.h

@@ -1,287 +0,0 @@
-/*
- **************************************************************************
- * Copyright (c) 2016, 2018-2021, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************
-*/
-
-#include "nss_dp_dev.h"
-
-#ifndef __NSS_DP_EDMA_DATAPLANE__
-#define __NSS_DP_EDMA_DATAPLANE__
-
-#define EDMA_BUF_SIZE			2000
-#define EDMA_DEVICE_NODE_NAME		"edma"
-#define EDMA_RX_BUFF_SIZE		(EDMA_BUF_SIZE + EDMA_RX_PREHDR_SIZE)
-#define EDMA_RX_PREHDR_SIZE		(sizeof(struct edma_rx_preheader))
-#define EDMA_TX_PREHDR_SIZE		(sizeof(struct edma_tx_preheader))
-#define EDMA_RING_SIZE			128
-#define EDMA_NAPI_WORK			100
-#define EDMA_START_GMACS		NSS_DP_START_IFNUM
-#define EDMA_MAX_GMACS			NSS_DP_HAL_MAX_PORTS
-#define EDMA_TX_PKT_MIN_SIZE		33	/* IPQ807x EDMA needs a minimum packet size of 33 bytes */
-#if defined(NSS_DP_IPQ60XX)
-#define EDMA_MAX_TXCMPL_RINGS		24	/* Max TxCmpl rings */
-#else
-#define EDMA_MAX_TXCMPL_RINGS		8	/* Max TxCmpl rings */
-#endif
-#define EDMA_MAX_RXDESC_RINGS		16	/* Max RxDesc rings */
-#define EDMA_MAX_RXFILL_RINGS		8	/* Max RxFill rings */
-#define EDMA_MAX_TXDESC_RINGS		24	/* Max TxDesc rings */
-#define EDMA_GET_DESC(R, i, type) (&(((type *)((R)->desc))[i]))
-#define EDMA_RXFILL_DESC(R, i) EDMA_GET_DESC(R, i, struct edma_rxfill_desc)
-#define EDMA_RXDESC_DESC(R, i) EDMA_GET_DESC(R, i, struct edma_rxdesc_desc)
-#define EDMA_TXDESC_DESC(R, i) EDMA_GET_DESC(R, i, struct edma_txdesc_desc)
-#define EDMA_RXPH_SRC_INFO_TYPE_GET(rxph)	(((rxph)->src_info >> 8) & 0xf0)
-#define EDMA_RXPH_SERVICE_CODE_GET(rxph)	(((rxph)->rx_pre4) & 0xff)
-
-/*
- * Tx descriptor
- */
-struct edma_txdesc_desc {
-	uint32_t buffer_addr;
-		/* buffer address */
-	uint32_t word1;
-		/* more bit, TSO, preheader, pool, offset and length */
-};
-
-/*
- * TxCmpl descriptor
- */
-struct edma_txcmpl_desc {
-	uint32_t buffer_addr;	/* buffer address/opaque */
-	uint32_t status;	/* status */
-};
-
-/*
- * Rx descriptor
- */
-struct edma_rxdesc_desc {
-	uint32_t buffer_addr;	/* buffer address */
-	uint32_t status;	/* status */
-};
-
-/*
- * RxFill descriptor
- */
-struct edma_rxfill_desc {
-	uint32_t buffer_addr;	/* Buffer address */
-	uint32_t word1;		/* opaque_ind and buffer size */
-};
-
-/*
- * Tx descriptor ring
- */
-struct edma_txdesc_ring {
-	uint32_t id;			/* TXDESC ring number */
-	void *desc;			/* descriptor ring virtual address */
-	dma_addr_t dma;			/* descriptor ring physical address */
-	spinlock_t tx_lock;		/* Tx ring lock */
-	uint16_t count;			/* number of descriptors */
-};
-
-/*
- * TxCmpl ring
- */
-struct edma_txcmpl_ring {
-	uint32_t id;			/* TXCMPL ring number */
-	void *desc;			/* descriptor ring virtual address */
-	dma_addr_t dma;			/* descriptor ring physical address */
-	uint16_t count;			/* number of descriptors in the ring */
-};
-
-/*
- * RxFill ring
- */
-struct edma_rxfill_ring {
-	uint32_t id;			/* RXFILL ring number */
-	void *desc;			/* descriptor ring virtual address */
-	dma_addr_t dma;			/* descriptor ring physical address */
-	spinlock_t lock;		/* Rx ring lock */
-	uint16_t count;			/* number of descriptors in the ring */
-};
-
-/*
- * RxDesc ring
- */
-struct edma_rxdesc_ring {
-	uint32_t id;			/* RXDESC ring number */
-	struct edma_rxfill_ring *rxfill;	/* RXFILL ring used */
-	void *desc;			/* descriptor ring virtual address */
-	dma_addr_t dma;			/* descriptor ring physical address */
-	uint16_t count;			/* number of descriptors in the ring */
-};
-
-/*
- * EDMA Tx Preheader
- */
-struct edma_tx_preheader {
-	uint32_t opaque;   /* Opaque, contains skb pointer */
-	uint16_t src_info; /* Src information */
-	uint16_t dst_info; /* Dest information */
-	uint32_t tx_pre2;  /* SVLAN & CVLAN flag, drop prec, hash value */
-	uint32_t tx_pre3;  /* STAG, CTAG */
-	uint32_t tx_pre4;  /* CPU code, L3 & L4 offset, service code */
-	uint32_t tx_pre5;  /* IP addr index, ACL index */
-	uint32_t tx_pre6;  /* IP payload checksum, copy2cpu, timestamp, dscp */
-	uint32_t tx_pre7;  /* Timestamp, QoS TAG */
-};
-
-/*
- * EDMA Rx Preheader
- */
-struct edma_rx_preheader {
-	uint32_t opaque;
-		/* Opaque, contains skb pointer*/
-	uint16_t src_info;
-		/* Src information */
-	uint16_t dst_info;
-		/* Dest information */
-	uint32_t rx_pre2;
-		/* SVLAN & CVLAN flag, drop prec, hash value */
-	uint32_t rx_pre3;
-		/* STAG, CTAG */
-	uint32_t rx_pre4;
-		/* CPU code, L3 & L4 offset, service code */
-	uint32_t rx_pre5;
-		/* IP addr index, ACL index */
-	uint32_t rx_pre6;
-		/* IP payload checksum, copy2cpu, timestamp, dscp */
-	uint32_t rx_pre7;
-		/* Timestamp, QoS TAG */
-};
-
-enum edma_tx {
-	EDMA_TX_OK = 0,		/* Tx success */
-	EDMA_TX_DESC = 1,	/* Not enough descriptors */
-	EDMA_TX_FAIL = 2,	/* Tx failure */
-};
-
-/*
- * EDMA private data structure
- */
-struct edma_hw {
-	struct napi_struct napi;
-			/* napi structure */
-	struct net_device *netdev_arr[EDMA_MAX_GMACS];
-			/* netdev for each gmac port */
-	struct device_node *device_node;
-			/* Device tree node */
-	struct platform_device *pdev;
-			/* Platform device */
-	void __iomem *reg_base;
-			/* Base register address */
-	struct resource *reg_resource;
-			/* Memory resource */
-	uint16_t rx_payload_offset;
-			/* start of the payload offset */
-	uint32_t flags;
-			/* internal flags */
-	int active;
-			/* status */
-	int napi_added;
-			/* flag to indicate napi add status */
-
-	/*
-	 * Debugfs entries
-	 */
-	struct dentry *edma_dentry;
-	struct dentry *txdesc_dentry;
-	struct dentry *txcmpl_dentry;
-	struct dentry *rxdesc_dentry;
-
-	/*
-	 * Store for tx and rx skbs
-	 */
-	struct sk_buff *rx_skb_store[EDMA_RING_SIZE];
-	struct sk_buff *tx_skb_store[EDMA_RING_SIZE];
-
-	struct edma_rxfill_ring *rxfill_ring;
-			/* Rx Fill Ring, SW is producer */
-	struct edma_rxdesc_ring *rxdesc_ring;
-			/* Rx Descriptor Ring, SW is consumer */
-	struct edma_txdesc_ring *txdesc_ring;
-			/* Tx Descriptor Ring, SW is producer */
-	struct edma_txcmpl_ring *txcmpl_ring;
-			/* Tx Completion Ring, SW is consumer */
-
-	uint32_t txdesc_rings;
-			/* Number of TxDesc rings */
-	uint32_t txdesc_ring_start;
-			/* Id of first TXDESC ring */
-	uint32_t txdesc_ring_end;
-			/* Id of the last TXDESC ring */
-	uint32_t txcmpl_rings;
-			/* Number of TxCmpl rings */
-	uint32_t txcmpl_ring_start;
-			/* Id of first TXCMPL ring */
-	uint32_t txcmpl_ring_end;
-			/* Id of last TXCMPL ring */
-	uint32_t rxfill_rings;
-			/* Number of RxFill rings */
-	uint32_t rxfill_ring_start;
-			/* Id of first RxFill ring */
-	uint32_t rxfill_ring_end;
-			/* Id of last RxFill ring */
-	uint32_t rxdesc_rings;
-			/* Number of RxDesc rings */
-	uint32_t rxdesc_ring_start;
-			/* Id of first RxDesc ring */
-	uint32_t rxdesc_ring_end;
-			/* Id of last RxDesc ring */
-	uint32_t txcmpl_intr[EDMA_MAX_TXCMPL_RINGS];
-			/* TxCmpl ring IRQ numbers */
-	uint32_t rxfill_intr[EDMA_MAX_RXFILL_RINGS];
-			/* Rx fill ring IRQ numbers */
-	uint32_t rxdesc_intr[EDMA_MAX_RXDESC_RINGS];
-			/* Rx desc ring IRQ numbers */
-	uint32_t misc_intr;
-			/* Misc IRQ number */
-
-	uint32_t tx_intr_mask;
-			/* Tx interrupt mask */
-	uint32_t rxfill_intr_mask;
-			/* Rx fill ring interrupt mask */
-	uint32_t rxdesc_intr_mask;
-			/* Rx Desc ring interrupt mask */
-	uint32_t txcmpl_intr_mask;
-			/* Tx Cmpl ring interrupt mask */
-	uint32_t misc_intr_mask;
-			/* misc interrupt interrupt mask */
-	uint32_t dp_override_cnt;
-			/* number of interfaces overriden */
-	bool edma_initialized;
-			/* flag to check initialization status */
-};
-
-extern struct edma_hw edma_hw;
-
-uint32_t edma_reg_read(uint32_t reg_off);
-void edma_reg_write(uint32_t reg_off, uint32_t val);
-
-int edma_alloc_rx_buffer(struct edma_hw *ehw,
-		struct edma_rxfill_ring *rxfill_ring);
-enum edma_tx edma_ring_xmit(struct edma_hw *ehw,
-			    struct net_device *netdev,
-			    struct sk_buff *skb,
-			    struct edma_txdesc_ring *txdesc_ring);
-uint32_t edma_clean_tx(struct edma_hw *ehw,
-			struct edma_txcmpl_ring *txcmpl_ring);
-irqreturn_t edma_handle_irq(int irq, void *ctx);
-irqreturn_t edma_handle_misc_irq(int irq, void *ctx);
-int edma_napi(struct napi_struct *napi, int budget);
-void edma_cleanup_rings(struct edma_hw *ehw);
-void edma_cleanup(bool is_dp_override);
-int edma_hw_init(struct edma_hw *ehw);
-#endif /* __NSS_DP_EDMA_DATAPLANE__ */

feeds/ipq807x/qca-nss-dp/src/hal/edma/edma_regs.h

@@ -1,454 +0,0 @@
-/*
- **************************************************************************
- * Copyright (c) 2016,2019-2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************
-*/
-
-#ifndef __EDMA_REGS__
-#define __EDMA_REGS__
-
-/*
- * IPQ807x EDMA register offsets
- */
-#define EDMA_REG_MAS_CTRL		0x0
-#define EDMA_REG_PORT_CTRL		0x4
-#define EDMA_REG_VLAN_CTRL		0x8
-#define EDMA_REG_RXDESC2FILL_MAP_0	0x18
-#define EDMA_REG_RXDESC2FILL_MAP_1	0x1c
-#define EDMA_REG_TXQ_CTRL		0x20
-#define EDMA_REG_TXQ_CTRL_2		0x24
-#define EDMA_REG_TXQ_FC_0		0x28
-#define EDMA_REG_TXQ_FC_1		0x30
-#define EDMA_REG_TXQ_FC_2		0x34
-#define EDMA_REG_TXQ_FC_3		0x38
-#define EDMA_REG_RXQ_CTRL		0x3c
-#define EDMA_REG_RX_TX_FULL_QID		0x40
-#define EDMA_REG_RXQ_FC_THRE		0x44
-#define EDMA_REG_DMAR_CTRL		0x48
-#define EDMA_REG_AXIR_CTRL		0x4c
-#define EDMA_REG_AXIW_CTRL		0x50
-#define EDMA_REG_MIN_MSS		0x54
-#define EDMA_REG_LOOPBACK_CTRL		0x58
-#define EDMA_REG_MISC_INT_STAT		0x5c
-#define EDMA_REG_MISC_INT_MASK		0x60
-#define EDMA_REG_DBG_CTRL		0x64
-#define EDMA_REG_DBG_DATA		0x68
-#define EDMA_REG_TXDESC_BA(n)		(0x1000 + (0x1000 * n))
-#define EDMA_REG_TXDESC_PROD_IDX(n)	(0x1004 + (0x1000 * n))
-#define EDMA_REG_TXDESC_CONS_IDX(n)	(0x1008 + (0x1000 * n))
-#define EDMA_REG_TXDESC_RING_SIZE(n)	(0x100c + (0x1000 * n))
-#define EDMA_REG_TXDESC_CTRL(n)		(0x1010 + (0x1000 * n))
-#if defined(NSS_DP_IPQ807X)
-#define EDMA_REG_TXDESC2CMPL_MAP_0	0xc
-#define EDMA_REG_TXDESC2CMPL_MAP_1	0x10
-#define EDMA_REG_TXDESC2CMPL_MAP_2	0x14
-#define EDMA_REG_TXCMPL_BASE		0x19000
-#define EDMA_REG_TX_BASE		0x21000
-#else
-#define EDMA_REG_TXCMPL_BASE		0x79000
-#define EDMA_REG_TX_BASE		0x91000
-#endif
-#define EDMA_REG_TXCMPL_BA_OFFSET		0x00000
-#define EDMA_REG_TXCMPL_PROD_IDX_OFFSET		0x00004
-#define EDMA_REG_TXCMPL_CONS_IDX_OFFSET		0x00008
-#define EDMA_REG_TXCMPL_RING_SIZE_OFFSET	0x0000c
-#define EDMA_REG_TXCMPL_UGT_THRE_OFFSET		0x00010
-#define EDMA_REG_TXCMPL_CTRL_OFFSET		0x00014
-#define EDMA_REG_TXCMPL_BPC_OFFSET		0x00018
-#define EDMA_REG_TX_INT_STAT_OFFSET		0x00000
-#define EDMA_REG_TX_INT_MASK_OFFSET		0x00004
-#define EDMA_REG_TX_MOD_TIMER_OFFSET		0x00008
-#define EDMA_REG_TX_INT_CTRL_OFFSET		0x0000c
-#define EDMA_REG_TXCMPL_BA(n)		(EDMA_REG_TXCMPL_BASE + EDMA_REG_TXCMPL_BA_OFFSET + (0x1000 * n))
-#define EDMA_REG_TXCMPL_PROD_IDX(n)	(EDMA_REG_TXCMPL_BASE + EDMA_REG_TXCMPL_PROD_IDX_OFFSET + (0x1000 * n))
-#define EDMA_REG_TXCMPL_CONS_IDX(n)	(EDMA_REG_TXCMPL_BASE + EDMA_REG_TXCMPL_CONS_IDX_OFFSET + (0x1000 * n))
-#define EDMA_REG_TXCMPL_RING_SIZE(n)	(EDMA_REG_TXCMPL_BASE + EDMA_REG_TXCMPL_RING_SIZE_OFFSET + (0x1000 * n))
-#define EDMA_REG_TXCMPL_UGT_THRE(n)	(EDMA_REG_TXCMPL_BASE + EDMA_REG_TXCMPL_UGT_THRE_OFFSET + (0x1000 * n))
-#define EDMA_REG_TXCMPL_CTRL(n)		(EDMA_REG_TXCMPL_BASE + EDMA_REG_TXCMPL_CTRL_OFFSET + (0x1000 * n))
-#define EDMA_REG_TXCMPL_BPC(n)		(EDMA_REG_TXCMPL_BASE + EDMA_REG_TXCMPL_BPC_OFFSET + (0x1000 * n))
-#define EDMA_REG_TX_INT_STAT(n)		(EDMA_REG_TX_BASE + EDMA_REG_TX_INT_STAT_OFFSET + (0x1000 * n))
-#define EDMA_REG_TX_INT_MASK(n)		(EDMA_REG_TX_BASE + EDMA_REG_TX_INT_MASK_OFFSET + (0x1000 * n))
-#define EDMA_REG_TX_MOD_TIMER(n)	(EDMA_REG_TX_BASE + EDMA_REG_TX_MOD_TIMER_OFFSET + (0x1000 * n))
-#define EDMA_REG_TX_INT_CTRL(n)		(EDMA_REG_TX_BASE + EDMA_REG_TX_INT_CTRL_OFFSET + (0x1000 * n))
-#define EDMA_REG_RXFILL_BA(n)		(0x29000 + (0x1000 * n))
-#define EDMA_REG_RXFILL_PROD_IDX(n)	(0x29004 + (0x1000 * n))
-#define EDMA_REG_RXFILL_CONS_IDX(n)	(0x29008 + (0x1000 * n))
-#define EDMA_REG_RXFILL_RING_SIZE(n)	(0x2900c + (0x1000 * n))
-#define EDMA_REG_RXFILL_BUFFER1_SIZE(n)	(0x29010 + (0x1000 * n))
-#define EDMA_REG_RXFILL_FC_THRE(n)	(0x29014 + (0x1000 * n))
-#define EDMA_REG_RXFILL_UGT_THRE(n)	(0x29018 + (0x1000 * n))
-#define EDMA_REG_RXFILL_RING_EN(n)	(0x2901c + (0x1000 * n))
-#define EDMA_REG_RXFILL_DISABLE(n)	(0x29020 + (0x1000 * n))
-#define EDMA_REG_RXFILL_DISABLE_DONE(n)	(0x29024 + (0x1000 * n))
-#define EDMA_REG_RXFILL_INT_STAT(n)	(0x31000 + (0x1000 * n))
-#define EDMA_REG_RXFILL_INT_MASK(n)	(0x31004 + (0x1000 * n))
-#define EDMA_REG_RXDESC_BA(n)		(0x39000 + (0x1000 * n))
-#define EDMA_REG_RXDESC_PROD_IDX(n)	(0x39004 + (0x1000 * n))
-#define EDMA_REG_RXDESC_CONS_IDX(n)	(0x39008 + (0x1000 * n))
-#define EDMA_REG_RXDESC_RING_SIZE(n)	(0x3900c + (0x1000 * n))
-#define EDMA_REG_RXDESC_FC_THRE(n)	(0x39010 + (0x1000 * n))
-#define EDMA_REG_RXDESC_UGT_THRE(n)	(0x39014 + (0x1000 * n))
-#define EDMA_REG_RXDESC_CTRL(n)		(0x39018 + (0x1000 * n))
-#define EDMA_REG_RXDESC_BPC(n)		(0x3901c + (0x1000 * n))
-#define EDMA_REG_RXDESC_INT_STAT(n)	(0x49000 + (0x1000 * n))
-#define EDMA_REG_RXDESC_INT_MASK(n)	(0x49004 + (0x1000 * n))
-#define EDMA_REG_RX_MOD_TIMER(n)	(0x49008 + (0x1000 * n))
-#define EDMA_REG_RX_INT_CTRL(n)		(0x4900c + (0x1000 * n))
-#define EDMA_QID2RID_TABLE_MEM(q)	(0x5a000 + (0x4 * q))
-#define EDMA_REG_RXRING_PC(n)		(0x5A200 + (0x10 * n))
-#define EDMA_REG_RXRING_BC_0(n)		(0x5A204 + (0x10 * n))
-#define EDMA_REG_RXRING_BC_1(n)		(0x5A208 + (0x10 * n))
-#define EDMA_REG_TXRING_PC(n)		(0x74000 + (0x10 * n))
-#define EDMA_REG_TXRING_BC_0(n)		(0x74004 + (0x10 * n))
-#define EDMA_REG_TXRING_BC_1(n)		(0x74008 + (0x10 * n))
-
-/*
- * EDMA_REG_PORT_CTRL register
- */
-#define EDMA_PORT_PAD_EN		0x1
-#define EDMA_PORT_EDMA_EN		0x2
-
-/*
- * EDMA_REG_TXQ_CTRL register
- */
-#define EDMA_TXDESC_PF_THRE_MASK		0xf
-#define EDMA_TXDESC_PF_THRE_SHIFT		0
-#define EDMA_TXCMPL_WB_THRE_MASK		0xf
-#define EDMA_TXCMPL_WB_THRE_SHIFT		4
-#define EDMA_TXDESC_PKT_SRAM_THRE_MASK		0xff
-#define EDMA_TXDESC_PKT_SRAM_THRE_SHIFT		8
-#define EDMA_TXCMPL_WB_TIMER_MASK		0xffff
-#define EDMA_TXCMPL_WB_TIMER_SHIFT		16
-
-/*
- * EDMA_REG_RXQ_CTRL register
- */
-#define EDMA_RXFILL_PF_THRE_MASK		0xf
-#define EDMA_RXFILL_PF_THRE_SHIFT		0
-#define EDMA_RXDESC_WB_THRE_MASK		0xf
-#define EDMA_RXDESC_WB_THRE_SHIFT		4
-#define EDMA_RXDESC_WB_TIMER_MASK		0xffff
-#define EDMA_RXDESC_WB_TIMER_SHIFT		16
-
-/*
- * EDMA_REG_RX_TX_FULL_QID register
- */
-#define EDMA_RX_DESC_FULL_QID_MASK		0xff
-#define EDMA_RX_DESC_FULL_QID_SHIFT		0
-#define EDMA_TX_CMPL_BUF_FULL_QID_MASK		0xff
-#define EDMA_TX_CMPL_BUF_FULL_QID_SHIFT		8
-#define EDMA_TX_SRAM_FULL_QID_MASK		0x1f
-#define EDMA_TX_SRAM_FULL_QID_SHIFT		16
-
-/*
- * EDMA_REG_RXQ_FC_THRE reister
- */
-#define EDMA_RXFILL_FIFO_XOFF_THRE_MASK		0x1f
-#define EDMA_RXFILL_FIFO_XOFF_THRE_SHIFT	0
-#define EDMA_DESC_FIFO_XOFF_THRE_MASK		0x3f
-#define EDMA_DESC_FIFO_XOFF_THRE_SHIFT		16
-
-/*
- * EDMA_REG_DMAR_CTRL register
- */
-#define EDMA_DMAR_REQ_PRI_MASK			0x7
-#define EDMA_DMAR_REQ_PRI_SHIFT			0
-#define EDMA_DMAR_BURST_LEN_MASK		0x1
-#define EDMA_DMAR_BURST_LEN_SHIFT		3
-#define EDMA_DMAR_TXDATA_OUTSTANDING_NUM_MASK	0x1f
-#define EDMA_DMAR_TXDATA_OUTSTANDING_NUM_SHIFT	4
-#define EDMA_DMAR_TXDESC_OUTSTANDING_NUM_MASK	0x7
-#define EDMA_DMAR_TXDESC_OUTSTANDING_NUM_SHIFT	9
-#define EDMA_DMAR_RXFILL_OUTSTANDING_NUM_MASK	0x7
-#define EDMA_DMAR_RXFILL_OUTSTANDING_NUM_SHIFT	12
-
-#define EDMA_DMAR_REQ_PRI_SET(x)        	(((x) & EDMA_DMAR_REQ_PRI_MASK) << EDMA_DMAR_REQ_PRI_SHIFT)
-#define EDMA_DMAR_TXDATA_OUTSTANDING_NUM_SET(x) (((x) & EDMA_DMAR_TXDATA_OUTSTANDING_NUM_MASK) << EDMA_DMAR_TXDATA_OUTSTANDING_NUM_SHIFT)
-#define EDMA_DMAR_TXDESC_OUTSTANDING_NUM_SET(x) (((x) & EDMA_DMAR_TXDESC_OUTSTANDING_NUM_MASK) << EDMA_DMAR_TXDESC_OUTSTANDING_NUM_SHIFT)
-#define EDMA_DMAR_RXFILL_OUTSTANDING_NUM_SET(x) (((x) & EDMA_DMAR_RXFILL_OUTSTANDING_NUM_MASK) << EDMA_DMAR_RXFILL_OUTSTANDING_NUM_SHIFT)
-#define EDMA_DMAR_BURST_LEN_SET(x)		(((x) & EDMA_DMAR_BURST_LEN_MASK) << EDMA_DMAR_BURST_LEN_SHIFT)
-
-/*
- * Enable 128 byte EDMA burts for IPQ60xx
- */
-#if defined(NSS_DP_IPQ60XX)
-#define EDMA_BURST_LEN_ENABLE		1
-#else
-#define EDMA_BURST_LEN_ENABLE		0
-#endif
-
-/*
- * EDMA_REG_AXIW_CTRL_REG
- */
-#define EDMA_AXIW_MAX_WR_SIZE_EN		0x400
-
-/*
- * EDMA DISABLE
- */
-#define EDMA_DISABLE				0
-
-/*
- * EDMA_REG_TXDESC_PROD_IDX register
- */
-#define EDMA_TXDESC_PROD_IDX_MASK		0xffff
-
-/*
- * EDMA_REG_TXDESC_CONS_IDX register
- */
-#define EDMA_TXDESC_CONS_IDX_MASK		0xffff
-
-/*
- * EDMA_REG_TXDESC_RING_SIZE register
- */
-#define EDMA_TXDESC_RING_SIZE_MASK		0xffff
-
-/*
- * EDMA_REG_TXDESC_CTRL register
- */
-#define EDMA_TXDESC_ARB_GRP_ID_MASK		0x3
-#define EDMA_TXDESC_ARB_GRP_ID_SHIFT		4
-#define EDMA_TXDESC_FC_GRP_ID_MASK		0x7
-#define EDMA_TXDESC_FC_GRP_ID_SHIFT		1
-#define EDMA_TXDESC_TX_EN			0x1
-
-/*
- * EDMA_REG_TXCMPL_PROD_IDX register
- */
-#define EDMA_TXCMPL_PROD_IDX_MASK		0xffff
-
-/*
- * EDMA_REG_TXCMPL_CONS_IDX register
- */
-#define EDMA_TXCMPL_CONS_IDX_MASK		0xffff
-
-/*
- * EDMA_REG_TXCMPL_RING_SIZE register
- */
-#define EDMA_TXCMPL_RING_SIZE_MASK		0xffff
-
-/*
- * EDMA_REG_TXCMPL_UGT_THRE register
- */
-#define EDMA_TXCMPL_LOW_THRE_MASK		0xffff
-#define EDMA_TXCMPL_LOW_THRE_SHIFT		0
-#define EDMA_TXCMPL_FC_THRE_MASK		0x3f
-#define EDMA_TXCMPL_FC_THRE_SHIFT		16
-
-/*
- * EDMA_REG_TXCMPL_CTRL register
- */
-#define EDMA_TXCMPL_RET_MODE_BUFF_ADDR		0x0
-#define EDMA_TXCMPL_RET_MODE_OPAQUE		0x1
-
-/*
- * EDMA_REG_TX_MOD_TIMER register
- */
-#define EDMA_TX_MOD_TIMER_INIT_MASK		0xffff
-#define EDMA_TX_MOD_TIMER_INIT_SHIFT		0
-
-/*
- * EDMA_REG_TX_INT_CTRL register
- */
-#define EDMA_TX_INT_MASK			0x3
-
-/*
- * EDMA_REG_RXFILL_PROD_IDX register
- */
-#define EDMA_RXFILL_PROD_IDX_MASK		0xffff
-
-/*
- * EDMA_REG_RXFILL_CONS_IDX register
- */
-#define EDMA_RXFILL_CONS_IDX_MASK		0xffff
-
-/*
- * EDMA_REG_RXFILL_RING_SIZE register
- */
-#define EDMA_RXFILL_RING_SIZE_MASK		0xffff
-#define EDMA_RXFILL_BUF_SIZE_MASK		0x3fff
-#define EDMA_RXFILL_BUF_SIZE_SHIFT		16
-
-/*
- * EDMA_REG_RXFILL_FC_THRE register
- */
-#define EDMA_RXFILL_FC_XON_THRE_MASK		0x7ff
-#define EDMA_RXFILL_FC_XON_THRE_SHIFT		12
-#define EDMA_RXFILL_FC_XOFF_THRE_MASK		0x7ff
-#define EDMA_RXFILL_FC_XOFF_THRE_SHIFT		0
-
-/*
- * EDMA_REG_RXFILL_UGT_THRE register
- */
-#define EDMA_RXFILL_LOW_THRE_MASK		0xffff
-#define EDMA_RXFILL_LOW_THRE_SHIFT		0
-
-/*
- * EDMA_REG_RXFILL_RING_EN register
- */
-#define EDMA_RXFILL_RING_EN			0x1
-
-/*
- * EDMA_REG_RXFILL_INT_MASK register
- */
-#define EDMA_RXFILL_INT_MASK			0x1
-
-/*
- * EDMA_REG_RXDESC_PROD_IDX register
- */
-#define EDMA_RXDESC_PROD_IDX_MASK		0xffff
-
-/*
- * EDMA_REG_RXDESC_CONS_IDX register
- */
-#define EDMA_RXDESC_CONS_IDX_MASK		0xffff
-
-/*
- * EDMA_REG_RXDESC_RING_SIZE register
- */
-#define EDMA_RXDESC_RING_SIZE_MASK		0xffff
-#define EDMA_RXDESC_PL_OFFSET_MASK		0x1ff
-#define EDMA_RXDESC_PL_OFFSET_SHIFT		16
-
-/*
- * EDMA_REG_RXDESC_FC_THRE register
- */
-#define EDMA_RXDESC_FC_XON_THRE_MASK		0x7ff
-#define EDMA_RXDESC_FC_XON_THRE_SHIFT		12
-#define EDMA_RXDESC_FC_XOFF_THRE_MASK		0x7ff
-#define EDMA_RXDESC_FC_XOFF_THRE_SHIFT		0
-
-/*
- * EDMA_REG_RXDESC_UGT_THRE register
- */
-#define EDMA_RXDESC_LOW_THRE_MASK		0xffff
-#define EDMA_RXDESC_LOW_THRE_SHIFT		0
-
-/*
- * EDMA_REG_RXDESC_CTRL register
- */
-#define EDMA_RXDESC_STAG_REMOVE_EN		0x8
-#define EDMA_RXDESC_CTAG_REMOVE_EN		0x4
-#define EDMA_RXDESC_QDISC_EN			0x2
-#define EDMA_RXDESC_RX_EN			0x1
-
-/*
- * EDMA_REG_TX_INT_MASK register
- */
-#define EDMA_TX_INT_MASK_PKT_INT		0x1
-#define EDMA_TX_INT_MASK_UGT_INT		0x2
-
-/*
- * EDMA_REG_RXDESC_INT_STAT register
- */
-#define EDMA_RXDESC_INT_STAT_PKT_INT		0x1
-#define EDMA_RXDESC_INT_STAT_UGT_INT		0x2
-
-/*
- * EDMA_REG_RXDESC_INT_MASK register
- */
-#define EDMA_RXDESC_INT_MASK_PKT_INT		0x1
-#define EDMA_RXDESC_INT_MASK_TIMER_INT_DIS	0x2
-
-#define EDMA_MASK_INT_DISABLE			0x0
-#define EDMA_MASK_INT_CLEAR			0x0
-
-/*
- * EDMA_REG_RX_MOD_TIMER register
- */
-#define EDMA_RX_MOD_TIMER_INIT_MASK		0xffff
-#define EDMA_RX_MOD_TIMER_INIT_SHIFT		0
-
-/*
- * EDMA QID2RID register sizes
- */
-#define EDMA_QID2RID_DEPTH			0x40
-#define EDMA_QID2RID_QUEUES_PER_ENTRY		8
-
-/*
- * TXDESC shift values
- */
-#define EDMA_TXDESC_MORE_SHIFT			31
-#define EDMA_TXDESC_TSO_EN_SHIFT		30
-#define EDMA_TXDESC_PREHEADER_SHIFT		29
-#define EDMA_TXDESC_POOL_ID_SHIFT		24
-#define EDMA_TXDESC_POOL_ID_MASK		0x1f
-#define EDMA_TXDESC_DATA_OFFSET_SHIFT		16
-#define EDMA_TXDESC_DATA_OFFSET_MASK		0xff
-#define EDMA_TXDESC_DATA_LENGTH_SHIFT		0
-#define EDMA_TXDESC_DATA_LENGTH_MASK		0xffff
-
-#define EDMA_PREHDR_DSTINFO_PORTID_IND		0x20
-#define EDMA_PREHDR_PORTNUM_BITS		0x0fff
-#define EDMA_RING_DMA_MASK			0xffffffff
-/*
- * RXDESC shift values
- */
-#define EDMA_RXDESC_RX_RXFILL_CNT_MASK		0x000f
-#define EDMA_RXDESC_RX_RXFILL_CNT_SHIFT		16
-
-#define EDMA_RXDESC_PKT_SIZE_MASK		0x3fff
-#define EDMA_RXDESC_PKT_SIZE_SHIFT		0
-
-#define EDMA_RXDESC_RXD_VALID_MASK		0x1
-#define EDMA_RXDESC_RXD_VALID_SHIFT		31
-
-#define EDMA_RXDESC_PACKET_LEN_MASK		0x3fff
-#define EDMA_RXDESC_RING_INT_STATUS_MASK	0x3
-
-#define EDMA_RING_DISABLE			0
-#define EDMA_TXCMPL_RING_INT_STATUS_MASK	0x3
-#define EDMA_TXCMPL_RETMODE_OPAQUE		0x0
-#define EDMA_RXFILL_RING_INT_STATUS_MASK	0x1
-
-/*
- * TODO tune the timer and threshold values
- */
-#define EDMA_RXFILL_FIFO_XOFF_THRE		0x3
-#define EDMA_RXFILL_PF_THRE			0x3
-#define EDMA_RXDESC_WB_THRE			0x0
-#define EDMA_RXDESC_WB_TIMER			0x2
-
-#define EDMA_RXDESC_XON_THRE			50
-#define EDMA_RXDESC_XOFF_THRE			30
-#define EDMA_RXDESC_LOW_THRE			0
-#define EDMA_RX_MOD_TIMER_INIT			1000
-
-#define EDMA_TXDESC_PF_THRE			0x3
-#define EDMA_TXCMPL_WB_THRE			0X0
-#define EDMA_TXDESC_PKT_SRAM_THRE		0x20
-#define EDMA_TXCMPL_WB_TIMER			0x2
-
-#define EDMA_TX_MOD_TIMER			150
-
-/*
- * EDMA misc error mask
- */
-#define EDMA_MISC_AXI_RD_ERR_MASK_EN		0x1
-#define EDMA_MISC_AXI_WR_ERR_MASK_EN		0x2
-#define EDMA_MISC_RX_DESC_FIFO_FULL_MASK_EN	0x4
-#define EDMA_MISC_RX_ERR_BUF_SIZE_MASK_EN	0x8
-#define EDMA_MISC_TX_SRAM_FULL_MASK_EN		0x10
-#define EDMA_MISC_TX_CMPL_BUF_FULL_MASK_EN	0x20
-
-#if defined(NSS_DP_IPQ807X)
-#define EDMA_MISC_PKT_LEN_LA_64K_MASK_EN	0x40
-#define EDMA_MISC_PKT_LEN_LE_40_MASK_EN		0x80
-#define EDMA_MISC_DATA_LEN_ERR_MASK_EN		0x100
-#else
-#define EDMA_MISC_DATA_LEN_ERR_MASK_EN		0x40
-#define EDMA_MISC_TX_TIMEOUT_MASK_EN		0x80
-#endif
-
-#endif /*  __EDMA_REGS__ */

feeds/ipq807x/qca-nss-dp/src/hal/edma/edma_tx_rx.c

@@ -1,795 +0,0 @@
-/*
- * Copyright (c) 2016-2018, 2020-21, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
- * USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <linux/version.h>
-#include <linux/interrupt.h>
-#include <linux/phy.h>
-#include <linux/netdevice.h>
-#include <linux/debugfs.h>
-
-#include "nss_dp_dev.h"
-#include "edma_regs.h"
-#include "edma_data_plane.h"
-
-/*
- * edma_alloc_rx_buffer()
- *	Alloc Rx buffers for one RxFill ring
- */
-int edma_alloc_rx_buffer(struct edma_hw *ehw,
-		struct edma_rxfill_ring *rxfill_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-	struct sk_buff *skb;
-	uint16_t num_alloc = 0;
-	uint16_t cons, next, counter;
-	struct edma_rxfill_desc *rxfill_desc;
-	uint32_t reg_data = 0;
-	uint32_t store_index = 0;
-	struct edma_rx_preheader *rxph = NULL;
-
-	/*
-	 * Read RXFILL ring producer index
-	 */
-	reg_data = edma_reg_read(EDMA_REG_RXFILL_PROD_IDX(rxfill_ring->id));
-	next = reg_data & EDMA_RXFILL_PROD_IDX_MASK & (rxfill_ring->count - 1);
-
-	/*
-	 * Read RXFILL ring consumer index
-	 */
-	reg_data = edma_reg_read(EDMA_REG_RXFILL_CONS_IDX(rxfill_ring->id));
-	cons = reg_data & EDMA_RXFILL_CONS_IDX_MASK;
-
-	while (1) {
-		counter = next;
-		if (++counter == rxfill_ring->count)
-			counter = 0;
-
-		if (counter == cons)
-			break;
-
-		/*
-		 * Allocate buffer
-		 */
-		skb = dev_alloc_skb(EDMA_RX_BUFF_SIZE);
-		if (unlikely(!skb))
-			break;
-
-		/*
-		 * Get RXFILL descriptor
-		 */
-		rxfill_desc = EDMA_RXFILL_DESC(rxfill_ring, next);
-
-		/*
-		 * Make room for Rx preheader
-		 */
-		rxph = (struct edma_rx_preheader *)
-			skb_push(skb, EDMA_RX_PREHDR_SIZE);
-
-		/*
-		 * Store the skb in the rx store
-		 */
-		store_index = next;
-		if (ehw->rx_skb_store[store_index] != NULL) {
-			dev_kfree_skb_any(skb);
-			break;
-		}
-		ehw->rx_skb_store[store_index] = skb;
-		memcpy((uint8_t *)&rxph->opaque, (uint8_t *)&store_index, 4);
-		/*
-		 * Save buffer size in RXFILL descriptor
-		 */
-		rxfill_desc->word1 = cpu_to_le32(EDMA_RX_BUFF_SIZE
-					& EDMA_RXFILL_BUF_SIZE_MASK);
-
-		/*
-		 * Map Rx buffer for DMA
-		 */
-		rxfill_desc->buffer_addr = cpu_to_le32(dma_map_single(
-						&pdev->dev,
-						skb->data,
-						EDMA_RX_BUFF_SIZE,
-						DMA_FROM_DEVICE));
-
-		if (!rxfill_desc->buffer_addr) {
-			dev_kfree_skb_any(skb);
-			ehw->rx_skb_store[store_index] = NULL;
-			break;
-		}
-
-		num_alloc++;
-		next = counter;
-	}
-
-	if (num_alloc) {
-		/*
-		 * Update RXFILL ring producer index
-		 */
-		reg_data = next & EDMA_RXFILL_PROD_IDX_MASK;
-
-		/*
-		 * make sure the producer index updated before
-		 * updating the hardware
-		 */
-		wmb();
-
-		edma_reg_write(EDMA_REG_RXFILL_PROD_IDX(rxfill_ring->id),
-				reg_data);
-	}
-
-	return num_alloc;
-}
-
-/*
- * edma_clean_tx()
- *	Reap Tx descriptors
- */
-uint32_t edma_clean_tx(struct edma_hw *ehw,
-			struct edma_txcmpl_ring *txcmpl_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-	struct edma_txcmpl_desc *txcmpl = NULL;
-	uint16_t prod_idx = 0;
-	uint16_t cons_idx = 0;
-	uint32_t data = 0;
-	uint32_t txcmpl_consumed = 0;
-	struct sk_buff *skb;
-	uint32_t len;
-	int store_index;
-	dma_addr_t daddr;
-
-	/*
-	 * Get TXCMPL ring producer index
-	 */
-	data = edma_reg_read(EDMA_REG_TXCMPL_PROD_IDX(txcmpl_ring->id));
-	prod_idx = data & EDMA_TXCMPL_PROD_IDX_MASK;
-
-	/*
-	 * Get TXCMPL ring consumer index
-	 */
-	data = edma_reg_read(EDMA_REG_TXCMPL_CONS_IDX(txcmpl_ring->id));
-	cons_idx = data & EDMA_TXCMPL_CONS_IDX_MASK;
-
-	while (cons_idx != prod_idx) {
-		txcmpl = &(((struct edma_txcmpl_desc *)
-					(txcmpl_ring->desc))[cons_idx]);
-
-		/*
-		 * skb for this is stored in tx store and
-		 * tx header contains the index in the field
-		 * buffer address (opaque) of txcmpl
-		 */
-		store_index = txcmpl->buffer_addr;
-		skb = ehw->tx_skb_store[store_index];
-		ehw->tx_skb_store[store_index] = NULL;
-
-		if (unlikely(!skb)) {
-			pr_warn("Invalid skb: cons_idx:%u prod_idx:%u status %x\n",
-				  cons_idx, prod_idx, txcmpl->status);
-			goto next_txcmpl_desc;
-		}
-
-		len = skb_headlen(skb);
-		daddr = (dma_addr_t)virt_to_phys(skb->data);
-
-		pr_debug("skb:%px cons_idx:%d prod_idx:%d word1:0x%x\n",
-			   skb, cons_idx, prod_idx, txcmpl->status);
-
-		dma_unmap_single(&pdev->dev, daddr,
-				 len, DMA_TO_DEVICE);
-		dev_kfree_skb_any(skb);
-
-next_txcmpl_desc:
-		if (++cons_idx == txcmpl_ring->count)
-			cons_idx = 0;
-
-		txcmpl_consumed++;
-	}
-
-	if (txcmpl_consumed == 0)
-		return 0;
-
-	pr_debug("TXCMPL:%u txcmpl_consumed:%u prod_idx:%u cons_idx:%u\n",
-			txcmpl_ring->id, txcmpl_consumed, prod_idx, cons_idx);
-
-	/*
-	 * Update TXCMPL ring consumer index
-	 */
-	wmb();
-	edma_reg_write(EDMA_REG_TXCMPL_CONS_IDX(txcmpl_ring->id), cons_idx);
-
-	return txcmpl_consumed;
-}
-
-/*
- * nss_phy_tstamp_rx_buf()
- *	Receive timestamp packet
- */
-void nss_phy_tstamp_rx_buf(__attribute__((unused))void *app_data, struct sk_buff *skb)
-{
-	struct net_device *ndev = skb->dev;
-
-	/*
-	 * The PTP_CLASS_ value 0 is passed to phy driver, which will be
-	 * set to the correct PTP class value by calling ptp_classify_raw
-	 * in drv->rxtstamp function.
-	 */
-	if (ndev && ndev->phydev && ndev->phydev->drv &&
-			ndev->phydev->drv->rxtstamp)
-		if(ndev->phydev->drv->rxtstamp(ndev->phydev, skb, 0))
-			return;
-
-	netif_receive_skb(skb);
-}
-EXPORT_SYMBOL(nss_phy_tstamp_rx_buf);
-
-/*
- * nss_phy_tstamp_tx_buf()
- *	Transmit timestamp packet
- */
-void nss_phy_tstamp_tx_buf(struct net_device *ndev, struct sk_buff *skb)
-{
-	/*
-	 * Function drv->txtstamp will create a clone of skb if necessary,
-	 * the PTP_CLASS_ value 0 is passed to phy driver, which will be
-	 * set to the correct PTP class value by calling ptp_classify_raw
-	 * in the drv->txtstamp function.
-	 */
-	if (ndev && ndev->phydev && ndev->phydev->drv &&
-			ndev->phydev->drv->txtstamp)
-		ndev->phydev->drv->txtstamp(ndev->phydev, skb, 0);
-}
-EXPORT_SYMBOL(nss_phy_tstamp_tx_buf);
-
-/*
- * edma_clean_rx()
- *	Reap Rx descriptors
- */
-static uint32_t edma_clean_rx(struct edma_hw *ehw,
-				int work_to_do,
-				struct edma_rxdesc_ring *rxdesc_ring)
-{
-	struct platform_device *pdev = ehw->pdev;
-	struct net_device *ndev;
-	struct sk_buff *skb = NULL;
-	struct edma_rxdesc_desc *rxdesc_desc;
-	struct edma_rx_preheader *rxph = NULL;
-	uint16_t prod_idx = 0;
-	int src_port_num = 0;
-	int pkt_length = 0;
-	uint16_t cons_idx = 0;
-	uint32_t work_done = 0;
-	int store_index;
-
-	/*
-	 * Read Rx ring consumer index
-	 */
-	cons_idx = edma_reg_read(EDMA_REG_RXDESC_CONS_IDX(rxdesc_ring->id))
-				& EDMA_RXDESC_CONS_IDX_MASK;
-
-	while (1) {
-		/*
-		 * Read Rx ring producer index
-		 */
-		prod_idx = edma_reg_read(
-			EDMA_REG_RXDESC_PROD_IDX(rxdesc_ring->id))
-			& EDMA_RXDESC_PROD_IDX_MASK;
-
-		if (cons_idx == prod_idx)
-			break;
-
-		if (work_done >= work_to_do)
-			break;
-
-		rxdesc_desc = EDMA_RXDESC_DESC(rxdesc_ring, cons_idx);
-
-		/*
-		 * Get Rx preheader
-		 */
-		rxph = (struct edma_rx_preheader *)
-			phys_to_virt(rxdesc_desc->buffer_addr);
-
-		/*
-		 * DMA unmap Rx buffer
-		 */
-		dma_unmap_single(&pdev->dev,
-				 rxdesc_desc->buffer_addr,
-				 EDMA_RX_BUFF_SIZE,
-				 DMA_FROM_DEVICE);
-
-		store_index = rxph->opaque;
-		skb = ehw->rx_skb_store[store_index];
-		ehw->rx_skb_store[store_index] = NULL;
-		if (unlikely(!skb)) {
-			pr_warn("WARN: empty skb reference in rx_store:%d\n",
-					cons_idx);
-			goto next_rx_desc;
-		}
-
-		/*
-		 * Check src_info from Rx preheader
-		 */
-		if (EDMA_RXPH_SRC_INFO_TYPE_GET(rxph) ==
-				EDMA_PREHDR_DSTINFO_PORTID_IND) {
-			src_port_num = rxph->src_info &
-				EDMA_PREHDR_PORTNUM_BITS;
-		} else {
-			pr_warn("WARN: src_info_type:0x%x. Drop skb:%px\n",
-				  EDMA_RXPH_SRC_INFO_TYPE_GET(rxph), skb);
-			dev_kfree_skb_any(skb);
-			goto next_rx_desc;
-		}
-
-		/*
-		 * Get packet length
-		 */
-		pkt_length = rxdesc_desc->status & EDMA_RXDESC_PACKET_LEN_MASK;
-
-		if (unlikely((src_port_num < NSS_DP_START_IFNUM)  ||
-			(src_port_num > NSS_DP_HAL_MAX_PORTS))) {
-			pr_warn("WARN: Port number error :%d. Drop skb:%px\n",
-					src_port_num, skb);
-			dev_kfree_skb_any(skb);
-			goto next_rx_desc;
-		}
-
-		/*
-		 * Get netdev for this port using the source port
-		 * number as index into the netdev array. We need to
-		 * subtract one since the indices start form '0' and
-		 * port numbers start from '1'.
-		 */
-		ndev = ehw->netdev_arr[src_port_num - 1];
-		if (unlikely(!ndev)) {
-			pr_warn("WARN: netdev Null src_info_type:0x%x. Drop skb:%px\n",
-					src_port_num, skb);
-			dev_kfree_skb_any(skb);
-			goto next_rx_desc;
-		}
-
-		if (unlikely(!netif_running(ndev))) {
-			dev_kfree_skb_any(skb);
-			goto next_rx_desc;
-		}
-
-		/*
-		 * Remove Rx preheader
-		 */
-		skb_pull(skb, EDMA_RX_PREHDR_SIZE);
-
-		/*
-		 * Update skb fields and indicate packet to stack
-		 */
-		skb->dev = ndev;
-		skb->skb_iif = ndev->ifindex;
-		skb_put(skb, pkt_length);
-		skb->protocol = eth_type_trans(skb, skb->dev);
-#ifdef CONFIG_NET_SWITCHDEV
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0))
-		skb->offload_fwd_mark = ndev->offload_fwd_mark;
-#else
-		/*
-		 * TODO: Implement ndo_get_devlink_port()
-		 */
-		 skb->offload_fwd_mark = 0;
-#endif
-		pr_debug("skb:%px ring_idx:%u pktlen:%d proto:0x%x mark:%u\n",
-			   skb, cons_idx, pkt_length, skb->protocol,
-			   skb->offload_fwd_mark);
-#else
-		pr_debug("skb:%px ring_idx:%u pktlen:%d proto:0x%x\n",
-			   skb, cons_idx, pkt_length, skb->protocol);
-#endif
-		/*
-		 * Deliver the ptp packet to phy driver for RX timestamping
-		 */
-		if (unlikely(EDMA_RXPH_SERVICE_CODE_GET(rxph) ==
-					NSS_PTP_EVENT_SERVICE_CODE))
-			nss_phy_tstamp_rx_buf(ndev, skb);
-		else
-			netif_receive_skb(skb);
-
-next_rx_desc:
-		/*
-		 * Update consumer index
-		 */
-		if (++cons_idx == rxdesc_ring->count)
-			cons_idx = 0;
-
-		/*
-		 * Update work done
-		 */
-		work_done++;
-	}
-
-	edma_alloc_rx_buffer(ehw, rxdesc_ring->rxfill);
-
-	/*
-	 * make sure the consumer index is updated
-	 * before updating the hardware
-	 */
-	wmb();
-	edma_reg_write(EDMA_REG_RXDESC_CONS_IDX(rxdesc_ring->id), cons_idx);
-	return work_done;
-}
-
-/*
- * edma_napi()
- *	EDMA NAPI handler
- */
-int edma_napi(struct napi_struct *napi, int budget)
-{
-	struct edma_hw *ehw = container_of(napi, struct edma_hw, napi);
-	struct edma_txcmpl_ring *txcmpl_ring = NULL;
-	struct edma_rxdesc_ring *rxdesc_ring = NULL;
-	struct edma_rxfill_ring *rxfill_ring = NULL;
-
-	struct net_device *ndev;
-	int work_done = 0;
-	int i;
-
-	for (i = 0; i < ehw->rxdesc_rings; i++) {
-		rxdesc_ring = &ehw->rxdesc_ring[i];
-		work_done += edma_clean_rx(ehw, budget, rxdesc_ring);
-	}
-
-	for (i = 0; i < ehw->txcmpl_rings; i++) {
-		txcmpl_ring = &ehw->txcmpl_ring[i];
-		work_done += edma_clean_tx(ehw, txcmpl_ring);
-	}
-
-	for (i = 0; i < ehw->rxfill_rings; i++) {
-		rxfill_ring = &ehw->rxfill_ring[i];
-		work_done += edma_alloc_rx_buffer(ehw, rxfill_ring);
-	}
-
-	/*
-	 * Resume netdev Tx queue
-	 */
-	/*
-	 * TODO works currently since we have a single queue.
-	 * Need to make sure we have support in place when there is
-	 * support for multiple queues
-	 */
-	for (i = 0; i < EDMA_MAX_GMACS; i++) {
-		ndev = ehw->netdev_arr[i];
-		if (!ndev)
-			continue;
-
-		if (netif_queue_stopped(ndev) && netif_carrier_ok(ndev))
-			netif_start_queue(ndev);
-	}
-
-	/*
-	 * TODO - rework and fix the budget control
-	 */
-	if (work_done < budget) {
-		/*
-		 * TODO per core NAPI
-		 */
-		napi_complete(napi);
-
-		/*
-		 * Set RXDESC ring interrupt mask
-		 */
-		for (i = 0; i < ehw->rxdesc_rings; i++) {
-			rxdesc_ring = &ehw->rxdesc_ring[i];
-			edma_reg_write(
-				EDMA_REG_RXDESC_INT_MASK(rxdesc_ring->id),
-				ehw->rxdesc_intr_mask);
-		}
-
-		/*
-		 * Set TXCMPL ring interrupt mask
-		 */
-		for (i = 0; i < ehw->txcmpl_rings; i++) {
-			txcmpl_ring = &ehw->txcmpl_ring[i];
-			edma_reg_write(EDMA_REG_TX_INT_MASK(txcmpl_ring->id),
-					ehw->txcmpl_intr_mask);
-		}
-
-		/*
-		 * Set RXFILL ring interrupt mask
-		 */
-		for (i = 0; i < ehw->rxfill_rings; i++) {
-			rxfill_ring = &ehw->rxfill_ring[i];
-			edma_reg_write(EDMA_REG_RXFILL_INT_MASK(
-						rxfill_ring->id),
-						edma_hw.rxfill_intr_mask);
-		}
-	}
-	return work_done;
-}
-
-/*
- * edma_ring_xmit()
- *	Transmit a packet using an EDMA ring
- */
-enum edma_tx edma_ring_xmit(struct edma_hw *ehw,
-			    struct net_device *netdev,
-			    struct sk_buff *skb,
-			    struct edma_txdesc_ring *txdesc_ring)
-{
-	struct nss_dp_dev *dp_dev = netdev_priv(netdev);
-	struct edma_txdesc_desc *txdesc = NULL;
-	uint16_t buf_len;
-	uint16_t hw_next_to_use, hw_next_to_clean, chk_idx;
-	uint32_t data;
-	uint32_t store_index = 0;
-	struct edma_tx_preheader *txph = NULL;
-
-	/*
-	 * TODO - revisit locking
-	 */
-	spin_lock_bh(&txdesc_ring->tx_lock);
-
-	/*
-	 * Read TXDESC ring producer index
-	 */
-	data = edma_reg_read(EDMA_REG_TXDESC_PROD_IDX(txdesc_ring->id));
-	hw_next_to_use = data & EDMA_TXDESC_PROD_IDX_MASK;
-
-	/*
-	 * Read TXDESC ring consumer index
-	 */
-	/*
-	 * TODO - read to local variable to optimize uncached access
-	 */
-	data = edma_reg_read(EDMA_REG_TXDESC_CONS_IDX(txdesc_ring->id));
-	hw_next_to_clean = data & EDMA_TXDESC_CONS_IDX_MASK;
-
-	/*
-	 * Check for available Tx descriptor
-	 */
-	chk_idx = (hw_next_to_use + 1) & (txdesc_ring->count-1);
-
-	if (chk_idx == hw_next_to_clean) {
-		spin_unlock_bh(&txdesc_ring->tx_lock);
-		return EDMA_TX_DESC;
-	}
-
-#if defined(NSS_DP_EDMA_TX_SMALL_PKT_WAR)
-	/*
-	 * IPQ807x EDMA hardware can't process the packet if the packet size is
-	 * less than EDMA_TX_PKT_MIN_SIZE (33 Byte). So, if the packet size
-	 * is indeed less than EDMA_TX_PKT_MIN_SIZE, perform padding
-	 * (if possible), otherwise drop the packet.
-	 * Using skb_padto() API for padding the packet. This API will drop
-	 * the packet if the padding is not possible.
-	 */
-	if (unlikely(skb->len < EDMA_TX_PKT_MIN_SIZE)) {
-		if (skb_padto(skb, EDMA_TX_PKT_MIN_SIZE)) {
-			netdev_dbg(netdev, "padding couldn't happen, skb is freed.\n");
-			netdev->stats.tx_dropped++;
-			spin_unlock_bh(&txdesc_ring->tx_lock);
-			return EDMA_TX_OK;
-		}
-		skb->len = EDMA_TX_PKT_MIN_SIZE;
-	}
-#endif
-
-	buf_len = skb_headlen(skb);
-
-	/*
-	 * Deliver the ptp packet to phy driver for TX timestamping
-	 */
-	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))
-		nss_phy_tstamp_tx_buf(netdev, skb);
-
-	/*
-	 * Make room for Tx preheader
-	 */
-	txph = (struct edma_tx_preheader *)skb_push(skb,
-			EDMA_TX_PREHDR_SIZE);
-	memset((void *)txph, 0, EDMA_TX_PREHDR_SIZE);
-
-	/*
-	 * Populate Tx preheader dst info, port id is macid in dp_dev
-	 */
-	txph->dst_info = (EDMA_PREHDR_DSTINFO_PORTID_IND << 8) |
-			(dp_dev->macid & 0x0fff);
-
-	/*
-	 * Store the skb in tx_store
-	 */
-	store_index = hw_next_to_use & (txdesc_ring->count - 1);
-	if (unlikely(ehw->tx_skb_store[store_index] != NULL)) {
-		spin_unlock_bh(&txdesc_ring->tx_lock);
-		return EDMA_TX_DESC;
-	}
-
-	ehw->tx_skb_store[store_index] = skb;
-	memcpy(skb->data, &store_index, 4);
-
-	/*
-	 * Get Tx descriptor
-	 */
-	txdesc = EDMA_TXDESC_DESC(txdesc_ring, hw_next_to_use);
-	memset(txdesc, 0, sizeof(struct edma_txdesc_desc));
-
-	/*
-	 * Map buffer to DMA address
-	 */
-	txdesc->buffer_addr = cpu_to_le32(dma_map_single(&(ehw->pdev)->dev,
-				       skb->data,
-				       buf_len + EDMA_TX_PREHDR_SIZE,
-				       DMA_TO_DEVICE));
-	if (!txdesc->buffer_addr) {
-		/*
-		 * DMA map failed for this address. Drop it
-		 * and make sure does not got to stack again
-		 */
-		dev_kfree_skb_any(skb);
-
-		ehw->tx_skb_store[store_index] = NULL;
-		spin_unlock_bh(&txdesc_ring->tx_lock);
-		return EDMA_TX_OK;
-	}
-
-	/*
-	 * Populate Tx descriptor
-	 */
-	txdesc->word1 |= (1 << EDMA_TXDESC_PREHEADER_SHIFT)
-			| ((EDMA_TX_PREHDR_SIZE & EDMA_TXDESC_DATA_OFFSET_MASK)
-			   << EDMA_TXDESC_DATA_OFFSET_SHIFT);
-	txdesc->word1 |= ((buf_len & EDMA_TXDESC_DATA_LENGTH_MASK)
-			<< EDMA_TXDESC_DATA_LENGTH_SHIFT);
-
-	netdev_dbg(netdev, "skb:%px tx_ring:%u proto:0x%x\n",
-			skb, txdesc_ring->id, ntohs(skb->protocol));
-	netdev_dbg(netdev, "port:%u prod_idx:%u cons_idx:%u\n",
-			dp_dev->macid, hw_next_to_use, hw_next_to_clean);
-
-	/*
-	 * Update producer index
-	 */
-	hw_next_to_use = (hw_next_to_use + 1) & (txdesc_ring->count - 1);
-
-	/*
-	 * make sure the hw_next_to_use is updated before the
-	 * write to hardware
-	 */
-	wmb();
-
-	edma_reg_write(EDMA_REG_TXDESC_PROD_IDX(txdesc_ring->id),
-		       hw_next_to_use & EDMA_TXDESC_PROD_IDX_MASK);
-	spin_unlock_bh(&txdesc_ring->tx_lock);
-	return EDMA_TX_OK;
-}
-
-/*
- * edma_handle_misc_irq()
- *	Process IRQ
- */
-irqreturn_t edma_handle_misc_irq(int irq, void *ctx)
-{
-	uint32_t misc_intr_status = 0;
-	uint32_t reg_data = 0;
-	struct edma_hw *ehw = NULL;
-	struct platform_device *pdev = (struct platform_device *)ctx;
-
-	ehw = platform_get_drvdata(pdev);
-
-	/*
-	 * Read Misc intr status
-	 */
-	reg_data = edma_reg_read(EDMA_REG_MISC_INT_STAT);
-	misc_intr_status = reg_data & ehw->misc_intr_mask;
-
-	/*
-	 * TODO - error logging
-	 */
-	if (misc_intr_status == 0)
-		return IRQ_NONE;
-	else
-		edma_reg_write(EDMA_REG_MISC_INT_MASK, EDMA_MASK_INT_DISABLE);
-
-	return IRQ_HANDLED;
-}
-
-/*
- * edma_handle_irq()
- *	Process IRQ and schedule napi
- */
-irqreturn_t edma_handle_irq(int irq, void *ctx)
-{
-	uint32_t reg_data = 0;
-	uint32_t rxdesc_intr_status = 0;
-	uint32_t txcmpl_intr_status = 0;
-	uint32_t rxfill_intr_status = 0;
-	int i;
-	struct edma_txcmpl_ring *txcmpl_ring = NULL;
-	struct edma_rxdesc_ring *rxdesc_ring = NULL;
-	struct edma_rxfill_ring *rxfill_ring = NULL;
-	struct edma_hw *ehw = NULL;
-	struct platform_device *pdev = (struct platform_device *)ctx;
-
-	ehw = platform_get_drvdata(pdev);
-	if (!ehw) {
-		pr_info("Unable to retrieve platrofm data");
-		return IRQ_HANDLED;
-	}
-
-	/*
-	 * Read RxDesc intr status
-	 */
-	for (i = 0; i < ehw->rxdesc_rings; i++) {
-		rxdesc_ring = &ehw->rxdesc_ring[i];
-		reg_data = edma_reg_read(
-				EDMA_REG_RXDESC_INT_STAT(rxdesc_ring->id));
-		rxdesc_intr_status |= reg_data &
-				EDMA_RXDESC_RING_INT_STATUS_MASK;
-
-		/*
-		 * Disable RxDesc intr
-		 */
-		edma_reg_write(EDMA_REG_RXDESC_INT_MASK(rxdesc_ring->id),
-			       EDMA_MASK_INT_DISABLE);
-	}
-
-	/*
-	 * Read TxCmpl intr status
-	 */
-	for (i = 0; i < ehw->txcmpl_rings; i++) {
-		txcmpl_ring = &ehw->txcmpl_ring[i];
-		reg_data = edma_reg_read(
-				EDMA_REG_TX_INT_STAT(txcmpl_ring->id));
-		txcmpl_intr_status |= reg_data &
-				EDMA_TXCMPL_RING_INT_STATUS_MASK;
-
-		/*
-		 * Disable TxCmpl intr
-		 */
-		edma_reg_write(EDMA_REG_TX_INT_MASK(txcmpl_ring->id),
-				EDMA_MASK_INT_DISABLE);
-	}
-
-	/*
-	 * Read RxFill intr status
-	 */
-	for (i = 0; i < ehw->rxfill_rings; i++) {
-		rxfill_ring = &ehw->rxfill_ring[i];
-		reg_data = edma_reg_read(
-				EDMA_REG_RXFILL_INT_STAT(rxfill_ring->id));
-		rxfill_intr_status |= reg_data &
-				EDMA_RXFILL_RING_INT_STATUS_MASK;
-
-		/*
-		 * Disable RxFill intr
-		 */
-		edma_reg_write(EDMA_REG_RXFILL_INT_MASK(rxfill_ring->id),
-			       EDMA_MASK_INT_DISABLE);
-
-	}
-
-	if ((rxdesc_intr_status == 0) && (txcmpl_intr_status == 0) &&
-			(rxfill_intr_status == 0))
-		return IRQ_NONE;
-
-	for (i = 0; i < ehw->rxdesc_rings; i++) {
-		rxdesc_ring = &ehw->rxdesc_ring[i];
-		edma_reg_write(EDMA_REG_RXDESC_INT_MASK(rxdesc_ring->id),
-			       EDMA_MASK_INT_DISABLE);
-	}
-
-	/*
-	 *TODO - per core NAPI
-	 */
-	if (rxdesc_intr_status || txcmpl_intr_status || rxfill_intr_status)
-		if (likely(napi_schedule_prep(&ehw->napi)))
-			__napi_schedule(&ehw->napi);
-
-	return IRQ_HANDLED;
-}

feeds/ipq807x/qca-nss-dp/src/hal/gmac_hal_ops/qcom/qcom_dev.h

@@ -1,697 +0,0 @@
-/*
- **************************************************************************
- * Copyright (c) 2016-2017,2020 The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF0
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************
- */
-
-#ifndef __QCOM_DEV_H__
-#define __QCOM_DEV_H__
-
-#include <nss_dp_hal_if.h>
-#include "qcom_reg.h"
-#include <fal/fal_mib.h>
-#include <fal/fal_port_ctrl.h>
-
-/*
- * Subclass for base nss_gmac_haldev
- */
-struct qcom_hal_dev {
-	struct nss_gmac_hal_dev nghd;	/* Base class */
-	fal_mib_counter_t stats;	/* Stats structure */
-};
-/*
- * qcom_set_rx_flow_ctrl()
- */
-static inline void qcom_set_rx_flow_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_RX_FLOW_ENABLE);
-}
-
-/*
- * qcom_clear_rx_flow_ctrl()
- */
-static inline void qcom_clear_rx_flow_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_RX_FLOW_ENABLE);
-}
-
-/*
- * qcom_set_tx_flow_ctrl()
- */
-static inline void qcom_set_tx_flow_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_TX_FLOW_ENABLE);
-}
-
-/*
- * qcom_clear_tx_flow_ctrl()
- */
-static inline void qcom_clear_tx_flow_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_TX_FLOW_ENABLE);
-}
-
-/*
- * qcom_clear_mac_ctrl0()
- */
-static inline void qcom_clear_mac_ctrl0(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, QCOM_MAC_CTRL0, 0);
-}
-
-/*
- * qcom_rx_enable()
- */
-static inline void qcom_rx_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_RX_MAC_ENABLE);
-}
-
-/*
- * qcom_rx_disable()
- *	Disable the reception of frames on GMII/MII.
- *	GMAC receive state machine is disabled after completion of reception of
- *	current frame.
- */
-static inline void qcom_rx_disable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_RX_MAC_ENABLE);
-}
-
-/*
- * qcom_tx_enable()
- */
-static inline void qcom_tx_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_TX_MAC_ENABLE);
-}
-
-/*
- * qcom_tx_disable()
- *	Disable the transmission of frames on GMII/MII.
- *	GMAC transmit state machine is disabled after completion of
- *	transmission of current frame.
- */
-static inline void qcom_tx_disable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_TX_MAC_ENABLE);
-}
-
-/*
- * qcom_set_full_duplex()
- */
-static inline void qcom_set_full_duplex(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_DUPLEX);
-}
-
-/*
- * qcom_set_half_duplex()
- */
-static inline void qcom_set_half_duplex(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_ENABLE, QCOM_DUPLEX);
-}
-
-/*
- * qcom_set_ipgt()
- */
-static inline void qcom_set_ipgt(struct nss_gmac_hal_dev *nghd, uint32_t ipgt)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_CTRL0);
-	data &= ~QCOM_IPGT_POS;
-	ipgt = ipgt << QCOM_IPGT_LSB;
-	data |= ipgt;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_CTRL0, data);
-}
-
-/*
- * qcom_set_ipgr()
- */
-static inline void qcom_set_ipgr(struct nss_gmac_hal_dev *nghd, uint32_t ipgr)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_CTRL0);
-	data &= ~QCOM_IPGR2_POS;
-	ipgr = ipgr << QCOM_IPGR2_LSB;
-	data |= ipgr;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_CTRL0, data);
-}
-
-/*
- * qcom_set_half_thdf_ctrl()
- */
-static inline void qcom_set_half_thdf_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_HALF_THDF_CTRL);
-}
-
-/*
- * qcom_reset_half_thdf_ctrl()
- */
-static inline void qcom_reset_half_thdf_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_HALF_THDF_CTRL);
-}
-
-/*
- * qcom_set_frame_len_chk()
- */
-static inline void qcom_set_frame_len_chk(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_FLCHK);
-}
-
-/*
- * qcom_reset_frame_len_chk()
- */
-static inline void qcom_reset_frame_len_chk(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_FLCHK);
-}
-
-/*
- * qcom_set_abebe()
- */
-static inline void qcom_set_abebe(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_ABEBE);
-}
-
-/*
- * qcom_reset_abebe()
- */
-static inline void qcom_reset_abebe(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_ABEBE);
-}
-
-/*
- * qcom_set_amaxe()
- */
-static inline void qcom_set_amaxe(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_AMAXE);
-}
-
-/*
- * qcom_reset_amaxe()
- */
-static inline void qcom_reset_amaxe(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_AMAXE);
-}
-
-/*
- * qcom_set_bpnb()
- */
-static inline void qcom_set_bpnb(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_BPNB);
-}
-
-/*
- * qcom_reset_bpnb()
- */
-static inline void qcom_reset_bpnb(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_BPNB);
-}
-
-/*
- * qcom_set_nobo()
- */
-static inline void qcom_set_nobo(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_NOBO);
-}
-
-/*
- * qcom_reset_nobo()
- */
-static inline void qcom_reset_nobo(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_NOBO);
-}
-
-/*
- * qcom_set_drbnib_rxok()
- */
-static inline void qcom_set_drbnib_rxok(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_DRBNIB_RXOK);
-}
-
-/*
- * qcom_reset_drbnib_rxok()
- */
-static inline void qcom_reset_drbnib_rxok(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL0, QCOM_DRBNIB_RXOK);
-}
-
-/*
- * qcom_set_jam_ipg()
- */
-static inline void qcom_set_jam_ipg(struct nss_gmac_hal_dev *nghd,
-							uint32_t jam_ipg)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_CTRL1);
-	data &= ~QCOM_JAM_IPG_POS;
-	jam_ipg = jam_ipg << QCOM_JAM_IPG_LSB;
-	data |= jam_ipg;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_CTRL1, data);
-}
-
-/*
- * qcom_set_ctrl1_test_pause()
- */
-static inline void qcom_set_ctrl1_test_pause(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_TPAUSE);
-}
-
-/*
- * qcom_reset_ctrl1_test_pause()
- */
-static inline void qcom_reset_ctrl1_test_pause(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_TPAUSE);
-}
-
-/*
- * qcom_reset_ctrl1_test_pause()
- */
-static inline void qcom_set_tctl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_TCTL);
-}
-
-/*
- * qcom_reset_tctl()
- */
-static inline void qcom_reset_tctl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_TCTL);
-}
-
-/*
- * qcom_set_sstct()
- */
-static inline void qcom_set_sstct(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_SSTCT);
-}
-
-/*
- * qcom_reset_sstct()
- */
-static inline void qcom_reset_sstct(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_SSTCT);
-}
-
-/*
- * qcom_set_simr()
- */
-static inline void qcom_set_simr(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_SIMR);
-}
-
-/*
- * qcom_reset_simr()
- */
-static inline void qcom_reset_simr(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_SIMR);
-}
-
-/*
- * qcom_set_retry()
- */
-static inline void qcom_set_retry(struct nss_gmac_hal_dev *nghd, uint32_t retry)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_CTRL1);
-	data &= ~QCOM_RETRY_POS;
-	retry = retry << QCOM_RETRY_LSB;
-	data |= retry;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_CTRL1, data);
-}
-
-/*
- * qcom_set_prlen()
- */
-static inline void qcom_set_prlen(struct nss_gmac_hal_dev *nghd, uint32_t prlen)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_CTRL1);
-	data &= ~QCOM_PRLEN_POS;
-	prlen = prlen << QCOM_PRLEN_LSB;
-	data |= prlen;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_CTRL1, data);
-}
-
-/*
- * qcom_set_ppad()
- */
-static inline void qcom_set_ppad(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_PPAD);
-}
-
-/*
- * qcom_reset_ppad()
- */
-static inline void qcom_reset_ppad(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_PPAD);
-}
-
-/*
- * qcom_set_povr()
- */
-static inline void qcom_set_povr(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_POVR);
-}
-
-/*
- * qcom_reset_povr()
- */
-static inline void qcom_reset_povr(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_POVR);
-}
-
-/*
- * qcom_set_phug()
- */
-static inline void qcom_set_phug(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_PHUG);
-}
-
-/*
- * qcom_reset_phug()
- */
-static inline void qcom_reset_phug(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_PHUG);
-}
-
-/*
- * qcom_set_mbof()
- */
-static inline void qcom_set_mbof(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_MBOF);
-}
-
-/*
- * qcom_reset_mbof()
- */
-static inline void qcom_reset_mbof(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_MBOF);
-}
-
-/*
- * qcom_set_lcol()
- */
-static inline void qcom_set_lcol(struct nss_gmac_hal_dev *nghd, uint32_t lcol)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_CTRL1);
-	data &= ~QCOM_LCOL_POS;
-	lcol = lcol << QCOM_LCOL_LSB;
-	data |= lcol;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_CTRL1, data);
-}
-
-/*
- * qcom_set_long_jam()
- */
-static inline void qcom_set_long_jam(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_LONG_JAM);
-}
-
-/*
- * qcom_reset_long_jam()
- */
-static inline void qcom_reset_long_jam(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL1, QCOM_LONG_JAM);
-}
-
-/*
- * qcom_set_ipg_dec_len()
- */
-static inline void qcom_set_ipg_dec_len(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_IPG_DEC_LEN);
-}
-
-/*
- * qcom_reset_ipg_dec_len()
- */
-static inline void qcom_reset_ipg_dec_len(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_IPG_DEC_LEN);
-}
-
-/*
- * qcom_set_ctrl2_test_pause()
- */
-static inline void qcom_set_ctrl2_test_pause(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_TEST_PAUSE);
-}
-
-/*
- * qcom_reset_ctrl2_test_pause()
- */
-static inline void qcom_reset_ctrl2_test_pause(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_TEST_PAUSE);
-}
-
-/*
- * qcom_set_mac_loopback()
- */
-static inline void qcom_set_mac_loopback(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_MAC_LOOPBACK);
-}
-
-/*
- * qcom_reset_mac_loopback()
- */
-static inline void qcom_reset_mac_loopback(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_MAC_LOOPBACK);
-}
-
-/*
- * qcom_set_ipg_dec()
- */
-static inline void qcom_set_ipg_dec(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_IPG_DEC);
-}
-
-/*
- * qcom_reset_ipg_dec()
- */
-static inline void qcom_reset_ipg_dec(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_IPG_DEC);
-}
-
-/*
- * qcom_set_crs_sel()
- */
-static inline void qcom_set_crs_sel(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_SRS_SEL);
-}
-
-/*
- * qcom_reset_crs_sel()
- */
-static inline void qcom_reset_crs_sel(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_SRS_SEL);
-}
-
-/*
- * qcom_set_crc_rsv()
- */
-static inline void qcom_set_crc_rsv(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_CRC_RSV);
-}
-
-/*
- * qcom_reset_crc_rsv()
- */
-static inline void qcom_reset_crc_rsv(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_CTRL2, QCOM_CRC_RSV);
-}
-
-/*
- * qcom_set_ipgr1()
- */
-static inline void qcom_set_ipgr1(struct nss_gmac_hal_dev *nghd, uint32_t ipgr1)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_DBG_CTRL);
-	data &= ~QCOM_DBG_IPGR1_POS;
-	ipgr1 = ipgr1 << QCOM_DBG_IPGR1_LSB;
-	data |= ipgr1;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_DBG_CTRL, data);
-}
-
-/*
- * qcom_set_hihg_ipg()
- */
-static inline void qcom_set_hihg_ipg(struct nss_gmac_hal_dev *nghd,
-			uint32_t hihg_ipg)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_DBG_CTRL);
-	data &= ~QCOM_DBG_HIHG_IPG_POS;
-	data |= hihg_ipg << QCOM_DBG_HIHG_IPG_LSB;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_DBG_CTRL, data);
-}
-
-/*
- * qcom_set_mac_ipg_ctrl()
- */
-static inline void qcom_set_mac_ipg_ctrl(struct nss_gmac_hal_dev *nghd,
-			uint32_t mac_ipg_ctrl)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_DBG_CTRL);
-	data &= ~QCOM_DBG_MAC_IPG_CTRL_POS;
-	data |= mac_ipg_ctrl << QCOM_DBG_MAC_IPG_CTRL_LSB;
-	hal_write_reg(nghd->mac_base, QCOM_MAC_DBG_CTRL, data);
-}
-
-/*
- * qcom_set_mac_len_ctrl()
- */
-static inline void qcom_set_mac_len_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_DBG_CTRL, QCOM_DBG_MAC_LEN_CTRL);
-}
-
-/*
- * qcom_reset_mac_len_ctrl()
- */
-static inline void qcom_reset_mac_len_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_DBG_CTRL, QCOM_DBG_MAC_LEN_CTRL);
-}
-
-/*
- * qcom_set_edxsdfr_transmit()
- */
-static inline void qcom_set_edxsdfr_transmit(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_DBG_CTRL, QCOM_DBG_EDxSDFR_TRANS);
-}
-
-/*
- * qcom_reset_edxsdfr_transmit()
- */
-static inline void qcom_reset_edxsdfr_transmit(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, QCOM_MAC_DBG_CTRL, QCOM_DBG_EDxSDFR_TRANS);
-}
-
-/*
- * qcom_set_mac_dbg_addr()
- */
-static inline void qcom_set_mac_dbg_addr(struct nss_gmac_hal_dev *nghd,
-						uint8_t mac_dbg_addr)
-{
-	hal_write_reg(nghd->mac_base, QCOM_MAC_DBG_ADDR, mac_dbg_addr);
-}
-
-/*
- * qcom_set_mac_dbg_data()
- */
-static inline void qcom_set_mac_dbg_data(struct nss_gmac_hal_dev *nghd,
-						uint32_t mac_dbg_data)
-{
-	hal_write_reg(nghd->mac_base, QCOM_MAC_DBG_DATA, mac_dbg_data);
-}
-
-/*
- * qcom_set_mac_jumbosize()
- */
-static inline void qcom_set_mac_jumbosize(struct nss_gmac_hal_dev *nghd,
-						uint16_t mac_jumbo_size)
-{
-	hal_write_reg(nghd->mac_base, QCOM_MAC_JMB_SIZE, mac_jumbo_size);
-}
-
-/*
- * qcom_clear_mib_ctrl()
- */
-static inline void qcom_clear_mib_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, QCOM_MAC_MIB_CTRL, 0);
-}
-
-/*
- * qcom_set_mib_ctrl()
- */
-static inline void qcom_set_mib_ctrl(struct nss_gmac_hal_dev *nghd,
-						int mib_settings)
-{
-	hal_set_reg_bits(nghd, QCOM_MAC_MIB_CTRL,
-			mib_settings);
-}
-
-/*
- * qcom_get_stats()
- */
-static int qcom_get_stats(struct nss_gmac_hal_dev *nghd)
-{
-	struct qcom_hal_dev *qhd = (struct qcom_hal_dev *)nghd;
-	fal_mib_counter_t *stats = &(qhd->stats);
-
-	if (fal_mib_counter_get(0, nghd->mac_id, stats) < 0)
-		return -1;
-
-	return 0;
-}
-#endif /* __QCOM_DEV_H__ */

feeds/ipq807x/qca-nss-dp/src/hal/gmac_hal_ops/qcom/qcom_if.c

@@ -1,479 +0,0 @@
-/*
- **************************************************************************
- * Copyright (c) 2016-2018, 2020 The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************
- */
-
-#include <linux/delay.h>
-#include <linux/ethtool.h>
-#include <linux/vmalloc.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <nss_dp_hal_if.h>
-#include <nss_dp_dev.h>
-#include "qcom_dev.h"
-
-#define QCOM_STAT(m) offsetof(fal_mib_counter_t, m)
-
-/*
- * Ethtool stats pointer structure
- */
-struct qcom_ethtool_stats {
-	uint8_t stat_string[ETH_GSTRING_LEN];
-	uint32_t stat_offset;
-};
-
-/*
- * Array of strings describing statistics
- */
-static const struct qcom_ethtool_stats qcom_gstrings_stats[] = {
-	{"rx_broadcast", QCOM_STAT(RxBroad)},
-	{"rx_pause", QCOM_STAT(RxPause)},
-	{"rx_unicast", QCOM_STAT(RxUniCast)},
-	{"rx_multicast", QCOM_STAT(RxMulti)},
-	{"rx_fcserr", QCOM_STAT(RxFcsErr)},
-	{"rx_alignerr", QCOM_STAT(RxAllignErr)},
-	{"rx_runt", QCOM_STAT(RxRunt)},
-	{"rx_frag", QCOM_STAT(RxFragment)},
-	{"rx_jmbfcserr", QCOM_STAT(RxJumboFcsErr)},
-	{"rx_jmbalignerr", QCOM_STAT(RxJumboAligenErr)},
-	{"rx_pkt64", QCOM_STAT(Rx64Byte)},
-	{"rx_pkt65to127", QCOM_STAT(Rx128Byte)},
-	{"rx_pkt128to255", QCOM_STAT(Rx256Byte)},
-	{"rx_pkt256to511", QCOM_STAT(Rx512Byte)},
-	{"rx_pkt512to1023", QCOM_STAT(Rx1024Byte)},
-	{"rx_pkt1024to1518", QCOM_STAT(Rx1518Byte)},
-	{"rx_pkt1519tox", QCOM_STAT(RxMaxByte)},
-	{"rx_toolong", QCOM_STAT(RxTooLong)},
-	{"rx_pktgoodbyte", QCOM_STAT(RxGoodByte)},
-	{"rx_pktbadbyte", QCOM_STAT(RxBadByte)},
-	{"rx_overflow", QCOM_STAT(RxOverFlow)},
-	{"tx_broadcast", QCOM_STAT(TxBroad)},
-	{"tx_pause", QCOM_STAT(TxPause)},
-	{"tx_multicast", QCOM_STAT(TxMulti)},
-	{"tx_underrun", QCOM_STAT(TxUnderRun)},
-	{"tx_pkt64", QCOM_STAT(Tx64Byte)},
-	{"tx_pkt65to127", QCOM_STAT(Tx128Byte)},
-	{"tx_pkt128to255", QCOM_STAT(Tx256Byte)},
-	{"tx_pkt256to511", QCOM_STAT(Tx512Byte)},
-	{"tx_pkt512to1023", QCOM_STAT(Tx1024Byte)},
-	{"tx_pkt1024to1518", QCOM_STAT(Tx1518Byte)},
-	{"tx_pkt1519tox", QCOM_STAT(TxMaxByte)},
-	{"tx_oversize", QCOM_STAT(TxOverSize)},
-	{"tx_pktbyte_h", QCOM_STAT(TxByte)},
-	{"tx_collisions", QCOM_STAT(TxCollision)},
-	{"tx_abortcol", QCOM_STAT(TxAbortCol)},
-	{"tx_multicol", QCOM_STAT(TxMultiCol)},
-	{"tx_singlecol", QCOM_STAT(TxSingalCol)},
-	{"tx_exesdeffer", QCOM_STAT(TxExcDefer)},
-	{"tx_deffer", QCOM_STAT(TxDefer)},
-	{"tx_latecol", QCOM_STAT(TxLateCol)},
-	{"tx_unicast", QCOM_STAT(TxUniCast)},
-};
-
-/*
- * Array of strings describing private flag names
- */
-static const char * const qcom_strings_priv_flags[] = {
-	"linkpoll",
-	"tstamp",
-	"tsmode",
-};
-
-#define QCOM_STATS_LEN ARRAY_SIZE(qcom_gstrings_stats)
-#define QCOM_PRIV_FLAGS_LEN ARRAY_SIZE(qcom_strings_priv_flags)
-
-/*
- * qcom_set_mac_speed()
- */
-static int32_t qcom_set_mac_speed(struct nss_gmac_hal_dev *nghd,
-				uint32_t mac_speed)
-{
-	struct net_device *netdev = nghd->netdev;
-
-	netdev_warn(netdev, "API deprecated\n");
-	return 0;
-}
-
-/*
- * qcom_get_mac_speed()
- */
-static uint32_t qcom_get_mac_speed(struct nss_gmac_hal_dev *nghd)
-{
-	struct net_device *netdev = nghd->netdev;
-
-	netdev_warn(netdev, "API deprecated\n");
-	return 0;
-}
-
-/*
- * qcom_set_duplex_mode()
- */
-static void qcom_set_duplex_mode(struct nss_gmac_hal_dev *nghd,
-				uint8_t duplex_mode)
-{
-	struct net_device *netdev = nghd->netdev;
-
-	netdev_warn(netdev, "This API deprecated\n");
-}
-
-/*
- * qcom_get_duplex_mode()
- */
-static uint8_t qcom_get_duplex_mode(struct nss_gmac_hal_dev *nghd)
-{
-	struct net_device *netdev = nghd->netdev;
-
-	netdev_warn(netdev, "API deprecated\n");
-	return 0;
-}
-
-/*
- * qcom_rx_flow_control()
- */
-static void qcom_rx_flow_control(struct nss_gmac_hal_dev *nghd, bool enabled)
-{
-	if (enabled)
-		qcom_set_rx_flow_ctrl(nghd);
-	else
-		qcom_clear_rx_flow_ctrl(nghd);
-}
-
-/*
- * qcom_tx_flow_control()
- */
-static void qcom_tx_flow_control(struct nss_gmac_hal_dev *nghd, bool enabled)
-{
-	if (enabled)
-		qcom_set_tx_flow_ctrl(nghd);
-	else
-		qcom_clear_tx_flow_ctrl(nghd);
-}
-
-/*
- * qcom_get_mib_stats()
- */
-static int32_t qcom_get_mib_stats(struct nss_gmac_hal_dev *nghd)
-{
-	if (qcom_get_stats(nghd))
-		return -1;
-
-	return 0;
-}
-
-/*
- * qcom_set_maxframe()
- */
-static int32_t qcom_set_maxframe(struct nss_gmac_hal_dev *nghd,
-				 uint32_t maxframe)
-{
-	return fal_port_max_frame_size_set(0, nghd->mac_id, maxframe);
-}
-
-/*
- * qcom_get_maxframe()
- */
-static int32_t qcom_get_maxframe(struct nss_gmac_hal_dev *nghd)
-{
-	int ret;
-	uint32_t mtu;
-
-	ret = fal_port_max_frame_size_get(0, nghd->mac_id, &mtu);
-
-	if (!ret)
-		return mtu;
-
-	return ret;
-}
-
-/*
- * qcom_get_netdev_stats()
- */
-static int32_t qcom_get_netdev_stats(struct nss_gmac_hal_dev *nghd,
-		struct rtnl_link_stats64 *stats)
-{
-	struct qcom_hal_dev *qhd = (struct qcom_hal_dev *)nghd;
-	fal_mib_counter_t *hal_stats = &(qhd->stats);
-
-	if (qcom_get_mib_stats(nghd))
-		return -1;
-
-	stats->rx_packets = hal_stats->RxUniCast + hal_stats->RxBroad
-				+ hal_stats->RxMulti;
-	stats->tx_packets = hal_stats->TxUniCast + hal_stats->TxBroad
-				+ hal_stats->TxMulti;
-	stats->rx_bytes = hal_stats->RxGoodByte;
-	stats->tx_bytes = hal_stats->TxByte;
-
-	/* RX errors */
-	stats->rx_crc_errors = hal_stats->RxFcsErr + hal_stats->RxJumboFcsErr;
-	stats->rx_frame_errors = hal_stats->RxAllignErr +
-				 hal_stats->RxJumboAligenErr;
-	stats->rx_fifo_errors = hal_stats->RxRunt;
-	stats->rx_errors = stats->rx_crc_errors + stats->rx_frame_errors +
-			   stats->rx_fifo_errors;
-
-	stats->rx_dropped = hal_stats->RxTooLong + stats->rx_errors;
-
-	/* TX errors */
-	stats->tx_fifo_errors = hal_stats->TxUnderRun;
-	stats->tx_aborted_errors = hal_stats->TxAbortCol;
-	stats->tx_errors = stats->tx_fifo_errors + stats->tx_aborted_errors;
-
-	stats->collisions = hal_stats->TxCollision;
-	stats->multicast = hal_stats->RxMulti;
-
-	return 0;
-}
-
-/*
- * qcom_get_strset_count()
- *	Get string set count for ethtool operations
- */
-int32_t qcom_get_strset_count(struct nss_gmac_hal_dev *nghd, int32_t sset)
-{
-	struct net_device *netdev = nghd->netdev;
-
-	switch (sset) {
-	case ETH_SS_STATS:
-		return QCOM_STATS_LEN;
-	case ETH_SS_PRIV_FLAGS:
-		return QCOM_PRIV_FLAGS_LEN;
-	}
-
-	netdev_dbg(netdev, "%s: Invalid string set\n", __func__);
-	return -EPERM;
-}
-
-/*
- * qcom_get_strings()
- *	Get strings
- */
-int32_t qcom_get_strings(struct nss_gmac_hal_dev *nghd, int32_t sset,
-						uint8_t *data)
-{
-	struct net_device *netdev = nghd->netdev;
-	int i;
-
-	switch (sset) {
-	case ETH_SS_STATS:
-		for (i = 0; i < QCOM_STATS_LEN; i++) {
-			memcpy(data, qcom_gstrings_stats[i].stat_string,
-				strlen(qcom_gstrings_stats[i].stat_string));
-			data += ETH_GSTRING_LEN;
-		}
-		break;
-	case ETH_SS_PRIV_FLAGS:
-		for (i = 0; i < QCOM_PRIV_FLAGS_LEN; i++) {
-			memcpy(data, qcom_strings_priv_flags[i],
-				strlen(qcom_strings_priv_flags[i]));
-			data += ETH_GSTRING_LEN;
-		}
-		break;
-	default:
-		netdev_dbg(netdev, "%s: Invalid string set\n", __func__);
-		return -EPERM;
-	}
-
-	return 0;
-}
-
-/*
- * qcom_get_eth_stats()
- */
-static int32_t qcom_get_eth_stats(struct nss_gmac_hal_dev *nghd, uint64_t *data)
-{
-	struct qcom_hal_dev *qhd = (struct qcom_hal_dev *)nghd;
-	fal_mib_counter_t *stats = &(qhd->stats);
-	uint8_t *p;
-	int i;
-
-	if (qcom_get_mib_stats(nghd))
-		return -1;
-
-	for (i = 0; i < QCOM_STATS_LEN; i++) {
-		p = (uint8_t *)stats + qcom_gstrings_stats[i].stat_offset;
-		data[i] = *(uint32_t *)p;
-	}
-
-	return 0;
-}
-
-/*
- * qcom_send_pause_frame()
- */
-static void qcom_send_pause_frame(struct nss_gmac_hal_dev *nghd)
-{
-	qcom_set_ctrl2_test_pause(nghd);
-}
-
-/*
- * qcom_stop_pause_frame()
- */
-static void qcom_stop_pause_frame(struct nss_gmac_hal_dev *nghd)
-{
-	qcom_reset_ctrl2_test_pause(nghd);
-}
-
-/*
- * qcom_start()
- */
-static int32_t qcom_start(struct nss_gmac_hal_dev *nghd)
-{
-	qcom_set_full_duplex(nghd);
-
-	/* TODO: Read speed from dts */
-
-	if (qcom_set_mac_speed(nghd, SPEED_1000))
-		return -1;
-
-	qcom_tx_enable(nghd);
-	qcom_rx_enable(nghd);
-
-	netdev_dbg(nghd->netdev, "%s: mac_base:0x%px mac_enable:0x%x\n",
-			__func__, nghd->mac_base,
-			hal_read_reg(nghd->mac_base, QCOM_MAC_ENABLE));
-
-	return 0;
-}
-
-/*
- * qcom_stop()
- */
-static int32_t qcom_stop(struct nss_gmac_hal_dev *nghd)
-{
-	qcom_tx_disable(nghd);
-	qcom_rx_disable(nghd);
-
-	netdev_dbg(nghd->netdev, "%s: mac_base:0x%px mac_enable:0x%x\n",
-			__func__, nghd->mac_base,
-			hal_read_reg(nghd->mac_base, QCOM_MAC_ENABLE));
-	return 0;
-}
-
-/*
- * qcom_init()
- */
-static void *qcom_init(struct gmac_hal_platform_data *gmacpdata)
-{
-	struct qcom_hal_dev *qhd = NULL;
-	struct net_device *ndev = NULL;
-	struct nss_dp_dev *dp_priv = NULL;
-	struct resource *res;
-
-	ndev = gmacpdata->netdev;
-	dp_priv = netdev_priv(ndev);
-
-	res = platform_get_resource(dp_priv->pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		netdev_dbg(ndev, "Resource get failed.\n");
-		return NULL;
-	}
-
-	if (!devm_request_mem_region(&dp_priv->pdev->dev, res->start,
-				     resource_size(res), ndev->name)) {
-		netdev_dbg(ndev, "Request mem region failed. Returning...\n");
-		return NULL;
-	}
-
-	qhd = (struct qcom_hal_dev *)devm_kzalloc(&dp_priv->pdev->dev,
-				sizeof(struct qcom_hal_dev), GFP_KERNEL);
-	if (!qhd) {
-		netdev_dbg(ndev, "kzalloc failed. Returning...\n");
-		return NULL;
-	}
-
-	/* Save netdev context in QCOM HAL context */
-	qhd->nghd.netdev = gmacpdata->netdev;
-	qhd->nghd.mac_id = gmacpdata->macid;
-
-	/* Populate the mac base addresses */
-	qhd->nghd.mac_base = devm_ioremap_nocache(&dp_priv->pdev->dev,
-						res->start, resource_size(res));
-	if (!qhd->nghd.mac_base) {
-		netdev_dbg(ndev, "ioremap fail.\n");
-		return NULL;
-	}
-
-	spin_lock_init(&qhd->nghd.slock);
-
-	netdev_dbg(ndev, "ioremap OK.Size 0x%x Ndev base 0x%lx macbase 0x%px\n",
-			gmacpdata->reg_len,
-			ndev->base_addr,
-			qhd->nghd.mac_base);
-
-	/* Reset MIB Stats */
-	if (fal_mib_port_flush_counters(0, qhd->nghd.mac_id)) {
-		netdev_dbg(ndev, "MIB stats Reset fail.\n");
-	}
-
-	return (struct nss_gmac_hal_dev *)qhd;
-}
-
-/*
- * qcom_get_mac_address()
- */
-static void qcom_get_mac_address(struct nss_gmac_hal_dev *nghd,
-				 uint8_t *macaddr)
-{
-	uint32_t data = hal_read_reg(nghd->mac_base, QCOM_MAC_ADDR0);
-	macaddr[5] = (data >> 8) & 0xff;
-	macaddr[4] = (data) & 0xff;
-
-	data = hal_read_reg(nghd->mac_base, QCOM_MAC_ADDR1);
-	macaddr[0] = (data >> 24) & 0xff;
-	macaddr[1] = (data >> 16) & 0xff;
-	macaddr[2] = (data >> 8) & 0xff;
-	macaddr[3] = (data) & 0xff;
-}
-
-/*
- * qcom_set_mac_address()
- */
-static void qcom_set_mac_address(struct nss_gmac_hal_dev *nghd,
-				uint8_t *macaddr)
-{
-	uint32_t data = (macaddr[5] << 8) | macaddr[4];
-	hal_write_reg(nghd->mac_base, QCOM_MAC_ADDR0, data);
-	data = (macaddr[0] << 24) | (macaddr[1] << 16)
-		| (macaddr[2] << 8) | macaddr[3];
-	hal_write_reg(nghd->mac_base, QCOM_MAC_ADDR1, data);
-}
-
-/*
- * MAC hal_ops base structure
- */
-struct nss_gmac_hal_ops qcom_hal_ops = {
-	.init = &qcom_init,
-	.start = &qcom_start,
-	.stop = &qcom_stop,
-	.setmacaddr = &qcom_set_mac_address,
-	.getmacaddr = &qcom_get_mac_address,
-	.rxflowcontrol = &qcom_rx_flow_control,
-	.txflowcontrol = &qcom_tx_flow_control,
-	.setspeed = &qcom_set_mac_speed,
-	.getspeed = &qcom_get_mac_speed,
-	.setduplex = &qcom_set_duplex_mode,
-	.getduplex = &qcom_get_duplex_mode,
-	.getstats = &qcom_get_mib_stats,
-	.setmaxframe = &qcom_set_maxframe,
-	.getmaxframe = &qcom_get_maxframe,
-	.getndostats = &qcom_get_netdev_stats,
-	.getssetcount = &qcom_get_strset_count,
-	.getstrings = &qcom_get_strings,
-	.getethtoolstats = &qcom_get_eth_stats,
-	.sendpause = &qcom_send_pause_frame,
-	.stoppause = &qcom_stop_pause_frame,
-};

feeds/ipq807x/qca-nss-dp/src/hal/gmac_hal_ops/qcom/qcom_reg.h

@@ -1,156 +0,0 @@
-/*
- **************************************************************************
- * Copyright (c) 2016,2020 The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF0
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************
- */
-
-#ifndef __QCOM_REG_H__
-#define __QCOM_REG_H__
-
-/* Register Offsets */
-/* Offsets of GMAC config and status registers within NSS_GMAC_QCOM_MAC_BASE */
-#define QCOM_MAC_ENABLE		0x0000
-#define QCOM_MAC_SPEED		0x0004
-#define QCOM_MAC_ADDR0		0x0008
-#define QCOM_MAC_ADDR1		0x000c
-#define QCOM_MAC_CTRL0		0x0010
-#define QCOM_MAC_CTRL1		0x0014
-#define QCOM_MAC_CTRL2		0x0018
-#define QCOM_MAC_DBG_CTRL	0x001c
-#define QCOM_MAC_DBG_ADDR	0x0020
-#define QCOM_MAC_DBG_DATA	0x0024
-#define QCOM_MAC_JMB_SIZE	0x0030
-#define QCOM_MAC_MIB_CTRL	0x0034
-
-/* RX stats */
-#define QCOM_RXBROAD		0x0040
-#define QCOM_RXPAUSE		0x0044
-#define QCOM_RXMULTI		0x0048
-#define QCOM_RXFCSERR		0x004c
-#define QCOM_RXALIGNERR		0x0050
-#define QCOM_RXRUNT		0x0054
-#define QCOM_RXFRAG		0x0058
-#define QCOM_RXJMBFCSERR	0x005c
-#define QCOM_RXJMBALIGNERR	0x0060
-#define QCOM_RXPKT64		0x0064
-#define QCOM_RXPKT65TO127	0x0068
-#define QCOM_RXPKT128TO255	0x006c
-#define QCOM_RXPKT256TO511	0x0070
-#define QCOM_RXPKT512TO1023	0x0074
-#define QCOM_RXPKT1024TO1518	0x0078
-#define QCOM_RXPKT1519TOX	0x007c
-#define QCOM_RXPKTTOOLONG	0x0080
-#define QCOM_RXPKTGOODBYTE_L	0x0084
-#define QCOM_RXPKTGOODBYTE_H	0x0088
-#define QCOM_RXPKTBADBYTE_L	0x008c
-#define QCOM_RXPKTBADBYTE_H	0x0090
-#define QCOM_RXUNI		0x0094
-
-/* TX stats */
-#define QCOM_TXBROAD		0x00a0
-#define QCOM_TXPAUSE		0x00a4
-#define QCOM_TXMULTI		0x00a8
-#define QCOM_TXUNDERUN		0x00aC
-#define QCOM_TXPKT64		0x00b0
-#define QCOM_TXPKT65TO127	0x00b4
-#define QCOM_TXPKT128TO255	0x00b8
-#define QCOM_TXPKT256TO511	0x00bc
-#define QCOM_TXPKT512TO1023	0x00c0
-#define QCOM_TXPKT1024TO1518	0x00c4
-#define QCOM_TXPKT1519TOX	0x00c8
-#define QCOM_TXPKTBYTE_L	0x00cc
-#define QCOM_TXPKTBYTE_H	0x00d0
-#define QCOM_TXCOLLISIONS	0x00d4
-#define QCOM_TXABORTCOL		0x00d8
-#define QCOM_TXMULTICOL		0x00dc
-#define QCOM_TXSINGLECOL	0x00e0
-#define QCOM_TXEXCESSIVEDEFER	0x00e4
-#define QCOM_TXDEFER		0x00e8
-#define QCOM_TXLATECOL		0x00ec
-#define QCOM_TXUNI		0x00f0
-
-/* Bit Masks */
-/* GMAC BITs */
-#define QCOM_RX_MAC_ENABLE	1
-#define QCOM_TX_MAC_ENABLE	0x2
-#define QCOM_DUPLEX		0x10
-#define QCOM_RX_FLOW_ENABLE	0x20
-#define QCOM_TX_FLOW_ENABLE	0x40
-
-#define QCOM_MAC_SPEED_10	0
-#define QCOM_MAC_SPEED_100	1
-#define QCOM_MAC_SPEED_1000	2
-
-/* MAC CTRL0 */
-#define QCOM_IPGT_POS		0x0000007f
-#define QCOM_IPGT_LSB		0
-#define QCOM_IPGR2_POS		0x00007f00
-#define QCOM_IPGR2_LSB		8
-#define QCOM_HALF_THDF_CTRL	0x8000
-#define QCOM_HUGE_RECV		0x10000
-#define QCOM_HUGE_TRANS		0x20000
-#define QCOM_FLCHK		0x40000
-#define QCOM_ABEBE		0x80000
-#define QCOM_AMAXE		0x10000000
-#define QCOM_BPNB		0x20000000
-#define QCOM_NOBO		0x40000000
-#define QCOM_DRBNIB_RXOK	0x80000000
-
-/* MAC CTRL1 */
-#define QCOM_JAM_IPG_POS	0x0000000f
-#define QCOM_JAM_IPG_LSB	0
-#define QCOM_TPAUSE		0x10
-#define QCOM_TCTL		0x20
-#define QCOM_SSTCT		0x40
-#define QCOM_SIMR		0x80
-#define QCOM_RETRY_POS		0x00000f00
-#define QCOM_RETRY_LSB		8
-#define QCOM_PRLEN_POS		0x0000f000
-#define QCOM_PRLEN_LSB		8
-#define QCOM_PPAD		0x10000
-#define QCOM_POVR		0x20000
-#define QCOM_PHUG		0x40000
-#define QCOM_MBOF		0x80000
-#define QCOM_LCOL_POS		0x0ff00000
-#define QCOM_LCOL_LSB		20
-#define QCOM_LONG_JAM		0x10000000
-
-/* MAC CTRL2 */
-#define QCOM_IPG_DEC_LEN	0x2
-#define QCOM_TEST_PAUSE		0x4
-#define QCOM_MAC_LPI_TX_IDLE	0x8
-#define QCOM_MAC_LOOPBACK	0x10
-#define QCOM_IPG_DEC		0x20
-#define QCOM_SRS_SEL		0x40
-#define QCOM_CRC_RSV		0x80
-#define QCOM_MAXFR_POS		0x003fff00
-#define QCOM_MAXFR_LSB		8
-
-/* MAC DEBUG_CTRL */
-#define QCOM_DBG_IPGR1_POS	0x0000007f
-#define QCOM_DBG_IPGR1_LSB	0
-#define QCOM_DBG_HIHG_IPG_POS	0x0000ff00
-#define QCOM_DBG_HIHG_IPG_LSB	8
-#define QCOM_DBG_MAC_IPG_CTRL_POS	0x0000ff00
-#define QCOM_DBG_MAC_IPG_CTRL_LSB	20
-#define QCOM_DBG_MAC_LEN_CTRL	0x40000000
-#define QCOM_DBG_EDxSDFR_TRANS	0x80000000
-
-/* MAC MIB-CTRL*/
-#define QCOM_MIB_ENABLE		1
-#define QCOM_MIB_RESET		0x2
-#define QCOM_MIB_RD_CLR		0x4
-
-#endif /*__QCOM_REG_H__*/

feeds/ipq807x/qca-nss-dp/src/hal/gmac_hal_ops/syn/gmac/syn_dev.h

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __SYN_DEV_H__
-#define __SYN_DEV_H__
-
-#include <nss_dp_dev.h>
-
-/*
- * Subclass for base nss_gmac_hal_dev
- */
-struct syn_hal_dev {
-	struct nss_gmac_hal_dev nghd;	/* Base class */
-	struct nss_dp_gmac_stats stats;	/* Stats structure */
-};
-
-#endif /*__SYN_DEV_H__*/

feeds/ipq807x/qca-nss-dp/src/hal/gmac_hal_ops/syn/gmac/syn_if.c

@@ -1,959 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <fal/fal_mib.h>
-#include <fal/fal_port_ctrl.h>
-#include <linux/delay.h>
-#include <linux/ethtool.h>
-#include <linux/vmalloc.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <nss_dp_hal.h>
-#include "syn_dev.h"
-#include "syn_reg.h"
-
-#define SYN_STAT(m)	offsetof(struct nss_dp_hal_gmac_stats, m)
-#define HW_ERR_SIZE	sizeof(uint64_t)
-
-/*
- * Array to store ethtool statistics
- */
-struct syn_ethtool_stats {
-	uint8_t stat_string[ETH_GSTRING_LEN];
-	uint64_t stat_offset;
-};
-
-/*
- * Array of strings describing statistics
- */
-static const struct syn_ethtool_stats syn_gstrings_stats[] = {
-	{"rx_bytes", SYN_STAT(rx_bytes)},
-	{"rx_packets", SYN_STAT(rx_packets)},
-	{"rx_errors", SYN_STAT(rx_errors)},
-	{"rx_receive_errors", SYN_STAT(rx_receive_errors)},
-	{"rx_descriptor_errors", SYN_STAT(rx_descriptor_errors)},
-	{"rx_late_collision_errors", SYN_STAT(rx_late_collision_errors)},
-	{"rx_dribble_bit_errors", SYN_STAT(rx_dribble_bit_errors)},
-	{"rx_length_errors", SYN_STAT(rx_length_errors)},
-	{"rx_ip_header_errors", SYN_STAT(rx_ip_header_errors)},
-	{"rx_ip_payload_errors", SYN_STAT(rx_ip_payload_errors)},
-	{"rx_no_buffer_errors", SYN_STAT(rx_no_buffer_errors)},
-	{"rx_transport_csum_bypassed", SYN_STAT(rx_transport_csum_bypassed)},
-	{"tx_bytes", SYN_STAT(tx_bytes)},
-	{"tx_packets", SYN_STAT(tx_packets)},
-	{"tx_collisions", SYN_STAT(tx_collisions)},
-	{"tx_errors", SYN_STAT(tx_errors)},
-	{"tx_jabber_timeout_errors", SYN_STAT(tx_jabber_timeout_errors)},
-	{"tx_frame_flushed_errors", SYN_STAT(tx_frame_flushed_errors)},
-	{"tx_loss_of_carrier_errors", SYN_STAT(tx_loss_of_carrier_errors)},
-	{"tx_no_carrier_errors", SYN_STAT(tx_no_carrier_errors)},
-	{"tx_late_collision_errors", SYN_STAT(tx_late_collision_errors)},
-	{"tx_excessive_collision_errors", SYN_STAT(tx_excessive_collision_errors)},
-	{"tx_excessive_deferral_errors", SYN_STAT(tx_excessive_deferral_errors)},
-	{"tx_underflow_errors", SYN_STAT(tx_underflow_errors)},
-	{"tx_ip_header_errors", SYN_STAT(tx_ip_header_errors)},
-	{"tx_ip_payload_errors", SYN_STAT(tx_ip_payload_errors)},
-	{"tx_dropped", SYN_STAT(tx_dropped)},
-	{"rx_missed", SYN_STAT(rx_missed)},
-	{"fifo_overflows", SYN_STAT(fifo_overflows)},
-	{"rx_scatter_errors", SYN_STAT(rx_scatter_errors)},
-	{"tx_ts_create_errors", SYN_STAT(tx_ts_create_errors)},
-	{"pmt_interrupts", SYN_STAT(hw_errs[0])},
-	{"mmc_interrupts", SYN_STAT(hw_errs[0]) + (1 * HW_ERR_SIZE)},
-	{"line_interface_interrupts", SYN_STAT(hw_errs[0]) + (2 * HW_ERR_SIZE)},
-	{"fatal_bus_error_interrupts", SYN_STAT(hw_errs[0]) + (3 * HW_ERR_SIZE)},
-	{"rx_buffer_unavailable_interrupts", SYN_STAT(hw_errs[0]) + (4 * HW_ERR_SIZE)},
-	{"rx_process_stopped_interrupts", SYN_STAT(hw_errs[0]) + (5 * HW_ERR_SIZE)},
-	{"tx_underflow_interrupts", SYN_STAT(hw_errs[0]) + (6 * HW_ERR_SIZE)},
-	{"rx_overflow_interrupts", SYN_STAT(hw_errs[0]) + (7 * HW_ERR_SIZE)},
-	{"tx_jabber_timeout_interrutps", SYN_STAT(hw_errs[0]) + (8 * HW_ERR_SIZE)},
-	{"tx_process_stopped_interrutps", SYN_STAT(hw_errs[0]) + (9 * HW_ERR_SIZE)},
-	{"gmac_total_ticks", SYN_STAT(gmac_total_ticks)},
-	{"gmac_worst_case_ticks", SYN_STAT(gmac_worst_case_ticks)},
-	{"gmac_iterations", SYN_STAT(gmac_iterations)},
-	{"tx_pause_frames", SYN_STAT(tx_pause_frames)},
-	{"mmc_rx_overflow_errors", SYN_STAT(mmc_rx_overflow_errors)},
-	{"mmc_rx_watchdog_timeout_errors", SYN_STAT(mmc_rx_watchdog_timeout_errors)},
-	{"mmc_rx_crc_errors", SYN_STAT(mmc_rx_crc_errors)},
-	{"mmc_rx_ip_header_errors", SYN_STAT(mmc_rx_ip_header_errors)},
-	{"mmc_rx_octets_g", SYN_STAT(mmc_rx_octets_g)},
-	{"mmc_rx_ucast_frames", SYN_STAT(mmc_rx_ucast_frames)},
-	{"mmc_rx_bcast_frames", SYN_STAT(mmc_rx_bcast_frames)},
-	{"mmc_rx_mcast_frames", SYN_STAT(mmc_rx_mcast_frames)},
-	{"mmc_rx_undersize", SYN_STAT(mmc_rx_undersize)},
-	{"mmc_rx_oversize", SYN_STAT(mmc_rx_oversize)},
-	{"mmc_rx_jabber", SYN_STAT(mmc_rx_jabber)},
-	{"mmc_rx_octets_gb", SYN_STAT(mmc_rx_octets_gb)},
-	{"mmc_rx_frag_frames_g", SYN_STAT(mmc_rx_frag_frames_g)},
-	{"mmc_tx_octets_g", SYN_STAT(mmc_tx_octets_g)},
-	{"mmc_tx_ucast_frames", SYN_STAT(mmc_tx_ucast_frames)},
-	{"mmc_tx_bcast_frames", SYN_STAT(mmc_tx_bcast_frames)},
-	{"mmc_tx_mcast_frames", SYN_STAT(mmc_tx_mcast_frames)},
-	{"mmc_tx_deferred", SYN_STAT(mmc_tx_deferred)},
-	{"mmc_tx_single_col", SYN_STAT(mmc_tx_single_col)},
-	{"mmc_tx_multiple_col", SYN_STAT(mmc_tx_multiple_col)},
-	{"mmc_tx_octets_gb", SYN_STAT(mmc_tx_octets_gb)},
-};
-
-#define SYN_STATS_LEN		ARRAY_SIZE(syn_gstrings_stats)
-
-/*
- * syn_set_rx_flow_ctrl()
- */
-static inline void syn_set_rx_flow_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_FLOW_CONTROL,
-			SYN_MAC_FC_RX_FLOW_CONTROL);
-}
-
-/*
- * syn_clear_rx_flow_ctrl()
- */
-static inline void syn_clear_rx_flow_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, SYN_MAC_FLOW_CONTROL,
-			SYN_MAC_FC_RX_FLOW_CONTROL);
-
-}
-
-/*
- * syn_set_tx_flow_ctrl()
- */
-static inline void syn_set_tx_flow_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_FLOW_CONTROL,
-			SYN_MAC_FC_TX_FLOW_CONTROL);
-}
-
-/*
- * syn_send_tx_pause_frame()
- */
-static inline void syn_send_tx_pause_frame(struct nss_gmac_hal_dev *nghd)
-{
-	syn_set_tx_flow_ctrl(nghd);
-	hal_set_reg_bits(nghd, SYN_MAC_FLOW_CONTROL,
-			SYN_MAC_FC_SEND_PAUSE_FRAME);
-}
-
-/*
- * syn_clear_tx_flow_ctrl()
- */
-static inline void syn_clear_tx_flow_ctrl(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, SYN_MAC_FLOW_CONTROL,
-			SYN_MAC_FC_TX_FLOW_CONTROL);
-}
-
-/*
- * syn_rx_enable()
- */
-static inline void syn_rx_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_CONFIGURATION, SYN_MAC_RX);
-	hal_set_reg_bits(nghd, SYN_MAC_FRAME_FILTER, SYN_MAC_FILTER_OFF);
-}
-
-/*
- * syn_tx_enable()
- */
-static inline void syn_tx_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_CONFIGURATION, SYN_MAC_TX);
-}
-
-/************Ip checksum offloading APIs*************/
-
-/*
- * syn_enable_rx_chksum_offload()
- *	Enable IPv4 header and IPv4/IPv6 TCP/UDP checksum calculation by GMAC.
- */
-static inline void syn_enable_rx_chksum_offload(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd,
-			      SYN_MAC_CONFIGURATION, SYN_MAC_RX_IPC_OFFLOAD);
-}
-
-/*
- * syn_disable_rx_chksum_offload()
- *	Disable the IP checksum offloading in receive path.
- */
-static inline void syn_disable_rx_chksum_offload(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd,
-				SYN_MAC_CONFIGURATION, SYN_MAC_RX_IPC_OFFLOAD);
-}
-
-/*
- * syn_rx_tcpip_chksum_drop_enable()
- *	Instruct the DMA to drop the packets that fail TCP/IP checksum.
- *
- * This is to instruct the receive DMA engine to drop the recevied
- * packet if they fails the tcp/ip checksum in hardware. Valid only when
- * full checksum offloading is enabled(type-2).
- */
-static inline void syn_rx_tcpip_chksum_drop_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd,
-				SYN_DMA_OPERATION_MODE, SYN_DMA_DISABLE_DROP_TCP_CS);
-}
-
-/*******************Ip checksum offloading APIs**********************/
-
-/*
- * syn_ipc_offload_init()
- *	Initialize IPC Checksum offloading.
- */
-static inline void syn_ipc_offload_init(struct nss_gmac_hal_dev *nghd)
-{
-	struct nss_dp_dev *dp_priv;
-	dp_priv = netdev_priv(nghd->netdev);
-
-	if (test_bit(__NSS_DP_RXCSUM, &dp_priv->flags)) {
-		/*
-		 * Enable the offload engine in the receive path
-		 */
-		syn_enable_rx_chksum_offload(nghd);
-
-		/*
-		 * DMA drops the packets if error in encapsulated ethernet
-		 * payload.
-		 */
-		syn_rx_tcpip_chksum_drop_enable(nghd);
-		netdev_dbg(nghd->netdev, "%s: enable Rx checksum\n", __func__);
-	} else {
-		syn_disable_rx_chksum_offload(nghd);
-		netdev_dbg(nghd->netdev, "%s: disable Rx checksum\n", __func__);
-	}
-}
-
-/*
- * syn_disable_mac_interrupt()
- *	Disable all the interrupts.
- */
-static inline void syn_disable_mac_interrupt(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, SYN_INTERRUPT_MASK, 0xffffffff);
-}
-
-/*
- * syn_disable_mmc_tx_interrupt()
- *	Disable the MMC Tx interrupt.
- *
- * The MMC tx interrupts are masked out as per the mask specified.
- */
-static inline void syn_disable_mmc_tx_interrupt(struct nss_gmac_hal_dev *nghd,
-						uint32_t mask)
-{
-	hal_set_reg_bits(nghd, SYN_MMC_TX_INTERRUPT_MASK, mask);
-}
-
-/*
- * syn_disable_mmc_rx_interrupt()
- *	Disable the MMC Rx interrupt.
- *
- * The MMC rx interrupts are masked out as per the mask specified.
- */
-static inline void syn_disable_mmc_rx_interrupt(struct nss_gmac_hal_dev *nghd,
-						uint32_t mask)
-{
-	hal_set_reg_bits(nghd, SYN_MMC_RX_INTERRUPT_MASK, mask);
-}
-
-/*
- * syn_disable_mmc_ipc_rx_interrupt()
- *	Disable the MMC ipc rx checksum offload interrupt.
- *
- * The MMC ipc rx checksum offload interrupts are masked out as
- * per the mask specified.
- */
-static inline void syn_disable_mmc_ipc_rx_interrupt(struct nss_gmac_hal_dev *nghd,
-					   uint32_t mask)
-{
-	hal_set_reg_bits(nghd, SYN_MMC_IPC_RX_INTR_MASK, mask);
-}
-
-/*
- * syn_disable_dma_interrupt()
- *	Disables all DMA interrupts.
- */
-void syn_disable_dma_interrupt(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, SYN_DMA_INT_ENABLE, SYN_DMA_INT_DISABLE);
-}
-
-/*
- * syn_enable_dma_interrupt()
- *	Enables all DMA interrupts.
- */
-void syn_enable_dma_interrupt(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, SYN_DMA_INT_ENABLE, SYN_DMA_INT_EN);
-}
-
-/*
- * syn_disable_interrupt_all()
- *	Disable all the interrupts.
- */
-static inline void syn_disable_interrupt_all(struct nss_gmac_hal_dev *nghd)
-{
-	syn_disable_mac_interrupt(nghd);
-	syn_disable_dma_interrupt(nghd);
-	syn_disable_mmc_tx_interrupt(nghd, 0xFFFFFFFF);
-	syn_disable_mmc_rx_interrupt(nghd, 0xFFFFFFFF);
-	syn_disable_mmc_ipc_rx_interrupt(nghd, 0xFFFFFFFF);
-}
-
-/*
- * syn_dma_bus_mode_init()
- *	Function to program DMA bus mode register.
- */
-static inline void syn_dma_bus_mode_init(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, SYN_DMA_BUS_MODE, SYN_DMA_BUS_MODE_VAL);
-}
-
-/*
- * syn_clear_dma_status()
- *	Clear all the pending dma interrupts.
- */
-void syn_clear_dma_status(struct nss_gmac_hal_dev *nghd)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, SYN_DMA_STATUS);
-	hal_write_reg(nghd->mac_base, SYN_DMA_STATUS, data);
-}
-
-/*
- * syn_enable_dma_rx()
- *	Enable Rx GMAC operation
- */
-void syn_enable_dma_rx(struct nss_gmac_hal_dev *nghd)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE);
-	data |= SYN_DMA_RX_START;
-	hal_write_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE, data);
-}
-
-/*
- * syn_disable_dma_rx()
- *	Disable Rx GMAC operation
- */
-void syn_disable_dma_rx(struct nss_gmac_hal_dev *nghd)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE);
-	data &= ~SYN_DMA_RX_START;
-	hal_write_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE, data);
-}
-
-/*
- * syn_enable_dma_tx()
- *	Enable Rx GMAC operation
- */
-void syn_enable_dma_tx(struct nss_gmac_hal_dev *nghd)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE);
-	data |= SYN_DMA_TX_START;
-	hal_write_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE, data);
-}
-
-/*
- * syn_disable_dma_tx()
- *	Disable Rx GMAC operation
- */
-void syn_disable_dma_tx(struct nss_gmac_hal_dev *nghd)
-{
-	uint32_t data;
-
-	data = hal_read_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE);
-	data &= ~SYN_DMA_TX_START;
-	hal_write_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE, data);
-}
-
-/*
- * syn_resume_dma_tx
- *	Resumes the DMA Transmission.
- */
-void syn_resume_dma_tx(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, SYN_DMA_TX_POLL_DEMAND, 0);
-}
-
-/*
- * syn_get_rx_missed
- *	Get Rx missed errors
- */
-uint32_t syn_get_rx_missed(struct nss_gmac_hal_dev *nghd)
-{
-	uint32_t missed_frame_buff_overflow;
-	missed_frame_buff_overflow = hal_read_reg(nghd->mac_base, SYN_DMA_MISSED_FRAME_AND_BUFF_OVERFLOW_COUNTER);
-	return missed_frame_buff_overflow & 0xFFFF;
-}
-
-/*
- * syn_get_fifo_overflows
- *	Get FIFO overflows
- */
-uint32_t syn_get_fifo_overflows(struct nss_gmac_hal_dev *nghd)
-{
-	uint32_t missed_frame_buff_overflow;
-	missed_frame_buff_overflow = hal_read_reg(nghd->mac_base, SYN_DMA_MISSED_FRAME_AND_BUFF_OVERFLOW_COUNTER);
-	return (missed_frame_buff_overflow >> 17) & 0x7ff;
-}
-
-/*
- * syn_init_tx_desc_base()
- *	Programs the Dma Tx Base address with the starting address of the descriptor ring or chain.
- */
-void syn_init_tx_desc_base(struct nss_gmac_hal_dev *nghd, uint32_t tx_desc_dma)
-{
-	hal_write_reg(nghd->mac_base, SYN_DMA_TX_DESCRIPTOR_LIST_ADDRESS, tx_desc_dma);
-}
-
-/*
- * syn_init_rx_desc_base()
- *	Programs the Dma Rx Base address with the starting address of the descriptor ring or chain.
- */
-void syn_init_rx_desc_base(struct nss_gmac_hal_dev *nghd, uint32_t rx_desc_dma)
-{
-	hal_write_reg(nghd->mac_base, SYN_DMA_RX_DESCRIPTOR_LIST_ADDRESS, rx_desc_dma);
-}
-
-/*
- * syn_dma_axi_bus_mode_init()
- *	Function to program DMA AXI bus mode register.
- */
-static inline void syn_dma_axi_bus_mode_init(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, SYN_DMA_AXI_BUS_MODE,
-					SYN_DMA_AXI_BUS_MODE_VAL);
-}
-
-/*
- * syn_dma_operation_mode_init()
- *	Function to program DMA Operation Mode register.
- */
-static inline void syn_dma_operation_mode_init(struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, SYN_DMA_OPERATION_MODE, SYN_DMA_OMR);
-}
-
-/*
- * syn_broadcast_enable()
- *	Enables Broadcast frames.
- *
- * When enabled Address filtering module passes all incoming broadcast frames.
- */
-static inline void syn_broadcast_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, SYN_MAC_FRAME_FILTER, SYN_MAC_BROADCAST);
-}
-
-/*
- * syn_multicast_enable()
- *	Enables Multicast frames.
- *
- * When enabled all multicast frames are passed.
- */
-static inline void syn_multicast_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_FRAME_FILTER, SYN_MAC_MULTICAST_FILTER);
-}
-
-/*
- * syn_promisc_enable()
- *	Enables promiscous mode.
- *
- * When enabled Address filter modules pass all incoming frames
- * regardless of their Destination and source addresses.
- */
-static inline void syn_promisc_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_FRAME_FILTER, SYN_MAC_FILTER_OFF);
-	hal_set_reg_bits(nghd, SYN_MAC_FRAME_FILTER,
-				SYN_MAC_PROMISCUOUS_MODE_ON);
-}
-
-/*
- * syn_get_stats()
- */
-static int syn_get_stats(struct nss_gmac_hal_dev *nghd)
-{
-	struct nss_dp_dev *dp_priv;
-	struct syn_hal_dev *shd;
-	struct nss_dp_gmac_stats *stats;
-
-	BUG_ON(nghd == NULL);
-
-	shd = (struct syn_hal_dev *)nghd;
-	stats = &(shd->stats);
-
-	dp_priv = netdev_priv(nghd->netdev);
-	if (!dp_priv->data_plane_ops)
-		return -1;
-
-	dp_priv->data_plane_ops->get_stats(dp_priv->dpc, stats);
-
-	return 0;
-}
-
-/*
- * syn_rx_flow_control()
- */
-static void syn_rx_flow_control(struct nss_gmac_hal_dev *nghd,
-				     bool enabled)
-{
-	BUG_ON(nghd == NULL);
-
-	if (enabled)
-		syn_set_rx_flow_ctrl(nghd);
-	else
-		syn_clear_rx_flow_ctrl(nghd);
-}
-
-/*
- * syn_tx_flow_control()
- */
-static void syn_tx_flow_control(struct nss_gmac_hal_dev *nghd,
-				     bool enabled)
-{
-	BUG_ON(nghd == NULL);
-
-	if (enabled)
-		syn_set_tx_flow_ctrl(nghd);
-	else
-		syn_clear_tx_flow_ctrl(nghd);
-}
-
-/*
- * syn_get_max_frame_size()
- */
-static int32_t syn_get_max_frame_size(struct nss_gmac_hal_dev *nghd)
-{
-	int ret;
-	uint32_t mtu;
-
-	BUG_ON(nghd == NULL);
-
-	ret = fal_port_max_frame_size_get(0, nghd->mac_id, &mtu);
-
-	if (!ret)
-		return mtu;
-
-	return ret;
-}
-
-/*
- * syn_set_max_frame_size()
- */
-static int32_t syn_set_max_frame_size(struct nss_gmac_hal_dev *nghd,
-					uint32_t val)
-{
-	BUG_ON(nghd == NULL);
-
-	return fal_port_max_frame_size_set(0, nghd->mac_id, val);
-}
-
-/*
- * syn_set_mac_speed()
- */
-static int32_t syn_set_mac_speed(struct nss_gmac_hal_dev *nghd,
-				   uint32_t mac_speed)
-{
-	struct net_device *netdev;
-	BUG_ON(nghd == NULL);
-
-	netdev = nghd->netdev;
-
-	netdev_warn(netdev, "API deprecated\n");
-	return 0;
-}
-
-/*
- * syn_get_mac_speed()
- */
-static uint32_t syn_get_mac_speed(struct nss_gmac_hal_dev *nghd)
-{
-	struct net_device *netdev;
-	BUG_ON(nghd == NULL);
-
-	netdev = nghd->netdev;
-
-	netdev_warn(netdev, "API deprecated\n");
-	return 0;
-}
-
-/*
- * syn_set_duplex_mode()
- */
-static void syn_set_duplex_mode(struct nss_gmac_hal_dev *nghd,
-				uint8_t duplex_mode)
-{
-	struct net_device *netdev;
-	BUG_ON(nghd == NULL);
-
-	netdev = nghd->netdev;
-
-	netdev_warn(netdev, "API deprecated\n");
-}
-
-/*
- * syn_get_duplex_mode()
- */
-static uint8_t syn_get_duplex_mode(struct nss_gmac_hal_dev *nghd)
-{
-	struct net_device *netdev;
-	BUG_ON(nghd == NULL);
-
-	netdev = nghd->netdev;
-
-	netdev_warn(netdev, "API deprecated\n");
-	return 0;
-}
-
-/*
- * syn_get_netdev_stats()
- */
-static int syn_get_netdev_stats(struct nss_gmac_hal_dev *nghd,
-				struct rtnl_link_stats64 *stats)
-{
-	struct syn_hal_dev *shd;
-	struct nss_dp_hal_gmac_stats *ndo_stats;
-
-	BUG_ON(nghd == NULL);
-
-	shd = (struct syn_hal_dev *)nghd;
-	ndo_stats = &(shd->stats.stats);
-
-	/*
-	 * Read stats from the registered dataplane.
-	 */
-	if (syn_get_stats(nghd))
-		return -1;
-
-	stats->rx_packets = ndo_stats->rx_packets;
-	stats->rx_bytes = ndo_stats->rx_bytes;
-	stats->rx_errors = ndo_stats->rx_errors;
-	stats->rx_dropped = ndo_stats->rx_errors;
-	stats->rx_length_errors = ndo_stats->rx_length_errors;
-	stats->rx_over_errors = ndo_stats->mmc_rx_overflow_errors;
-	stats->rx_crc_errors = ndo_stats->mmc_rx_crc_errors;
-	stats->rx_frame_errors = ndo_stats->rx_dribble_bit_errors;
-	stats->rx_fifo_errors = ndo_stats->fifo_overflows;
-	stats->rx_missed_errors = ndo_stats->rx_missed;
-	stats->collisions = ndo_stats->tx_collisions + ndo_stats->rx_late_collision_errors;
-	stats->tx_packets = ndo_stats->tx_packets;
-	stats->tx_bytes = ndo_stats->tx_bytes;
-	stats->tx_errors = ndo_stats->tx_errors;
-	stats->tx_dropped = ndo_stats->tx_dropped;
-	stats->tx_carrier_errors = ndo_stats->tx_loss_of_carrier_errors + ndo_stats->tx_no_carrier_errors;
-	stats->tx_fifo_errors = ndo_stats->tx_underflow_errors;
-	stats->tx_window_errors = ndo_stats->tx_late_collision_errors;
-
-	return 0;
-}
-
-/*
- * syn_get_eth_stats()
- */
-static int32_t syn_get_eth_stats(struct nss_gmac_hal_dev *nghd,
-						uint64_t *data)
-{
-	struct syn_hal_dev *shd;
-	struct nss_dp_gmac_stats *stats;
-	uint8_t *p = NULL;
-	int i;
-
-	BUG_ON(nghd == NULL);
-
-	shd = (struct syn_hal_dev *)nghd;
-	stats = &(shd->stats);
-
-	/*
-	 * Read stats from the registered dataplane.
-	 */
-	if (syn_get_stats(nghd))
-		return -1;
-
-	for (i = 0; i < SYN_STATS_LEN; i++) {
-		p = ((uint8_t *)(stats) +
-				syn_gstrings_stats[i].stat_offset);
-		data[i] = *(uint32_t *)p;
-	}
-
-	return 0;
-}
-
-/*
- * syn_get_strset_count()
- */
-static int32_t syn_get_strset_count(struct nss_gmac_hal_dev *nghd,
-							int32_t sset)
-{
-	struct net_device *netdev;
-	BUG_ON(nghd == NULL);
-
-	netdev = nghd->netdev;
-
-	switch (sset) {
-	case ETH_SS_STATS:
-		return SYN_STATS_LEN;
-	}
-
-	netdev_dbg(netdev, "%s: Invalid string set\n", __func__);
-	return -EPERM;
-}
-
-/*
- * syn_get_strings()
- */
-static int32_t syn_get_strings(struct nss_gmac_hal_dev *nghd,
-					int32_t stringset, uint8_t *data)
-{
-	struct net_device *netdev;
-	int i;
-
-	BUG_ON(nghd == NULL);
-
-	netdev = nghd->netdev;
-
-	switch (stringset) {
-	case ETH_SS_STATS:
-		for (i = 0; i < SYN_STATS_LEN; i++) {
-			memcpy(data, syn_gstrings_stats[i].stat_string,
-				ETH_GSTRING_LEN);
-			data += ETH_GSTRING_LEN;
-		}
-		break;
-
-	default:
-		netdev_dbg(netdev, "%s: Invalid string set\n", __func__);
-		return -EPERM;
-	}
-
-	return 0;
-}
-
-/*
- * syn_send_pause_frame()
- */
-static void syn_send_pause_frame(struct nss_gmac_hal_dev *nghd)
-{
-	BUG_ON(nghd == NULL);
-
-	syn_send_tx_pause_frame(nghd);
-}
-
-/*
- * syn_set_mac_address()
- */
-static void syn_set_mac_address(struct nss_gmac_hal_dev *nghd,
-							uint8_t *macaddr)
-{
-	uint32_t data;
-
-	BUG_ON(nghd == NULL);
-
-	if (!macaddr) {
-		netdev_warn(nghd->netdev, "macaddr is not valid.\n");
-		return;
-	}
-
-	data = (macaddr[5] << 8) | macaddr[4] | SYN_MAC_ADDR_HIGH_AE;
-	hal_write_reg(nghd->mac_base, SYN_MAC_ADDR0_HIGH, data);
-	data = (macaddr[3] << 24) | (macaddr[2] << 16) | (macaddr[1] << 8)
-		| macaddr[0];
-	hal_write_reg(nghd->mac_base, SYN_MAC_ADDR0_LOW, data);
-}
-
-/*
- * syn_get_mac_address()
- */
-static void syn_get_mac_address(struct nss_gmac_hal_dev *nghd,
-							uint8_t *macaddr)
-{
-	uint32_t data;
-
-	BUG_ON(nghd == NULL);
-
-	if (!macaddr) {
-		netdev_warn(nghd->netdev, "macaddr is not valid.\n");
-		return;
-	}
-
-	data = hal_read_reg(nghd->mac_base, SYN_MAC_ADDR0_HIGH);
-	macaddr[5] = (data >> 8) & 0xff;
-	macaddr[4] = (data) & 0xff;
-
-	data = hal_read_reg(nghd->mac_base, SYN_MAC_ADDR0_LOW);
-	macaddr[3] = (data >> 24) & 0xff;
-	macaddr[2] = (data >> 16) & 0xff;
-	macaddr[1] = (data >> 8) & 0xff;
-	macaddr[0] = (data) & 0xff;
-}
-
-/*
- * syn_dma_init()
- *	Initialize settings for GMAC DMA and AXI bus.
- */
-static void syn_dma_init(struct nss_gmac_hal_dev *nghd)
-{
-	struct net_device *ndev = nghd->netdev;
-	struct nss_dp_dev *dp_priv = netdev_priv(ndev);
-
-	/*
-	 * Enable SoC specific GMAC clocks.
-	 */
-	nss_dp_hal_clk_enable(dp_priv);
-
-	/*
-	 * Configure DMA registers.
-	 */
-	syn_dma_bus_mode_init(nghd);
-	syn_dma_axi_bus_mode_init(nghd);
-	syn_dma_operation_mode_init(nghd);
-}
-
-/*
- * syn_init()
- */
-static void *syn_init(struct gmac_hal_platform_data *gmacpdata)
-{
-	struct syn_hal_dev *shd = NULL;
-	struct net_device *ndev = NULL;
-	struct nss_dp_dev *dp_priv = NULL;
-	struct resource *res;
-
-	ndev = gmacpdata->netdev;
-	dp_priv = netdev_priv(ndev);
-
-	res = platform_get_resource(dp_priv->pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		netdev_dbg(ndev, "Resource get failed.\n");
-		return NULL;
-	}
-
-	shd = (struct syn_hal_dev *)devm_kzalloc(&dp_priv->pdev->dev,
-					sizeof(struct syn_hal_dev),
-					GFP_KERNEL);
-	if (!shd) {
-		netdev_dbg(ndev, "kzalloc failed. Returning...\n");
-		return NULL;
-	}
-
-	shd->nghd.mac_reg_len = resource_size(res);
-	shd->nghd.memres = devm_request_mem_region(&dp_priv->pdev->dev,
-								res->start,
-								resource_size(res),
-								ndev->name);
-	if (!shd->nghd.memres) {
-		netdev_dbg(ndev, "Request mem region failed. Returning...\n");
-		devm_kfree(&dp_priv->pdev->dev, shd);
-		return NULL;
-	}
-
-	/*
-	 * Save netdev context in syn HAL context
-	 */
-	shd->nghd.netdev = gmacpdata->netdev;
-	shd->nghd.mac_id = gmacpdata->macid;
-	shd->nghd.duplex_mode = DUPLEX_FULL;
-
-	set_bit(__NSS_DP_RXCSUM, &dp_priv->flags);
-
-	/*
-	 * Populate the mac base addresses
-	 */
-	shd->nghd.mac_base =
-		devm_ioremap_nocache(&dp_priv->pdev->dev, res->start,
-				     resource_size(res));
-	if (!shd->nghd.mac_base) {
-		netdev_dbg(ndev, "ioremap fail.\n");
-		devm_kfree(&dp_priv->pdev->dev, shd);
-		return NULL;
-	}
-
-	spin_lock_init(&shd->nghd.slock);
-
-	netdev_dbg(ndev, "ioremap OK.Size 0x%x Ndev base 0x%lx macbase 0x%px\n",
-			gmacpdata->reg_len,
-			ndev->base_addr,
-			shd->nghd.mac_base);
-
-	syn_disable_interrupt_all(&shd->nghd);
-	syn_dma_init(&shd->nghd);
-	syn_ipc_offload_init(&shd->nghd);
-	syn_promisc_enable(&shd->nghd);
-	syn_broadcast_enable(&shd->nghd);
-	syn_multicast_enable(&shd->nghd);
-	syn_rx_enable(&shd->nghd);
-	syn_tx_enable(&shd->nghd);
-
-	/*
-	 * Reset MIB Stats
-	 */
-	if (fal_mib_port_flush_counters(0, shd->nghd.mac_id)) {
-		netdev_dbg(ndev, "MIB stats Reset fail.\n");
-	}
-
-	return (struct nss_gmac_hal_dev *)shd;
-}
-
-/*
- * syn_exit()
- */
-static void syn_exit(struct nss_gmac_hal_dev *nghd)
-{
-	struct nss_dp_dev *dp_priv = NULL;
-
-	dp_priv = netdev_priv(nghd->netdev);
-	devm_iounmap(&dp_priv->pdev->dev,
-			(void *)nghd->mac_base);
-	devm_release_mem_region(&dp_priv->pdev->dev,
-			(nghd->memres)->start,
-			nghd->mac_reg_len);
-
-	nghd->memres = NULL;
-	nghd->mac_base = NULL;
-}
-
-struct nss_gmac_hal_ops syn_hal_ops = {
-	.init = &syn_init,
-	.start =  NULL,
-	.stop = NULL,
-	.exit = &syn_exit,
-	.setmacaddr = &syn_set_mac_address,
-	.getmacaddr = &syn_get_mac_address,
-	.rxflowcontrol = &syn_rx_flow_control,
-	.txflowcontrol = &syn_tx_flow_control,
-	.setspeed = &syn_set_mac_speed,
-	.getspeed = &syn_get_mac_speed,
-	.setduplex = &syn_set_duplex_mode,
-	.getduplex = &syn_get_duplex_mode,
-	.setmaxframe = &syn_set_max_frame_size,
-	.getmaxframe = &syn_get_max_frame_size,
-	.getndostats = &syn_get_netdev_stats,
-	.getssetcount = &syn_get_strset_count,
-	.getstrings = &syn_get_strings,
-	.getethtoolstats = &syn_get_eth_stats,
-	.sendpause = &syn_send_pause_frame,
-};

feeds/ipq807x/qca-nss-dp/src/hal/gmac_hal_ops/syn/gmac/syn_reg.h

@@ -1,531 +0,0 @@
-/*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __SYN_REG_H__
-#define __SYN_REG_H__
-
-/*
- * MAC register offset
- */
-#define SYN_MAC_CONFIGURATION				0x0000
-#define SYN_MAC_FRAME_FILTER				0x0004
-#define SYN_MAC_FLOW_CONTROL				0x0018
-#define SYN_VLAN_TAG					0x001C
-#define SYN_VERSION					0x0020
-#define SYN_DEBUG					0x0024
-#define SYN_REMOTE_WAKE_UP_FRAME_FILTER			0x0028
-#define SYN_PMT_CONTROL_STATUS				0x002C
-#define SYN_LPI_CONTROL_STATUS				0x0030
-#define SYN_LPI_TIMERS_CONTROL				0x0034
-#define SYN_INTERRUPT_STATUS				0x0038
-#define SYN_INTERRUPT_MASK				0x003C
-
-/*
- * MAC address register offset
- */
-#define SYN_MAC_ADDR0_HIGH				0x0040
-#define SYN_MAC_ADDR0_LOW				0x0044
-#define SYN_MAC_ADDR1_HIGH				0x0048
-#define SYN_MAC_ADDR1_LOW				0x004C
-#define SYN_MAC_ADDR2_HIGH				0x0050
-#define SYN_MAC_ADDR2_LOW				0x0054
-#define SYN_MAC_ADDR3_HIGH				0x0058
-#define SYN_MAC_ADDR3_LOW				0x005C
-#define SYN_MAC_ADDR4_HIGH				0x0060
-#define SYN_MAC_ADDR4_LOW				0x0064
-
-/*
- * Watchdog timeout register
- */
-#define SYN_WDOG_TIMEOUT				0x00DC
-
-/*
- * Mac Management Counters (MMC) register offset
- */
-#define SYN_MMC_CONTROL					0x0100
-#define SYN_MMC_RX_INTERRUPT				0x0104
-#define SYN_MMC_TX_INTERRUPT				0x0108
-#define SYN_MMC_RX_INTERRUPT_MASK			0x010C
-#define SYN_MMC_TX_INTERRUPT_MASK			0x0110
-#define SYN_MMC_IPC_RX_INTR_MASK			0x0200
-
-/*
- * DMA Register offset
- */
-#define SYN_DMA_BUS_MODE				0x1000
-#define SYN_DMA_TX_POLL_DEMAND				0x1004
-#define SYN_DMA_RX_POLL_DEMAND				0x1008
-#define SYN_DMA_RX_DESCRIPTOR_LIST_ADDRESS		0x100C
-#define SYN_DMA_TX_DESCRIPTOR_LIST_ADDRESS		0x1010
-#define SYN_DMA_STATUS					0x1014
-#define SYN_DMA_OPERATION_MODE				0x1018
-#define SYN_DMA_INT_ENABLE				0x101C
-#define SYN_DMA_MISSED_FRAME_AND_BUFF_OVERFLOW_COUNTER	0x1020
-#define SYN_DMA_RX_INTERRUPT_WATCHDOG_TIMER		0x1024
-#define SYN_DMA_AXI_BUS_MODE				0x1028
-#define SYN_DMA_AHB_OR_AXI_STATUS			0x102C
-#define SYN_DMA_CURRENT_HOST_TX_DESCRIPTOR		0x1048
-#define SYN_DMA_CURRENT_HOST_RX_DESCRIPTOR		0x104C
-#define SYN_DMA_CURRENT_HOST_TX_BUFFER_ADDRESS		0x1050
-#define SYN_DMA_CURRENT_HOST_RX_BUFFER_ADDRESS		0x1054
-
-/*
- * Optional HW feature register
- */
-#define SYN_HW_FEATURE					0x1058
-
-/*
- * Register Bit Definitions
- */
-
-/*
- * SYN_MAC_CONFIGURATION = 0x0000,	MAC config Register Layout
- */
-enum syn_mac_config_reg {
-	SYN_MAC_TWOKPE = 0x08000000,			/* Support for 2K packets */
-	SYN_MAC_TWOKPE_ENABLE = 0x08000000,
-	SYN_MAC_TWOKPE_DISABLE = 0x00000000,
-	SYN_MAC_CST = 0x02000000,			/* (CST) CRC Stripping for Type Frames */
-	SYN_MAC_CST_ENABLE = 0x02000000,
-	SYN_MAC_CST_DISABLE = 0x02000000,
-	SYN_MAC_TC = 0x01000000,			/* (TC) Transmit configuration */
-	SYN_MAC_WATCHDOG = 0x00800000,
-	SYN_MAC_WATCHDOG_ENABLE = 0x00000000,		/* Enable watchdog timer */
-	SYN_MAC_WATCHDOG_DISABLE = 0x00800000,		/* (WD)Disable watchdog timer on Rx */
-	SYN_MAC_JABBER = 0x00400000,
-	SYN_MAC_JABBER_ENABLE = 0x00000000,		/* Enable jabber timer */
-	SYN_MAC_JABBER_DISABLE = 0x00400000,		/* (JD)Disable jabber timer on Tx */
-	SYN_MAC_FRAME_BURST = 0x00200000,
-	SYN_MAC_FRAME_BURST_ENABLE = 0x00200000,	/* (BE)Enable frame bursting
-							   during Tx */
-	SYN_MAC_FRAME_BURST_DISABLE = 0x00000000,	/* Disable frame bursting */
-	SYN_MAC_JUMBO_FRAME = 0x00100000,
-	SYN_MAC_JUMBO_FRAME_ENABLE = 0x00100000,	/* (JE)Enable jumbo frame for Rx */
-	SYN_MAC_JUMBO_FRAME_DISABLE = 0x00000000,	/* Disable jumbo frame */
-	SYN_MAC_INTER_FRAME_GAP7 = 0x000E0000,		/* (IFG) Config7 - 40bit times */
-	SYN_MAC_INTER_FRAME_GAP6 = 0x000C0000,		/* (IFG) Config6 - 48bit times */
-	SYN_MAC_INTER_FRAME_GAP5 = 0x000A0000,		/* (IFG) Config5 - 56bit times */
-	SYN_MAC_INTER_FRAME_GAP4 = 0x00080000,		/* (IFG) Config4 - 64bit times */
-	SYN_MAC_INTER_FRAME_GAP3 = 0x00060000,		/* (IFG) Config3 - 72bit times */
-	SYN_MAC_INTER_FRAME_GAP2 = 0x00040000,		/* (IFG) Config2 - 80bit times */
-	SYN_MAC_INTER_FRAME_GAP1 = 0x00020000,		/* (IFG) Config1 - 88bit times */
-	SYN_MAC_INTER_FRAME_GAP0 = 0x00000000,		/* (IFG) Config0 - 96bit times */
-	SYN_MAC_DISABLE_CRS = 0x00010000,		/* (DCRS) Disable Carrier Sense During Transmission */
-	SYN_MAC_MII_GMII = 0x00008000,
-	SYN_MAC_SELECT_MII = 0x00008000,		/* (PS)Port Select-MII mode   */
-	SYN_MAC_SELECT_GMII = 0x00000000,		/* GMII mode                  */
-	SYN_MAC_FE_SPEED100 = 0x00004000,		/* (FES)Fast Ethernet speed 100Mbps */
-	SYN_MAC_FE_SPEED = 0x00004000,			/* (FES)Fast Ethernet speed 100Mbps */
-	SYN_MAC_FE_SPEED10 = 0x00000000,		/* (FES)Fast Ethernet speed 10Mbps */
-	SYN_MAC_RX_OWN = 0x00002000,
-	SYN_MAC_DISABLE_RX_OWN = 0x00002000,		/* (DO)Disable receive own packets */
-	SYN_MAC_ENABLE_RX_OWN = 0x00000000,		/* Enable receive own packets */
-	SYN_MAC_LOOPBACK = 0x00001000,
-	SYN_MAC_LOOPBACK_ON = 0x00001000,		/* (LM)Loopback mode for GMII/MII */
-	SYN_MAC_LOOPBACK_OFF = 0x00000000,		/* Normal mode                */
-	SYN_MAC_DUPLEX = 0x00000800,
-	SYN_MAC_FULL_DUPLEX = 0x00000800,		/* (DM)Full duplex mode       */
-	SYN_MAC_HALF_DUPLEX = 0x00000000,		/* Half duplex mode           */
-	SYN_MAC_RX_IPC_OFFLOAD = 0x00000400,		/* IPC checksum offload       */
-	SYN_MAC_RX_IPC_OFFLOAD_ENABLE = 0x00000400,
-	SYN_MAC_RX_IPC_OFFLOAD_DISABLE = 0x00000000,
-	SYN_MAC_RETRY = 0x00000200,
-	SYN_MAC_RETRY_DISABLE = 0x00000200,		/* (DR)Disable Retry          */
-	SYN_MAC_RETRY_ENABLE = 0x00000000,		/* Enable retransmission as per BL */
-	SYN_MAC_LINK_UP = 0x00000100,			/* (LUD)Link UP               */
-	SYN_MAC_LINK_DOWN = 0x00000100,			/* Link Down                  */
-	SYN_MAC_PAD_CRC_STRIP = 0x00000080,
-	SYN_MAC_PAD_CRC_STRIP_ENABLE = 0x00000080,	/* (ACS) Automatic Pad/Crc strip enable */
-	SYN_MAC_PAD_CRC_STRIP_DISABLE = 0x00000000,	/* Automatic Pad/Crc stripping disable */
-	SYN_MAC_BACKOFF_LIMIT = 0x00000060,
-	SYN_MAC_BACKOFF_LIMIT3 = 0x00000060,		/* (BL)Back-off limit in HD mode */
-	SYN_MAC_BACKOFF_LIMIT2 = 0x00000040,
-	SYN_MAC_BACKOFF_LIMIT1 = 0x00000020,
-	SYN_MAC_BACKOFF_LIMIT0 = 0x00000000,
-	SYN_MAC_DEFERRAL_CHECK = 0x00000010,
-	SYN_MAC_DEFERRAL_CHECK_ENABLE = 0x00000010,	/* (DC)Deferral check enable in HD mode */
-	SYN_MAC_DEFERRAL_CHECK_DISABLE = 0x00000000,	/* Deferral check disable    */
-	SYN_MAC_TX = 0x00000008,
-	SYN_MAC_TX_ENABLE = 0x00000008,			/* (TE)Transmitter enable */
-	SYN_MAC_TX_DISABLE = 0x00000000,		/* Transmitter disable */
-	SYN_MAC_RX = 0x00000004,
-	SYN_MAC_RX_ENABLE = 0x00000004,			/* (RE)Receiver enable */
-	SYN_MAC_RX_DISABLE = 0x00000000,		/* Receiver disable */
-	SYN_MAC_PRELEN_RESERVED = 0x00000003,		/* Preamble Length for Transmit Frames */
-	SYN_MAC_PRELEN_3B = 0x00000002,
-	SYN_MAC_PRELEN_5B = 0x00000001,
-	SYN_MAC_PRELEN_7B = 0x00000000,
-};
-
-/*
- * SYN_MAC_FRAME_FILTER = 0x0004,	Mac frame filtering controls Register
- */
-enum syn_mac_frame_filter_reg {
-	SYN_MAC_FILTER = 0x80000000,
-	SYN_MAC_FILTER_OFF = 0x80000000,		/* (RA)Receive all incoming packets */
-	SYN_MAC_FILTER_ON = 0x00000000,			/* Receive filtered pkts only */
-	SYN_MAC_HASH_PERFECT_FILTER = 0x00000400,	/* Hash or Perfect Filter enable */
-	SYN_MAC_SRC_ADDR_FILTER = 0x00000200,
-	SYN_MAC_SRC_ADDR_FILTER_ENABLE = 0x00000200,	/* (SAF)Source Address Filter enable */
-	SYN_MAC_SRC_ADDR_FILTER_DISABLE = 0x00000000,
-	SYN_MAC_SRC_INVA_ADDR_FILTER = 0x00000100,
-	SYN_MAC_SRC_INV_ADDR_FILTER_EN = 0x00000100,	/* (SAIF)Inv Src Addr Filter enable */
-	SYN_MAC_SRC_INV_ADDR_FILTER_DIS = 0x00000000,
-	SYN_MAC_PASS_CONTROL = 0x000000C0,
-	SYN_MAC_PASS_CONTROL3 = 0x000000C0,		/* (PCF)Forwards ctrl frames that pass AF */
-	SYN_MAC_PASS_CONTROL2 = 0x00000080,		/* Forwards all control frames
-							   even if they fail the AF */
-	SYN_MAC_PASS_CONTROL1 = 0x00000040,		/* Forwards all control frames except
-							   PAUSE control frames to application
-							   even if they fail the AF */
-	SYN_MAC_PASS_CONTROL0 = 0x00000000,		/* Don't pass control frames */
-	SYN_MAC_BROADCAST = 0x00000020,
-	SYN_MAC_BROADCAST_DISABLE = 0x00000020,		/* (DBF)Disable Rx of broadcast frames */
-	SYN_MAC_BROADCAST_ENABLE = 0x00000000,		/* Enable broadcast frames    */
-	SYN_MAC_MULTICAST_FILTER = 0x00000010,
-	SYN_MAC_MULTICAST_FILTER_OFF = 0x00000010,	/* (PM) Pass all multicast packets */
-	SYN_MAC_MULTICAST_FILTER_ON = 0x00000000,	/* Pass filtered multicast packets */
-	SYN_MAC_DEST_ADDR_FILTER = 0x00000008,
-	SYN_MAC_DEST_ADDR_FILTER_INV = 0x00000008,	/* (DAIF)Inverse filtering for DA */
-	SYN_MAC_DEST_ADDR_FILTER_NOR = 0x00000000,	/* Normal filtering for DA */
-	SYN_MAC_MCAST_HASH_FILTER = 0x00000004,
-	SYN_MAC_MCAST_HASH_FILTER_ON = 0x00000004,	/* (HMC)perfom multicast hash filtering */
-	SYN_MAC_MCAST_HASH_FILTER_OFF = 0x00000000,	/* perfect filtering only     */
-	SYN_MAC_UCAST_HASH_FILTER = 0x00000002,
-	SYN_MAC_UCAST_HASH_FILTER_ON = 0x00000002,	/* (HUC)Unicast Hash filtering only */
-	SYN_MAC_UCAST_HASH_FILTER_OFF = 0x00000000,	/* perfect filtering only     */
-	SYN_MAC_PROMISCUOUS_MODE = 0x00000001,
-	SYN_MAC_PROMISCUOUS_MODE_ON = 0x00000001,	/* Receive all frames         */
-	SYN_MAC_PROMISCUOUS_MODE_OFF = 0x00000000,	/* Receive filtered packets only */
-};
-
-/*
- * SYN_MAC_FLOW_CONTROL = 0x0018,	Flow control Register Layout
- */
-enum syn_mac_flow_control_reg {
-	SYN_MAC_FC_PAUSE_TIME_MASK = 0xFFFF0000,	/* (PT) PAUSE TIME field
-							   in the control frame */
-	SYN_MAC_FC_PAUSE_TIME_SHIFT = 16,
-	SYN_MAC_FC_PAUSE_LOW_THRESH = 0x00000030,
-	SYN_MAC_FC_PAUSE_LOW_THRESH3 = 0x00000030,	/* (PLT)thresh for pause
-							   tmr 256 slot time */
-	SYN_MAC_FC_PAUSE_LOW_THRESH2 = 0x00000020,	/* 144 slot time         */
-	SYN_MAC_FC_PAUSE_LOW_THRESH1 = 0x00000010,	/* 28 slot time          */
-	SYN_MAC_FC_PAUSE_LOW_THRESH0 = 0x00000000,	/* 4 slot time           */
-	SYN_MAC_FC_UNICAST_PAUSE_FRAME = 0x00000008,
-	SYN_MAC_FC_UNICAST_PAUSE_FRAME_ON = 0x00000008,	/* (UP)Detect pause frame
-							   with unicast addr. */
-	SYN_MAC_FC_UNICAST_PAUSE_FRAME_OFF = 0x00000000,/* Detect only pause frame
-							   with multicast addr. */
-	SYN_MAC_FC_RX_FLOW_CONTROL = 0x00000004,
-	SYN_MAC_FC_RX_FLOW_CONTROL_ENABLE = 0x00000004,	/* (RFE)Enable Rx flow control */
-	SYN_MAC_FC_RX_FLOW_CONTROL_DISABLE = 0x00000000,/* Disable Rx flow control */
-	SYN_MAC_FC_TX_FLOW_CONTROL = 0x00000002,
-	SYN_MAC_FC_TX_FLOW_CONTROL_ENABLE = 0x00000002,	/* (TFE)Enable Tx flow control */
-	SYN_MAC_FC_TX_FLOW_CONTROL_DISABLE = 0x00000000,/* Disable flow control */
-	SYN_MAC_FC_FLOW_CONTROL_BACK_PRESSURE = 0x00000001,
-	SYN_MAC_FC_SEND_PAUSE_FRAME = 0x00000001,	/* (FCB/PBA)send pause frm/Apply
-							   back pressure */
-};
-
-/*
- * SYN_MAC_ADDR_HIGH Register
- */
-enum syn_mac_addr_high {
-	SYN_MAC_ADDR_HIGH_AE = 0x80000000,
-};
-
-/*
- * SYN_DMA_BUS_MODE = 0x0000,		CSR0 - Bus Mode
- */
-enum syn_dma_bus_mode_reg {
-	SYN_DMA_FIXED_BURST_ENABLE = 0x00010000,	/* (FB)Fixed Burst SINGLE, INCR4,
-							   INCR8 or INCR16 */
-	SYN_DMA_FIXED_BURST_DISABLE = 0x00000000,	/* SINGLE, INCR */
-	SYN_DMA_TX_PRIORITY_RATIO11 = 0x00000000,	/* (PR)TX:RX DMA priority ratio 1:1 */
-	SYN_DMA_TX_PRIORITY_RATIO21 = 0x00004000,	/* (PR)TX:RX DMA priority ratio 2:1 */
-	SYN_DMA_TX_PRIORITY_RATIO31 = 0x00008000,	/* (PR)TX:RX DMA priority ratio 3:1 */
-	SYN_DMA_TX_PRIORITY_RATIO41 = 0x0000C000,	/* (PR)TX:RX DMA priority ratio 4:1 */
-	SYN_DMA_ADDRESS_ALIGNED_BEATS = 0x02000000,	/* Address Aligned beats */
-	SYN_DMA_BURST_LENGTHX8 = 0x01000000,		/* When set mutiplies the PBL by 8 */
-	SYN_DMA_BURST_LENGTH256 = 0x01002000,		/* (dma_burst_lengthx8 |
-							   dma_burst_length32) = 256 */
-	SYN_DMA_BURST_LENGTH128 = 0x01001000,		/* (dma_burst_lengthx8 |
-							   dma_burst_length16) = 128 */
-	SYN_DMA_BURST_LENGTH64 = 0x01000800,		/* (dma_burst_lengthx8 |
-							   dma_burst_length8) = 64 */
-	/* (PBL) programmable burst length */
-	SYN_DMA_BURST_LENGTH32 = 0x00002000,		/* Dma burst length = 32 */
-	SYN_DMA_BURST_LENGTH16 = 0x00001000,		/* Dma burst length = 16 */
-	SYN_DMA_BURST_LENGTH8 = 0x00000800,		/* Dma burst length = 8  */
-	SYN_DMA_BURST_LENGTH4 = 0x00000400,		/* Dma burst length = 4  */
-	SYN_DMA_BURST_LENGTH2 = 0x00000200,		/* Dma burst length = 2  */
-	SYN_DMA_BURST_LENGTH1 = 0x00000100,		/* Dma burst length = 1  */
-	SYN_DMA_BURST_LENGTH0 = 0x00000000,		/* Dma burst length = 0  */
-
-	SYN_DMA_DESCRIPTOR8_WORDS = 0x00000080,		/* Enh Descriptor works  1=>
-							   8 word descriptor          */
-	SYN_DMA_DESCRIPTOR4_WORDS = 0x00000000,		/* Enh Descriptor works  0=>
-							   4 word descriptor          */
-	SYN_DMA_DESCRIPTOR_SKIP16 = 0x00000040,		/* (DSL)Descriptor skip length (no.of dwords) */
-	SYN_DMA_DESCRIPTOR_SKIP8 = 0x00000020,		/* between two unchained descriptors */
-	SYN_DMA_DESCRIPTOR_SKIP4 = 0x00000010,
-	SYN_DMA_DESCRIPTOR_SKIP2 = 0x00000008,
-	SYN_DMA_DESCRIPTOR_SKIP1 = 0x00000004,
-	SYN_DMA_DESCRIPTOR_SKIP0 = 0x00000000,
-	SYN_DMA_ARBIT_RR = 0x00000000,			/* (DA) DMA RR arbitration    */
-	SYN_DMA_ARBIT_PR = 0x00000002,			/* Rx has priority over Tx    */
-	SYN_DMA_RESET_ON = 0x00000001,			/* (SWR)Software Reset DMA engine */
-	SYN_DMA_RESET_OFF = 0x00000000,
-};
-
-/*
- * SYN_DMA_STATUS = 0x0014,		CSR5 - Dma status Register
- */
-enum syn_dma_status_reg {
-	SYN_DMA_GMAC_PMT_INTR = 0x10000000,		/* (GPI)Gmac subsystem interrupt */
-	SYN_DMA_GMAC_MMC_INTR = 0x08000000,		/* (GMI)Gmac MMC subsystem interrupt */
-	SYN_DMA_GMAC_LINE_INTF_INTR = 0x04000000,	/* Line interface interrupt */
-	SYN_DMA_ERROR_BIT2 = 0x02000000,		/* (EB)Error bits 0-data buffer, 1-desc access */
-	SYN_DMA_ERROR_BIT1 = 0x01000000,		/* (EB)Error bits 0-write trnsf, 1-read transfer */
-	SYN_DMA_ERROR_BIT0 = 0x00800000,		/* (EB)Error bits 0-Rx DMA, 1-Tx DMA */
-	SYN_DMA_TX_STATE = 0x00700000,			/* (TS)Transmit process state */
-	SYN_DMA_TX_STOPPED = 0x00000000,		/* Stopped - Reset or Stop Tx Command issued */
-	SYN_DMA_TX_FETCHING = 0x00100000,		/* Running - fetching the Tx descriptor */
-	SYN_DMA_TX_WAITING = 0x00200000,		/* Running - waiting for status */
-	SYN_DMA_TX_READING = 0x00300000,		/* Running - reading the data from host memory */
-	SYN_DMA_TX_SUSPENDED = 0x00600000,		/* Suspended - Tx Descriptor unavailabe */
-	SYN_DMA_TX_CLOSING = 0x00700000,		/* Running - closing Rx descriptor */
-	SYN_DMA_RX_STATE = 0x000E0000,			/* (RS)Receive process state */
-	SYN_DMA_RX_STOPPED = 0x00000000,		/* Stopped - Reset or Stop Rx Command issued */
-	SYN_DMA_RX_FETCHING = 0x00020000,		/* Running - fetching the Rx descriptor */
-	SYN_DMA_RX_WAITING = 0x00060000,		/* Running - waiting for packet */
-	SYN_DMA_RX_SUSPENDED = 0x00080000,		/* Suspended - Rx Descriptor unavailable */
-	SYN_DMA_RX_CLOSING = 0x000A0000,		/* Running - closing descriptor */
-	SYN_DMA_RX_QUEUING = 0x000E0000,		/* Running - queuing the receive frame into host memory */
-	SYN_DMA_INT_NORMAL = 0x00010000,		/* (NIS)Normal interrupt summary */
-	SYN_DMA_INT_ABNORMAL = 0x00008000,		/* (AIS)Abnormal interrupt summary */
-	SYN_DMA_INT_EARLY_RX = 0x00004000,		/* Early receive interrupt (Normal) */
-	SYN_DMA_INT_BUS_ERROR = 0x00002000,		/* Fatal bus error (Abnormal) */
-	SYN_DMA_INT_EARLY_TX = 0x00000400,		/* Early transmit interrupt (Abnormal) */
-	SYN_DMA_INT_RX_WDOG_TO = 0x00000200,		/* Receive Watchdog Timeout (Abnormal) */
-	SYN_DMA_INT_RX_STOPPED = 0x00000100,		/* Receive process stopped (Abnormal) */
-	SYN_DMA_INT_RX_NO_BUFFER = 0x00000080,		/* RX buffer unavailable (Abnormal) */
-	SYN_DMA_INT_RX_COMPLETED = 0x00000040,		/* Completion of frame RX (Normal) */
-	SYN_DMA_INT_TX_UNDERFLOW = 0x00000020,		/* Transmit underflow (Abnormal) */
-	SYN_DMA_INT_RCV_OVERFLOW = 0x00000010,		/* RX Buffer overflow interrupt */
-	SYN_DMA_INT_TX_JABBER_TO = 0x00000008,		/* TX Jabber Timeout (Abnormal) */
-	SYN_DMA_INT_TX_NO_BUFFER = 0x00000004,		/* TX buffer unavailable (Normal) */
-	SYN_DMA_INT_TX_STOPPED = 0x00000002,		/* TX process stopped (Abnormal) */
-	SYN_DMA_INT_TX_COMPLETED = 0x00000001,		/* Transmit completed (Normal) */
-};
-
-/*
- * SYN_DMA_OPERATION_MODE = 0x0018,		CSR6 - Dma Operation Mode Register
- */
-enum syn_dma_operation_mode_reg {
-	SYN_DMA_DISABLE_DROP_TCP_CS = 0x04000000,	/* (DT) Dis. drop. of tcp/ip
-							   CS error frames            */
-	SYN_DMA_RX_STORE_AND_FORWARD = 0x02000000,	/* Rx (SF)Store and forward   */
-	SYN_DMA_RX_FRAME_FLUSH = 0x01000000,		/* Disable Receive Frame Flush*/
-	SYN_DMA_TX_STORE_AND_FORWARD = 0x00200000,	/* Tx (SF)Store and forward   */
-	SYN_DMA_FLUSH_TX_FIFO = 0x00100000,		/* (FTF)Tx FIFO controller
-							   is reset to default        */
-	SYN_DMA_TX_THRESH_CTRL = 0x0001C000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo                */
-	SYN_DMA_TX_THRESH_CTRL16 = 0x0001C000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo 16             */
-	SYN_DMA_TX_THRESH_CTRL24 = 0x00018000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo 24             */
-	SYN_DMA_TX_THRESH_CTRL32 = 0x00014000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo 32             */
-	SYN_DMA_TX_THRESH_CTRL40 = 0x00010000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo 40             */
-	SYN_DMA_TX_THRESH_CTRL256 = 0x0000c000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo 256            */
-	SYN_DMA_TX_THRESH_CTRL192 = 0x00008000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo 192            */
-	SYN_DMA_TX_THRESH_CTRL128 = 0x00004000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo 128            */
-	SYN_DMA_TX_THRESH_CTRL64 = 0x00000000,		/* (TTC)Controls thre Thresh of
-							   MTL tx Fifo 64             */
-	SYN_DMA_TX_START = 0x00002000,			/* (ST)Start/Stop transmission*/
-	SYN_DMA_RX_FLOW_CTRL_DEACT = 0x00401800,	/* (RFD)Rx flow control
-							   deact. Threshold            */
-	SYN_DMA_RX_FLOW_CTRL_DEACT1K = 0x00000000,	/* (RFD)Rx flow control
-							   deact. Threshold (1kbytes)  */
-	SYN_DMA_RX_FLOW_CTRL_DEACT2K = 0x00000800,	/* (RFD)Rx flow control
-							   deact. Threshold (2kbytes)  */
-	SYN_DMA_RX_FLOW_CTRL_DEACT3K = 0x00001000,	/* (RFD)Rx flow control
-							   deact. Threshold (3kbytes)  */
-	SYN_DMA_RX_FLOW_CTRL_DEACT4K = 0x00001800,	/* (RFD)Rx flow control
-							   deact. Threshold (4kbytes)  */
-	SYN_DMA_RX_FLOW_CTRL_DEACT5K = 0x00400000,	/* (RFD)Rx flow control
-							   deact. Threshold (4kbytes)  */
-	SYN_DMA_RX_FLOW_CTRL_DEACT6K = 0x00400800,	/* (RFD)Rx flow control
-							   deact. Threshold (4kbytes)  */
-	SYN_DMA_RX_FLOW_CTRL_DEACT7K = 0x00401000,	/* (RFD)Rx flow control
-							   deact. Threshold (4kbytes)  */
-	SYN_DMA_RX_FLOW_CTRL_ACT = 0x00800600,		/* (RFA)Rx flow control
-							   Act. Threshold              */
-	SYN_DMA_RX_FLOW_CTRL_ACT1K = 0x00000000,	/* (RFA)Rx flow control
-							   Act. Threshold (1kbytes)    */
-	SYN_DMA_RX_FLOW_CTRL_ACT2K = 0x00000200,	/* (RFA)Rx flow control
-							   Act. Threshold (2kbytes)    */
-	SYN_DMA_RX_FLOW_CTRL_ACT3K = 0x00000400,	/* (RFA)Rx flow control
-							   Act. Threshold (3kbytes)    */
-	SYN_DMA_RX_FLOW_CTRL_ACT4K = 0x00000600,	/* (RFA)Rx flow control
-							   Act. Threshold (4kbytes)    */
-	SYN_DMA_RX_FLOW_CTRL_ACT5K = 0x00800000,	/* (RFA)Rx flow control
-							   Act. Threshold (5kbytes)    */
-	SYN_DMA_RX_FLOW_CTRL_ACT6K = 0x00800200,	/* (RFA)Rx flow control
-							   Act. Threshold (6kbytes)    */
-	SYN_DMA_RX_FLOW_CTRL_ACT7K = 0x00800400,	/* (RFA)Rx flow control
-							   Act. Threshold (7kbytes)    */
-	SYN_DMA_RX_THRESH_CTRL = 0x00000018,		/* (RTC)Controls thre
-							   Thresh of MTL rx Fifo       */
-	SYN_DMA_RX_THRESH_CTRL64 = 0x00000000,		/* (RTC)Controls thre
-							   Thresh of MTL tx Fifo 64    */
-	SYN_DMA_RX_THRESH_CTRL32 = 0x00000008,		/* (RTC)Controls thre
-							   Thresh of MTL tx Fifo 32    */
-	SYN_DMA_RX_THRESH_CTRL96 = 0x00000010,		/* (RTC)Controls thre
-							   Thresh of MTL tx Fifo 96    */
-	SYN_DMA_RX_THRESH_CTRL128 = 0x00000018,		/* (RTC)Controls thre
-							   Thresh of MTL tx Fifo 128   */
-	SYN_DMA_EN_HW_FLOW_CTRL = 0x00000100,		/* (EFC)Enable HW flow control*/
-	SYN_DMA_DIS_HW_FLOW_CTRL = 0x00000000,		/* Disable HW flow control    */
-	SYN_DMA_FWD_ERROR_FRAMES = 0x00000080,		/* (FEF)Forward error frames  */
-	SYN_DMA_FWD_UNDER_SZ_FRAMES = 0x00000040,	/* (FUF)Forward undersize
-							   frames                     */
-	SYN_DMA_TX_SECOND_FRAME = 0x00000004,		/* (OSF)Operate on 2nd frame  */
-	SYN_DMA_RX_START = 0x00000002,			/* (SR)Start/Stop reception   */
-};
-
-/*
- * SYN_DMA_INT_ENABLE = 0x101C,		CSR7 - Interrupt enable Register Layout
- */
-enum syn_dma_interrupt_reg {
-	SYN_DMA_IE_NORMAL = SYN_DMA_INT_NORMAL,		/* Normal interrupt enable */
-	SYN_DMA_IE_ABNORMAL = SYN_DMA_INT_ABNORMAL,	/* Abnormal interrupt enable */
-	SYN_DMA_IE_EARLY_RX = SYN_DMA_INT_EARLY_RX,	/* Early RX interrupt enable */
-	SYN_DMA_IE_BUS_ERROR = SYN_DMA_INT_BUS_ERROR,	/* Fatal bus error enable */
-	SYN_DMA_IE_EARLY_TX = SYN_DMA_INT_EARLY_TX,	/* Early TX interrupt enable */
-	SYN_DMA_IE_RX_WDOG_TO = SYN_DMA_INT_RX_WDOG_TO,	/* RX Watchdog Timeout enable */
-	SYN_DMA_IE_RX_STOPPED = SYN_DMA_INT_RX_STOPPED,	/* RX process stopped enable */
-	SYN_DMA_IE_RX_NO_BUFFER = SYN_DMA_INT_RX_NO_BUFFER,
-							/* Receive buffer unavailable enable */
-	SYN_DMA_IE_RX_COMPLETED = SYN_DMA_INT_RX_COMPLETED,
-							/* Completion of frame reception enable */
-	SYN_DMA_IE_TX_UNDERFLOW = SYN_DMA_INT_TX_UNDERFLOW,
-							/* TX underflow enable */
-	SYN_DMA_IE_RX_OVERFLOW = SYN_DMA_INT_RCV_OVERFLOW,
-							/* RX Buffer overflow interrupt */
-	SYN_DMA_IE_TX_JABBER_TO = SYN_DMA_INT_TX_JABBER_TO,
-							/* TX Jabber Timeout enable */
-	SYN_DMA_IE_TX_NO_BUFFER = SYN_DMA_INT_TX_NO_BUFFER,
-							/* TX buffer unavailable enable */
-	SYN_DMA_IE_TX_STOPPED = SYN_DMA_INT_TX_STOPPED,
-							/* TX process stopped enable */
-	SYN_DMA_IE_TX_COMPLETED = SYN_DMA_INT_TX_COMPLETED,
-							/* TX completed enable */
-};
-
-/*
- * SYN_DMA_AXI_BUS_MODE = 0x1028
- */
-enum syn_dma_axi_bus_mode_reg {
-	SYN_DMA_EN_LPI = 0x80000000,
-	SYN_DMA_LPI_XIT_FRM = 0x40000000,
-	SYN_DMA_WR_OSR_NUM_REQS16 = 0x00F00000,
-	SYN_DMA_WR_OSR_NUM_REQS8 = 0x00700000,
-	SYN_DMA_WR_OSR_NUM_REQS4 = 0x00300000,
-	SYN_DMA_WR_OSR_NUM_REQS2 = 0x00100000,
-	SYN_DMA_WR_OSR_NUM_REQS1 = 0x00000000,
-	SYN_DMA_RD_OSR_NUM_REQS16 = 0x000F0000,
-	SYN_DMA_RD_OSR_NUM_REQS8 = 0x00070000,
-	SYN_DMA_RD_OSR_NUM_REQS4 = 0x00030000,
-	SYN_DMA_RD_OSR_NUM_REQS2 = 0x00010000,
-	SYN_DMA_RD_OSR_NUM_REQS1 = 0x00000000,
-	SYN_DMA_ONEKBBE = 0x00002000,
-	SYN_DMA_AXI_AAL = 0x00001000,
-	SYN_DMA_AXI_BLEN256 = 0x00000080,
-	SYN_DMA_AXI_BLEN128 = 0x00000040,
-	SYN_DMA_AXI_BLEN64 = 0x00000020,
-	SYN_DMA_AXI_BLEN32 = 0x00000010,
-	SYN_DMA_AXI_BLEN16 = 0x00000008,
-	SYN_DMA_AXI_BLEN8 = 0x00000004,
-	SYN_DMA_AXI_BLEN4 = 0x00000002,
-	SYN_DMA_UNDEFINED = 0x00000001,
-};
-
-/*
- * Values to initialize DMA registers
- */
-enum syn_dma_init_values {
-	/*
-	 * Interrupt groups
-	 */
-	SYN_DMA_INT_ERROR_MASK = SYN_DMA_INT_BUS_ERROR,		/* Error              */
-	SYN_DMA_INT_RX_ABN_MASK = SYN_DMA_INT_RX_NO_BUFFER,	/* RX abnormal intr   */
-	SYN_DMA_INT_RX_NORM_MASK = SYN_DMA_INT_RX_COMPLETED,	/* RXnormal intr      */
-	SYN_DMA_INT_RX_STOPPED_MASK = SYN_DMA_INT_RX_STOPPED,	/* RXstopped          */
-	SYN_DMA_INT_TX_ABN_MASK = SYN_DMA_INT_TX_UNDERFLOW,	/* TX abnormal intr   */
-	SYN_DMA_INT_TX_NORM_MASK = SYN_DMA_INT_TX_COMPLETED,	/* TX normal intr     */
-	SYN_DMA_INT_TX_STOPPED_MASK = SYN_DMA_INT_TX_STOPPED,	/* TX stopped         */
-
-	SYN_DMA_BUS_MODE_INIT = SYN_DMA_FIXED_BURST_ENABLE | SYN_DMA_BURST_LENGTH8
-		| SYN_DMA_DESCRIPTOR_SKIP2 | SYN_DMA_RESET_OFF,
-
-	SYN_DMA_BUS_MODE_VAL = SYN_DMA_BURST_LENGTH32
-		| SYN_DMA_BURST_LENGTHX8 | SYN_DMA_DESCRIPTOR_SKIP0
-		| SYN_DMA_DESCRIPTOR8_WORDS | SYN_DMA_ARBIT_PR | SYN_DMA_ADDRESS_ALIGNED_BEATS,
-
-	SYN_DMA_OMR = SYN_DMA_TX_STORE_AND_FORWARD | SYN_DMA_RX_STORE_AND_FORWARD
-		| SYN_DMA_RX_THRESH_CTRL128 | SYN_DMA_TX_SECOND_FRAME,
-
-	SYN_DMA_INT_EN = SYN_DMA_IE_NORMAL | SYN_DMA_IE_ABNORMAL | SYN_DMA_INT_ERROR_MASK
-		| SYN_DMA_INT_RX_ABN_MASK | SYN_DMA_INT_RX_NORM_MASK
-		| SYN_DMA_INT_RX_STOPPED_MASK | SYN_DMA_INT_TX_ABN_MASK
-		| SYN_DMA_INT_TX_NORM_MASK | SYN_DMA_INT_TX_STOPPED_MASK,
-	SYN_DMA_INT_DISABLE = 0,
-	SYN_DMA_AXI_BUS_MODE_VAL = SYN_DMA_AXI_BLEN16 | SYN_DMA_RD_OSR_NUM_REQS8
-		| SYN_DMA_WR_OSR_NUM_REQS8,
-};
-
-/*
- * desc_mode
- *	GMAC descriptors mode
- */
-enum desc_mode {
-	RINGMODE = 0x00000001,
-	CHAINMODE = 0x00000002,
-};
-
-extern void syn_disable_dma_interrupt(struct nss_gmac_hal_dev *nghd);
-extern void syn_enable_dma_interrupt(struct nss_gmac_hal_dev *nghd);
-extern void syn_enable_dma_rx(struct nss_gmac_hal_dev *nghd);
-extern void syn_disable_dma_rx(struct nss_gmac_hal_dev *nghd);
-extern void syn_enable_dma_tx(struct nss_gmac_hal_dev *nghd);
-extern void syn_disable_dma_tx(struct nss_gmac_hal_dev *nghd);
-extern void syn_clear_dma_status(struct nss_gmac_hal_dev *nghd);
-extern void syn_resume_dma_tx(struct nss_gmac_hal_dev *nghd);
-extern uint32_t syn_get_rx_missed(struct nss_gmac_hal_dev *nghd);
-extern uint32_t syn_get_fifo_overflows(struct nss_gmac_hal_dev *nghd);
-
-extern void syn_init_tx_desc_base(struct nss_gmac_hal_dev *nghd, uint32_t tx_desc_dma);
-extern void syn_init_rx_desc_base(struct nss_gmac_hal_dev *nghd, uint32_t rx_desc_dma);
-
-#endif /*__SYN_REG_H__*/

feeds/ipq807x/qca-nss-dp/src/hal/gmac_hal_ops/syn/xgmac/syn_dev.h

@@ -1,189 +0,0 @@
-/*
- **************************************************************************
- * Copyright (c) 2016,2020 The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF0
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************
- */
-
-#ifndef __SYN_DEV_H__
-#define __SYN_DEV_H__
-
-#include "syn_reg.h"
-#include <fal/fal_mib.h>
-#include <fal/fal_port_ctrl.h>
-
-/*
- * Subclass for base nss_gmac_haldev
- */
-struct syn_hal_dev {
-	struct nss_gmac_hal_dev nghd;	/* Base class */
-	fal_xgmib_info_t stats;		/* Stats structure */
-};
-
-/*
- * syn_set_rx_flow_ctrl()
- */
-static inline void syn_set_rx_flow_ctrl(
-		struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_RX_FLOW_CTL,
-			SYN_MAC_RX_FLOW_ENABLE);
-}
-
-/*
- * syn_clear_rx_flow_ctrl()
- */
-static inline void syn_clear_rx_flow_ctrl(
-		struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, SYN_MAC_RX_FLOW_CTL,
-			SYN_MAC_RX_FLOW_ENABLE);
-}
-
-/*
- * syn_set_tx_flow_ctrl()
- */
-static inline void syn_set_tx_flow_ctrl(
-		struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_Q0_TX_FLOW_CTL,
-			SYN_MAC_TX_FLOW_ENABLE);
-}
-
-/*
- * syn_send_tx_pause_frame()
- */
-static inline void syn_send_tx_pause_frame(
-		struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_Q0_TX_FLOW_CTL,
-			SYN_MAC_TX_FLOW_ENABLE);
-	hal_set_reg_bits(nghd, SYN_MAC_Q0_TX_FLOW_CTL,
-			SYN_MAC_TX_PAUSE_SEND);
-}
-
-/*
- * syn_clear_tx_flow_ctrl()
- */
-static inline void syn_clear_tx_flow_ctrl(
-		struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, SYN_MAC_Q0_TX_FLOW_CTL,
-			SYN_MAC_TX_FLOW_ENABLE);
-}
-
-/*
- * syn_clear_mac_ctrl()
- */
-static inline void syn_clear_mac_ctrl(
-		struct nss_gmac_hal_dev *nghd)
-{
-	hal_write_reg(nghd->mac_base, SYN_MAC_TX_CONFIG, 0);
-	hal_write_reg(nghd->mac_base, SYN_MAC_RX_CONFIG, 0);
-}
-
-/*
- * syn_rx_enable()
- */
-static inline void syn_rx_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_RX_CONFIG, SYN_MAC_RX_ENABLE);
-	hal_set_reg_bits(nghd, SYN_MAC_PACKET_FILTER, SYN_MAC_RX_ENABLE);
-}
-
-/*
- * syn_rx_disable()
- */
-static inline void syn_rx_disable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, SYN_MAC_RX_CONFIG, SYN_MAC_RX_ENABLE);
-}
-
-/*
- * syn_tx_enable()
- */
-static inline void syn_tx_enable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_TX_CONFIG, SYN_MAC_TX_ENABLE);
-}
-
-/*
- * syn_tx_disable()
- */
-static inline void syn_tx_disable(struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, SYN_MAC_TX_CONFIG,
-			SYN_MAC_TX_ENABLE);
-}
-
-/*
- * syn_set_mmc_stats()
- */
-static inline void syn_set_mmc_stats(struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_MMC_CTL,
-			SYN_MAC_MMC_RSTONRD);
-}
-
-/*
- * syn_rx_jumbo_frame_enable()
- */
-static inline void syn_rx_jumbo_frame_enable(
-		struct nss_gmac_hal_dev *nghd)
-{
-	hal_set_reg_bits(nghd, SYN_MAC_RX_CONFIG,
-			SYN_MAC_JUMBO_FRAME_ENABLE);
-}
-
-/*
- * syn_rx_jumbo_frame_disable()
- */
-static inline void syn_rx_jumbo_frame_disable(
-		struct nss_gmac_hal_dev *nghd)
-{
-	hal_clear_reg_bits(nghd, SYN_MAC_RX_CONFIG,
-			SYN_MAC_JUMBO_FRAME_ENABLE);
-}
-
-/*
- * syn_set_full_duplex()
- */
-static inline void syn_set_full_duplex(
-		struct nss_gmac_hal_dev *nghd)
-{
-	/* TBD */
-	return;
-}
-
-/*
- * syn_set_half_duplex()
- */
-static inline void syn_set_half_duplex(
-		struct nss_gmac_hal_dev *nghd)
-{
-	/* TBD */
-	return;
-}
-
-static int syn_get_stats(struct nss_gmac_hal_dev *nghd)
-{
-	struct syn_hal_dev *shd = (struct syn_hal_dev *)nghd;
-	fal_xgmib_info_t *stats = &(shd->stats);
-
-	if (fal_get_xgmib_info(0, nghd->mac_id, stats))
-		return -1;
-
-	return 0;
-}
-#endif /*__SYN_DEV_H__*/