Skip to contentSkip to conversation

trivial: acpi: replace some bitshifts with BIT macro

PATCH In review Garrit Franke 3 participants 6 messages Jul 24, 2020 – Jul 28, 2020 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): alpine.DEB.2.21.2007241814450.2834@hadrien

#1 lore raw

PATCH 1/1 trivial: acpi: replace some bitshifts with BIT macro

---
 drivers/acpi/acpica/exfldio.c   | 2 +-
 drivers/acpi/acpica/utownerid.c | 6 +++---
 drivers/acpi/bus.c              | 2 +-
 drivers/acpi/sleep.c            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/acpi/acpica/exfldio.c +1 -1
index ade35ff1c7..92fc702456 100644
@@ -298,7 +298,7 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
 		return (FALSE);
 	}
 
-	if (value >= ((u64) 1 << obj_desc->common_field.bit_length)) {
+	if (value >= ((u64) BIT(obj_desc->common_field.bit_length))) {
 		/*
 		 * The Value is larger than the maximum value that can fit into
 		 * the register.
drivers/acpi/acpica/utownerid.c +3 -3
index d3525ef8ed..c4e2db2f54 100644
@@ -74,13 +74,13 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id *owner_id)
 			 * int. Some compilers or runtime error detection may flag this as
 			 * an error.
 			 */
-			if (!(acpi_gbl_owner_id_mask[j] & ((u32)1 << k))) {
+			if (!(acpi_gbl_owner_id_mask[j] & (u32)BIT(k))) {
 				/*
 				 * Found a free ID. The actual ID is the bit index plus one,
 				 * making zero an invalid Owner ID. Save this as the last ID
 				 * allocated and update the global ID mask.
 				 */
-				acpi_gbl_owner_id_mask[j] |= ((u32)1 << k);
+				acpi_gbl_owner_id_mask[j] |= (u32)BIT(k);
 
 				acpi_gbl_last_owner_id_index = (u8)j;
 				acpi_gbl_next_owner_id_offset = (u8)(k + 1);
@@ -171,7 +171,7 @@ void acpi_ut_release_owner_id(acpi_owner_id *owner_id_ptr)
 	/* Decode ID to index/offset pair */
 
 	index = ACPI_DIV_32(owner_id);
-	bit = (u32)1 << ACPI_MOD_32(owner_id);
+	bit = (u32)BIT(ACPI_MOD_32(owner_id));
 
 	/* Free the owner ID only if it is valid */
 
drivers/acpi/bus.c +1 -1
index 54002670cb..39ead80c45 100644
@@ -233,7 +233,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
 		goto out_kfree;
 	}
 	/* Need to ignore the bit0 in result code */
-	errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
+	errors = *((u32 *)out_obj->buffer.pointer) & BIT(0);
 	if (errors) {
 		if (errors & OSC_REQUEST_ERROR)
 			acpi_print_osc_error(handle, context,
drivers/acpi/sleep.c +1 -1
index aff13bf4d9..38f5210313 100644
@@ -880,7 +880,7 @@ static void acpi_sleep_run_lps0_dsm(unsigned int func)
 {
 	union acpi_object *out_obj;
 
-	if (!(lps0_dsm_func_mask & (1 << func)))
+	if (!(lps0_dsm_func_mask & BIT(func)))
 		return;
 
 	out_obj = acpi_evaluate_dsm(lps0_device_handle, &lps0_dsm_guid, 1, func, NULL);
Signature · 1 line
2.25.1
#2 lore raw

Where is "BIT" defined?

-----Original Message-----
From: Garrit Franke <garritfranke(a)gmail.com>
Sent: Friday, July 24, 2020 9:21 AM
To: Moore, Robert <robert.moore(a)intel.com>; Wysocki, Rafael J <rafael.j.wysocki(a)intel.com>; lenb(a)kernel.org; trivial(a)kernel.org; linux-acpi(a)vger.kernel.org; devel(a)acpica.org; kernel-janitors(a)vger.kernel.org
Cc: Garrit Franke <garritfranke(a)gmail.com>
Subject: [PATCH] trivial: acpi: replace some bitshifts with BIT macro

Signed-off-by Garrit Franke <garritfranke(a)gmail.com>
---
 drivers/acpi/acpica/exfldio.c   | 2 +-
 drivers/acpi/acpica/utownerid.c | 6 +++---
 drivers/acpi/bus.c              | 2 +-
 drivers/acpi/sleep.c            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/acpi/acpica/exfldio.c +1 -1
@@ -298,7 +298,7 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
 		return (FALSE);
 	}
 
-	if (value >= ((u64) 1 << obj_desc->common_field.bit_length)) {
+	if (value >= ((u64) BIT(obj_desc->common_field.bit_length))) {
 		/*
 		 * The Value is larger than the maximum value that can fit into
 		 * the register.
drivers/acpi/acpica/utownerid.c +2 -2
@@ -74,13 +74,13 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id *owner_id)
 			 * int. Some compilers or runtime error detection may flag this as
 			 * an error.
 			 */
-			if (!(acpi_gbl_owner_id_mask[j] & ((u32)1 << k))) {
+			if (!(acpi_gbl_owner_id_mask[j] & (u32)BIT(k))) {
 				/*
 				 * Found a free ID. The actual ID is the bit index plus one,
 				 * making zero an invalid Owner ID. Save this as the last ID
 				 * allocated and update the global ID mask.
 				 */
-				acpi_gbl_owner_id_mask[j] |= ((u32)1 << k);
+				acpi_gbl_owner_id_mask[j] |= (u32)BIT(k);
 
 				acpi_gbl_last_owner_id_index = (u8)j;
 				acpi_gbl_next_owner_id_offset = (u8)(k + 1); @@ -171,7 +171,7 @@ void acpi_ut_release_owner_id(acpi_owner_id *owner_id_ptr)

/* Decode ID to index/offset pair */

index = ACPI_DIV_32(owner_id);
- bit = (u32)1 << ACPI_MOD_32(owner_id);
+ bit = (u32)BIT(ACPI_MOD_32(owner_id));

/* Free the owner ID only if it is valid */

drivers/acpi/bus.c +1 -1
@@ -233,7 +233,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
 		goto out_kfree;
 	}
 	/* Need to ignore the bit0 in result code */
-	errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
+	errors = *((u32 *)out_obj->buffer.pointer) & BIT(0);
 	if (errors) {
 		if (errors & OSC_REQUEST_ERROR)
 			acpi_print_osc_error(handle, context, diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index aff13bf4d9..38f5210313 100644
drivers/acpi/sleep.c +1 -2
@@ -880,7 +880,7 @@ static void acpi_sleep_run_lps0_dsm(unsigned int func)  {
 	union acpi_object *out_obj;
 
-	if (!(lps0_dsm_func_mask & (1 << func)))
+	if (!(lps0_dsm_func_mask & BIT(func)))
 		return;
 
 	out_obj = acpi_evaluate_dsm(lps0_device_handle, &lps0_dsm_guid, 1, func, NULL);
--

2.25.1

#3 lore raw
Quoted 1 line · Robert

Where is "BIT" defined?

this is a linux macro, currently in include/vdso.bits.h, see also linux/bits.h for the BIT_ULL() unsigned long long variant too.

Quoted 85 lines

-----Original Message-----
From: Garrit Franke <garritfranke(a)gmail.com>
Sent: Friday, July 24, 2020 9:21 AM
To: Moore, Robert <robert.moore(a)intel.com>; Wysocki, Rafael J <rafael.j.wysocki(a)intel.com>; lenb(a)kernel.org; trivial(a)kernel.org; linux-acpi(a)vger.kernel.org; devel(a)acpica.org; kernel-janitors(a)vger.kernel.org
Cc: Garrit Franke <garritfranke(a)gmail.com>
Subject: [PATCH] trivial: acpi: replace some bitshifts with BIT macro

Signed-off-by Garrit Franke <garritfranke(a)gmail.com>
---
 drivers/acpi/acpica/exfldio.c   | 2 +-
 drivers/acpi/acpica/utownerid.c | 6 +++---
 drivers/acpi/bus.c              | 2 +-
 drivers/acpi/sleep.c            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/acpi/acpica/exfldio.c +1 -1
@@ -298,7 +298,7 @@ acpi_ex_register_overflow(union acpi_operand_object *obj_desc, u64 value)
 		return (FALSE);
 	}
 
-	if (value >= ((u64) 1 << obj_desc->common_field.bit_length)) {
+	if (value >= ((u64) BIT(obj_desc->common_field.bit_length))) {
 		/*
 		 * The Value is larger than the maximum value that can fit into
 		 * the register.
drivers/acpi/acpica/utownerid.c +2 -2
@@ -74,13 +74,13 @@ acpi_status acpi_ut_allocate_owner_id(acpi_owner_id *owner_id)
 			 * int. Some compilers or runtime error detection may flag this as
 			 * an error.
 			 */
-			if (!(acpi_gbl_owner_id_mask[j] & ((u32)1 << k))) {
+			if (!(acpi_gbl_owner_id_mask[j] & (u32)BIT(k))) {
 				/*
 				 * Found a free ID. The actual ID is the bit index plus one,
 				 * making zero an invalid Owner ID. Save this as the last ID
 				 * allocated and update the global ID mask.
 				 */
-				acpi_gbl_owner_id_mask[j] |= ((u32)1 << k);
+				acpi_gbl_owner_id_mask[j] |= (u32)BIT(k);
 
 				acpi_gbl_last_owner_id_index = (u8)j;
 				acpi_gbl_next_owner_id_offset = (u8)(k + 1); @@ -171,7 +171,7 @@ void acpi_ut_release_owner_id(acpi_owner_id *owner_id_ptr)
drivers/acpi/acpica/utownerid.c +1 -1
 	/* Decode ID to index/offset pair */
 
 	index = ACPI_DIV_32(owner_id);
-	bit = (u32)1 << ACPI_MOD_32(owner_id);
+	bit = (u32)BIT(ACPI_MOD_32(owner_id));
 
 	/* Free the owner ID only if it is valid */
drivers/acpi/bus.c +1 -1
@@ -233,7 +233,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
 		goto out_kfree;
 	}
 	/* Need to ignore the bit0 in result code */
-	errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
+	errors = *((u32 *)out_obj->buffer.pointer) & BIT(0);
 	if (errors) {
 		if (errors & OSC_REQUEST_ERROR)
 			acpi_print_osc_error(handle, context, diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index aff13bf4d9..38f5210313 100644
drivers/acpi/sleep.c +1 -2
@@ -880,7 +880,7 @@ static void acpi_sleep_run_lps0_dsm(unsigned int func)  {
 	union acpi_object *out_obj;
 
-	if (!(lps0_dsm_func_mask & (1 << func)))
+	if (!(lps0_dsm_func_mask & BIT(func)))
 		return;
 
 	out_obj = acpi_evaluate_dsm(lps0_device_handle, &lps0_dsm_guid, 1, func, NULL);
--

2.25.1
_______________________________________________
Devel mailing list -- devel(a)acpica.org
To unsubscribe send an email to devel-leave(a)acpica.org %(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

#4 lore raw
In reply to Moore
Quoted 1 line · Robert

Where is "BIT" defined?

It is defined in multiple places (see include/vdso/bits.h for example), therefore I blatently assumed that it would be defined. I'm quite new to kernel development, and I'm learning along the way. Thank you for pointing this out.

Would it make sense to copy this file to this drivers root, or is it not worth the effort?

Thanks for your time
Garrit

#5 lore raw

Well, since BIT is a linux macro only, we can't use it in ACPICA, because the code is compiler/environment independent. Bob

-----Original Message-----
From: Garrit Franke <garritfranke(a)gmail.com>
Sent: Friday, July 24, 2020 9:48 AM
To: Moore, Robert <robert.moore(a)intel.com>
Cc: Wysocki, Rafael J <rafael.j.wysocki(a)intel.com>; lenb(a)kernel.org; trivial(a)kernel.org; linux-acpi(a)vger.kernel.org; devel(a)acpica.org; kernel-janitors(a)vger.kernel.org
Subject: Re: [PATCH] trivial: acpi: replace some bitshifts with BIT macro

Quoted 1 line · Robert

Where is "BIT" defined?

It is defined in multiple places (see include/vdso/bits.h for example), therefore I blatently assumed that it would be defined. I'm quite new to kernel development, and I'm learning along the way. Thank you for pointing this out.

Would it make sense to copy this file to this drivers root, or is it not worth the effort?

Thanks for your time
Garrit

#6 lore raw
In reply to Garrit Franke

-----Original Message-----
From: Garrit Franke <garritfranke(a)gmail.com>
Sent: Friday, July 24, 2020 9:48 AM
To: Moore, Robert <robert.moore(a)intel.com>
Cc: Wysocki, Rafael J <rafael.j.wysocki(a)intel.com>; lenb(a)kernel.org; trivial(a)kernel.org; linux-acpi(a)vger.kernel.org; devel(a)acpica.org; kernel-janitors(a)vger.kernel.org
Subject: Re: [PATCH] trivial: acpi: replace some bitshifts with BIT macro

Quoted 1 line · Robert

Where is "BIT" defined?

It is defined in multiple places (see include/vdso/bits.h for example), therefore I blatently assumed that it would be defined. I'm quite new to kernel development, and I'm learning along the way. Thank you for pointing this out.

Would it make sense to copy this file to this drivers root, or is it not worth the effort?

I'm not sure that it is worth the effort. Linux is not the only OS supported (and GCC is not the only compiler supported) by ACPICA.

Thanks for your time
Garrit