Arm-dev October 2015

arm-dev@lists.centos.org

12 participants
10 discussions

Gigabyte MP30-AR0
by Gordan Bobic 12 Nov '19

12 Nov '19

Hi, I am toying with the idea of getting a Gigabyte MP30-AR0 board (despite the insanely exorbitant price tag). Has anyone got the aarch64 CentOS working on one of those? Any special instructions? Also, if I get the ISO, is it bootable on aarch64? Does the installer work? Or does the image have to be used like on 32-bit ARM? Thanks. Gordan

10 197

ARMv8 virtualization support packages
by Lomovtsev, Vadim 21 Oct '15

21 Oct '15

Hi guys, As far as I know currently the virtualization support is stripped off the aarch64 build... Are there any info about virtualization support packages to be included into CentOS 7 aarch64 platform? Or may be there are some plans/roadmap where it will be available at CentOS? Just out of curiosity - anybody interested in virtialization support at CentOS fro aarch64 ? Vadim

2 2

backport request to fix a glibc bug in CentOS 7 aarch64
by Stefano Stabellini 19 Oct '15

19 Oct '15

Hi all, glibc in CentOS 7 aarch64 has a bug: see https://bugs.launchpad.net/linaro-aarch64/+bug/1169164. Including signal.h causes the following symbols to be defined (they are actually in ptrace.h but signal.h includes it): #define PSR_MODE_EL0t 0x00000000 #define PSR_MODE_EL1t 0x00000004 #define PSR_MODE_EL1h 0x00000005 #define PSR_MODE_EL2t 0x00000008 #define PSR_MODE_EL2h 0x00000009 #define PSR_MODE_EL3t 0x0000000c #define PSR_MODE_EL3h 0x0000000d #define PSR_MODE_MASK 0x0000000f The presence of these symbols causes build failures of some Xen userspace applications, because they clash with the same symbols there. signal.h is POSIX so is restricted in what namespace is permitted to claim. Glibc has been fixed a while back: https://sourceware.org/ml/libc-alpha/2014-05/msg00327.html. The commit is the following: commit 7d05a8168b45c0580e1f9a79c2dd26c8f0d31fca Author: Yvan Roux <yvan.roux(a)linaro.org> Date: Tue May 20 13:45:22 2014 +0100 AArch64: Remove asm/ptrace.h inclusion in sys/user.h and sys/procfs.h It fixes the problem by removing the inclusion of ptrace.h from two other headers. The change allows Xen and any other applications which define PSR_MODE_ symbols to build appropriately. Nothing else should be affected. Any chances we can have that patch in the CentOS 7 aarch64 glibc? Thanks, Stefano

2 8

Cubieboard2 - selinux enforcing fails
by Robert Moskowitz 17 Oct '15

17 Oct '15

I had to rebuild me image from scratch, so this time, instead of permissive, I decided to set enforcing for selinux. I powered off and powered back on. What ever happened (and I can send the serial console to anyone wanting to review this), the system rebooted and came back around finally to login. Once I logged in, I saw that the ethernet was not available. So I am going to redo this and just leave selinux to disabled until we get further along (and someone else tests it out!). I am running all my systems behind two firewalls and will just have to rely on that for now.

5 7

Roseapple Pi Giveaway Event
by T.J. Yang 14 Oct '15

14 Oct '15

Hi All My first post here in this group. There is a giveaway event happening on Roseapp Pi F.B. page <https://www.facebook.com/roseapplepi?fref=ts>. You can fill the google form <http://goo.gl/forms/804Bo9e854> to apply for one. I got mine already, hope you get yours too ;) [rapi@f21rapi02 owl]$ cat /proc/cpuinfo |grep ^Hardware Hardware : gs705a [rapi@f21rapi02 owl]$ [rapi@f21rapi02 owl]$ cat /etc/os-release NAME=Fedora VERSION="21 (Twenty One)" ID=fedora VERSION_ID=21 PRETTY_NAME="Fedora 21 (Twenty One)" ANSI_COLOR="0;34" CPE_NAME="cpe:/o:fedoraproject:fedora:21" HOME_URL="https://fedoraproject.org/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_BUGZILLA_PRODUCT="Fedora" REDHAT_BUGZILLA_PRODUCT_VERSION=21 REDHAT_SUPPORT_PRODUCT="Fedora" REDHAT_SUPPORT_PRODUCT_VERSION=21 [rapi@f21rapi02 owl]$ -- T.J. Yang

1 0

Building failing C7 ARM packages (atlas)
by PixelDrift.NET Sam 09 Oct '15

09 Oct '15

