staging: brcm80211: remove nvram related source files (d794fec0) · Commits · jan.koester / Linux

drivers/staging/brcm80211/brcmsmac/Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -50,8 +50,7 @@ BRCMSMAC_OFILES := \
		bcmotp.o \
		bcmsrom.o \
		dma.o \
		nicpci.o \
		nvram.o
		nicpci.o

		MODULEPFX := brcmsmac

drivers/staging/brcm80211/brcmsmac/aiutils.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -28,9 +28,10 @@

		/* ******** from siutils.c ********* */
		#include <nicpci.h>
		#include <bcmnvram.h>
		#include <bcmsrom.h>
		#include <wlc_pmu.h>
		#include <wlc_scb.h>
		#include <wlc_pub.h>

		/* slow_clk_ctl */
		#define SCC_SS_MASK 0x00000007 /* slow clock source mask */
		@@ -985,9 +986,6 @@ static si_info_t ai_doattach(si_info_t sii, uint devid,
		udelay(10);
		}

		/* Init nvram from flash if it exists */
		nvram_init();

		/* Init nvram from sprom/otp if they exist */
		if (srom_var_init
		(&sii->pub, bustype, regs, vars, varsz)) {
		@@ -1096,8 +1094,6 @@ void ai_detach(struct si_pub *sih)
		sii->regs[idx] = NULL;
		}

		nvram_exit(); /* free up nvram buffers */

		if (sih->bustype == PCI_BUS) {
		if (sii->pch)
		pcicore_deinit(sii->pch);

drivers/staging/brcm80211/brcmsmac/bcmnvram.h

deleted100644 → 0

+0 −149

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2010 Broadcom Corporation
		*
		* 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 _bcmnvram_h_
		#define _bcmnvram_h_

		#include <bcmdefs.h>

		struct nvram_header {
		u32 magic;
		u32 len;
		u32 crc_ver_init; /* 0:7 crc, 8:15 ver, 16:31 sdram_init */
		u32 config_refresh; /* 0:15 sdram_config, 16:31 sdram_refresh */
		u32 config_ncdl; /* ncdl values for memc */
		};

		/*
		* Initialize NVRAM access. May be unnecessary or undefined on certain
		* platforms.
		*/
		extern int nvram_init(void);

		/*
		* Append a chunk of nvram variables to the global list
		*/
		extern int nvram_append(char *vars, uint varsz);

		/*
		* Check for reset button press for restoring factory defaults.
		*/
		extern int nvram_reset(void);

		/*
		* Disable NVRAM access. May be unnecessary or undefined on certain
		* platforms.
		*/
		extern void nvram_exit(void);

		/*
		* Get the value of an NVRAM variable. The pointer returned may be
		* invalid after a set.
		* @param name name of variable to get
		* @return value of variable or NULL if undefined
		*/
		extern char nvram_get(const char name);

		/*
		* Get the value of an NVRAM variable.
		* @param name name of variable to get
		* @return value of variable or NUL if undefined
		*/
		#define nvram_safe_get(name) (nvram_get(name) ? : "")

		/*
		* Match an NVRAM variable.
		* @param name name of variable to match
		* @param match value to compare against value of variable
		* @return true if variable is defined and its value is string equal
		* to match or false otherwise
		*/
		static inline int nvram_match(char name, char match)
		{
		const char *value = nvram_get(name);
		return value && !strcmp(value, match);
		}

		/*
		* Inversely match an NVRAM variable.
		* @param name name of variable to match
		* @param match value to compare against value of variable
		* @return true if variable is defined and its value is not string
		* equal to invmatch or false otherwise
		*/
		static inline int nvram_invmatch(char name, char invmatch)
		{
		const char *value = nvram_get(name);
		return value && strcmp(value, invmatch);
		}

		/*
		* Set the value of an NVRAM variable. The name and value strings are
		* copied into private storage. Pointers to previously set values
		* may become invalid. The new value may be immediately
		* retrieved but will not be permanently stored until a commit.
		* @param name name of variable to set
		* @param value value of variable
		* @return 0 on success and errno on failure
		*/
		extern int nvram_set(const char name, const char value);

		/*
		* Unset an NVRAM variable. Pointers to previously set values
		* remain valid until a set.
		* @param name name of variable to unset
		* @return 0 on success and errno on failure
		* NOTE: use nvram_commit to commit this change to flash.
		*/
		extern int nvram_unset(const char *name);

		/*
		* Commit NVRAM variables to permanent storage. All pointers to values
		* may be invalid after a commit.
		* NVRAM values are undefined after a commit.
		* @return 0 on success and errno on failure
		*/
		extern int nvram_commit(void);

		/*
		* Get all NVRAM variables (format name=value\0 ... \0\0).
		* @param buf buffer to store variables
		* @param count size of buffer in bytes
		* @return 0 on success and errno on failure
		*/
		extern int nvram_getall(char *nvram_buf, int count);

		/* variable access */
		extern char getvar(char vars, const char *name);
		extern int getintvar(char vars, const char name);

		/* The NVRAM version number stored as an NVRAM variable */
		#define NVRAM_SOFTWARE_VERSION "1"

		#define NVRAM_MAGIC 0x48534C46 /* 'FLSH' */
		#define NVRAM_CLEAR_MAGIC 0x0
		#define NVRAM_INVALID_MAGIC 0xFFFFFFFF
		#define NVRAM_VERSION 1
		#define NVRAM_HEADER_SIZE 20
		#define NVRAM_SPACE 0x8000

		#define NVRAM_MAX_VALUE_LEN 255
		#define NVRAM_MAX_PARAM_LEN 64

		#define NVRAM_CRC_START_POSITION 9 /* magic, len, crc8 to be skipped */
		#define NVRAM_CRC_VER_MASK 0xffffff00 /* for crc_ver_init */

		#endif /* _bcmnvram_h_ */

drivers/staging/brcm80211/brcmsmac/bcmsrom.c

+4 −120

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@
		#include <nicpci.h>
		#include <aiutils.h>
		#include <bcmsrom.h>

		#include <bcmnvram.h>
		#include <bcmotp.h>

		#define SROM_OFFSET(sih) ((sih->ccrev > 31) ? \
		@@ -780,12 +778,9 @@ static const sromvar_t perpath_pci_sromvars[] = {
		{NULL, 0, 0, 0, 0}
		};

		static int initvars_srom_si(struct si_pub sih, void curmap, char **vars,
		uint *count);
		static void _initvars_srom_pci(u8 sromrev, u16 srom, uint off, varbuf_t b);
		static int initvars_srom_pci(struct si_pub sih, void curmap, char **vars,
		uint *count);
		static int initvars_flash_si(struct si_pub sih, char vars, uint count);
		static int sprom_read_pci(struct si_pub sih, u16 sprom,
		uint wordoff, u16 *buf, uint nwords, bool check_crc);
		#if defined(BCMNVRAMR)
		@@ -796,8 +791,6 @@ static u16 srom_cc_cmd(struct si_pub sih, void ccregs, u32 cmd,

		static int initvars_table(char start, char end,
		char *vars, uint count);
		static int initvars_flash(struct si_pub sih, char *vp,
		uint len);

		/* Initialization of varbuf structure */
		static void varbuf_init(varbuf_t b, char buf, uint size)
		@@ -877,20 +870,9 @@ int srom_var_init(struct si_pub sih, uint bustype, void curmap,
		*vars = NULL;
		*count = 0;

		switch (bustype) {
		case SI_BUS:
		case JTAG_BUS:
		return initvars_srom_si(sih, curmap, vars, count);

		case PCI_BUS:
		if (curmap == NULL)
		return -1;

		if (curmap != NULL && bustype == PCI_BUS)
		return initvars_srom_pci(sih, curmap, vars, count);

		default:
		break;
		}
		return -1;
		}

		@@ -1063,87 +1045,6 @@ static int initvars_table(char start, char end,
		return 0;
		}

		/*
		* Find variables with <devpath> from flash. 'base' points to the beginning
		* of the table upon enter and to the end of the table upon exit when success.
		* Return 0 on success, nonzero on error.
		*/
		static int initvars_flash(struct si_pub sih, char *base, uint len)
		{
		char vp = base;
		char *flash;
		int err;
		char *s;
		uint l, dl, copy_len;
		char devpath[SI_DEVPATH_BUFSZ];

		/* allocate memory and read in flash */
		flash = kmalloc(NVRAM_SPACE, GFP_ATOMIC);
		if (!flash)
		return -ENOMEM;
		err = nvram_getall(flash, NVRAM_SPACE);
		if (err)
		goto exit;

		ai_devpath(sih, devpath, sizeof(devpath));

		/* grab vars with the <devpath> prefix in name */
		dl = strlen(devpath);
		for (s = flash; s && *s; s += l + 1) {
		l = strlen(s);

		/* skip non-matching variable */
		if (strncmp(s, devpath, dl))
		continue;

		/* is there enough room to copy? */
		copy_len = l - dl + 1;
		if (len < copy_len) {
		err = -EOVERFLOW;
		goto exit;
		}

		/* no prefix, just the name=value */
		strncpy(vp, &s[dl], copy_len);
		vp += copy_len;
		len -= copy_len;
		}

		/* add null string as terminator */
		if (len < 1) {
		err = -EOVERFLOW;
		goto exit;
		}
		*vp++ = '\0';

		*base = vp;

		exit: kfree(flash);
		return err;
		}

		/*
		* Initialize nonvolatile variable table from flash.
		* Return 0 on success, nonzero on error.
		*/
		static int initvars_flash_si(struct si_pub sih, char vars, uint count)
		{
		char vp, base;
		int err;

		base = vp = kmalloc(MAXSZ_NVRAM_VARS, GFP_ATOMIC);
		if (!vp)
		return -ENOMEM;

		err = initvars_flash(sih, &vp, MAXSZ_NVRAM_VARS);
		if (err == 0)
		err = initvars_table(base, vp, vars, count);

		kfree(base);

		return err;
		}

		/* Parse SROM and create name=value pairs. 'srom' points to
		* the SROM word array. 'off' specifies the offset of the
		* first word 'srom' points to, which should be either 0 or
		@@ -1405,20 +1306,12 @@ static int initvars_srom_pci(struct si_pub sih, void curmap, char **vars,
		goto errout;
		}

		base = vp = kmalloc(MAXSZ_NVRAM_VARS, GFP_ATOMIC);
		if (!vp) {
		base = kmalloc(MAXSZ_NVRAM_VARS, GFP_ATOMIC);
		if (!base) {
		err = -2;
		goto errout;
		}

		/* read variables from flash */
		if (flash) {
		err = initvars_flash(sih, &vp, MAXSZ_NVRAM_VARS);
		if (err)
		goto errout;
		goto varsdone;
		}

		varbuf_init(&b, base, MAXSZ_NVRAM_VARS);

		/* parse SROM into name=value pairs. */
		@@ -1428,7 +1321,6 @@ static int initvars_srom_pci(struct si_pub sih, void curmap, char **vars,
		vp = b.buf;
		*vp++ = '\0';

		varsdone:
		err = initvars_table(base, vp, vars, count);

		errout:
		@@ -1438,11 +1330,3 @@ static int initvars_srom_pci(struct si_pub sih, void curmap, char **vars,
		kfree(srom);
		return err;
		}


		static int initvars_srom_si(struct si_pub sih, void curmap, char **vars,
		uint *varsz)
		{
		/* Search flash nvram section for srom variables */
		return initvars_flash_si(sih, vars, varsz);
		}

drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@
		#include <bcmdefs.h>
		#include <brcmu_wifi.h>
		#include <brcmu_utils.h>
		#include <bcmnvram.h>
		#include <nicpci.h>
		#include "bcmdma.h"

		@@ -1297,26 +1296,8 @@ static int __init brcms_module_init(void)
		#ifdef BCMDBG
		if (msglevel != 0xdeadbeef)
		brcm_msg_level = msglevel;
		else {
		char *var = getvar(NULL, "wl_msglevel");
		if (var) {
		unsigned long value;

		(void)strict_strtoul(var, 0, &value);
		brcm_msg_level = value;
		}
		}
		if (phymsglevel != 0xdeadbeef)
		phyhal_msg_level = phymsglevel;
		else {
		char *var = getvar(NULL, "phy_msglevel");
		if (var) {
		unsigned long value;

		(void)strict_strtoul(var, 0, &value);
		phyhal_msg_level = value;
		}
		}
		#endif /* BCMDBG */

		error = pci_register_driver(&brcms_pci_driver);