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

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

Merge "bitops: Introduce a more generic BITMASK macro"

parents 8fb80145 ce718d8b

drivers/edac/amd64_edac.c

+24 −22
Original line number Diff line number Diff line
@@ -338,8 +338,8 @@ static void get_cs_base_and_mask(struct amd64_pvt *pvt, int csrow, u8 dct, 
	if (boot_cpu_data.x86 == 0xf && pvt->ext_model < K8_REV_F) {

		csbase		= pvt->csels[dct].csbases[csrow];

		csmask		= pvt->csels[dct].csmasks[csrow];

		base_bits	= GENMASK(21, 31) | GENMASK(9, 15);

		mask_bits	= GENMASK(21, 29) | GENMASK(9, 15);

		base_bits	= GENMASK_ULL(31, 21) | GENMASK_ULL(15, 9);

		mask_bits	= GENMASK_ULL(29, 21) | GENMASK_ULL(15, 9);

		addr_shift	= 4;



	/*
@@ -350,16 +350,16 @@ static void get_cs_base_and_mask(struct amd64_pvt *pvt, int csrow, u8 dct, 
		csbase          = pvt->csels[dct].csbases[csrow];

		csmask          = pvt->csels[dct].csmasks[csrow >> 1];



		*base  = (csbase & GENMASK(5,  15)) << 6;

		*base |= (csbase & GENMASK(19, 30)) << 8;

		*base  = (csbase & GENMASK_ULL(15,  5)) << 6;

		*base |= (csbase & GENMASK_ULL(30, 19)) << 8;



		*mask = ~0ULL;

		/* poke holes for the csmask */

		*mask &= ~((GENMASK(5, 15)  << 6) |

			   (GENMASK(19, 30) << 8));

		*mask &= ~((GENMASK_ULL(15, 5)  << 6) |

			   (GENMASK_ULL(30, 19) << 8));



		*mask |= (csmask & GENMASK(5, 15))  << 6;

		*mask |= (csmask & GENMASK(19, 30)) << 8;

		*mask |= (csmask & GENMASK_ULL(15, 5))  << 6;

		*mask |= (csmask & GENMASK_ULL(30, 19)) << 8;



		return;

	} else {
@@ -368,9 +368,11 @@ static void get_cs_base_and_mask(struct amd64_pvt *pvt, int csrow, u8 dct, 
		addr_shift	= 8;



		if (boot_cpu_data.x86 == 0x15)

			base_bits = mask_bits = GENMASK(19,30) | GENMASK(5,13);

			base_bits = mask_bits =

				GENMASK_ULL(30,19) | GENMASK_ULL(13,5);

		else

			base_bits = mask_bits = GENMASK(19,28) | GENMASK(5,13);

			base_bits = mask_bits =

				GENMASK_ULL(28,19) | GENMASK_ULL(13,5);

	}



	*base  = (csbase & base_bits) << addr_shift;
@@ -561,7 +563,7 @@ static u64 sys_addr_to_dram_addr(struct mem_ctl_info *mci, u64 sys_addr) 
	 * section 3.4.2 of AMD publication 24592: AMD x86-64 Architecture

	 * Programmer's Manual Volume 1 Application Programming.

	 */

	dram_addr = (sys_addr & GENMASK(0, 39)) - dram_base;

	dram_addr = (sys_addr & GENMASK_ULL(39, 0)) - dram_base;



	edac_dbg(2, "using DRAM Base register to translate SysAddr 0x%lx to DramAddr 0x%lx\n",

		 (unsigned long)sys_addr, (unsigned long)dram_addr);
@@ -597,7 +599,7 @@ static u64 dram_addr_to_input_addr(struct mem_ctl_info *mci, u64 dram_addr) 
	 * concerning translating a DramAddr to an InputAddr.

	 */

	intlv_shift = num_node_interleave_bits(dram_intlv_en(pvt, 0));

	input_addr = ((dram_addr >> intlv_shift) & GENMASK(12, 35)) +

	input_addr = ((dram_addr >> intlv_shift) & GENMASK_ULL(35, 12)) +

		      (dram_addr & 0xfff);



	edac_dbg(2, "  Intlv Shift=%d DramAddr=0x%lx maps to InputAddr=0x%lx\n",
@@ -847,7 +849,7 @@ static u64 get_error_address(struct mce *m) 
		end_bit   = 39;

	}



	addr = m->addr & GENMASK(start_bit, end_bit);

	addr = m->addr & GENMASK_ULL(end_bit, start_bit);



	/*

	 * Erratum 637 workaround
@@ -859,7 +861,7 @@ static u64 get_error_address(struct mce *m) 
		u16 mce_nid;

		u8 intlv_en;



		if ((addr & GENMASK(24, 47)) >> 24 != 0x00fdf7)

		if ((addr & GENMASK_ULL(47, 24)) >> 24 != 0x00fdf7)

			return addr;



		mce_nid	= amd_get_nb_id(m->extcpu);
@@ -869,7 +871,7 @@ static u64 get_error_address(struct mce *m) 
		intlv_en = tmp >> 21 & 0x7;



		/* add [47:27] + 3 trailing bits */

		cc6_base  = (tmp & GENMASK(0, 20)) << 3;

		cc6_base  = (tmp & GENMASK_ULL(20, 0)) << 3;



		/* reverse and add DramIntlvEn */

		cc6_base |= intlv_en ^ 0x7;
@@ -878,18 +880,18 @@ static u64 get_error_address(struct mce *m) 
		cc6_base <<= 24;



		if (!intlv_en)

			return cc6_base | (addr & GENMASK(0, 23));

			return cc6_base | (addr & GENMASK_ULL(23, 0));



		amd64_read_pci_cfg(pvt->F1, DRAM_LOCAL_NODE_BASE, &tmp);



							/* faster log2 */

		tmp_addr  = (addr & GENMASK(12, 23)) << __fls(intlv_en + 1);

		tmp_addr  = (addr & GENMASK_ULL(23, 12)) << __fls(intlv_en + 1);



		/* OR DramIntlvSel into bits [14:12] */

		tmp_addr |= (tmp & GENMASK(21, 23)) >> 9;

		tmp_addr |= (tmp & GENMASK_ULL(23, 21)) >> 9;



		/* add remaining [11:0] bits from original MC4_ADDR */

		tmp_addr |= addr & GENMASK(0, 11);

		tmp_addr |= addr & GENMASK_ULL(11, 0);



		return cc6_base | tmp_addr;

	}
@@ -948,12 +950,12 @@ static void read_dram_base_limit_regs(struct amd64_pvt *pvt, unsigned range) 


	amd64_read_pci_cfg(f1, DRAM_LOCAL_NODE_LIM, &llim);



	pvt->ranges[range].lim.lo &= GENMASK(0, 15);

	pvt->ranges[range].lim.lo &= GENMASK_ULL(15, 0);



				    /* {[39:27],111b} */

	pvt->ranges[range].lim.lo |= ((llim & 0x1fff) << 3 | 0x7) << 16;



	pvt->ranges[range].lim.hi &= GENMASK(0, 7);

	pvt->ranges[range].lim.hi &= GENMASK_ULL(7, 0);



				    /* [47:40] */

	pvt->ranges[range].lim.hi |= llim >> 13;
@@ -1303,7 +1305,7 @@ static u64 f1x_get_norm_dct_addr(struct amd64_pvt *pvt, u8 range, 
			chan_off = dram_base;

	}



	return (sys_addr & GENMASK(6,47)) - (chan_off & GENMASK(23,47));

	return (sys_addr & GENMASK_ULL(47,6)) - (chan_off & GENMASK_ULL(47,23));

}



