From owner-svn-src-all@freebsd.org Sat Mar 26 06:57:37 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA4BFADDB00; Sat, 26 Mar 2016 06:57:37 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A160D10AB; Sat, 26 Mar 2016 06:57:37 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2Q6va0V077562; Sat, 26 Mar 2016 06:57:36 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2Q6vaWA077560; Sat, 26 Mar 2016 06:57:36 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201603260657.u2Q6vaWA077560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Sat, 26 Mar 2016 06:57:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297285 - in head/sys/arm: arm include X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2016 06:57:38 -0000 Author: mmel Date: Sat Mar 26 06:57:36 2016 New Revision: 297285 URL: https://svnweb.freebsd.org/changeset/base/297285 Log: ARM: Fix ATAG handling in LINUX_BOOT_API: - Don't convert atags address passed from U-Boot. It's real physical address (and we have 1:1 mapping). - Size of tags is encoded in words, not in bytes Modified: head/sys/arm/arm/machdep.c head/sys/arm/include/atags.h Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Sat Mar 26 06:55:55 2016 (r297284) +++ head/sys/arm/arm/machdep.c Sat Mar 26 06:57:36 2016 (r297285) @@ -1035,6 +1035,7 @@ linux_parse_boot_param(struct arm_boot_p struct arm_lbabi_tag *walker; uint32_t revision; uint64_t serial; + int size; #ifdef FDT struct fdt_header *dtb_ptr; uint32_t dtb_size; @@ -1061,8 +1062,7 @@ linux_parse_boot_param(struct arm_boot_p return (0); board_id = abp->abp_r1; - walker = (struct arm_lbabi_tag *) - (abp->abp_r2 + KERNVIRTADDR - abp->abp_physaddr); + walker = (struct arm_lbabi_tag *)abp->abp_r2; if (ATAG_TAG(walker) != ATAG_CORE) return 0; @@ -1079,8 +1079,9 @@ linux_parse_boot_param(struct arm_boot_p case ATAG_INITRD2: break; case ATAG_SERIAL: - serial = walker->u.tag_sn.low | - ((uint64_t)walker->u.tag_sn.high << 32); + serial = walker->u.tag_sn.high; + serial <<= 32; + serial |= walker->u.tag_sn.low; board_set_serial(serial); break; case ATAG_REVISION: @@ -1089,8 +1090,12 @@ linux_parse_boot_param(struct arm_boot_p break; case ATAG_CMDLINE: /* XXX open question: Parse this for boothowto? */ - bcopy(walker->u.tag_cmd.command, linux_command_line, - ATAG_SIZE(walker)); + size = ATAG_SIZE(walker) - + sizeof(struct arm_lbabi_header); + size = min(size, sizeof(linux_command_line) - 1); + strncpy(linux_command_line, walker->u.tag_cmd.command, + size); + linux_command_line[size] = '\0'; break; default: break; Modified: head/sys/arm/include/atags.h ============================================================================== --- head/sys/arm/include/atags.h Sat Mar 26 06:55:55 2016 (r297284) +++ head/sys/arm/include/atags.h Sat Mar 26 06:57:36 2016 (r297285) @@ -123,7 +123,7 @@ struct arm_lbabi_tag }; #define ATAG_TAG(a) (a)->tag_hdr.tag -#define ATAG_SIZE(a) (a)->tag_hdr.size +#define ATAG_SIZE(a) ((a)->tag_hdr.size * sizeof(uint32_t)) #define ATAG_NEXT(a) (struct arm_lbabi_tag *)((char *)(a) + ATAG_SIZE(a)) #endif /* __MACHINE_ATAGS_H__ */