Last lot of target-arm changes to squeeze in before rc1:

* various minor Arm bug fixes

* David Carlier's Haiku build portability fixes

* Wentong Wu's fixes for icount handling in the nios2 target

The following changes since commit 00ce6c36b35e0eb8cc5d68a28f288a6335848813:

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-13' into staging (2020-07-13 13:01:30 +0100)

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20200713

for you to fetch changes up to 756f739b1682bf131994ec96dad7fbdf8b54493a:

hw/arm/aspeed: Do not create and attach empty SD cards by default (2020-07-13 14:36:12 +0100)

* hw/arm/bcm2836: Remove unused 'cpu_type' field

* target/arm: Fix mtedesc for do_mem_zpz

* Add the ability to change the FEC PHY MDIO device number on i.MX25/i.MX6/i.MX7

* target/arm: Don't do raw writes for PMINTENCLR

* virtio-iommu: Fix coverity issue in virtio_iommu_handle_command()

* build: Fix various issues with building on Haiku

* target/nios2: fix wrctl behaviour when using icount

* hw/arm/tosa: Encapsulate misc GPIO handling in a device

* hw/arm/palm.c: Encapsulate misc GPIO handling in a device

* hw/arm/aspeed: Do not create and attach empty SD cards by default

Aaron Lindsay (1):

target/arm: Don't do raw writes for PMINTENCLR

David CARLIER (8):

build: Enable BSD symbols for Haiku

util/qemu-openpty.c: Don't assume pty.h is glibc-only

build: Check that mlockall() exists

osdep.h: Always include <sys/signal.h> if it exists

osdep.h: For Haiku, define SIGIO as equivalent to SIGPOLL

bswap.h: Include <endian.h> on Haiku for bswap operations

util/compatfd.c: Only include <sys/syscall.h> if CONFIG_SIGNALFD

util/oslib-posix.c: Implement qemu_init_exec_dir() for Haiku

Eric Auger (1):

virtio-iommu: Fix coverity issue in virtio_iommu_handle_command()

Gerd Hoffmann (1):

util/drm: make portable by avoiding struct dirent d_type

Jean-Christophe Dubois (3):

Add the ability to change the FEC PHY MDIO device number on i.MX25 processor

Add the ability to change the FEC PHY MDIO device number on i.MX6 processor

Add the ability to change the FEC PHY MDIO devices numbers on i.MX7 processor

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

The 'cpu_type' has been moved from BCM283XState to BCM283XClass

in commit 210f47840d, but we forgot to remove the old variable.

Do it now.

Fixes: 210f47840d ("hw/arm/bcm2836: Hardcode correct CPU type")

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Message-id: 20200703200459.23294-1-f4bug@amsat.org

include/hw/arm/bcm2836.h | 1 -

1 file changed, 1 deletion(-)

diff --git a/include/hw/arm/bcm2836.h b/include/hw/arm/bcm2836.h

--- a/include/hw/arm/bcm2836.h

+++ b/include/hw/arm/bcm2836.h

