Compare revisions

Pritam Jha · y · Pritam Jha · Pritam Jha · Linux Build Service Account · 9dbdbb1d
--- a/qca-nss-ecm/qca-nss-ecm.bb
+++ b/qca-nss-ecm/qca-nss-ecm.bb
@@ -16,14 +16,14 @@ SRC_URI = "file://qca-nss-ecm \
 	   "

 DEPENDS_append += "virtual/kernel"
-DEPENDS_${SOC}_append += "nat46 qca-mcs-lkm qca-nss-sfe qca-nss-ppe qca-emesh-sp"
+DEPENDS_${SOC}_append += "nat46 qca-mcs-lkm qca-nss-sfe qca-nss-ppe qca-emesh-sp qca-ovsmgr"

 DEPENDS_append_ipq40xx = "simulated-driver"

 DEPENDS_ipq807x_append += "qca-nss-drv"
 DEPENDS_ipq807x_64_append += "qca-nss-drv"
-DEPENDS_ipq807x_remove = "qca-nss-sfe qca-nss-ppe qca-emesh-sp"
-DEPENDS_ipq807x_64_remove = "qca-nss-sfe qca-nss-ppe qca-emesh-sp"
+DEPENDS_ipq807x_remove = "qca-nss-sfe qca-nss-ppe qca-emesh-sp qca-ovsmgr"
+DEPENDS_ipq807x_64_remove = "qca-nss-sfe qca-nss-ppe qca-emesh-sp qca-ovsmgr"
 DEPENDS_ipq53xx_remove = "qca-emesh-sp"
 DEPENDS_ipq53xx_64_remove = "qca-emesh-sp"

@@ -80,6 +80,26 @@ ECM_MAKE_OPTS_ipq807x_remove = "ECM_FRONT_END_PPE_ENABLE=y \
 				ECM_FRONT_END_PPE_QOS_ENABLE=y \
 				"
 ECM_MAKE_OPTS_ipq40xx_remove = "ECM_FRONT_END_PPE_ENABLE=y"
+ECM_MAKE_OPTS_ipq95xx_append += "ECM_CLASSIFIER_OVS_ENABLE=y \
+				 ECM_INTERFACE_OVS_BRIDGE_ENABLE=y \
+				 CONFIG_QCA_NSS_ECM_OVS=y \
+				 EXAMPLES_BUILD_OVS=y \
+				 "
+ECM_MAKE_OPTS_ipq95xx_64_append += "ECM_CLASSIFIER_OVS_ENABLE=y \
+				    ECM_INTERFACE_OVS_BRIDGE_ENABLE=y \
+				    CONFIG_QCA_NSS_ECM_OVS=y \
+				    EXAMPLES_BUILD_OVS=y \
+				    "
+ECM_MAKE_OPTS_ipq53xx_append += "ECM_CLASSIFIER_OVS_ENABLE=y \
+				 ECM_INTERFACE_OVS_BRIDGE_ENABLE=y \
+				 CONFIG_QCA_NSS_ECM_OVS=y \
+				 EXAMPLES_BUILD_OVS=y \
+				 "
+ECM_MAKE_OPTS_ipq53xx_64_append += "ECM_CLASSIFIER_OVS_ENABLE=y \
+				    ECM_INTERFACE_OVS_BRIDGE_ENABLE=y \
+				    CONFIG_QCA_NSS_ECM_OVS=y \
+				    EXAMPLES_BUILD_OVS=y \
+				    "
 ECM_MAKE_OPTS_ipq53xx_64_remove = "ECM_CLASSIFIER_MSCS_SCS_ENABLE=y \
 				ECM_CLASSIFIER_MSCS_ENABLE=y \
 				ECM_CLASSIFIER_EMESH_ENABLE=y \
@@ -95,11 +115,13 @@ EXTRA_CFLAGS += "-I${STAGING_INCDIR}/nat46 \
 		-I${STAGING_INCDIR}/qca-nss-ppe \
 		-I${STAGING_INCDIR}/qca-nss-drv \
 		-I${STAGING_INCDIR}/emesh-sp \