Hi, I have recently been working through some of the failed CentOS 7 ARM RPM builds (http://armv7.dev.centos.org/report.html) with the following successful builds: atlas (F21) http://arm.koji.fedoraproject.org/koji/buildinfo?buildID=260230 suitesparse (C7) gegl (C7) scipy (C7) gimp (C7) gsl (C7) bogofilter (C7) evolution (C7) evolution-ews (C7) evolution-mapi (C7) gutenprint (C7) brasero (C7 Modified BuildRequires brasero-devel) rhythmbox (C7) With atlas there appears to be a patch in the Fedora stream for the same version which fixes the armv7 build issue which appears to be blocking this package in the automated build process: * Sun Feb 16 2014 Marcin Juszkiewicz <mjuszkiewicz(a)redhat.com> - 3.10.1-11 - Unbreak AArch64 build. - ARMv8 is different from ARMv7 so should not be treated as such. Otherwise atlas tries to do some crazy ARMv764 build and fail. After building atlas with the fixed package I was able to proceed building the other listed packages with their original C7 srpms. Can someone advise on the process for getting the patch from the Fedora package into C7? Thanks in advance. -Sam

3 4

current build status
by Fabian Arrotin 07 Oct '15

07 Oct '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Just to let you know that I've spent (some) time today on some remaining packages, and some new packages built fine. If someone else also want to have a look at why the remaining packages don't build (probably need patches now), feel free to contribute ;-) Depending on how it goes, we can eventually decide to go to pass-2 (massive rebuild) against pass-1 only and then evaluate again. Then decide the current status (and updates to be built) , push "official" images for public consumption for various boards (and automate all that), and release the tree to mirrors (after having signed the whole tree) Happy week-end - -- Fabian Arrotin The CentOS Project | http://www.centos.org gpg key: 56BEC54E | twitter: @arrfab -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iEYEARECAAYFAlYFkv0ACgkQnVkHo1a+xU6PTQCeKA8uoMJoovixxtgMfV/8PbrN YRcAniUiRefyMqiU++NPkJG9mkUBdKVa =WVKq -----END PGP SIGNATURE-----

4 5

Submitting a roll-up patch to support 2nd SGMII and XFI ports for APM X-Gene
by Y Vo 02 Oct '15

02 Oct '15

Hi all, I am Y Vo from AppliedMicro. Per APM’s recent discussion with Jim Perrin, we’ll be sending a patch which rolls up several commits already accepted into upstream kernel in order to support the 2nd SGMII and XFI interfaces for X-Gene. This is applicable for the current CentOS 7.1 release based on kernel 3.19. Regards, Y

2 2

[PATCH] driver: net: xgene: Add support SGMII1 XFI1 on Centos 3.19
by Y Vo 02 Oct '15

02 Oct '15

This is a rollup of the following patches that apply to kernel 3.19. It mainly adds support for the 2nd SGMII port and 2nd XFI port of X-Gene 1 and Ring Manager v2 support for X-Gene 2. Besides, there are various bug fixes. Theses patches have been incorporated in the latest kernel.org linux-stable tree, except the first one which has been accepted into linux-next tree. 149e9ab driver: net: xgene: Add support for 2nd 10GbE port ccc02dd drivers: net: xgene: fix: Oops in linkwatch_fire_event. 2e59871 drivers: net: xgene: Pre-initialize ret in xgene_enet_get_resources(). 8beeef8 drivers: net: xgene: fix for ACPI support without ACPI c2d33bd drivers: net: xgene: Check for IS_ERR rather than NULL for clock. 822e34a drivers: net: xgene: Add ACPI support for SGMII0 and XFI1 interface of 2nd H/W version of APM X-Gene SoC ethernet controller. 2c7be0a drivers: net: xgene: Implement the backward compatibility with the old and new firmware w.r.t Tx completion IRQ interrupt. 0738c54 drivers: net: xgene: Fix the ACPI support for RGMII/SGMII0/XFI interface of APM X-Gene SoC ethernet controller. ccad725 net: xgene_enet: Set hardware dependency 9dd3c79 drivers: net: xgene: fix kbuild warnings 561fea6 drivers: net: xgene: Add SGMII based 1GbE support with ring manager v2 bc1b7c1 drivers: net: xgene: Add 10GbE support with ring manager v2 ed9b7da drivers: net: xgene: Add ring manager v2 functions 81cefb8 drivers: net: xgene: Change ring manager to use function pointers d313464 dtb: xgene: Add interrupt for Tx completion 6772b65 drivers: net: xgene: Add separate tx completion ring ca62645 drivers: net: xgene: Add second SGMII based 1G interface a6b0dc2 drivers: net: xgene: constify of_device_id array 163cff3 drivers: net: xgene: Make xgene_enet_of_match depend on CONFIG_OF 3ec7a17 net: eth: xgene: devm_ioremap() returns NULL on error de7b5b3 net: eth: xgene: change APM X-Gene SoC platform ethernet to support ACPI Signed-off-by: Y Vo <yvo(a)apm.com> Signed-off-by: Chuong Tran <cltran(a)apm.com> Signed-off by: Phong Vo <pvo(a)apm.com> --- arch/arm64/boot/dts/apm/apm-mustang.dts | 4 + arch/arm64/boot/dts/apm/apm-storm.dtsi | 32 ++- drivers/net/ethernet/apm/xgene/Kconfig | 1 + drivers/net/ethernet/apm/xgene/Makefile | 2 +- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 114 +++-- drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 20 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 527 +++++++++++++++------ drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 63 +++- drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 200 ++++++++ drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h | 49 ++ drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 84 ++-- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 21 +- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 20 + 13 files changed, 884 insertions(+), 253 deletions(-) create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h diff --git a/arch/arm64/boot/dts/apm/apm-mustang.dts b/arch/arm64/boot/dts/apm/apm-mustang.dts index eefe77b..da35bb3 100644 --- a/arch/arm64/boot/dts/apm/apm-mustang.dts +++ b/arch/arm64/boot/dts/apm/apm-mustang.dts @@ -49,6 +49,10 @@ status = "ok"; }; +&sgenet1 { + status = "ok"; +}; + &xgenet { status = "ok"; }; diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi index ceb5417..74a1a7d 100644 --- a/arch/arm64/boot/dts/apm/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi @@ -202,6 +202,16 @@ clock-output-names = "sge0clk"; }; + sge1clk: sge1clk@1f21c000 { + compatible = "apm,xgene-device-clock"; + #clock-cells = <1>; + clocks = <&socplldiv2 0>; + reg = <0x0 0x1f21c000 0x0 0x1000>; + reg-names = "csr-reg"; + csr-mask = <0xc>; + clock-output-names = "sge1clk"; + }; + xge0clk: xge0clk@1f61c000 { compatible = "apm,xgene-device-clock"; #clock-cells = <1>; @@ -715,13 +725,30 @@ <0x0 0x1f200000 0x0 0Xc300>, <0x0 0x1B000000 0x0 0X200>; reg-names = "enet_csr", "ring_csr", "ring_cmd"; - interrupts = <0x0 0xA0 0x4>; + interrupts = <0x0 0xA0 0x4>, + <0x0 0xA1 0x4>; dma-coherent; clocks = <&sge0clk 0>; local-mac-address = [00 00 00 00 00 00]; phy-connection-type = "sgmii"; }; + sgenet1: ethernet@1f210030 { + compatible = "apm,xgene1-sgenet"; + status = "disabled"; + reg = <0x0 0x1f210030 0x0 0xd100>, + <0x0 0x1f200000 0x0 0Xc300>, + <0x0 0x1B000000 0x0 0X8000>; + reg-names = "enet_csr", "ring_csr", "ring_cmd"; + interrupts = <0x0 0xAC 0x4>, + <0x0 0xAD 0x4>; + port-id = <1>; + dma-coherent; + clocks = <&sge1clk 0>; + local-mac-address = [00 00 00 00 00 00]; + phy-connection-type = "sgmii"; + }; + xgenet: ethernet@1f610000 { compatible = "apm,xgene1-xgenet"; status = "disabled"; @@ -729,7 +756,8 @@ <0x0 0x1f600000 0x0 0Xc300>, <0x0 0x18000000 0x0 0X200>; reg-names = "enet_csr", "ring_csr", "ring_cmd"; - interrupts = <0x0 0x60 0x4>; + interrupts = <0x0 0x60 0x4>, + <0x0 0x61 0x4>; dma-coherent; clocks = <&xge0clk 0>; /* mac address will be overwritten by the bootloader */ diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig index f4054d2..19e38af 100644 --- a/drivers/net/ethernet/apm/xgene/Kconfig +++ b/drivers/net/ethernet/apm/xgene/Kconfig @@ -1,6 +1,7 @@ config NET_XGENE tristate "APM X-Gene SoC Ethernet Driver" depends on HAS_DMA + depends on ARCH_XGENE || COMPILE_TEST select PHYLIB help This is the Ethernet driver for the on-chip ethernet interface on the diff --git a/drivers/net/ethernet/apm/xgene/Makefile b/drivers/net/ethernet/apm/xgene/Makefile index 68be565..700b5ab 100644 --- a/drivers/net/ethernet/apm/xgene/Makefile +++ b/drivers/net/ethernet/apm/xgene/Makefile @@ -3,5 +3,5 @@ # xgene-enet-objs := xgene_enet_hw.o xgene_enet_sgmac.o xgene_enet_xgmac.o \ - xgene_enet_main.o xgene_enet_ethtool.o + xgene_enet_main.o xgene_enet_ring2.o xgene_enet_ethtool.o obj-$(CONFIG_NET_XGENE) += xgene-enet.o diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c index e14a4f1..b0c7227 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c @@ -87,10 +87,11 @@ static void xgene_enet_ring_rd32(struct xgene_enet_desc_ring *ring, static void xgene_enet_write_ring_state(struct xgene_enet_desc_ring *ring) { + struct xgene_enet_pdata *pdata = netdev_priv(ring->ndev); int i; xgene_enet_ring_wr32(ring, CSR_RING_CONFIG, ring->num); - for (i = 0; i < NUM_RING_CONFIG; i++) { + for (i = 0; i < pdata->ring_ops->num_ring_config; i++) { xgene_enet_ring_wr32(ring, CSR_RING_WR_BASE + (i * 4), ring->state[i]); } @@ -98,7 +99,7 @@ static void xgene_enet_write_ring_state(struct xgene_enet_desc_ring *ring) static void xgene_enet_clr_ring_state(struct xgene_enet_desc_ring *ring) { - memset(ring->state, 0, sizeof(u32) * NUM_RING_CONFIG); + memset(ring->state, 0, sizeof(ring->state)); xgene_enet_write_ring_state(ring); } @@ -106,7 +107,8 @@ static void xgene_enet_set_ring_state(struct xgene_enet_desc_ring *ring) { xgene_enet_ring_set_type(ring); - if (xgene_enet_ring_owner(ring->id) == RING_OWNER_ETH0) + if (xgene_enet_ring_owner(ring->id) == RING_OWNER_ETH0 || + xgene_enet_ring_owner(ring->id) == RING_OWNER_ETH1) xgene_enet_ring_set_recombbuf(ring); xgene_enet_ring_init(ring); @@ -141,8 +143,8 @@ static void xgene_enet_clr_desc_ring_id(struct xgene_enet_desc_ring *ring) xgene_enet_ring_wr32(ring, CSR_RING_ID_BUF, 0); } -struct xgene_enet_desc_ring *xgene_enet_setup_ring( - struct xgene_enet_desc_ring *ring) +static struct xgene_enet_desc_ring *xgene_enet_setup_ring( + struct xgene_enet_desc_ring *ring) { u32 size = ring->size; u32 i, data; @@ -168,7 +170,7 @@ struct xgene_enet_desc_ring *xgene_enet_setup_ring( return ring; } -void xgene_enet_clear_ring(struct xgene_enet_desc_ring *ring) +static void xgene_enet_clear_ring(struct xgene_enet_desc_ring *ring) { u32 data; bool is_bufpool; @@ -186,6 +188,22 @@ out: xgene_enet_clr_ring_state(ring); } +static void xgene_enet_wr_cmd(struct xgene_enet_desc_ring *ring, int count) +{ + iowrite32(count, ring->cmd); +} + +static u32 xgene_enet_ring_len(struct xgene_enet_desc_ring *ring) +{ + u32 __iomem *cmd_base = ring->cmd_base; + u32 ring_state, num_msgs; + + ring_state = ioread32(&cmd_base[1]); + num_msgs = GET_VAL(NUMMSGSINQ, ring_state); + + return num_msgs; +} + void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring, struct xgene_enet_pdata *pdata, enum xgene_enet_err_code status) @@ -593,12 +611,12 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata) if (!xgene_ring_mgr_init(pdata)) return -ENODEV; - if (pdata->clk) { + if (!IS_ERR(pdata->clk)) { clk_prepare_enable(pdata->clk); clk_disable_unprepare(pdata->clk); clk_prepare_enable(pdata->clk); + xgene_enet_ecc_init(pdata); } - xgene_enet_ecc_init(pdata); xgene_enet_config_ring_if_assoc(pdata); /* Enable auto-incr for scanning */ @@ -612,16 +630,8 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata) static void xgene_gport_shutdown(struct xgene_enet_pdata *pdata) { - u32 val = 0xffffffff; - - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIFPDISABLE_ADDR, val); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIFPRESET_ADDR, val); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIFPDISABLE_ADDR, 0); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIWQDISABLE_ADDR, val); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIWQRESET_ADDR, val); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIWQDISABLE_ADDR, 0); - - clk_disable_unprepare(pdata->clk); + if (!IS_ERR(pdata->clk)) + clk_disable_unprepare(pdata->clk); } static int xgene_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum) @@ -685,7 +695,7 @@ static int xgene_enet_phy_connect(struct net_device *ndev) phy_dev = pdata->phy_dev; - if (phy_dev == NULL || + if (!phy_dev || phy_connect_direct(ndev, phy_dev, &xgene_enet_adjust_link, pdata->phy_mode)) { netdev_err(ndev, "Could not connect to PHY\n"); @@ -701,23 +711,37 @@ static int xgene_enet_phy_connect(struct net_device *ndev) return 0; } -#ifdef CONFIG_ACPI -static int xgene_acpi_mdiobus_register(struct xgene_enet_pdata *pdata, - struct mii_bus *mdio) +static int xgene_mdiobus_register(struct xgene_enet_pdata *pdata, + struct mii_bus *mdio) { struct device *dev = &pdata->pdev->dev; + struct net_device *ndev = pdata->ndev; struct phy_device *phy; - int i, ret; + struct device_node *child_np; + struct device_node *mdio_np = NULL; + int ret; u32 phy_id; + if (dev->of_node) { + for_each_child_of_node(dev->of_node, child_np) { + if (of_device_is_compatible(child_np, + "apm,xgene-mdio")) { + mdio_np = child_np; + break; + } + } + + if (!mdio_np) { + netdev_dbg(ndev, "No mdio node in the dts\n"); + return -ENXIO; + } + + return of_mdiobus_register(mdio, mdio_np); + } + /* Mask out all PHYs from auto probing. */ mdio->phy_mask = ~0; - /* Clear all the IRQ properties */ - if (mdio->irq) - for (i = 0; i < PHY_MAX_ADDR; i++) - mdio->irq[i] = PHY_POLL; - /* Register the MDIO bus */ ret = mdiobus_register(mdio); if (ret) @@ -725,6 +749,8 @@ static int xgene_acpi_mdiobus_register(struct xgene_enet_pdata *pdata, ret = device_property_read_u32(dev, "phy-channel", &phy_id); if (ret) + ret = device_property_read_u32(dev, "phy-addr", &phy_id); + if (ret) return -EINVAL; phy = get_phy_device(mdio, phy_id, false); @@ -739,31 +765,13 @@ static int xgene_acpi_mdiobus_register(struct xgene_enet_pdata *pdata, return ret; } -#else -#define xgene_acpi_mdiobus_register(a, b) -1 -#endif int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata) { struct net_device *ndev = pdata->ndev; - struct device *dev = &pdata->pdev->dev; - struct device_node *child_np; - struct device_node *mdio_np = NULL; struct mii_bus *mdio_bus; int ret; - for_each_child_of_node(dev->of_node, child_np) { - if (of_device_is_compatible(child_np, "apm,xgene-mdio")) { - mdio_np = child_np; - break; - } - } - - if (dev->of_node && !mdio_np) { - netdev_dbg(ndev, "No mdio node in the dts\n"); - return -ENXIO; - } - mdio_bus = mdiobus_alloc(); if (!mdio_bus) return -ENOMEM; @@ -777,10 +785,7 @@ int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata) mdio_bus->priv = pdata; mdio_bus->parent = &ndev->dev; - if (dev->of_node) - ret = of_mdiobus_register(mdio_bus, mdio_np); - else - ret = xgene_acpi_mdiobus_register(pdata, mdio_bus); + ret = xgene_mdiobus_register(pdata, mdio_bus); if (ret) { netdev_err(ndev, "Failed to register MDIO bus\n"); mdiobus_free(mdio_bus); @@ -820,3 +825,12 @@ struct xgene_port_ops xgene_gport_ops = { .cle_bypass = xgene_enet_cle_bypass, .shutdown = xgene_gport_shutdown, }; + +struct xgene_ring_ops xgene_ring1_ops = { + .num_ring_config = NUM_RING_CONFIG, + .num_ring_id_shift = 6, + .setup = xgene_enet_setup_ring, + .clear = xgene_enet_clear_ring, + .wr_cmd = xgene_enet_wr_cmd, + .len = xgene_enet_ring_len, +}; diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h index 5385351..541bed0 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h @@ -26,6 +26,7 @@ struct xgene_enet_pdata; struct xgene_enet_stats; +struct xgene_enet_desc_ring; /* clears and then set bits */ static inline void xgene_set_bits(u32 *dst, u32 val, u32 start, u32 len) @@ -97,10 +98,12 @@ enum xgene_enet_rm { #define QCOHERENT BIT(4) #define RECOMBBUF BIT(27) +#define MAC_OFFSET 0x30 + #define BLOCK_ETH_CSR_OFFSET 0x2000 #define BLOCK_ETH_RING_IF_OFFSET 0x9000 +#define BLOCK_ETH_CLKRST_CSR_OFFSET 0xc000 #define BLOCK_ETH_DIAG_CSR_OFFSET 0xD000 - #define BLOCK_ETH_MAC_OFFSET 0x0000 #define BLOCK_ETH_MAC_CSR_OFFSET 0x2800 @@ -155,13 +158,6 @@ enum xgene_enet_rm { #define TX_DV_GATE_EN0 BIT(2) #define RX_DV_GATE_EN0 BIT(1) #define RESUME_RX0 BIT(0) -#define ENET_CFGSSQMIFPDISABLE_ADDR 0x10 -#define ENET_CFGSSQMIFPRESET_ADDR 0x14 -#define ENET_CFGSSQMIWQDISABLE_ADDR 0x18 -#define ENET_CFGSSQMIWQRESET_ADDR 0x1c -#define ENET_CFGSSQMIFPNUMENTRIES0_ADDR 0x30 -#define ENET_CFGSSQMIWQNUMENTRIES0_ADDR 0x50 - #define ENET_CFGSSQMIWQASSOC_ADDR 0xe0 #define ENET_CFGSSQMIFPQASSOC_ADDR 0xdc #define ENET_CFGSSQMIQMLITEFPQASSOC_ADDR 0xf0 @@ -266,6 +262,7 @@ enum xgene_enet_ring_type { enum xgene_ring_owner { RING_OWNER_ETH0, + RING_OWNER_ETH1, RING_OWNER_CPU = 15, RING_OWNER_INVALID }; @@ -319,9 +316,6 @@ static inline u16 xgene_enet_get_numslots(u16 id, u32 size) size / WORK_DESC_SIZE; } -struct xgene_enet_desc_ring *xgene_enet_setup_ring( - struct xgene_enet_desc_ring *ring); -void xgene_enet_clear_ring(struct xgene_enet_desc_ring *ring); void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring, struct xgene_enet_pdata *pdata, enum xgene_enet_err_code status); @@ -332,8 +326,6 @@ bool xgene_ring_mgr_init(struct xgene_enet_pdata *p); extern struct xgene_mac_ops xgene_gmac_ops; extern struct xgene_port_ops xgene_gport_ops; - -extern struct xgene_mac_ops xgene_gmac_ops; -extern struct xgene_port_ops xgene_gport_ops; +extern struct xgene_ring_ops xgene_ring1_ops; #endif /* __XGENE_ENET_HW_H__ */ diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index 987fb56..58b7e29 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -24,6 +24,13 @@ #include "xgene_enet_sgmac.h" #include "xgene_enet_xgmac.h" +#define RES_ENET_CSR 0 +#define RES_RING_CSR 1 +#define RES_RING_CMD 2 + +static const struct of_device_id xgene_enet_of_match[]; +static const struct acpi_device_id xgene_enet_acpi_match[]; + static void xgene_enet_init_bufpool(struct xgene_enet_desc_ring *buf_pool) { struct xgene_enet_raw_desc16 *raw_desc; @@ -44,6 +51,7 @@ static int xgene_enet_refill_bufpool(struct xgene_enet_desc_ring *buf_pool, { struct sk_buff *skb; struct xgene_enet_raw_desc16 *raw_desc; + struct xgene_enet_pdata *pdata; struct net_device *ndev; struct device *dev; dma_addr_t dma_addr; @@ -54,6 +62,7 @@ static int xgene_enet_refill_bufpool(struct xgene_enet_desc_ring *buf_pool, ndev = buf_pool->ndev; dev = ndev_to_dev(buf_pool->ndev); + pdata = netdev_priv(ndev); bufdatalen = BUF_LEN_CODE_2K | (SKB_BUFFER_SIZE & GENMASK(11, 0)); len = XGENE_ENET_MAX_MTU; @@ -78,7 +87,7 @@ static int xgene_enet_refill_bufpool(struct xgene_enet_desc_ring *buf_pool, tail = (tail + 1) & slots; } - iowrite32(nbuf, buf_pool->cmd); + pdata->ring_ops->wr_cmd(buf_pool, nbuf); buf_pool->tail = tail; return 0; @@ -98,26 +107,16 @@ static u8 xgene_enet_hdr_len(const void *data) return (eth->h_proto == htons(ETH_P_8021Q)) ? VLAN_ETH_HLEN : ETH_HLEN; } -static u32 xgene_enet_ring_len(struct xgene_enet_desc_ring *ring) -{ - u32 __iomem *cmd_base = ring->cmd_base; - u32 ring_state, num_msgs; - - ring_state = ioread32(&cmd_base[1]); - num_msgs = ring_state & CREATE_MASK(NUMMSGSINQ_POS, NUMMSGSINQ_LEN); - - return num_msgs >> NUMMSGSINQ_POS; -} - static void xgene_enet_delete_bufpool(struct xgene_enet_desc_ring *buf_pool) { + struct xgene_enet_pdata *pdata = netdev_priv(buf_pool->ndev); struct xgene_enet_raw_desc16 *raw_desc; u32 slots = buf_pool->slots - 1; u32 tail = buf_pool->tail; u32 userinfo; int i, len; - len = xgene_enet_ring_len(buf_pool); + len = pdata->ring_ops->len(buf_pool); for (i = 0; i < len; i++) { tail = (tail - 1) & slots; raw_desc = &buf_pool->raw_desc16[tail]; @@ -127,7 +126,7 @@ static void xgene_enet_delete_bufpool(struct xgene_enet_desc_ring *buf_pool) dev_kfree_skb_any(buf_pool->rx_skb[userinfo]); } - iowrite32(-len, buf_pool->cmd); + pdata->ring_ops->wr_cmd(buf_pool, -len); buf_pool->tail = tail; } @@ -259,8 +258,8 @@ static netdev_tx_t xgene_enet_start_xmit(struct sk_buff *skb, struct xgene_enet_desc_ring *cp_ring = tx_ring->cp_ring; u32 tx_level, cq_level; - tx_level = xgene_enet_ring_len(tx_ring); - cq_level = xgene_enet_ring_len(cp_ring); + tx_level = pdata->ring_ops->len(tx_ring); + cq_level = pdata->ring_ops->len(cp_ring); if (unlikely(tx_level > pdata->tx_qcnt_hi || cq_level > pdata->cp_qcnt_hi)) { netif_stop_queue(ndev); @@ -272,7 +271,7 @@ static netdev_tx_t xgene_enet_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; } - iowrite32(1, tx_ring->cmd); + pdata->ring_ops->wr_cmd(tx_ring, 1); skb_tx_timestamp(skb); tx_ring->tail = (tx_ring->tail + 1) & (tx_ring->slots - 1); @@ -385,11 +384,11 @@ static int xgene_enet_process_ring(struct xgene_enet_desc_ring *ring, } while (--budget); if (likely(count)) { - iowrite32(-count, ring->cmd); + pdata->ring_ops->wr_cmd(ring, -count); ring->head = head; if (netif_queue_stopped(ring->ndev)) { - if (xgene_enet_ring_len(ring) < pdata->cp_qcnt_low) + if (pdata->ring_ops->len(ring) < pdata->cp_qcnt_low) netif_wake_queue(ring->ndev); } } @@ -424,13 +423,23 @@ static int xgene_enet_register_irq(struct net_device *ndev) { struct xgene_enet_pdata *pdata = netdev_priv(ndev); struct device *dev = ndev_to_dev(ndev); + struct xgene_enet_desc_ring *ring; int ret; - ret = devm_request_irq(dev, pdata->rx_ring->irq, xgene_enet_rx_irq, - IRQF_SHARED, ndev->name, pdata->rx_ring); - if (ret) { - netdev_err(ndev, "rx%d interrupt request failed\n", - pdata->rx_ring->irq); + ring = pdata->rx_ring; + ret = devm_request_irq(dev, ring->irq, xgene_enet_rx_irq, + IRQF_SHARED, ring->irq_name, ring); + if (ret) + netdev_err(ndev, "Failed to request irq %s\n", ring->irq_name); + + if (pdata->cq_cnt) { + ring = pdata->tx_ring->cp_ring; + ret = devm_request_irq(dev, ring->irq, xgene_enet_rx_irq, + IRQF_SHARED, ring->irq_name, ring); + if (ret) { + netdev_err(ndev, "Failed to request irq %s\n", + ring->irq_name); + } } return ret; @@ -444,6 +453,37 @@ static void xgene_enet_free_irq(struct net_device *ndev) pdata = netdev_priv(ndev); dev = ndev_to_dev(ndev); devm_free_irq(dev, pdata->rx_ring->irq, pdata->rx_ring); + + if (pdata->cq_cnt) { + devm_free_irq(dev, pdata->tx_ring->cp_ring->irq, + pdata->tx_ring->cp_ring); + } +} + +static void xgene_enet_napi_enable(struct xgene_enet_pdata *pdata) +{ + struct napi_struct *napi; + + napi = &pdata->rx_ring->napi; + napi_enable(napi); + + if (pdata->cq_cnt) { + napi = &pdata->tx_ring->cp_ring->napi; + napi_enable(napi); + } +} + +static void xgene_enet_napi_disable(struct xgene_enet_pdata *pdata) +{ + struct napi_struct *napi; + + napi = &pdata->rx_ring->napi; + napi_disable(napi); + + if (pdata->cq_cnt) { + napi = &pdata->tx_ring->cp_ring->napi; + napi_disable(napi); + } } static int xgene_enet_open(struct net_device *ndev) @@ -455,16 +495,17 @@ static int xgene_enet_open(struct net_device *ndev) mac_ops->tx_enable(pdata); mac_ops->rx_enable(pdata); - napi_enable(&pdata->rx_ring->napi); ret = xgene_enet_register_irq(ndev); if (ret) return ret; + xgene_enet_napi_enable(pdata); if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) phy_start(pdata->phy_dev); else schedule_delayed_work(&pdata->link_work, PHY_POLL_LINK_OFF); + netif_carrier_off(ndev); netif_start_queue(ndev); return ret; @@ -482,13 +523,13 @@ static int xgene_enet_close(struct net_device *ndev) else cancel_delayed_work_sync(&pdata->link_work); - mac_ops->tx_disable(pdata); - mac_ops->rx_disable(pdata); + xgene_enet_napi_disable(pdata); xgene_enet_free_irq(ndev); - napi_disable(&pdata->rx_ring->napi); - xgene_enet_process_ring(pdata->rx_ring, -1); + mac_ops->tx_disable(pdata); + mac_ops->rx_disable(pdata); + return 0; } @@ -500,7 +541,7 @@ static void xgene_enet_delete_ring(struct xgene_enet_desc_ring *ring) pdata = netdev_priv(ring->ndev); dev = ndev_to_dev(ring->ndev); - xgene_enet_clear_ring(ring); + pdata->ring_ops->clear(ring); dma_free_coherent(dev, ring->size, ring->desc_addr, ring->dma); } @@ -553,15 +594,17 @@ static int xgene_enet_get_ring_size(struct device *dev, static void xgene_enet_free_desc_ring(struct xgene_enet_desc_ring *ring) { + struct xgene_enet_pdata *pdata; struct device *dev; if (!ring) return; dev = ndev_to_dev(ring->ndev); + pdata = netdev_priv(ring->ndev); if (ring->desc_addr) { - xgene_enet_clear_ring(ring); + pdata->ring_ops->clear(ring); dma_free_coherent(dev, ring->size, ring->desc_addr, ring->dma); } devm_kfree(dev, ring); @@ -576,6 +619,8 @@ static void xgene_enet_free_desc_rings(struct xgene_enet_pdata *pdata) if (ring) { if (ring->cp_ring && ring->cp_ring->cp_skb) devm_kfree(dev, ring->cp_ring->cp_skb); + if (ring->cp_ring && pdata->cq_cnt) + xgene_enet_free_desc_ring(ring->cp_ring); xgene_enet_free_desc_ring(ring); } @@ -590,6 +635,25 @@ static void xgene_enet_free_desc_rings(struct xgene_enet_pdata *pdata) } } +static bool is_irq_mbox_required(struct xgene_enet_pdata *pdata, + struct xgene_enet_desc_ring *ring) +{ + if ((pdata->enet_id == XGENE_ENET2) && + (xgene_enet_ring_owner(ring->id) == RING_OWNER_CPU)) { + return true; + } + + return false; +} + +static void __iomem *xgene_enet_ring_cmd_base(struct xgene_enet_pdata *pdata, + struct xgene_enet_desc_ring *ring) +{ + u8 num_ring_id_shift = pdata->ring_ops->num_ring_id_shift; + + return pdata->ring_cmd_addr + (ring->num << num_ring_id_shift); +} + static struct xgene_enet_desc_ring *xgene_enet_create_desc_ring( struct net_device *ndev, u32 ring_num, enum xgene_enet_ring_cfgsize cfgsize, u32 ring_id) @@ -621,9 +685,20 @@ static struct xgene_enet_desc_ring *xgene_enet_create_desc_ring( } ring->size = size; - ring->cmd_base = pdata->ring_cmd_addr + (ring->num << 6); + if (is_irq_mbox_required(pdata, ring)) { + ring->irq_mbox_addr = dma_zalloc_coherent(dev, INTR_MBOX_SIZE, + &ring->irq_mbox_dma, GFP_KERNEL); + if (!ring->irq_mbox_addr) { + dma_free_coherent(dev, size, ring->desc_addr, + ring->dma); + devm_kfree(dev, ring); + return NULL; + } + } + + ring->cmd_base = xgene_enet_ring_cmd_base(pdata, ring); ring->cmd = ring->cmd_base + INC_DEC_CMD_ADDR; - ring = xgene_enet_setup_ring(ring); + ring = pdata->ring_ops->setup(ring); netdev_dbg(ndev, "ring info: num=%d size=%d id=%d slots=%d\n", ring->num, ring->size, ring->id, ring->slots); @@ -635,18 +710,43 @@ static u16 xgene_enet_get_ring_id(enum xgene_ring_owner owner, u8 bufnum) return (owner << 6) | (bufnum & GENMASK(5, 0)); } +static enum xgene_ring_owner xgene_derive_ring_owner(struct xgene_enet_pdata *p) +{ + enum xgene_ring_owner owner; + + if (p->enet_id == XGENE_ENET1) { + switch (p->phy_mode) { + case PHY_INTERFACE_MODE_SGMII: + owner = RING_OWNER_ETH0; + break; + default: + owner = (!p->port_id) ? RING_OWNER_ETH0 : + RING_OWNER_ETH1; + break; + } + } else { + owner = (!p->port_id) ? RING_OWNER_ETH0 : RING_OWNER_ETH1; + } + + return owner; +} + static int xgene_enet_create_desc_rings(struct net_device *ndev) { struct xgene_enet_pdata *pdata = netdev_priv(ndev); struct device *dev = ndev_to_dev(ndev); struct xgene_enet_desc_ring *rx_ring, *tx_ring, *cp_ring; struct xgene_enet_desc_ring *buf_pool = NULL; - u8 cpu_bufnum = 0, eth_bufnum = START_ETH_BUFNUM; - u8 bp_bufnum = START_BP_BUFNUM; - u16 ring_id, ring_num = START_RING_NUM; + enum xgene_ring_owner owner; + u8 cpu_bufnum = pdata->cpu_bufnum; + u8 eth_bufnum = pdata->eth_bufnum; + u8 bp_bufnum = pdata->bp_bufnum; + u16 ring_num = pdata->ring_num; + u16 ring_id; int ret; /* allocate rx descriptor ring */ + owner = xgene_derive_ring_owner(pdata); ring_id = xgene_enet_get_ring_id(RING_OWNER_CPU, cpu_bufnum++); rx_ring = xgene_enet_create_desc_ring(ndev, ring_num++, RING_CFGSIZE_16KB, ring_id); @@ -656,7 +756,8 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) } /* allocate buffer pool for receiving packets */ - ring_id = xgene_enet_get_ring_id(RING_OWNER_ETH0, bp_bufnum++); + owner = xgene_derive_ring_owner(pdata); + ring_id = xgene_enet_get_ring_id(owner, bp_bufnum++); buf_pool = xgene_enet_create_desc_ring(ndev, ring_num++, RING_CFGSIZE_2KB, ring_id); if (!buf_pool) { @@ -667,6 +768,12 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) rx_ring->nbufpool = NUM_BUFPOOL; rx_ring->buf_pool = buf_pool; rx_ring->irq = pdata->rx_irq; + if (!pdata->cq_cnt) { + snprintf(rx_ring->irq_name, IRQ_ID_SIZE, "%s-rx-txc", + ndev->name); + } else { + snprintf(rx_ring->irq_name, IRQ_ID_SIZE, "%s-rx", ndev->name); + } buf_pool->rx_skb = devm_kcalloc(dev, buf_pool->slots, sizeof(struct sk_buff *), GFP_KERNEL); if (!buf_pool->rx_skb) { @@ -679,7 +786,8 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) pdata->rx_ring = rx_ring; /* allocate tx descriptor ring */ - ring_id = xgene_enet_get_ring_id(RING_OWNER_ETH0, eth_bufnum++); + owner = xgene_derive_ring_owner(pdata); + ring_id = xgene_enet_get_ring_id(owner, eth_bufnum++); tx_ring = xgene_enet_create_desc_ring(ndev, ring_num++, RING_CFGSIZE_16KB, ring_id); if (!tx_ring) { @@ -688,7 +796,22 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev) } pdata->tx_ring = tx_ring; - cp_ring = pdata->rx_ring; + if (!pdata->cq_cnt) { + cp_ring = pdata->rx_ring; + } else { + /* allocate tx completion descriptor ring */ + ring_id = xgene_enet_get_ring_id(RING_OWNER_CPU, cpu_bufnum++); + cp_ring = xgene_enet_create_desc_ring(ndev, ring_num++, + RING_CFGSIZE_16KB, + ring_id); + if (!cp_ring) { + ret = -ENOMEM; + goto err; + } + cp_ring->irq = pdata->txc_irq; + snprintf(cp_ring->irq_name, IRQ_ID_SIZE, "%s-txc", ndev->name); + } + cp_ring->cp_skb = devm_kcalloc(dev, tx_ring->slots, sizeof(struct sk_buff *), GFP_KERNEL); if (!cp_ring->cp_skb) { @@ -749,40 +872,73 @@ static const struct net_device_ops xgene_ndev_ops = { }; #ifdef CONFIG_ACPI -static int acpi_get_mac_address(struct device *dev, - unsigned char *addr) +static int xgene_get_port_id_acpi(struct device *dev, + struct xgene_enet_pdata *pdata) +{ + acpi_status status; + u64 temp; + + status = acpi_evaluate_integer(ACPI_HANDLE(dev), "_SUN", NULL, &temp); + if (ACPI_FAILURE(status)) { + pdata->port_id = 0; + } else { + pdata->port_id = temp; + } + + return 0; +} +#endif + +static int xgene_get_port_id_dt(struct device *dev, struct xgene_enet_pdata *pdata) +{ + u32 id = 0; + int ret; + + ret = of_property_read_u32(dev->of_node, "port-id", &id); + if (ret) { + pdata->port_id = 0; + ret = 0; + } else { + pdata->port_id = id & BIT(0); + } + + return ret; +} + +static int xgene_get_mac_address(struct device *dev, + unsigned char *addr) { int ret; - ret = device_property_read_u8_array(dev, "mac-address", addr, 6); + ret = device_property_read_u8_array(dev, "local-mac-address", addr, 6); + if (ret) + ret = device_property_read_u8_array(dev, "mac-address", + addr, 6); if (ret) - return 0; + return -ENODEV; - return 6; + return ETH_ALEN; } -static int acpi_get_phy_mode(struct device *dev) +static int xgene_get_phy_mode(struct device *dev) { - int i, ret, phy_mode; + int i, ret; char *modestr; - ret = device_property_read_string(dev, "phy-mode", &modestr); + ret = device_property_read_string(dev, "phy-connection-type", + (const char **)&modestr); + if (ret) + ret = device_property_read_string(dev, "phy-mode", + (const char **)&modestr); if (ret) - return -1; + return -ENODEV; - phy_mode = -1; for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) { - if (!strcasecmp(modestr, phy_modes(i))) { - phy_mode = i; - break; - } + if (!strcasecmp(modestr, phy_modes(i))) + return i; } - return phy_mode; + return -ENODEV; } -#else -#define acpi_get_mac_address(a, b, c) 0 -#define acpi_get_phy_mode(a) -1 -#endif static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) { @@ -791,58 +947,63 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) struct device *dev; struct resource *res; void __iomem *base_addr; - const char *mac; - int ret; + u32 offset; + int ret = 0; pdev = pdata->pdev; dev = &pdev->dev; ndev = pdata->ndev; - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "enet_csr"); - if (!res) - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - pdata->base_addr = devm_ioremap_resource(dev, res); - if (IS_ERR(pdata->base_addr)) { + res = platform_get_resource(pdev, IORESOURCE_MEM, RES_ENET_CSR); + if (!res) { + dev_err(dev, "Resource enet_csr not defined\n"); + return -ENODEV; + } + pdata->base_addr = devm_ioremap(dev, res->start, resource_size(res)); + if (!pdata->base_addr) { dev_err(dev, "Unable to retrieve ENET Port CSR region\n"); - return PTR_ERR(pdata->base_addr); + return -ENOMEM; } - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_csr"); - if (!res) - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - pdata->ring_csr_addr = devm_ioremap_resource(dev, res); - if (IS_ERR(pdata->ring_csr_addr)) { + res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CSR); + if (!res) { + dev_err(dev, "Resource ring_csr not defined\n"); + return -ENODEV; + } + pdata->ring_csr_addr = devm_ioremap(dev, res->start, + resource_size(res)); + if (!pdata->ring_csr_addr) { dev_err(dev, "Unable to retrieve ENET Ring CSR region\n"); - return PTR_ERR(pdata->ring_csr_addr); + return -ENOMEM; } - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ring_cmd"); - if (!res) - res = platform_get_resource(pdev, IORESOURCE_MEM, 2); - pdata->ring_cmd_addr = devm_ioremap_resource(dev, res); - if (IS_ERR(pdata->ring_cmd_addr)) { + res = platform_get_resource(pdev, IORESOURCE_MEM, RES_RING_CMD); + if (!res) { + dev_err(dev, "Resource ring_cmd not defined\n"); + return -ENODEV; + } + pdata->ring_cmd_addr = devm_ioremap(dev, res->start, + resource_size(res)); + if (!pdata->ring_cmd_addr) { dev_err(dev, "Unable to retrieve ENET Ring command region\n"); - return PTR_ERR(pdata->ring_cmd_addr); + return -ENOMEM; } - ret = platform_get_irq(pdev, 0); - if (ret <= 0) { - dev_err(dev, "Unable to get ENET Rx IRQ\n"); - ret = ret ? : -ENXIO; + if (dev->of_node) + ret = xgene_get_port_id_dt(dev, pdata); +#ifdef CONFIG_ACPI + else + ret = xgene_get_port_id_acpi(dev, pdata); +#endif + if (ret) return ret; - } - pdata->rx_irq = ret; - mac = of_get_mac_address(dev->of_node); - if (mac) - memcpy(ndev->dev_addr, mac, ndev->addr_len); - else if (!acpi_get_mac_address(dev, ndev->dev_addr)) + if (xgene_get_mac_address(dev, ndev->dev_addr) != ETH_ALEN) eth_hw_addr_random(ndev); + memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len); - pdata->phy_mode = of_get_phy_mode(pdev->dev.of_node); - if (pdata->phy_mode < 0) - pdata->phy_mode = acpi_get_phy_mode(dev); + pdata->phy_mode = xgene_get_phy_mode(dev); if (pdata->phy_mode < 0) { dev_err(dev, "Unable to get phy-connection-type\n"); return pdata->phy_mode; @@ -854,23 +1015,46 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) return -ENODEV; } + ret = platform_get_irq(pdev, 0); + if (ret <= 0) { + dev_err(dev, "Unable to get ENET Rx IRQ\n"); + ret = ret ? : -ENXIO; + return ret; + } + pdata->rx_irq = ret; + + if (pdata->phy_mode != PHY_INTERFACE_MODE_RGMII) { + ret = platform_get_irq(pdev, 1); + if (ret <= 0) { + pdata->cq_cnt = 0; + dev_info(dev, "Unable to get Tx completion IRQ," + "using Rx IRQ instead\n"); + } else { + pdata->cq_cnt = XGENE_MAX_TXC_RINGS; + pdata->txc_irq = ret; + } + } + pdata->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pdata->clk)) { - /* - * Not necessarily an error. Firmware may have - * set up the clock already. - */ - pdata->clk = NULL; + /* Firmware may have set up the clock already. */ + dev_info(dev, "clocks have been setup already\n"); } - base_addr = pdata->base_addr; + if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII) + base_addr = pdata->base_addr - (pdata->port_id * MAC_OFFSET); + else + base_addr = pdata->base_addr; pdata->eth_csr_addr = base_addr + BLOCK_ETH_CSR_OFFSET; pdata->eth_ring_if_addr = base_addr + BLOCK_ETH_RING_IF_OFFSET; pdata->eth_diag_csr_addr = base_addr + BLOCK_ETH_DIAG_CSR_OFFSET; if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII || pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) { - pdata->mcx_mac_addr = base_addr + BLOCK_ETH_MAC_OFFSET; - pdata->mcx_mac_csr_addr = base_addr + BLOCK_ETH_MAC_CSR_OFFSET; + pdata->mcx_mac_addr = pdata->base_addr + BLOCK_ETH_MAC_OFFSET; + offset = (pdata->enet_id == XGENE_ENET1) ? + BLOCK_ETH_MAC_CSR_OFFSET : + X2_BLOCK_ETH_MAC_CSR_OFFSET; + pdata->mcx_mac_csr_addr = base_addr + offset; } else { pdata->mcx_mac_addr = base_addr + BLOCK_AXG_MAC_OFFSET; pdata->mcx_mac_csr_addr = base_addr + BLOCK_AXG_MAC_CSR_OFFSET; @@ -932,6 +1116,79 @@ static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata) pdata->rm = RM0; break; } + + if (pdata->enet_id == XGENE_ENET1) { + switch (pdata->port_id) { + case 0: + pdata->cpu_bufnum = START_CPU_BUFNUM_0; + pdata->eth_bufnum = START_ETH_BUFNUM_0; + pdata->bp_bufnum = START_BP_BUFNUM_0; + pdata->ring_num = START_RING_NUM_0; + break; + case 1: + if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) { + pdata->cpu_bufnum = XG_START_CPU_BUFNUM_1; + pdata->eth_bufnum = XG_START_ETH_BUFNUM_1; + pdata->bp_bufnum = XG_START_BP_BUFNUM_1; + pdata->ring_num = XG_START_RING_NUM_1; + } else { + pdata->cpu_bufnum = START_CPU_BUFNUM_1; + pdata->eth_bufnum = START_ETH_BUFNUM_1; + pdata->bp_bufnum = START_BP_BUFNUM_1; + pdata->ring_num = START_RING_NUM_1; + } + break; + default: + break; + } + pdata->ring_ops = &xgene_ring1_ops; + } else { + switch (pdata->port_id) { + case 0: + pdata->cpu_bufnum = X2_START_CPU_BUFNUM_0; + pdata->eth_bufnum = X2_START_ETH_BUFNUM_0; + pdata->bp_bufnum = X2_START_BP_BUFNUM_0; + pdata->ring_num = X2_START_RING_NUM_0; + break; + case 1: + pdata->cpu_bufnum = X2_START_CPU_BUFNUM_1; + pdata->eth_bufnum = X2_START_ETH_BUFNUM_1; + pdata->bp_bufnum = X2_START_BP_BUFNUM_1; + pdata->ring_num = X2_START_RING_NUM_1; + break; + default: + break; + } + pdata->rm = RM0; + pdata->ring_ops = &xgene_ring2_ops; + } +} + +static void xgene_enet_napi_add(struct xgene_enet_pdata *pdata) +{ + struct napi_struct *napi; + + napi = &pdata->rx_ring->napi; + netif_napi_add(pdata->ndev, napi, xgene_enet_napi, NAPI_POLL_WEIGHT); + + if (pdata->cq_cnt) { + napi = &pdata->tx_ring->cp_ring->napi; + netif_napi_add(pdata->ndev, napi, xgene_enet_napi, + NAPI_POLL_WEIGHT); + } +} + +static void xgene_enet_napi_del(struct xgene_enet_pdata *pdata) +{ + struct napi_struct *napi; + + napi = &pdata->rx_ring->napi; + netif_napi_del(napi); + + if (pdata->cq_cnt) { + napi = &pdata->tx_ring->cp_ring->napi; + netif_napi_del(napi); + } } static int xgene_enet_probe(struct platform_device *pdev) @@ -939,8 +1196,8 @@ static int xgene_enet_probe(struct platform_device *pdev) struct net_device *ndev; struct xgene_enet_pdata *pdata; struct device *dev = &pdev->dev; - struct napi_struct *napi; struct xgene_mac_ops *mac_ops; + const struct of_device_id *of_id; int ret; ndev = alloc_etherdev(sizeof(struct xgene_enet_pdata)); @@ -959,6 +1216,24 @@ static int xgene_enet_probe(struct platform_device *pdev) NETIF_F_GSO | NETIF_F_GRO; + of_id = of_match_device(xgene_enet_of_match, &pdev->dev); + if (of_id) { + pdata->enet_id = (enum xgene_enet_id)of_id->data; + } +#ifdef CONFIG_ACPI + else { + const struct acpi_device_id *acpi_id; + + acpi_id = acpi_match_device(xgene_enet_acpi_match, &pdev->dev); + if (acpi_id) + pdata->enet_id = (enum xgene_enet_id) acpi_id->driver_data; + } +#endif + if (!pdata->enet_id) { + free_netdev(ndev); + return -ENODEV; + } + ret = xgene_enet_get_resources(pdata); if (ret) goto err; @@ -981,9 +1256,7 @@ static int xgene_enet_probe(struct platform_device *pdev) if (ret) goto err; - napi = &pdata->rx_ring->napi; - netif_napi_add(ndev, napi, xgene_enet_napi, NAPI_POLL_WEIGHT); - + xgene_enet_napi_add(pdata); mac_ops = pdata->mac_ops; if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) ret = xgene_enet_mdio_config(pdata); @@ -1010,13 +1283,7 @@ static int xgene_enet_remove(struct platform_device *pdev) mac_ops->rx_disable(pdata); mac_ops->tx_disable(pdata); - rtnl_lock(); - if (netif_running(ndev)) - dev_close(ndev); - rtnl_unlock(); - - netif_napi_del(&pdata->rx_ring->napi); - + xgene_enet_napi_del(pdata); if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) xgene_enet_mdio_remove(pdata); unregister_netdev(ndev); @@ -1027,48 +1294,40 @@ static int xgene_enet_remove(struct platform_device *pdev) return 0; } -static void xgene_enet_shutdown(struct platform_device *pdev) -{ - struct xgene_enet_pdata *pdata; - - pdata = platform_get_drvdata(pdev); - if (!pdata) - return; - - if (!pdata->ndev) - return; - - xgene_enet_remove(pdev); -} - #ifdef CONFIG_ACPI static const struct acpi_device_id xgene_enet_acpi_match[] = { - { "APMC0D05", }, - { "APMC0D30", }, - { "APMC0D31", }, + { "APMC0D05", XGENE_ENET1}, + { "APMC0D30", XGENE_ENET1}, + { "APMC0D31", XGENE_ENET1}, + { "APMC0D3F", XGENE_ENET1}, + { "APMC0D26", XGENE_ENET2}, + { "APMC0D25", XGENE_ENET2}, { } }; MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match); #endif -static struct of_device_id xgene_enet_match[] = { - {.compatible = "apm,xgene-enet",}, - {.compatible = "apm,xgene1-sgenet",}, - {.compatible = "apm,xgene1-xgenet",}, +#ifdef CONFIG_OF +static const struct of_device_id xgene_enet_of_match[] = { + {.compatible = "apm,xgene-enet", .data = (void *)XGENE_ENET1}, + {.compatible = "apm,xgene1-sgenet", .data = (void *)XGENE_ENET1}, + {.compatible = "apm,xgene1-xgenet", .data = (void *)XGENE_ENET1}, + {.compatible = "apm,xgene2-sgenet", .data = (void *)XGENE_ENET2}, + {.compatible = "apm,xgene2-xgenet", .data = (void *)XGENE_ENET2}, {}, }; -MODULE_DEVICE_TABLE(of, xgene_enet_match); +MODULE_DEVICE_TABLE(of, xgene_enet_of_match); +#endif static struct platform_driver xgene_enet_driver = { .driver = { .name = "xgene-enet", - .of_match_table = xgene_enet_match, + .of_match_table = of_match_ptr(xgene_enet_of_match), .acpi_match_table = ACPI_PTR(xgene_enet_acpi_match), }, .probe = xgene_enet_probe, .remove = xgene_enet_remove, - .shutdown = xgene_enet_shutdown, }; module_platform_driver(xgene_enet_driver); diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h index 7b5cb63..ede7f29 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h @@ -22,7 +22,10 @@ #ifndef __XGENE_ENET_MAIN_H__ #define __XGENE_ENET_MAIN_H__ +#include <linux/acpi.h> #include <linux/clk.h> +#include <linux/efi.h> +#include <linux/io.h> #include <linux/of_platform.h> #include <linux/of_net.h> #include <linux/of_mdio.h> @@ -31,24 +34,49 @@ #include <linux/prefetch.h> #include <linux/if_vlan.h> #include <linux/phy.h> -#include <linux/acpi.h> #include "xgene_enet_hw.h" +#include "xgene_enet_ring2.h" #define XGENE_DRV_VERSION "v1.0" #define XGENE_ENET_MAX_MTU 1536 #define SKB_BUFFER_SIZE (XGENE_ENET_MAX_MTU - NET_IP_ALIGN) #define NUM_PKT_BUF 64 #define NUM_BUFPOOL 32 -#define START_ETH_BUFNUM 2 -#define START_BP_BUFNUM 0x22 -#define START_RING_NUM 8 -#define PHY_POLL_LINK_ON (10 * HZ) -#define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5) +#define START_CPU_BUFNUM_0 0 +#define START_ETH_BUFNUM_0 2 +#define START_BP_BUFNUM_0 0x22 +#define START_RING_NUM_0 8 +#define START_CPU_BUFNUM_1 12 +#define START_ETH_BUFNUM_1 10 +#define START_BP_BUFNUM_1 0x2A +#define START_RING_NUM_1 264 + +#define XG_START_CPU_BUFNUM_1 12 +#define XG_START_ETH_BUFNUM_1 2 +#define XG_START_BP_BUFNUM_1 0x22 +#define XG_START_RING_NUM_1 264 + +#define X2_START_CPU_BUFNUM_0 0 +#define X2_START_ETH_BUFNUM_0 0 +#define X2_START_BP_BUFNUM_0 0x20 +#define X2_START_RING_NUM_0 0 +#define X2_START_CPU_BUFNUM_1 0xc +#define X2_START_ETH_BUFNUM_1 0 +#define X2_START_BP_BUFNUM_1 0x20 +#define X2_START_RING_NUM_1 256 + +#define IRQ_ID_SIZE 16 +#define XGENE_MAX_TXC_RINGS 1 #define PHY_POLL_LINK_ON (10 * HZ) #define PHY_POLL_LINK_OFF (PHY_POLL_LINK_ON / 5) +enum xgene_enet_id { + XGENE_ENET1 = 1, + XGENE_ENET2 +}; + /* software context of a descriptor ring */ struct xgene_enet_desc_ring { struct net_device *ndev; @@ -58,11 +86,14 @@ struct xgene_enet_desc_ring { u16 tail; u16 slots; u16 irq; + char irq_name[IRQ_ID_SIZE]; u32 size; - u32 state[NUM_RING_CONFIG]; + u32 state[X2_NUM_RING_CONFIG]; void __iomem *cmd_base; void __iomem *cmd; dma_addr_t dma; + dma_addr_t irq_mbox_dma; + void *irq_mbox_addr; u16 dst_ring_num; u8 nbufpool; struct sk_buff *(*rx_skb); @@ -96,6 +127,15 @@ struct xgene_port_ops { void (*shutdown)(struct xgene_enet_pdata *pdata); }; +struct xgene_ring_ops { + u8 num_ring_config; + u8 num_ring_id_shift; + struct xgene_enet_desc_ring * (*setup)(struct xgene_enet_desc_ring *); + void (*clear)(struct xgene_enet_desc_ring *); + void (*wr_cmd)(struct xgene_enet_desc_ring *, int); + u32 (*len)(struct xgene_enet_desc_ring *); +}; + /* ethernet private data */ struct xgene_enet_pdata { struct net_device *ndev; @@ -104,6 +144,7 @@ struct xgene_enet_pdata { int phy_speed; struct clk *clk; struct platform_device *pdev; + enum xgene_enet_id enet_id; struct xgene_enet_desc_ring *tx_ring; struct xgene_enet_desc_ring *rx_ring; char *dev_name; @@ -112,6 +153,8 @@ struct xgene_enet_pdata { u32 cp_qcnt_hi; u32 cp_qcnt_low; u32 rx_irq; + u32 txc_irq; + u8 cq_cnt; void __iomem *eth_csr_addr; void __iomem *eth_ring_if_addr; void __iomem *eth_diag_csr_addr; @@ -125,7 +168,13 @@ struct xgene_enet_pdata { struct rtnl_link_stats64 stats; struct xgene_mac_ops *mac_ops; struct xgene_port_ops *port_ops; + struct xgene_ring_ops *ring_ops; struct delayed_work link_work; + u32 port_id; + u8 cpu_bufnum; + u8 eth_bufnum; + u8 bp_bufnum; + u16 ring_num; }; struct xgene_indirect_ctl { diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c new file mode 100644 index 0000000..0b6896b --- /dev/null +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c @@ -0,0 +1,200 @@ +/* Applied Micro X-Gene SoC Ethernet Driver + * + * Copyright (c) 2015, Applied Micro Circuits Corporation + * Author: Iyappan Subramanian <isubramanian(a)apm.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "xgene_enet_main.h" +#include "xgene_enet_hw.h" +#include "xgene_enet_ring2.h" + +static void xgene_enet_ring_init(struct xgene_enet_desc_ring *ring) +{ + u32 *ring_cfg = ring->state; + u64 addr = ring->dma; + + if (xgene_enet_ring_owner(ring->id) == RING_OWNER_CPU) { + ring_cfg[0] |= SET_VAL(X2_INTLINE, ring->id & RING_BUFNUM_MASK); + ring_cfg[3] |= SET_BIT(X2_DEQINTEN); + } + ring_cfg[0] |= SET_VAL(X2_CFGCRID, 1); + + addr >>= 8; + ring_cfg[2] |= QCOHERENT | SET_VAL(RINGADDRL, addr); + + addr >>= 27; + ring_cfg[3] |= SET_VAL(RINGSIZE, ring->cfgsize) + | ACCEPTLERR + | SET_VAL(RINGADDRH, addr); + ring_cfg[4] |= SET_VAL(X2_SELTHRSH, 1); + ring_cfg[5] |= SET_BIT(X2_QBASE_AM) | SET_BIT(X2_MSG_AM); +} + +static void xgene_enet_ring_set_type(struct xgene_enet_desc_ring *ring) +{ + u32 *ring_cfg = ring->state; + bool is_bufpool; + u32 val; + + is_bufpool = xgene_enet_is_bufpool(ring->id); + val = (is_bufpool) ? RING_BUFPOOL : RING_REGULAR; + ring_cfg[4] |= SET_VAL(X2_RINGTYPE, val); + if (is_bufpool) + ring_cfg[3] |= SET_VAL(RINGMODE, BUFPOOL_MODE); +} + +static void xgene_enet_ring_set_recombbuf(struct xgene_enet_desc_ring *ring) +{ + u32 *ring_cfg = ring->state; + + ring_cfg[3] |= RECOMBBUF; + ring_cfg[4] |= SET_VAL(X2_RECOMTIMEOUT, 0x7); +} + +static void xgene_enet_ring_wr32(struct xgene_enet_desc_ring *ring, + u32 offset, u32 data) +{ + struct xgene_enet_pdata *pdata = netdev_priv(ring->ndev); + + iowrite32(data, pdata->ring_csr_addr + offset); +} + +static void xgene_enet_write_ring_state(struct xgene_enet_desc_ring *ring) +{ + struct xgene_enet_pdata *pdata = netdev_priv(ring->ndev); + int i; + + xgene_enet_ring_wr32(ring, CSR_RING_CONFIG, ring->num); + for (i = 0; i < pdata->ring_ops->num_ring_config; i++) { + xgene_enet_ring_wr32(ring, CSR_RING_WR_BASE + (i * 4), + ring->state[i]); + } +} + +static void xgene_enet_clr_ring_state(struct xgene_enet_desc_ring *ring) +{ + memset(ring->state, 0, sizeof(ring->state)); + xgene_enet_write_ring_state(ring); +} + +static void xgene_enet_set_ring_state(struct xgene_enet_desc_ring *ring) +{ + enum xgene_ring_owner owner; + + xgene_enet_ring_set_type(ring); + + owner = xgene_enet_ring_owner(ring->id); + if (owner == RING_OWNER_ETH0 || owner == RING_OWNER_ETH1) + xgene_enet_ring_set_recombbuf(ring); + + xgene_enet_ring_init(ring); + xgene_enet_write_ring_state(ring); +} + +static void xgene_enet_set_ring_id(struct xgene_enet_desc_ring *ring) +{ + u32 ring_id_val, ring_id_buf; + bool is_bufpool; + + if (xgene_enet_ring_owner(ring->id) == RING_OWNER_CPU) + return; + + is_bufpool = xgene_enet_is_bufpool(ring->id); + + ring_id_val = ring->id & GENMASK(9, 0); + ring_id_val |= OVERWRITE; + + ring_id_buf = (ring->num << 9) & GENMASK(18, 9); + ring_id_buf |= PREFETCH_BUF_EN; + if (is_bufpool) + ring_id_buf |= IS_BUFFER_POOL; + + xgene_enet_ring_wr32(ring, CSR_RING_ID, ring_id_val); + xgene_enet_ring_wr32(ring, CSR_RING_ID_BUF, ring_id_buf); +} + +static void xgene_enet_clr_desc_ring_id(struct xgene_enet_desc_ring *ring) +{ + u32 ring_id; + + ring_id = ring->id | OVERWRITE; + xgene_enet_ring_wr32(ring, CSR_RING_ID, ring_id); + xgene_enet_ring_wr32(ring, CSR_RING_ID_BUF, 0); +} + +static struct xgene_enet_desc_ring *xgene_enet_setup_ring( + struct xgene_enet_desc_ring *ring) +{ + bool is_bufpool; + u32 addr, i; + + xgene_enet_clr_ring_state(ring); + xgene_enet_set_ring_state(ring); + xgene_enet_set_ring_id(ring); + + ring->slots = xgene_enet_get_numslots(ring->id, ring->size); + + is_bufpool = xgene_enet_is_bufpool(ring->id); + if (is_bufpool || xgene_enet_ring_owner(ring->id) != RING_OWNER_CPU) + return ring; + + addr = CSR_VMID0_INTR_MBOX + (4 * (ring->id & RING_BUFNUM_MASK)); + xgene_enet_ring_wr32(ring, addr, ring->irq_mbox_dma >> 10); + + for (i = 0; i < ring->slots; i++) + xgene_enet_mark_desc_slot_empty(&ring->raw_desc[i]); + + return ring; +} + +static void xgene_enet_clear_ring(struct xgene_enet_desc_ring *ring) +{ + xgene_enet_clr_desc_ring_id(ring); + xgene_enet_clr_ring_state(ring); +} + +static void xgene_enet_wr_cmd(struct xgene_enet_desc_ring *ring, int count) +{ + u32 data = 0; + + if (xgene_enet_ring_owner(ring->id) == RING_OWNER_CPU) { + data = SET_VAL(X2_INTLINE, ring->id & RING_BUFNUM_MASK) | + INTR_CLEAR; + } + data |= (count & GENMASK(16, 0)); + + iowrite32(data, ring->cmd); +} + +static u32 xgene_enet_ring_len(struct xgene_enet_desc_ring *ring) +{ + u32 __iomem *cmd_base = ring->cmd_base; + u32 ring_state, num_msgs; + + ring_state = ioread32(&cmd_base[1]); + num_msgs = GET_VAL(X2_NUMMSGSINQ, ring_state); + + return num_msgs; +} + +struct xgene_ring_ops xgene_ring2_ops = { + .num_ring_config = X2_NUM_RING_CONFIG, + .num_ring_id_shift = 13, + .setup = xgene_enet_setup_ring, + .clear = xgene_enet_clear_ring, + .wr_cmd = xgene_enet_wr_cmd, + .len = xgene_enet_ring_len, +}; diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h b/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h new file mode 100644 index 0000000..8b235db --- /dev/null +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h @@ -0,0 +1,49 @@ +/* Applied Micro X-Gene SoC Ethernet Driver + * + * Copyright (c) 2015, Applied Micro Circuits Corporation + * Author: Iyappan Subramanian <isubramanian(a)apm.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __XGENE_ENET_RING2_H__ +#define __XGENE_ENET_RING2_H__ + +#include "xgene_enet_main.h" + +#define X2_NUM_RING_CONFIG 6 + +#define INTR_MBOX_SIZE 1024 +#define CSR_VMID0_INTR_MBOX 0x0270 +#define INTR_CLEAR BIT(23) + +#define X2_MSG_AM_POS 10 +#define X2_QBASE_AM_POS 11 +#define X2_INTLINE_POS 24 +#define X2_INTLINE_LEN 5 +#define X2_CFGCRID_POS 29 +#define X2_CFGCRID_LEN 3 +#define X2_SELTHRSH_POS 7 +#define X2_SELTHRSH_LEN 3 +#define X2_RINGTYPE_POS 23 +#define X2_RINGTYPE_LEN 2 +#define X2_DEQINTEN_POS 29 +#define X2_RECOMTIMEOUT_POS 0 +#define X2_RECOMTIMEOUT_LEN 7 +#define X2_NUMMSGSINQ_POS 0 +#define X2_NUMMSGSINQ_LEN 17 + +extern struct xgene_ring_ops xgene_ring2_ops; + +#endif /* __XGENE_ENET_RING2_H__ */ diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c index 1055fcc..05b817e 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c @@ -21,6 +21,7 @@ #include "xgene_enet_main.h" #include "xgene_enet_hw.h" #include "xgene_enet_sgmac.h" +#include "xgene_enet_xgmac.h" static void xgene_enet_wr_csr(struct xgene_enet_pdata *p, u32 offset, u32 val) { @@ -39,6 +40,14 @@ static void xgene_enet_wr_diag_csr(struct xgene_enet_pdata *p, iowrite32(val, p->eth_diag_csr_addr + offset); } +static void xgene_enet_wr_mcx_csr(struct xgene_enet_pdata *pdata, + u32 offset, u32 val) +{ + void __iomem *addr = pdata->mcx_mac_csr_addr + offset; + + iowrite32(val, addr); +} + static bool xgene_enet_wr_indirect(struct xgene_indirect_ctl *ctl, u32 wr_addr, u32 wr_data) { @@ -140,8 +149,9 @@ static int xgene_enet_ecc_init(struct xgene_enet_pdata *p) static void xgene_enet_config_ring_if_assoc(struct xgene_enet_pdata *p) { - u32 val = 0xffffffff; + u32 val; + val = (p->enet_id == XGENE_ENET1) ? 0xffffffff : 0; xgene_enet_wr_ring_if(p, ENET_CFGSSQMIWQASSOC_ADDR, val); xgene_enet_wr_ring_if(p, ENET_CFGSSQMIFPQASSOC_ADDR, val); } @@ -226,6 +236,9 @@ static u32 xgene_enet_link_status(struct xgene_enet_pdata *p) static void xgene_sgmac_init(struct xgene_enet_pdata *p) { u32 data, loop = 10; + u32 offset = p->port_id * 4; + u32 enet_spare_cfg_reg, rsif_config_reg; + u32 cfg_bypass_reg, rx_dv_gate_reg; xgene_sgmac_reset(p); @@ -238,7 +251,7 @@ static void xgene_sgmac_init(struct xgene_enet_pdata *p) SGMII_STATUS_ADDR >> 2); if ((data & AUTO_NEG_COMPLETE) && (data & LINK_STATUS)) break; - usleep_range(10, 20); + usleep_range(1000, 2000); } if (!(data & AUTO_NEG_COMPLETE) || !(data & LINK_STATUS)) netdev_err(p->ndev, "Auto-negotiation failed\n"); @@ -248,33 +261,38 @@ static void xgene_sgmac_init(struct xgene_enet_pdata *p) xgene_enet_wr_mac(p, MAC_CONFIG_2_ADDR, data | FULL_DUPLEX2); xgene_enet_wr_mac(p, INTERFACE_CONTROL_ADDR, ENET_GHD_MODE); - data = xgene_enet_rd_csr(p, ENET_SPARE_CFG_REG_ADDR); + if (p->enet_id == XGENE_ENET1) { + enet_spare_cfg_reg = ENET_SPARE_CFG_REG_ADDR; + rsif_config_reg = RSIF_CONFIG_REG_ADDR; + cfg_bypass_reg = CFG_BYPASS_ADDR; + rx_dv_gate_reg = SG_RX_DV_GATE_REG_0_ADDR; + } else { + enet_spare_cfg_reg = XG_ENET_SPARE_CFG_REG_ADDR; + rsif_config_reg = XG_RSIF_CONFIG_REG_ADDR; + cfg_bypass_reg = XG_CFG_BYPASS_ADDR; + rx_dv_gate_reg = XG_MCX_RX_DV_GATE_REG_0_ADDR; + } + + data = xgene_enet_rd_csr(p, enet_spare_cfg_reg); data |= MPA_IDLE_WITH_QMI_EMPTY; - xgene_enet_wr_csr(p, ENET_SPARE_CFG_REG_ADDR, data); + xgene_enet_wr_csr(p, enet_spare_cfg_reg, data); xgene_sgmac_set_mac_addr(p); - data = xgene_enet_rd_csr(p, DEBUG_REG_ADDR); - data |= CFG_BYPASS_UNISEC_TX | CFG_BYPASS_UNISEC_RX; - xgene_enet_wr_csr(p, DEBUG_REG_ADDR, data); - /* Adjust MDC clock frequency */ data = xgene_enet_rd_mac(p, MII_MGMT_CONFIG_ADDR); MGMT_CLOCK_SEL_SET(&data, 7); xgene_enet_wr_mac(p, MII_MGMT_CONFIG_ADDR, data); /* Enable drop if bufpool not available */ - data = xgene_enet_rd_csr(p, RSIF_CONFIG_REG_ADDR); + data = xgene_enet_rd_csr(p, rsif_config_reg); data |= CFG_RSIF_FPBUFF_TIMEOUT_EN; - xgene_enet_wr_csr(p, RSIF_CONFIG_REG_ADDR, data); - - /* Rtype should be copied from FP */ - xgene_enet_wr_csr(p, RSIF_RAM_DBG_REG0_ADDR, 0); + xgene_enet_wr_csr(p, rsif_config_reg, data); /* Bypass traffic gating */ - xgene_enet_wr_csr(p, CFG_LINK_AGGR_RESUME_0_ADDR, TX_PORT0); - xgene_enet_wr_csr(p, CFG_BYPASS_ADDR, RESUME_TX); - xgene_enet_wr_csr(p, SG_RX_DV_GATE_REG_0_ADDR, RESUME_RX0); + xgene_enet_wr_csr(p, XG_ENET_SPARE_CFG_REG_1_ADDR, 0x84); + xgene_enet_wr_csr(p, cfg_bypass_reg, RESUME_TX); + xgene_enet_wr_mcx_csr(p, rx_dv_gate_reg + offset, RESUME_RX0); } static void xgene_sgmac_rxtx(struct xgene_enet_pdata *p, u32 bits, bool set) @@ -316,9 +334,11 @@ static int xgene_enet_reset(struct xgene_enet_pdata *p) if (!xgene_ring_mgr_init(p)) return -ENODEV; - clk_prepare_enable(p->clk); - clk_disable_unprepare(p->clk); - clk_prepare_enable(p->clk); + if (!IS_ERR(p->clk)) { + clk_prepare_enable(p->clk); + clk_disable_unprepare(p->clk); + clk_prepare_enable(p->clk); + } xgene_enet_ecc_init(p); xgene_enet_config_ring_if_assoc(p); @@ -330,27 +350,29 @@ static void xgene_enet_cle_bypass(struct xgene_enet_pdata *p, u32 dst_ring_num, u16 bufpool_id) { u32 data, fpsel; + u32 cle_bypass_reg0, cle_bypass_reg1; + u32 offset = p->port_id * MAC_OFFSET; + + if (p->enet_id == XGENE_ENET1) { + cle_bypass_reg0 = CLE_BYPASS_REG0_0_ADDR; + cle_bypass_reg1 = CLE_BYPASS_REG1_0_ADDR; + } else { + cle_bypass_reg0 = XCLE_BYPASS_REG0_ADDR; + cle_bypass_reg1 = XCLE_BYPASS_REG1_ADDR; + } data = CFG_CLE_BYPASS_EN0; - xgene_enet_wr_csr(p, CLE_BYPASS_REG0_0_ADDR, data); + xgene_enet_wr_csr(p, cle_bypass_reg0 + offset, data); fpsel = xgene_enet_ring_bufnum(bufpool_id) - 0x20; data = CFG_CLE_DSTQID0(dst_ring_num) | CFG_CLE_FPSEL0(fpsel); - xgene_enet_wr_csr(p, CLE_BYPASS_REG1_0_ADDR, data); + xgene_enet_wr_csr(p, cle_bypass_reg1 + offset, data); } static void xgene_enet_shutdown(struct xgene_enet_pdata *p) { - u32 val = 0xffffffff; - - xgene_enet_wr_ring_if(p, ENET_CFGSSQMIFPDISABLE_ADDR, val); - xgene_enet_wr_ring_if(p, ENET_CFGSSQMIFPRESET_ADDR, val); - xgene_enet_wr_ring_if(p, ENET_CFGSSQMIFPDISABLE_ADDR, 0); - xgene_enet_wr_ring_if(p, ENET_CFGSSQMIWQDISABLE_ADDR, val); - xgene_enet_wr_ring_if(p, ENET_CFGSSQMIWQRESET_ADDR, val); - xgene_enet_wr_ring_if(p, ENET_CFGSSQMIWQDISABLE_ADDR, 0); - - clk_disable_unprepare(p->clk); + if (!IS_ERR(p->clk)) + clk_disable_unprepare(p->clk); } static void xgene_enet_link_state(struct work_struct *work) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c index f057b1f..05edb84 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c @@ -122,7 +122,6 @@ static bool xgene_enet_rd_indirect(void __iomem *addr, void __iomem *rd, return true; } - static void xgene_enet_rd_mac(struct xgene_enet_pdata *pdata, u32 rd_addr, u32 *rd_data) { @@ -257,9 +256,11 @@ static int xgene_enet_reset(struct xgene_enet_pdata *pdata) if (!xgene_ring_mgr_init(pdata)) return -ENODEV; - clk_prepare_enable(pdata->clk); - clk_disable_unprepare(pdata->clk); - clk_prepare_enable(pdata->clk); + if (!IS_ERR(pdata->clk)) { + clk_prepare_enable(pdata->clk); + clk_disable_unprepare(pdata->clk); + clk_prepare_enable(pdata->clk); + } xgene_enet_ecc_init(pdata); xgene_enet_config_ring_if_assoc(pdata); @@ -286,16 +287,8 @@ static void xgene_enet_xgcle_bypass(struct xgene_enet_pdata *pdata, static void xgene_enet_shutdown(struct xgene_enet_pdata *pdata) { - u32 val = 0xffffffff; - - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIFPDISABLE_ADDR, val); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIFPRESET_ADDR, val); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIFPDISABLE_ADDR, 0); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIWQDISABLE_ADDR, val); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIWQRESET_ADDR, val); - xgene_enet_wr_ring_if(pdata, ENET_CFGSSQMIWQDISABLE_ADDR, 0); - - clk_disable_unprepare(pdata->clk); + if (!IS_ERR(pdata->clk)) + clk_disable_unprepare(pdata->clk); } static void xgene_enet_link_state(struct work_struct *work) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h index 5a5296a..bf0a994 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h @@ -21,9 +21,28 @@ #ifndef __XGENE_ENET_XGMAC_H__ #define __XGENE_ENET_XGMAC_H__ +#define X2_BLOCK_ETH_MAC_CSR_OFFSET 0x3000 #define BLOCK_AXG_MAC_OFFSET 0x0800 #define BLOCK_AXG_MAC_CSR_OFFSET 0x2000 +#define XGENET_CONFIG_REG_ADDR 0x20 +#define XGENET_SRST_ADDR 0x00 +#define XGENET_CLKEN_ADDR 0x08 + +#define CSR_CLK BIT(0) +#define XGENET_CLK BIT(1) +#define PCS_CLK BIT(3) +#define AN_REF_CLK BIT(4) +#define AN_CLK BIT(5) +#define AD_CLK BIT(6) + +#define CSR_RST BIT(0) +#define XGENET_RST BIT(1) +#define PCS_RST BIT(3) +#define AN_REF_RST BIT(4) +#define AN_RST BIT(5) +#define AD_RST BIT(6) + #define AXGMAC_CONFIG_0 0x0000 #define AXGMAC_CONFIG_1 0x0004 #define HSTMACRST BIT(31) @@ -38,6 +57,7 @@ #define HSTMACADR_MSW_ADDR 0x0014 #define HSTMAXFRAME_LENGTH_ADDR 0x0020 +#define XG_MCX_RX_DV_GATE_REG_0_ADDR 0x0004 #define XG_RSIF_CONFIG_REG_ADDR 0x00a0 #define XCLE_BYPASS_REG0_ADDR 0x0160 #define XCLE_BYPASS_REG1_ADDR 0x0164 -- 1.7.1

1 0

[PATCH] Add Xen multiboot support to grub2 for aarch64
by Stefano Stabellini 01 Oct '15

01 Oct '15

Backport required patches. Disable Secure Boot for now as it conflicts with the Xen patches. Increase Epoch. Signed-off-by: Stefano Stabellini <stefano.stabellini(a)eu.citrix.com> --- ...rm64-Export-useful-functions-from-linux.c.patch | 280 ++++++++ ...nd-export-some-accessor-functions-for-xen.patch | 67 ++ SOURCES/0003-arm64-Add-xen_boot-module-file.patch | 733 +++++++++++++++++++++ ...-20_linux_xen.in-Add-support-of-the-XEN-b.patch | 60 ++ ...he-introduction-of-xen-boot-commands-in-d.patch | 94 +++ .../0006-fdt.h-Add-grub_fdt_set_reg64-macro.patch | 34 + SPECS/grub2.spec | 16 +- 7 files changed, 1280 insertions(+), 4 deletions(-) create mode 100644 SOURCES/0001-arm64-Export-useful-functions-from-linux.c.patch create mode 100644 SOURCES/0002-arm64-Add-and-export-some-accessor-functions-for-xen.patch create mode 100644 SOURCES/0003-arm64-Add-xen_boot-module-file.patch create mode 100644 SOURCES/0004-util-grub.d-20_linux_xen.in-Add-support-of-the-XEN-b.patch create mode 100644 SOURCES/0005-arm64-Add-the-introduction-of-xen-boot-commands-in-d.patch create mode 100644 SOURCES/0006-fdt.h-Add-grub_fdt_set_reg64-macro.patch diff --git a/SOURCES/0001-arm64-Export-useful-functions-from-linux.c.patch b/SOURCES/0001-arm64-Export-useful-functions-from-linux.c.patch new file mode 100644 index 0000000..88ccc12 --- /dev/null +++ b/SOURCES/0001-arm64-Export-useful-functions-from-linux.c.patch @@ -0,0 +1,280 @@ +From cfce76bbd91696e83bb15a180fd51a0fd1c31f83 Mon Sep 17 00:00:00 2001 +From: Fu Wei <fu.wei(a)linaro.org> +Date: Thu, 7 May 2015 15:11:04 +0200 +Subject: [PATCH 1/5] arm64: Export useful functions from linux.c + +Signed-off-by: Fu Wei <fu.wei(a)linaro.org> + +Conflicts: + gentpl.py +--- + gentpl.py | 2 +- + grub-core/loader/arm64/linux.c | 59 ++++++++++++++++++++-------------------- + grub-core/loader/i386/linux.c | 11 ++++---- + grub-core/loader/linux.c | 3 +- + include/grub/arm64/linux.h | 11 ++++++++ + 5 files changed, 49 insertions(+), 37 deletions(-) + +diff --git a/gentpl.py b/gentpl.py +index bdcae1a..136b484 100644 +--- a/gentpl.py ++++ b/gentpl.py +@@ -753,7 +753,7 @@ def image(defn, platform): + if test x$(TARGET_APPLE_LINKER) = x1; then \ + $(MACHO2IMG) $< $@; \ + else \ +- $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn -R .note.gnu.gold-version $< $@; \ ++ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R .rel.dyn -R .note.gnu.gold-version -R .hash -R .dynsym -R .dynstr -R .rel.text $< $@; \ + fi + """) + +diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c +index 9d15aad..18c34c8 100644 +--- a/grub-core/loader/arm64/linux.c ++++ b/grub-core/loader/arm64/linux.c +@@ -33,12 +33,6 @@ + + GRUB_MOD_LICENSE ("GPLv3+"); + +-#define GRUB_EFI_PAGE_SHIFT 12 +-#define BYTES_TO_PAGES(bytes) (((bytes) + 0xfff) >> GRUB_EFI_PAGE_SHIFT) +-#define GRUB_EFI_PE_MAGIC 0x5A4D +- +-static grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; +- + static grub_dl_t my_mod; + static int loaded; + +@@ -58,6 +52,7 @@ static void * + get_firmware_fdt (void) + { + grub_efi_configuration_table_t *tables; ++ grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; + void *firmware_fdt = NULL; + unsigned int i; + +@@ -75,8 +70,8 @@ get_firmware_fdt (void) + return firmware_fdt; + } + +-static void +-get_fdt (void) ++void * ++grub_linux_get_fdt (void) + { + void *raw_fdt; + grub_size_t size; +@@ -99,7 +94,7 @@ get_fdt (void) + grub_dprintf ("linux", "allocating %ld bytes for fdt\n", size); + fdt = grub_efi_allocate_pages (0, BYTES_TO_PAGES (size)); + if (!fdt) +- return; ++ return NULL; + + if (raw_fdt) + { +@@ -110,10 +105,11 @@ get_fdt (void) + { + grub_fdt_create_empty_tree (fdt, size); + } ++ return fdt; + } + +-static grub_err_t +-check_kernel (struct grub_arm64_linux_kernel_header *lh) ++grub_err_t ++grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh) + { + if (lh->magic != GRUB_ARM64_LINUX_MAGIC) + return grub_error(GRUB_ERR_BAD_OS, "invalid magic number"); +@@ -131,14 +127,14 @@ check_kernel (struct grub_arm64_linux_kernel_header *lh) + } + + static grub_err_t +-finalize_params (void) ++finalize_params_linux (void) + { + grub_efi_boot_services_t *b; ++ grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; + grub_efi_status_t status; + int node, retval; + +- get_fdt (); +- if (!fdt) ++ if (!grub_linux_get_fdt ()) + goto failure; + + node = grub_fdt_find_subnode (fdt, 0, "chosen"); +@@ -240,21 +236,16 @@ out: + return grub_errno; + } + +-static grub_err_t +-grub_linux_boot (void) ++grub_err_t ++grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args) + { + grub_efi_memory_mapped_device_path_t *mempath; + grub_efi_handle_t image_handle; + grub_efi_boot_services_t *b; + grub_efi_status_t status; +- grub_err_t retval; + grub_efi_loaded_image_t *loaded_image; + int len; + +- retval = finalize_params(); +- if (retval != GRUB_ERR_NONE) +- return retval; +- + mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t)); + if (!mempath) + return grub_errno; +@@ -263,8 +254,8 @@ grub_linux_boot (void) + mempath[0].header.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE; + mempath[0].header.length = grub_cpu_to_le16_compile_time (sizeof (*mempath)); + mempath[0].memory_type = GRUB_EFI_LOADER_DATA; +- mempath[0].start_address = (grub_addr_t) kernel_addr; +- mempath[0].end_address = (grub_addr_t) kernel_addr + kernel_size; ++ mempath[0].start_address = addr; ++ mempath[0].end_address = addr + size; + + mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE; + mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE; +@@ -273,16 +264,16 @@ grub_linux_boot (void) + b = grub_efi_system_table->boot_services; + status = b->load_image (0, grub_efi_image_handle, + (grub_efi_device_path_t *) mempath, +- kernel_addr, kernel_size, &image_handle); ++ (void *) addr, size, &image_handle); + if (status != GRUB_EFI_SUCCESS) + return grub_error (GRUB_ERR_BAD_OS, "cannot load image"); + +- grub_dprintf ("linux", "linux command line: '%s'\n", linux_args); ++ grub_dprintf ("linux", "linux command line: '%s'\n", args); + + /* Convert command line to UCS-2 */ + loaded_image = grub_efi_get_loaded_image (image_handle); + loaded_image->load_options_size = len = +- (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t); ++ (grub_strlen (args) + 1) * sizeof (grub_efi_char16_t); + loaded_image->load_options = + grub_efi_allocate_pages (0, + BYTES_TO_PAGES (loaded_image->load_options_size)); +@@ -291,9 +282,9 @@ grub_linux_boot (void) + + loaded_image->load_options_size = + 2 * grub_utf8_to_utf16 (loaded_image->load_options, len, +- (grub_uint8_t *) linux_args, len, NULL); ++ (grub_uint8_t *) args, len, NULL); + +- grub_dprintf("linux", "starting image %p\n", image_handle); ++ grub_dprintf ("linux", "starting image %p\n", image_handle); + status = b->start_image (image_handle, 0, NULL); + + /* When successful, not reached */ +@@ -305,6 +296,16 @@ grub_linux_boot (void) + } + + static grub_err_t ++grub_linux_boot (void) ++{ ++ if (finalize_params_linux () != GRUB_ERR_NONE) ++ return grub_errno; ++ ++ return (grub_arm64_uefi_boot_image((grub_addr_t)kernel_addr, ++ kernel_size, linux_args)); ++} ++ ++static grub_err_t + grub_linux_unload (void) + { + grub_dl_unref (my_mod); +@@ -400,7 +401,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), + if (grub_file_read (file, &lh, sizeof (lh)) < (long) sizeof (lh)) + return grub_errno; + +- if (check_kernel (&lh) != GRUB_ERR_NONE) ++ if (grub_arm64_uefi_check_image (&lh) != GRUB_ERR_NONE) + goto fail; + + grub_loader_unset(); +diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c +index 31fb91e..434ddca 100644 +--- a/grub-core/loader/i386/linux.c ++++ b/grub-core/loader/i386/linux.c +@@ -69,7 +69,6 @@ static grub_addr_t prot_mode_target; + static void *initrd_mem; + static grub_addr_t initrd_mem_target; + static grub_size_t prot_init_space; +-static grub_uint32_t initrd_pages; + static struct grub_relocator *relocator = NULL; + static void *efi_mmap_buf; + static grub_size_t maximal_cmdline_size; +@@ -1046,7 +1045,7 @@ static grub_err_t + grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) + { +- grub_size_t size = 0; ++ grub_size_t size = 0, aligned_size = 0; + grub_addr_t addr_min, addr_max; + grub_addr_t addr; + grub_err_t err; +@@ -1068,8 +1067,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + goto fail; + + size = grub_get_initrd_size (&initrd_ctx); +- +- initrd_pages = (page_align (size) >> 12); ++ aligned_size = ALIGN_UP (size, 4096); + + /* Get the highest address available for the initrd. */ + if (grub_le_to_cpu16 (linux_params.version) >= 0x0203) +@@ -1097,7 +1095,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + addr_min = (grub_addr_t) prot_mode_target + prot_init_space; + + /* Put the initrd as high as possible, 4KiB aligned. */ +- addr = (addr_max - size) & ~0xFFF; ++ addr = (addr_max - aligned_size) & ~0xFFF; + + if (addr < addr_min) + { +@@ -1108,7 +1106,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + { + grub_relocator_chunk_t ch; + err = grub_relocator_alloc_chunk_align (relocator, &ch, +- addr_min, addr, size, 0x1000, ++ addr_min, addr, aligned_size, ++ 0x1000, + GRUB_RELOCATOR_PREFERENCE_HIGH, + 1); + if (err) +diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h +index 864e5dc..65796d9 100644 +--- a/include/grub/arm64/linux.h ++++ b/include/grub/arm64/linux.h +@@ -23,6 +23,10 @@ + + #define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ + ++#define GRUB_EFI_PAGE_SHIFT 12 ++#define BYTES_TO_PAGES(bytes) (((bytes) + 0xfff) >> GRUB_EFI_PAGE_SHIFT) ++#define GRUB_EFI_PE_MAGIC 0x5A4D ++ + /* From linux/Documentation/arm64/booting.txt */ + struct grub_arm64_linux_kernel_header + { +@@ -38,4 +42,11 @@ struct grub_arm64_linux_kernel_header + grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ + }; + ++/* Declare the functions for getting dtb and checking/booting image */ ++void *grub_linux_get_fdt (void); ++grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header ++ *lh); ++grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, ++ char *args); ++ + #endif /* ! GRUB_LINUX_CPU_HEADER */ +-- +1.7.10.4 + diff --git a/SOURCES/0002-arm64-Add-and-export-some-accessor-functions-for-xen.patch b/SOURCES/0002-arm64-Add-and-export-some-accessor-functions-for-xen.patch new file mode 100644 index 0000000..8caf670 --- /dev/null +++ b/SOURCES/0002-arm64-Add-and-export-some-accessor-functions-for-xen.patch @@ -0,0 +1,67 @@ +From 484f6f757c6ce8419bd6037d6e67ae339d243720 Mon Sep 17 00:00:00 2001 +From: Fu Wei <fu.wei(a)linaro.org> +Date: Thu, 23 Jul 2015 13:16:20 +0800 +Subject: [PATCH 2/5] arm64: Add and export some accessor functions for xen + boot + +Add accessor functions of "loaded" flag in +grub-core/loader/arm64/linux.c. + +Export accessor functions of "loaded" flag and +grub_linux_get_fdt function in include/grub/arm64/linux.h. + +Purpose: Reuse the existing code of devicetree in linux module. + +Signed-off-by: Fu Wei <fu.wei(a)linaro.org> +--- + grub-core/loader/arm64/linux.c | 13 +++++++++++++ + include/grub/arm64/linux.h | 6 +++++- + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c +index 18c34c8..038300e 100644 +--- a/grub-core/loader/arm64/linux.c ++++ b/grub-core/loader/arm64/linux.c +@@ -48,6 +48,19 @@ static grub_addr_t initrd_end; + static void *loaded_fdt; + static void *fdt; + ++/* The accessor functions for "loaded" flag */ ++int ++grub_linux_get_loaded (void) ++{ ++ return loaded; ++} ++ ++void ++grub_linux_set_loaded (int loaded_flag) ++{ ++ loaded = loaded_flag; ++} ++ + static void * + get_firmware_fdt (void) + { +diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h +index 65796d9..20058f3 100644 +--- a/include/grub/arm64/linux.h ++++ b/include/grub/arm64/linux.h +@@ -43,10 +43,14 @@ struct grub_arm64_linux_kernel_header + }; + + /* Declare the functions for getting dtb and checking/booting image */ +-void *grub_linux_get_fdt (void); + grub_err_t grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header + *lh); + grub_err_t grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, + char *args); + ++/* Export the accessor functions for gettin dtb and "loaded" flag */ ++void EXPORT_FUNC (*grub_linux_get_fdt) (void); ++int EXPORT_FUNC (grub_linux_get_loaded) (void); ++void EXPORT_FUNC (grub_linux_set_loaded) (int loaded_flag); ++ + #endif /* ! GRUB_LINUX_CPU_HEADER */ +-- +1.7.10.4 + diff --git a/SOURCES/0003-arm64-Add-xen_boot-module-file.patch b/SOURCES/0003-arm64-Add-xen_boot-module-file.patch new file mode 100644 index 0000000..bbbd227 --- /dev/null +++ b/SOURCES/0003-arm64-Add-xen_boot-module-file.patch @@ -0,0 +1,733 @@ +From f319fbb1efd802c1fd62c788261ff1f6c32d9438 Mon Sep 17 00:00:00 2001 +From: Fu Wei <fu.wei(a)linaro.org> +Date: Thu, 23 Jul 2015 13:16:21 +0800 +Subject: [PATCH 3/5] arm64: Add xen_boot module file + +grub-core/loader/arm64/xen_boot.c + + - This adds support for the Xen boot on ARM specification for arm64. + - Introduce xen_hypervisor, xen_linux, xen_initrd and xen_xsm + to load different binaries for xen boot; + Introduce xen_module to load common or custom module for xen boot. + - This Xen boot support is a separated module for aarch64, + but reuse the existing code of devicetree in linux module. + +Signed-off-by: Fu Wei <fu.wei(a)linaro.org> +--- + grub-core/Makefile.core.def | 7 + + grub-core/loader/arm64/xen_boot.c | 685 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 692 insertions(+) + create mode 100644 grub-core/loader/arm64/xen_boot.c + +diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def +index c916246..2c92323 100644 +--- a/grub-core/Makefile.core.def ++++ b/grub-core/Makefile.core.def +@@ -1662,6 +1662,13 @@ module = { + }; + + module = { ++ name = xen_boot; ++ common = lib/cmdline.c; ++ arm64 = loader/arm64/xen_boot.c; ++ enable = arm64; ++}; ++ ++module = { + name = linux; + x86 = loader/i386/linux.c; + xen = loader/i386/xen.c; +diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c +new file mode 100644 +index 0000000..33a65dd +--- /dev/null ++++ b/grub-core/loader/arm64/xen_boot.c +@@ -0,0 +1,685 @@ ++/* ++ * GRUB -- GRand Unified Bootloader ++ * Copyright (C) 2014 Free Software Foundation, Inc. ++ * ++ * GRUB is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GRUB is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GRUB. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++#include <grub/cache.h> ++#include <grub/charset.h> ++#include <grub/command.h> ++#include <grub/err.h> ++#include <grub/file.h> ++#include <grub/fdt.h> ++#include <grub/linux.h> ++#include <grub/list.h> ++#include <grub/loader.h> ++#include <grub/misc.h> ++#include <grub/mm.h> ++#include <grub/types.h> ++#include <grub/cpu/linux.h> ++#include <grub/efi/efi.h> ++#include <grub/efi/pe32.h> /* required by struct xen_hypervisor_header */ ++#include <grub/i18n.h> ++#include <grub/lib/cmdline.h> ++ ++GRUB_MOD_LICENSE ("GPLv3+"); ++ ++#define XEN_HYPERVISOR_NAME "xen_hypervisor" ++ ++#define MODULE_DEFAULT_ALIGN (0x0) ++#define MODULE_IMAGE_MIN_ALIGN MODULE_DEFAULT_ALIGN ++#define MODULE_INITRD_MIN_ALIGN MODULE_DEFAULT_ALIGN ++#define MODULE_XSM_MIN_ALIGN MODULE_DEFAULT_ALIGN ++#define MODULE_CUSTOM_MIN_ALIGN MODULE_DEFAULT_ALIGN ++ ++/* #define MODULE_IMAGE_COMPATIBLE "xen,linux-image\0xen,module" ++#define MODULE_INITRD_COMPATIBLE "xen,linux-image\0xen,module" ++#define MODULE_XSM_COMPATIBLE "xen,xsm-policy\0xen,module" ++#define MODULE_CUSTOM_COMPATIBLE "xen,module" */ ++#define MODULE_IMAGE_COMPATIBLE "multiboot,kernel\0multiboot,module" ++#define MODULE_INITRD_COMPATIBLE "multiboot,ramdisk\0multiboot,module" ++#define MODULE_XSM_COMPATIBLE "xen,xsm-policy\0multiboot,module" ++#define MODULE_CUSTOM_COMPATIBLE "multiboot,module" ++ ++/* This maximum size is defined in Power.org ePAPR V1.1 ++ * https://www.power.org/documentation/epapr-version-1-1/ ++ * 2.2.1.1 Node Name Requirements ++ * node-name@unit-address ++ * 31 + 1(@) + 16(64bit address in hex format) + 1(\0) = 49 ++ */ ++#define FDT_NODE_NAME_MAX_SIZE (49) ++ ++#define ARG_SHIFT(argc, argv) \ ++ do { \ ++ (argc)--; \ ++ (argv)++; \ ++ } while (0) ++ ++struct compat_string_struct ++{ ++ grub_size_t size; ++ const char *compat_string; ++}; ++typedef struct compat_string_struct compat_string_struct_t; ++#define FDT_COMPATIBLE(x) {.size = sizeof(x), .compat_string = (x)} ++ ++enum module_type ++{ ++ MODULE_IMAGE, ++ MODULE_INITRD, ++ MODULE_XSM, ++ MODULE_CUSTOM ++}; ++typedef enum module_type module_type_t; ++ ++struct fdt_node_info ++{ ++ module_type_t type; ++ ++ const char *compat_string; ++ grub_size_t compat_string_size; ++}; ++ ++struct xen_hypervisor_header ++{ ++ struct grub_arm64_linux_kernel_header efi_head; ++ ++ /* This is always PE\0\0. */ ++ grub_uint8_t signature[GRUB_PE32_SIGNATURE_SIZE]; ++ /* The COFF file header. */ ++ struct grub_pe32_coff_header coff_header; ++ /* The Optional header. */ ++ struct grub_pe64_optional_header optional_header; ++}; ++ ++struct xen_boot_binary ++{ ++ struct xen_boot_binary *next; ++ struct xen_boot_binary **prev; ++ const char *name; ++ ++ grub_addr_t start; ++ grub_size_t size; ++ grub_size_t align; ++ ++ char *cmdline; ++ int cmdline_size; ++ ++ struct fdt_node_info node_info; ++}; ++ ++static grub_dl_t my_mod; ++ ++static struct xen_boot_binary *xen_hypervisor; ++static struct xen_boot_binary *module_head; ++static const grub_size_t module_default_align[] = { ++ MODULE_IMAGE_MIN_ALIGN, ++ MODULE_INITRD_MIN_ALIGN, ++ MODULE_XSM_MIN_ALIGN, ++ MODULE_CUSTOM_MIN_ALIGN ++}; ++ ++static void *xen_boot_fdt; ++static const compat_string_struct_t default_compat_string[] = { ++ FDT_COMPATIBLE (MODULE_IMAGE_COMPATIBLE), ++ FDT_COMPATIBLE (MODULE_INITRD_COMPATIBLE), ++ FDT_COMPATIBLE (MODULE_XSM_COMPATIBLE), ++ FDT_COMPATIBLE (MODULE_CUSTOM_COMPATIBLE) ++}; ++ ++static __inline grub_addr_t ++xen_boot_address_align (grub_addr_t start, grub_size_t align) ++{ ++ return (align ? (ALIGN_UP (start, align)) : start); ++} ++ ++/* Parse the option of xen_module command. For now, we support ++ (1) --type <the compatible stream> ++ We also set up the type of module in this function. ++ If there are some "--type" options in the command line, ++ we make a custom compatible stream in this function. */ ++static grub_err_t ++set_module_type (grub_command_t cmd, struct xen_boot_binary *module, ++ int argc, char *argv[], int *file_name_index) ++{ ++ char **compat_string_temp_array; ++ grub_size_t total_size = 0; ++ int num_types = 0, i; ++ char *temp = NULL; ++ ++ *file_name_index = 0; ++ ++ if (!grub_strcmp (cmd->name, "xen_linux")) ++ module->node_info.type = MODULE_IMAGE; ++ else if (!grub_strcmp (cmd->name, "xen_initrd")) ++ module->node_info.type = MODULE_INITRD; ++ else if (!grub_strcmp (cmd->name, "xen_xsm")) ++ module->node_info.type = MODULE_XSM; ++ else if (!grub_strcmp (cmd->name, "xen_module")) ++ module->node_info.type = MODULE_CUSTOM; ++ ++ /* if there are some options we need to process. */ ++ if (module->node_info.type == MODULE_CUSTOM) ++ { ++ compat_string_temp_array = ++ (char **) grub_zalloc (sizeof (char *) * argc); ++ if (!compat_string_temp_array) ++ return grub_errno; ++ /* the module type is set by "--type"(MODULE_CUSTOM) */ ++ while (argc > 2 && !grub_strcmp (argv[0], "--type")) ++ { ++ module->node_info.type = MODULE_CUSTOM; ++ ARG_SHIFT (argc, argv); ++ total_size += grub_strlen (argv[0]) + 1; ++ compat_string_temp_array[num_types++] = argv[0]; ++ ARG_SHIFT (argc, argv); ++ (*file_name_index) += 2; ++ } ++ ++ if (total_size) ++ { ++ module->node_info.compat_string = temp = ++ (char *) grub_zalloc (total_size); ++ if (!temp) ++ { ++ grub_free (compat_string_temp_array); ++ return grub_errno; ++ } ++ ++ module->node_info.compat_string_size = total_size; ++ for (i = 0; num_types > 0; num_types--, i++, temp++) ++ { ++ grub_strcpy (temp, compat_string_temp_array[i]); ++ temp += grub_strlen (compat_string_temp_array[i]); ++ } ++ } ++ else ++ { ++ module->node_info.compat_string = ++ default_compat_string[MODULE_CUSTOM].compat_string; ++ module->node_info.compat_string_size = ++ default_compat_string[MODULE_CUSTOM].size; ++ } ++ ++ grub_free (compat_string_temp_array); ++ } ++ ++ return GRUB_ERR_NONE; ++} ++ ++static grub_err_t ++prepare_xen_hypervisor_params (void) ++{ ++ int chosen_node = 0; ++ int retval; ++ ++ xen_boot_fdt = grub_linux_get_fdt (); ++ if (!xen_boot_fdt) ++ return grub_error (GRUB_ERR_IO, "failed to get FDT"); ++ ++ chosen_node = grub_fdt_find_subnode (xen_boot_fdt, 0, "chosen"); ++ if (chosen_node < 0) ++ chosen_node = grub_fdt_add_subnode (xen_boot_fdt, 0, "chosen"); ++ if (chosen_node < 1) ++ return grub_error (GRUB_ERR_IO, "failed to get chosen node in FDT"); ++ ++ grub_dprintf ("xen_loader", ++ "Xen Hypervisor cmdline : %s @ %p size:%d\n", ++ xen_hypervisor->cmdline, xen_hypervisor->cmdline, ++ xen_hypervisor->cmdline_size); ++ ++ retval = grub_fdt_set_prop (xen_boot_fdt, chosen_node, "bootargs", ++ xen_hypervisor->cmdline, ++ xen_hypervisor->cmdline_size); ++ if (retval) ++ return grub_error (GRUB_ERR_IO, "failed to install/update FDT"); ++ ++ return GRUB_ERR_NONE; ++} ++ ++static grub_err_t ++prepare_xen_module_params (struct xen_boot_binary *module) ++{ ++ int retval, chosen_node = 0, module_node = 0; ++ char module_name[FDT_NODE_NAME_MAX_SIZE]; ++ ++ retval = grub_snprintf (module_name, FDT_NODE_NAME_MAX_SIZE, "module@%lx", ++ xen_boot_address_align (module->start, ++ module->align)); ++ grub_dprintf ("xen_loader", "Module node name %s \n", module_name); ++ ++ if (retval < (int) sizeof ("module@")) ++ return grub_error (GRUB_ERR_IO, N_("failed to get FDT")); ++ ++ chosen_node = grub_fdt_find_subnode (xen_boot_fdt, 0, "chosen"); ++ if (chosen_node < 0) ++ chosen_node = grub_fdt_add_subnode (xen_boot_fdt, 0, "chosen"); ++ if (chosen_node < 1) ++ return grub_error (GRUB_ERR_IO, "failed to get chosen node in FDT"); ++ ++ module_node = ++ grub_fdt_find_subnode (xen_boot_fdt, chosen_node, module_name); ++ if (module_node < 0) ++ module_node = ++ grub_fdt_add_subnode (xen_boot_fdt, chosen_node, module_name); ++ ++ retval = grub_fdt_set_prop (xen_boot_fdt, module_node, "compatible", ++ module->node_info.compat_string, ++ (grub_uint32_t) module-> ++ node_info.compat_string_size); ++ if (retval) ++ return grub_error (GRUB_ERR_IO, N_("failed to update FDT")); ++ ++ grub_dprintf ("xen_loader", "Module %s compatible = %s size = 0x%lx\n", ++ module->name, module->node_info.compat_string, ++ module->node_info.compat_string_size); ++ ++ retval = grub_fdt_set_reg64 (xen_boot_fdt, module_node, ++ xen_boot_address_align (module->start, ++ module->align), ++ module->size); ++ if (retval) ++ return grub_error (GRUB_ERR_IO, N_("failed to update FDT")); ++ ++ if (module->cmdline && module->cmdline_size > 0) ++ { ++ grub_dprintf ("xen_loader", ++ "Module %s cmdline : %s @ %p size:%d\n", module->name, ++ module->cmdline, module->cmdline, module->cmdline_size); ++ ++ retval = grub_fdt_set_prop (xen_boot_fdt, module_node, "bootargs", ++ module->cmdline, module->cmdline_size + 1); ++ if (retval) ++ return grub_error (GRUB_ERR_IO, "failed to update FDT"); ++ } ++ else ++ { ++ grub_dprintf ("xen_loader", "Module %s has not bootargs!\n", ++ module->name); ++ } ++ ++ return GRUB_ERR_NONE; ++} ++ ++static grub_err_t ++install_all_params (void) ++{ ++ grub_efi_guid_t fdt_guid = GRUB_EFI_DEVICE_TREE_GUID; ++ grub_efi_boot_services_t *b; ++ grub_efi_status_t status; ++ ++ b = grub_efi_system_table->boot_services; ++ status = b->install_configuration_table (&fdt_guid, xen_boot_fdt); ++ if (status != GRUB_EFI_SUCCESS) ++ return grub_error (GRUB_ERR_IO, "failed to install FDT"); ++ ++ grub_dprintf ("xen_loader", ++ "Installed/updated FDT configuration table @ %p\n", ++ xen_boot_fdt); ++ ++ return GRUB_ERR_NONE; ++} ++ ++static grub_err_t ++clean_all_params (void) ++{ ++ if (xen_boot_fdt) ++ { ++ grub_efi_free_pages ((grub_efi_physical_address_t) xen_boot_fdt, ++ BYTES_TO_PAGES (grub_fdt_get_totalsize ++ (xen_boot_fdt))); ++ xen_boot_fdt = NULL; ++ } ++ ++ return GRUB_ERR_NONE; ++} ++ ++static grub_err_t ++finalize_params_xen_boot (void) ++{ ++ struct xen_boot_binary *module; ++ ++ if (xen_hypervisor) ++ { ++ if (prepare_xen_hypervisor_params () != GRUB_ERR_NONE) ++ goto fail; ++ } ++ else ++ { ++ grub_dprintf ("xen_loader", "Failed to get Xen Hypervisor info!\n"); ++ goto fail; ++ } ++ ++ /* Set module params info */ ++ FOR_LIST_ELEMENTS (module, module_head) ++ { ++ if (module->start && module->size > 0) ++ { ++ grub_dprintf ("xen_loader", "Module %s @ 0x%lx size:0x%lx\n", ++ module->name, ++ xen_boot_address_align (module->start, module->align), ++ module->size); ++ if (prepare_xen_module_params (module) != GRUB_ERR_NONE) ++ goto fail; ++ } ++ else ++ { ++ grub_dprintf ("xen_loader", "Module info error: %s!\n", module->name); ++ goto fail; ++ } ++ } ++ ++ if (install_all_params () == GRUB_ERR_NONE) ++ return GRUB_ERR_NONE; ++ ++fail: ++ clean_all_params (); ++ ++ return grub_error (GRUB_ERR_IO, "failed to install/update FDT"); ++} ++ ++ ++static grub_err_t ++xen_boot (void) ++{ ++ grub_err_t err = finalize_params_xen_boot (); ++ if (err) ++ return err; ++ ++ return grub_arm64_uefi_boot_image (xen_hypervisor->start, ++ xen_hypervisor->size, ++ xen_hypervisor->cmdline); ++} ++ ++static void ++single_binary_unload (struct xen_boot_binary *binary) ++{ ++ if (!binary) ++ return; ++ ++ if (binary->start && binary->size > 0) ++ { ++ grub_efi_free_pages ((grub_efi_physical_address_t) binary->start, ++ BYTES_TO_PAGES (binary->size + binary->align)); ++ } ++ ++ if (binary->cmdline && binary->cmdline_size > 0) ++ { ++ grub_free (binary->cmdline); ++ grub_dprintf ("xen_loader", ++ "Module %s cmdline memory free @ %p size: %d\n", ++ binary->name, binary->cmdline, binary->cmdline_size); ++ } ++ ++ if (binary->node_info.type == MODULE_CUSTOM) ++ grub_free ((void *) binary->node_info.compat_string); ++ ++ if (grub_strcmp (binary->name, XEN_HYPERVISOR_NAME)) ++ grub_list_remove (GRUB_AS_LIST (binary)); ++ ++ grub_dprintf ("xen_loader", ++ "Module %s struct memory free @ %p size: 0x%lx\n", ++ binary->name, binary, sizeof (binary)); ++ grub_free (binary); ++ ++ return; ++} ++ ++static void ++all_binaries_unload (void) ++{ ++ struct xen_boot_binary *binary; ++ ++ FOR_LIST_ELEMENTS (binary, module_head) ++ { ++ single_binary_unload (binary); ++ } ++ ++ if (xen_hypervisor) ++ single_binary_unload (xen_hypervisor); ++ ++ return; ++} ++ ++static grub_err_t ++xen_unload (void) ++{ ++ grub_linux_set_loaded (0); ++ all_binaries_unload (); ++ clean_all_params (); ++ grub_dl_unref (my_mod); ++ ++ return GRUB_ERR_NONE; ++} ++ ++static void ++xen_boot_binary_load (struct xen_boot_binary *binary, grub_file_t file, ++ int argc, char *argv[]) ++{ ++ binary->size = grub_file_size (file); ++ grub_dprintf ("xen_loader", "Xen_boot %s file size: 0x%lx\n", ++ binary->name, binary->size); ++ ++ binary->start = (grub_addr_t) grub_efi_allocate_pages (0, ++ (BYTES_TO_PAGES ++ (binary->size + ++ binary->align))); ++ if (!binary->start) ++ { ++ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); ++ return; ++ } ++ ++ grub_dprintf ("xen_loader", "Xen_boot %s numpages: 0x%lx\n", ++ binary->name, BYTES_TO_PAGES (binary->size + binary->align)); ++ ++ if (grub_file_read (file, (void *) xen_boot_address_align (binary->start, ++ binary->align), ++ binary->size) != (grub_ssize_t) binary->size) ++ { ++ single_binary_unload (binary); ++ grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), argv[0]); ++ return; ++ } ++ ++ if (argc > 1) ++ { ++ binary->cmdline_size = grub_loader_cmdline_size (argc - 1, argv + 1); ++ binary->cmdline = grub_zalloc (binary->cmdline_size); ++ if (!binary->cmdline) ++ { ++ single_binary_unload (binary); ++ grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory")); ++ return; ++ } ++ grub_create_loader_cmdline (argc - 1, argv + 1, binary->cmdline, ++ binary->cmdline_size); ++ grub_dprintf ("xen_loader", ++ "Xen_boot %s cmdline @ %p %s, size: %d\n", binary->name, ++ binary->cmdline, binary->cmdline, binary->cmdline_size); ++ } ++ else ++ { ++ binary->cmdline_size = 0; ++ binary->cmdline = NULL; ++ } ++ ++ grub_errno = GRUB_ERR_NONE; ++ return; ++} ++ ++static grub_err_t ++grub_cmd_xen_module (grub_command_t cmd, int argc, char *argv[]) ++{ ++ ++ struct xen_boot_binary *module = NULL; ++ int file_name_index = 0; ++ grub_file_t file = 0; ++ ++ if (!argc) ++ { ++ grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); ++ goto fail; ++ } ++ ++ if (!grub_linux_get_loaded ()) ++ { ++ grub_error (GRUB_ERR_BAD_ARGUMENT, ++ N_("you need to load the Xen Hypervisor first")); ++ goto fail; ++ } ++ ++ module = ++ (struct xen_boot_binary *) grub_zalloc (sizeof (struct xen_boot_binary)); ++ if (!module) ++ return grub_errno; ++ ++ /* process all the options and get module type */ ++ if (set_module_type (cmd, module, argc, argv, &file_name_index) != ++ GRUB_ERR_NONE) ++ goto fail; ++ switch (module->node_info.type) ++ { ++ case MODULE_IMAGE: ++ case MODULE_INITRD: ++ case MODULE_XSM: ++ module->node_info.compat_string = ++ default_compat_string[module->node_info.type].compat_string; ++ module->node_info.compat_string_size = ++ default_compat_string[module->node_info.type].size; ++ break; ++ ++ case MODULE_CUSTOM: ++ /* we have set the node_info in set_module_type */ ++ break; ++ ++ default: ++ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("invalid argument")); ++ } ++ module->name = module->node_info.compat_string; ++ module->align = module_default_align[module->node_info.type]; ++ ++ grub_dprintf ("xen_loader", "Init %s module and node info:\n" ++ "compatible %s\ncompat_string_size 0x%lx\n", ++ module->name, module->node_info.compat_string, ++ module->node_info.compat_string_size); ++ ++ file = grub_file_open (argv[file_name_index]); ++ if (!file) ++ goto fail; ++ ++ xen_boot_binary_load (module, file, argc - file_name_index, ++ argv + file_name_index); ++ if (grub_errno == GRUB_ERR_NONE) ++ grub_list_push (GRUB_AS_LIST_P (&module_head), GRUB_AS_LIST (module)); ++ ++fail: ++ if (file) ++ grub_file_close (file); ++ if (grub_errno != GRUB_ERR_NONE) ++ single_binary_unload (module); ++ ++ return grub_errno; ++} ++ ++static grub_err_t ++grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ ((unused)), ++ int argc, char *argv[]) ++{ ++ struct xen_hypervisor_header sh; ++ grub_file_t file = NULL; ++ ++ grub_dl_ref (my_mod); ++ ++ if (!argc) ++ { ++ grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); ++ goto fail; ++ } ++ ++ file = grub_file_open (argv[0]); ++ if (!file) ++ goto fail; ++ ++ if (grub_file_read (file, &sh, sizeof (sh)) != (long) sizeof (sh)) ++ goto fail; ++ if (grub_arm64_uefi_check_image ++ ((struct grub_arm64_linux_kernel_header *) &sh) != GRUB_ERR_NONE) ++ goto fail; ++ grub_file_seek (file, 0); ++ ++ /* if another module has called grub_loader_set, ++ we need to make sure that another module is unloaded properly */ ++ grub_loader_unset (); ++ ++ xen_hypervisor = ++ (struct xen_boot_binary *) grub_zalloc (sizeof (struct xen_boot_binary)); ++ if (!xen_hypervisor) ++ return grub_errno; ++ ++ xen_hypervisor->name = XEN_HYPERVISOR_NAME; ++ xen_hypervisor->align = (grub_size_t) sh.optional_header.section_alignment; ++ ++ xen_boot_binary_load (xen_hypervisor, file, argc, argv); ++ if (grub_errno == GRUB_ERR_NONE) ++ { ++ grub_loader_set (xen_boot, xen_unload, 0); ++ grub_linux_set_loaded (1); ++ } ++ ++fail: ++ if (file) ++ grub_file_close (file); ++ if (grub_errno != GRUB_ERR_NONE) ++ { ++ grub_linux_set_loaded (0); ++ all_binaries_unload (); ++ grub_dl_unref (my_mod); ++ } ++ ++ return grub_errno; ++} ++ ++static grub_command_t cmd_xen_hypervisor, cmd_xen_module; ++static grub_command_t cmd_xen_linux, cmd_xen_initrd, cmd_xen_xsm; ++ ++GRUB_MOD_INIT (xen_boot) ++{ ++ cmd_xen_hypervisor = ++ grub_register_command ("xen_hypervisor", grub_cmd_xen_hypervisor, 0, ++ N_("Load a xen hypervisor.")); ++ cmd_xen_linux = ++ grub_register_command ("xen_linux", grub_cmd_xen_module, 0, ++ N_("Load a xen linux kernel for dom0.")); ++ cmd_xen_initrd = ++ grub_register_command ("xen_initrd", grub_cmd_xen_module, 0, ++ N_("Load a xen initrd for dom0.")); ++ cmd_xen_xsm = ++ grub_register_command ("xen_xsm", grub_cmd_xen_module, 0, ++ N_("Load a xen security module.")); ++ cmd_xen_module = ++ grub_register_command ("xen_module", grub_cmd_xen_module, 0, ++ N_("Load a xen module.")); ++ my_mod = mod; ++} ++ ++GRUB_MOD_FINI (xen_boot) ++{ ++ grub_unregister_command (cmd_xen_hypervisor); ++ grub_unregister_command (cmd_xen_linux); ++ grub_unregister_command (cmd_xen_initrd); ++ grub_unregister_command (cmd_xen_xsm); ++ grub_unregister_command (cmd_xen_module); ++} +-- +1.7.10.4 + diff --git a/SOURCES/0004-util-grub.d-20_linux_xen.in-Add-support-of-the-XEN-b.patch b/SOURCES/0004-util-grub.d-20_linux_xen.in-Add-support-of-the-XEN-b.patch new file mode 100644 index 0000000..bd3a0e6 --- /dev/null +++ b/SOURCES/0004-util-grub.d-20_linux_xen.in-Add-support-of-the-XEN-b.patch @@ -0,0 +1,60 @@ +From 05b8c5b34eb6d30131b381145040a4eecb10cba4 Mon Sep 17 00:00:00 2001 +From: Fu Wei <fu.wei(a)linaro.org> +Date: Thu, 23 Jul 2015 13:16:22 +0800 +Subject: [PATCH 4/5] * util/grub.d/20_linux_xen.in: Add support of the XEN + boot on aarch64 + +This patch adds the support of boot command on aarch64 for XEN: + xen_hypervisor + xen_linux + xen_initrd + +Signed-off-by: Fu Wei <fu.wei(a)linaro.org> +--- + util/grub.d/20_linux_xen.in | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in +index a608435..b8bfc6c 100644 +--- a/util/grub.d/20_linux_xen.in ++++ b/util/grub.d/20_linux_xen.in +@@ -120,16 +120,16 @@ linux_entry () + else + xen_rm_opts="no-real-mode edd=off" + fi +- multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} ++ ${multiboot_cmd} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} + echo '$(echo "$lmessage" | grub_quote)' +- module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} ++ ${module_linux_cmd} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} + EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. + message="$(gettext_printf "Loading initial ramdisk ...")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' +- module --nounzip ${rel_dirname}/${initrd} ++ ${module_initrd_cmd} ${rel_dirname}/${initrd} + EOF + fi + sed "s/^/$submenu_indentation/" << EOF +@@ -183,6 +183,16 @@ case "$machine" in + *) GENKERNEL_ARCH="$machine" ;; + esac + ++if [ "x$machine" != xaarch64 ]; then ++ multiboot_cmd="multiboot" ++ module_linux_cmd="module" ++ module_initrd_cmd="module --nounzip" ++else ++ multiboot_cmd="xen_hypervisor" ++ module_linux_cmd="xen_linux" ++ module_initrd_cmd="xen_initrd" ++fi ++ + # Extra indentation to add to menu entries in a submenu. We're not in a submenu + # yet, so it's empty. In a submenu it will be equal to '\t' (one tab). + submenu_indentation="" +-- +1.7.10.4 + diff --git a/SOURCES/0005-arm64-Add-the-introduction-of-xen-boot-commands-in-d.patch b/SOURCES/0005-arm64-Add-the-introduction-of-xen-boot-commands-in-d.patch new file mode 100644 index 0000000..9baf400 --- /dev/null +++ b/SOURCES/0005-arm64-Add-the-introduction-of-xen-boot-commands-in-d.patch @@ -0,0 +1,94 @@ +From 3aeb819fa8dde62b62e29c157fd1171ff4c5a3c9 Mon Sep 17 00:00:00 2001 +From: Fu Wei <fu.wei(a)linaro.org> +Date: Thu, 23 Jul 2015 13:16:23 +0800 +Subject: [PATCH 5/5] arm64: Add the introduction of xen boot commands in + docs/grub.texi + + xen_hypervisor + xen_linux + xen_initrd + xen_xsm + xen_module + +Signed-off-by: Fu Wei <fu.wei(a)linaro.org> +--- + docs/grub.texi | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 56 insertions(+) + +diff --git a/docs/grub.texi b/docs/grub.texi +index 46b9e7f..9c62a1b 100644 +--- a/docs/grub.texi ++++ b/docs/grub.texi +@@ -3839,6 +3839,12 @@ you forget a command, you can run the command @command{help} + @comment * vbeinfo:: List available video modes + * verify_detached:: Verify detached digital signature + * videoinfo:: List available video modes ++@comment * xen_*:: Xen boot commands, for arm64 only ++* xen_hypervisor:: Load xen hypervisor binary on arm64 ++* xen_linux:: Load dom0 kernel for xen hypervisor on arm64 ++* xen_initrd:: Load dom0 initrd for xen hypervisor on arm64 ++* xen_xsm:: Load xen security module for xen hypervisor on arm64 ++* xen_module:: Load custom module for xen hypervisor on arm64 + @end menu + + +@@ -5102,6 +5108,56 @@ successfully. If validation fails, it is set to a non-zero value. + List available video modes. If resolution is given, show only matching modes. + @end deffn + ++@node xen_hypervisor ++@subsection xen_hypervisor ++ ++@deffn Command xen_hypervisor file [arguments] @dots{} ++Load a Xen hypervisor binary from @var{file}. The rest of the ++line is passed verbatim as the @dfn{kernel command-line}. Any Xen module must ++be reloaded after using this command (@pxref{xen_module}). ++This command is only available on ARM64 systems. ++@end deffn ++ ++@node xen_linux ++@subsection xen_linux ++ ++@deffn Command xen_linux file [arguments] ++Load a dom0 kernel image for xen hypervisor binary. The rest of the ++line is passed verbatim as the module command line. ++This command is only available on ARM64 systems. ++@end deffn ++ ++@node xen_initrd ++@subsection xen_initrd ++ ++@deffn Command xen_initrd file ++Load a dom0 initrd image for xen hypervisor binary. ++This command is only available on ARM64 systems. ++@end deffn ++ ++@node xen_xsm ++@subsection xen_xsm ++ ++@deffn Command xen_xsm file ++Load a xen security module for xen hypervisor binary. ++This command is only available on ARM64 systems. ++@end deffn ++ ++ ++@node xen_module ++@subsection xen_module ++ ++@deffn Command xen_module [--type <compatible stream>] file [arguments] ++Load a custom module for xen hypervisor binary. The rest of the ++line is passed verbatim as the module command line. ++This command is only available on ARM64 systems. ++ ++--type is an option which allow the module command to take "compatible" string. ++This would override default compatible string:"xen,module". The rest of the ++line is passed verbatim as the module command line. ++This command is only available on ARM64 systems. ++@end deffn ++ + @node Networking commands + @section The list of networking commands + +-- +1.7.10.4 + diff --git a/SOURCES/0006-fdt.h-Add-grub_fdt_set_reg64-macro.patch b/SOURCES/0006-fdt.h-Add-grub_fdt_set_reg64-macro.patch new file mode 100644 index 0000000..c1a899e --- /dev/null +++ b/SOURCES/0006-fdt.h-Add-grub_fdt_set_reg64-macro.patch @@ -0,0 +1,34 @@ +From 1c7ca193728bf99f1a0b8b9ac267fa7f51fc9ec5 Mon Sep 17 00:00:00 2001 +From: Fu Wei <fu.wei(a)linaro.org> +Date: Thu, 7 May 2015 15:13:25 +0200 +Subject: [PATCH] fdt.h: Add grub_fdt_set_reg64 macro + +Signed-off-by: Fu Wei <fu.wei(a)linaro.org> +--- + include/grub/fdt.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/include/grub/fdt.h b/include/grub/fdt.h +index 3016998..fdfca75 100644 +--- a/include/grub/fdt.h ++++ b/include/grub/fdt.h +@@ -117,4 +117,16 @@ int grub_fdt_set_prop (void *fdt, unsigned int nodeoffset, const char *name, + grub_fdt_set_prop ((fdt), (nodeoffset), (name), &_val, 8); \ + }) + ++/* Setup "reg" property for ++ * #address-cells = <0x2> ++ * #size-cells = <0x2> ++ */ ++#define grub_fdt_set_reg64(fdt, nodeoffset, addr, size) \ ++({ \ ++ grub_uint64_t reg_64[2]; \ ++ reg_64[0] = grub_cpu_to_be64(addr); \ ++ reg_64[1] = grub_cpu_to_be64(size); \ ++ grub_fdt_set_prop ((fdt), (nodeoffset), "reg", reg_64, 16); \ ++}) ++ + #endif /* ! GRUB_FDT_HEADER */ +-- +1.7.10.4 + diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index a7077a1..a0d7f22 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -43,7 +43,7 @@ %undefine _missing_build_ids_terminate_build Name: grub2 -Epoch: 1 +Epoch: 2 Version: 2.02 Release: 0.16.1%{?dist} Summary: Bootloader with support for Linux, Multiboot and more @@ -54,7 +54,7 @@ URL: http://www.gnu.org/software/grub/ Obsoletes: grub < 1:0.98 Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz #Source0: ftp://ftp.gnu.org/gnu/grub/grub-%{tarversion}.tar.xz -Source1: centos.cer +#Source1: centos.cer #(source removed) Source4: http://unifoundry.com/unifont-5.1.20080820.pcf.gz Source5: theme.tar.bz2 @@ -211,7 +211,7 @@ Patch0148: 0001-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch Patch0149: 0001-Add-GRUB_DISABLE_UUID.patch Patch0150: 0001-Allow-fallback-to-include-entries-by-title-not-just-.patch Patch0151: 0001-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch -Patch0152: 0002-Load-arm-with-SB-enabled.patch +#Patch0152: 0002-Load-arm-with-SB-enabled.patch Patch0153: 0001-Fix-up-some-man-pages-rpmdiff-noticed.patch Patch0154: 0001-Try-prefix-if-fw_path-doesn-t-work.patch @@ -220,6 +220,14 @@ Patch0201: 0001-efinet-skip-virtual-IPv4-and-IPv6-devices-when-enume.patch Patch0202: 0002-efinet-open-Simple-Network-Protocol-exclusively.patch Patch0203: 0001-efinet-save-and-restore-SNP-rx-filters.patch +Patch204: 0001-arm64-Export-useful-functions-from-linux.c.patch +Patch205: 0002-arm64-Add-and-export-some-accessor-functions-for-xen.patch +Patch206: 0003-arm64-Add-xen_boot-module-file.patch +Patch207: 0004-util-grub.d-20_linux_xen.in-Add-support-of-the-XEN-b.patch +Patch208: 0005-arm64-Add-the-introduction-of-xen-boot-commands-in-d.patch +Patch209: 0006-fdt.h-Add-grub_fdt_set_reg64-macro.patch + + BuildRequires: flex bison binutils python BuildRequires: ncurses-devel xz-devel bzip2-devel BuildRequires: freetype-devel libusb-devel @@ -352,7 +360,7 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo efifwsetup \ jpeg loadenv lvm mdraid09 mdraid1x minicmd normal part_apple \ part_msdos part_gpt password_pbkdf2 png reboot search \ search_fs_uuid search_fs_file search_label sleep syslinuxcfg \ - test tftp regexp video xfs" + test tftp regexp video xfs xen_boot" %ifarch aarch64 GRUB_MODULES="${GRUB_MODULES} linux" %else -- 1.8.3.1

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Arm-dev October 2015