@@ -XXX,XX +XXX,XX @@ typedef struct BCM283XState {

DeviceState parent_obj;

/*< public >*/

- char *cpu_type;

uint32_t enabled_cpus;

struct {

2.20.1

The mtedesc that was constructed was not actually passed in.

Found by Coverity (CID 1429996).

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Message-id: 20200706202345.193676-1-richard.henderson@linaro.org

target/arm/translate-sve.c | 2 +-

diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c

--- a/target/arm/translate-sve.c

+++ b/target/arm/translate-sve.c

@@ -XXX,XX +XXX,XX @@ static void do_mem_zpz(DisasContext *s, int zt, int pg, int zm,

desc = FIELD_DP32(desc, MTEDESC, ESIZE, 1 << msz);

desc <<= SVE_MTEDESC_SHIFT;

}

- desc = simd_desc(vsz, vsz, scale);

+ desc = simd_desc(vsz, vsz, desc | scale);

t_desc = tcg_const_i32(desc);

tcg_gen_addi_ptr(t_pg, cpu_env, pred_full_reg_offset(s, pg));

2.20.1

From: Jean-Christophe Dubois <jcd@tribudubois.net>

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

Message-id: c850187322be9930e47c8b234c385a7d0da245cb.1593806826.git.jcd@tribudubois.net

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

[PMM: updated for object_property_set_uint() argument reordering]

include/hw/arm/fsl-imx7.h | 1 +

hw/arm/fsl-imx7.c | 9 +++++++++

2 files changed, 10 insertions(+)

diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h

--- a/include/hw/arm/fsl-imx7.h

+++ b/include/hw/arm/fsl-imx7.h

@@ -XXX,XX +XXX,XX @@ typedef struct FslIMX7State {

IMX7GPRState gpr;

ChipideaState usb[FSL_IMX7_NUM_USBS];

DesignwarePCIEHost pcie;

+ uint32_t phy_num[FSL_IMX7_NUM_ETHS];

} FslIMX7State;

enum FslIMX7MemoryMap {

diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/fsl-imx7.c

+++ b/hw/arm/fsl-imx7.c

@@ -XXX,XX +XXX,XX @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)

FSL_IMX7_ENET2_ADDR,

};

+ object_property_set_uint(OBJECT(&s->eth[i]), "phy-num",

+ s->phy_num[i], &error_abort);

object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num",

FSL_IMX7_ETH_NUM_TX_RINGS, &error_abort);

qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]);

@@ -XXX,XX +XXX,XX @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)

FSL_IMX7_PCIE_PHY_SIZE);

+static Property fsl_imx7_properties[] = {

+ DEFINE_PROP_UINT32("fec1-phy-num", FslIMX7State, phy_num[0], 0),

+ DEFINE_PROP_UINT32("fec2-phy-num", FslIMX7State, phy_num[1], 1),

+ DEFINE_PROP_END_OF_LIST(),

+};

static void fsl_imx7_class_init(ObjectClass *oc, void *data)

{

DeviceClass *dc = DEVICE_CLASS(oc);

+ device_class_set_props(dc, fsl_imx7_properties);

dc->realize = fsl_imx7_realize;

/* Reason: Uses serial_hds and nd_table in realize() directly */

2.20.1

From: Aaron Lindsay <aaron@os.amperecomputing.com>

Raw writes to this register when in KVM mode can cause interrupts to be

raised (even when the PMU is disabled). Because the underlying state is

already aliased to PMINTENSET (which already provides raw write

functions), we can safely disable raw accesses to PMINTENCLR entirely.

Signed-off-by: Aaron Lindsay <aaron@os.amperecomputing.com>

Message-id: 20200707152616.1917154-1-aaron@os.amperecomputing.com

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

target/arm/helper.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo v7_cp_reginfo[] = {

.resetvalue = 0x0 },

{ .name = "PMINTENCLR", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 2,

.access = PL1_RW, .accessfn = access_tpm,

- .type = ARM_CP_ALIAS | ARM_CP_IO,

+ .type = ARM_CP_ALIAS | ARM_CP_IO | ARM_CP_NO_RAW,

.fieldoffset = offsetof(CPUARMState, cp15.c9_pminten),

.writefn = pmintenclr_write, },

{ .name = "PMINTENCLR_EL1", .state = ARM_CP_STATE_AA64,

.opc0 = 3, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 2,

.access = PL1_RW, .accessfn = access_tpm,

- .type = ARM_CP_ALIAS | ARM_CP_IO,

+ .type = ARM_CP_ALIAS | ARM_CP_IO | ARM_CP_NO_RAW,

.fieldoffset = offsetof(CPUARMState, cp15.c9_pminten),

.writefn = pmintenclr_write },

{ .name = "CCSIDR", .state = ARM_CP_STATE_BOTH,

2.20.1

From: David CARLIER <devnexen@gmail.com>

Tell Haiku to provide various BSD functions by setting BSD_SOURCE

and linking libbsd.

Signed-off-by: David Carlier <devnexen@gmail.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Message-id: 20200703145614.16684-2-peter.maydell@linaro.org

[PMM: expanded commit message]

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

configure | 4 ++--

diff --git a/configure b/configure

index XXXXXXX..XXXXXXX 100755

--- a/configure

+++ b/configure

@@ -XXX,XX +XXX,XX @@ SunOS)

;;

Haiku)

