[PATCH 00/11] treewide: fix some ARCH=arm clang warnings

[PATCH 00/11] treewide: fix some ARCH=arm clang warnings

[Ahmad Fatoum]

I had tried to build imx_v7_defconfig with clang and ran into some
warnings. This series fixes them. Building for arm32 is still not
possible though, because clang explicitly doesn't support mixing C and
inline assembly in naked functions. (In GCC it is undefined behavior,
but happens to usually work for us).

Ahmad Fatoum (11):
  linux/kbuild.h: sync with upstream
  ratp: fix use of %hu for printing int
  complete: remove unused variable
  i2c-mux-pca954x: remove use of uninitialized variable
  net: phy: mv88e6xxx: remove duplicate member in struct initializer
  smc911x: fix inverted poll-for-ready
  nvme: use 64 bit types for timeouts even on 32 bit systems
  usb: gadget: fsl_udc: remove always-true null pointer checks
  commands: mmc_extcsd: describe missing bit
  gui: png_lode: fix freeing of uninitialized pointer
  fs: fat: fix use of wrong enumeration type

 commands/mmc_extcsd.c               | 11 +++++++++--
 common/complete.c                   |  2 --
 common/ratp/mw.c                    |  2 +-
 drivers/i2c/muxes/i2c-mux-pca954x.c |  6 +++---
 drivers/net/phy/mv88e6xxx/chip.c    |  1 -
 drivers/net/smc911x.c               |  2 +-
 drivers/nvme/host/core.c            |  4 ++--
 drivers/usb/gadget/fsl_udc.c        |  9 +--------
 fs/fat/ff.c                         |  2 +-
 include/ata_drive.h                 |  4 ++--
 include/linux/kbuild.h              |  7 ++++---
 include/mci.h                       |  1 +
 lib/gui/png_lode.c                  | 13 +++++++------
 13 files changed, 32 insertions(+), 32 deletions(-)

-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 01/11] linux/kbuild.h: sync with upstream

[Ahmad Fatoum]

Clang doesn't like literal ASCII in the listing.
Copy over the Linux v5.2 state of the file to fix this.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 include/linux/kbuild.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/linux/kbuild.h b/include/linux/kbuild.h
index 359d4a8682a1..e7be517aaaf6 100644
--- a/include/linux/kbuild.h
+++ b/include/linux/kbuild.h
@@ -1,15 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #ifndef __LINUX_KBUILD_H
 #define __LINUX_KBUILD_H
 
 #define DEFINE(sym, val) \
-	asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+	asm volatile("\n.ascii \"->" #sym " %0 " #val "\"" : : "i" (val))
 
-#define BLANK() asm volatile("\n->" : : )
+#define BLANK() asm volatile("\n.ascii \"->\"" : : )
 
 #define OFFSET(sym, str, mem) \
 	DEFINE(sym, offsetof(struct str, mem))
 
 #define COMMENT(x) \
-	asm volatile("\n->#" x)
+	asm volatile("\n.ascii \"->#" x "\"")
 
 #endif
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 02/11] ratp: fix use of %hu for printing int

[Ahmad Fatoum]

