Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0647208 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss: Reserve 0-4K memory for QCA6174"

parents f568ebc6 fb6bc187

arch/arm/boot/dts/qcom/apq8084.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 * GNU General Public License for more details.

 */



/memreserve/ 0x00000000 0x00001000;



#include "skeleton64.dtsi"

#include <dt-bindings/clock/msm-clocks-krait.h>

drivers/net/wireless/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -335,6 +335,15 @@ config WCNSS_REGISTER_DUMP_ON_BITE 
	 register access failures. So this feature is to enable/disable the

	 register dump on WCNSS WDOG bite.



config CNSS_MAC_BUG

	bool "Enable/disable 0-4K memory initialization for QCA6174"

	depends on CNSS

	help

	 If enabled, 0-4K memory is reserved for QCA6174 to address a MAC HW bug.

	 MAC would do an invalid pointer fetch based on the data, that was read

	 from 0 to 4K. So fill it with zero's; to an address for which PCIe root

	 complex would honor the read without any errors.



config CLD_LL_CORE

	tristate "Qualcomm CORE driver for QCA6174"

	select WIRELESS_EXT

drivers/net/wireless/cnss/cnss.c

+9 −0
Original line number Diff line number Diff line
@@ -1147,6 +1147,15 @@ static int cnss_probe(struct platform_device *pdev) 
		}

	}



#ifdef CONFIG_CNSS_MAC_BUG

	/* 0-4K memory is reserved for QCA6174 to address a MAC HW bug.

	 * MAC would do an invalid pointer fetch based on the data

	 * that was read from 0 to 4K. So fill it with zero's (to an

	 * address for which PCIe RC honored the read without any errors).

	 */

	memset(phys_to_virt(0), 0, SZ_4K);

#endif



	pr_info("cnss: Platform driver probed successfully.\n");

	return ret;