Skip to content

Commit

Permalink
octeon: re-enable CONFIG_CAVIUM_CN63XXP1 and EdgeRouter image
Browse files Browse the repository at this point in the history
The symbol CONFIG_CAVIUM_CN63XXP1 was disabled during the bump to
4.19 (see Fixes:) with the following reason:

  No supported hardware uses CN63XXP1 and it causes "slight decrease
  in performance"

However, it later turned out that the edgerouter image needed it,
which led to having the device disabled in [1].
Still, dropping support of a device seems a harsh action for just
removing a "slight" decrease in performance from the other devices.

Thus, this enables CONFIG_CAVIUM_CN63XXP1 again, and essentially
restores the situation present until (including) kernel 4.14 on
this target.

For OpenWrt as a platform, it seems more desirable to support all
devices (and have them tested regularly via the snapshots) in this
case.
Users interested in maximum performance might still just remove
the symbol again in their local build.

[1] 3824fa2 ("octeon: disable edgerouter image")

Fixes: 6c22545 ("target/octeon: Add Linux 4.19 support")

Signed-off-by: Adrian Schmutzler <[email protected]>
  • Loading branch information
adschm committed Feb 28, 2021
1 parent 5ad49ca commit cfd1a40
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion target/linux/octeon/config-5.4
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_MQ_PCI=y
CONFIG_BLK_SCSI_REQUEST=y
CONFIG_BUILTIN_DTB=y
# CONFIG_CAVIUM_CN63XXP1 is not set
CONFIG_CAVIUM_CN63XXP1=y
CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=0
CONFIG_CAVIUM_OCTEON_LOCK_L2=y
CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y
Expand Down
1 change: 0 additions & 1 deletion target/linux/octeon/image/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ define Device/ubnt_edgerouter
DEVICE_MODEL := EdgeRouter
BOARD_NAME := er
CMDLINE := $(ER_CMDLINE)
DEFAULT := n
endef
TARGET_DEVICES += ubnt_edgerouter

Expand Down

0 comments on commit cfd1a40

Please sign in to comment.