While each of path_size and data_size is 16 bit in size, their sum may
exceed this. Also the type of the resulting expression is an int, thus
change the format specifier accordingly.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 common/ratp/mw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/ratp/mw.c b/common/ratp/mw.c
index 55e79bbaf08b..772910b39d1b 100644
--- a/common/ratp/mw.c
+++ b/common/ratp/mw.c
@@ -125,7 +125,7 @@ static int ratp_cmd_mw(const struct ratp_bb *req, int req_len,
 
 	/* Validate buffer size */
 	if (buffer_size < (path_size + data_size)) {
-		pr_err("ignored: size mismatch (%d < %hu): path or data not be fully given\n",
+		pr_err("ignored: size mismatch (%d < %u): path or data not be fully given\n",
 		       req_len, path_size + data_size);
 		ret = -EINVAL;
 		goto out;
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 03/11] complete: remove unused variable

[Ahmad Fatoum]

instr_param serves no purpose in the function. Thus remove it.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 common/complete.c   | 2 --
 include/ata_drive.h | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/complete.c b/common/complete.c
index 2dab7d1dde1e..919e5abc6a62 100644
--- a/common/complete.c
+++ b/common/complete.c
@@ -277,7 +277,6 @@ static int env_param_complete(struct string_list *sl, char *instr, int eval)
 	struct device_d *dev;
 	struct variable_d *var;
 	struct env_context *c;
-	char *instr_param;
 	int len;
 	char end = '=', *pos, *dot;
 	char *begin = "";
@@ -317,7 +316,6 @@ static int env_param_complete(struct string_list *sl, char *instr, int eval)
 
 		devname = xstrndup(instr, dot - instr);
 
-		instr_param++;
 
 		dev = get_device_by_name(devname);
 		free(devname);
diff --git a/include/ata_drive.h b/include/ata_drive.h
index 11685eef12cf..d61c6f11d4d3 100644
--- a/include/ata_drive.h
+++ b/include/ata_drive.h
@@ -14,7 +14,7 @@
  */
 
 #ifndef ATA_DISK_H
-# define ATA_DISK
+#define ATA_DISK_H
 
 #include <block.h>
 
@@ -197,4 +197,4 @@ struct device_d;
  *       0x400         data      data       16 bit area with 1 kiB in size
  */
 
-#endif /* ATA_DISK */
+#endif /* ATA_DISK_H */
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 04/11] i2c-mux-pca954x: remove use of uninitialized variable

[Ahmad Fatoum]

force isn't used except to print its uninitialized value in an error
path. Drop it.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index d397e803b1e7..bbc4870c3eca 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -177,7 +177,7 @@ static int pca954x_probe(struct device_d *dev)
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
-	int num, force;
+	int num;
 	struct pca954x *data;
 	uintptr_t tmp;
 	int ret = -ENODEV;
@@ -220,8 +220,8 @@ static int pca954x_probe(struct device_d *dev)
 		if (data->virt_adaps[num] == NULL) {
 			ret = -ENODEV;
 			dev_err(&client->dev,
-				"failed to register multiplexed adapter"
-				" %d as bus %d\n", num, force);
+				"failed to register multiplexed adapter%d\n",
+				num);
 			goto virt_reg_failed;
 		}
 	}
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 05/11] net: phy: mv88e6xxx: remove duplicate member in struct initializer

[Ahmad Fatoum]

There's already an .ops member two lines later. Remove one.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 drivers/net/phy/mv88e6xxx/chip.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/phy/mv88e6xxx/chip.c b/drivers/net/phy/mv88e6xxx/chip.c
index ac08b5ef547c..9688dbd1be43 100644
--- a/drivers/net/phy/mv88e6xxx/chip.c
+++ b/drivers/net/phy/mv88e6xxx/chip.c
@@ -572,7 +572,6 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
 		.name = "Marvell 88E6352",
 		.num_ports = 7,
 		.port_base_addr = 0x10,
-		.ops = &mv88e6352_ops,
 		.global2_addr = 0x1c,
 		.ops = &mv88e6352_ops,
 	},
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 06/11] smc911x: fix inverted poll-for-ready

[Ahmad Fatoum]

The ! operator is applied wrongly to only smc91xx_reg_read's return value,
when probably the intention was for it to apply to the whole expression.

However, wait_on_timeout keeps looping while the condition is false,
so dropping the ! is the right thing to do. Do the right thing.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 drivers/net/smc911x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 0d5dcb31ee0e..ea7cea5f1bc4 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -540,7 +540,7 @@ static int smc911x_probe(struct device_d *dev)
 	 * poll the READY bit in PMT_CTRL. Any other access to the device is
 	 * forbidden while this bit isn't set. Try for 100ms
 	 */
