From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445323; cv=none; d=zohomail.com; s=zohoarc; b=HtR7kNyKHF4D0YijFDXuUWC1/2sSp8rHWa9luvn68qrBnzCSDnZaVOi1QuWyGY7Nfv2qhu2mQgz/nvEGZpcZNJYbdgzOmoiMUD75pyr9rSi9CboFHlfpTpGOwq6D0Gbtht5G1T/U8JT/3EWALbrk+IjJRyOznJJfIUjaw+ygD2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445323; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UwW4Of4L0vp9KCPhla6GcS2im8yFuLCul7ILXLuzBRg=; b=RByohD5flY2Jch16JXea1NaX+CnSRJHYMi5dvitvLilSfo9eGTROJJY+l5OJdGSwY/6vTwCoC7pVh8wwFKIiS3G9Gqz7XD+B0Q82LKJCFSo0Wcx41g7T8tiE95ceuyy2rT3t6JTcUJn8nivo+dMpMUo7H8ycBokgqxXEeTvp2Lc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445323214812.3152117692595; Tue, 17 Mar 2020 04:42:03 -0700 (PDT) Received: from localhost ([::1]:59158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAbh-0002ZI-VG for importer@patchew.org; Tue, 17 Mar 2020 07:42:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43452) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAaV-0000N1-3Z for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAaT-0001yb-7m for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:47 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42739) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAaS-0001nB-Uc for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:45 -0400 Received: by mail-wr1-x442.google.com with SMTP id v11so25232679wrm.9 for ; Tue, 17 Mar 2020 04:40:44 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UwW4Of4L0vp9KCPhla6GcS2im8yFuLCul7ILXLuzBRg=; b=Lwrrr0ZGoxOdmfQbYG/ei6zgi9vn0a7rD+TH2wyduWwR14P+YOFNmPHTBj1RQx/hsC 9nTiIpl4MS75hJVLBK2r1gyNuWR59sVKOXeffh/eQJjb7rY6V0wy47v5zdq9X81xeaMe mbhMUjrkIfNpxG2/1o5zeQidoJVljVnBun52bkHlXXowfvfZdVSCX54TuJfz1n7/9nJL Nh+YaQTgurErAdgfNT29m4Jto8Kasf1Cg7y+OucC8hQt/xH9Dun1+WQ8Zi6xEiMNofLl grnuijEwtIwuE1LyC7iNyH+PI+aPVnoODZ0gxCjgf5iWXqfiqqgqaZE6zcadmzWt1NBp /OXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UwW4Of4L0vp9KCPhla6GcS2im8yFuLCul7ILXLuzBRg=; b=MFaOT0mI7o2vJ3A3JuKBBq9cxtc6RN5cQBbYfaabzDxXMrBa9YfNc1iFb8tThKde7G SDFJDZ4FeACiH2kdLQND22hLoH7soawyQj8lxo0UddAJ71rs+ovFcABKmjbTCwm1cWg9 dHq8P9UbaX+zRF86yiztcp5sYPh0N03JHMsQwignDiu7/KAIe/47zItflPzvWSohY9BF 3ImsgIHJr9poRzOB6A0vBl+WuB/g/ysGBImoEcJCRvrtlUXvoA8QJ4DUwAyLByUaR18L /HM6KIilu+KwTKouOAHIXrKxL/Uap+GR8bTJ5Zama3I4PCyWvFfBGUmsOeOxKkHxWk85 /jQg== X-Gm-Message-State: ANhLgQ33DxYtqyFLRaKANmoqE3OapeilXAzNUaE6/Ces81zUhnFtHoBB uidngNcmh6KdbPUAM7peEmS4bktm7i8X/g== X-Google-Smtp-Source: ADFU+vs8oUceyNrVpx703z3WSwBN4zha/nhanJLKnjJDrGAybvKVOXwFJi3ZDn5EfPKreaAwllI3qA== X-Received: by 2002:a5d:6aca:: with SMTP id u10mr5290428wrw.99.1584445243427; Tue, 17 Mar 2020 04:40:43 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/11] hw/usb: Add basic i.MX USB Phy support Date: Tue, 17 Mar 2020 11:40:29 +0000 Message-Id: <20200317114039.26914-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Guenter Roeck Add basic USB PHY support as implemented in i.MX23, i.MX28, i.MX6, and i.MX7 SoCs. The only support really needed - at least to boot Linux - is support for soft reset, which needs to reset various registers to their initial value. Otherwise, just record register values. Reviewed-by: Peter Maydell Signed-off-by: Guenter Roeck Message-id: 20200313014551.12554-2-linux@roeck-us.net Signed-off-by: Peter Maydell --- hw/usb/Makefile.objs | 2 + include/hw/usb/imx-usb-phy.h | 53 +++++++++ hw/usb/imx-usb-phy.c | 225 +++++++++++++++++++++++++++++++++++ MAINTAINERS | 2 + hw/arm/Kconfig | 1 + hw/usb/Kconfig | 5 + 6 files changed, 288 insertions(+) create mode 100644 include/hw/usb/imx-usb-phy.h create mode 100644 hw/usb/imx-usb-phy.c diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 2b108689370..66835e5bf73 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -61,3 +61,5 @@ common-obj-$(CONFIG_XEN) +=3D xen-usb.o xen-usb.o-cflags :=3D $(LIBUSB_CFLAGS) xen-usb.o-libs :=3D $(LIBUSB_LIBS) endif + +common-obj-$(CONFIG_IMX_USBPHY) +=3D imx-usb-phy.o diff --git a/include/hw/usb/imx-usb-phy.h b/include/hw/usb/imx-usb-phy.h new file mode 100644 index 00000000000..07f0235d101 --- /dev/null +++ b/include/hw/usb/imx-usb-phy.h @@ -0,0 +1,53 @@ +#ifndef IMX_USB_PHY_H +#define IMX_USB_PHY_H + +#include "hw/sysbus.h" +#include "qemu/bitops.h" + +enum IMXUsbPhyRegisters { + USBPHY_PWD, + USBPHY_PWD_SET, + USBPHY_PWD_CLR, + USBPHY_PWD_TOG, + USBPHY_TX, + USBPHY_TX_SET, + USBPHY_TX_CLR, + USBPHY_TX_TOG, + USBPHY_RX, + USBPHY_RX_SET, + USBPHY_RX_CLR, + USBPHY_RX_TOG, + USBPHY_CTRL, + USBPHY_CTRL_SET, + USBPHY_CTRL_CLR, + USBPHY_CTRL_TOG, + USBPHY_STATUS, + USBPHY_DEBUG =3D 0x14, + USBPHY_DEBUG_SET, + USBPHY_DEBUG_CLR, + USBPHY_DEBUG_TOG, + USBPHY_DEBUG0_STATUS, + USBPHY_DEBUG1 =3D 0x1c, + USBPHY_DEBUG1_SET, + USBPHY_DEBUG1_CLR, + USBPHY_DEBUG1_TOG, + USBPHY_VERSION, + USBPHY_MAX +}; + +#define USBPHY_CTRL_SFTRST BIT(31) + +#define TYPE_IMX_USBPHY "imx.usbphy" +#define IMX_USBPHY(obj) OBJECT_CHECK(IMXUSBPHYState, (obj), TYPE_IMX_USBPH= Y) + +typedef struct IMXUSBPHYState { + /* */ + SysBusDevice parent_obj; + + /* */ + MemoryRegion iomem; + + uint32_t usbphy[USBPHY_MAX]; +} IMXUSBPHYState; + +#endif /* IMX_USB_PHY_H */ diff --git a/hw/usb/imx-usb-phy.c b/hw/usb/imx-usb-phy.c new file mode 100644 index 00000000000..e705a03a1fc --- /dev/null +++ b/hw/usb/imx-usb-phy.c @@ -0,0 +1,225 @@ +/* + * i.MX USB PHY + * + * Copyright (c) 2020 Guenter Roeck + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + * We need to implement basic reset control in the PHY control register. + * For everything else, it is sufficient to set whatever is written. + */ + +#include "qemu/osdep.h" +#include "hw/usb/imx-usb-phy.h" +#include "migration/vmstate.h" +#include "qemu/log.h" +#include "qemu/module.h" + +static const VMStateDescription vmstate_imx_usbphy =3D { + .name =3D TYPE_IMX_USBPHY, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(usbphy, IMXUSBPHYState, USBPHY_MAX), + VMSTATE_END_OF_LIST() + }, +}; + +static void imx_usbphy_softreset(IMXUSBPHYState *s) +{ + s->usbphy[USBPHY_PWD] =3D 0x001e1c00; + s->usbphy[USBPHY_TX] =3D 0x10060607; + s->usbphy[USBPHY_RX] =3D 0x00000000; + s->usbphy[USBPHY_CTRL] =3D 0xc0200000; +} + +static void imx_usbphy_reset(DeviceState *dev) +{ + IMXUSBPHYState *s =3D IMX_USBPHY(dev); + + s->usbphy[USBPHY_STATUS] =3D 0x00000000; + s->usbphy[USBPHY_DEBUG] =3D 0x7f180000; + s->usbphy[USBPHY_DEBUG0_STATUS] =3D 0x00000000; + s->usbphy[USBPHY_DEBUG1] =3D 0x00001000; + s->usbphy[USBPHY_VERSION] =3D 0x04020000; + + imx_usbphy_softreset(s); +} + +static uint64_t imx_usbphy_read(void *opaque, hwaddr offset, unsigned size) +{ + IMXUSBPHYState *s =3D (IMXUSBPHYState *)opaque; + uint32_t index =3D offset >> 2; + uint32_t value; + + switch (index) { + case USBPHY_PWD_SET: + case USBPHY_TX_SET: + case USBPHY_RX_SET: + case USBPHY_CTRL_SET: + case USBPHY_DEBUG_SET: + case USBPHY_DEBUG1_SET: + /* + * All REG_NAME_SET register access are in fact targeting the + * REG_NAME register. + */ + value =3D s->usbphy[index - 1]; + break; + case USBPHY_PWD_CLR: + case USBPHY_TX_CLR: + case USBPHY_RX_CLR: + case USBPHY_CTRL_CLR: + case USBPHY_DEBUG_CLR: + case USBPHY_DEBUG1_CLR: + /* + * All REG_NAME_CLR register access are in fact targeting the + * REG_NAME register. + */ + value =3D s->usbphy[index - 2]; + break; + case USBPHY_PWD_TOG: + case USBPHY_TX_TOG: + case USBPHY_RX_TOG: + case USBPHY_CTRL_TOG: + case USBPHY_DEBUG_TOG: + case USBPHY_DEBUG1_TOG: + /* + * All REG_NAME_TOG register access are in fact targeting the + * REG_NAME register. + */ + value =3D s->usbphy[index - 3]; + break; + default: + value =3D s->usbphy[index]; + break; + } + return (uint64_t)value; +} + +static void imx_usbphy_write(void *opaque, hwaddr offset, uint64_t value, + unsigned size) +{ + IMXUSBPHYState *s =3D (IMXUSBPHYState *)opaque; + uint32_t index =3D offset >> 2; + + switch (index) { + case USBPHY_CTRL: + s->usbphy[index] =3D value; + if (value & USBPHY_CTRL_SFTRST) { + imx_usbphy_softreset(s); + } + break; + case USBPHY_PWD: + case USBPHY_TX: + case USBPHY_RX: + case USBPHY_STATUS: + case USBPHY_DEBUG: + case USBPHY_DEBUG1: + s->usbphy[index] =3D value; + break; + case USBPHY_CTRL_SET: + s->usbphy[index - 1] |=3D value; + if (value & USBPHY_CTRL_SFTRST) { + imx_usbphy_softreset(s); + } + break; + case USBPHY_PWD_SET: + case USBPHY_TX_SET: + case USBPHY_RX_SET: + case USBPHY_DEBUG_SET: + case USBPHY_DEBUG1_SET: + /* + * All REG_NAME_SET register access are in fact targeting the + * REG_NAME register. So we change the value of the REG_NAME + * register, setting bits passed in the value. + */ + s->usbphy[index - 1] |=3D value; + break; + case USBPHY_PWD_CLR: + case USBPHY_TX_CLR: + case USBPHY_RX_CLR: + case USBPHY_CTRL_CLR: + case USBPHY_DEBUG_CLR: + case USBPHY_DEBUG1_CLR: + /* + * All REG_NAME_CLR register access are in fact targeting the + * REG_NAME register. So we change the value of the REG_NAME + * register, unsetting bits passed in the value. + */ + s->usbphy[index - 2] &=3D ~value; + break; + case USBPHY_CTRL_TOG: + s->usbphy[index - 3] ^=3D value; + if ((value & USBPHY_CTRL_SFTRST) && + (s->usbphy[index - 3] & USBPHY_CTRL_SFTRST)) { + imx_usbphy_softreset(s); + } + break; + case USBPHY_PWD_TOG: + case USBPHY_TX_TOG: + case USBPHY_RX_TOG: + case USBPHY_DEBUG_TOG: + case USBPHY_DEBUG1_TOG: + /* + * All REG_NAME_TOG register access are in fact targeting the + * REG_NAME register. So we change the value of the REG_NAME + * register, toggling bits passed in the value. + */ + s->usbphy[index - 3] ^=3D value; + break; + default: + /* Other registers are read-only */ + break; + } +} + +static const struct MemoryRegionOps imx_usbphy_ops =3D { + .read =3D imx_usbphy_read, + .write =3D imx_usbphy_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + /* + * Our device would not work correctly if the guest was doing + * unaligned access. This might not be a limitation on the real + * device but in practice there is no reason for a guest to access + * this device unaligned. + */ + .min_access_size =3D 4, + .max_access_size =3D 4, + .unaligned =3D false, + }, +}; + +static void imx_usbphy_realize(DeviceState *dev, Error **errp) +{ + IMXUSBPHYState *s =3D IMX_USBPHY(dev); + + memory_region_init_io(&s->iomem, OBJECT(s), &imx_usbphy_ops, s, + "imx-usbphy", 0x1000); + sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem); +} + +static void imx_usbphy_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D imx_usbphy_reset; + dc->vmsd =3D &vmstate_imx_usbphy; + dc->desc =3D "i.MX USB PHY Module"; + dc->realize =3D imx_usbphy_realize; +} + +static const TypeInfo imx_usbphy_info =3D { + .name =3D TYPE_IMX_USBPHY, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(IMXUSBPHYState), + .class_init =3D imx_usbphy_class_init, +}; + +static void imx_usbphy_register_types(void) +{ + type_register_static(&imx_usbphy_info); +} + +type_init(imx_usbphy_register_types) diff --git a/MAINTAINERS b/MAINTAINERS index 32867bc6367..f8741cabdc5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -764,6 +764,8 @@ F: hw/arm/sabrelite.c F: hw/arm/fsl-imx6.c F: hw/misc/imx6_*.c F: hw/ssi/imx_spi.c +F: hw/usb/imx-usb-phy.c +F: include/hw/usb/imx-usb-phy.h F: include/hw/arm/fsl-imx6.h F: include/hw/misc/imx6_*.h F: include/hw/ssi/imx_spi.h diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index e5a876c8d14..188419dc1e7 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -373,6 +373,7 @@ config FSL_IMX6 select IMX select IMX_FEC select IMX_I2C + select IMX_USBPHY select SDHCI =20 config ASPEED_SOC diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index 5e70ed5f7b8..464348ba142 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -91,3 +91,8 @@ config USB_STORAGE_MTP bool default y depends on USB + +config IMX_USBPHY + bool + default y + depends on USB --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445363; cv=none; d=zohomail.com; s=zohoarc; b=KUdQI7/wk7qDxKAcYVmfz+rdLzwtaSdjUW7Y3rdfm6Wod7IBf0evRbz7YNDm3k/gWl/K6QiLps2WxtXVjabnqkY0Ak9HuLEzNkvl2Tvp7XIY1UvY1vwDNI668Y9XLkSi02ncKtA9pny62s1jZj0KOEQyR93TK9cDXt1d25cYwvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445363; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ABVKs1NpmHYOQoqLi66UN8zfxPP2JlZOHPOmwWjZRfw=; b=cLpgGR2GiDzAsxZbY1cF9L8vJ56ygIrhWzeM94+N6s1EjzmZdIDNt/dBqokE3MpHCr7tA91EDfgd4G6P6aAx3lwS2CabaFTZ4uMPjkL2wL4t2FxkaomP7k7YI+qiNhxjfmp7nw0Vv88So0GDI4FwrVbSVE58b7RazoXtaIUI5dU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445363135980.4990550312766; Tue, 17 Mar 2020 04:42:43 -0700 (PDT) Received: from localhost ([::1]:59166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAcL-0003fo-VS for importer@patchew.org; Tue, 17 Mar 2020 07:42:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43450) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAaV-0000N0-30 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAaU-00028T-4g for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:46 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:36849) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAaT-00020B-UV for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:46 -0400 Received: by mail-wr1-x434.google.com with SMTP id s5so25250840wrg.3 for ; Tue, 17 Mar 2020 04:40:45 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ABVKs1NpmHYOQoqLi66UN8zfxPP2JlZOHPOmwWjZRfw=; b=waWSWnlbyM99S8t4YzMXJ0QdH3oSzKY5rJWTkeTX1L6SvIQ6jfYMTb6xSuzhkAJoma 1JN9k6N/vnyPGVxZIA38OdIHShjibNkTH0khywEtKCYkZI+8NIOf0T3Q5hMfJ8D8+5QG khYaTbxC23ONNLx7qfOxmp32nw/+ucBM0ov/KfkftG3vXLndC+aimt6/l8GNR7aaZGE+ 9PaYb+5PPQ9Xm0vNBRc+71Of2Jw+VfPoaytrKgYA+C/gCisRiTKR0YhzN7D4aoIGyS92 gLTAwsex8nRuUpdzLxRWk5XzO0PYPwLmw3a0ve/kBhmX2Ux91rW79tH8sRNaME9YEqUN KH6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ABVKs1NpmHYOQoqLi66UN8zfxPP2JlZOHPOmwWjZRfw=; b=n/3vwFAPGoiIqu/mW6PFGGozayj+n4RkyLpzVoBpo2QJOfoJ+xzhXIr1agzzUb+vUw 2nWcDzj+vLJRYbiD1I1iHJwLItHtY3k/0eKtYAWvMb4Jz33YSLaihLZE3P5lYe33ZgO2 w52AFgJBLFFPreBgqtqutf3ZdcSiGdtaSWe+PJRzeEFO5LroDnsm+NeFmYc4+iVNuQrZ 011qLQLU19M22b+w8M8WiVG8vZ8hKJ09+9YUw9GKD8+pGnkqCVWXBubS+akddkHXyHj4 MjHMvHiumtziuZhKyTpAtQKH4K5DH5fUiH9+32O6L8OjuTS7VdXUm8YL6T8yH1QxxsGf FmUA== X-Gm-Message-State: ANhLgQ01Yl5X9R0wFoGTXelG06fA/0S4oRlL79FXbH3/VGuUyTpeBb85 nrpoTlu/cdONxfPIgcU+Mgh3N0AQrFABUw== X-Google-Smtp-Source: ADFU+vsrzYgk6anChAHbStN9ZTUkH+u3eFdkcWfWJDNbHXqN8+4fSaQLyI4ssYk/OeGWYTkynBvTGg== X-Received: by 2002:adf:a117:: with SMTP id o23mr5992040wro.219.1584445244607; Tue, 17 Mar 2020 04:40:44 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/11] hw/arm/fsl-imx6ul: Fix USB interrupt numbers Date: Tue, 17 Mar 2020 11:40:30 +0000 Message-Id: <20200317114039.26914-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Guenter Roeck USB1 and USB2 interrupt numbers were swapped. USB_PHY2 interrupt number is 45. That didn't really matter up to now since the interrupts were not used, but it needs to be fixed to be able to wire up the USB controllers. Fixes: 31cbf933f0e ("i.MX6UL: Add i.MX6UL SOC") Signed-off-by: Guenter Roeck Message-id: 20200313014551.12554-3-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx6ul.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index eda389aec7d..5a420785b95 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -241,10 +241,10 @@ enum FslIMX6ULIRQs { FSL_IMX6UL_UART7_IRQ =3D 39, FSL_IMX6UL_UART8_IRQ =3D 40, =20 - FSL_IMX6UL_USB1_IRQ =3D 42, - FSL_IMX6UL_USB2_IRQ =3D 43, + FSL_IMX6UL_USB1_IRQ =3D 43, + FSL_IMX6UL_USB2_IRQ =3D 42, FSL_IMX6UL_USB_PHY1_IRQ =3D 44, - FSL_IMX6UL_USB_PHY2_IRQ =3D 44, + FSL_IMX6UL_USB_PHY2_IRQ =3D 45, =20 FSL_IMX6UL_CAAM_JQ2_IRQ =3D 46, FSL_IMX6UL_CAAM_ERR_IRQ =3D 47, --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445323; cv=none; d=zohomail.com; s=zohoarc; b=ebpjS/RUVU85c1ugiN74WkqedsQVLNLipsXmfc/+8gBReDBga7T32/q3H3eN0TOwF0Hj8rbeE94HkLUYELOZW8xTvZC0I5AW92yJn0YlMcMTjviRz6WS4SylF/4t251F1BqSfTndSTTCB9k+SZrxcc8bKdzZPmGnGDgcgmQhQQ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445323; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gGt7/ycHlk/paOjuicsg+s6eHvlL+QhBi/5GXoTKKrA=; b=MSFxF5Q1IxkRrLjNOFefxdPKegY4lcCcqeTPbsnKEj75RXQk+E3XFxUCcQk1ubIVOIUselYIl3TMb1toQf3dbwiIoLxB5btH2WdzYr7bCOd7sHJbFrcjfn0VrHoZHvUIe1xY293EFQR+M801hqDYOap68J/bV9UhEdnST5KT2vo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445323831292.24917685062815; Tue, 17 Mar 2020 04:42:03 -0700 (PDT) Received: from localhost ([::1]:59162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAbi-0002d2-LB for importer@patchew.org; Tue, 17 Mar 2020 07:42:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43487) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAaW-0000NJ-Di for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAaV-0002MX-DT for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:48 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAaV-0002Db-6j for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:47 -0400 Received: by mail-wr1-x444.google.com with SMTP id a25so25212093wrd.0 for ; Tue, 17 Mar 2020 04:40:47 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=gGt7/ycHlk/paOjuicsg+s6eHvlL+QhBi/5GXoTKKrA=; b=jCb853Z24I+auyAJtr2pNHZaN8W7teP3+bramSLeBQfME8nI/peMv2Ye1e2WeBCMSN OhziJaUornz7vbbeWH9a506mD6YZTrvVo/f7wLTSK1AnscKn/QFp3X5+GH5OtRxzzI4r z8lExrguuvwUXnjYukDUTinXJoJRA6RMoj3yeAB/+8079nQ4HRhPA4ttH7WP2CMLlS9K ASCjeMjryixvJ462lUVGh+ITFFNIgNOVR/ek4BaRTvN0QcuUv0Kp4Ks8c7ALnWfIpPUE baJnrH51vWiYfEt8e3H3zOPt+7/ivE2FSy3ID2i1tSp8sq7GOz2Zz1YPxcTVV15D5wGj Vsvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gGt7/ycHlk/paOjuicsg+s6eHvlL+QhBi/5GXoTKKrA=; b=K+Dbpu88qivi5tHegANqHYQOgzBL4fS4585zyGDHuJ5LbW40Fbn1ipiWvHtcxu0yDr 0R0ex34J/13CnaRxO76ey8jkeCZTfxVUhUVyfHqbD5W7lKYOPz18uUwgUOfkx9xnwCSm 5OuAzbf9Vm+QscNqFAp5phdS1mMBA2G6rOyeLunRo5KB5IPcLIepedHCgCc8Wbyk1OX1 SUHVIYeTTfbcbwsS+WJ+iBy5ly1U/clXyq03zUhGriqapG1OX5rx1I8Rh2DmawdDhfNC f1yVG7lg9KahhyhALD6oLZWaaFBbYF8EZFCHcNE+5VSaXne59/u1VUTqtwaP73p30neR ULag== X-Gm-Message-State: ANhLgQ0iYKR3U25iKjwQ6RsHXy8lj+5AYi+RdtMEQx70kl4cibG8UV+z KUBNJK0/D7lBcFtiIeNiJUdbKA1EZTm3Iw== X-Google-Smtp-Source: ADFU+vuqq1kHs/gSy1ZIgsAO5i92QnlB0HmaKGMg1k6aHODUVZln5lWutdExd6KIAXCb6mE0AWhzEg== X-Received: by 2002:adf:eb48:: with SMTP id u8mr5554501wrn.283.1584445245549; Tue, 17 Mar 2020 04:40:45 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/11] hw/arm/fsl-imx6ul: Instantiate unimplemented pwm and can devices Date: Tue, 17 Mar 2020 11:40:31 +0000 Message-Id: <20200317114039.26914-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Guenter Roeck Recent Linux kernels (post v4.20) crash due to accesses to flexcan and pwm controllers. Instantiate as unimplemented devices to work around the problem. Signed-off-by: Guenter Roeck Message-id: 20200313014551.12554-4-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/fsl-imx6ul.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index c405b68d1dd..a0bcc6f8957 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -516,6 +516,20 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error= **errp) */ create_unimplemented_device("sdma", FSL_IMX6UL_SDMA_ADDR, 0x4000); =20 + /* + * PWM + */ + create_unimplemented_device("pwm1", FSL_IMX6UL_PWM1_ADDR, 0x4000); + create_unimplemented_device("pwm2", FSL_IMX6UL_PWM2_ADDR, 0x4000); + create_unimplemented_device("pwm3", FSL_IMX6UL_PWM3_ADDR, 0x4000); + create_unimplemented_device("pwm4", FSL_IMX6UL_PWM4_ADDR, 0x4000); + + /* + * CAN + */ + create_unimplemented_device("can1", FSL_IMX6UL_CAN1_ADDR, 0x4000); + create_unimplemented_device("can2", FSL_IMX6UL_CAN2_ADDR, 0x4000); + /* * APHB_DMA */ --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445447; cv=none; d=zohomail.com; s=zohoarc; b=VyOa0GUWEhOb+syd076SpwBS9nWeVg8JpRjRTaji7cvXP3KNh+qxhK70aYUXisnDGcNv0x85xdZhl/D/pj2kJGDuzUpaCn/0ch62R8jubwmSkOVXf7NqoM+2Zp31mF9NXtsB8h+Dx/A/LQMjTBgiB6JGVlEfIr7902Hs1HxMXqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445447; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jXJaCx3hbYmcNKuqEiqjFHkajTM6KcIwjOw6oo6oGk4=; b=DNmQ2/8hXNNSMDg0cloEthtfQeyvgnNWx5ZmFMJZ9ExVucoONMm5NDrfLylIYBgEWf3Apxy4UcpT8rwbwxA2PoHGUUJj1xzw4PLLyh0pUq1pqziE39b4I0AzI7dozKTZeig/UCq9TTpIgJ5PHb3qQMlAaXiGrE5rmuzUGTe30CM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445447376488.09989588329483; Tue, 17 Mar 2020 04:44:07 -0700 (PDT) Received: from localhost ([::1]:59212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAdi-00068U-5T for importer@patchew.org; Tue, 17 Mar 2020 07:44:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43519) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAaX-0000PM-Q2 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAaW-0002aO-GS for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:49 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:40659) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAaW-0002Pz-9U for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:48 -0400 Received: by mail-wm1-x332.google.com with SMTP id z12so12365555wmf.5 for ; Tue, 17 Mar 2020 04:40:48 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jXJaCx3hbYmcNKuqEiqjFHkajTM6KcIwjOw6oo6oGk4=; b=ay1LZVy1BbgFQjfzwts4uKZY68k+JjH638j5tbCwtSS3YdFA/tyeNGCy/ujp1PJirr VNKvoIDfX4Q7wB3RyuVVOedjcH/jwrIvkQzNOIYYu8ufuHmxCnG9CDK+kLknXq8rcltU J+CdnO7CxyupWFUj+K5lY1RSorpZ8DSSAA8UdwtBSk3x/9sHPjojGeR9MCw/RizOymvk 98Kr99oxAsLoxxoxbHV1NoK/EIsONKG1ePqu2r9Iu3A0hck7Bs1KbGTFuAviBnoc3gfk 4SAQJE5B06fkmqvH0zLM3s/10sOTWOq2DOZGCgn9cEuuupBny0P2H58eKdi3W3fhay1d wp4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jXJaCx3hbYmcNKuqEiqjFHkajTM6KcIwjOw6oo6oGk4=; b=VRIkTjhvEt1kXqsKFQE8WWSHMBbjqwqTXcgWGmrW1l1FvJEWbiI3LH5mZUQbXTyQFo RqGcHSPP+llzdbXA3zHP17fECQm+lQH3BWzDETzWvfv6KLxxHQcxHAUPbfjGNoD6a0ob EjA5/zlWCyI+Vt2RjSk2COJO8eNc3I5WDoqUUzR42INxuDIaW/P52IOEMd80zs6dF3Wg jB7XIwX4BttQCpvwEbqDWWQoq7UDJV7ANFOiWpOJB5d+//ffxQKnU0eausxrGdSiPQHk DLIsJeMLg8mFTSYAftAtzy3v1qf6bhkxWMI6SBh8oUS6MV2rsZYxvWJ0+pjv+OvMLyvl cfHg== X-Gm-Message-State: ANhLgQ22RNP1PPBvk81S/uxO1bEhKI5KglaAOVDvoqpSwdRftgajAuI3 2iDkAVj9gObDSNqWTpm1Wgdyfwp/FQ7ieQ== X-Google-Smtp-Source: ADFU+vvj7cCDbg3n7bCQpUolpHdcPA39IUKztmEWnNXxS9fsXGxxi80yXMsjXgdi7rose46KRg80og== X-Received: by 2002:a7b:c341:: with SMTP id l1mr4636504wmj.146.1584445246910; Tue, 17 Mar 2020 04:40:46 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/11] hw/arm/fsl-imx6ul: Wire up USB controllers Date: Tue, 17 Mar 2020 11:40:32 +0000 Message-Id: <20200317114039.26914-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Guenter Roeck IMX6UL USB controllers are quite similar to IMX7 USB controllers. Wire them up the same way. The only real difference is that wiring up phy devices is necessary to avoid phy reset timeouts in the Linux kernel. Signed-off-by: Guenter Roeck Message-id: 20200313014551.12554-5-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx6ul.h | 10 ++++++++++ hw/arm/fsl-imx6ul.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index 5a420785b95..1a0bab8daaf 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -34,6 +34,8 @@ #include "hw/sd/sdhci.h" #include "hw/ssi/imx_spi.h" #include "hw/net/imx_fec.h" +#include "hw/usb/chipidea.h" +#include "hw/usb/imx-usb-phy.h" #include "exec/memory.h" #include "cpu.h" =20 @@ -54,6 +56,8 @@ enum FslIMX6ULConfiguration { FSL_IMX6UL_NUM_I2CS =3D 4, FSL_IMX6UL_NUM_ECSPIS =3D 4, FSL_IMX6UL_NUM_ADCS =3D 2, + FSL_IMX6UL_NUM_USB_PHYS =3D 2, + FSL_IMX6UL_NUM_USBS =3D 2, }; =20 typedef struct FslIMX6ULState { @@ -77,6 +81,8 @@ typedef struct FslIMX6ULState { IMXFECState eth[FSL_IMX6UL_NUM_ETHS]; SDHCIState usdhc[FSL_IMX6UL_NUM_USDHCS]; IMX2WdtState wdt[FSL_IMX6UL_NUM_WDTS]; + IMXUSBPHYState usbphy[FSL_IMX6UL_NUM_USB_PHYS]; + ChipideaState usb[FSL_IMX6UL_NUM_USBS]; MemoryRegion rom; MemoryRegion caam; MemoryRegion ocram; @@ -145,6 +151,10 @@ enum FslIMX6ULMemoryMap { FSL_IMX6UL_EPIT2_ADDR =3D 0x020D4000, FSL_IMX6UL_EPIT1_ADDR =3D 0x020D0000, FSL_IMX6UL_SNVS_HP_ADDR =3D 0x020CC000, + FSL_IMX6UL_USBPHY2_ADDR =3D 0x020CA000, + FSL_IMX6UL_USBPHY2_SIZE =3D (4 * 1024), + FSL_IMX6UL_USBPHY1_ADDR =3D 0x020C9000, + FSL_IMX6UL_USBPHY1_SIZE =3D (4 * 1024), FSL_IMX6UL_ANALOG_ADDR =3D 0x020C8000, FSL_IMX6UL_CCM_ADDR =3D 0x020C4000, FSL_IMX6UL_WDOG2_ADDR =3D 0x020C0000, diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index a0bcc6f8957..99a5859a4e9 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -20,6 +20,7 @@ #include "qapi/error.h" #include "hw/arm/fsl-imx6ul.h" #include "hw/misc/unimp.h" +#include "hw/usb/imx-usb-phy.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" @@ -133,6 +134,18 @@ static void fsl_imx6ul_init(Object *obj) TYPE_IMX_ENET); } =20 + /* USB */ + for (i =3D 0; i < FSL_IMX6UL_NUM_USB_PHYS; i++) { + snprintf(name, NAME_SIZE, "usbphy%d", i); + sysbus_init_child_obj(obj, name, &s->usbphy[i], sizeof(s->usbphy[i= ]), + TYPE_IMX_USBPHY); + } + for (i =3D 0; i < FSL_IMX6UL_NUM_USBS; i++) { + snprintf(name, NAME_SIZE, "usb%d", i); + sysbus_init_child_obj(obj, name, &s->usb[i], sizeof(s->usb[i]), + TYPE_CHIPIDEA); + } + /* * SDHCI */ @@ -456,6 +469,28 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error= **errp) FSL_IMX6UL_ENETn_TIMER_IRQ[i])= ); } =20 + /* USB */ + for (i =3D 0; i < FSL_IMX6UL_NUM_USB_PHYS; i++) { + object_property_set_bool(OBJECT(&s->usbphy[i]), true, "realized", + &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->usbphy[i]), 0, + FSL_IMX6UL_USBPHY1_ADDR + i * 0x1000); + } + + for (i =3D 0; i < FSL_IMX6UL_NUM_USBS; i++) { + static const int FSL_IMX6UL_USBn_IRQ[] =3D { + FSL_IMX6UL_USB1_IRQ, + FSL_IMX6UL_USB2_IRQ, + }; + object_property_set_bool(OBJECT(&s->usb[i]), true, "realized", + &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->usb[i]), 0, + FSL_IMX6UL_USBO2_USB_ADDR + i * 0x200); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->usb[i]), 0, + qdev_get_gpio_in(DEVICE(&s->a7mpcore), + FSL_IMX6UL_USBn_IRQ[i])); + } + /* * USDHC */ --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445446; cv=none; d=zohomail.com; s=zohoarc; b=ApuPNaZLcaFqHL29RNjNxlpLochTTOa5Vpc+cgrNGCkRZhUx8qCH65IqKH9eFPtXVO6+G1CNg+AMBwNXYJFoqT1XKhOdKyMDHjYwDNuMbGDi97sHgQRqsXzXPku1TMShHKkufplPe+y8xJJlK7eZ70MhNXKBCgUnaa+2g/cdqcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445446; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1aHjPvUHnsNDgHEP2zgBF6uXgi4tw5ct0zaFNIjPWRQ=; b=DJ2C5OlcdMOXuPB4OIcX8kGodK8mmZgNQOsMOFt1AXmZyyt2GM20m2Dr4sNHE1ZhwykmfXMgVjmblOXVu1CkJbpRw8irjS0vrIqTDtUZSi9p/3NKchwmCRO38wP83fn9cRCD1Azu3GvKemsdtlc/O0qp+WnVrqe7/IsRn3sNbRw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445446158668.624320795566; Tue, 17 Mar 2020 04:44:06 -0700 (PDT) Received: from localhost ([::1]:59208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAdg-00063i-V4 for importer@patchew.org; Tue, 17 Mar 2020 07:44:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43545) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAaY-0000R1-RA for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAaX-0002mR-Hv for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:50 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54859) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAaX-0002c4-94 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:49 -0400 Received: by mail-wm1-x342.google.com with SMTP id n8so21058575wmc.4 for ; Tue, 17 Mar 2020 04:40:49 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1aHjPvUHnsNDgHEP2zgBF6uXgi4tw5ct0zaFNIjPWRQ=; b=GRpOWJ6F1159FOtGGpykObhsKSHyGq/9oInvtuF9kywsIgsV7tDLoHY+7OmbgIqgmM pVE/e3ysr6RVNn7KzV6C3ZNOJaOGydDmfl+pBZheeJPPObveln6sG+C9z5ZyBtOUrJFF +87QQB2ycwum3LILrfRgFjPpfGqbdxoTcb5DGU9zoKJCz75S+9kELRhUA/0jC82VSJG5 jlq5tTobP0KjAY7Z5TwuAVbyhWwiqBeB7ugCKsX3BqpmvmuuNXAHCPzim32trtA1m1DN mGekE7k6f3N0V2EfU565c6bb5TOyBmFw3a3Ie7+igcTLGQm3MikJOEvtALDMEE63H2yb GX8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1aHjPvUHnsNDgHEP2zgBF6uXgi4tw5ct0zaFNIjPWRQ=; b=YJ6wWe6jyOPqXgHHkqpCgp2qQXjp5Id09UFrWNdUNcbH9z36U7U3+Zr1UBcvx7ByEC mZ0qt0iv99rLtAz6eHlXUTK+798YYDbsy/faijORLH2aav86D+Quo8Qp/0BJXik+jCgU mPoyWi4uRxNqCkWVrJ0sUfOAALekUrLYCzctmYTGQzMki3ffkvksRRxsRhS26kb0oToJ 3/+0eVC2Gl3AVIygIo5n1c262TlHinTmG2sznzpbXy+bOH+jp6bdSYHdO7r3VXLuQkWM ZZm8iAMRP88Lx/WQer1AgrXSocrKfBppl4tWgIJv44zHExF4Gwzn+6ibgbZy/dNawgHp qTZw== X-Gm-Message-State: ANhLgQ2YroL78OEoCpw7lNGQTBMfrvpfDDvkgLM7oclrOCiZozJqplZX IqmWT+Z+Gy/pWYFnx8Dplf4XHYt+qRuDAQ== X-Google-Smtp-Source: ADFU+vs5ESMt8uxj2+/VSbRxFG84FuEclW67kHN6AAUWLv//YitQUw0CqC0/lbJGuUytUkfDoxsXqQ== X-Received: by 2002:a1c:b154:: with SMTP id a81mr4926538wmf.175.1584445247947; Tue, 17 Mar 2020 04:40:47 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/11] hw/arm/fsl-imx6: Wire up USB controllers Date: Tue, 17 Mar 2020 11:40:33 +0000 Message-Id: <20200317114039.26914-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Guenter Roeck With this patch, the USB controllers on 'sabrelite' are detected and can be used to boot the system. Signed-off-by: Guenter Roeck Message-id: 20200313014551.12554-6-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx6.h | 6 ++++++ hw/arm/fsl-imx6.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h index 60eadccb421..973bcb72f7f 100644 --- a/include/hw/arm/fsl-imx6.h +++ b/include/hw/arm/fsl-imx6.h @@ -30,6 +30,8 @@ #include "hw/sd/sdhci.h" #include "hw/ssi/imx_spi.h" #include "hw/net/imx_fec.h" +#include "hw/usb/chipidea.h" +#include "hw/usb/imx-usb-phy.h" #include "exec/memory.h" #include "cpu.h" =20 @@ -44,6 +46,8 @@ #define FSL_IMX6_NUM_ESDHCS 4 #define FSL_IMX6_NUM_ECSPIS 5 #define FSL_IMX6_NUM_WDTS 2 +#define FSL_IMX6_NUM_USB_PHYS 2 +#define FSL_IMX6_NUM_USBS 4 =20 typedef struct FslIMX6State { /*< private >*/ @@ -62,6 +66,8 @@ typedef struct FslIMX6State { SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS]; IMXSPIState spi[FSL_IMX6_NUM_ECSPIS]; IMX2WdtState wdt[FSL_IMX6_NUM_WDTS]; + IMXUSBPHYState usbphy[FSL_IMX6_NUM_USB_PHYS]; + ChipideaState usb[FSL_IMX6_NUM_USBS]; IMXFECState eth; MemoryRegion rom; MemoryRegion caam; diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index ecc62855f2b..e095e4abc6f 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -22,6 +22,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/arm/fsl-imx6.h" +#include "hw/usb/imx-usb-phy.h" #include "hw/boards.h" #include "hw/qdev-properties.h" #include "sysemu/sysemu.h" @@ -86,6 +87,17 @@ static void fsl_imx6_init(Object *obj) TYPE_IMX_USDHC); } =20 + for (i =3D 0; i < FSL_IMX6_NUM_USB_PHYS; i++) { + snprintf(name, NAME_SIZE, "usbphy%d", i); + sysbus_init_child_obj(obj, name, &s->usbphy[i], sizeof(s->usbphy[i= ]), + TYPE_IMX_USBPHY); + } + for (i =3D 0; i < FSL_IMX6_NUM_USBS; i++) { + snprintf(name, NAME_SIZE, "usb%d", i); + sysbus_init_child_obj(obj, name, &s->usb[i], sizeof(s->usb[i]), + TYPE_CHIPIDEA); + } + for (i =3D 0; i < FSL_IMX6_NUM_ECSPIS; i++) { snprintf(name, NAME_SIZE, "spi%d", i + 1); sysbus_init_child_obj(obj, name, &s->spi[i], sizeof(s->spi[i]), @@ -349,6 +361,30 @@ static void fsl_imx6_realize(DeviceState *dev, Error *= *errp) esdhc_table[i].irq)); } =20 + /* USB */ + for (i =3D 0; i < FSL_IMX6_NUM_USB_PHYS; i++) { + object_property_set_bool(OBJECT(&s->usbphy[i]), true, "realized", + &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->usbphy[i]), 0, + FSL_IMX6_USBPHY1_ADDR + i * 0x1000); + } + for (i =3D 0; i < FSL_IMX6_NUM_USBS; i++) { + static const int FSL_IMX6_USBn_IRQ[] =3D { + FSL_IMX6_USB_OTG_IRQ, + FSL_IMX6_USB_HOST1_IRQ, + FSL_IMX6_USB_HOST2_IRQ, + FSL_IMX6_USB_HOST3_IRQ, + }; + + object_property_set_bool(OBJECT(&s->usb[i]), true, "realized", + &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->usb[i]), 0, + FSL_IMX6_USBOH3_USB_ADDR + i * 0x200); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->usb[i]), 0, + qdev_get_gpio_in(DEVICE(&s->a9mpcore), + FSL_IMX6_USBn_IRQ[i])); + } + /* Initialize all ECSPI */ for (i =3D 0; i < FSL_IMX6_NUM_ECSPIS; i++) { static const struct { --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445481; cv=none; d=zohomail.com; s=zohoarc; b=PKIP95VFBzsguXB37jxawdJIt137tyYqoQHlNXoED3I4MteRXX/qGqpwSctOrKurjaYGp3ZojmK+9F1hTPALakYijJ420ul+sfbSGYeBklZTuqewx96Gc5AamX5QHCTf7c9OoUYnj+NYBoURc+RfeeStccC+Vl6hw98NK7Z7bl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445481; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mMeVBvXlMaaa/OKSczXDTF+WMf2stZl9iIzAXVliKXU=; b=jOvoZ0MiGl2J6nuLYqug0vjdqfGyE9qBT9AhCxXgSTnubHnOcxaW1sU37MGdDHy6rgd/KfIJL36La886ImPR5I2HFQjT4t6CLrp/VRX1KrwlmxEYxEOZMEDSUVk8VGkO86mLGW29knl7QLIa9BPsPNEJjTBKTMkdhMj6T/kjBQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445481241281.82879277723555; Tue, 17 Mar 2020 04:44:41 -0700 (PDT) Received: from localhost ([::1]:59220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAeG-0007Qy-6B for importer@patchew.org; Tue, 17 Mar 2020 07:44:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43566) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAaZ-0000Sn-NE for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAaY-0002yR-Fp for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:51 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:51141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAaY-0002n0-85 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:50 -0400 Received: by mail-wm1-x343.google.com with SMTP id z13so5011808wml.0 for ; Tue, 17 Mar 2020 04:40:50 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=mMeVBvXlMaaa/OKSczXDTF+WMf2stZl9iIzAXVliKXU=; b=TVz8/vrniLSGvQUUqxkB7fJr3f5f8+SL3+7oncsZWaubu2IPu9FjM2dP002Z/vE/Iy uPVEx1bvaPmGDb/idnH4zHpjCegk6sbWgBpg+kD6LcPTKVFUm+EK593A880lPbOT1txC nf6ssEO6594+liYvyhDby5ChjAmzGKX/qLq1X+wGaV8YZtyxnUBwb6J0EPNakQm/g/Og rvzlccByC3nuj7AsSICIl+IlbZORDj+7+Q5BkcXxiDUjURKOyeWTG9ynBxN9yjnlozEv cgvzdsRx0teBaM8DFcp915WQBnY1TZ8eYAar1EG7r4BZQkSPChVohAQuO5NIj9hF+nMs NLZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mMeVBvXlMaaa/OKSczXDTF+WMf2stZl9iIzAXVliKXU=; b=sGXqEfqg0EFvzTUcQFaVKtErkhE/snZG+v8bHOeLkCrBLdQQjFTIlRKsODAQH0jOcJ 5ptEvDa1YISMeRuH31IEfjhwf8PfqYWY7Lv+ngFtaZmAdSdGOJ+1MENhHEaHcRfZ/n6q JAtiLgWjfdSvBLOZeBrR7XUpHlBrgvtOKmlTB1U3NssVikN7SB65ReUSJqkMNT3Jqz37 Y2xl+fNE6FH9X82qhOUVoDauLxpFrAHEjEHB9J7mNExUqmEvP4p1vry0n58zioIUT9pY NA7Mf03+IqZ16weqrcJnrWuCf4aDrd3DJNp0cEgBR3HffptRDjKrrmUbWXv7bR9IqHYH sBLg== X-Gm-Message-State: ANhLgQ3EDnQV7LhznCOgWuy9zKv5mRvh25wGRSCJqeskkVJjM+MkWlzN aF9Fpq5IXDJ8CeQatQtW3eC486WYJWVuSw== X-Google-Smtp-Source: ADFU+vtky0W0KZxhChVU1MXIn27EvriV+qOStnPQpY7qauCNvjeqliLpZmiA0D1gSOf0wbC3bAb1BA== X-Received: by 2002:a1c:984a:: with SMTP id a71mr5124175wme.185.1584445248897; Tue, 17 Mar 2020 04:40:48 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/11] hw/net/imx_fec: write TGSR and TCSR3 in imx_enet_write() Date: Tue, 17 Mar 2020 11:40:34 +0000 Message-Id: <20200317114039.26914-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Chen Qun The current code causes clang static code analyzer generate warning: hw/net/imx_fec.c:858:9: warning: Value stored to 'value' is never read value =3D value & 0x0000000f; ^ ~~~~~~~~~~~~~~~~~~ hw/net/imx_fec.c:864:9: warning: Value stored to 'value' is never read value =3D value & 0x000000fd; ^ ~~~~~~~~~~~~~~~~~~ According to the definition of the function, the two =E2=80=9Cvalue=E2=80= =9D assignments should be written to registers. Reported-by: Euler Robot Signed-off-by: Chen Qun Message-id: 20200313123242.13236-1-kuhn.chenqun@huawei.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/net/imx_fec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 6a124a154a8..5c145a8197e 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -855,13 +855,15 @@ static void imx_enet_write(IMXFECState *s, uint32_t i= ndex, uint32_t value) break; case ENET_TGSR: /* implement clear timer flag */ - value =3D value & 0x0000000f; + s->regs[index] &=3D ~(value & 0x0000000f); /* all bits W1C */ break; case ENET_TCSR0: case ENET_TCSR1: case ENET_TCSR2: case ENET_TCSR3: - value =3D value & 0x000000fd; + s->regs[index] &=3D ~(value & 0x00000080); /* W1C bits */ + s->regs[index] &=3D ~0x0000007d; /* writable fields */ + s->regs[index] |=3D (value & 0x0000007d); break; case ENET_TCCR0: case ENET_TCCR1: --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445561; cv=none; d=zohomail.com; s=zohoarc; b=HgCA5MmK4TIq4pXOKigiPvn0GjOykYROnVavPLJFbo7qFi568Ymbm9g9e2EREtuA+kAGc0Cm6OUqn2CE2kiW7B3whNwENpWAs4Snsi41DcZLKSvSuahbbt9t6u9dqVMVS8DSiuabISJAUzcMSdiIJ6tEHlFHijJtXdaNYmIayuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445561; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hAL6R1W30kQJDLELv7RQwnzz+uTtd3Q5yg+T35G1inY=; b=OcOYHowIv+0THSLa+dBKQrRpEQjqXVcIMrKlzP08G2ZNV5TszSzDWuDHGwSqAbssXKnsuZj9vocemLLEerw2pFD2glZuZZQFUJn+7cE8on5QV80GR4S5Ez0YBMIFlfaKPA+cn14rHPM8nLfAgrNUY/aF5OYJ9mno6uEwduMc68E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445561248638.4325197293335; Tue, 17 Mar 2020 04:46:01 -0700 (PDT) Received: from localhost ([::1]:59266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAfY-0001Qz-0u for importer@patchew.org; Tue, 17 Mar 2020 07:46:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43612) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAab-0000XV-Li for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAaZ-0003Cq-OP for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:53 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:54898) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAaZ-00032D-Fb for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:51 -0400 Received: by mail-wm1-x329.google.com with SMTP id n8so21058711wmc.4 for ; Tue, 17 Mar 2020 04:40:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hAL6R1W30kQJDLELv7RQwnzz+uTtd3Q5yg+T35G1inY=; b=EcfkICseHquFT19a2nC+1A9BLfBf2IEX+Ups4XefOGlqpGBqZu1Mq4TKUBVx97xE5q OWTmzor5dCpfzMzNDGBlZkLAnpPjIGvoKrkGegZyWH5sdhtrEVCgCrAGhYVOFX5Rcdk9 jfH+9+Mu8gHkqp38IjF6XApgn8VkdYAaeB/g9gfep59AbBWj5/GcqAj3BtF/4ljnxUL6 wbRxrzRDyVNl+gh5rvzBRZCPmyNAtZdqLmpthre/GBvi8apFIheMBDc2HCFmnigO0WyP wzB3D7M4qSZqdq8uNjplkq1Yw2uQFrWOQtAW42A6wpkVsbMjyklT7janzw6D6EnbNHQI inqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hAL6R1W30kQJDLELv7RQwnzz+uTtd3Q5yg+T35G1inY=; b=lQPpgGliv0+FUlQNUlX3lpI3Ro+fTXkTIAmcwD12IuHy+onWnOjy979aGa8pEmn7ls hSXydGyPdwPz+3F6kEK9MfCzi6EBOxdvwT5vrdffyWGfZ30r7F8E8Fux9kezn8n+us5D 3cnfKcXcJCyaPXkYJwd6QZ/lzsbemPOYnx0k1SSBBAeHJgwVxhRqSc9X4/pRhvjoNHTN 0FsC7udmw4G+ktIOScOc3BC9iYYs45q1VtPrR8+51M5fEIqLtCpO5HILTZJ00hpKxJuM Yq65myUcygWWHjAWn88tOgz8FmoDuzFsvMhTu6vj/Bf9lc4dREvdR328krMYfRx5CwY+ GE+w== X-Gm-Message-State: ANhLgQ2cxDA2kTK4n5gOj+kGLBdFJ/HOoB3hTOjq1rrexlPSslI/Cq4s wkpR2QdqTTdieYBbcwK31PmC1IBjOkrNLw== X-Google-Smtp-Source: ADFU+vunpENIY91qdvmX99PUMbtNiBn50740cr+pwiWXklPkHIzx+7HsqAHUX0GE+u+BXOvGXKJSXw== X-Received: by 2002:a1c:e442:: with SMTP id b63mr5034195wmh.174.1584445249904; Tue, 17 Mar 2020 04:40:49 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/11] m25p80: Convert to support tracing Date: Tue, 17 Mar 2020 11:40:35 +0000 Message-Id: <20200317114039.26914-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Guenter Roeck While at it, add some trace messages to help debug problems seen when running the latest Linux kernel. Signed-off-by: Guenter Roeck Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Peter Maydell --- hw/block/m25p80.c | 48 ++++++++++++++++++++----------------------- hw/block/trace-events | 16 +++++++++++++++ 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 61f2fb8f8f8..5ff8d270c4a 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -32,17 +32,7 @@ #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" - -#ifndef M25P80_ERR_DEBUG -#define M25P80_ERR_DEBUG 0 -#endif - -#define DB_PRINT_L(level, ...) do { \ - if (M25P80_ERR_DEBUG > (level)) { \ - fprintf(stderr, ": %s: ", __func__); \ - fprintf(stderr, ## __VA_ARGS__); \ - } \ -} while (0) +#include "trace.h" =20 /* Fields for FlashPartInfo->flags */ =20 @@ -574,7 +564,8 @@ static void flash_erase(Flash *s, int offset, FlashCMD = cmd) abort(); } =20 - DB_PRINT_L(0, "offset =3D %#x, len =3D %d\n", offset, len); + trace_m25p80_flash_erase(s, offset, len); + if ((s->pi->flags & capa_to_assert) !=3D capa_to_assert) { qemu_log_mask(LOG_GUEST_ERROR, "M25P80: %d erase size not supporte= d by" " device\n", len); @@ -607,8 +598,7 @@ void flash_write8(Flash *s, uint32_t addr, uint8_t data) } =20 if ((prev ^ data) & data) { - DB_PRINT_L(1, "programming zero to one! addr=3D%" PRIx32 " %" PRI= x8 - " -> %" PRIx8 "\n", addr, prev, data); + trace_m25p80_programming_zero_to_one(s, addr, prev, data); } =20 if (s->pi->flags & EEPROM) { @@ -662,6 +652,9 @@ static void complete_collecting_data(Flash *s) =20 s->state =3D STATE_IDLE; =20 + trace_m25p80_complete_collecting(s, s->cmd_in_progress, n, s->ear, + s->cur_addr); + switch (s->cmd_in_progress) { case DPP: case QPP: @@ -825,7 +818,7 @@ static void reset_memory(Flash *s) break; } =20 - DB_PRINT_L(0, "Reset done.\n"); + trace_m25p80_reset_done(s); } =20 static void decode_fast_read_cmd(Flash *s) @@ -941,9 +934,10 @@ static void decode_qio_read_cmd(Flash *s) =20 static void decode_new_cmd(Flash *s, uint32_t value) { - s->cmd_in_progress =3D value; int i; - DB_PRINT_L(0, "decoded new command:%x\n", value); + + s->cmd_in_progress =3D value; + trace_m25p80_command_decoded(s, value); =20 if (value !=3D RESET_MEMORY) { s->reset_enable =3D false; @@ -1042,7 +1036,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; =20 case JEDEC_READ: - DB_PRINT_L(0, "populated jedec code\n"); + trace_m25p80_populated_jedec(s); for (i =3D 0; i < s->pi->id_len; i++) { s->data[i] =3D s->pi->id[i]; } @@ -1063,7 +1057,7 @@ static void decode_new_cmd(Flash *s, uint32_t value) case BULK_ERASE_60: case BULK_ERASE: if (s->write_enable) { - DB_PRINT_L(0, "chip erase\n"); + trace_m25p80_chip_erase(s); flash_erase(s, 0, BULK_ERASE); } else { qemu_log_mask(LOG_GUEST_ERROR, "M25P80: chip erase with write " @@ -1184,7 +1178,7 @@ static int m25p80_cs(SSISlave *ss, bool select) s->data_read_loop =3D false; } =20 - DB_PRINT_L(0, "%sselect\n", select ? "de" : ""); + trace_m25p80_select(s, select ? "de" : ""); =20 return 0; } @@ -1194,19 +1188,20 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint= 32_t tx) Flash *s =3D M25P80(ss); uint32_t r =3D 0; =20 + trace_m25p80_transfer(s, s->state, s->len, s->needed_bytes, s->pos, + s->cur_addr, (uint8_t)tx); + switch (s->state) { =20 case STATE_PAGE_PROGRAM: - DB_PRINT_L(1, "page program cur_addr=3D%#" PRIx32 " data=3D%" PRIx= 8 "\n", - s->cur_addr, (uint8_t)tx); + trace_m25p80_page_program(s, s->cur_addr, (uint8_t)tx); flash_write8(s, s->cur_addr, (uint8_t)tx); s->cur_addr =3D (s->cur_addr + 1) & (s->size - 1); break; =20 case STATE_READ: r =3D s->storage[s->cur_addr]; - DB_PRINT_L(1, "READ 0x%" PRIx32 "=3D%" PRIx8 "\n", s->cur_addr, - (uint8_t)r); + trace_m25p80_read_byte(s, s->cur_addr, (uint8_t)r); s->cur_addr =3D (s->cur_addr + 1) & (s->size - 1); break; =20 @@ -1244,6 +1239,7 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32= _t tx) } =20 r =3D s->data[s->pos]; + trace_m25p80_read_data(s, s->pos, (uint8_t)r); s->pos++; if (s->pos =3D=3D s->len) { s->pos =3D 0; @@ -1281,7 +1277,7 @@ static void m25p80_realize(SSISlave *ss, Error **errp) return; } =20 - DB_PRINT_L(0, "Binding to IF_MTD drive\n"); + trace_m25p80_binding(s); s->storage =3D blk_blockalign(s->blk, s->size); =20 if (blk_pread(s->blk, 0, s->storage, s->size) !=3D s->size) { @@ -1289,7 +1285,7 @@ static void m25p80_realize(SSISlave *ss, Error **errp) return; } } else { - DB_PRINT_L(0, "No BDRV - binding to RAM\n"); + trace_m25p80_binding_no_bdrv(s); s->storage =3D blk_blockalign(NULL, s->size); memset(s->storage, 0xFF, s->size); } diff --git a/hw/block/trace-events b/hw/block/trace-events index c03e80c2c9c..f78939fa9da 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -134,3 +134,19 @@ xen_block_blockdev_add(char *str) "%s" xen_block_blockdev_del(const char *node_name) "%s" xen_block_device_create(unsigned int number) "%u" xen_block_device_destroy(unsigned int number) "%u" + +# m25p80.c +m25p80_flash_erase(void *s, int offset, uint32_t len) "[%p] offset =3D 0x%= "PRIx32", len =3D %u" +m25p80_programming_zero_to_one(void *s, uint32_t addr, uint8_t prev, uint8= _t data) "[%p] programming zero to one! addr=3D0x%"PRIx32" 0x%"PRIx8" -> 0= x%"PRIx8 +m25p80_reset_done(void *s) "[%p] Reset done." +m25p80_command_decoded(void *s, uint32_t cmd) "[%p] new command:0x%"PRIx32 +m25p80_complete_collecting(void *s, uint32_t cmd, int n, uint8_t ear, uint= 32_t cur_addr) "[%p] decode cmd: 0x%"PRIx32" len %d ear 0x%"PRIx8" addr 0x%= "PRIx32 +m25p80_populated_jedec(void *s) "[%p] populated jedec code" +m25p80_chip_erase(void *s) "[%p] chip erase" +m25p80_select(void *s, const char *what) "[%p] %sselect" +m25p80_page_program(void *s, uint32_t addr, uint8_t tx) "[%p] page program= cur_addr=3D0x%"PRIx32" data=3D0x%"PRIx8 +m25p80_transfer(void *s, uint8_t state, uint32_t len, uint8_t needed, uint= 32_t pos, uint32_t cur_addr, uint8_t t) "[%p] Transfer state 0x%"PRIx8" len= 0x%"PRIx32" needed 0x%"PRIx8" pos 0x%"PRIx32" addr 0x%"PRIx32" tx 0x%"PRIx8 +m25p80_read_byte(void *s, uint32_t addr, uint8_t v) "[%p] Read byte 0x%"PR= Ix32"=3D0x%"PRIx8 +m25p80_read_data(void *s, uint32_t pos, uint8_t v) "[%p] Read data 0x%"PRI= x32"=3D0x%"PRIx8 +m25p80_binding(void *s) "[%p] Binding to IF_MTD drive" +m25p80_binding_no_bdrv(void *s) "[%p] No BDRV - binding to RAM" --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445447; cv=none; d=zohomail.com; s=zohoarc; b=J3/7LWvpYmBplgCMaqtJPggj6ODlE8dx2X3W1bauPgEzN37zaCHi+hZ+v6rnhUtkK+cBUwJ01ZWoAttMfVQxskvJpuzQ3gV0smZKcQoUi8/EPc0uoEmdLgQyaBb+KRjD4wPNrNXzFNl2MRJ9ZfHhLpH4YbfZfKP3SRx1NpnfXAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445447; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7QaJCv7GzRfGh0KkLLK7VCXCCrICGrOH8s1Sycp5qFA=; b=mB7ksFD+YnKBqgLOGUaQUNe71TioW3S59l1s1RO7AGGmTv/BhBYMdqtWxlkJqx55kPToApzIwFP4Fe8l+T86Y5iN08/56T4NHhKg0DnaoLeZl2WcYXNKDfIQOddpvAgEpsDfj8nYXBN2gi8rkeh9T+cVueygq3syfDpQI9D/9Y0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445447505893.5641410923502; Tue, 17 Mar 2020 04:44:07 -0700 (PDT) Received: from localhost ([::1]:59214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAdi-00068b-DV for importer@patchew.org; Tue, 17 Mar 2020 07:44:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43616) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAac-0000YR-1B for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAaa-0003M4-Pk for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:53 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54860) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAaa-0003F0-Ij for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:52 -0400 Received: by mail-wm1-x341.google.com with SMTP id n8so21058777wmc.4 for ; Tue, 17 Mar 2020 04:40:52 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7QaJCv7GzRfGh0KkLLK7VCXCCrICGrOH8s1Sycp5qFA=; b=p65F/NlVIgSOkwUvLg80G0rnrKNGAqyMxUegZmTKBWOtpEb1Djb7+rBUJEc3okVMFa h5mbmNliCWWd8Ar8TXB7MonnfTe5mV9uTd97NPUmP5zop+KxLxuJENt/zR9BGFWnijQk GB5f0u09aArT+c36p4SmPR7vGxigDeynaMwP8dM7hJ7IzMgOLUqjf6+94cTR99ec1zg2 rtRlYiRqxvGx0Jkg5CePRj2/DHh5z5+yU8MqPSWnOyLOCz7w23FzXjtYxoAPtaKkBa33 V6VnIBor9lz/+mdBWL5hkDEiOBVg1BlM39toozV8EZA2uPVXDdmhDePxRP2OnyogmpE9 VA2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7QaJCv7GzRfGh0KkLLK7VCXCCrICGrOH8s1Sycp5qFA=; b=lxAIwQKZuc7B54PoH8C33BO8cwV0OKvaZHIgC1P50AfFMotr/ir0V3aLg/R7swNJFQ Uiu2e3oYigA2HwzK6LeNKaD+FeqFnG7VKQrF6TC9jaz1snoDtPiO3m+F7qbXf9w+IWG6 Khk87/e5D3CVOSmTYfiwnHqXT/CQ1VSjpXx8EjQCta2WIyVn5qZV0n6QTcFuCcSms6/v xVhV+hI72NPssr79GKp3CQIdiiOQ3e3Y7iYXmOia1UsO7eslJh2D0zOsLvQiRYZoDTaW Z99XMaNCFy9OSwmohWX7tGU3AqCxWCaBMhcL7jyNX17H0b/W9S6lImvdPgnLh5q/BRLY JX2w== X-Gm-Message-State: ANhLgQ2a6Gqjm+8Jt4HF7PN/qLQkxK+kylz/0Wl7X3mTQZ3lDKJNEsXI YlOmBb9brvoJF4MNvy6QttLaULeII6NgzA== X-Google-Smtp-Source: ADFU+vsTgTCjodEg+OcPg5uOds6Zxx/GV50FSGSZDeZ2EVrOqv1GNY3GGi4tCxMlkPE1vawxT//cMQ== X-Received: by 2002:a7b:cb86:: with SMTP id m6mr4811503wmi.72.1584445251089; Tue, 17 Mar 2020 04:40:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/11] m25p80: Improve command handling for Jedec commands Date: Tue, 17 Mar 2020 11:40:36 +0000 Message-Id: <20200317114039.26914-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Guenter Roeck When requesting JEDEC data using the JEDEC_READ command, the Linux kernel always requests 6 bytes. The current implementation only returns three bytes, and interprets the remaining three bytes as new commands. While this does not matter most of the time, it is at the very least confusing. To avoid the problem, always report up to 6 bytes of JEDEC data. Fill remaining data with 0. Signed-off-by: Guenter Roeck Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Peter Maydell --- hw/block/m25p80.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 5ff8d270c4a..53bf63856f5 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -1040,8 +1040,11 @@ static void decode_new_cmd(Flash *s, uint32_t value) for (i =3D 0; i < s->pi->id_len; i++) { s->data[i] =3D s->pi->id[i]; } + for (; i < SPI_NOR_MAX_ID_LEN; i++) { + s->data[i] =3D 0; + } =20 - s->len =3D s->pi->id_len; + s->len =3D SPI_NOR_MAX_ID_LEN; s->pos =3D 0; s->state =3D STATE_READING_DATA; break; --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445562; cv=none; d=zohomail.com; s=zohoarc; b=eOsCBBmW0OR4Kv+66j+ba/OWyyorGtzSfRKp7+H3VTMPxXgD0j/nRmJe24cCEE2AA9u6GkcvhwHVVZagnt1/7Gw4lWG/+8uQsUzfFUs67LpPGKt+p+3wpRlLcqQpotNZrGHA3mjSWcY0jZkrZ6ZseXag0ZW9fpmdfz/ry5mAUQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445562; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uJezzTDs3XobR7ONkeF8BKlCK+ZTZQttyc6HsBQx6+8=; b=mcqMkZ9pS39046B/x1f+IPvr32c1WNZhspgRz9hqJvOaiL0Buy8SlOcFAssFOwQLS2X+pfNTajmj3UIQwxGuCQYEzZZCPIV6Z5V8+TAS139Dt/o+RbRMS/K1MTpsfhAktcXB90XPZV+A14zQxfCvzgnGj+ATAwExf5aHiQ52Y3Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445562167882.3418770828534; Tue, 17 Mar 2020 04:46:02 -0700 (PDT) Received: from localhost ([::1]:59270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAfY-0001RP-VE for importer@patchew.org; Tue, 17 Mar 2020 07:46:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43650) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAac-0000ad-TA for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAab-0003TW-HG for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:54 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:38649) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAab-0003LB-8T for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:53 -0400 Received: by mail-wm1-x342.google.com with SMTP id t13so15202180wmi.3 for ; Tue, 17 Mar 2020 04:40:53 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=uJezzTDs3XobR7ONkeF8BKlCK+ZTZQttyc6HsBQx6+8=; b=mLp7vdgquFY3QNk1KOtLMNSKRH7EzMQlkUaN2McgyOalSkS+KJc6SaO0oR98fGCQzY I5JpT/yxVj3VYvGkNJMNK7bsdfVDb6JM73fRxoKVr3Eo8TbGoVP4lT+EdKvxsABdWaNh cCsGgopQEB7GT7j0Efr1867i5AN9Ap4y+HqQwWdkk5lkMhE2hb6rNRKkZS93jJFeyF2R T244CWZnGm4bbP5lAnsMO/2ZofqrFIVk1Ihe5Wflp25x5BQarm+69zVrDo5HOKZcXOeT 06ZMjdzQysLUF36kcYTWm7Nv7RN0K+6+mh6iL18Ib9L/wZt0bAobUR1xZkNWuyJCZowX Km4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uJezzTDs3XobR7ONkeF8BKlCK+ZTZQttyc6HsBQx6+8=; b=qEYauY7/7n/gC1j2MfCRzxuOikA1jgoBRo8GZb1+EJyaMNzP+88UUA4zbTU6ohb5Js sPQOWN+aG/aN366I8PvJB0kXUuW85R4TEAwSKsh5A0FAOsEpMqvG2Tc5grD3Xl1TInJO TqEEAaAkIkQl8VG016dJd8TIN2HVIyBz8tNtop3KcGzyrfDMZZVQYEuZVoB+dW/kVV6Z ojic68TkQ/lh3CAI7AVciIjZvy7jtxnTz8/5WWrbOtg+mmQuWHuqm3LHBkRFLl7eeX+S 8pOyZTaHDIsG3fLNo0n/nR2vnGJDWcAzdCpg05mTedtJ6r1oWe6glTLo2CjDkQKsOtJV QBfg== X-Gm-Message-State: ANhLgQ1dxns75dDaI94TpG6XGDO0Xmz9zcMggaOO15A1d2/ul3o9siOg 8BRvPy60CYiiJBo0W9Btf8LpfnVVnvQoRA== X-Google-Smtp-Source: ADFU+vuImWy916hIC16u5l3FZrAGLs/EdluiB1K++vtpL4WBRXAMzRtfcm0H3QSxTvZWwuVO+357sg== X-Received: by 2002:a7b:c458:: with SMTP id l24mr4849938wmi.120.1584445252054; Tue, 17 Mar 2020 04:40:52 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/11] m25p80: Improve command handling for unsupported commands Date: Tue, 17 Mar 2020 11:40:37 +0000 Message-Id: <20200317114039.26914-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Guenter Roeck Whenever an unsupported command is encountered, the current code interprets each transferred byte as new command. Most of the time, those 'commands' are interpreted as new unknown commands. However, in rare cases, it may be that for example address or length information passed with the original command is by itself a valid command. If that happens, the state machine may get completely confused and, worst case, start writing data into the flash or even erase it. To avoid the problem, transition into STATE_READING_DATA and keep sending a value of 0 until the chip is deselected after encountering an unsupported command. Signed-off-by: Guenter Roeck Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Peter Maydell --- hw/block/m25p80.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 53bf63856f5..82270884416 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -1161,6 +1161,11 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->quad_enable =3D false; break; default: + s->pos =3D 0; + s->len =3D 1; + s->state =3D STATE_READING_DATA; + s->data_read_loop =3D true; + s->data[0] =3D 0; qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Unknown cmd %x\n", value); break; } --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445608; cv=none; d=zohomail.com; s=zohoarc; b=DQQR/CY3+nPo37GOD2vn340h1dl1ElPe17ADd+LC5cxvOqc/JG4Q2yeoYvnFqZtd0R3tfGvmUxMi96vhoBJFrITKXM+aSmd3XLqZQxs9odTNKcaa7y6w6x4D6u9oAKWNryEFLKt+H+ujvnDAXuyshENxktz2IUJLCb+fDlbJdyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445608; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jyfKZxmYAbu3IZ0cWkZdHudvDWFaFVhw3+dbnWWC1P0=; b=IudY2ObUYn/VIG+Ndu+/FpsHVbRoCDYLo+Fa3rmRfG5t6m2IIiGyScXnw3v1KK+plFOn9zAgVMt8K+Id/dCvevW5UObAXiyEZtmOLVsN8KSq9/rPFhJd9O0IAMvGoJ0bBwJNxMLuRnhtXfSaym0uP433CBp3rTfvY7iJE71fAN4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445608944942.4051196686503; Tue, 17 Mar 2020 04:46:48 -0700 (PDT) Received: from localhost ([::1]:59286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAgJ-0002bj-PC for importer@patchew.org; Tue, 17 Mar 2020 07:46:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43678) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAad-0000dq-UA for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAac-0003bf-HR for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:55 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34621) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAac-0003UM-9f for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:54 -0400 Received: by mail-wr1-x435.google.com with SMTP id z15so25170769wrl.1 for ; Tue, 17 Mar 2020 04:40:54 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jyfKZxmYAbu3IZ0cWkZdHudvDWFaFVhw3+dbnWWC1P0=; b=q3UfIIp7vASNk/GfuZbbPGOXx8m7+J21JZgDlIDB6f1F1+jU0Uc2pUIWv5jVu6jrbE ZviW5EIrfwzFhk+6bBcvq8kQ/B9jEhGs6pNUw0sdGldg2N77WjNOSJKIc0MUGNT7w3AC JY6tAHhrhw/EtYPtniODBOq7tKs6ZTrjn2HpN9lUMFNGgt6yKnD7ELCnFBUp+9ldyT/F Q5Fkl5RBc2fvYp6Y/gEoXbDSiCePNKHxpsvA6lgtPc3EHVg2h939fArIJB+Iwr5oXqfR Sx5Bp7ebqSJPrjp/jTtT9TbdR/51DCkIbZJliC0/n6sVlUXAbc856a+dR5OB6FgyeDpb CEWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jyfKZxmYAbu3IZ0cWkZdHudvDWFaFVhw3+dbnWWC1P0=; b=p0T0UDvJkPtBCGDeSGB6foO27prFZd5v7CWtVs97ybhn7oq6h1+YSsa68oM5Nq47Tr FoKiiahec384qVTsuSkWCe4HE1FYLNCkf06rWlva40IIFr/tKNV2TlEd5sKvYBfnCciT UNp8UdLrKIPdTsko+aY+YpWoPXCJ9FR/we3FkLdnPBU3841uPB3WCr1LZ3Gu62fiRxIo 5zj+zcU4F1U9Ng+nLDOww2CAf69n9gGR3uXXdVTPzHaKi2l0rWVPrIrYCmfu1PvAajzR 7lZRKf4686Ov9f64WVCZycvhVFhL34HEbPXqObdqjdeWeKhDl6md0BMBq6wBA48K39Fh jy6Q== X-Gm-Message-State: ANhLgQ0vqWXeRhKKXK2PZBTNHP7Yz9IvCsLAAWkiqyHO/VyVUmwKl2S2 oM9WY0gLgkuwth58ZnnpvbrYijHwzdqHZw== X-Google-Smtp-Source: ADFU+vvr+Bfz1g4ME5uN8GlXGCH+Qpo5uyumGDbl576JhV8w8eP3bT0s24oYMGWOkuZszVKfXFeLaA== X-Received: by 2002:adf:f0cb:: with SMTP id x11mr955379wro.13.1584445253034; Tue, 17 Mar 2020 04:40:53 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/11] aspeed/smc: Fix number of dummy cycles for FAST_READ_4 command Date: Tue, 17 Mar 2020 11:40:38 +0000 Message-Id: <20200317114039.26914-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Guenter Roeck The Linux kernel recently started using FAST_READ_4 commands. This results in flash read failures. At the same time, the m25p80 emulation is seen to read 8 more bytes than expected. Adjusting the expected number of dummy cycles to match FAST_READ fixes the problem. Fixes: f95c4bffdc4c ("aspeed/smc: snoop SPI transfers to fake dummy cycles") Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Guenter Roeck Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peter Maydell --- hw/ssi/aspeed_smc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 32be2a02b0e..9d5c696d5a1 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -788,11 +788,11 @@ static int aspeed_smc_num_dummies(uint8_t command) case FAST_READ: case DOR: case QOR: + case FAST_READ_4: case DOR_4: case QOR_4: return 1; case DIOR: - case FAST_READ_4: case DIOR_4: return 2; case QIOR: --=20 2.20.1 From nobody Sun Apr 28 15:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1584445673; cv=none; d=zohomail.com; s=zohoarc; b=mYB2N43IBsUZbJglWQ97HyskXWv0ehvASm0ePlKxvAwF3VDYK5WKdgGsg30y4HV4uxd/L631ySWM6GBLUbv8XlbDJ9DbLYLVhn7BBDwIUiLI7HhRV5U3nJXn+mHA91Rr6d2yo2exhuEmd50E1UPJMAPbSYcaQgxUk/51XX2Hx1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584445673; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ua1+sx+ArThYkjHUd6R8UKXnZNXGP9jD04wMaayZK/g=; b=nvsZsNwc9u11Z4ptpmDzRLQ0HFOJCof5+LflXIUHAtRQFdELx1b2NiM0RN//yj1xuFyE6DP7+/3mz4M0fDRc2yJmeNJTnjtvAxc0B++hTELxE7/oYIZSxe6VV7V6K0VRhjgbz8Cm5GivEJSnYvwGJdbbLPooYF+qUzLtWCOQvyw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584445673535765.4489312825582; Tue, 17 Mar 2020 04:47:53 -0700 (PDT) Received: from localhost ([::1]:59322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAhM-0004lY-Eu for importer@patchew.org; Tue, 17 Mar 2020 07:47:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43697) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAae-0000fM-Jq for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAad-0003l1-J8 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:56 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44405) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEAad-0003dA-BP for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:40:55 -0400 Received: by mail-wr1-x42e.google.com with SMTP id y2so9714272wrn.11 for ; Tue, 17 Mar 2020 04:40:55 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a186sm3577443wmh.33.2020.03.17.04.40.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2020 04:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ua1+sx+ArThYkjHUd6R8UKXnZNXGP9jD04wMaayZK/g=; b=RL5YB2oG3iArlwHLksWx2nyZPiRFTp2VvJLygY4em9a9szirrPcXmfjykmXYR8Ocrz qAm+oVzdnDmtp5BKl7d9266Dl0goENy0DC8oQSuAZZMwAwM6ggA0jr2Bdlat399Q9SMj Bu5+Kk+fJO/HcZH7O8qqlCw1NocrggcEXFA6EL+6QOw3zWMZqQo6ZyR8jQgEnnmoFNjB JML39hu5fXsBRSrH7PWbkVv5dUMM49F5rgzPSgE/p6FpG4+xCrArEMmF4+85odtLUdxy Yt3WvV4hC0NJUXKg7TZ/mN+ks3kOKBdAoAajjQWpt67sOtVs8qPXbnyJ4cj7EAOBlZW9 HXJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ua1+sx+ArThYkjHUd6R8UKXnZNXGP9jD04wMaayZK/g=; b=M4MtIZCKY9dQuRA4fcgu8jwziMB4iTZnv5b2/SeStfZ7e4iyAq1Hh9Yp0Vxt/eXgrr OGK8GV9Q2KtiLgIncTxrpeTh02Nwjgxg4p5oYJ9+c3Q2RFTPMGcq88N1myXWtaPp+2M4 TimP0+flr2b4cKAMsMIpw53taG2PqMUmO4gEqC8KTayhzRFyDYpsBisVfgRA1iI32unY b0R0mHLVTxs2/pcVM+j6XATyYNZyA8W90b47zw/PcBtQyeEnRbssxTtOlykmE+FtP7mH DGvExW381Jv5Mvc7L4H6FY5P6ZpwecDDbFD+iLQVpTOpS9zDgDnczpp3znDikRG4ph9t ZLDQ== X-Gm-Message-State: ANhLgQ3erLoDkB/HJSJKRhQ1lDsB62GOlhZInRBNnxmNGX6Vk9KckIfa qOxtHP8mz5KtdJr+5ewW643chg7vgwaKuA== X-Google-Smtp-Source: ADFU+vsDgqItHnRVMDxy1toPka4x8136yMjRoUaxSSOYOZsDUyMa4RX/H4XtwgCNGHeJatmLUf9e6g== X-Received: by 2002:adf:e883:: with SMTP id d3mr5548209wrm.75.1584445254011; Tue, 17 Mar 2020 04:40:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/11] hw/arm/pxa2xx: Do not wire up OHCI for PXA255 Date: Tue, 17 Mar 2020 11:40:39 +0000 Message-Id: <20200317114039.26914-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317114039.26914-1-peter.maydell@linaro.org> References: <20200317114039.26914-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Guenter Roeck PXA255 does not support a USB OHCI controller, so don't wire it up. Signed-off-by: Guenter Roeck Message-id: 20200313160215.28155-1-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/pxa2xx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 56a36202d71..336c9bad4ae 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -2290,9 +2290,6 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space,= unsigned int sdram_size) s->ssp[i] =3D (SSIBus *)qdev_get_child_bus(dev, "ssi"); } =20 - sysbus_create_simple("sysbus-ohci", 0x4c000000, - qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1)); - s->pcmcia[0] =3D pxa2xx_pcmcia_init(address_space, 0x20000000); s->pcmcia[1] =3D pxa2xx_pcmcia_init(address_space, 0x30000000); =20 --=20 2.20.1