+		-I${STAGING_INCDIR}/qca-ovsmgr \
 		"

 MODULE_EXTRA_SYMBOLS ="${STAGING_INCDIR}/qca-nss-sfe/Module.symvers ${STAGING_INCDIR}/qca-nss-ppe/Module.symvers \
 		${STAGING_INCDIR}/qca-nss-drv/Module.symvers ${STAGING_INCDIR}/nat46/Module.symvers \
-		${STAGING_INCDIR}/qca-mcs/Module.symvers ${STAGING_INCDIR}/emesh-sp/Module.symvers"
+		${STAGING_INCDIR}/qca-mcs/Module.symvers ${STAGING_INCDIR}/emesh-sp/Module.symvers \
+		${STAGING_INCDIR}/qca-ovsmgr/Module.symvers"

 do_configure() {
 	true
@@ -120,6 +142,8 @@ do_compile() {
 do_install() {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/${PN}
 	install -m 0644 ecm${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/${PN}
+	[ -f examples/ecm_ovs${KERNEL_OBJECT_SUFFIX} ] && \
+		install -m 0644 examples/ecm_ovs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/${PN}
 	install -d ${D}/usr/bin
 	install -m 0755 ${WORKDIR}/files/ecm_dump.sh ${D}${bindir}/ecm_dump.sh
 	install -m 0755 ${WORKDIR}/files/qca-nss-ecm ${D}${bindir}/qca-nss-ecm

--- a/qca-nss-ppe/qca-nss-ppe.bb
+++ b/qca-nss-ppe/qca-nss-ppe.bb
@@ -16,19 +16,21 @@ SRC_URI = "file://qca-nss-ppe/ \

 PACKAGES += "kernel-module-qca-nss-ppe "

-DEPENDS = "virtual/kernel qca-ssdk-nohnat nat46"
+DEPENDS = "virtual/kernel qca-ssdk-nohnat nat46 qca-ovsmgr"
 RDEPEND-{PN} = "qca-ssdk-nohnat"
 RDEPENDS-qca-nss-ppe-vlan-mgr = "qca-nss-ppe bonding"
-RDEPENDS-qca-nss-ppe-bridge-mgr = "qca-nss-ppe qca-nss-ppe-vlan-mgr bonding"
+RDEPENDS-qca-nss-ppe-bridge-mgr = "qca-nss-ppe qca-nss-ppe-vlan-mgr bonding qca-ovsmgr"
 RDEPENDS-qca-nss-ppe-pppoe-mgr  = "qca-nss-ppe pppoe bonding"
 RDEPENDS-qca-nss-ppe-lag-mgr   = "qca-nss-ppe qca-nss-ppe-vlan-mgr bonding"

-S = "${WORKDIR}/qca-nss-ppe/"
+S = "${WORKDIR}/qca-nss-ppe"
 SSDK_STG_INCDIR = "${STAGING_INCDIR}/qca-ssdk"
 NAT46_STG_INCDIR = "${STAGING_INCDIR}/nat46"

 NSS_PPE_MODULES += ""
-NSS_PPE_MODULES_append_qca-nss-ppe-bridge-mgr += "bridge-mgr=y "
+NSS_PPE_MODULES_append_qca-nss-ppe-bridge-mgr += "bridge-mgr=y \
+						  NSS_PPE_BRIDGE_MGR_OVS_ENABLE=y \
+						  "
 NSS_PPE_MODULES_append_qca-nss-ppe-vlan-mgr  += "vlan-mgr=y "
 NSS_PPE_MODULES_append_qca-nss-ppe-pppoe-mgr += "pppoe-mgr=y"
 NSS_PPE_MODULES_append_qca-nss-ppe-lag-mgr += "lag-mgr=y"
@@ -37,10 +39,14 @@ EXTRA_CFLAGS += " \
 		-I${STAGING_INCDIR}/qca-ssdk \
 		-I${STAGING_INCDIR}/qca-ssdk/init \
 		-I${STAGING_INCDIR}/qca-ssdk/fal \
+		-I${STAGING_INCDIR}/qca-ovsmgr \
 		-I${STAGING_INCDIR}/ \
 		"

-MODULE_EXTRA_SYMBOLS ="${SSDK_STG_INCDIR}/Module.symvers ${NAT46_STG_INCDIR}/Module.symvers "
+MODULE_EXTRA_SYMBOLS ="${SSDK_STG_INCDIR}/Module.symvers ${NAT46_STG_INCDIR}/Module.symvers \
+		       ${STAGING_INCDIR}/qca-ovsmgr/Module.symvers"
+
+module_conf_qca-nss-ppe-bridge-mgr += "options qca-nss-ppe-bridge-mgr ovs_enabled=0"

 do_configure() {
 	true
@@ -87,5 +93,6 @@ do_install_append_qca-nss-ppe-lag-mgr() {
 KERNEL_MODULE_AUTOLOAD_${PN} += "qca-nss-ppe"
 KERNEL_MODULE_AUTOLOAD_append_qca-nss-ppe-vlan-mgr += "qca-nss-ppe-vlan"
 KERNEL_MODULE_AUTOLOAD_append_qca-nss-ppe-bridge-mgr += "qca-nss-ppe-bridge-mgr"
+KERNEL_MODULE_PROBECONF += "qca-nss-ppe-bridge-mgr"
 KERNEL_MODULE_AUTOLOAD_append_qca-nss-ppe-pppoe-mgr += "qca-nss-ppe-pppoe-mgr"
 KERNEL_MODULE_AUTOLOAD_append_qca-nss-ppe-lag-mgr += "qca-nss-ppe-lag"
--- a/qca-ovsmgr/qca-ovsmgr.bb
+++ b/qca-ovsmgr/qca-ovsmgr.bb
+DESCRIPTION = "Kernel driver for NSS OpenVSwitch manager"
+LICENSE = "ISC"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/${LICENSE};md5=f3b90e78ea0cffb20bf5cca7947a896d"
+
+inherit module
+
+SOC = "${@d.getVar('SOC_FAMILY', d, 1).split(':')[1]}"
+SOC_TYPE = "${@d.getVar('SOC', d, 0).split('_')[0]}"
+
+FILESPATH = "${TOPDIR}/../opensource/:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/:"
+
+SRC_URI = "file://qca-ovsmgr \
+	   "
+PACKAGES += "kernel-module-qca-ovsmgr"
+
+DEPENDS = "virtual/kernel"
+
+S = "${WORKDIR}/qca-ovsmgr"
+
+EXTRA_CFLAGS += " \
+		-I${STAGING_KERNEL_DIR}/net/openvswitch \
+		-I${S}/exports \
+		"
+
+do_configure() {
+	true
+}
+
+do_compile() {
+	unset LDFLAGS
+	make -C "${STAGING_KERNEL_BUILDDIR}" ${OVSMGR_MAKE_OPTS} \
+	CROSS_COMPILE="${TARGET_PREFIX}" \
+	ARCH="${KARCH}" \
+	M="${S}" \
+	EXTRA_CFLAGS="${EXTRA_CFLAGS}" \
+	KBUILD_EXTRA_SYMBOLS="${MODULE_EXTRA_SYMBOLS}" \
+	SoC='${SOC_TYPE}' \
+	modules
+}
+
+do_install() {
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/${PN}
+	install -m 0644 ${S}/qca-ovsmgr${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/${PN}
+	install -d ${D}${includedir}/qca-ovsmgr
+	install -m 0644 ${WORKDIR}/qca-ovsmgr/exports/* ${D}${includedir}/qca-ovsmgr/.
+	install -m 0644 ${S}/Module.symvers ${D}${includedir}/qca-ovsmgr/Module.symvers
+}
+
+KERNEL_MODULE_AUTOLOAD += "qca-ovsmgr"
No results found