-	ret = wait_on_timeout(100 * MSECOND, !smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY);
+	ret = wait_on_timeout(100 * MSECOND, smc911x_reg_read(priv, PMT_CTRL) & PMT_CTRL_READY);
 	if (!ret) {
 		dev_err(dev, "Device not READY in 100ms aborting\n");
 		return -ENODEV;
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 07/11] nvme: use 64 bit types for timeouts even on 32 bit systems

[Ahmad Fatoum]

The SHUTDOWN_TIMEOUT value of 5e9 would already exceed the range of
unsigned long on a 32-bit system. Fix this by using uint64_t for
all time-holding variables.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 drivers/nvme/host/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index e0984708b4d2..d2c2b6f30630 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -94,7 +94,7 @@ EXPORT_SYMBOL_GPL(nvme_set_queue_count);
 static int nvme_wait_ready(struct nvme_ctrl *ctrl, u64 cap, bool enabled)
 {
 	uint64_t start = get_time_ns();
-	unsigned long timeout =
+	uint64_t timeout =
 		((NVME_CAP_TIMEOUT(cap) + 1) * HZ / 2);
 	u32 csts, bit = enabled ? NVME_CSTS_RDY : 0;
 	int ret;
@@ -496,7 +496,7 @@ EXPORT_SYMBOL_GPL(nvme_enable_ctrl);
 int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl)
 {
 	uint64_t start = get_time_ns();
-	unsigned long timeout = SHUTDOWN_TIMEOUT;
+	uint64_t timeout = SHUTDOWN_TIMEOUT;
 	u32 csts;
 	int ret;
 
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 08/11] usb: gadget: fsl_udc: remove always-true null pointer checks

[Ahmad Fatoum]

struct fsl_ep's name member can never be NULL because it is a character
array. Remove these superfluous null pointer checks.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 drivers/usb/gadget/fsl_udc.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/usb/gadget/fsl_udc.c b/drivers/usb/gadget/fsl_udc.c
index a47ba20f469f..a44c7abc018b 100644
--- a/drivers/usb/gadget/fsl_udc.c
+++ b/drivers/usb/gadget/fsl_udc.c
@@ -1422,8 +1422,7 @@ static void udc_reset_ep_queue(struct fsl_udc *udc, u8 pipe)
 {
 	struct fsl_ep *ep = get_ep_by_pipe(udc, pipe);
 
-	if (ep->name)
-		nuke(ep, -ESHUTDOWN);
+	nuke(ep, -ESHUTDOWN);
 }
 
 /* Clear up all ep queues */
@@ -1914,12 +1913,6 @@ static void dtd_complete_irq(struct fsl_udc *udc)
 
 		curr_ep = get_ep_by_pipe(udc, i);
 
-		/* If the ep is configured */
-		if (curr_ep->name == NULL) {
-			WARNING("Invalid EP?");
-			continue;
-		}
-
 		/* process the req queue until an uncomplete request */
 		list_for_each_entry_safe(curr_req, temp_req, &curr_ep->queue,
 				queue) {
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 09/11] commands: mmc_extcsd: describe missing bit

[Ahmad Fatoum]

The EXT_CSD_EXCEPTION_EVENTS_STATUS array entry is wrongly duplicated.
Replace the index by the correct field at byte offset 58[1].

[1]: See http://webshop.atlantiksysteme.de/temp/FLEXXONeMMC4.5pSLCSPECV1.2.pdf

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 commands/mmc_extcsd.c | 11 +++++++++--
 include/mci.h         |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/commands/mmc_extcsd.c b/commands/mmc_extcsd.c
index c27bb722ea51..ad8e9ad19f5f 100644
--- a/commands/mmc_extcsd.c
+++ b/commands/mmc_extcsd.c
@@ -222,8 +222,8 @@ static struct extcsd_reg extcsd[] = {
                 .access = ACC_R,
                 .width = 2,
         },