/*

drivers/edac/amd64_edac.h

+0 −8
Original line number Diff line number Diff line
@@ -159,14 +159,6 @@ 
#define ON true

#define OFF false



/*

 * Create a contiguous bitmask starting at bit position @lo and ending at

 * position @hi. For example

 *

 * GENMASK(21, 39) gives us the 64bit vector 0x000000ffffe00000.

 */

#define GENMASK(lo, hi)			(((1ULL << ((hi) - (lo) + 1)) - 1) << (lo))



/*

 * PCI-defined configuration space registers

 */

drivers/edac/sb_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int probed; 
 * Get a bit field at register value <v>, from bit <lo> to bit <hi>

 */

#define GET_BITFIELD(v, lo, hi)	\

	(((v) & ((1ULL << ((hi) - (lo) + 1)) - 1) << (lo)) >> (lo))

	(((v) & GENMASK_ULL(hi, lo)) >> (lo))



/*

 * sbridge Memory Controller Registers

drivers/video/sis/init.c

+2 −3
Original line number Diff line number Diff line
@@ -3320,9 +3320,8 @@ SiSSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo) 
}



#ifndef GETBITSTR

#define BITMASK(h,l)    	(((unsigned)(1U << ((h)-(l)+1))-1)<<(l))

#define GENMASK(mask)   	BITMASK(1?mask,0?mask)

#define GETBITS(var,mask)   	(((var) & GENMASK(mask)) >> (0?mask))

#define GENBITSMASK(mask)   	GENMASK(1?mask,0?mask)

#define GETBITS(var,mask)   	(((var) & GENBITSMASK(mask)) >> (0?mask))

#define GETBITSTR(val,from,to)  ((GETBITS(val,from)) << (0?to))

#endif

include/linux/bitops.h

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@ 
#define BITS_TO_LONGS(nr)	DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(long))

#endif



/*

 * Create a contiguous bitmask starting at bit position @l and ending at

 * position @h. For example

 * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.

 */

#define GENMASK(h, l)		(((U32_C(1) << ((h) - (l) + 1)) - 1) << (l))

#define GENMASK_ULL(h, l)	(((U64_C(1) << ((h) - (l) + 1)) - 1) << (l))



extern unsigned int __sw_hweight8(unsigned int w);

extern unsigned int __sw_hweight16(unsigned int w);

extern unsigned int __sw_hweight32(unsigned int w);