haiku="yes"

- QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS"

- LIBS="-lposix_error_mapper -lnetwork $LIBS"

+ QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -DBSD_SOURCE $QEMU_CFLAGS"

+ LIBS="-lposix_error_mapper -lnetwork -lbsd $LIBS"

;;

Linux)

audio_drv_list="try-pa oss"

2.20.1

From: David CARLIER <devnexen@gmail.com>

util/compatfd.c includes <sys/syscall.h> so that the CONFIG_SIGNALFD

code can use SYS_signalfd. Guard the #include with CONFIG_SIGNALFD

to avoid portability issues on hosts like Haiku which do not

provide that header file.

Signed-off-by: David Carlier <devnexen@gmail.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Message-id: 20200703145614.16684-8-peter.maydell@linaro.org

[PMM: Expanded commit message]

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

util/compatfd.c | 2 ++

diff --git a/util/compatfd.c b/util/compatfd.c

--- a/util/compatfd.c

+++ b/util/compatfd.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "qemu/thread.h"

+#if defined(CONFIG_SIGNALFD)

#include <sys/syscall.h>

+#endif

struct sigfd_compat_info

{

2.20.1

From: David CARLIER <devnexen@gmail.com>

The qemu_init_exec_dir() function is inherently non-portable;

provide an implementation for Haiku hosts.

Signed-off-by: David Carlier <devnexen@gmail.com>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Message-id: 20200703145614.16684-9-peter.maydell@linaro.org

[PMM: Expanded commit message]

util/oslib-posix.c | 19 +++++++++++++++++++

1 file changed, 19 insertions(+)

diff --git a/util/oslib-posix.c b/util/oslib-posix.c

--- a/util/oslib-posix.c

+++ b/util/oslib-posix.c

@@ -XXX,XX +XXX,XX @@

#include <mach-o/dyld.h>

#endif

+#ifdef __HAIKU__

+#include <kernel/image.h>

+#endif

+

#include "qemu/mmap-alloc.h"

#ifdef CONFIG_DEBUG_STACK_USAGE

@@ -XXX,XX +XXX,XX @@ void qemu_init_exec_dir(const char *argv0)

}

+#elif defined(__HAIKU__)

+ {

+ image_info ii;

+ int32_t c = 0;

+

+ *buf = '\0';

+ while (get_next_image_info(0, &c, &ii) == B_OK) {

+ if (ii.type == B_APP_IMAGE) {

+ strncpy(buf, ii.name, sizeof(buf));

+ buf[sizeof(buf) - 1] = 0;

+ p = buf;

+ }

+ }

#endif

/* If we don't have any way of figuring out the actual executable

location then try argv[0]. */

2.20.1

From: Gerd Hoffmann <kraxel@redhat.com>

Given this isn't perforance critical at all lets avoid the non-portable

d_type and use fstat instead to check whenever the file is a chardev.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reported-by: David Carlier <devnexen@gmail.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Message-id: 20200703145614.16684-10-peter.maydell@linaro.org

Message-id: 20200701180302.14821-1-kraxel@redhat.com

[PMM: fixed comment style; tweaked subject line]

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

util/drm.c | 19 ++++++++++++++-----

1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/util/drm.c b/util/drm.c

--- a/util/drm.c

+++ b/util/drm.c

@@ -XXX,XX +XXX,XX @@ int qemu_drm_rendernode_open(const char *rendernode)

DIR *dir;

struct dirent *e;

- int r, fd;

+ struct stat st;

+ int r, fd, ret;

char *p;

if (rendernode) {

@@ -XXX,XX +XXX,XX @@ int qemu_drm_rendernode_open(const char *rendernode)

fd = -1;

while ((e = readdir(dir))) {

- if (e->d_type != DT_CHR) {

- continue;