-        [EXT_CSD_EXCEPTION_EVENTS_STATUS] = {
-                .name = "EXT_CSD_EXCEPTION_EVENTS_STATUS",
+        [EXT_CSD_EXCEPTION_DYNCAP_NEEDED] = {
+                .name = "EXT_CSD_EXCEPTION_DYNCAP_NEEDED",
                 .access = ACC_R,
                 .width = 1,
         },
@@ -1833,6 +1833,13 @@ static int print_field(u8 *reg, int index)
 		printf("\t[4] EXTENDED_SECURITY_FAILURE: %i\n", val);
 		return 1;
 
+	case EXT_CSD_EXCEPTION_DYNCAP_NEEDED:
+		if  (get_field_val(EXT_CSD_EXCEPTION_EVENTS_STATUS, 2, 0x1)) {
+			val = get_field_val(EXT_CSD_EXCEPTION_DYNCAP_NEEDED, 0, 0x1);
+			printf("\t[0] DYNCAP_NEEDED: %i\n", val);
+		}
+                return 1;
+
 	case EXT_CSD_EXCEPTION_EVENTS_CTRL:
 		val = get_field_val(EXT_CSD_EXCEPTION_EVENTS_CTRL, 1, 0x1);
 		printf("\t[1] DYNCAP_EVENT_EN: %i\n", val);
diff --git a/include/mci.h b/include/mci.h
index 072008ef9da7..77625ea8e901 100644
--- a/include/mci.h
+++ b/include/mci.h
@@ -164,6 +164,7 @@
 #define EXT_CSD_EXT_PARTITIONS_ATTRIBUTE	52	/* R/W, 2 bytes */
 #define EXT_CSD_EXCEPTION_EVENTS_STATUS		54	/* RO, 2 bytes */
 #define EXT_CSD_EXCEPTION_EVENTS_CTRL		56	/* R/W, 2 bytes */
+#define EXT_CSD_EXCEPTION_DYNCAP_NEEDED		58	/* RO, 1 byte */
 #define EXT_CSD_CLASS_6_CTRL			59	/* R/W */
 #define EXT_CSD_INI_TIMEOUT_EMU			60	/* RO */
 #define EXT_CSD_DATA_SECTOR_SIZE		61	/* RO */
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 10/11] gui: png_lode: fix freeing of uninitialized pointer

[Ahmad Fatoum]

If either calloc or png_uncompress_init fails, free(png) will free the
uninitialized png pointer. Avoid this and while at it postpone the
img allocation till after the early exit.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 lib/gui/png_lode.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/gui/png_lode.c b/lib/gui/png_lode.c
index 477704d9768c..e30db0f853b3 100644
--- a/lib/gui/png_lode.c
+++ b/lib/gui/png_lode.c
@@ -46,15 +46,16 @@ struct image *png_open(char *inbuf, int insize)
 	LodePNGState state;
 	int ret;
 	unsigned error;
-	struct image *img = calloc(1, sizeof(struct image));
-	unsigned char *png;
-
-	if (!img)
-		return ERR_PTR(-ENOMEM);
+	struct image *img;
+	unsigned char *png = NULL;
 
 	ret = png_uncompress_init();
 	if (ret)
-		goto err;
+		return ERR_PTR(ret);
+
+	img = calloc(1, sizeof(struct image));
+	if (!img)
+		return ERR_PTR(-ENOMEM);
 
 	lodepng_state_init(&state);
 
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 11/11] fs: fat: fix use of wrong enumeration type

[Ahmad Fatoum]

disk_read returns a DRESULT, not enum filetype. Change the return value
appropriately.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 fs/fat/ff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/fat/ff.c b/fs/fat/ff.c
index ba4adfc13389..4d30433e5f03 100644
--- a/fs/fat/ff.c
+++ b/fs/fat/ff.c
@@ -1538,7 +1538,7 @@ static enum filetype check_fs (	/* 0:The FAT BR, 1:Valid BR but not an FAT, 2:No
 	DWORD *bootsec
 )
 {
-	enum filetype ret;
+	DRESULT ret;
 
 	/* Load boot record */
 	ret = disk_read(fs, fs->win, sect, 1);
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 03/11] complete: remove unused variable

[Michael Olbrich]

