[PATCH 0/7] agp: Various minor fixes

[PATCH 0/7] agp: Various minor fixes

[Thomas Zimmermann]

Fix a number of compiler warnings in the AGP drivers. No functional
changes.

Thomas Zimmermann (7):
  agp: Remove trailing whitespaces
  agp: Include "compat_ioctl.h" where necessary
  agp: Documentation fixes
  agp/ati: Return error from ati_create_page_map()
  agp/nvidia: Ignore value returned by readl()
  agp/sworks: Remove unused variable 'current_size'
  agp/via: Remove unused variable 'current_size'

 drivers/char/agp/ati-agp.c    | 10 ++++++++--
 drivers/char/agp/backend.c    |  2 ++
 drivers/char/agp/frontend.c   |  4 +++-
 drivers/char/agp/nvidia-agp.c |  6 +++---
 drivers/char/agp/sworks-agp.c |  5 +----
 drivers/char/agp/via-agp.c    |  3 ---
 6 files changed, 17 insertions(+), 13 deletions(-)

--
2.33.1

[PATCH 1/7] agp: Remove trailing whitespaces

[Thomas Zimmermann]

Trivial coding-style fix.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/char/agp/ati-agp.c    | 2 +-
 drivers/char/agp/frontend.c   | 2 +-
 drivers/char/agp/sworks-agp.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 20bf5f78a362..857b37141a07 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -303,7 +303,7 @@ static int ati_insert_memory(struct agp_memory * mem,
 	for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
 		addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
 		cur_gatt = GET_GATT(addr);
-		writel(agp_bridge->driver->mask_memory(agp_bridge,	
+		writel(agp_bridge->driver->mask_memory(agp_bridge,
 						       page_to_phys(mem->pages[i]),
 						       mem->type),
 		       cur_gatt+GET_GATT_OFF(addr));
diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 00ff5fcb808a..6802a6bbf0f2 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -1017,7 +1017,7 @@ static long agp_ioctl(struct file *file,
 	case AGPIOC_UNBIND:
 		ret_val = agpioc_unbind_wrap(curr_priv, (void __user *) arg);
 		break;
-	       
+
 	case AGPIOC_CHIPSET_FLUSH:
 		break;
 	}
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index f875970bda65..b15d3d4f71d5 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -350,7 +350,7 @@ static int serverworks_insert_memory(struct agp_memory *mem,
 	for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
 		addr = (j * PAGE_SIZE) + agp_bridge->gart_bus_addr;
 		cur_gatt = SVRWRKS_GET_GATT(addr);
-		writel(agp_bridge->driver->mask_memory(agp_bridge, 
+		writel(agp_bridge->driver->mask_memory(agp_bridge,
 				page_to_phys(mem->pages[i]), mem->type),
 		       cur_gatt+GET_GATT_OFF(addr));
 	}
-- 
2.33.1

[PATCH 2/7] agp: Include "compat_ioctl.h" where necessary

[Thomas Zimmermann]

Fix compiler warnings like

  drivers/char/agp/frontend.c:46:20: warning: no previous prototype for 'agp_find_mem_by_key' [-Wmissing-prototypes]
    46 | struct agp_memory *agp_find_mem_by_key(int key)

by including the compat_ioctl.h in the source file.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/char/agp/frontend.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
index 6802a6bbf0f2..321118a9cfa5 100644
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
@@ -39,7 +39,9 @@
 #include <linux/fs.h>
 #include <linux/sched.h>
 #include <linux/uaccess.h>
+
 #include "agp.h"
+#include "compat_ioctl.h"
 
 struct agp_front_data agp_fe;
 
-- 
2.33.1

[PATCH 3/7] agp: Documentation fixes

[Thomas Zimmermann]

Fix compiler warnings

  drivers/char/agp/backend.c:68: warning: Function parameter or member 'pdev' not described in 'agp_backend_acquire'
  drivers/char/agp/backend.c:93: warning: Function parameter or member 'bridge' not described in 'agp_backend_release'

by adding the necessary documentation.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/char/agp/backend.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 004a3ce8ba72..0e19c600db53 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -62,6 +62,7 @@ EXPORT_SYMBOL(agp_find_bridge);
 
 /**
  *	agp_backend_acquire  -  attempt to acquire an agp backend.
+ *	@pdev: the PCI device
  *
  */
 struct agp_bridge_data *agp_backend_acquire(struct pci_dev *pdev)
@@ -83,6 +84,7 @@ EXPORT_SYMBOL(agp_backend_acquire);
 
 /**
  *	agp_backend_release  -  release the lock on the agp backend.
+ *	@bridge: the AGP backend to release
  *
  *	The caller must insure that the graphics aperture translation table
  *	is read for use by another entity.
-- 
2.33.1

[PATCH 4/7] agp/ati: Return error from ati_create_page_map()

[Thomas Zimmermann]

Fix the compiler warning

  drivers/char/agp/ati-agp.c: In function 'ati_create_page_map':
  drivers/char/agp/ati-agp.c:58:16: warning: variable 'err' set but not used [-Wunused-but-set-variable]
    58 |         int i, err = 0;

by returing the error to the caller.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/char/agp/ati-agp.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index 857b37141a07..785cc1ecf4e0 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -55,7 +55,7 @@ static struct _ati_generic_private {
 
 static int ati_create_page_map(struct ati_page_map *page_map)
 {
-	int i, err = 0;
+	int i, err;
 
 	page_map->real = (unsigned long *) __get_free_page(GFP_KERNEL);
 	if (page_map->real == NULL)
@@ -63,6 +63,8 @@ static int ati_create_page_map(struct ati_page_map *page_map)
 
 	set_memory_uc((unsigned long)page_map->real, 1);
 	err = map_page_into_agp(virt_to_page(page_map->real));
+	if (err)
+		goto err_free_page;
 	page_map->remapped = page_map->real;
 
 	for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
@@ -71,6 +73,10 @@ static int ati_create_page_map(struct ati_page_map *page_map)
 	}
 
 	return 0;
+
+err_free_page:
+	free_page((unsigned long)page_map->real);
+	return err;
 }
 
 
-- 
2.33.1

[PATCH 5/7] agp/nvidia: Ignore value returned by readl()

[Thomas Zimmermann]

Fix the compiler warning

  drivers/char/agp/nvidia-agp.c: In function 'nvidia_tlbflush':
  drivers/char/agp/nvidia-agp.c:264:22: warning: variable 'temp' set but not used [-Wunused-but-set-variable]
    264 |         u32 wbc_reg, temp;

by removing the unused variable. The affected readl() is only
required for flushing caches, but the returned value is not of
interest.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/char/agp/nvidia-agp.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
index f78e756157db..437b3581cbe5 100644
--- a/drivers/char/agp/nvidia-agp.c
+++ b/drivers/char/agp/nvidia-agp.c
@@ -261,7 +261,7 @@ static int nvidia_remove_memory(struct agp_memory *mem, off_t pg_start, int type
 static void nvidia_tlbflush(struct agp_memory *mem)
 {
 	unsigned long end;
-	u32 wbc_reg, temp;
+	u32 wbc_reg;
 	int i;
 
 	/* flush chipset */
@@ -283,9 +283,9 @@ static void nvidia_tlbflush(struct agp_memory *mem)
 
 	/* flush TLB entries */
 	for (i = 0; i < 32 + 1; i++)
-		temp = readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
+		(void)readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
 	for (i = 0; i < 32 + 1; i++)
-		temp = readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
+		(void)readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
 }
 
 
-- 
2.33.1

[PATCH 6/7] agp/sworks: Remove unused variable 'current_size'

[Thomas Zimmermann]

Fix the compiler warning

  drivers/char/agp/sworks-agp.c: In function 'serverworks_configure':
  drivers/char/agp/sworks-agp.c:265:37: warning: variable 'current_size' set but not used [-Wunused-but-set-variable]
    265 |         struct aper_size_info_lvl2 *current_size;

by removing the variable.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/char/agp/sworks-agp.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index b15d3d4f71d5..b91da5998dd7 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -262,13 +262,10 @@ static void serverworks_tlbflush(struct agp_memory *temp)
 
 static int serverworks_configure(void)
 {
-	struct aper_size_info_lvl2 *current_size;
 	u32 temp;
 	u8 enable_reg;
 	u16 cap_reg;
 
-	current_size = A_SIZE_LVL2(agp_bridge->current_size);
-
 	/* Get the memory mapped registers */
 	pci_read_config_dword(agp_bridge->dev, serverworks_private.mm_addr_ofs, &temp);
 	temp = (temp & PCI_BASE_ADDRESS_MEM_MASK);
-- 
2.33.1

[PATCH 7/7] agp/via: Remove unused variable 'current_size'

[Thomas Zimmermann]

Fix the compiler warning

  drivers/char/agp/via-agp.c: In function 'via_configure_agp3':
  drivers/char/agp/via-agp.c:131:35: warning: variable 'current_size' set but not used [-Wunused-but-set-variable]
    131 |         struct aper_size_info_16 *current_size;

by removing the variable.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/char/agp/via-agp.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 87a92a044570..dc594f4eca38 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -128,9 +128,6 @@ static int via_fetch_size_agp3(void)
 static int via_configure_agp3(void)
 {
 	u32 temp;
-	struct aper_size_info_16 *current_size;
-
-	current_size = A_SIZE_16(agp_bridge->current_size);
 
 	/* address to map to */
 	agp_bridge->gart_bus_addr = pci_bus_address(agp_bridge->dev,
-- 
2.33.1

Re: [PATCH 0/7] agp: Various minor fixes

[Thomas Zimmermann]

[-- Attachment #1.1: Type: text/plain, Size: 1088 bytes --]

Ping! Any feedback on these patches?

Am 12.11.21 um 15:16 schrieb Thomas Zimmermann:
> Fix a number of compiler warnings in the AGP drivers. No functional
> changes.
> 
> Thomas Zimmermann (7):
>    agp: Remove trailing whitespaces
>    agp: Include "compat_ioctl.h" where necessary
>    agp: Documentation fixes
>    agp/ati: Return error from ati_create_page_map()
>    agp/nvidia: Ignore value returned by readl()
>    agp/sworks: Remove unused variable 'current_size'
>    agp/via: Remove unused variable 'current_size'
> 
>   drivers/char/agp/ati-agp.c    | 10 ++++++++--
>   drivers/char/agp/backend.c    |  2 ++
>   drivers/char/agp/frontend.c   |  4 +++-
>   drivers/char/agp/nvidia-agp.c |  6 +++---
>   drivers/char/agp/sworks-agp.c |  5 +----
>   drivers/char/agp/via-agp.c    |  3 ---
>   6 files changed, 17 insertions(+), 13 deletions(-)
> 
> --
> 2.33.1
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]

Re: [PATCH 4/7] agp/ati: Return error from ati_create_page_map()

[Helge Deller]

On 11/12/21 15:16, Thomas Zimmermann wrote:
> Fix the compiler warning
>
>   drivers/char/agp/ati-agp.c: In function 'ati_create_page_map':
>   drivers/char/agp/ati-agp.c:58:16: warning: variable 'err' set but not used [-Wunused-but-set-variable]
>     58 |         int i, err = 0;
>
> by returing the error to the caller.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>  drivers/char/agp/ati-agp.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
> index 857b37141a07..785cc1ecf4e0 100644
> --- a/drivers/char/agp/ati-agp.c
> +++ b/drivers/char/agp/ati-agp.c
> @@ -55,7 +55,7 @@ static struct _ati_generic_private {
>
>  static int ati_create_page_map(struct ati_page_map *page_map)
>  {
> -	int i, err = 0;
> +	int i, err;
>
>  	page_map->real = (unsigned long *) __get_free_page(GFP_KERNEL);
>  	if (page_map->real == NULL)
> @@ -63,6 +63,8 @@ static int ati_create_page_map(struct ati_page_map *page_map)
>
>  	set_memory_uc((unsigned long)page_map->real, 1);
>  	err = map_page_into_agp(virt_to_page(page_map->real));
> +	if (err)
> +		goto err_free_page;

I'd suggest to not use goto here, but instead simply fold
in the free_page() and return.


>  	page_map->remapped = page_map->real;
>
>  	for (i = 0; i < PAGE_SIZE / sizeof(unsigned long); i++) {
> @@ -71,6 +73,10 @@ static int ati_create_page_map(struct ati_page_map *page_map)
>  	}
>
>  	return 0;
> +
> +err_free_page:
> +	free_page((unsigned long)page_map->real);
> +	return err;
>  }
>
>
>

Re: [PATCH 5/7] agp/nvidia: Ignore value returned by readl()

[Helge Deller]

On 11/12/21 15:16, Thomas Zimmermann wrote:
> Fix the compiler warning
>
>   drivers/char/agp/nvidia-agp.c: In function 'nvidia_tlbflush':
>   drivers/char/agp/nvidia-agp.c:264:22: warning: variable 'temp' set but not used [-Wunused-but-set-variable]
>     264 |         u32 wbc_reg, temp;
>
> by removing the unused variable. The affected readl() is only
> required for flushing caches, but the returned value is not of
> interest.
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
>  drivers/char/agp/nvidia-agp.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c
> index f78e756157db..437b3581cbe5 100644
> --- a/drivers/char/agp/nvidia-agp.c
> +++ b/drivers/char/agp/nvidia-agp.c
> @@ -261,7 +261,7 @@ static int nvidia_remove_memory(struct agp_memory *mem, off_t pg_start, int type
>  static void nvidia_tlbflush(struct agp_memory *mem)
>  {
>  	unsigned long end;
> -	u32 wbc_reg, temp;
> +	u32 wbc_reg;
>  	int i;
>
>  	/* flush chipset */
> @@ -283,9 +283,9 @@ static void nvidia_tlbflush(struct agp_memory *mem)
>
>  	/* flush TLB entries */
>  	for (i = 0; i < 32 + 1; i++)
> -		temp = readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
> +		(void)readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));

IMHO the void is ugly.
Would tagging temp with "__maybe_unused" work ?

Helge


>  	for (i = 0; i < 32 + 1; i++)
> -		temp = readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
> +		(void)readl(nvidia_private.aperture+(i * PAGE_SIZE / sizeof(u32)));
>  }
>
>
>

Re: [PATCH 0/7] agp: Various minor fixes

[Helge Deller]

On 11/30/21 11:03, Thomas Zimmermann wrote:
> Ping! Any feedback on these patches?

I just reviewed those patches, and sent some feedback.
The others are:
Acked-by: Helge Deller <deller@gmx.de>

Helge

> Am 12.11.21 um 15:16 schrieb Thomas Zimmermann:
>> Fix a number of compiler warnings in the AGP drivers. No functional
>> changes.
>>
>> Thomas Zimmermann (7):
>>    agp: Remove trailing whitespaces
>>    agp: Include "compat_ioctl.h" where necessary
>>    agp: Documentation fixes
>>    agp/ati: Return error from ati_create_page_map()
>>    agp/nvidia: Ignore value returned by readl()
>>    agp/sworks: Remove unused variable 'current_size'
>>    agp/via: Remove unused variable 'current_size'
>>
>>   drivers/char/agp/ati-agp.c    | 10 ++++++++--
>>   drivers/char/agp/backend.c    |  2 ++
>>   drivers/char/agp/frontend.c   |  4 +++-
>>   drivers/char/agp/nvidia-agp.c |  6 +++---
>>   drivers/char/agp/sworks-agp.c |  5 +----
>>   drivers/char/agp/via-agp.c    |  3 ---
>>   6 files changed, 17 insertions(+), 13 deletions(-)
>>
>> --
>> 2.33.1
>>
>