On Thu, Aug 22, 2019 at 07:51:06AM +0200, Ahmad Fatoum wrote:
> instr_param serves no purpose in the function. Thus remove it.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
>  common/complete.c   | 2 --
>  include/ata_drive.h | 4 ++--
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/common/complete.c b/common/complete.c
> index 2dab7d1dde1e..919e5abc6a62 100644
> --- a/common/complete.c
> +++ b/common/complete.c
> @@ -277,7 +277,6 @@ static int env_param_complete(struct string_list *sl, char *instr, int eval)
>  	struct device_d *dev;
>  	struct variable_d *var;
>  	struct env_context *c;
> -	char *instr_param;
>  	int len;
>  	char end = '=', *pos, *dot;
>  	char *begin = "";
> @@ -317,7 +316,6 @@ static int env_param_complete(struct string_list *sl, char *instr, int eval)
>  
>  		devname = xstrndup(instr, dot - instr);
>  
> -		instr_param++;
>  
>  		dev = get_device_by_name(devname);
>  		free(devname);
> diff --git a/include/ata_drive.h b/include/ata_drive.h
> index 11685eef12cf..d61c6f11d4d3 100644
> --- a/include/ata_drive.h
> +++ b/include/ata_drive.h
> @@ -14,7 +14,7 @@
>   */
>  
>  #ifndef ATA_DISK_H
> -# define ATA_DISK
> +#define ATA_DISK_H

Unrelated change?

Michael

>  
>  #include <block.h>
>  
> @@ -197,4 +197,4 @@ struct device_d;
>   *       0x400         data      data       16 bit area with 1 kiB in size
>   */
>  
> -#endif /* ATA_DISK */
> +#endif /* ATA_DISK_H */
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 03/11] complete: remove unused variable

[Ahmad Fatoum]

On 8/22/19 8:08 AM, Michael Olbrich wrote:
> On Thu, Aug 22, 2019 at 07:51:06AM +0200, Ahmad Fatoum wrote:
>> instr_param serves no purpose in the function. Thus remove it.
>>
>> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
>> ---
>>  common/complete.c   | 2 --
>>  include/ata_drive.h | 4 ++--
>>  2 files changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/common/complete.c b/common/complete.c
>> index 2dab7d1dde1e..919e5abc6a62 100644
>> --- a/common/complete.c
>> +++ b/common/complete.c
>> @@ -277,7 +277,6 @@ static int env_param_complete(struct string_list *sl, char *instr, int eval)
>>  	struct device_d *dev;
>>  	struct variable_d *var;
>>  	struct env_context *c;
>> -	char *instr_param;
>>  	int len;
>>  	char end = '=', *pos, *dot;
>>  	char *begin = "";
>> @@ -317,7 +316,6 @@ static int env_param_complete(struct string_list *sl, char *instr, int eval)
>>  
>>  		devname = xstrndup(instr, dot - instr);
>>  
>> -		instr_param++;
>>  
>>  		dev = get_device_by_name(devname);
>>  		free(devname);
>> diff --git a/include/ata_drive.h b/include/ata_drive.h
>> index 11685eef12cf..d61c6f11d4d3 100644
>> --- a/include/ata_drive.h
>> +++ b/include/ata_drive.h
>> @@ -14,7 +14,7 @@
>>   */
>>  
>>  #ifndef ATA_DISK_H
>> -# define ATA_DISK
>> +#define ATA_DISK_H
> 
> Unrelated change?

Ye, thanks for spotting.
I will send a fixup.

> 
> Michael
> 
>>  
>>  #include <block.h>
>>  
>> @@ -197,4 +197,4 @@ struct device_d;
>>   *       0x400         data      data       16 bit area with 1 kiB in size
>>   */
>>  
>> -#endif /* ATA_DISK */
>> +#endif /* ATA_DISK_H */
>> -- 
>> 2.20.1
>>
>>
>> _______________________________________________
>> barebox mailing list
>> barebox@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/barebox
>>
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/2] fixup! complete: remove unused variable

[Ahmad Fatoum]

Split this unrelated changes into a seperate commit.

---
 include/ata_drive.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/ata_drive.h b/include/ata_drive.h
index d61c6f11d4d3..11685eef12cf 100644
--- a/include/ata_drive.h
+++ b/include/ata_drive.h
@@ -14,7 +14,7 @@
  */
 
 #ifndef ATA_DISK_H
-#define ATA_DISK_H
+# define ATA_DISK
 
 #include <block.h>
 
@@ -197,4 +197,4 @@ struct device_d;
  *       0x400         data      data       16 bit area with 1 kiB in size
  */
 
-#endif /* ATA_DISK_H */
+#endif /* ATA_DISK */
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/2] ata: fix mismatched header guards

[Ahmad Fatoum]

The header checks for ATA_DISK_H, but defines a different ATA_DISK,
which would lead to compilation errors when included multiple times.
Fix this.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 include/ata_drive.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/ata_drive.h b/include/ata_drive.h
index 11685eef12cf..d61c6f11d4d3 100644
--- a/include/ata_drive.h
+++ b/include/ata_drive.h
@@ -14,7 +14,7 @@
  */
 
 #ifndef ATA_DISK_H
-# define ATA_DISK
+#define ATA_DISK_H
 
 #include <block.h>
 
@@ -197,4 +197,4 @@ struct device_d;
  *       0x400         data      data       16 bit area with 1 kiB in size
  */
 
-#endif /* ATA_DISK */
+#endif /* ATA_DISK_H */
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH] ARM: don't use -no-thumb-interwork if unavailable

[Ahmad Fatoum]

Clang doesn't support the option and even on GCC it's ignored whenver
-mabi=aapcs-linux is specified[1]:

  -mthumb-interwork

	[..]. In AAPCS configurations this option is meaningless.

We can't get rid of the option
altogether because that breaks old GCC builds[2], but for now we can
make -mno-thumb-interwork optional, which is what this patch does.

[1]: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
[2]: https://patchwork.kernel.org/patch/10306823/

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
missed this one the first time, but here it is
---
 arch/arm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5cb46f661335..ef85f9d72823 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -52,7 +52,7 @@ ifeq ($(CONFIG_CPU_V8), y)
 CFLAGS_ABI	:=-mabi=lp64
 else
 ifeq ($(CONFIG_AEABI),y)
-CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork
+CFLAGS_ABI	:=-mabi=aapcs-linux $(call cc-option,-mno-thumb-interwork)
 else
 CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
 endif
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 00/11] treewide: fix some ARCH=arm clang warnings

[Sascha Hauer]

On Thu, Aug 22, 2019 at 07:51:03AM +0200, Ahmad Fatoum wrote:
> I had tried to build imx_v7_defconfig with clang and ran into some
> warnings. This series fixes them. Building for arm32 is still not
> possible though, because clang explicitly doesn't support mixing C and
> inline assembly in naked functions. (In GCC it is undefined behavior,
> but happens to usually work for us).
> 
> Ahmad Fatoum (11):
>   linux/kbuild.h: sync with upstream
>   ratp: fix use of %hu for printing int
>   complete: remove unused variable
>   i2c-mux-pca954x: remove use of uninitialized variable
>   net: phy: mv88e6xxx: remove duplicate member in struct initializer
>   smc911x: fix inverted poll-for-ready
>   nvme: use 64 bit types for timeouts even on 32 bit systems
>   usb: gadget: fsl_udc: remove always-true null pointer checks
>   commands: mmc_extcsd: describe missing bit
>   gui: png_lode: fix freeing of uninitialized pointer
>   fs: fat: fix use of wrong enumeration type

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 01/11] linux/kbuild.h: sync with upstream

[Sascha Hauer]

On Thu, Aug 22, 2019 at 07:51:04AM +0200, Ahmad Fatoum wrote:
> Clang doesn't like literal ASCII in the listing.
> Copy over the Linux v5.2 state of the file to fix this.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
>  include/linux/kbuild.h | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

This patch breaks building arm64 and mips defconfigs. For example
bcm47xx_defconfig with:

arch/mips/lib/genex.S: Assembler messages:
arch/mips/lib/genex.S:14: Error: operand 2 must be constant `subu $27,PT_SIZE'
arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
...

zynqmp_defconfig with:

arch/arm/cpu/smccc-call_64.S: Assembler messages:
arch/arm/cpu/smccc-call_64.S:41: Error: undefined symbol ARM_SMCCC_RES_X0_OFFS used as an immediate value
arch/arm/cpu/smccc-call_64.S:41: Error: undefined symbol ARM_SMCCC_RES_X2_OFFS used as an immediate value
arch/arm/cpu/smccc-call_64.S:41: Error: undefined symbol ARM_SMCCC_QUIRK_ID_OFFS used as an immediate value
arch/arm/cpu/smccc-call_64.S:41: Error: undefined symbol ARM_SMCCC_QUIRK_STATE_OFFS used as an immediate value
arch/arm/cpu/smccc-call_64.S:51: Error: undefined symbol ARM_SMCCC_RES_X0_OFFS used as an immediate value
arch/arm/cpu/smccc-call_64.S:51: Error: undefined symbol ARM_SMCCC_RES_X2_OFFS used as an immediate value
arch/arm/cpu/smccc-call_64.S:51: Error: undefined symbol ARM_SMCCC_QUIRK_ID_OFFS used as an immediate value
arch/arm/cpu/smccc-call_64.S:51: Error: undefined symbol ARM_SMCCC_QUIRK_STATE_OFFS used as an immediate value

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 01/11] linux/kbuild.h: sync with upstream

[Ahmad Fatoum]

Hello Sascha,

On 8/26/19 12:35 PM, Sascha Hauer wrote:
> On Thu, Aug 22, 2019 at 07:51:04AM +0200, Ahmad Fatoum wrote:
>> Clang doesn't like literal ASCII in the listing.
>> Copy over the Linux v5.2 state of the file to fix this.
>>
>> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
>> ---
>>  include/linux/kbuild.h | 7 ++++---
>>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> This patch breaks building arm64 and mips defconfigs. For example
> bcm47xx_defconfig with:
> 
> arch/mips/lib/genex.S: Assembler messages:
> arch/mips/lib/genex.S:14: Error: operand 2 must be constant `subu $27,PT_SIZE'
> arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
> arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
> arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
> arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
> arch/mips/lib/genex.S:14: Error: macro used $at after ".set noat"
> ...
> 
> zynqmp_defconfig with:
> 
> arch/arm/cpu/smccc-call_64.S: Assembler messages:
> arch/arm/cpu/smccc-call_64.S:41: Error: undefined symbol ARM_SMCCC_RES_X0_OFFS used as an immediate value
> arch/arm/cpu/smccc-call_64.S:41: Error: undefined symbol ARM_SMCCC_RES_X2_OFFS used as an immediate value
> arch/arm/cpu/smccc-call_64.S:41: Error: undefined symbol ARM_SMCCC_QUIRK_ID_OFFS used as an immediate value
> arch/arm/cpu/smccc-call_64.S:41: Error: undefined symbol ARM_SMCCC_QUIRK_STATE_OFFS used as an immediate value
> arch/arm/cpu/smccc-call_64.S:51: Error: undefined symbol ARM_SMCCC_RES_X0_OFFS used as an immediate value
> arch/arm/cpu/smccc-call_64.S:51: Error: undefined symbol ARM_SMCCC_RES_X2_OFFS used as an immediate value
> arch/arm/cpu/smccc-call_64.S:51: Error: undefined symbol ARM_SMCCC_QUIRK_ID_OFFS used as an immediate value
> arch/arm/cpu/smccc-call_64.S:51: Error: undefined symbol ARM_SMCCC_QUIRK_STATE_OFFS used as an immediate value

Hmm, I wonder what upstream is doing differently..
When I retry to build barebox with clang, I will look more
into this.

Cheers
Ahmad 

> 
> Sascha
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox